From cebb046145cf0e8f02078e07490bb25691bb87b0 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Tue, 16 Feb 2016 18:21:45 -0800 Subject: [PATCH] adds sfx, tweaks damage, changes proc to apply_damage() known bugs: apply_damage isn't properly accounting for armor --- code/modules/mob/living/simple_animal/bot/cleanbot.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index f6468104265..52440c0f6f4 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -98,13 +98,14 @@ if(emagged == 2) //Emag functions if(istype(loc,/turf/simulated)) - for(var/mob/living/carbon/victim in src.loc) + for(var/mob/living/carbon/victim in loc) if(victim.stat != DEAD)//cleanbots always finish the job victim.visible_message("[src] sprays hydrofluoric acid at [victim]!", "[src] sprays you with hydrofluoric acid!") - victim.adjustFireLoss(25) - victim.emote("scream") var/phrase = pick("PURIFICATION IN PROGRESS.", "THIS IS FOR ALL THE MESSES YOU'VE MADE ME CLEAN.", "THE FLESH IS WEAK. IT MUST BE WASHED AWAY.", "THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.") - say("[phrase]") + say(phrase) + victim.emote("scream") + playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6) + victim.apply_damage(20, BURN, null) if(prob(10)) //Wets floors randomly var/turf/simulated/T = loc