From 4d42f685081bd9be3b4fd4e302145ebf157fbcc7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 23 Feb 2018 19:32:57 -0600 Subject: [PATCH] [MIRROR] Cleans up chem grenade copypasta'd code (#5675) * Merge pull request #35913 from ShizCalev/chem_grenade Cleans up chem grenade copypasta'd code * Cleans up chem grenade copypasta'd code --- .../objects/items/grenades/chem_grenade.dm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 8851b3446b..1bfba34772 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -30,23 +30,11 @@ /obj/item/grenade/chem_grenade/attack_self(mob/user) - if(stage == READY && !active) + if(stage == READY && !active) if(nadeassembly) nadeassembly.attack_self(user) - else if(clown_check(user)) - var/turf/bombturf = get_turf(src) - var/area/A = get_area(bombturf) - message_admins("[ADMIN_LOOKUPFLW(usr)] has primed a [name] for detonation at [A.name][ADMIN_JMP(bombturf)].") - log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].") - to_chat(user, "You prime the [name]! [det_time / 10] second\s!") - playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1) - active = 1 - icon_state = initial(icon_state) + "_active" - if(iscarbon(user)) - var/mob/living/carbon/C = user - C.throw_mode_on() - - addtimer(CALLBACK(src, .proc/prime), det_time) + else + ..() /obj/item/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)