From e1658b277ed78d7e9f0b907f478e1b68299c3a8b Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Sat, 7 May 2016 10:52:55 -0400 Subject: [PATCH 1/2] Fixes some simple animal maxhealths --- .../mob/living/simple_animal/friendly/farm_animals.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 66a10c95760..e373e0f4873 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -21,6 +21,7 @@ attacktext = "kicks" attack_sound = 'sound/weapons/punch1.ogg' health = 40 + maxHealth = 40 melee_damage_lower = 1 melee_damage_upper = 2 environment_smash = 0 @@ -98,6 +99,7 @@ attacktext = "kicks" attack_sound = 'sound/weapons/punch1.ogg' health = 50 + maxHealth = 50 var/obj/item/udder/udder = null gold_core_spawnable = 2 @@ -157,7 +159,8 @@ response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicks" - health = 1 + health = 3 + maxHealth = 3 ventcrawler = 2 var/amount_grown = 0 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB @@ -206,7 +209,8 @@ var/global/chicken_count = 0 response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicks" - health = 10 + health = 15 + maxHealth = 15 ventcrawler = 2 var/eggsleft = 0 var/eggsFertile = TRUE From 5ad7fd341d8818092a1a5282a11675aec95bef3c Mon Sep 17 00:00:00 2001 From: Nerd Lord Date: Sat, 7 May 2016 11:08:52 -0400 Subject: [PATCH 2/2] these match actual alien healths --- code/modules/mob/living/simple_animal/hostile/alien.dm | 8 ++++---- code/modules/mob/living/simple_animal/hostile/hivebot.dm | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm index e1b8695c437..b361d62b00d 100644 --- a/code/modules/mob/living/simple_animal/hostile/alien.dm +++ b/code/modules/mob/living/simple_animal/hostile/alien.dm @@ -12,8 +12,8 @@ speed = 0 butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 4, /obj/item/stack/sheet/animalhide/xeno = 1) - maxHealth = 100 - health = 100 + maxHealth = 125 + health = 125 harm_intent_damage = 5 melee_damage_lower = 25 melee_damage_upper = 25 @@ -39,7 +39,6 @@ icon_state = "aliend_s" icon_living = "aliend_s" icon_dead = "aliend_dead" - health = 60 melee_damage_lower = 15 melee_damage_upper = 15 var/plant_cooldown = 30 @@ -59,7 +58,8 @@ icon_state = "aliens_s" icon_living = "aliens_s" icon_dead = "aliens_dead" - health = 120 + health = 150 + maxHealth = 150 melee_damage_lower = 15 melee_damage_upper = 15 ranged = 1 diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 0063669071c..d83faba36e2 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -48,6 +48,7 @@ name = "strong hivebot" desc = "A robot, this one is armed and looks tough!" health = 80 + maxHealth = 80 ranged = 1 /mob/living/simple_animal/hostile/hivebot/death(gibbed)