From 05284d7e0a32ae62e0899ffe396dd305b3e261cd Mon Sep 17 00:00:00 2001
From: evilew <mipsio117@gmail.com>
Date: Thu, 19 Dec 2024 17:49:55 +0100
Subject: [PATCH 1/8] vent clog tweak

- generally nerfed the event so it doesn't spill everywhere and it doesn't have such a heavy emphasis on mess-making chemicals
- as a future addition, we could just dillute the pool with more 'safe' chems as well tbh
---
 code/modules/events/vent_clog.dm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index ee5f4e83f3..b6af06a5f6 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -18,13 +18,13 @@
 	var/list/saferChems = list(
 		/datum/reagent/water,
 		/datum/reagent/carbon,
-		/datum/reagent/consumable/flour,
+		// /datum/reagent/consumable/flour, //GS13 remove: there's already few too many messy reagents there
 		/datum/reagent/space_cleaner,
 		/datum/reagent/consumable/nutriment,
 		/datum/reagent/consumable/condensedcapsaicin,
 		/datum/reagent/drug/mushroomhallucinogen,
 		/datum/reagent/lube,
-		/datum/reagent/glitter/pink,
+		// /datum/reagent/glitter/pink, //GS13 tweak: there's already few too many messy reagents there
 		/datum/reagent/glitter/pink_subtle, //GS13 Add: Add our subtle variants of glitter.
 		/datum/reagent/cryptobiolin,
 		//datum/reagent/toxin/plantbgone, //GS13 Remove: Annoying Reagent
@@ -42,7 +42,7 @@
 		/datum/reagent/pax,
 		/datum/reagent/consumable/laughter,
 		/datum/reagent/concentrated_barbers_aid,
-		/datum/reagent/baldium,
+		// /datum/reagent/baldium, //gs13 remove: just cruel
 		/datum/reagent/colorful_reagent,
 		/datum/reagent/peaceborg_confuse,
 		/datum/reagent/peaceborg_tire,
@@ -67,7 +67,7 @@
 	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert", has_important_message = TRUE)
 
 /datum/round_event/vent_clog/setup()
-	end_when = rand(120, 180)
+	end_when = rand(60, 120) //GS13 - length nerf
 	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
 		var/turf/T = get_turf(temp_vent)
 		var/area/A = T.loc
@@ -102,7 +102,7 @@
 		R.add_reagent(pick(saferChems), reagentsAmount)
 
 	var/datum/effect_system/smoke_spread/chem/smoke_machine/C = new
-	C.set_up(R,16,1,T)
+	C.set_up(R,5,1,T) //GS13 - tweaked size of clouds, from 16 to 5
 	C.start()
 	playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3)
 
@@ -110,7 +110,7 @@
 	name = "Clogged Vents: Threatening"
 	typepath = /datum/round_event/vent_clog/threatening
 	weight = 4
-	min_players = 18
+	min_players = 30 //gs13 tweak
 	max_occurrences = 1
 	earliest_start = 35 MINUTES
 	description = "Extra dangerous chemicals come out of the scrubbers."
@@ -123,7 +123,7 @@
 	name = "Clogged Vents: Catastrophic"
 	typepath = /datum/round_event/vent_clog/catastrophic
 	weight = 2
-	min_players = 25
+	min_players = 35 //gs13 tweak
 	max_occurrences = 1
 	earliest_start = 45 MINUTES
 	description = "EXTREMELY dangerous chemicals come out of the scrubbers."

From f3486be2928f9881cac02acae806fc1f0965d215 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:07:57 -0500
Subject: [PATCH 2/8] permafat damage

---
 GainStation13/code/mechanics/fatness.dm         | 8 ++++++++
 code/__DEFINES/combat.dm                        | 2 ++
 code/modules/mob/living/carbon/human/species.dm | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/GainStation13/code/mechanics/fatness.dm b/GainStation13/code/mechanics/fatness.dm
index b2c370571f..4315a6570a 100644
--- a/GainStation13/code/mechanics/fatness.dm
+++ b/GainStation13/code/mechanics/fatness.dm
@@ -275,3 +275,11 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/command/bridge, /area/mainten
 	var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * FAT_DAMAGE_TO_FATNESS)
 	adjust_fatness(fat_to_add, FATTENING_TYPE_WEAPON)
 	return fat_to_add
+
+/mob/living/carbon/proc/applyPermaFatnessDamage(amount)
+	if(!client?.prefs?.weight_gain_permanent) // If we cant apply permafat, apply regular fat
+		return applyFatnessDamage(amount)
+
+	var/fat_to_add = ((amount * CONFIG_GET(number/damage_multiplier)) * PERMA_FAT_DAMAGE_TO_FATNESS)
+	adjust_perma(fat_to_add, FATTENING_TYPE_WEAPON)
+	return fat_to_add
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index 4629c4a954..785c83c322 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -277,5 +277,7 @@
 
 // GS13 EDIT
 #define FAT 		"fat"
+#define PERMA_FAT 		"perma_fat"
 /// What is the rate that one damage is converted to fatness?
 #define FAT_DAMAGE_TO_FATNESS 4
+#define PERMA_FAT_DAMAGE_TO_FATNESS 4
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 5f2875df34..550d179583 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -2325,6 +2325,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		// GS13 EDIT
 		if(FAT)
 			H.applyFatnessDamage(damage * hit_percent)
+		if(PERMA_FAT)
+			H.applyPermaFatnessDamage(damage * hit_percent)
 
 	return TRUE
 

From 63dbd661e86969a5ec1f2f34ad8f8a8925a119c7 Mon Sep 17 00:00:00 2001
From: evilew <mipsio117@gmail.com>
Date: Thu, 19 Dec 2024 21:09:56 +0100
Subject: [PATCH 3/8] sec fix

double wide door in sec fix
---
 _maps/map_files/MetaStation/MetaStation.dmm | 44 +++++++++++----------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 067d02df5e..2be59b4655 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -48118,13 +48118,14 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard)
 "dMm" = (
-/obj/machinery/door/airlock/external{
-	name = "Supply Dock Airlock";
-	req_access_txt = "31"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	name = "Supply Dock Airlock";
+	req_access_txt = "31";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/cargo/storage)
 "dNK" = (
@@ -52715,6 +52716,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/airlock/security/glass{
+	id_tag = "innerbrig";
+	name = "Brig";
+	req_access_txt = "63"
+	},
 /turf/open/floor/plasteel,
 /area/security/office)
 "gzG" = (
@@ -55330,14 +55336,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/airlock/security/glass{
-	bound_width = 64;
-	doorOpen = 'sound/machines/bigairlockopen.ogg';
-	icon = 'icons/obj/doors/airlocks/station/securitydouble.dmi';
 	id_tag = "innerbrig";
-	name = "Security Office";
-	note_overlay_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi';
-	overlays_file = 'icons/obj/doors/airlocks/station/overlaysdouble.dmi';
-	req_one_access_txt = "1;4"
+	name = "Brig";
+	req_access_txt = "63"
 	},
 /turf/open/floor/plasteel,
 /area/security/office)
@@ -58988,12 +58989,13 @@
 /turf/open/floor/plasteel/dark,
 /area/commons/cryopod)
 "kff" = (
-/obj/machinery/door/airlock/external{
-	name = "Mining Dock Airlock"
-	},
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
 	dir = 4
 	},
+/obj/machinery/door/airlock/external{
+	name = "Mining Dock Airlock";
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/cargo/miningoffice)
 "kfu" = (
@@ -62043,11 +62045,12 @@
 /turf/open/floor/plating,
 /area/construction/storage_wing)
 "lQC" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 8
+	},
 /obj/machinery/door/airlock/mining/glass{
 	name = "Mining Dock";
-	req_access_txt = "48"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	req_access_txt = "48";
 	dir = 8
 	},
 /turf/open/floor/plasteel,
@@ -66379,11 +66382,12 @@
 /turf/open/floor/plating,
 /area/cargo/storage)
 "otk" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 4
+	},
 /obj/machinery/door/airlock/external{
 	name = "Supply Dock Airlock";
-	req_access_txt = "31"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	req_access_txt = "31";
 	dir = 4
 	},
 /turf/open/floor/plating,

From 2402580023471994f2bfbc9c8cb4eff5e9bd88ac Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:43:35 -0500
Subject: [PATCH 4/8] runtime fix

---
 .../code/modules/food_and_drinks/bigbottle.dm |   1 -
 GainStation13/icons/obj/device.dmi            | Bin 1182 -> 7385 bytes
 _maps/RandomRuins/SpaceRuins/spacehotel.dmm   |  11 ++++-------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm
index a04875e20e..6ab4ce01f7 100644
--- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm
+++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm
@@ -46,7 +46,6 @@
   cut_overlays()
   var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent")
   if(reagents.reagent_list.len)
-    var/datum/reagent/R = reagents.get_master_reagent()
     /*if(!renamedByPlayer)
       name = "bottle of " + R.name
       desc = R.glass_desc*/
diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi
index b4a729167769d34dce64ca079112a7c8d1886f06..6b6d86e2489fc61634e6a18ed4b987101db15807 100644
GIT binary patch
literal 7385
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

literal 1182
zcmXYt4N%f|7{~v}CcfmswOzS9gEgm^H86GBO#ZmZ#9n;El<pGAF4F5t=1T&Sf6#Mf
zw&~igFiE{-t<yBkE162-(ut*lk)~-ureLK(Vf{tk_P6=F`#s<LKKI;n-_KK?7$589
zvB?7f0IxWDOfsU1)$fKz>Jb-d7$S!g_omPk3PoZfn@px=@y<{axdZ}Hr<+%L<8*4A
zw~}0ibE~g%a}z~emnm>mI)O|jGP6W71@lamOsA9KaO4Oooynf3Cz@mgHkXH6CL)W~
zS#E&DjX)$;0p4tY5bM<{MY^c`<ah=^)lYB`b54-L%#S&ecQ`kjo1dL?0sweYMk+VA
z0A6Bn-@c#Sx@Y^=ks%eMbw7DDL^rcdwKs4O$UXOqEFvU1L=&=`Ae}kicRq!{2>dE6
z_%FX7$}2*?ZolqLWGnltQ~!|EcyQ2RR~z(xsU;KNP1FZ=M*lop(^vg_T?R0In!^!h
z?*78^@75sM%HN_=SAe)b&JkGlN(=z#q_~*q6rOak1}eHl{=7`n`>@$ZgX`THzGQ{&
zpJ&qhrahZwepCF#N|03|O0F|ZZ~hX&x$zG}&l29BuJJnikn(P6rkyz3Zrjpx-?U+m
zt-|KtqkUdyG|`eSjFsIY&+4x(^a#)1=q6s>HiyL?;LP=N7{_N*58Nq8&k6A1vCOQd
z=FDzAd~?_wMB^W?B(*|G0t^$L8q);neA!Q(e)2buk3BioUi;xkxK>cyRQmd~*E$a7
z(u8<)$elSXC=w6Ft;fi8E<Xiu`JQiY0)?U`-o6ZKleJK}_$f~nRaKJK0gL1hIyRVt
zY-xma(h9bGUqQcrP!8*gdo>>cT762%goUC<x0&r@dbE%N8jaPY=@(ZFRtdJ@vXdmm
zX3^%1X_J1JwWJ5%8pa_-m#|i;-DCXZsOIPnEhL3qaVHhg{ZlL3pIu8($GjLqN!-zS
zs8D0rOF7B~WUKo`hjxi9C`>ptsXMJ9BfKYE3-OC_QQ83^L2$Ry@_!6K2l}5x9Cbm6
zw~IeU$~HLXvGt(H0j!|2t@EoX*Ji7N+svniFqsDHJhpEH4#v|Xov{#LM=fF0c=}YV
z3Tds40yxh}F!#fsukZ&QwVfS4T#I!_0*t=E@5GZ0!-M6)5UH>$z4~I#lRL)`ez>bO
z-YmWHNS+04F7}n!<WVEb%GWe=mtC`C@^BuP@(6Dl$5_!PPRT%WOTY^Hp5PX!4oiO=
zY)7dunq!80cJb(Ec5yGmE)GwCF`X^ho34R63tRX`7{S8JJz$J$0;|3vEd{EN3{B5#
zu%a2@)80mk8gDw)3aW1pwCq&F)LaM0!R43F+oB3ceQigV>#sLzUWN{88SsXS@;a4a
zUDO(!i1?A7YXR$2Dr=G66AzEB9>(#T1(?K}4Cr2)!`ED9dA}qSy<<`EBgoAu(r+?`
zH%f%gL(k@nF%a970x9OK&mE#EXxZr;u$yZauslmqE2tA9kb+D_Fs~8O{vz7)ZF5oB
oB6gRc7zZMY6ze0Ax|&4!YuXlVUE4<gnYmRPM~jbX`JP?!ACw0<{r~^~

diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index c5231c015a..ce834d885a 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -528,7 +528,7 @@
 "km" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/security)
 "kn" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security)
 "ko" = (/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
-"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
+"kp" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/window{dir = 1; icon_state = "window"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "kq" = (/obj/machinery/suit_storage_unit/standard_unit,/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power)
 "kr" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "0-8"},/obj/structure/sign/warning/electricshock{pixel_y = -32},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power)
 "ks" = (/obj/machinery/power/smes/engineering,/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel,/area/ruin/space/has_grav/hotel/power)
@@ -683,7 +683,6 @@
 "no" = (/obj/machinery/door/airlock{dir = 4; name = "Men's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool)
 "np" = (/obj/structure/table,/obj/item/reagent_containers/rag/towel{pixel_x = 4; pixel_y = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool)
 "nq" = (/obj/structure/table,/obj/item/card/id/away/hotel/securty,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/security)
-"nr" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "ns" = (/obj/machinery/door/airlock{dir = 4; name = "Women's Changing"},/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/structure/curtain,/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool)
 "nt" = (/obj/machinery/door/airlock{dir = 4; name = "Custodial Closet"; req_access_txt = "200,201"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/hotel/custodial)
 "nu" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/hotel/dock)
@@ -715,7 +714,7 @@
 "pD" = (/obj/effect/turf_decal/tile/purple,/turf/open/pool,/area/ruin/space/has_grav/hotel/pool)
 "pV" = (/obj/structure/mirror{pixel_y = 32},/obj/structure/sink{pixel_y = 24},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6)
 "qs" = (/obj/machinery/vending/autodrobe/all_access,/turf/open/floor/wood,/area/ruin/space/has_grav/hotel/dock)
-"qC" = (/obj/machinery/vending/clothing{credits = 50},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
+"qC" = (/obj/machinery/vending/clothing,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "qW" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool)
 "rd" = (/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/space/has_grav/hotel/pool)
 "rs" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool)
@@ -767,13 +766,11 @@
 "EG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/machinery/vending/mealdor,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "EY" = (/obj/structure/toilet{dir = 4},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6)
 "Fh" = (/obj/machinery/pool/controller,/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 8},/turf/open/floor/plasteel/yellowsiding,/area/ruin/space/has_grav/hotel/pool)
-"FH" = (/obj/structure/window,/obj/structure/chair/comfy/blue{dir = 8},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "Gg" = (/obj/machinery/deepfryer,/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/hotel/bar)
 "Gj" = (/obj/effect/overlay/palmtree_l,/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ywflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool)
 "Gk" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/reagent_dispensers/water_cooler,/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "Gz" = (/obj/machinery/door/window/eastleft{dir = 1},/obj/effect/turf_decal/loading_area{dir = 5; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/guestroom/room_6)
 "GA" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/showroomfloor,/area/ruin/space/has_grav/hotel/pool)
-"GG" = (/obj/structure/window{dir = 1; icon_state = "window"},/obj/structure/chair/comfy/blue{dir = 4},/turf/open/floor/plasteel/white,/area/ruin/space/has_grav/hotel/pool)
 "HU" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/obj/machinery/light,/turf/open/floor/grass,/area/ruin/space/has_grav/hotel/pool)
 "IF" = (/turf/open/pool,/area/ruin/space/has_grav/hotel/pool)
 "IN" = (/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/hotel/pool)
@@ -880,7 +877,7 @@ aaaaaaaaabaaajiriHiIiJiJiKiLircQfifihIfifihUfifififififififiamamamamamamameTmWeT
 aaaaaaaaabaaajiriRiIiSiSiKiTirhPcJiUiVcJcJiWcJcJcJcJcJhQcJcJcJcJiYiZcJcJnLjamZjanajcjdeGjeeWgKNrgyeWzwjfgKNrgyjheGgfaaaaababaaaaaaaaaa
 aaaaaaaaabaaajirjijjjkjliKjmjnjojojpjqjojojrjGjojojpnbhfjtjtjtjtjtjtjtjtjtjtncjvndjxjtjtjtjtjtjtjyjtjtfreGeGeGeGeGgfaaabaaaaaaaaaaaaaa
 aaaaaaaaabaaajirjAjBiKjCjDjEjFjGjHjIjJjKjLjGjMjNjOjPckcQjQnvwsVXUcAhjTrsnvnfDrqCngDrjZneAhUcVXBfkanvjQgWgAgAhwjQaaaaaaabaaaaaaaaaaaaaa
-aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokoGGwekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa
+aaaaaaaaabacajkbkckdkekfiKiKkgjGkhkikjkkklkmknknknjPbLcQjQEGyfWHGkkokokokokUkUkUnkkUkokokokokowekpyBjQkFluluXPjQaaaaaaabaaaaaaaaaaaaaa
 aaaaaaaaabaaajirkqkrksktkukvkwjGkxkykzkAklkBknknkCjPawcQjQMykUkUlPnhnhnhnhnhnhnhninhnhnhnhnhrdkUkGnnMFlululuINjQaaaaaaabaaaaaaaaaaaaaa
 aaaaaaaaabaaajirkHkHkHkIkHkHkJjGkKkkkLkMkNkmkOkPknjPawcQjQMynzlPYxnynynynyAonyFhkRpikSkSkSkSONVlnAsxjQjQjQjQjQjQacacacabaaaaaaaaaaaaaa
 aaaaaaaaabaaajirkVkWkXkYkZkHlajGlbkklcldkljGlelflgjPawcQjQbMjbfbZSLKljNnNnAMNnNnNnAMNnNnNnliKiVNjbnnjQlmlnlnlojQaaaaaaabaaaaaaaaaaaaaa
@@ -894,7 +891,7 @@ abaclVlWlWlWlWlXlYlYlYlYlZacacjGjGjGjGjGjGjGjGjGjGjPcQmajQMynzlhZSUtIFIFIFIFIFnO
 abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmemfmgmhmimjmkmlmmcQckjQbMjbfbZSzQtetetenmtetetenmteteteltKiVNjRnnnslHlHlHlHjQaaaaabaaaaaaaaaaaaaaaa
 abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmlmlmlmompmpmpmqhfcvjtmrnzwBEknjnjnjnjIQnjnjnjIQnjnjnjnjsonxkUnnjQmsOcOcmtjQaaaaabaaaaaaaaaaaaaaaa
 abaclVlWlWlWlWlXlYlYlYlYlZacacacmdmlmlmlmumvmvmvmwntmymznMmBkTkUwBjSjSjSjSjSjSjSjSjSjSjSjSjSnxkUkULEjQlmlululojQacacabaaaaaaaaaaaaaaaa
-abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQnrVhFHkQkUkUkUkQkQkQkUkUkUkQnrVhFHkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa
+abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmlmEmFmGmHmImlmJmdawedjQSOkQkQVhkQkQkUkUkUkQkQkQkUkUkUkQkQVhkQkQUqjQlmlululojQaaaaabaaaaaaaaaaaaaaaa
 abaaaaaaaaaaaaajaaaaaaaaaaaaaaaamdmdmdmdmdmdmdmdmdmdawfgjQnvxXvrHUxAnvPEfLoJnvGjnvoJmLDwnvnwhXqWBfnvjQlmlululojQaaaaabaaaaaaaaaaaaaaaa
 abaclVlWlWlWlWlXlYlYlYlYlZacacacacacaaaaaaaaacaaaaamamamjQjQjQmNmNmNmNjQjQmNmNmNmNmNjQjQmNmNmNmNjQjQjQjQjQjQjQjQaaaaabaaaaaaaaaaaaaaaa
 abaaaaaaaaaaaaajaaaaaaaaaaaaaaaaaaacaaaaaaaaacaaaaaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaacaaaaaaaaaaaaacaaaaabaaaaaaaaaaaaaaaa

From 20f4a1b699f27034e141f2872cca4c5bc91ff5fe Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:51:43 -0500
Subject: [PATCH 5/8] Update DeltaStation2.dmm

---
 _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8efd2b2683..a694c9b392 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -62,14 +62,14 @@
 /turf/open/floor/plating)
 "aas" = (
 /obj/docking_port/stationary/random{
-	id = "pod_lavaland1";
+	shuttle_id = "pod_lavaland1";
 	name = "lavaland"
 	},
 /turf/open/space,
 /area/space/nearstation)
 "aat" = (
 /obj/docking_port/stationary/random{
-	id = "pod_lavaland2";
+	shuttle_id = "pod_lavaland2";
 	name = "lavaland"
 	},
 /turf/open/space,

From b9a644d8a4782ddce5a33cd832fe970b9db1b076 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:00:15 -0500
Subject: [PATCH 6/8] Update DeltaStation2.dmm

---
 _maps/map_files/Deltastation/DeltaStation2.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index a694c9b392..5831767eda 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -392,7 +392,7 @@
 	dir = 2;
 	dwidth = 4;
 	height = 17;
-	id = "arrivals_stationary";
+	shuttle_id = "arrivals_stationary";
 	name = "delta arrivals";
 	roundstart_template = /datum/map_template/shuttle/arrival/delta;
 	width = 9

From e98de30e8b873ba11abd21a7c77037da92783873 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:16:30 -0500
Subject: [PATCH 7/8] moves some files so that CI doesn't scream at us as much

---
 .../old_map_backups}/gs_maps/BoxStation/BoxStation.dmm            | 0
 .../old_map_backups}/gs_maps/Deltastation/DeltaStation2.dmm       | 0
 .../old_map_backups}/gs_maps/KiloStation/KiloStation.dmm          | 0
 .../old_map_backups}/gs_maps/LayeniaStation/LayeniaStation.dmm    | 0
 .../old_map_backups}/gs_maps/MetaStation/MetaStation.dmm          | 0
 .../old_map_backups}/gs_maps/Mining/Lavaland.dmm                  | 0
 .../old_map_backups}/gs_maps/Mining/Lavaland_Demone.dmm           | 0
 .../old_map_backups}/gs_maps/Mining/Lavaland_Lower.dmm            | 0
 .../old_map_backups}/gs_maps/OmegaStation/OmegaStation.dmm        | 0
 .../old_map_backups}/gs_maps/OmegaStation/job_changes.dm          | 0
 .../old_map_backups}/gs_maps/PubbyStation/PubbyStation.dmm        | 0
 .../old_map_backups}/gs_maps/PubbyStation/job_changes.dm          | 0
 .../Lavaland/MiningStation/Mining_Station_Public_01.dmm           | 0
 .../gs_maps/SyndieBoxStation/SyndieBoxStation.dmm                 | 0
 .../old_map_backups}/gs_maps/debug/multiz.dmm                     | 0
 .../old_map_backups}/gs_maps/debug/runtimestation.dmm             | 0
 .../old_map_backups}/gs_maps/generic/CentCom.dmm                  | 0
 .../old_map_backups}/gs_maps/generic/City_of_Cogs.dmm             | 0
 .../old_map_backups}/gs_maps/generic/SpaceDock.dmm                | 0
 .../old_map_backups}/gs_maps/gs13/Fast_Food.dmm                   | 0
 .../old_map_backups}/gs_maps/gs13/GS13_beach.dmm                  | 0
 .../old_map_backups}/gs_maps/hyper/Diner.dmm                      | 0
 .../old_map_backups}/map_files/BoxStation/BoxStation.dmm          | 0
 .../old_map_backups}/map_files/CogStation/CogStation.dmm          | 0
 .../old_map_backups}/map_files/CogStation/job_changes.dm          | 0
 .../old_map_backups}/map_files/Deltastation/DeltaStation2.dmm     | 0
 .../old_map_backups}/map_files/FestiveBall/FestiveStation.dmm     | 0
 .../old_map_backups}/map_files/FestiveBall/doorButtonOrganizer.dm | 0
 .../old_map_backups}/map_files/KiloStation/KiloStation.dmm        | 0
 .../old_map_backups}/map_files/LambdaStation/dorms.dmm            | 0
 .../old_map_backups}/map_files/LambdaStation/lambda.dmm           | 0
 .../old_map_backups}/map_files/Mafia/mafia_ayylmao.dmm            | 0
 .../old_map_backups}/map_files/Mafia/mafia_ball.dmm               | 0
 .../old_map_backups}/map_files/Mafia/mafia_gothic.dmm             | 0
 .../old_map_backups}/map_files/Mafia/mafia_lavaland.dmm           | 0
 .../old_map_backups}/map_files/Mafia/mafia_reebe.dmm              | 0
 .../old_map_backups}/map_files/Mafia/mafia_snow.dmm               | 0
 .../old_map_backups}/map_files/Mafia/mafia_spiderclan.dmm         | 0
 .../old_map_backups}/map_files/Mafia/mafia_syndie.dmm             | 0
 .../old_map_backups}/map_files/MetaStation/MetaStation.dmm        | 0
 .../old_map_backups}/map_files/Mining/Lavaland.dmm                | 0
 .../old_map_backups}/map_files/Mining/Lavaland_Demone.dmm         | 0
 .../old_map_backups}/map_files/Mining/Lavaland_Lower.dmm          | 0
 .../old_map_backups}/map_files/OmegaStation/OmegaStation.dmm      | 0
 .../old_map_backups}/map_files/OmegaStation/job_changes.dm        | 0
 .../old_map_backups}/map_files/PubbyStation/PubbyStation.dmm      | 0
 .../old_map_backups}/map_files/PubbyStation/job_changes.dm        | 0
 .../old_map_backups}/map_files/Snaxi/Snaxi.dmm                    | 0
 .../old_map_backups}/map_files/SpookyStation/SpookyStation.dmm    | 0
 .../map_files/SpookyStation/halloweenPersiWork.dm                 | 0
 .../old_map_backups}/map_files/SpookyStation/job_changes.dm       | 0
 .../map_files/SyndicateStation/SyndicateBoxStation.dmm            | 0
 .../old_map_backups}/map_files/debug/multiz.dmm                   | 0
 .../old_map_backups}/map_files/debug/runtimestation.dmm           | 0
 .../old_map_backups}/map_files/generic/CentCom.dmm                | 0
 .../old_map_backups}/map_files/generic/City_of_Cogs.dmm           | 0
 .../old_map_backups}/map_files/generic/SpaceDock.dmm              | 0
 .../old_map_backups}/map_files/gs13/Fast_Food.dmm                 | 0
 .../old_map_backups}/map_files/hyper/Diner.dmm                    | 0
 59 files changed, 0 insertions(+), 0 deletions(-)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/BoxStation/BoxStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Deltastation/DeltaStation2.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/KiloStation/KiloStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/LayeniaStation/LayeniaStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/MetaStation/MetaStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland_Demone.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/Mining/Lavaland_Lower.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/OmegaStation/OmegaStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/OmegaStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/PubbyStation/PubbyStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/PubbyStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/debug/multiz.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/debug/runtimestation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/CentCom.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/City_of_Cogs.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/generic/SpaceDock.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/gs13/Fast_Food.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/gs13/GS13_beach.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/gs_maps/hyper/Diner.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/BoxStation/BoxStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/CogStation/CogStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/CogStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Deltastation/DeltaStation2.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/FestiveBall/FestiveStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/FestiveBall/doorButtonOrganizer.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/KiloStation/KiloStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/LambdaStation/dorms.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/LambdaStation/lambda.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_ayylmao.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_ball.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_gothic.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_lavaland.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_reebe.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_snow.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_spiderclan.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mafia/mafia_syndie.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/MetaStation/MetaStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland_Demone.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Mining/Lavaland_Lower.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/OmegaStation/OmegaStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/OmegaStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/PubbyStation/PubbyStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/PubbyStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/Snaxi/Snaxi.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/SpookyStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/halloweenPersiWork.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SpookyStation/job_changes.dm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/SyndicateStation/SyndicateBoxStation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/debug/multiz.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/debug/runtimestation.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/CentCom.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/City_of_Cogs.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/generic/SpaceDock.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/gs13/Fast_Food.dmm (100%)
 rename {_maps/old_backups => backup_files/old_map_backups}/map_files/hyper/Diner.dmm (100%)

diff --git a/_maps/old_backups/gs_maps/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/BoxStation/BoxStation.dmm
rename to backup_files/old_map_backups/gs_maps/BoxStation/BoxStation.dmm
diff --git a/_maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/Deltastation/DeltaStation2.dmm
rename to backup_files/old_map_backups/gs_maps/Deltastation/DeltaStation2.dmm
diff --git a/_maps/old_backups/gs_maps/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/KiloStation/KiloStation.dmm
rename to backup_files/old_map_backups/gs_maps/KiloStation/KiloStation.dmm
diff --git a/_maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm b/backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/LayeniaStation/LayeniaStation.dmm
rename to backup_files/old_map_backups/gs_maps/LayeniaStation/LayeniaStation.dmm
diff --git a/_maps/old_backups/gs_maps/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/MetaStation/MetaStation.dmm
rename to backup_files/old_map_backups/gs_maps/MetaStation/MetaStation.dmm
diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/Mining/Lavaland.dmm
rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland.dmm
diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/Mining/Lavaland_Demone.dmm
rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Demone.dmm
diff --git a/_maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/Mining/Lavaland_Lower.dmm
rename to backup_files/old_map_backups/gs_maps/Mining/Lavaland_Lower.dmm
diff --git a/_maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/OmegaStation/OmegaStation.dmm
rename to backup_files/old_map_backups/gs_maps/OmegaStation/OmegaStation.dmm
diff --git a/_maps/old_backups/gs_maps/OmegaStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/gs_maps/OmegaStation/job_changes.dm
rename to backup_files/old_map_backups/gs_maps/OmegaStation/job_changes.dm
diff --git a/_maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/PubbyStation/PubbyStation.dmm
rename to backup_files/old_map_backups/gs_maps/PubbyStation/PubbyStation.dmm
diff --git a/_maps/old_backups/gs_maps/PubbyStation/job_changes.dm b/backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/gs_maps/PubbyStation/job_changes.dm
rename to backup_files/old_map_backups/gs_maps/PubbyStation/job_changes.dm
diff --git a/_maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm b/backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm
rename to backup_files/old_map_backups/gs_maps/RandomRuins/StationRuins/Lavaland/MiningStation/Mining_Station_Public_01.dmm
diff --git a/_maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm b/backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm
rename to backup_files/old_map_backups/gs_maps/SyndieBoxStation/SyndieBoxStation.dmm
diff --git a/_maps/old_backups/gs_maps/debug/multiz.dmm b/backup_files/old_map_backups/gs_maps/debug/multiz.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/debug/multiz.dmm
rename to backup_files/old_map_backups/gs_maps/debug/multiz.dmm
diff --git a/_maps/old_backups/gs_maps/debug/runtimestation.dmm b/backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/debug/runtimestation.dmm
rename to backup_files/old_map_backups/gs_maps/debug/runtimestation.dmm
diff --git a/_maps/old_backups/gs_maps/generic/CentCom.dmm b/backup_files/old_map_backups/gs_maps/generic/CentCom.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/generic/CentCom.dmm
rename to backup_files/old_map_backups/gs_maps/generic/CentCom.dmm
diff --git a/_maps/old_backups/gs_maps/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/generic/City_of_Cogs.dmm
rename to backup_files/old_map_backups/gs_maps/generic/City_of_Cogs.dmm
diff --git a/_maps/old_backups/gs_maps/generic/SpaceDock.dmm b/backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/generic/SpaceDock.dmm
rename to backup_files/old_map_backups/gs_maps/generic/SpaceDock.dmm
diff --git a/_maps/old_backups/gs_maps/gs13/Fast_Food.dmm b/backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/gs13/Fast_Food.dmm
rename to backup_files/old_map_backups/gs_maps/gs13/Fast_Food.dmm
diff --git a/_maps/old_backups/gs_maps/gs13/GS13_beach.dmm b/backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/gs13/GS13_beach.dmm
rename to backup_files/old_map_backups/gs_maps/gs13/GS13_beach.dmm
diff --git a/_maps/old_backups/gs_maps/hyper/Diner.dmm b/backup_files/old_map_backups/gs_maps/hyper/Diner.dmm
similarity index 100%
rename from _maps/old_backups/gs_maps/hyper/Diner.dmm
rename to backup_files/old_map_backups/gs_maps/hyper/Diner.dmm
diff --git a/_maps/old_backups/map_files/BoxStation/BoxStation.dmm b/backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/BoxStation/BoxStation.dmm
rename to backup_files/old_map_backups/map_files/BoxStation/BoxStation.dmm
diff --git a/_maps/old_backups/map_files/CogStation/CogStation.dmm b/backup_files/old_map_backups/map_files/CogStation/CogStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/CogStation/CogStation.dmm
rename to backup_files/old_map_backups/map_files/CogStation/CogStation.dmm
diff --git a/_maps/old_backups/map_files/CogStation/job_changes.dm b/backup_files/old_map_backups/map_files/CogStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/map_files/CogStation/job_changes.dm
rename to backup_files/old_map_backups/map_files/CogStation/job_changes.dm
diff --git a/_maps/old_backups/map_files/Deltastation/DeltaStation2.dmm b/backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Deltastation/DeltaStation2.dmm
rename to backup_files/old_map_backups/map_files/Deltastation/DeltaStation2.dmm
diff --git a/_maps/old_backups/map_files/FestiveBall/FestiveStation.dmm b/backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/FestiveBall/FestiveStation.dmm
rename to backup_files/old_map_backups/map_files/FestiveBall/FestiveStation.dmm
diff --git a/_maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm b/backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm
similarity index 100%
rename from _maps/old_backups/map_files/FestiveBall/doorButtonOrganizer.dm
rename to backup_files/old_map_backups/map_files/FestiveBall/doorButtonOrganizer.dm
diff --git a/_maps/old_backups/map_files/KiloStation/KiloStation.dmm b/backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/KiloStation/KiloStation.dmm
rename to backup_files/old_map_backups/map_files/KiloStation/KiloStation.dmm
diff --git a/_maps/old_backups/map_files/LambdaStation/dorms.dmm b/backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm
similarity index 100%
rename from _maps/old_backups/map_files/LambdaStation/dorms.dmm
rename to backup_files/old_map_backups/map_files/LambdaStation/dorms.dmm
diff --git a/_maps/old_backups/map_files/LambdaStation/lambda.dmm b/backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm
similarity index 100%
rename from _maps/old_backups/map_files/LambdaStation/lambda.dmm
rename to backup_files/old_map_backups/map_files/LambdaStation/lambda.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_ayylmao.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_ayylmao.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_ball.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_ball.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_ball.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_gothic.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_gothic.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_gothic.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_lavaland.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_lavaland.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_lavaland.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_reebe.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_reebe.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_reebe.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_snow.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_snow.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_snow.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_spiderclan.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_spiderclan.dmm
diff --git a/_maps/old_backups/map_files/Mafia/mafia_syndie.dmm b/backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mafia/mafia_syndie.dmm
rename to backup_files/old_map_backups/map_files/Mafia/mafia_syndie.dmm
diff --git a/_maps/old_backups/map_files/MetaStation/MetaStation.dmm b/backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/MetaStation/MetaStation.dmm
rename to backup_files/old_map_backups/map_files/MetaStation/MetaStation.dmm
diff --git a/_maps/old_backups/map_files/Mining/Lavaland.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mining/Lavaland.dmm
rename to backup_files/old_map_backups/map_files/Mining/Lavaland.dmm
diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Demone.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mining/Lavaland_Demone.dmm
rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Demone.dmm
diff --git a/_maps/old_backups/map_files/Mining/Lavaland_Lower.dmm b/backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Mining/Lavaland_Lower.dmm
rename to backup_files/old_map_backups/map_files/Mining/Lavaland_Lower.dmm
diff --git a/_maps/old_backups/map_files/OmegaStation/OmegaStation.dmm b/backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/OmegaStation/OmegaStation.dmm
rename to backup_files/old_map_backups/map_files/OmegaStation/OmegaStation.dmm
diff --git a/_maps/old_backups/map_files/OmegaStation/job_changes.dm b/backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/map_files/OmegaStation/job_changes.dm
rename to backup_files/old_map_backups/map_files/OmegaStation/job_changes.dm
diff --git a/_maps/old_backups/map_files/PubbyStation/PubbyStation.dmm b/backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/PubbyStation/PubbyStation.dmm
rename to backup_files/old_map_backups/map_files/PubbyStation/PubbyStation.dmm
diff --git a/_maps/old_backups/map_files/PubbyStation/job_changes.dm b/backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/map_files/PubbyStation/job_changes.dm
rename to backup_files/old_map_backups/map_files/PubbyStation/job_changes.dm
diff --git a/_maps/old_backups/map_files/Snaxi/Snaxi.dmm b/backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm
similarity index 100%
rename from _maps/old_backups/map_files/Snaxi/Snaxi.dmm
rename to backup_files/old_map_backups/map_files/Snaxi/Snaxi.dmm
diff --git a/_maps/old_backups/map_files/SpookyStation/SpookyStation.dmm b/backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/SpookyStation/SpookyStation.dmm
rename to backup_files/old_map_backups/map_files/SpookyStation/SpookyStation.dmm
diff --git a/_maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm b/backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm
similarity index 100%
rename from _maps/old_backups/map_files/SpookyStation/halloweenPersiWork.dm
rename to backup_files/old_map_backups/map_files/SpookyStation/halloweenPersiWork.dm
diff --git a/_maps/old_backups/map_files/SpookyStation/job_changes.dm b/backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm
similarity index 100%
rename from _maps/old_backups/map_files/SpookyStation/job_changes.dm
rename to backup_files/old_map_backups/map_files/SpookyStation/job_changes.dm
diff --git a/_maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm b/backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm
rename to backup_files/old_map_backups/map_files/SyndicateStation/SyndicateBoxStation.dmm
diff --git a/_maps/old_backups/map_files/debug/multiz.dmm b/backup_files/old_map_backups/map_files/debug/multiz.dmm
similarity index 100%
rename from _maps/old_backups/map_files/debug/multiz.dmm
rename to backup_files/old_map_backups/map_files/debug/multiz.dmm
diff --git a/_maps/old_backups/map_files/debug/runtimestation.dmm b/backup_files/old_map_backups/map_files/debug/runtimestation.dmm
similarity index 100%
rename from _maps/old_backups/map_files/debug/runtimestation.dmm
rename to backup_files/old_map_backups/map_files/debug/runtimestation.dmm
diff --git a/_maps/old_backups/map_files/generic/CentCom.dmm b/backup_files/old_map_backups/map_files/generic/CentCom.dmm
similarity index 100%
rename from _maps/old_backups/map_files/generic/CentCom.dmm
rename to backup_files/old_map_backups/map_files/generic/CentCom.dmm
diff --git a/_maps/old_backups/map_files/generic/City_of_Cogs.dmm b/backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm
similarity index 100%
rename from _maps/old_backups/map_files/generic/City_of_Cogs.dmm
rename to backup_files/old_map_backups/map_files/generic/City_of_Cogs.dmm
diff --git a/_maps/old_backups/map_files/generic/SpaceDock.dmm b/backup_files/old_map_backups/map_files/generic/SpaceDock.dmm
similarity index 100%
rename from _maps/old_backups/map_files/generic/SpaceDock.dmm
rename to backup_files/old_map_backups/map_files/generic/SpaceDock.dmm
diff --git a/_maps/old_backups/map_files/gs13/Fast_Food.dmm b/backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm
similarity index 100%
rename from _maps/old_backups/map_files/gs13/Fast_Food.dmm
rename to backup_files/old_map_backups/map_files/gs13/Fast_Food.dmm
diff --git a/_maps/old_backups/map_files/hyper/Diner.dmm b/backup_files/old_map_backups/map_files/hyper/Diner.dmm
similarity index 100%
rename from _maps/old_backups/map_files/hyper/Diner.dmm
rename to backup_files/old_map_backups/map_files/hyper/Diner.dmm

From 3ffca10009d8c0cd1cfb885a26c6a11d76ad2b07 Mon Sep 17 00:00:00 2001
From: Metis <100518708+sheepishgoat@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:45:54 -0500
Subject: [PATCH 8/8] Update DeltaStation2.dmm

---
 _maps/map_files/Deltastation/DeltaStation2.dmm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 5831767eda..6a467ccfa8 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -1454,7 +1454,7 @@
 	dir = 8;
 	dwidth = 12;
 	height = 17;
-	id = "syndicate_ne";
+	shuttle_id = "syndicate_ne";
 	name = "northeast of station";
 	width = 23
 	},
@@ -1465,7 +1465,7 @@
 	dir = 8;
 	dwidth = 11;
 	height = 15;
-	id = "whiteship_home";
+	shuttle_id = "whiteship_home";
 	name = "SS13: Auxiliary Dock, Station-Fore";
 	width = 32
 	},
@@ -1777,7 +1777,7 @@
 	dir = 1;
 	dwidth = 2;
 	height = 13;
-	id = "ferry_home";
+	shuttle_id = "ferry_home";
 	name = "port bay 2";
 	width = 5
 	},
@@ -12461,7 +12461,7 @@
 	dir = 4;
 	dwidth = 4;
 	height = 7;
-	id = "supply_home";
+	shuttle_id = "supply_home";
 	name = "Cargo Bay";
 	width = 12
 	},
@@ -26243,7 +26243,7 @@
 "bbz" = (
 /obj/docking_port/stationary/random{
 	dir = 4;
-	id = "pod_lavaland4";
+	shuttle_id = "pod_lavaland4";
 	name = "lavaland"
 	},
 /turf/open/space,
@@ -29021,7 +29021,7 @@
 	dir = 4;
 	dwidth = 3;
 	height = 5;
-	id = "mining_home";
+	shuttle_id = "mining_home";
 	name = "mining shuttle bay";
 	roundstart_template = /datum/map_template/shuttle/mining/delta;
 	width = 7
@@ -39820,7 +39820,7 @@
 	dir = 8;
 	dwidth = 2;
 	height = 5;
-	id = "laborcamp_home";
+	shuttle_id = "laborcamp_home";
 	name = "fore bay 1";
 	roundstart_template = /datum/map_template/shuttle/labour/delta;
 	width = 9
@@ -113910,7 +113910,7 @@
 	dir = 4;
 	dwidth = 11;
 	height = 18;
-	id = "emergency_home";
+	shuttle_id = "emergency_home";
 	name = "DeltaStation emergency evac bay";
 	width = 30
 	},
@@ -118015,7 +118015,7 @@
 	dir = 4;
 	dwidth = 4;
 	height = 9;
-	id = "aux_base_zone";
+	shuttle_id = "aux_base_zone";
 	name = "aux base zone";
 	roundstart_template = /datum/map_template/shuttle/aux_base/default;
 	width = 9