From 443732367a9ec8a2fe0aeed9678571c3eab03e32 Mon Sep 17 00:00:00 2001
From: KathrinBailey <kat892@outlook.com>
Date: Wed, 26 Oct 2022 03:31:35 +0100
Subject: [PATCH] Fixes corp sofas

---
 _maps/map_files/BoxStation/BoxStation.dmm     |   2 +-
 .../BoxedInStation/BoxedInStation.dmm         |  59 +++++++++---------
 _maps/map_files/LambdaStation/dorms.dmm       |   2 +-
 .../SyndicateStation/SyndicateBoxStation.dmm  |  20 +++---
 .../map_files/Smexistation/Snaxi_Splurt.dmm   |   4 +-
 .../Smexistation_OLD/Snaxi_Splurt.dmm         |   4 +-
 .../objects/structures/bed_chairs/sofa.dm     |   2 +
 modular_splurt/icons/obj/sofa.dmi             | Bin 0 -> 2201 bytes
 tgstation.dme                                 |   2 +-
 9 files changed, 48 insertions(+), 47 deletions(-)
 create mode 100644 modular_splurt/code/game/objects/structures/bed_chairs/sofa.dm
 create mode 100644 modular_splurt/icons/obj/sofa.dmi

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 3419c8391d..dc36753402 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -48575,7 +48575,7 @@
 /turf/open/floor/plasteel/dark,
 /area/tcommsat/computer)
 "hdv" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/wood,
diff --git a/_maps/map_files/BoxedInStation/BoxedInStation.dmm b/_maps/map_files/BoxedInStation/BoxedInStation.dmm
index af1b524279..8a2762bbe7 100644
--- a/_maps/map_files/BoxedInStation/BoxedInStation.dmm
+++ b/_maps/map_files/BoxedInStation/BoxedInStation.dmm
@@ -6476,13 +6476,13 @@
 /turf/open/floor/plasteel,
 /area/security/office)
 "dwJ" = (
-/obj/structure/chair/sofa/corp/left{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "dwS" = (
@@ -8162,10 +8162,10 @@
 /turf/open/floor/plasteel,
 /area/ai_monitored/command/storage/eva)
 "ena" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/effect/landmark/start/station_engineer,
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
-/obj/effect/landmark/start/station_engineer,
 /turf/open/floor/plasteel,
 /area/engineering/break_room)
 "enj" = (
@@ -10105,15 +10105,15 @@
 /turf/open/floor/plasteel,
 /area/engineering/main)
 "flX" = (
-/obj/structure/chair/sofa/corp/right{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/qm)
 "fmg" = (
@@ -12227,7 +12227,7 @@
 /turf/open/floor/plasteel/white,
 /area/science/xenobiology)
 "gqi" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -26742,15 +26742,15 @@
 /turf/open/floor/plating,
 /area/engineering/atmos)
 "oeK" = (
-/obj/structure/chair/sofa/corp/right{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/green{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hop)
 "oeM" = (
@@ -30557,15 +30557,15 @@
 /turf/open/floor/plasteel,
 /area/security/prison)
 "pTr" = (
-/obj/structure/chair/sofa/corp/left{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/cmo)
 "pTK" = (
@@ -33615,13 +33615,13 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/port)
 "rtO" = (
-/obj/structure/chair/sofa/corp/right{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/red,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/chair/sofa/corp/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hos)
 "rtU" = (
@@ -37114,15 +37114,15 @@
 	},
 /area/maintenance/bar)
 "tjZ" = (
-/obj/structure/chair/sofa/corp/right{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/left{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/cmo)
 "tkL" = (
@@ -37843,15 +37843,15 @@
 /turf/open/floor/plasteel,
 /area/cargo/miningdock)
 "tBW" = (
-/obj/structure/chair/sofa/corp/left{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/green{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/command/heads_quarters/hop)
 "tCd" = (
@@ -39060,8 +39060,7 @@
 /area/hallway/secondary/exit)
 "uhI" = (
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 5;
-	icon_state = "pipe11-2"
+	dir = 5
 	},
 /turf/closed/wall/r_wall,
 /area/engineering/atmos)
@@ -41019,7 +41018,7 @@
 /turf/open/floor/plasteel,
 /area/medical/chemistry)
 "vdH" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -45606,15 +45605,15 @@
 /turf/open/floor/plating,
 /area/engineering/atmos)
 "xtv" = (
-/obj/structure/chair/sofa/corp/left{
-	dir = 1
-	},
 /obj/effect/turf_decal/tile/brown{
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/brown{
 	dir = 4
 	},
+/obj/structure/chair/sofa/corp/right{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/cargo/qm)
 "xtC" = (
diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index 50cdc3ac50..bb45bf4c27 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -7853,7 +7853,7 @@
 /turf/open/floor/plasteel/freezer,
 /area/commons/toilet)
 "up" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
index 4183045fdd..ea70d19af7 100644
--- a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
+++ b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
@@ -11381,7 +11381,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/hallway/secondary/entry)
 "aCr" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -16170,7 +16170,7 @@
 /area/service/bar)
 "aQd" = (
 /obj/structure/window/plasma,
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -16690,7 +16690,7 @@
 	},
 /obj/structure/window/plasma,
 /obj/effect/landmark/start/assistant,
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -20022,7 +20022,7 @@
 /area/service/bar)
 "baa" = (
 /obj/effect/landmark/start/assistant,
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -20039,7 +20039,7 @@
 /obj/structure/noticeboard{
 	pixel_y = -27
 	},
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/carpet/black,
@@ -54839,7 +54839,7 @@
 /obj/structure/sign/poster/contraband/borg_fancy_2{
 	pixel_y = -32
 	},
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -58867,7 +58867,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/medical/morgue)
 "oKh" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark/telecomms,
@@ -60317,7 +60317,7 @@
 /turf/open/floor/carpet/black,
 /area/commons/dorms)
 "rgW" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
@@ -61186,7 +61186,7 @@
 /turf/closed/wall/r_wall/syndicate,
 /area/security/prison/cells)
 "sAH" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark/telecomms,
@@ -63577,7 +63577,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/security/prison/cells)
 "wfC" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/mineral/plastitanium/red,
diff --git a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm
index 9883388400..9e3065d6a0 100644
--- a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm
+++ b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm
@@ -3089,7 +3089,7 @@
 /turf/closed/wall,
 /area/maintenance/aft)
 "aIt" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/carpet/orange,
@@ -20758,7 +20758,7 @@
 /turf/open/floor/wood,
 /area/command/corporate_showroom)
 "hCp" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/carpet/orange,
diff --git a/_maps/splurt_maps/map_files/Smexistation_OLD/Snaxi_Splurt.dmm b/_maps/splurt_maps/map_files/Smexistation_OLD/Snaxi_Splurt.dmm
index 5dd6dfd97b..44c5c98615 100644
--- a/_maps/splurt_maps/map_files/Smexistation_OLD/Snaxi_Splurt.dmm
+++ b/_maps/splurt_maps/map_files/Smexistation_OLD/Snaxi_Splurt.dmm
@@ -3061,7 +3061,7 @@
 /turf/closed/wall,
 /area/maintenance/aft)
 "aIt" = (
-/obj/structure/chair/sofa/corp/right{
+/obj/structure/chair/sofa/corp/left{
 	dir = 1
 	},
 /turf/open/floor/carpet/orange,
@@ -20233,7 +20233,7 @@
 /turf/open/floor/wood,
 /area/command/corporate_showroom)
 "hCp" = (
-/obj/structure/chair/sofa/corp/left{
+/obj/structure/chair/sofa/corp/right{
 	dir = 1
 	},
 /turf/open/floor/carpet/orange,
diff --git a/modular_splurt/code/game/objects/structures/bed_chairs/sofa.dm b/modular_splurt/code/game/objects/structures/bed_chairs/sofa.dm
new file mode 100644
index 0000000000..f3552db2fd
--- /dev/null
+++ b/modular_splurt/code/game/objects/structures/bed_chairs/sofa.dm
@@ -0,0 +1,2 @@
+/obj/structure/chair/sofa/corp
+	icon = 'modular_splurt/icons/obj/sofa.dmi'
diff --git a/modular_splurt/icons/obj/sofa.dmi b/modular_splurt/icons/obj/sofa.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..132f3be0d7ebdbc9657217f1c0a282310a6baaff
GIT binary patch
literal 2201
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
RCain|V86@R?%qyz^1ox2yKevh

literal 0
HcmV?d00001

diff --git a/tgstation.dme b/tgstation.dme
index 5187213951..24e690495d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4294,7 +4294,6 @@
 #include "modular_splurt\code\datums\mind.dm"
 #include "modular_splurt\code\datums\shuttles.dm"
 #include "modular_splurt\code\datums\status_effects.dm"
-#include "modular_splurt\code\datums\world_topic.dm"
 #include "modular_splurt\code\datums\components\chasm.dm"
 #include "modular_splurt\code\datums\components\dullahan.dm"
 #include "modular_splurt\code\datums\components\nanites.dm"
@@ -4423,6 +4422,7 @@
 #include "modular_splurt\code\game\objects\structures\watercloset.dm"
 #include "modular_splurt\code\game\objects\structures\bed_chairs\beds.dm"
 #include "modular_splurt\code\game\objects\structures\bed_chairs\chairs.dm"
+#include "modular_splurt\code\game\objects\structures\bed_chairs\sofa.dm"
 #include "modular_splurt\code\game\objects\structures\cannons\cannon.dm"
 #include "modular_splurt\code\game\objects\structures\cannons\cannonballs.dm"
 #include "modular_splurt\code\game\objects\structures\crates_lockers\closets\fitness.dm"