Fully refactors Chairs, Stools & Beds. Adds a few fun bits

This commit is contained in:
Purpose
2018-09-14 18:40:42 +01:00
parent e340389c49
commit efbcd54cf2
107 changed files with 2210 additions and 2053 deletions
@@ -146,7 +146,7 @@ Doesn't work on other aliens/AI.*/
if("resin membrane")
new /obj/structure/alien/resin/membrane(loc)
if("resin nest")
new /obj/structure/stool/bed/nest(loc)
new /obj/structure/bed/nest(loc)
return
/mob/living/carbon/alien/humanoid/verb/regurgitate()
+5 -5
View File
@@ -578,14 +578,14 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/can_use_hands()
if(handcuffed)
return 0
if(buckled && ! istype(buckled, /obj/structure/stool/bed/chair)) // buckling does not restrict hands
return 0
return 1
return FALSE
if(buckled && ! istype(buckled, /obj/structure/chair)) // buckling does not restrict hands
return FALSE
return TRUE
/mob/living/carbon/restrained()
if(handcuffed)
return 1
return TRUE
return
+2 -2
View File
@@ -354,8 +354,8 @@
handle_dreams()
adjustStaminaLoss(-10)
var/comfort = 1
if(istype(buckled, /obj/structure/stool/bed))
var/obj/structure/stool/bed/bed = buckled
if(istype(buckled, /obj/structure/bed))
var/obj/structure/bed/bed = buckled
comfort+= bed.comfort
for(var/obj/item/bedsheet/bedsheet in range(loc,0))
if(bedsheet.loc != loc) //bedsheets in your backpack/neck don't give you comfort
+1 -1
View File
@@ -359,7 +359,7 @@
character.lastarea = get_area(loc)
// Moving wheelchair if they have one
if(character.buckled && istype(character.buckled, /obj/structure/stool/bed/chair/wheelchair))
if(character.buckled && istype(character.buckled, /obj/structure/chair/wheelchair))
character.buckled.loc = character.loc
character.buckled.dir = character.dir