From 88f32290fcc092a16984117880ce5f033f06fa69 Mon Sep 17 00:00:00 2001 From: Vivalas Date: Mon, 19 Jun 2017 20:45:20 -0500 Subject: [PATCH] Fixes bed offset --- .../objects/structures/stool_bed_chair_nest/bed.dm | 11 +++++++++++ .../objects/structures/stool_bed_chair_nest/chairs.dm | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 56c6861e4fc..cb2d80ba5f4 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -17,10 +17,20 @@ burntime = 30 buildstackamount = 2 var/movable = 0 // For mobility checks + var/x_offset = 0 + var/y_offset = -6 /obj/structure/stool/bed/MouseDrop(atom/over_object) ..(over_object, skip_fucking_stool_shit = 1) +/obj/structure/stool/bed/post_buckle_mob(mob/living/M) + if(M == buckled_mob) + M.pixel_y = y_offset + M.pixel_x = x_offset + else + M.pixel_y = M.get_standard_pixel_y_offset() + M.pixel_x = M.get_standard_pixel_x_offset() + /obj/structure/stool/psychbed name = "psych bed" desc = "For prime comfort during psychiatric evaluations." @@ -36,6 +46,7 @@ anchored = 0 buildstackamount = 10 buildstacktype = /obj/item/stack/sheet/wood + y_offset = 0 /obj/structure/stool/bed/dogbed/ian name = "Ian's bed" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 2b8cdd9e3ba..9bc3914b420 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -5,7 +5,7 @@ buckle_lying = 0 //you sit in a chair, not lay burn_state = FIRE_PROOF buildstackamount = 1 - + y_offset = 0 var/propelled = 0 // Check for fire-extinguisher-driven chairs /obj/structure/stool/bed/chair/New()