From 90569b8daa453831924fb2e0c973940b5ed6c63f Mon Sep 17 00:00:00 2001 From: Mycah142 <11076040+Mycah142@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:04:29 -0400 Subject: [PATCH] Sorter Room Disposal Chute Fix, Shipping Supplies (General Map PR) (#8327) * Fix Sorter Chute Disposal Chute leading to sorter somehow never had a trunk under it. Really ever. How in tarnation was this ever missed? * Add Stairwell From Club to Gym Use old NT 'janitor supply' as a hodgepodge stairwell up to the center of the gym. * Add Tagger/Wrap around map Added Destination Tagger and Package Wrap to Heads of Department rooms, and any existing instance of EFTPOS. * Neothology EFTPOS Made and added Neotheology EFTPOS to both the church stall, and the Preacher's office. * Add Tagger/Wrap to Library Makes a second spot that public Destination Tagger and Package Wrap are available to those outside departments or non-heads. * Remove Club Stairs Removes the "new" stairs from club to gym. * Corrected NT Windoor Access When I added the windoor to the agro room, I just made a copy of the NT shop windoor, assuming it had access proper. It didn't, so I added "Crematorium" access to the shop (which is limited to all clergy), and Agrolyte access to the agro windoor. * Map Spare Pulsar Power Bridge Added a spare Pulsar Power Bridge circuit to secured technical storage, so it exists as more than maint loot. --- maps/CEVEris/_CEV_Eris.dmm | 316 ++++++++++++++++++++----------------- 1 file changed, 175 insertions(+), 141 deletions(-) diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 08ba23a6929..982dee97da9 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -3757,6 +3757,8 @@ /obj/item/device/eftpos{ eftpos_name = "Ironhammer EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/wood, /area/eris/command/commander) "aiZ" = ( @@ -9353,14 +9355,10 @@ /area/eris/crew_quarters/fitness) "awt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) "awu" = ( @@ -39024,6 +39022,8 @@ /obj/item/reagent_containers/food/drinks/flask/shiny, /obj/item/device/eftpos, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/carpet/sblucarpet, /area/eris/crew_quarters/clubmanager) "bOj" = ( @@ -48605,6 +48605,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/electronics/circuitboard/pulsar_power_bridge{ + pixel_y = -2 + }, /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/storage/tech) "cmb" = ( @@ -55551,6 +55554,8 @@ /obj/item/device/eftpos{ eftpos_name = "Moebius Labs EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/carpet/purcarpet, /area/eris/command/meo) "cDX" = ( @@ -67894,6 +67899,8 @@ /obj/item/device/eftpos{ eftpos_name = "Technomancers EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/tiled/steel/brown_perforated, /area/eris/command/exultant) "diR" = ( @@ -69140,6 +69147,8 @@ /obj/item/device/eftpos{ eftpos_name = "Command EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/carpet/turcarpet, /area/eris/command/captain) "dlB" = ( @@ -73966,6 +73975,8 @@ /obj/item/device/eftpos{ eftpos_name = "Command EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/wood, /area/eris/command/fo/quarters) "dxd" = ( @@ -75131,6 +75142,8 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/carpet/sblucarpet, /area/eris/command/mbo) "dzY" = ( @@ -75904,14 +75917,6 @@ name = "Fitness Room" }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel/cargo, /area/eris/crew_quarters/fitness) "dBN" = ( @@ -75923,6 +75928,8 @@ /obj/item/device/eftpos{ eftpos_name = "Medbay EFTPOS scanner" }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/medical/reception) "dBO" = ( @@ -77769,7 +77776,8 @@ /obj/structure/table/standard, /obj/machinery/door/window{ dir = 1; - name = "NeoTheology Shop" + name = "NeoTheology Shop"; + req_access = list(27) }, /obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ @@ -93702,6 +93710,8 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/wood, /area/eris/crew_quarters/library) "euv" = ( @@ -93954,6 +93964,8 @@ "evf" = ( /obj/structure/table/standard, /obj/item/device/eftpos, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/tiled/steel/gray_platform, /area/eris/quartermaster/storage) "evg" = ( @@ -95223,6 +95235,8 @@ pixel_x = 26 }, /obj/item/reagent_containers/food/drinks/mug/aster, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/quartermaster/office) "exW" = ( @@ -95249,13 +95263,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/steel, /area/eris/storage/primary) -"eya" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/window_lwall_spawn/smartspawn, -/turf/simulated/open, -/area/eris/maintenance/section3deck1central) "eyd" = ( /obj/effect/window_lwall_spawn/smartspawn, /obj/machinery/door/firedoor, @@ -99179,6 +99186,10 @@ /obj/spawner/soda, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/hallway/side/section3deck2port) +"eVa" = ( +/obj/machinery/light, +/turf/simulated/floor/plating/under, +/area/eris/crew_quarters/kitchen) "eWR" = ( /obj/structure/table/rack, /obj/item/contraband/poster/placed{ @@ -99225,6 +99236,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/section3deck2port) "fbK" = ( @@ -99248,6 +99267,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/steel, /area/eris/crew_quarters/fitness) "ffH" = ( @@ -99669,16 +99692,18 @@ /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/churchcorridor) "gdl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, -/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/steel, /area/eris/hallway/side/section3deck2port) "gey" = ( @@ -100513,6 +100538,9 @@ dir = 1; pixel_y = -22 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel, /area/eris/crew_quarters/fitness) "hUQ" = ( @@ -100700,6 +100728,14 @@ }, /turf/simulated/floor/plating/under, /area/eris/maintenance/section3deck5starboard) +"iwg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel, +/area/eris/crew_quarters/fitness) "iwp" = ( /obj/structure/table/rack, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -101290,13 +101326,6 @@ }, /turf/simulated/floor/tiled/techmaint_cargo, /area/eris/medical/chemstor) -"jEd" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/gym, -/turf/simulated/floor/tiled/steel/techfloor, -/area/eris/crew_quarters/fitness) "jFt" = ( /obj/machinery/door/airlock/maintenance_common, /obj/structure/disposalpipe/segment, @@ -101585,7 +101614,16 @@ dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) @@ -101871,6 +101909,7 @@ /obj/item/device/radio/intercom{ pixel_y = 24 }, +/obj/machinery/camera/network/third_section, /turf/simulated/floor/tiled/white/brown_perforated, /area/eris/crew_quarters/fitness) "ldW" = ( @@ -102614,15 +102653,12 @@ /turf/simulated/floor/wood, /area/eris/crew_quarters/kitchen) "mFk" = ( -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "West APC"; pixel_x = -28 }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) "mKQ" = ( @@ -102887,18 +102923,6 @@ }, /turf/simulated/floor/tiled/dark/gray_platform, /area/eris/neotheology/altar) -"nsA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel/monofloor, -/area/eris/crew_quarters/fitness) "ntp" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, @@ -102934,10 +102958,9 @@ /area/eris/neotheology/bioprinter) "nAr" = ( /turf/simulated/floor/plating/under, -/area/eris/neotheology/chapel) +/area/eris/crew_quarters/kitchen) "nBk" = ( /obj/structure/table/reinforced, -/obj/structure/disposalpipe/segment, /obj/spawner/toy/figure, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/crew_quarters/fitness) @@ -103714,8 +103737,7 @@ "pvG" = ( /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_x = 3 + dir = 9 }, /turf/simulated/floor/tiled/white, /area/eris/crew_quarters/fitness) @@ -103910,10 +103932,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/eris/neotheology/office) "pYi" = ( +/obj/machinery/disposal, /obj/structure/disposalpipe/up{ - dir = 1 + dir = 4 }, -/obj/machinery/disposal, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/crew_quarters/fitness) "pYm" = ( @@ -104450,7 +104472,17 @@ /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/crew_quarters/fitness) "rqQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) "rtb" = ( @@ -104501,8 +104533,16 @@ /turf/simulated/floor/plating, /area/eris/engineering/atmos/storage) "rEb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) @@ -104578,17 +104618,13 @@ /turf/simulated/wall, /area/eris/rnd/lab) "rOg" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/tiled/steel, -/area/eris/hallway/side/section3deck2port) +/turf/simulated/floor/tiled/steel/monofloor, +/area/eris/crew_quarters/fitness) "rOp" = ( /obj/machinery/conveyor/northwest{ id = "hangar_to_disposal" @@ -104988,16 +105024,6 @@ }, /turf/simulated/floor/tiled/dark/golden, /area/eris/crew_quarters/janitor) -"sHp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/steel/monofloor, -/area/eris/crew_quarters/fitness) "sHI" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -105159,14 +105185,7 @@ /turf/simulated/floor/tiled/dark/golden, /area/eris/neotheology/chapel) "sZH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) "taz" = ( @@ -105320,9 +105339,6 @@ /obj/structure/cable/green, /turf/simulated/floor/carpet/sblucarpet, /area/eris/crew_quarters/clubmanager) -"tpd" = ( -/turf/simulated/wall, -/area/eris/neotheology/chapel) "tpE" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/bcarpet, @@ -105743,9 +105759,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel/monofloor, /area/eris/crew_quarters/fitness) "ukB" = ( @@ -105896,16 +105917,14 @@ /turf/simulated/wall, /area/eris/engineering/post) "uBj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/table/woodentable, +/obj/item/packageWrap, +/obj/item/device/destTagger, +/obj/item/device/eftpos{ + eftpos_name = "Neotheology EFTPOS scanner" }, -/turf/simulated/floor/tiled/steel, -/area/eris/hallway/side/section3deck2port) +/turf/simulated/floor/carpet/bcarpet, +/area/eris/neotheology/office) "uCf" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, @@ -106002,17 +106021,6 @@ }, /turf/simulated/floor/tiled/steel/gray_perforated, /area/eris/engineering/long_range_scanner) -"uQi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel/monofloor, -/area/eris/crew_quarters/fitness) "uVI" = ( /obj/structure/sign/faction/neotheology_cross/gold{ pixel_y = 32 @@ -106084,6 +106092,11 @@ /area/eris/engineering/engine_room) "vcS" = ( /obj/structure/table/standard, +/obj/item/device/eftpos{ + eftpos_name = "Neotheology EFTPOS scanner" + }, +/obj/item/packageWrap, +/obj/item/device/destTagger, /turf/simulated/floor/tiled/white/golden, /area/eris/neotheology/churchbooth) "vdS" = ( @@ -106194,6 +106207,7 @@ dir = 1 }, /obj/structure/railing, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plating/under, /area/eris/maintenance/sorter) "voT" = ( @@ -106336,6 +106350,23 @@ /obj/structure/jtb_pillar, /turf/simulated/floor/tiled/dark/danger, /area/eris/maintenance/junk) +"vGh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel/monofloor, +/area/eris/crew_quarters/fitness) "vGy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -106396,6 +106427,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel/cargo, /area/eris/crew_quarters/fitness) "vIQ" = ( @@ -106419,7 +106458,8 @@ /obj/machinery/door/firedoor, /obj/structure/table/woodentable, /obj/machinery/door/window{ - name = "Agrocultural Window" + name = "Agrocultural Window"; + req_access = list(73) }, /turf/simulated/floor/plating, /area/eris/crew_quarters/hydroponics) @@ -107085,6 +107125,12 @@ /obj/item/device/scanner/plant, /turf/simulated/floor/grass, /area/eris/crew_quarters/hydroponics/garden) +"xyn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel/techfloor, +/area/eris/crew_quarters/fitness) "xzg" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/steel/monofloor, @@ -107156,18 +107202,6 @@ "xIm" = ( /turf/simulated/wall/r_wall, /area/eris/hallway/side/section3port) -"xJN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel/monofloor, -/area/eris/crew_quarters/fitness) "xLv" = ( /obj/effect/shuttle_landmark/merc/sec2west, /turf/space, @@ -159875,7 +159909,7 @@ bmX oTR sfv ceX -tpE +uBj tpE kEr cJu @@ -204318,7 +204352,7 @@ cte evu cmE nAr -nAr +eVa wsA qtc efZ @@ -204721,8 +204755,8 @@ fuj cmE cmE cmE -tpd -tpd +mXZ +mXZ wsA qOT tSk @@ -204924,8 +204958,8 @@ cmE xNN pfh xNN -pfh xNN +pfh xNN xNN xNN @@ -244111,7 +244145,7 @@ fdQ dxq qyZ uXf -eSm +rOg mFk xLP uXf @@ -244313,8 +244347,8 @@ iMO dxq qyZ uXf -eSm tZw +eSm uXf fJu awr @@ -244517,7 +244551,7 @@ hEe mQJ rqQ sZH -uXf +xyn uXf awr uls @@ -244718,8 +244752,8 @@ awr mye gif rEb -xJN -jEd +eSm +xLP qeb awr jZP @@ -244919,8 +244953,8 @@ fdQ awr qxd uXf -sHp -nsA +ujt +eSm nBk pYi awr @@ -245122,7 +245156,7 @@ dxq qyZ uXf ujt -uQi +eSm cDi hSc awr @@ -245325,7 +245359,7 @@ qyZ uXf khZ awt -fex +iwg fex nNN oEI @@ -245525,8 +245559,8 @@ cDN awr qxd uXf -ujt -uQi +vGh +eSm wVm icS awr @@ -245930,7 +245964,7 @@ cEy cEy cEy fbD -uBj +vhi vhi vhi vhi @@ -246132,7 +246166,7 @@ eam guR ebV gdl -rOg +cDr cDr cDr cDr @@ -285521,7 +285555,7 @@ kLT erG emG erX -eya +blY aLZ aLZ aZv