cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #662 from Petethegoat/hang

Browse Source 
Nooses and table fix
This commit is contained in:
Cael Aislinn
2013-05-31 05:00:20 -07:00
parent 0d8a9e6809 dcf7c34990
commit 41364fc293
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+4 -1
View File
@@ -227,7 +227,10 @@
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
if(locate(/obj/structure/stool) in user.loc)
viewers(user) << "\red <b>[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.</b>"
else
viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return(OXYLOSS)