From 3de92a2fb28033db2ec97f9d380e82fec2418007 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Thu, 24 Dec 2015 14:51:50 -0800 Subject: [PATCH] tweaks EMP act now deals 25 fire damage and ignites the owner with a full 20 firestacks. not an instant kill. also forcibly retracts the item should it be out at the time of EMP. --- code/modules/surgery/organs/augments_internal.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index f2526e9b7bf..c6dbcd8223e 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -288,13 +288,18 @@ if(!owner)//ensure that it's in an owner, then... return if(overloaded == 0)//make sure this is the first time it's been EMPed, and... + if(out == 1)//check if he has the item out... + owner.unEquip(holder, 1)//if he does, take it away. + holder.loc = null + out = 0 + owner.visible_message("[holder] forcibly retracts into your arm.") owner.visible_message("A loud bang comes from [owner]...") playsound(get_turf(owner), 'sound/weapons/flashbang.ogg', 100, 1) - owner << "You feel an explosion erupt inside your chest. Is it hot in here?" + owner << "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?" owner.adjust_fire_stacks(20) - owner.IgniteMob() + owner.IgniteMob()//ignite the owner, and then... owner.say("AUUUUUUUUUUUUUUUUUUGH!!") - owner.adjustFireLoss(10000)//kill the owner! + owner.adjustFireLoss(25)//severely injure him! overloaded = 1//then make sure this can't happen again by breaking the implant. else return