diff --git a/_maps/cit_map_files/BoxStation/BoxStation.dmm b/_maps/cit_map_files/BoxStation/BoxStation.dmm index 470112f175..339ac253b2 100644 --- a/_maps/cit_map_files/BoxStation/BoxStation.dmm +++ b/_maps/cit_map_files/BoxStation/BoxStation.dmm @@ -25476,7 +25476,15 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bml" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/mineral/ore_redemption{ + input_dir = 4; + output_dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/eastleft{ + name = "ORM Access"; + req_access_txt = "64" + }, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/office) "bmm" = ( @@ -28833,9 +28841,6 @@ }, /area/quartermaster/office) "bud" = ( -/obj/effect/turf_decal/loading_area{ - dir = 1 - }, /turf/open/floor/plasteel/brown/corner{ dir = 8 }, @@ -56896,12 +56901,8 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "QoO" = ( -/obj/machinery/mineral/ore_redemption{ - input_dir = 2; - output_dir = 1 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/quartermaster/miningdock) "QoP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -60316,6 +60317,14 @@ }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"Qyg" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/quartermaster/office) +"Qyh" = ( +/obj/machinery/rnd/protolathe/department/cargo, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) (1,1,1) = {" aaa @@ -76408,7 +76417,7 @@ aaa aaa aaa aaa -QuO +QuN aaa aoV aaa @@ -76665,7 +76674,7 @@ aaa aaa aaa aaa -QuP +QuN aaa aoV aaa @@ -76922,7 +76931,7 @@ aaa aaa aaa aaa -QuQ +QuN aaa aoV aaa @@ -77179,7 +77188,7 @@ aaa aaa aaa aaa -QuR +QuN aaa aoV aaa @@ -77436,7 +77445,7 @@ aaa aaa aaa aaa -QuS +QuN aaa aoV aaa @@ -78979,9 +78988,9 @@ aaf aaf aaf aag -QuV +QuU QuX -Qvb +QuU bVx caf aoV @@ -80219,7 +80228,7 @@ Qtq Qtx QtC QtK -aKu +QtM aLF aLF aOs @@ -80471,7 +80480,7 @@ ayB QsU Qtb Qtk -Qtp +Qto Qtr Qty QtD @@ -80728,12 +80737,12 @@ ayB QsV Qtc aBT -aDs +Qto aEN aGb -QtE +Qtx +QtM QtM -aKu aLE aLE aOl @@ -80752,7 +80761,7 @@ aZF aZF bgy aZE -QoN +bjr bjr ama bmh @@ -80779,7 +80788,7 @@ aaa bCq bPV bCq -QuZ +QuY bTw bCq bVD @@ -81037,7 +81046,7 @@ bCq bPW QuW bSp -bTv +Qve bCq bVC bWx @@ -81760,8 +81769,8 @@ aDv aEP aGe QtH -QtN -aKu +QtM +QtM aLE aMS aOt @@ -81809,19 +81818,19 @@ bPY cOw bCq Qvf -Qvm -Qvu -QvE -QvP +Qvf +Qvf +Qvf +Qvf Qwa -Qwl -Qwv -cjn -cjn -cjn -cjn -cjn -cjn +Qvf +Qvf +Qvf +Qvf +Qvf +Qvf +Qvf +Qvf bUs bLv aaa @@ -82065,20 +82074,20 @@ bCq bPX bRg bRg -Qvg +Qvf Qvn bVG QvF QvQ -Qwb +Qvn Qwm -Qww -bcU +Qvf +Qvn QwJ bVG -bcU +Qvn Qxf -cjn +Qvf bUs bLv aaa @@ -82275,7 +82284,7 @@ Qtw QtB QtJ QtP -aKu +QtM aLE aMS aOi @@ -82307,7 +82316,7 @@ bOL bxy byF bwW -bGm +Qyh bCo bDk bEK @@ -82322,20 +82331,20 @@ bLv bQa bHE bHE -Qvh +Qvf Qvo Qvv QvG QvR Qwc -Qwn +QvR Qwx -QwD -QwK +QvR +QvR QwQ -QwZ +QwN Qxg -cjn +Qvf bUs bLv aaf @@ -82587,12 +82596,12 @@ QvS Qwd Qwo Qwy -QwE +Qwo QwL QwR cCa -bcU -cjn +Qvn +Qvf bUs bLv aaa @@ -82615,8 +82624,8 @@ QxL QxQ bgN QxU -QxX -Qyb +QxV +QxW bgN btG aaa @@ -82836,20 +82845,20 @@ bLv bHE bHE bSs -Qvj +Qvf Qvq Qvx QvI QvT -Qwe -bcU +Qvx +Qvn Qwz QwF cCa QwS Qxa Qxh -cjn +Qvf bUs bLv aaa @@ -82868,7 +82877,7 @@ Qxu btF bsc QxI -QxM +QxL QxR bgN QxV @@ -83073,10 +83082,10 @@ bnz bpA bbR bkM -bbR +bqs bud QoO -kSb +byE bAZ bGm bzF @@ -83093,20 +83102,20 @@ bCq bHE bRh bLu -Qvk +Qvf Qvr Qvy QvJ QvU Qwf Qwp -QwA -bcU +Qvf +Qvn QwM -QwT -Qxb +QwS +Qxa Qxi -cjn +Qvf bUs bLv aaf @@ -83125,12 +83134,12 @@ Qxv btG QxE bsc -QxN -QxS +QxL +QxQ bgN QxW -QxY -Qyd +QxV +QxU bgN btG aaa @@ -83350,20 +83359,20 @@ bCq bOK bCq bCq -Qvl +Qvf Qvs Qvz QvK QvV Qwg -Qwq -cjn -bcU +Qvf +Qvf +Qvn cCa QwU Qxc cCa -cjn +Qvf bUs bLv aaa @@ -83377,9 +83386,9 @@ coz cpn Qxn Qxo -Qxr +Qxo Qxw -QxA +Qxo QxF QxJ QxO @@ -83587,7 +83596,7 @@ boR bqs bbR bkM -bbR +Qyg bwd bxB bvL @@ -83609,18 +83618,18 @@ bLv aaa bLv Qvt -QvA -QvL -QvW -Qwh -Qwr -bcU -bcU -bcU +Qvz +Qvf +Qvf +Qvf +Qvf +Qvn +Qvn +Qvn QwV cCa Qxj -cjn +Qvf bUs bLv aaa @@ -83865,19 +83874,19 @@ bHE bLv aaf bLv -bUt -QvB +Qvt +Qvz QvM QvX Qwi Qws -bcU -QwG +Qvn +QwF QwN QwW -bcU -bcU -cjn +Qvn +Qvn +Qvf bUs bLv aaf @@ -83892,7 +83901,7 @@ cjJ cjJ aaa aaa -Qxy +Qxx aaf aaa aaa @@ -84122,19 +84131,19 @@ bLv bCq aaa bLv -bUt -QvC +Qvt +Qvz QvN QvY Qwj -Qwt +Qvf QwB QwH QwO QwX Qxd Qxk -cjn +Qvf bUs bCq aaa @@ -84149,7 +84158,7 @@ cpo cjJ aaa aaa -Qxz +Qxx aaf Qoi aaa @@ -84301,8 +84310,8 @@ afy agh abc Qrx -QrD -QrG +Qrx +Qrx aiV ajs akb @@ -84382,15 +84391,15 @@ bTB bUv QvD QvO -QvZ -Qwk -Qwu -QwC -QwI -QwP -QwY -Qxe -Qxl +QvO +QvO +QvO +QvO +QvO +QvO +QvO +QvO +QvO car bUs bCq @@ -84557,9 +84566,9 @@ aeK afx agg abc -Qry +Qrx QrE -QrH +Qrx aiV ajr aka @@ -84814,9 +84823,9 @@ aeN afA afA afA -Qrz -QrF -QrI +Qrx +Qrx +Qrx aiV aju akd @@ -87649,7 +87658,7 @@ aja akl akP alx -amh +Qsf ami aiX anw @@ -88212,10 +88221,10 @@ aaa Qoi aaa Quu -bsb -bsb -bsb -bsb +Quu +Quu +Quu +Quu aXf aJq byU @@ -88468,11 +88477,11 @@ aBb aBb Quq aaa -bsb +Quu Quw QuD QuG -bsb +Quu QuK aJq bBi @@ -88655,7 +88664,7 @@ aaa aaa aaa aaf -Qqx +Qqw aaf aaZ QqI @@ -88717,7 +88726,7 @@ aZR aZR aZR bft -QtZ +QtX aBa Quj bmv @@ -88725,7 +88734,7 @@ Qum bnT bpg aaa -bsb +Quu Qux buP bwm @@ -88912,12 +88921,12 @@ aaa aaa aaa aaf -Qqy +Qqw aaf aaZ -QqJ +QqI QqU -Qrd +Qrc aaZ acl cxA @@ -88930,7 +88939,7 @@ ahx ahS aiK QrN -QrP +QrO akm akT aly @@ -88974,7 +88983,7 @@ bbm bdh bee bfv -Qua +QtX aBa big aEM @@ -89169,10 +89178,10 @@ aaa aaa aaa aaf -Qqz +Qqw aaf aaZ -QqK +QqI QqV Qre aaZ @@ -89191,18 +89200,18 @@ ajI akl akS alx -amh +Qsf amp aiX anS aoy QsH QsK -QsM -QsN -QsO -QsP -QsQ +QsK +QsK +QsK +QsK +QsK QsS axB anz @@ -89231,7 +89240,7 @@ bcf bdg bed bfv -Qub +QtX aBa aBV bkZ @@ -89426,11 +89435,11 @@ aaa aaa aaa aaf -QqA +Qqw aaf aaZ -QqL -QqW +QqI +QqU Qrf aaZ Qrl @@ -89488,7 +89497,7 @@ bbm bdh bef bfv -Quc +QtX aBa Quk aEO @@ -89683,12 +89692,12 @@ aaa aaa aaa aaf -QqB +Qqw aaf aaZ QqM QqX -Qrg +Qrf aaZ Qrm coS @@ -89745,7 +89754,7 @@ aZR aZR aZR bfw -Qud +QtX aBa Qul bjy @@ -89753,7 +89762,7 @@ Qup bnW bpi aaa -bsb +Quu QuB buR bwo @@ -89940,7 +89949,7 @@ aaa aaa aaa aaf -QqC +Qqw aaf aaZ QqN @@ -89966,7 +89975,7 @@ amn amV Qsr anB -QsF +Qsn aod aqf ahT @@ -90010,11 +90019,11 @@ aBc aBc Qus aaa -bsb +Quu QuC QuF QuI -bsb +Quu QuL aJq bBu @@ -90197,7 +90206,7 @@ aaa aaa aaa aaf -QqD +Qqw aaf aaZ QqO @@ -90259,19 +90268,19 @@ bcg aZU beg aYB -Quf -Qui +QtX +Quh aaf aaf Qoi aaa Qoi aaa -bsb -bsb -bsb -bsb -bsb +Quu +Quu +Quu +Quu +Quu aJq aJq bBt @@ -90454,7 +90463,7 @@ aaa aaa aaa aaf -QqE +Qqw aaf aaZ QqP @@ -90477,9 +90486,9 @@ akr akX alC Qsk -amX -amX -amX +Qsk +Qsk +Qsk aoB aod aqe @@ -90734,8 +90743,8 @@ ahY akX Qse amo -amX -amX +Qsk +Qsk Qsz QsG QsI @@ -90970,7 +90979,7 @@ aaa aaa abp QqF -QqG +QqF QqQ abO abO @@ -90986,11 +90995,11 @@ ahA ahZ adR aiQ -QrU +QrO akt Qsc anw -Qsl +Qse Qsn anB QsA @@ -91247,10 +91256,10 @@ ajK aks akY anA -Qsm +Qse Qso amo -QsB +QsA aoC aod aqe @@ -91486,10 +91495,10 @@ abp abO abO QqR -Qrb -acq -acq -acq +QqR +QqR +QqR +QqR abO aew afe @@ -91506,7 +91515,7 @@ aiX akz alf Qsp -Qst +Qsp QsC aoF apo @@ -92001,9 +92010,9 @@ aco QqH QqS abR -abP -abP -abP +QqS +QqS +QqS abl abp abp diff --git a/_maps/cit_map_files/Deltastation/DeltaStation2.dmm b/_maps/cit_map_files/Deltastation/DeltaStation2.dmm index 7dfcc26f6d..97e633e4fb 100644 --- a/_maps/cit_map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/cit_map_files/Deltastation/DeltaStation2.dmm @@ -105034,13 +105034,8 @@ /turf/open/floor/plasteel/brown, /area/quartermaster/office) "ehK" = ( -/obj/machinery/mineral/ore_redemption{ - input_dir = 4; - output_dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/plasteel/neutral, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/quartermaster/miningoffice) "ehL" = ( /obj/structure/cable/white{ @@ -105534,6 +105529,20 @@ /obj/machinery/vending/kink, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"QOt" = ( +/obj/machinery/mineral/ore_redemption{ + input_dir = 2; + output_dir = 1 + }, +/obj/effect/turf_decal/stripes/box, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/southright{ + name = "ORM Access"; + req_access_txt = "64" + }, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel, +/area/quartermaster/miningoffice) (1,1,1) = {" aaa @@ -148817,7 +148826,7 @@ bgK bii bjU blR -baU +QOt boO bqZ bsT @@ -149542,7 +149551,7 @@ afj ahH abi aip -QOo +QOn ajb ajo ajP @@ -150314,7 +150323,7 @@ ahH abi ais aiI -QOp +QOn ajq aig akt diff --git a/_maps/cit_map_files/MetaStation/MetaStation.dmm b/_maps/cit_map_files/MetaStation/MetaStation.dmm index 697149f53e..0a5f1615a8 100644 --- a/_maps/cit_map_files/MetaStation/MetaStation.dmm +++ b/_maps/cit_map_files/MetaStation/MetaStation.dmm @@ -30886,6 +30886,10 @@ "bmh" = ( /obj/machinery/door/firedoor, /obj/machinery/mineral/ore_redemption, +/obj/machinery/door/window/southright{ + name = "ORM Access"; + req_access_txt = "64" + }, /turf/open/floor/plasteel/dark, /area/quartermaster/office) "bmi" = ( diff --git a/_maps/cit_map_files/OmegaStation/OmegaStation.dmm b/_maps/cit_map_files/OmegaStation/OmegaStation.dmm index ff81b52bb8..23d5a7960f 100644 --- a/_maps/cit_map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/cit_map_files/OmegaStation/OmegaStation.dmm @@ -7506,6 +7506,10 @@ input_dir = 4; output_dir = 8 }, +/obj/machinery/door/window/westright{ + name = "ORM Access"; + req_access_txt = "64" + }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "aoi" = ( diff --git a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm index f48fff1bbd..7b5d548f70 100644 --- a/_maps/cit_map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/cit_map_files/PubbyStation/PubbyStation.dmm @@ -19778,6 +19778,10 @@ input_dir = 4; output_dir = 8 }, +/obj/machinery/door/window/westright{ + name = "ORM Access"; + req_access_txt = "64" + }, /turf/open/floor/plasteel/dark, /area/quartermaster/office) "aWw" = (