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
@@ -14,7 +14,7 @@
description_info = "Add a metal floor tile to build a floor on top of the lattice.<br>\
Lattices can be made by applying metal rods to a space tile."
/obj/structure/stool/bed
/obj/structure/bed
description_info = "Click and drag yourself (or anyone) to this to buckle in. Click on this with an empty hand to undo the buckles.<br>\
<br>\
Anyone with restraints, such as handcuffs, will not be able to unbuckle themselves. They must use the Resist button, or verb, to break free of \
+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>")
+1 -1
View File
@@ -106,7 +106,7 @@
return 1
else if(locate(/obj/structure/table, T))
return 0.8
else if(locate(/obj/structure/stool/bed, T))
else if(locate(/obj/structure/bed, T))
return 0.7
else
return 0.5