shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Cleans up chem grenade copypasta'd code (#5675)

Browse Source 
* Merge pull request #35913 from ShizCalev/chem_grenade

Cleans up chem grenade copypasta'd code

* Cleans up chem grenade copypasta'd code
This commit is contained in:
CitadelStationBot
2018-02-23 19:32:57 -06:00
committed by Poojawa
parent e85aa903a7
commit 4d42f68508
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/items/grenades/chem_grenade.dm
View File

@@ -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, "<span class='warning'>You prime the [name]! [det_time / 10] second\s!</span>")
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)