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 0000000000..132f3be0d7 Binary files /dev/null and b/modular_splurt/icons/obj/sofa.dmi differ 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"