cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix of names in grenade

Browse Source
This commit is contained in:
Ater Ignis
2012-10-27 19:48:48 +04:00
parent 6337048aad
commit 2acba34e11
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/weapons/grenades/chem_grenade.dm
View File

@@ -31,7 +31,7 @@
if(istype(B)) if(istype(B))
beakers -= B beakers -= B
user.put_in_hands(B) user.put_in_hands(B)
name = "unsecured grenade with [beakers.len] containers[stage?" and detonator":""]" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
if(stage > 1 && !active && clown_check(user)) if(stage > 1 && !active && clown_check(user))
user << "<span class='warning'>You prime \the [name]!</span>" user << "<span class='warning'>You prime \the [name]!</span>"
@@ -45,7 +45,7 @@
var/mob/living/carbon/C = user var/mob/living/carbon/C = user
C.throw_mode_on() C.throw_mode_on()
attackby(obj/item/weapon/W as obj, mob/user as mob)//TODO:Have grenades use the new assembly things attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2) if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2)
var/obj/item/device/assembly_holder/det = W var/obj/item/device/assembly_holder/det = W
@@ -62,7 +62,7 @@
det.loc = src det.loc = src
detonator = det detonator = det
icon_state = initial(icon_state) +"_ass" icon_state = initial(icon_state) +"_ass"
name = "unsecured grenade with [beakers.len] containers[stage?" and detonator":""]" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
stage = 1 stage = 1
else if(istype(W,/obj/item/weapon/screwdriver) && path != 2) else if(istype(W,/obj/item/weapon/screwdriver) && path != 2)
if(stage == 1) if(stage == 1)
@@ -83,7 +83,7 @@
else if(stage == 2) else if(stage == 2)
user << "\blue You unlock the assembly." user << "\blue You unlock the assembly."
playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3) playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, -3)
name = "unsecured grenade with [beakers.len] containers[stage?" and detonator":""]" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
icon_state = initial(icon_state) + (detonator?"_ass":"") icon_state = initial(icon_state) + (detonator?"_ass":"")
stage = 1 stage = 1
active = 0 active = 0
@@ -99,7 +99,7 @@
W.loc = src W.loc = src
beakers += W beakers += W
stage = 1 stage = 1
name = "unsecured grenade with [beakers.len] containers[stage?" and detonator":""]" name = "unsecured grenade with [beakers.len] containers[detonator?" and detonator":""]"
else else
user << "\red \the [W] is empty." user << "\red \the [W] is empty."