From 3eba0022e4044564251a400153e7c9082700eafb Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:15:38 +0300 Subject: [PATCH 01/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 8295f12b42e..dfe02d351bc 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -38886,7 +38886,7 @@ /obj/item/clothing/gloves/latex, /obj/item/tool/kitchen/rollingpin, /obj/item/reagent_containers/food/drinks/shaker, -/obj/item/clothing/suit/ru/fartumasti, +/obj/item/clothing/suit/chef/military, /obj/effect/spawner/random/food_or_drink/kitchenknife/butcherweighted, /turf/open/floor/mainship/metal/full, /area/mainship/living/grunt_rnr) From 2d8e9f18f49d13930b457674842d33f2d23103bb Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:17:50 +0300 Subject: [PATCH 02/11] Update prop.dm --- code/game/objects/structures/prop.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index b22640e2060..932f673052d 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -1754,7 +1754,6 @@ name = "railing" desc = "Basic railing meant to protect idiots like you from falling." icon = 'icons/Marine/mainship_props.dmi' - density = FALSE icon_state = "railing" /obj/structure/prop/mainship/railing/corner From 563e7e480b69ec5deead5d3ea05499d3ea8d4720 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:26:53 +0300 Subject: [PATCH 03/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 55 ++++++++++------------------- 1 file changed, 18 insertions(+), 37 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index dfe02d351bc..5dc527e8f17 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -7146,7 +7146,8 @@ /area/space) "egq" = ( /obj/structure/table/mainship, -/obj/item/supplytablet, +/obj/item/megaphone, +/obj/item/whistle, /turf/open/floor/carpet, /area/mainship/squads/req) "egt" = ( @@ -9757,17 +9758,6 @@ }, /turf/open/floor/mainship/metal, /area/mainship/engineering/engineering_workshop) -"fAM" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/obj/structure/barricade/metal, -/turf/open/floor/prison/yellow, -/area/mainship/squads/req) "fAQ" = ( /obj/structure/barricade/metal, /obj/structure/barricade/metal{ @@ -11769,7 +11759,6 @@ /obj/item/tool/hand_labeler, /obj/machinery/cell_charger, /obj/item/cell/hyper, -/obj/item/clothing/glasses/welding, /obj/machinery/light/mainship/small{ dir = 8 }, @@ -20791,6 +20780,9 @@ "muB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/warning_stripes/cargo, +/obj/structure/barricade/metal{ + dir = 1 + }, /turf/open/floor/prison/plate, /area/mainship/squads/req) "muF" = ( @@ -24652,15 +24644,14 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/starboard_hallway) "oIO" = ( -/obj/machinery/line_nexter{ - dir = 1; - pixel_y = 19 - }, /obj/structure/barricade/metal{ dir = 8 }, /obj/effect/turf_decal/warning_stripes/cargo, /obj/machinery/light/mainship, +/obj/machinery/line_nexter{ + dir = 1 + }, /turf/open/floor/prison/plate, /area/mainship/squads/req) "oIT" = ( @@ -24679,6 +24670,9 @@ /area/mainship/medical/medical_science) "oJz" = ( /obj/effect/turf_decal/warning_stripes/cargo, +/obj/structure/barricade/metal{ + dir = 1 + }, /turf/open/floor/prison/plate, /area/mainship/squads/req) "oJE" = ( @@ -26641,17 +26635,15 @@ /obj/item/clipboard, /obj/item/tool/hand_labeler, /obj/item/tool/pen, -/obj/item/megaphone, -/obj/item/whistle, -/obj/item/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner" - }, /obj/item/tool/stamp{ name = "Quartermaster's stamp" }, /obj/item/tool/stamp/denied, -/obj/item/folder/black_random, /obj/effect/turf_decal/woodsiding, +/obj/item/eftpos{ + eftpos_name = "Cargo Bay EFTPOS scanner" + }, +/obj/item/folder/black_random, /turf/open/floor/carpet, /area/mainship/squads/req) "pPB" = ( @@ -35609,17 +35601,6 @@ dir = 8 }, /area/space) -"vwv" = ( -/obj/structure/barricade/metal, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 8 - }, -/turf/open/floor/prison/yellow, -/area/mainship/squads/req) "vwZ" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -69814,7 +69795,7 @@ qoh qoh qoh kOO -vwv +nsi oJz nQj dFx @@ -70071,7 +70052,7 @@ qoh qoh qoh lzD -vwv +nsi oJz nQj bRY @@ -70328,7 +70309,7 @@ cEW qoh qoh kOO -fAM +nsi muB oKV hey From 3f7c5d6055cdc9e2657e8222e99a334258ea808a Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:28:20 +0300 Subject: [PATCH 04/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 5dc527e8f17..4f2c290d5b2 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -12020,6 +12020,13 @@ }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) +"hkJ" = ( +/obj/machinery/vending/cargo_supply, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, +/area/mainship/squads/req) "hkO" = ( /obj/effect/turf_decal/siding/metal/corner{ dir = 1 @@ -23279,13 +23286,13 @@ /obj/structure/table/reinforced{ layer = 2.1 }, +/obj/machinery/door/firedoor/mainship, /obj/machinery/door/window/secure/req{ dir = 2 }, /obj/machinery/door/window/right{ dir = 1 }, -/obj/machinery/door/firedoor/mainship, /obj/machinery/door/poddoor/shutters/mainship/req/ro{ dir = 2 }, @@ -24717,14 +24724,10 @@ /turf/open/floor/plating, /area/mainship/hull/upper_hull) "oKV" = ( -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 - }, -/obj/machinery/vending/cargo_supply, /obj/structure/sign/semiotic/terminal{ pixel_x = 32 }, -/turf/open/floor/plating, +/turf/closed/wall/mainship/alt, /area/mainship/squads/req) "oLf" = ( /obj/structure/table/mainship, @@ -70054,7 +70057,7 @@ qoh lzD nsi oJz -nQj +hkJ bRY lmN pys From ac5667d05f37b13e2fdbbe6cda180df525e0825f Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:34:23 +0300 Subject: [PATCH 05/11] Revert "Update prop.dm" This reverts commit 2d8e9f18f49d13930b457674842d33f2d23103bb. --- code/game/objects/structures/prop.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm index 932f673052d..b22640e2060 100644 --- a/code/game/objects/structures/prop.dm +++ b/code/game/objects/structures/prop.dm @@ -1754,6 +1754,7 @@ name = "railing" desc = "Basic railing meant to protect idiots like you from falling." icon = 'icons/Marine/mainship_props.dmi' + density = FALSE icon_state = "railing" /obj/structure/prop/mainship/railing/corner From bbe424fac99b25e5b47859b3220fdc747b83ff9d Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:37:07 +0300 Subject: [PATCH 06/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 108 ++++++++++++++++------------ 1 file changed, 64 insertions(+), 44 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 4f2c290d5b2..04b53ac2788 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -12020,13 +12020,6 @@ }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) -"hkJ" = ( -/obj/machinery/vending/cargo_supply, -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 - }, -/turf/open/floor/prison/marked, -/area/mainship/squads/req) "hkO" = ( /obj/effect/turf_decal/siding/metal/corner{ dir = 1 @@ -17747,6 +17740,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt{ dir = 4 }, +/obj/machinery/door_control/mainship/req{ + dir = 4; + id = "qm_warehouse"; + name = "RO Warehouse Shutters"; + pixel_x = -25 + }, /turf/open/floor/prison/yellow{ dir = 10 }, @@ -22562,6 +22561,16 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /turf/open/floor/mainship/metal, /area/mainship/squads/charlie) +"nuh" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/open/floor/plating/plating_catwalk/prison, +/area/mainship/squads/req) "nuC" = ( /obj/machinery/light/mainship{ dir = 8 @@ -23212,18 +23221,12 @@ /turf/open/floor/plating/mainship/reinforced, /area/mainship/hallways/hangar) "nOT" = ( +/obj/machinery/door/airlock/multi_tile/mainship/marine/requisitions, /obj/machinery/door/poddoor/shutters{ dir = 1; id = "qm_warehouse"; name = "Warehouse Shutters" }, -/obj/machinery/door/firedoor, -/obj/machinery/door_control/mainship/req{ - dir = 4; - id = "qm_warehouse"; - name = "RO Warehouse Shutters"; - pixel_x = -25 - }, /turf/open/floor/mainship/stripesquare, /area/mainship/squads/req) "nOX" = ( @@ -23283,16 +23286,7 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/port_hallway) "nQj" = ( -/obj/structure/table/reinforced{ - layer = 2.1 - }, -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/window/secure/req{ - dir = 2 - }, -/obj/machinery/door/window/right{ - dir = 1 - }, +/obj/machinery/vending/cargo_supply, /obj/machinery/door/poddoor/shutters/mainship/req/ro{ dir = 2 }, @@ -23747,6 +23741,22 @@ dir = 8 }, /area/mainship/squads/delta) +"obT" = ( +/obj/structure/table/reinforced{ + layer = 2.1 + }, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/window/secure/req{ + dir = 2 + }, +/obj/machinery/door/window/right{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, +/area/mainship/squads/req) "obX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23866,7 +23876,7 @@ /area/mainship/medical/upper_medical) "ohH" = ( /obj/structure/table/mainship, -/obj/item/pizzabox, +/obj/item/pizzabox/random, /turf/open/floor/prison/plate, /area/mainship/squads/req) "oid" = ( @@ -27004,6 +27014,15 @@ /obj/effect/soundplayer, /turf/closed/wall/mainship/white, /area/mainship/medical/lounge) +"qaX" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "qbk" = ( /obj/effect/turf_decal/siding/metal{ dir = 1 @@ -29215,14 +29234,8 @@ /turf/open/floor/mainship/metal, /area/mainship/squads/alpha) "rtB" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/obj/machinery/door/firedoor, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/mainship/stripesquare, +/turf/closed/wall/mainship/alt, /area/mainship/squads/req) "rtT" = ( /turf/open/floor/plating/plating_catwalk/dark, @@ -35457,18 +35470,17 @@ /turf/open/floor/mainship/rubber, /area/mainship/medical/operating_room_one) "vsb" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /obj/structure/cable, -/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, /turf/open/floor/mainship/stripesquare, /area/mainship/squads/req) "vsc" = ( @@ -37147,6 +37159,14 @@ }, /turf/open/floor/mainship/metal, /area/mainship/living/starboard_garden) +"wsG" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "wsM" = ( /turf/open/floor/mainship/metal/lino, /area/mainship/living/cafeteria) @@ -67742,7 +67762,7 @@ bCh izl rNK oxn -lWS +qaX oJE oxC egq @@ -68514,7 +68534,7 @@ rNK izl nlI arD -lWS +wsG pQT lWS jBI @@ -69025,7 +69045,7 @@ xWG xWG kqv xzh -kfy +nuh kfy nnn kfy @@ -69800,7 +69820,7 @@ qoh kOO nsi oJz -nQj +obT dFx grR wvU @@ -70057,7 +70077,7 @@ qoh lzD nsi oJz -hkJ +nQj bRY lmN pys @@ -71593,8 +71613,8 @@ vdI oKG xuf ohH -ohH fiO +ohH uHR fkn sPp From bcc66cc825b2fa6bcb9add1f5bc51badcfb48b2a Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:40:09 +0300 Subject: [PATCH 07/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 126 ++++++++++++++-------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 04b53ac2788..dfe78059c1d 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -2336,6 +2336,15 @@ "brL" = ( /turf/open/floor/mainship/tcomms, /area/mainship/command/cic) +"bsk" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "bsq" = ( /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/grass, @@ -6569,6 +6578,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt, /turf/open/floor/plating, /area/mainship/hull/upper_hull) +"dMB" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "dMG" = ( /turf/open/floor/mainship/metal, /area/mainship/shipboard/firing_range) @@ -7146,8 +7163,14 @@ /area/space) "egq" = ( /obj/structure/table/mainship, -/obj/item/megaphone, -/obj/item/whistle, +/obj/structure/paper_bin, +/obj/item/clipboard, +/obj/item/tool/hand_labeler, +/obj/item/tool/pen, +/obj/item/folder/black_random, +/obj/item/eftpos{ + eftpos_name = "Cargo Bay EFTPOS scanner" + }, /turf/open/floor/carpet, /area/mainship/squads/req) "egt" = ( @@ -22561,16 +22584,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /turf/open/floor/mainship/metal, /area/mainship/squads/charlie) -"nuh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/open/floor/plating/plating_catwalk/prison, -/area/mainship/squads/req) "nuC" = ( /obj/machinery/light/mainship{ dir = 8 @@ -23741,22 +23754,6 @@ dir = 8 }, /area/mainship/squads/delta) -"obT" = ( -/obj/structure/table/reinforced{ - layer = 2.1 - }, -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/window/secure/req{ - dir = 2 - }, -/obj/machinery/door/window/right{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 - }, -/turf/open/floor/prison/marked, -/area/mainship/squads/req) "obX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26644,19 +26641,9 @@ /area/mainship/hallways/bow_hallway) "pPm" = ( /obj/structure/table/mainship, -/obj/structure/paper_bin, -/obj/item/clipboard, -/obj/item/tool/hand_labeler, -/obj/item/tool/pen, -/obj/item/tool/stamp{ - name = "Quartermaster's stamp" - }, -/obj/item/tool/stamp/denied, /obj/effect/turf_decal/woodsiding, -/obj/item/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner" - }, -/obj/item/folder/black_random, +/obj/item/storage/fancy/cigar, +/obj/item/tool/lighter/zippo, /turf/open/floor/carpet, /area/mainship/squads/req) "pPB" = ( @@ -27014,15 +27001,6 @@ /obj/effect/soundplayer, /turf/closed/wall/mainship/white, /area/mainship/medical/lounge) -"qaX" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "qbk" = ( /obj/effect/turf_decal/siding/metal{ dir = 1 @@ -30311,6 +30289,22 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/starboard_hallway) +"scc" = ( +/obj/structure/table/reinforced{ + layer = 2.1 + }, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/window/secure/req{ + dir = 2 + }, +/obj/machinery/door/window/right{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, +/area/mainship/squads/req) "scd" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ dir = 9 @@ -30854,6 +30848,16 @@ /obj/effect/turf_decal/siding/metal, /turf/open/floor/mainship/metal, /area/mainship/hallways/bow_hallway) +"srQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/open/floor/plating/plating_catwalk/prison, +/area/mainship/squads/req) "ssf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ @@ -31356,10 +31360,14 @@ /area/mainship/engineering/engineering_workshop) "sHT" = ( /obj/structure/table/mainship, -/obj/item/storage/fancy/cigar, -/obj/item/tool/lighter/zippo, /obj/effect/turf_decal/woodsiding, /obj/machinery/light/mainship/small, +/obj/item/tool/stamp/denied, +/obj/item/tool/stamp{ + name = "Quartermaster's stamp" + }, +/obj/item/whistle, +/obj/item/megaphone, /turf/open/floor/carpet, /area/mainship/squads/req) "sIq" = ( @@ -37159,14 +37167,6 @@ }, /turf/open/floor/mainship/metal, /area/mainship/living/starboard_garden) -"wsG" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "wsM" = ( /turf/open/floor/mainship/metal/lino, /area/mainship/living/cafeteria) @@ -67762,7 +67762,7 @@ bCh izl rNK oxn -qaX +bsk oJE oxC egq @@ -68534,7 +68534,7 @@ rNK izl nlI arD -wsG +dMB pQT lWS jBI @@ -69045,7 +69045,7 @@ xWG xWG kqv xzh -nuh +srQ kfy nnn kfy @@ -69820,7 +69820,7 @@ qoh kOO nsi oJz -obT +scc dFx grR wvU From 9bff906dfd382964a6b303c097180d71fa3b3037 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:40:26 +0300 Subject: [PATCH 08/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 86 +++++++++++++---------------- 1 file changed, 39 insertions(+), 47 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index dfe78059c1d..e97fe060e41 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -1687,6 +1687,22 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/bow_hallway) +"aTP" = ( +/obj/structure/table/reinforced{ + layer = 2.1 + }, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/window/secure/req{ + dir = 2 + }, +/obj/machinery/door/window/right{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, +/area/mainship/squads/req) "aUz" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 2 @@ -2336,15 +2352,6 @@ "brL" = ( /turf/open/floor/mainship/tcomms, /area/mainship/command/cic) -"bsk" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "bsq" = ( /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/grass, @@ -6578,14 +6585,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt, /turf/open/floor/plating, /area/mainship/hull/upper_hull) -"dMB" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "dMG" = ( /turf/open/floor/mainship/metal, /area/mainship/shipboard/firing_range) @@ -22096,6 +22095,14 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/wood, /area/mainship/squads/charlie) +"nfi" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "nfn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/toolcloset, @@ -23240,6 +23247,7 @@ id = "qm_warehouse"; name = "Warehouse Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/mainship/stripesquare, /area/mainship/squads/req) "nOX" = ( @@ -30289,22 +30297,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/starboard_hallway) -"scc" = ( -/obj/structure/table/reinforced{ - layer = 2.1 - }, -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/window/secure/req{ - dir = 2 - }, -/obj/machinery/door/window/right{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 - }, -/turf/open/floor/prison/marked, -/area/mainship/squads/req) "scd" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ dir = 9 @@ -30848,16 +30840,6 @@ /obj/effect/turf_decal/siding/metal, /turf/open/floor/mainship/metal, /area/mainship/hallways/bow_hallway) -"srQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/open/floor/plating/plating_catwalk/prison, -/area/mainship/squads/req) "ssf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ @@ -35489,6 +35471,7 @@ id = "qm_warehouse"; name = "Warehouse Shutters" }, +/obj/machinery/door/firedoor, /turf/open/floor/mainship/stripesquare, /area/mainship/squads/req) "vsc" = ( @@ -39952,6 +39935,15 @@ color = "#E2E0DC" }, /area/mainship/medical/surgery_hallway) +"yeg" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "yem" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -67762,7 +67754,7 @@ bCh izl rNK oxn -bsk +yeg oJE oxC egq @@ -68534,7 +68526,7 @@ rNK izl nlI arD -dMB +nfi pQT lWS jBI @@ -69045,7 +69037,7 @@ xWG xWG kqv xzh -srQ +kfy kfy nnn kfy @@ -69820,7 +69812,7 @@ qoh kOO nsi oJz -scc +aTP dFx grR wvU From a7bf93ef8f403a1fc80d80260f11e2bdfde2c0d1 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 21:53:07 +0300 Subject: [PATCH 09/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 155 +++++++++++++--------------- 1 file changed, 74 insertions(+), 81 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index e97fe060e41..910a4f039b4 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -1687,22 +1687,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/bow_hallway) -"aTP" = ( -/obj/structure/table/reinforced{ - layer = 2.1 - }, -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/window/secure/req{ - dir = 2 - }, -/obj/machinery/door/window/right{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 - }, -/turf/open/floor/prison/marked, -/area/mainship/squads/req) "aUz" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 2 @@ -3323,9 +3307,6 @@ /turf/open/floor/mainship/metal/full, /area/mainship/hallways/hangar) "bRY" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/yellow{ dir = 1 @@ -4514,6 +4495,15 @@ /obj/machinery/camera/autoname/alt, /turf/open/floor/prison/cleanmarked, /area/mainship/hallways/hangar/droppod) +"cBD" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "cBI" = ( /obj/structure/closet/crate/radiation, /turf/open/floor/prison/marked, @@ -7161,15 +7151,10 @@ /turf/open/floor/mainship/terragov/north, /area/space) "egq" = ( -/obj/structure/table/mainship, /obj/structure/paper_bin, /obj/item/clipboard, -/obj/item/tool/hand_labeler, /obj/item/tool/pen, -/obj/item/folder/black_random, -/obj/item/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner" - }, +/obj/structure/table/woodentable, /turf/open/floor/carpet, /area/mainship/squads/req) "egt" = ( @@ -11134,12 +11119,10 @@ /area/mainship/command/cic) "gEi" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /turf/open/floor/prison/yellow, /area/mainship/squads/req) "gEA" = ( @@ -11772,18 +11755,13 @@ }, /area/mainship/medical/lounge) "hbE" = ( -/obj/structure/table/mainship, -/obj/item/folder/yellow, -/obj/item/tool/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/tool/hand_labeler, -/obj/machinery/cell_charger, -/obj/item/cell/hyper, /obj/machinery/light/mainship/small{ dir = 8 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt{ + dir = 4 + }, +/obj/structure/bed/chair/office/dark, /turf/open/floor/prison/yellow{ dir = 8 }, @@ -17759,15 +17737,15 @@ pixel_x = 8; pixel_y = -25 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt{ - dir = 4 - }, -/obj/machinery/door_control/mainship/req{ - dir = 4; - id = "qm_warehouse"; - name = "RO Warehouse Shutters"; - pixel_x = -25 +/obj/structure/table/mainship, +/obj/item/cell/hyper, +/obj/item/tool/hand_labeler, +/obj/item/folder/yellow, +/obj/item/tool/pen{ + pixel_x = 4; + pixel_y = 4 }, +/obj/machinery/cell_charger, /turf/open/floor/prison/yellow{ dir = 10 }, @@ -20975,10 +20953,13 @@ /turf/open/floor/wood, /area/mainship/medical/surgery_hallway) "myC" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, /obj/effect/turf_decal/woodsiding, +/obj/structure/table/woodentable, +/obj/item/eftpos{ + eftpos_name = "Cargo Bay EFTPOS scanner" + }, +/obj/item/tool/hand_labeler, +/obj/item/folder/black_random, /turf/open/floor/carpet, /area/mainship/squads/req) "mze" = ( @@ -20994,10 +20975,10 @@ }, /area/mainship/hallways/starboard_umbilical) "mAw" = ( -/obj/structure/closet/secure_closet/req_officer, /obj/effect/turf_decal/woodsiding{ dir = 10 }, +/obj/effect/spawner/random/misc/plant, /turf/open/floor/carpet, /area/mainship/squads/req) "mAx" = ( @@ -21292,7 +21273,6 @@ }, /area/mainship/living/starboard_garden) "mIt" = ( -/obj/structure/closet/firecloset, /obj/effect/turf_decal/woodsiding{ dir = 1 }, @@ -22095,14 +22075,6 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/wood, /area/mainship/squads/charlie) -"nfi" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "nfn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/toolcloset, @@ -24698,11 +24670,20 @@ /turf/open/floor/prison/plate, /area/mainship/squads/req) "oJE" = ( -/obj/structure/closet/toolcloset, -/obj/effect/turf_decal/woodsiding{ +/obj/structure/table/reinforced{ + layer = 2.1 + }, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/window/secure/req{ + dir = 2 + }, +/obj/machinery/door/window/right{ dir = 1 }, -/turf/open/floor/carpet, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, /area/mainship/squads/req) "oJM" = ( /obj/item/radio/intercom/general{ @@ -24716,6 +24697,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 5 }, +/obj/effect/spawner/random/misc/plant, /turf/open/floor/carpet, /area/mainship/squads/req) "oKl" = ( @@ -25151,8 +25133,10 @@ /turf/open/floor/mainship/metal/lino, /area/mainship/living/cafeteria) "oYC" = ( -/obj/structure/bed/chair/office/light, /obj/effect/landmark/start/job/requisitionsofficer, +/obj/structure/bed/chair/office/light{ + dir = 4 + }, /turf/open/floor/carpet, /area/mainship/squads/req) "oYN" = ( @@ -25566,6 +25550,11 @@ "pjA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/floor_warn_light/self_destruct, +/obj/machinery/door_control/mainship/req{ + id = "qm_warehouse"; + name = "RO Warehouse Shutters"; + pixel_y = 25 + }, /turf/open/floor/prison/yellow{ dir = 4 }, @@ -26648,10 +26637,10 @@ /turf/open/floor/mainship/metal, /area/mainship/hallways/bow_hallway) "pPm" = ( -/obj/structure/table/mainship, /obj/effect/turf_decal/woodsiding, /obj/item/storage/fancy/cigar, /obj/item/tool/lighter/zippo, +/obj/structure/table/woodentable, /turf/open/floor/carpet, /area/mainship/squads/req) "pPB" = ( @@ -28439,10 +28428,12 @@ dir = 1 }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1{ + dir = 4 + }, /turf/open/floor/prison/plate, /area/mainship/squads/req) "qSd" = ( @@ -28944,13 +28935,15 @@ /turf/open/floor/grass, /area/mainship/living/starboard_garden) "rhC" = ( -/obj/effect/spawner/random/misc/plant, /obj/effect/turf_decal/woodsiding{ dir = 9 }, /obj/machinery/camera/autoname/alt{ dir = 4 }, +/obj/structure/closet/secure_closet/req_officer, +/obj/item/whistle, +/obj/item/megaphone, /turf/open/floor/carpet, /area/mainship/squads/req) "ril" = ( @@ -29290,6 +29283,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt{ dir = 4 }, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, /turf/open/floor/carpet, /area/mainship/squads/req) "rwu" = ( @@ -31341,15 +31337,13 @@ /turf/open/floor/mainship/metal, /area/mainship/engineering/engineering_workshop) "sHT" = ( -/obj/structure/table/mainship, /obj/effect/turf_decal/woodsiding, /obj/machinery/light/mainship/small, /obj/item/tool/stamp/denied, /obj/item/tool/stamp{ name = "Quartermaster's stamp" }, -/obj/item/whistle, -/obj/item/megaphone, +/obj/structure/table/woodentable, /turf/open/floor/carpet, /area/mainship/squads/req) "sIq" = ( @@ -31601,6 +31595,14 @@ /obj/structure/curtain/open/shower, /turf/open/floor/plating/plating_catwalk/light, /area/mainship/squads/alpha) +"sQL" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "sQS" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -39935,15 +39937,6 @@ color = "#E2E0DC" }, /area/mainship/medical/surgery_hallway) -"yeg" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "yem" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -67754,8 +67747,8 @@ bCh izl rNK oxn -yeg -oJE +cBD +mIt oxC egq pPm @@ -68526,7 +68519,7 @@ rNK izl nlI arD -nfi +sQL pQT lWS jBI @@ -69812,7 +69805,7 @@ qoh kOO nsi oJz -aTP +oJE dFx grR wvU From 67cb99516aca255ea433db73358f3ed00eb0be23 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Fri, 9 Aug 2024 22:02:59 +0300 Subject: [PATCH 10/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 108 +++++++++++++++++----------- 1 file changed, 65 insertions(+), 43 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index 910a4f039b4..f4a19707f66 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -4022,6 +4022,13 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/hangar/droppod) +"ckT" = ( +/obj/machinery/vending/cargo_supply, +/obj/machinery/door/poddoor/shutters/mainship/req/ro{ + dir = 2 + }, +/turf/open/floor/prison/marked, +/area/mainship/squads/req) "ckU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1/alt{ dir = 8 @@ -4495,15 +4502,6 @@ /obj/machinery/camera/autoname/alt, /turf/open/floor/prison/cleanmarked, /area/mainship/hallways/hangar/droppod) -"cBD" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "cBI" = ( /obj/structure/closet/crate/radiation, /turf/open/floor/prison/marked, @@ -7151,10 +7149,10 @@ /turf/open/floor/mainship/terragov/north, /area/space) "egq" = ( -/obj/structure/paper_bin, /obj/item/clipboard, /obj/item/tool/pen, /obj/structure/table/woodentable, +/obj/structure/paper_bin, /turf/open/floor/carpet, /area/mainship/squads/req) "egt" = ( @@ -9589,6 +9587,14 @@ }, /turf/open/floor/mainship/metal/lino, /area/mainship/living/cafeteria) +"fua" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "fuC" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -17941,6 +17947,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/squads/alpha) +"kRi" = ( +/obj/structure/window/framed/mainship/alt, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/turf/open/floor/plating, +/area/mainship/squads/req) "kRF" = ( /obj/machinery/computer/navigation{ dir = 4 @@ -20955,11 +20970,17 @@ "myC" = ( /obj/effect/turf_decal/woodsiding, /obj/structure/table/woodentable, +/obj/item/folder/black_random{ + pixel_y = 2 + }, /obj/item/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner" + eftpos_name = "Cargo Bay EFTPOS scanner"; + pixel_y = 1; + pixel_x = 4 + }, +/obj/item/tool/hand_labeler{ + pixel_x = -4 }, -/obj/item/tool/hand_labeler, -/obj/item/folder/black_random, /turf/open/floor/carpet, /area/mainship/squads/req) "mze" = ( @@ -23279,7 +23300,16 @@ /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/hallways/port_hallway) "nQj" = ( -/obj/machinery/vending/cargo_supply, +/obj/structure/table/reinforced{ + layer = 2.1 + }, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/door/window/secure/req{ + dir = 2 + }, +/obj/machinery/door/window/right{ + dir = 1 + }, /obj/machinery/door/poddoor/shutters/mainship/req/ro{ dir = 2 }, @@ -24670,20 +24700,10 @@ /turf/open/floor/prison/plate, /area/mainship/squads/req) "oJE" = ( -/obj/structure/table/reinforced{ - layer = 2.1 - }, -/obj/machinery/door/firedoor/mainship, -/obj/machinery/door/window/secure/req{ - dir = 2 - }, -/obj/machinery/door/window/right{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/mainship/req/ro{ - dir = 2 +/obj/machinery/holopad, +/turf/open/floor/prison/yellow{ + dir = 4 }, -/turf/open/floor/prison/marked, /area/mainship/squads/req) "oJM" = ( /obj/item/radio/intercom/general{ @@ -29234,6 +29254,13 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk/dark, /area/mainship/engineering/engine_core) +"rud" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 8 + }, +/obj/machinery/holopad, +/turf/open/floor/carpet, +/area/mainship/squads/req) "rup" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -31339,9 +31366,12 @@ "sHT" = ( /obj/effect/turf_decal/woodsiding, /obj/machinery/light/mainship/small, -/obj/item/tool/stamp/denied, +/obj/item/tool/stamp/denied{ + pixel_x = -3 + }, /obj/item/tool/stamp{ - name = "Quartermaster's stamp" + name = "Quartermaster's stamp"; + pixel_x = 3 }, /obj/structure/table/woodentable, /turf/open/floor/carpet, @@ -31595,14 +31625,6 @@ /obj/structure/curtain/open/shower, /turf/open/floor/plating/plating_catwalk/light, /area/mainship/squads/alpha) -"sQL" = ( -/obj/structure/window/framed/mainship/alt, -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/turf/open/floor/plating, -/area/mainship/squads/req) "sQS" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -67747,9 +67769,9 @@ bCh izl rNK oxn -cBD +kRi mIt -oxC +rud egq pPm pQT @@ -68519,7 +68541,7 @@ rNK izl nlI arD -sQL +fua pQT lWS jBI @@ -69288,7 +69310,7 @@ oer oer oer oer -oer +oJE tXT oky rtB @@ -69805,7 +69827,7 @@ qoh kOO nsi oJz -oJE +nQj dFx grR wvU @@ -70062,7 +70084,7 @@ qoh lzD nsi oJz -nQj +ckT bRY lmN pys From eca03f17c5137fa67d44ca1afce756a3a169884c Mon Sep 17 00:00:00 2001 From: Helg2 Date: Sat, 10 Aug 2024 14:59:49 +0300 Subject: [PATCH 11/11] Update TGS_Talos.dmm --- _maps/map_files/Talos/TGS_Talos.dmm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index f4a19707f66..b5c5d6e35c0 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -4027,6 +4027,9 @@ /obj/machinery/door/poddoor/shutters/mainship/req/ro{ dir = 2 }, +/obj/structure/sign/semiotic/terminal{ + pixel_x = 32 + }, /turf/open/floor/prison/marked, /area/mainship/squads/req) "ckU" = ( @@ -24740,12 +24743,6 @@ }, /turf/open/floor/plating, /area/mainship/hull/upper_hull) -"oKV" = ( -/obj/structure/sign/semiotic/terminal{ - pixel_x = 32 - }, -/turf/closed/wall/mainship/alt, -/area/mainship/squads/req) "oLf" = ( /obj/structure/table/mainship, /obj/effect/spawner/random/clothing/hats, @@ -70341,7 +70338,7 @@ qoh kOO nsi muB -oKV +pQT hey qfG dui