From f148ddaf51fb05a95090cba9e2054bbdd95fe89a Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sat, 7 Dec 2024 22:45:32 +1000 Subject: [PATCH 1/5] Fix driver sit --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 3 ++- 1 file changed, 2 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 1d163702727..b6051c0e76e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -155,7 +155,8 @@ /obj/structure/bed/attackby(obj/item/I, mob/user, params) . = ..() - + if(resistance_flags && RESIST_ALL) + return if(iswrench(I)) if(!buildstacktype) return From 71a711fade763c35ba8d4a755b0e3026a678899c Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sun, 8 Dec 2024 01:35:54 +1000 Subject: [PATCH 2/5] review fix --- .../structures/stool_bed_chair_nest/bed.dm | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) 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 b6051c0e76e..30e530fbc5d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -153,20 +153,19 @@ new buildstacktype (loc, buildstackamount) qdel(src) -/obj/structure/bed/attackby(obj/item/I, mob/user, params) - . = ..() - if(resistance_flags && RESIST_ALL) +/obj/structure/bed/wrench_act(mob/living/user, obj/item/I) + if(resistance_flags & RESIST_ALL) return - if(iswrench(I)) - if(!buildstacktype) - return - - playsound(loc, 'sound/items/ratchet.ogg', 25, 1) - if(dropmetal) - new buildstacktype(loc, buildstackamount) - qdel(src) + if(!buildstacktype) + return + playsound(loc, 'sound/items/ratchet.ogg', 25, 1) + if(dropmetal) + new buildstacktype(loc, buildstackamount) + qdel(src) - else if(istype(I, /obj/item/grab) && !LAZYLEN(buckled_mobs) && !buckled_bodybag) +/obj/structure/bed/attackby(obj/item/I, mob/user, params) + . = ..() + if(istype(I, /obj/item/grab) && !LAZYLEN(buckled_mobs) && !buckled_bodybag) var/obj/item/grab/G = I if(!ismob(G.grabbed_thing)) return From 02a551c661f646c78b4a4e58e8c34c29bcfef7f5 Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sun, 8 Dec 2024 01:46:07 +1000 Subject: [PATCH 3/5] min --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- 1 file changed, 1 insertion(+), 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 30e530fbc5d..b60326bc8fe 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -153,7 +153,7 @@ new buildstacktype (loc, buildstackamount) qdel(src) -/obj/structure/bed/wrench_act(mob/living/user, obj/item/I) +/obj/structure/bed/wrench_act() if(resistance_flags & RESIST_ALL) return if(!buildstacktype) From 2ac08326659dbd99b80bc0cc2e1857718111b856 Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sun, 8 Dec 2024 04:11:50 +1000 Subject: [PATCH 4/5] rewiew fix --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 +- 1 file changed, 1 insertion(+), 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 b60326bc8fe..30e530fbc5d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -153,7 +153,7 @@ new buildstacktype (loc, buildstackamount) qdel(src) -/obj/structure/bed/wrench_act() +/obj/structure/bed/wrench_act(mob/living/user, obj/item/I) if(resistance_flags & RESIST_ALL) return if(!buildstacktype) From 691d0b015217942a19e61f3af0b3cbbb90147b2b Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sun, 8 Dec 2024 05:07:16 +1000 Subject: [PATCH 5/5] Uh yes --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 2 -- code/modules/vehicles/armored/interiors/chairs.dm | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) 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 30e530fbc5d..f97f5249979 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -154,8 +154,6 @@ qdel(src) /obj/structure/bed/wrench_act(mob/living/user, obj/item/I) - if(resistance_flags & RESIST_ALL) - return if(!buildstacktype) return playsound(loc, 'sound/items/ratchet.ogg', 25, 1) diff --git a/code/modules/vehicles/armored/interiors/chairs.dm b/code/modules/vehicles/armored/interiors/chairs.dm index bc6fe655d4e..1645d53a854 100644 --- a/code/modules/vehicles/armored/interiors/chairs.dm +++ b/code/modules/vehicles/armored/interiors/chairs.dm @@ -4,6 +4,7 @@ icon_state = "vehicle_chair" resistance_flags = RESIST_ALL dir = EAST + buildstacktype = null /obj/structure/bed/chair/vehicle_driver_seat name = "driver seat" @@ -13,6 +14,7 @@ dir = EAST ///owner of this object, assigned during interior linkage var/obj/vehicle/sealed/armored/owner + buildstacktype = null /obj/structure/bed/chair/vehicle_driver_seat/Destroy() owner = null @@ -54,6 +56,7 @@ dir = EAST ///owner of this object, assigned during interior linkage var/obj/vehicle/sealed/armored/owner + buildstacktype = null /obj/structure/bed/chair/vehicle_gunner_seat/link_interior(datum/interior/link) if(!istype(link, /datum/interior/armored)) @@ -91,6 +94,7 @@ dir = EAST ///owner of this object, assigned during interior linkage var/obj/vehicle/sealed/armored/owner + buildstacktype = null /obj/structure/bed/chair/driver_gunner_seat/link_interior(datum/interior/link) if(!istype(link, /datum/interior/armored))