Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Ren Erthilo
2012-04-25 18:57:20 +01:00
2 changed files with 19 additions and 3 deletions
+2 -1
View File
@@ -759,7 +759,6 @@
desc = "Apply butt."
icon = 'objects.dmi'
icon_state = "stool"
anchored = 1.0
flags = FPRINT
pressure_resistance = 3*ONE_ATMOSPHERE
@@ -768,6 +767,7 @@
desc = "This is used to lie in, sleep in or strap on."
icon_state = "bed"
var/mob/living/buckled_mob
anchored = 1.0
/obj/structure/stool/bed/alien
name = "Resting contraption"
@@ -779,6 +779,7 @@
name = "chair"
desc = "You sit in this. Either by will or force."
icon_state = "chair"
anchored = 0
/obj/structure/stool/bed/chair/comfy
name = "comfy chair"