Fixes plastic chairs not restoring your pixel_x/pixel_y positions, DE…

…LETES ALL MENTIONS OF CAN_BUCKLE = 0, MAPPERS THE CHAIR ISSUE IS FIXED. STOP IT (#2497) * boop * shoots down some more can_buckle on maps
vlggms · Oct 22, 2024 · 8384a31 · 8384a31
1 parent 9924c27
commit 8384a31
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 42 deletions.
diff --git a/ModularTegustation/chair_override.dm b/ModularTegustation/chair_override.dm
@@ -0,0 +1,14 @@
+/obj/structure/chair/post_buckle_mob(mob/living/M)
+	. = ..()
+	M.pixel_x += pixel_x
+	M.pixel_y += pixel_y
+
+/obj/structure/chair/post_unbuckle_mob(mob/living/M)
+	. = ..()
+	M.pixel_x -= pixel_x
+	M.pixel_y -= pixel_y
+
+/obj/structure/chair/plastic/post_unbuckle_mob(mob/living/Mob)
+	. = ..()
+	Mob.pixel_x -= pixel_x
+	Mob.pixel_y -= pixel_y
diff --git a/_maps/map_files/Event/laboratory.dmm b/_maps/map_files/Event/laboratory.dmm
@@ -38,7 +38,6 @@
 	dir = 4;
 	pixel_y = 15;
 	pixel_x = -5;
-	can_buckle = 0
 	},
 /obj/structure/table/wood{
 	alpha = 0;
@@ -970,7 +969,6 @@
 "dL" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 8;
 	pixel_y = 4;
 	pixel_x = -8
@@ -2706,7 +2704,6 @@
 	},
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 8;
 	pixel_y = 4;
 	pixel_x = -6
@@ -2948,7 +2945,6 @@
 "me" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 4;
 	pixel_x = 6;
 	pixel_y = 4
@@ -5167,7 +5163,6 @@
 "vs" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 4;
 	pixel_x = 8;
 	pixel_y = 4
@@ -5431,7 +5426,6 @@
 "wy" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 8;
 	pixel_y = 4;
 	pixel_x = -8
@@ -6201,8 +6195,7 @@
 /obj/structure/chair/comfy/teal{
 	dir = 8;
 	pixel_y = 5;
-	pixel_x = 5;
-	can_buckle = 0
+	pixel_x = 5
 	},
 /obj/structure/table/wood{
 	alpha = 0;
@@ -6529,7 +6522,6 @@
 "AN" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 8;
 	pixel_y = 4;
 	pixel_x = -6
@@ -7224,17 +7216,14 @@
 "DD" = (
 /obj/structure/chair/plastic{
 	pixel_y = 12;
-	can_buckle = 0;
 	mouse_opacity = 0
 	},
 /obj/structure/chair/plastic{
 	pixel_y = 15;
-	can_buckle = 0;
 	mouse_opacity = 0
 	},
 /obj/structure/chair/plastic{
 	pixel_y = 18;
-	can_buckle = 0;
 	mouse_opacity = 0
 	},
 /obj/machinery/light{
@@ -8105,8 +8094,7 @@
 /obj/structure/chair/comfy/teal{
 	dir = 8;
 	pixel_y = 15;
-	pixel_x = 5;
-	can_buckle = 0
+	pixel_x = 5
 	},
 /obj/structure/table/wood{
 	alpha = 0;
@@ -9287,8 +9275,7 @@
 /obj/structure/chair/comfy/teal{
 	dir = 4;
 	pixel_y = 5;
-	pixel_x = -5;
-	can_buckle = 0
+	pixel_x = -5
 	},
 /obj/structure/table/wood{
 	alpha = 0;
@@ -9680,7 +9667,6 @@
 "Nh" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple{
@@ -10747,7 +10733,6 @@
 	},
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 4;
 	pixel_x = 6;
 	pixel_y = 4
@@ -11769,7 +11754,6 @@
 "Ve" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 8;
 	pixel_y = 4;
 	pixel_x = -8
@@ -12476,7 +12460,6 @@
 "Yc" = (
 /obj/structure/chair/office/light{
 	anchored = 1;
-	can_buckle = 0;
 	dir = 4;
 	pixel_x = 8;
 	pixel_y = 4

diff --git a/_maps/shuttles/deltamain_elevator.dmm b/_maps/shuttles/deltamain_elevator.dmm
@@ -75,7 +75,6 @@
 /area/shuttle/mining)
 "F" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	dir = 1
@@ -123,7 +122,6 @@
 /area/shuttle/mining)
 "U" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	dir = 1

diff --git a/_maps/shuttles/iotaextra_elevator.dmm b/_maps/shuttles/iotaextra_elevator.dmm
@@ -45,7 +45,6 @@
 /area/shuttle/mining)
 "g" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6
@@ -55,7 +54,6 @@
 "h" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -90,7 +88,6 @@
 "n" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -125,7 +122,6 @@
 /area/shuttle/mining)
 "s" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6
@@ -149,7 +145,6 @@
 /area/shuttle/mining)
 "v" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6
@@ -175,7 +170,6 @@
 /area/shuttle/mining)
 "x" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6
@@ -197,7 +191,6 @@
 /area/shuttle/mining)
 "z" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6
@@ -207,7 +200,6 @@
 "A" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -259,7 +251,6 @@
 "G" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -291,7 +282,6 @@
 "L" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -309,7 +299,6 @@
 "R" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 1
@@ -349,7 +338,6 @@
 /area/shuttle/mining)
 "X" = (
 /obj/structure/chair/comfy/shuttle{
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 6

diff --git a/_maps/shuttles/zetadeparteast_elevator.dmm b/_maps/shuttles/zetadeparteast_elevator.dmm
@@ -83,7 +83,6 @@
 "L" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat"
 	},

diff --git a/_maps/shuttles/zetadepartwest_elevator.dmm b/_maps/shuttles/zetadepartwest_elevator.dmm
@@ -20,7 +20,6 @@
 "g" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 4
@@ -46,7 +45,6 @@
 "n" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat"
 	},
@@ -73,7 +71,6 @@
 	},
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
-	can_buckle = 0;
 	desc = "A comfortable, secure seat.";
 	name = "metalic seat";
 	pixel_y = 4

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
@@ -116,14 +116,10 @@
 /obj/structure/chair/post_buckle_mob(mob/living/M)
 	. = ..()
 	handle_layer()
-	M.pixel_x += pixel_x // LOBOTOMYCORPORATION ADDITION -- BETTER CHAIRS FOR MAPPERS
-	M.pixel_y += pixel_y
 
 /obj/structure/chair/post_unbuckle_mob(mob/living/M)
 	. = ..()
 	handle_layer()
-	M.pixel_x -= pixel_x // LOBOTOMYCORPORATION ADDITION -- BETTER CHAIRS FOR MAPPERS
-	M.pixel_y -= pixel_y
 
 /obj/structure/chair/setDir(newdir)
 	..()

diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme
@@ -3960,6 +3960,7 @@
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"
 #include "interface\skin.dmf"
+#include "ModularTegustation\chair_override.dm"
 #include "ModularTegustation\engineering_bounties.dm"
 #include "ModularTegustation\harvestable_gardens.dm"
 #include "ModularTegustation\languagebooks.dm"