cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes beds occasionally buckling in odd directions

Browse Source
This commit is contained in:
Hubblenaut
2015-09-19 15:27:24 +02:00
parent 0f30018331
commit 4eef7ab65d
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/buckling.dm
View File

@@ -1,6 +1,7 @@
/obj /obj
var/can_buckle = 0 var/can_buckle = 0
var/buckle_movable = 0 var/buckle_movable = 0
var/buckle_dir = 0
var/buckle_lying = -1 //bed-like behavior, forces mob.lying = buckle_lying if != -1 var/buckle_lying = -1 //bed-like behavior, forces mob.lying = buckle_lying if != -1
var/buckle_require_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes var/buckle_require_restraints = 0 //require people to be handcuffed before being able to buckle. eg: pipes
var/mob/living/buckled_mob = null var/mob/living/buckled_mob = null
@@ -31,7 +32,7 @@
M.buckled = src M.buckled = src
M.facing_dir = null M.facing_dir = null
M.set_dir(dir) M.set_dir(buckle_dir ? buckle_dir : dir)
M.update_canmove() M.update_canmove()
buckled_mob = M buckled_mob = M
post_buckle_mob(M) post_buckle_mob(M)

1
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -15,6 +15,7 @@
pressure_resistance = 15 pressure_resistance = 15
anchored = 1 anchored = 1
can_buckle = 1 can_buckle = 1
buckle_dir = SOUTH
buckle_lying = 1 buckle_lying = 1
var/material/material var/material/material
var/material/padding_material var/material/padding_material

1
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -4,6 +4,7 @@
icon_state = "chair_preview" icon_state = "chair_preview"
color = "#666666" color = "#666666"
base_icon = "chair" base_icon = "chair"
buckle_dir = 0
buckle_lying = 0 //force people to sit up in chairs when buckled buckle_lying = 0 //force people to sit up in chairs when buckled
var/propelled = 0 // Check for fire-extinguisher-driven chairs var/propelled = 0 // Check for fire-extinguisher-driven chairs