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

Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522

Browse Source 
[MIRROR] Adds ~70 more suicides
This commit is contained in:
LetterJay
2018-01-23 10:00:04 -06:00
committed by GitHub
parent b81afc1b17 6066ab31dd
commit f26f1b5370
52 changed files with 582 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+9
View File
@@ -149,6 +149,15 @@
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
/obj/item/device/destTagger/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] begins tagging [user.p_their()] final destination! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if (islizard(user))
to_chat(user, "<span class='notice'>*HELL*</span>")//lizard nerf
else
to_chat(user, "<span class='notice'>*HEAVEN*</span>")
playsound(src, 'sound/machines/twobeep.ogg', 100, 1)
return BRUTELOSS
/obj/item/device/destTagger/proc/openwindow(mob/user)
var/dat = "<tt><center><h1><b>TagMaster 2.2</b></h1></center>"