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

Merge pull request #6446 from Citadel-Station-13/upstream-merge-37216

Browse Source 
[MIRROR] Esword cig lighting messages fix
This commit is contained in:
LetterJay
2018-04-22 02:32:53 -05:00
committed by GitHub
parent 3635cd9c71 e9a9cca791
commit 3d4acf38a1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/energy.dm
+2 -2
View File
@@ -53,9 +53,9 @@
var/in_mouth = ""
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.wear_mask == src)
if(C.wear_mask)
in_mouth = ", barely missing their nose"
. = "<span class='warning'>[user] swings their [src][in_mouth]. They light [A] in the process.</span>"
. = "<span class='warning'>[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process.</span>"
playsound(loc, hitsound, get_clamped_volume(), 1, -1)
add_fingerprint(user)
code/game/objects/items/twohanded.dm
+2 -2
View File
@@ -417,9 +417,9 @@
var/in_mouth = ""
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.wear_mask == src)
if(C.wear_mask)
in_mouth = ", barely missing their nose"
. = "<span class='warning'>[user] swings [user.p_their()] [src][in_mouth]. [user.p_they()] light[user.p_s()] [A] in the process.</span>"
. = "<span class='warning'>[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process.</span>"
playsound(loc, hitsound, get_clamped_volume(), 1, -1)
add_fingerprint(user)
// Light your candles while spinning around the room