diff --git a/code/modules/mob/living/simple_animal/hostile/f13/renegade.dm b/code/modules/mob/living/simple_animal/hostile/f13/renegade.dm index 3e3cf0a4..2dd59101 100644 --- a/code/modules/mob/living/simple_animal/hostile/f13/renegade.dm +++ b/code/modules/mob/living/simple_animal/hostile/f13/renegade.dm @@ -13,13 +13,13 @@ icon_dead = "renegade_prospect-dead" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID turns_per_move = 5 - maxHealth = 140 - health = 140 + maxHealth = 125 + health = 125 healable = 1 speed = 1.2 obj_damage = 150 - melee_damage_lower = 25 - melee_damage_upper = 40 + melee_damage_lower = 15 + melee_damage_upper = 20 attack_verb_simple = "smacks" attack_sound = 'sound/weapons/smash.ogg' a_intent = INTENT_HARM @@ -47,7 +47,6 @@ icon_dead = "renegade_smasher-dead" melee_damage_lower = 20 melee_damage_upper = 30 - rapid_melee = 2 // LIGHT RANGED VARIANT /mob/living/simple_animal/hostile/renegade/grunt @@ -57,8 +56,8 @@ icon_living = "renegade_grunt" icon_dead = "renegade_grunt-dead" ranged = TRUE - maxHealth = 200 - health = 200 + maxHealth = 150 + health = 150 healable = 1 check_friendly_fire = 1 retreat_distance = 6 @@ -98,7 +97,7 @@ obj_damage = 200 retreat_distance = 4 minimum_distance = 1 - ranged_cooldown_time = 4 + ranged_cooldown_time = 5 projectiletype = /obj/item/projectile/bullet/pellet/shotgun_buckshot projectilesound = 'sound/f13weapons/shotgun.ogg' casingtype = /obj/item/ammo_casing/shotgun @@ -151,8 +150,8 @@ icon_living = "renegade_defender" icon_dead = "renegade_defender-dead" ranged = TRUE - maxHealth = 750 - health = 750 + maxHealth = 600 + health = 600 healable = 1 speed = 0.1 check_friendly_fire = 1 @@ -172,7 +171,7 @@ /mob/living/simple_animal/hostile/renegade/defender/assaulter name = "Renegade Assaulter" desc = "The Renegade member who's sole purpose is to withstand punishment with layers of advanced combat armor- and dish out just as much with a well placed violent mace swing. As if to flaunt who's about to smack your skull in- there's a huge red R painted into his shield." - armour_penetration = 0.6 + armour_penetration = 0.5 icon_state = "renegade_assaulter" icon_living = "renegade_assaulter" icon_dead = "renegade_assaulter-dead" @@ -185,12 +184,11 @@ icon_living = "renegade_drifter" icon_dead = "renegade_drifter-dead" ranged = TRUE - maxHealth = 280 - health = 280 + maxHealth = 200 + health = 200 healable = 1 speed = 1.3 vision_range = 12 - aggro_vision_range = 15 check_friendly_fire = 1 retreat_distance = 10 minimum_distance = 6 @@ -209,8 +207,8 @@ desc = "A veteran of the Renegades, specializing in recon and long range engagements and equipped with old, stolen riot gear- with no regard for the safety of their comrades so long as their target went down." armour_penetration = 0.2 check_friendly_fire = 0 - health = 300 - maxHealth = 300 + health = 250 + maxHealth = 250 minimum_distance = 8 vision_range = 15 icon_state = "renegade_sniper" @@ -225,13 +223,13 @@ icon_living = "renegade_guardian" icon_dead = "renegade_guardian-dead" ranged = TRUE - maxHealth = 420 - health = 420 + maxHealth = 300 + health = 300 healable = 1 - speed = 0.9 + speed = 1 check_friendly_fire = 1 minimum_distance = 2 - ranged_cooldown_time = 3 + ranged_cooldown_time = 5 projectiletype = /obj/item/projectile/bullet/pellet/shotgun_buckshot projectilesound = 'sound/f13weapons/auto5.ogg' casingtype = /obj/item/ammo_casing/shotgun @@ -248,7 +246,6 @@ armour_penetration = 5 extra_projectiles = 2 melee_queue_distance = 2 - rapid_melee = 2 icon_state = "renegade_shotgunner" icon_living = "renegade_shotgunner" icon_dead = "renegade_shotgunner-dead" @@ -260,18 +257,23 @@ icon_state = "renegade_meister" icon_living = "renegade_meister" icon_dead = "renegade_meister-dead" - maxHealth = 1000 - health = 1000 + maxHealth = 850 + health = 850 + aggro_vision_range = 8 + armour_penetration = 0.2 healable = 1 - melee_damage_lower = 50 - melee_damage_upper = 50 + melee_damage_lower = 25 + melee_damage_upper = 30 retreat_distance = 3 minimum_distance = 1 + vision_range = 8 ranged = 1 attack_verb_simple = "power-fists" attack_sound = 'sound/weapons/slam.ogg' ranged_cooldown_time = 30 - extra_projectiles = 5 + extra_projectiles = 4 + speed = 5 + move_to_delay = 6 projectiletype = /obj/item/projectile/bullet/a5mm/simple projectilesound = 'sound/f13weapons/762lmg.ogg' loot = list(/obj/item/stack/f13Cash/random/high, /obj/item/advanced_crafting_components/alloys, /obj/item/stack/sheet/plasteel/five) @@ -285,13 +287,20 @@ /mob/living/simple_animal/hostile/renegade/meister/heavy name = "Renegade Heavy" desc = "Is that a merc in layered advanced combat armor, high on drugs?! Holy shit, that's a big gun!" - aggro_vision_range = 14 - armour_penetration = 0.8 + maxHealth = 700 + health = 700 + melee_damage_upper = 20 + melee_damage_lower = 20 + aggro_vision_range = 8 + armour_penetration = 0.2 check_friendly_fire = 0 environment_smash = ENVIRONMENT_SMASH_RWALLS - extra_projectiles = 7 - rapid_melee = 2 + extra_projectiles = 4 + ranged_cooldown_time = 15 + speed = 6 + move_to_delay = 6 retreat_distance = 2 + vision_range = 8 icon_state = "renegade_heavy" icon_living = "renegade_heavy" icon_dead = "renegade_heavy-dead" @@ -304,8 +313,8 @@ icon_living = "renegade_doc" icon_dead = "renegade_doc-dead" ranged = TRUE - maxHealth = 250 - health = 250 + maxHealth = 200 + health = 200 healable = 1 check_friendly_fire = 1 retreat_distance = 6 @@ -338,19 +347,23 @@ name = "Renegade Boss" desc = "A Renegade boss, clad in hotrod power armor, and wielding a deadly rapid-fire shrapnel cannon. He's had enough of your shit." faction = list("raider","wastebot","hostile","supermutant","ghoul") - aggro_vision_range = 15 - armour_penetration = 0.8 + aggro_vision_range = 8 + armour_penetration = 0.2 environment_smash = ENVIRONMENT_SMASH_RWALLS - extra_projectiles = 7 - health = 1250 - maxHealth = 1250 - melee_damage_upper = 50 - minimum_distance = 0 + extra_projectiles = 6 + ranged_cooldown_time = 30 + health = 1000 + maxHealth = 1000 + melee_damage_upper = 25 + melee_damage_lower = 20 + minimum_distance = 1 obj_damage = 500 - rapid_melee = 2 + speed = 6 + move_to_delay = 6 retreat_distance = 0 - vision_range = 15 + vision_range = 8 icon = 'icons/fallout/mobs/humans/renegade.dmi' icon_state = "renegade_boss" icon_living = "renegade_boss" icon_dead = "renegade_boss-dead" + loot = list(/obj/effect/spawner/lootdrop/f13/medical/vault/meds, /obj/item/stack/f13Cash/random/high, /obj/item/stack/sheet/plasteel/five)