From a077e143b3a8aeadf8df49e2b861831b80e66a5b Mon Sep 17 00:00:00 2001
From: Sara <SaraSayomi@users.noreply.github.com>
Date: Fri, 13 Sep 2024 19:19:06 -0600
Subject: [PATCH 1/3] Fixes to shuttles and other merge conflicts

---
 _maps/map_files/BoxStation/BoxStation.dmm     |  48 +----
 _maps/map_files/CogStation/CogStation.dmm     | 200 ++----------------
 .../map_files/Deltastation/DeltaStation2.dmm  |  25 ---
 _maps/map_files/IceBox/IceBoxStation.dmm      |  33 ---
 _maps/map_files/MetaStation/MetaStation.dmm   |  24 ---
 _maps/map_files/OmegaStation/OmegaStation.dmm |  32 ---
 _maps/map_files/PubbyStation/PubbyStation.dmm |  19 +-
 7 files changed, 26 insertions(+), 355 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 7a9473be1b0f..6fac3515170c 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -47540,23 +47540,6 @@
 /obj/effect/landmark/navigate_destination/research,
 /turf/open/floor/plasteel/white,
 /area/science/research)
-"gEw" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary{
-	area_type = /area/construction/mining/aux_base;
-	dheight = 4;
-	dir = 8;
-	dwidth = 4;
-	height = 9;
-	shuttle_id = "aux_base_zone";
-	name = "aux base zone";
-	roundstart_template = /datum/map_template/shuttle/aux_base/default;
-	width = 9
-	},
-/turf/open/floor/plating,
-/area/construction/mining/aux_base)
 "gER" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
@@ -60814,17 +60797,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/service/hydroponics)
-"seT" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary/random{
-	dir = 4;
-	shuttle_id = "pod_lavaland3";
-	name = "lavaland"
-	},
-/turf/open/space/basic,
-/area/space)
 "seV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/bed{
@@ -67821,20 +67793,6 @@
 	},
 /turf/closed/wall/r_wall,
 /area/security/execution/transfer)
-"yfx" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 12;
-	height = 18;
-	shuttle_id = "emergency_home";
-	name = "BoxStation emergency evac bay";
-	width = 32
-	},
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
 "ygb" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 4
@@ -78064,7 +78022,7 @@ apN
 apN
 apN
 apN
-gEw
+apN
 apN
 apN
 apN
@@ -104001,7 +103959,7 @@ aaa
 aaa
 aaa
 gXs
-seT
+aaa
 aaa
 aaa
 aaa
@@ -119206,7 +119164,7 @@ aaa
 aNa
 aeR
 aNa
-yfx
+aQE
 aNa
 aaf
 aaa
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index fd1184ab5c3d..8c4cdf3a3823 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -61042,31 +61042,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/prison/cells)
-"fSP" = (
-/obj/machinery/requests_console{
-	department = "Public Router";
-	name = "Public Router RC";
-	pixel_x = -32
-	},
-/obj/structure/lattice,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/item/dest_tagger,
-/obj/machinery/requests_console{
-	department = "Public Router";
-	name = "Public Router RC";
-	pixel_x = -32
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 4
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "fSU" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -61193,21 +61168,10 @@
 /turf/open/floor/plasteel,
 /area/security/prison/cells)
 "ghx" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/delivery,
 /obj/machinery/light/small{
 	dir = 1;
 	light_color = "#ffc1c1"
 	},
-/obj/item/dest_tagger,
-/obj/machinery/requests_console{
-	department = "Service Router";
-	name = "Service Router RC";
-	pixel_y = 28
-	},
 /turf/closed/wall/r_wall,
 /area/service/hydroponics/upper)
 "ghD" = (
@@ -61608,15 +61572,6 @@
 	name = "Catering";
 	req_one_access_txt = "25;28"
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table,
-/obj/item/dest_tagger,
-/obj/machinery/airalarm{
-	pixel_y = 24
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "gNr" = (
@@ -61990,14 +61945,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port/fore)
 "hvF" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
 /obj/effect/turf_decal/bot,
-/obj/structure/table/reinforced,
-/obj/item/dest_tagger,
-/obj/item/dest_tagger,
-/obj/item/dest_tagger,
 /obj/structure/sign/warning{
 	name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES";
 	pixel_y = 32
@@ -62141,21 +62089,6 @@
 /obj/item/shovel/spade,
 /turf/open/floor/plasteel,
 /area/security/prison/garden)
-"hFN" = (
-/obj/effect/turf_decal/bot,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 5;
-	height = 7;
-	shuttle_id = "supply_home";
-	name = "Cargo Shuttle";
-	width = 12
-	},
-/turf/open/floor/plasteel,
-/area/cargo/storage)
 "hFX" = (
 /obj/machinery/vending/cola/red{
 	onstation = 0
@@ -64331,23 +64264,6 @@
 /obj/machinery/door/airlock/maintenance_hatch,
 /turf/open/floor/plating,
 /area/maintenance/disposal)
-"lPd" = (
-/obj/structure/lattice,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table/reinforced,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/item/dest_tagger,
-/obj/machinery/light,
-/obj/machinery/requests_console{
-	department = "MedSci Router";
-	name = "MedSci Router RC";
-	pixel_y = -32
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "lPL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -66796,6 +66712,14 @@
 	},
 /turf/open/floor/carpet/green,
 /area/command/heads_quarters/hop)
+"pTN" = (
+/obj/machinery/requests_console{
+	department = "MedSci Router";
+	name = "MedSci Router RC";
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
 "pUo" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /turf/open/floor/plasteel,
@@ -67074,41 +66998,6 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/item/ai_module/core/full/asimov{
-	pixel_x = 2;
-	pixel_y = 10
-	},
-/obj/effect/spawner/lootdrop/ai_module_neutral{
-	pixel_x = 1;
-	pixel_y = 8
-	},
-/obj/effect/spawner/lootdrop/ai_module_harmless{
-	pixel_y = 6
-	},
-/obj/item/ai_module/core/freeformcore{
-	pixel_x = -1;
-	pixel_y = 2
-	},
-/obj/item/ai_module/supplied/freeform{
-	pixel_x = -2
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /turf/open/floor/plasteel,
 /area/ai_monitored/turret_protected/ai)
 "quc" = (
@@ -67790,6 +67679,14 @@
 "rOL" = (
 /turf/closed/wall,
 /area/security/prison/shower)
+"rOM" = (
+/obj/machinery/requests_console{
+	department = "Engineering Router";
+	name = "Engineering Router RC";
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/engineering/main)
 "rOP" = (
 /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
 	dir = 4
@@ -69608,19 +69505,6 @@
 "vgX" = (
 /turf/closed/wall,
 /area/service/hydroponics/garden)
-"vko" = (
-/obj/structure/lattice,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/effect/turf_decal/delivery,
-/obj/structure/table,
-/obj/item/dest_tagger,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "vlR" = (
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
@@ -69919,23 +69803,6 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/item/dest_tagger,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 8
-	},
-/obj/machinery/button/massdriver{
-	id = "security_out";
-	name = "Security Driver Control";
-	pixel_x = 8;
-	pixel_y = 24
-	},
 /turf/open/floor/plasteel,
 /area/security/brig)
 "vRf" = (
@@ -70746,24 +70613,6 @@
 /area/cargo/storage)
 "xqz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/item/hand_labeler,
-/obj/item/dest_tagger,
-/obj/effect/turf_decal/bot,
-/obj/machinery/requests_console{
-	department = "EVA Router";
-	name = "EVA Router RC";
-	pixel_y = 28
-	},
-/obj/item/radio/intercom{
-	name = "Station Intercom (Common)";
-	pixel_x = 26
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
 /turf/open/floor/carpet/red,
 /area/maintenance/department/eva)
 "xqI" = (
@@ -70976,11 +70825,6 @@
 /area/security/prison/cells)
 "xJJ" = (
 /obj/machinery/light/small,
-/obj/machinery/requests_console{
-	department = "Engineering Router";
-	name = "Engineering Router RC";
-	pixel_y = -32
-	},
 /turf/closed/wall/r_wall,
 /area/engineering/main)
 "xKr" = (
@@ -96310,7 +96154,7 @@ mwX
 xxy
 bsU
 tBp
-bsU
+pTN
 bIk
 aaU
 aaU
@@ -96826,7 +96670,7 @@ bsU
 idT
 rlV
 bIk
-lPd
+aaU
 aaa
 aaa
 aaU
@@ -106504,7 +106348,7 @@ aHO
 umH
 vvB
 aHt
-fSP
+aaU
 aaU
 ocZ
 aaU
@@ -106812,7 +106656,7 @@ dKl
 mvz
 oOH
 nws
-nws
+rOM
 aQC
 bEK
 bIQ
@@ -107310,7 +107154,7 @@ aaU
 aaa
 aaa
 aaa
-vko
+aaU
 xJJ
 aQC
 aQC
@@ -120699,7 +120543,7 @@ bgV
 lKy
 bhK
 bkn
-hFN
+bkn
 bkn
 bhK
 fvH
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 7b0dc2d4e26a..6fd95ecddfdf 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -86766,12 +86766,6 @@
 /turf/open/pool,
 /area/commons/fitness/pool)
 "jEM" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
@@ -112571,25 +112565,6 @@
 	pixel_x = 5;
 	pixel_y = 5
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_x = -3;
-	pixel_y = 15
-	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_x = -6;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/drinks/beer{
-	desc = "Whatever it is, it reeks of foul, putrid froth.";
-	list_reagents = list("bacchus_blessing"=15);
-	name = "Delta-Down";
-	pixel_x = 5;
-	pixel_y = 5
-	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
diff --git a/_maps/map_files/IceBox/IceBoxStation.dmm b/_maps/map_files/IceBox/IceBoxStation.dmm
index 43c03d357ac2..a8d442e83f23 100644
--- a/_maps/map_files/IceBox/IceBoxStation.dmm
+++ b/_maps/map_files/IceBox/IceBoxStation.dmm
@@ -3520,7 +3520,6 @@
 	pixel_y = 26;
 	req_access_txt = "5"
 	},
-/obj/item/book/manual/splurt_space_law,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -8547,7 +8546,6 @@
 /area/medical/medbay/central)
 "cRn" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/splurt_space_law,
 /obj/item/coin/plasma,
 /turf/open/floor/wood,
 /area/command/heads_quarters/captain)
@@ -10254,7 +10252,6 @@
 /area/command/teleporter)
 "dvj" = (
 /obj/structure/table,
-/obj/item/book/manual/splurt_space_law,
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 4
@@ -10302,7 +10299,6 @@
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "dvO" = (
-/obj/item/book/manual/splurt_space_law,
 /obj/structure/table,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
@@ -12008,7 +12004,6 @@
 /area/commons/dorms)
 "ebl" = (
 /obj/structure/table,
-/obj/item/book/manual/splurt_space_law,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
@@ -12194,7 +12189,6 @@
 "efp" = (
 /obj/structure/table,
 /obj/item/aicard,
-/obj/item/aiModule/reset,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -19422,8 +19416,6 @@
 /area/commons/locker)
 "gFl" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/splurt_space_law,
-/obj/item/book/manual/splurt_space_law,
 /obj/item/pen/red,
 /turf/open/floor/wood,
 /area/service/lawoffice)
@@ -21361,7 +21353,6 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "hog" = (
-/obj/item/book/manual/splurt_space_law,
 /obj/structure/table/wood,
 /turf/open/floor/carpet,
 /area/command/meeting_room)
@@ -23536,7 +23527,6 @@
 /obj/item/book/manual/wiki/experimentor,
 /obj/item/book/manual/wiki/research_and_development,
 /obj/item/book/manual/wiki/robotics_cyborgs,
-/obj/item/book/manual/splurt_space_law,
 /obj/item/book/manual/wiki/medicine,
 /obj/item/book/manual/wiki/medical_cloning,
 /obj/item/book/manual/wiki/infections,
@@ -27378,7 +27368,6 @@
 	pixel_x = 1;
 	pixel_y = -1
 	},
-/obj/item/book/manual/splurt_space_law,
 /turf/open/floor/plasteel,
 /area/security/brig)
 "jtx" = (
@@ -28084,7 +28073,6 @@
 /area/maintenance/fore)
 "jGw" = (
 /obj/structure/table,
-/obj/item/aiModule/supplied/quarantine,
 /obj/machinery/camera/motion{
 	c_tag = "AI Upload Chamber - West";
 	dir = 4;
@@ -41405,7 +41393,6 @@
 /area/command/bridge)
 "ovw" = (
 /obj/structure/table/wood,
-/obj/item/book/manual/splurt_space_law,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -47484,7 +47471,6 @@
 /turf/open/floor/plasteel,
 /area/engineering/main)
 "qyM" = (
-/obj/item/book/manual/splurt_space_law,
 /obj/structure/table/wood,
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -51165,8 +51151,6 @@
 /area/science/storage)
 "rKF" = (
 /obj/structure/table,
-/obj/item/book/manual/splurt_space_law,
-/obj/item/book/manual/splurt_space_law,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/security/office)
@@ -55602,7 +55586,6 @@
 /area/security/office)
 "tln" = (
 /obj/structure/table,
-/obj/item/aiModule/reset,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -57805,23 +57788,18 @@
 /area/commons/locker)
 "uaT" = (
 /obj/structure/table,
-/obj/item/aiModule/supplied/oxygen,
-/obj/item/aiModule/zeroth/oneHuman,
 /obj/machinery/door/window{
 	dir = 8;
 	name = "High-Risk Modules";
 	req_access_txt = "20"
 	},
-/obj/item/aiModule/reset/purge,
 /obj/structure/window/reinforced,
-/obj/effect/spawner/lootdrop/aimodule_harmful,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/aiModule/supplied/protectStation,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai_upload)
 "uaZ" = (
@@ -67378,7 +67356,6 @@
 /area/hallway/primary/central)
 "xvH" = (
 /obj/structure/table,
-/obj/item/aiModule/supplied/freeform,
 /obj/structure/sign/plaques/kiddie{
 	pixel_x = 32
 	},
@@ -69055,8 +69032,6 @@
 /area/security/warden)
 "xYh" = (
 /obj/structure/table,
-/obj/item/aiModule/core/full/asimov,
-/obj/item/aiModule/core/freeformcore,
 /obj/machinery/door/window{
 	base_state = "right";
 	dir = 4;
@@ -69065,16 +69040,12 @@
 	req_access_txt = "20"
 	},
 /obj/structure/window/reinforced,
-/obj/effect/spawner/lootdrop/aimodule_harmless,
-/obj/effect/spawner/lootdrop/aimodule_lewd,
-/obj/effect/spawner/lootdrop/aimodule_neutral,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/aiModule/core/full/custom,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/turret_protected/ai_upload)
 "xYt" = (
@@ -69656,10 +69627,6 @@
 /area/maintenance/fore/secondary)
 "yiR" = (
 /obj/structure/table,
-/obj/item/book/manual/splurt_space_law{
-	pixel_x = -3;
-	pixel_y = 5
-	},
 /turf/open/floor/plasteel/dark,
 /area/security/courtroom)
 "yiY" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index e69f60445d53..a12ccf0db90b 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -60903,30 +60903,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 6
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/closet/secure_closet{
-	name = "contraband locker";
-	req_access_txt = "3"
-	},
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
-	},
-/obj/effect/spawner/lootdrop/armory_contraband{
-	loot = list(/obj/item/gun/ballistic/automatic/pistol=5,/obj/item/gun/ballistic/shotgun/automatic/combat=5,/obj/item/gun/ballistic/revolver/mateba,/obj/item/gun/ballistic/automatic/pistol/deagle,/obj/item/storage/box/syndie_kit/throwing_weapons=3)
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "kFi" = (
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 73e366806ea8..112bc3690a40 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -35163,18 +35163,6 @@
 	},
 /obj/structure/curtain,
 /obj/structure/window/spawner/north,
-/obj/structure/sign/poster/contraband/yes_erp{
-	pixel_x = 32
-	},
-/obj/effect/turf_decal/bot,
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/machinery/shower{
-	dir = 1
-	},
-/obj/structure/curtain,
-/obj/structure/window/spawner/north,
 /obj/structure/sign/poster/contraband/yes_erp{
 	pixel_x = 32
 	},
@@ -35959,16 +35947,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/item/folder/red,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/taperecorder,
-/obj/structure/cable/white{
-	icon_state = "1-2"
-	},
-/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/command/bridge)
 "ipZ" = (
@@ -37137,16 +37115,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/camera/detective,
-/obj/item/radio/intercom{
-	name = "Station Intercom";
-	pixel_x = -26
-	},
 /turf/open/floor/plasteel/dark/side{
 	dir = 8
 	},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index cecbafacdfea..81f0826cfa87 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -59223,20 +59223,6 @@
 /obj/machinery/piratepad/civilian,
 /turf/open/floor/plasteel,
 /area/cargo/office)
-"pHz" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/docking_port/stationary{
-	dwidth = 2;
-	height = 6;
-	shuttle_id = "monastery_shuttle_station";
-	name = "Station";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/large;
-	width = 5
-	},
-/turf/closed/wall,
-/area/commons/dorms)
 "pHI" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -65116,9 +65102,6 @@
 /turf/open/floor/plasteel/dark,
 /area/service/library)
 "wnI" = (
-/obj{
-	name = "---Merge conflict marker---"
-	},
 /obj/docking_port/stationary{
 	dheight = 1;
 	dir = 8;
@@ -106611,7 +106594,7 @@ aaa
 apX
 apX
 apX
-pHz
+apX
 apX
 apX
 azA

From f13455d8ddd206b2d3b21a3dc4ddae5e82858500 Mon Sep 17 00:00:00 2001
From: SPLURT Bot <97993072+SPLURT-Station-Bot@users.noreply.github.com>
Date: Sun, 15 Sep 2024 14:27:22 +0000
Subject: [PATCH 2/3] Automatic changelog generation for PR #1200 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1200.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1200.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1200.yml b/html/changelogs/AutoChangeLog-pr-1200.yml
new file mode 100644
index 000000000000..1eabf875d0f8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1200.yml
@@ -0,0 +1,7 @@
+author: SaraSayomi
+delete-after: true
+changes:
+  - bugfix: remove doubled up shuttle markers, causing shuttles to love up on the
+      station with murder
+  - bugfix: several spacelaw merge conflicts
+  - bugfix: Not sanity

From 761c9883d560fedf534b93ce095b0ac4e8cfd8c5 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 15 Sep 2024 14:28:42 +0000
Subject: [PATCH 3/3] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1200.yml | 7 -------
 html/changelogs/archive/2024-09.yml       | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-1200.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1200.yml b/html/changelogs/AutoChangeLog-pr-1200.yml
deleted file mode 100644
index 1eabf875d0f8..000000000000
--- a/html/changelogs/AutoChangeLog-pr-1200.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: SaraSayomi
-delete-after: true
-changes:
-  - bugfix: remove doubled up shuttle markers, causing shuttles to love up on the
-      station with murder
-  - bugfix: several spacelaw merge conflicts
-  - bugfix: Not sanity
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
index 5d3a42384ef9..8648958b2e4d 100644
--- a/html/changelogs/archive/2024-09.yml
+++ b/html/changelogs/archive/2024-09.yml
@@ -6,3 +6,9 @@
   SandPoot:
   - rscadd: Added Character offering system, exchange characters with people you want
       to!
+2024-09-15:
+  SaraSayomi:
+  - bugfix: remove doubled up shuttle markers, causing shuttles to love up on the
+      station with murder
+  - bugfix: several spacelaw merge conflicts
+  - bugfix: Not sanity