Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes

A few fixes
This commit is contained in:
variableundefined
2018-10-12 13:48:02 +08:00
committed by GitHub
9 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -502,7 +502,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
toolspeed = 1
/obj/item/stack/cable_coil/suicide_act(mob/user)
if(locate(/obj/structure/stool) in user.loc)
if(locate(/obj/structure/chair/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")