From c4ebe82ea7b14e95c83bf922c6cdadebd0d2322d Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Mon, 28 Dec 2020 06:22:30 +0000 Subject: [PATCH] Exceptions part 1 Curtains, Jani/Engi/Food Cart, Roller Beds, Chairs/Wheelchairs --- code/game/objects/structures/curtains.dm | 1 + code/game/objects/structures/engicart.dm | 1 + code/game/objects/structures/foodcart.dm | 1 + code/game/objects/structures/janicart.dm | 1 + code/game/objects/structures/stool_bed_chair_nest/bed.dm | 1 + code/game/objects/structures/stool_bed_chair_nest/chairs.dm | 1 + 6 files changed, 6 insertions(+) diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm index 029b0a761ad..da8b0f48476 100644 --- a/code/game/objects/structures/curtains.dm +++ b/code/game/objects/structures/curtains.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/curtain.dmi' name = "curtain" icon_state = "closed" + face_while_pulling = FALSE layer = SHOWER_CLOSED_LAYER opacity = 1 density = 0 diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index a77dc35b909..52e1d0ca8e1 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -3,6 +3,7 @@ desc = "A cart for storing engineering items." icon = 'icons/obj/engicart.dmi' icon_state = "cart" + face_while_pulling = FALSE anchored = 0 density = 1 var/obj/item/stack/sheet/glass/myglass = null diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index 3a9a3414986..0253ad66952 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -3,6 +3,7 @@ desc = "A cart for transporting food and drinks." icon = 'icons/obj/foodcart.dmi' icon_state = "cart" + face_while_pulling = FALSE anchored = 0 density = 1 //Food slots diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 58120ca4ed5..75a2d288a9e 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -7,6 +7,7 @@ icon_state = "cart" anchored = 0 density = 1 + face_while_pulling = FALSE container_type = OPENCONTAINER //copypaste sorry var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite 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 d91caa4244f..7d02e861fb2 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -64,6 +64,7 @@ name = "roller bed" icon = 'icons/obj/rollerbed.dmi' icon_state = "down" + face_while_pulling = FALSE resistance_flags = NONE anchored = FALSE comfort = 1 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 c1fe7dd7013..0c40c15d539 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -11,6 +11,7 @@ max_integrity = 250 integrity_failure = 25 buckle_offset = 0 + face_while_pulling = FALSE var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 1 var/item_chair = /obj/item/chair // if null it can't be picked up