From d62038a3366d4865337bae09c1fb8ba22c9f2833 Mon Sep 17 00:00:00 2001 From: Kyep Date: Thu, 29 Dec 2016 23:41:32 -0800 Subject: [PATCH] Crazylemon Changes 1) Changed \ref and ..() per Crazylemon's request 2) Fixed a bug with Life() that was causing regeneration not to work --- .../hostile/terror_spiders/actions.dm | 1 + .../hostile/terror_spiders/terror_spiders.dm | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm index 5c573ae82ea..963bfd472fd 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm @@ -38,6 +38,7 @@ /obj/effect/spider/terrorweb/New() + ..() if(prob(50)) icon_state = "stickyweb2" diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 143c5e28750..67683d39b39 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -235,7 +235,7 @@ var/global/list/ts_spiderlist = list() notify_ghosts("[src] has appeared in [get_area(src)]. (already player-controlled)", source = src, alert_overlay = alert_overlay) else if(ai_playercontrol_allowingeneral && ai_playercontrol_allowtype) var/image/alert_overlay = image('icons/mob/terrorspider.dmi', icon_state) - notify_ghosts("[src] has appeared in [get_area(src)].", enter_link = "(Click to control)", source = src, alert_overlay = alert_overlay, attack_not_jump = 1) + notify_ghosts("[src] has appeared in [get_area(src)].", enter_link = "(Click to control)", source = src, alert_overlay = alert_overlay, attack_not_jump = 1) /mob/living/simple_animal/hostile/poison/terror_spider/Destroy() ts_spiderlist -= src @@ -243,8 +243,13 @@ var/global/list/ts_spiderlist = list() return ..() /mob/living/simple_animal/hostile/poison/terror_spider/Life() - . = ..() - if(!.) // if mob is alive + ..() + if(stat == DEAD) + if(prob(2)) + // 2% chance every cycle to decompose + visible_message("\The dead body of the [src] decomposes!") + gib() + else if(regen_points < regen_points_max) regen_points += regen_points_per_tick if((bruteloss > 0) || (fireloss > 0)) @@ -257,11 +262,7 @@ var/global/list/ts_spiderlist = list() regen_points -= regen_points_per_hp if(prob(5)) CheckFaction() - else if(stat == DEAD) - if(prob(2)) - // 2% chance every cycle to decompose - visible_message("\The dead body of the [src] decomposes!") - gib() +