From 261615a0bc78d2d90c9e221760d9f987f4f56c94 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Sat, 4 Jan 2014 19:26:05 -0600 Subject: [PATCH] Ninja Death Tweak THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY YES I'M MAD --- code/modules/events/ninja.dm | 4 ++++ code/modules/mob/living/carbon/human/death.dm | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index f2c22c3ab76..44847d2ae03 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -377,6 +377,10 @@ ________________________________________________________________________________ equip_to_slot_or_del(new /obj/item/weapon/plastique(src), slot_l_store) equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back) + + var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(src) + E.imp_in = src + E.implanted = 1 return 1 //=======//HELPER PROCS//=======// diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 978b9b9729e..473707ff132 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -28,14 +28,8 @@ if(!gibbed) emote("deathgasp") //let the world KNOW WE ARE DEAD - //For ninjas exploding when they die./N - if( istype(wear_suit, /obj/item/clothing/suit/space/space_ninja) && wear_suit:s_initialized ) - src << browse(null, "window=spideros")//Just in case. - var/location = loc - explosion(location, 1, 2, 3, 4) - update_canmove() - if(client) blind.layer = 0 + if(client) blind.layer = 0 tod = worldtime2text() //weasellos time of death patch if(mind) mind.store_memory("Time of death: [tod]", 0)