From 200501c03e4c9c515daf556d4c5719f58906a0f8 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 24 Sep 2021 18:01:34 -0700 Subject: [PATCH 1/2] Update delta.dmm --- _maps/map_files/Delta/delta.dmm | 155 +++++++++++++++++++++++++++----- 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5b78075d0c9..3bfb75d72ea 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -5222,7 +5222,7 @@ /area/engine/controlroom) "ate" = ( /obj/structure/table/wood, -/obj/item/circuitboard/arcade, +/obj/item/circuitboard/arcade/battle, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -17321,7 +17321,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + req_access_txt = "46" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -61562,6 +61562,8 @@ /obj/machinery/door/airlock/glass{ name = "Cabin" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -63914,7 +63916,7 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "cJr" = ( -/obj/structure/table, +/obj/structure/table/glass, /obj/item/tank/internals/emergency_oxygen/nitrogen{ pixel_x = 5; pixel_y = 5 @@ -64555,10 +64557,6 @@ /turf/simulated/floor/wood, /area/hallway/primary/central) "cLd" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -64569,6 +64567,16 @@ dir = 4; network = list("SS13","Medical") }, +/obj/structure/table/glass, +/obj/item/storage/box/autoinjectors{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/iv_bags, +/obj/item/storage/box/pillbottles{ + pixel_x = -5; + pixel_y = -5 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -64734,6 +64742,9 @@ pixel_y = 28 }, /obj/machinery/cryopod, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -68890,10 +68901,7 @@ /obj/machinery/defibrillator_mount/loaded{ pixel_y = 30 }, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" - }, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -70774,8 +70782,14 @@ }, /area/medical/medbay) "cYM" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/structure/table, /obj/machinery/light/small, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -70854,6 +70868,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -74683,6 +74702,7 @@ /obj/item/storage/box/bodybags, /obj/item/pen, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -74768,6 +74788,7 @@ }, /obj/item/screwdriver, /obj/effect/decal/warning_stripes/north, +/obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79030,14 +79051,15 @@ dir = 1 }, /obj/structure/table, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, /obj/item/reagent_containers/spray/cleaner{ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner" }, -/obj/item/stack/medical/bruise_pack/advanced{ - pixel_x = -5; - pixel_y = 3 - }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -82321,6 +82343,10 @@ dir = 1; network = list("Medical","SS13") }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -95979,6 +96005,10 @@ layer = 4; pixel_y = -32 }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -97989,6 +98019,14 @@ icon_state = "neutral" }, /area/maintenance/fore2) +"ouw" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/crew_quarters/sleep) "oBE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/vending_refill/coffee, @@ -98000,6 +98038,17 @@ }, /turf/space, /area/space) +"oDf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "oDD" = ( /obj/structure/cable{ d1 = 4; @@ -98106,6 +98155,15 @@ }, /turf/simulated/floor/plasteel, /area/security/brig) +"oYe" = ( +/obj/machinery/cryopod, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "pcv" = ( /obj/structure/cable{ d1 = 1; @@ -99249,6 +99307,17 @@ icon_state = "grimy" }, /area/security/detectives_office) +"sZB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "sZT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99733,6 +99802,19 @@ icon_state = "red" }, /area/security/warden) +"urL" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "usl" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -99808,6 +99890,15 @@ /obj/item/seeds/ambrosia, /turf/simulated/floor/plating, /area/security/permabrig) +"uUH" = ( +/obj/machinery/cryopod/right, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "uVQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -99821,6 +99912,15 @@ icon_state = "wood-broken" }, /area/crew_quarters/theatre) +"uXu" = ( +/obj/machinery/cryopod/right, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "uYc" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -100214,6 +100314,13 @@ icon_state = "red" }, /area/hallway/secondary/exit) +"vUI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "vVf" = ( /obj/machinery/chem_dispenser, /obj/item/reagent_containers/glass/beaker/large, @@ -153880,13 +153987,13 @@ aFx cyY cyY cBY -cyY +uXu bmW cFv cGV cIl bmW -cyY +uUH cBY cyY cyY @@ -154137,13 +154244,13 @@ aFx cyZ cAr cAr -cAr +sZB cEv -cFv -cGV -cIk +urL +ouw +vUI cEv -cAr +oDf cAr cAr cQj @@ -154394,7 +154501,7 @@ aFx cza cAs cAs -cAs +oYe bmW bFh cGT From a72568804ce577506703dfe397a571a7530c92ce Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Fri, 24 Sep 2021 18:09:10 -0700 Subject: [PATCH 2/2] Update delta.dmm --- _maps/map_files/Delta/delta.dmm | 159 ++++++++++++++++---------------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 3bfb75d72ea..68fb67f6c9f 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -17420,6 +17420,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ + name = "Entertainment Office"; req_access_txt = "46" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -95764,6 +95765,17 @@ "gTW" = ( /turf/simulated/floor/plasteel, /area/security/securearmoury) +"gUi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "haD" = ( /obj/structure/cable{ d2 = 8; @@ -98019,14 +98031,6 @@ icon_state = "neutral" }, /area/maintenance/fore2) -"ouw" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/sleep) "oBE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/vending_refill/coffee, @@ -98038,17 +98042,6 @@ }, /turf/space, /area/space) -"oDf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/sleep) "oDD" = ( /obj/structure/cable{ d1 = 4; @@ -98155,10 +98148,10 @@ }, /turf/simulated/floor/plasteel, /area/security/brig) -"oYe" = ( -/obj/machinery/cryopod, +"oXY" = ( +/obj/machinery/cryopod/right, /obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -98249,6 +98242,13 @@ icon_state = "white" }, /area/toxins/misc_lab) +"plm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "pnF" = ( /obj/structure/window/reinforced, /turf/space, @@ -98505,6 +98505,15 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) +"qqh" = ( +/obj/machinery/cryopod, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "qqW" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave, @@ -99240,6 +99249,17 @@ }, /turf/simulated/floor/engine, /area/toxins/mixing) +"sOo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "sPS" = ( /obj/structure/cable, /obj/machinery/alarm{ @@ -99307,17 +99327,6 @@ icon_state = "grimy" }, /area/security/detectives_office) -"sZB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/sleep) "sZT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -99435,6 +99444,19 @@ /obj/item/paper_bin, /turf/simulated/floor/plating, /area/security/permabrig) +"tvI" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/crew_quarters/sleep) "txW" = ( /obj/structure/cable{ d1 = 4; @@ -99802,19 +99824,6 @@ icon_state = "red" }, /area/security/warden) -"urL" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "usl" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -99890,15 +99899,6 @@ /obj/item/seeds/ambrosia, /turf/simulated/floor/plating, /area/security/permabrig) -"uUH" = ( -/obj/machinery/cryopod/right, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/sleep) "uVQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -99912,15 +99912,6 @@ icon_state = "wood-broken" }, /area/crew_quarters/theatre) -"uXu" = ( -/obj/machinery/cryopod/right, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/crew_quarters/sleep) "uYc" = ( /obj/structure/closet/secure_closet/brig{ id = "Cell 3"; @@ -100138,6 +100129,14 @@ icon_state = "red" }, /area/security/brig) +"vzs" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/crew_quarters/sleep) "vzz" = ( /obj/machinery/light{ dir = 4 @@ -100314,13 +100313,6 @@ icon_state = "red" }, /area/hallway/secondary/exit) -"vUI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "vVf" = ( /obj/machinery/chem_dispenser, /obj/item/reagent_containers/glass/beaker/large, @@ -100372,6 +100364,15 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) +"why" = ( +/obj/machinery/cryopod/right, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/crew_quarters/sleep) "wmQ" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -153987,13 +153988,13 @@ aFx cyY cyY cBY -uXu +why bmW cFv cGV cIl bmW -uUH +oXY cBY cyY cyY @@ -154244,13 +154245,13 @@ aFx cyZ cAr cAr -sZB +gUi cEv -urL -ouw -vUI +tvI +vzs +plm cEv -oDf +sOo cAr cAr cQj @@ -154501,7 +154502,7 @@ aFx cza cAs cAs -oYe +qqh bmW bFh cGT