diff --git a/archive/maps/cynosure/cynosure-6.dmm b/archive/maps/cynosure/cynosure-6.dmm index a4423a66b9..16cce7eb2b 100644 --- a/archive/maps/cynosure/cynosure-6.dmm +++ b/archive/maps/cynosure/cynosure-6.dmm @@ -814,8 +814,7 @@ }, /area/wizard_station) "aRp" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/sif, -/turf/simulated/sky/moving/north, +/turf/simulated/sky/moving/north/sif/planet_fall, /area/space) "aRw" = ( /obj/structure/window/reinforced/holowindow{ diff --git a/archive/maps/cynosure/turfs/outdoors.dm b/archive/maps/cynosure/turfs/outdoors.dm index d0d7e398a3..e7cb2f08ec 100644 --- a/archive/maps/cynosure/turfs/outdoors.dm +++ b/archive/maps/cynosure/turfs/outdoors.dm @@ -171,8 +171,8 @@ temperature = TCMB // Step trigger to fall down to planet Sif -/obj/effect/step_trigger/teleporter/planetary_fall/sif/find_planet() - planet = planet_sif +/turf/simulated/sky/moving/north/sif/planet_fall/find_planet() + return planet_sif //CHOMPedit: Changes to sif/planetuse snow to make it work properly as it does on Polaris, it was broken by YW edits. /turf/simulated/floor/outdoors/snow/sif/planetuse diff --git a/maps/tether_better/submaps/tether_misc.dmm b/archive/maps/old_yw/tether_better/submaps/tether_misc.dmm similarity index 100% rename from maps/tether_better/submaps/tether_misc.dmm rename to archive/maps/old_yw/tether_better/submaps/tether_misc.dmm diff --git a/maps/tether_better/tether-01-surface1.dmm b/archive/maps/old_yw/tether_better/tether-01-surface1.dmm similarity index 99% rename from maps/tether_better/tether-01-surface1.dmm rename to archive/maps/old_yw/tether_better/tether-01-surface1.dmm index 3ff410086b..f11936c57a 100644 --- a/maps/tether_better/tether-01-surface1.dmm +++ b/archive/maps/old_yw/tether_better/tether-01-surface1.dmm @@ -9597,13 +9597,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/vacant_site) -"aqP" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) "aqQ" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -50392,7 +50385,7 @@ ahx ahx apF apF -aqP +abR apF apF apF @@ -50534,7 +50527,7 @@ cZL haw pKR apF -aqP +abR apF arL arO @@ -50818,7 +50811,7 @@ xqZ qPs qhr apF -aqP +abR arl apF apF diff --git a/maps/tether_better/tether-02-surface2.dmm b/archive/maps/old_yw/tether_better/tether-02-surface2.dmm similarity index 99% rename from maps/tether_better/tether-02-surface2.dmm rename to archive/maps/old_yw/tether_better/tether-02-surface2.dmm index 128ce98d84..6958ca433a 100644 --- a/maps/tether_better/tether-02-surface2.dmm +++ b/archive/maps/old_yw/tether_better/tether-02-surface2.dmm @@ -17311,18 +17311,6 @@ }, /turf/simulated/floor, /area/bridge_hallway) -"aEN" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/commandmaint) "aEO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -25387,12 +25375,6 @@ }, /turf/simulated/floor/tiled, /area/janitor) -"aVy" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/janitor) "aVz" = ( /obj/machinery/door/airlock/maintenance{ name = "Custodial Maintenance"; @@ -46325,7 +46307,7 @@ aBW aCL aDC aAJ -aEN +azH aFp aGg aGK @@ -46467,7 +46449,7 @@ aze aCM aDD aAJ -aEN +azH aFp aFp aFp @@ -48339,7 +48321,7 @@ aSn atC aUc aUQ -aVy +aVx aWt aUc adt diff --git a/maps/tether_better/tether-03-surface3.dmm b/archive/maps/old_yw/tether_better/tether-03-surface3.dmm similarity index 100% rename from maps/tether_better/tether-03-surface3.dmm rename to archive/maps/old_yw/tether_better/tether-03-surface3.dmm diff --git a/maps/tether_better/tether_things.dm b/archive/maps/old_yw/tether_better/tether_things.dm similarity index 100% rename from maps/tether_better/tether_things.dm rename to archive/maps/old_yw/tether_better/tether_things.dm diff --git a/maps/yw/cryogaia-01-centcomm.dmm b/archive/maps/old_yw/yw/cryogaia-01-centcomm.dmm similarity index 100% rename from maps/yw/cryogaia-01-centcomm.dmm rename to archive/maps/old_yw/yw/cryogaia-01-centcomm.dmm diff --git a/maps/yw/cryogaia-02-mining.dmm b/archive/maps/old_yw/yw/cryogaia-02-mining.dmm similarity index 99% rename from maps/yw/cryogaia-02-mining.dmm rename to archive/maps/old_yw/yw/cryogaia-02-mining.dmm index bdf62ba749..1a24eed6d4 100644 --- a/maps/yw/cryogaia-02-mining.dmm +++ b/archive/maps/old_yw/yw/cryogaia-02-mining.dmm @@ -5738,21 +5738,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) -"pf" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/gateway) "pg" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -34652,7 +34637,7 @@ UK UK Mz TI -pf +bN hE Oc pr @@ -34976,7 +34961,7 @@ tv UK aX aX -pf +bN kG jH Oz @@ -35300,7 +35285,7 @@ UK UK aX aX -pf +bN kG oA Jn diff --git a/maps/yw/cryogaia-03-transit.dmm b/archive/maps/old_yw/yw/cryogaia-03-transit.dmm similarity index 100% rename from maps/yw/cryogaia-03-transit.dmm rename to archive/maps/old_yw/yw/cryogaia-03-transit.dmm diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/archive/maps/old_yw/yw/cryogaia-04-maintenance.dmm similarity index 99% rename from maps/yw/cryogaia-04-maintenance.dmm rename to archive/maps/old_yw/yw/cryogaia-04-maintenance.dmm index 9b5341ade2..ec58e3c52b 100644 --- a/maps/yw/cryogaia-04-maintenance.dmm +++ b/archive/maps/old_yw/yw/cryogaia-04-maintenance.dmm @@ -6921,12 +6921,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/central) -"eLt" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/aft) "eLM" = ( /obj/machinery/camera/network/medbay{ c_tag = "Medbay Psychiatric Isolation"; @@ -11909,12 +11903,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/security_lower) -"idC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/dormitory) "idM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14443,12 +14431,6 @@ }, /turf/simulated/floor/tiled, /area/security/prison) -"jBq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/medical_lower) "jBz" = ( /obj/machinery/door/morgue{ dir = 2; @@ -17324,16 +17306,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/coffee_shop) -"lfo" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor, -/area/maintenance/starboard) "lfy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17892,12 +17864,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway_lower) -"lyr" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/maintenance/aft) "lyy" = ( /obj/structure/sink{ dir = 8; @@ -17942,12 +17908,6 @@ }, /turf/simulated/floor/plating, /area/hallway/lower/central) -"lzG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/rnd/lab) "lzU" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/atmos, @@ -18429,12 +18389,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled, /area/engineering/atmos) -"lOA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "lPd" = ( /obj/item/frame, /obj/item/cell/high, @@ -21216,12 +21170,6 @@ }, /turf/simulated/floor/tiled, /area/security/perma) -"nOx" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "nOW" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -21897,16 +21845,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"oiA" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/maintenance/medical_lower) "oiP" = ( /obj/structure/cable{ icon_state = "1-4" @@ -22087,15 +22025,6 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/engineering/atmos) -"opN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/medical_lower) "oqQ" = ( /obj/structure/sign/poster, /turf/simulated/wall/titanium, @@ -24887,12 +24816,6 @@ can_open = 1 }, /area/maintenance/maintroom4) -"pZL" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor, -/area/maintenance/aft) "qan" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, @@ -28661,15 +28584,6 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/pyschwarde) -"sGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/maintenance/starboard) "sGz" = ( /obj/effect/floor_decal/techfloor, /obj/effect/decal/cleanable/dirt, @@ -28762,21 +28676,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/powercontrol) -"sJX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/security_lower) "sKi" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -33292,12 +33191,6 @@ }, /turf/simulated/floor/tiled, /area/security/prison) -"vvp" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "vvE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35029,12 +34922,6 @@ /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor, /area/maintenance/aft) -"wFh" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/medical_lower) "wFo" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/techfloor, @@ -35064,12 +34951,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) -"wGL" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "wHf" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -35152,12 +35033,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/medical/pyschwarde) -"wLl" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/aft) "wLE" = ( /obj/machinery/alarm{ dir = 1; @@ -35538,16 +35413,6 @@ }, /turf/simulated/floor/carpet/tealcarpet, /area/medical/pyschwarde) -"wYx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor, -/area/maintenance/starboard) "wYC" = ( /obj/structure/table/standard, /turf/simulated/floor/tiled/dark, @@ -36221,14 +36086,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/security_lower) -"xss" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor, -/area/maintenance/atmos_control) "xsx" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -36570,15 +36427,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/medical/virology) -"xBX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/medical_lower) "xCe" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -36903,12 +36751,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/tiled, /area/engineering/hallway_lower) -"xOi" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/rnd/lab) "xOq" = ( /obj/effect/floor_decal/techfloor, /obj/structure/table/steel, @@ -39369,10 +39211,10 @@ dEN dEN kGg arS -jBq -jBq -jBq -jBq +cmi +cmi +cmi +cmi kvG cOZ eCX @@ -41953,13 +41795,13 @@ ttU ttU ttU tZE -xBX +vMX pYh -xBX -xBX +vMX +vMX moY -xBX -xBX +vMX +vMX rQV ttU ixT @@ -42112,8 +41954,8 @@ dzL dzL tHV vMX -xBX -xBX +vMX +vMX krr dhM ttU @@ -42125,8 +41967,8 @@ ixT nwa ttU tZE -xBX -xBX +vMX +vMX xEC bkf sGd @@ -42285,7 +42127,7 @@ bsg kIJ ixT eDs -xBX +vMX krr ixT ixT @@ -42739,7 +42581,7 @@ sXK sXK sXK jvy -wFh +hmi ttU hWX ixT @@ -42901,7 +42743,7 @@ sXK uDI jFD jvy -wFh +hmi ttU ixT ixT @@ -43063,7 +42905,7 @@ jFD uDI sXK jvy -wFh +hmi ixT ixT ixT @@ -43225,7 +43067,7 @@ odm sXK gTY jvy -wFh +hmi wXa wXa wXa @@ -43549,7 +43391,7 @@ cfr sXK iYg jvy -wFh +hmi wXa aTH amp @@ -43711,7 +43553,7 @@ jvy jvy jvy jvy -wFh +hmi wXa xnr eZr @@ -44062,7 +43904,7 @@ hPJ xLU mbJ ttU -opN +aLl qDO xjr xjr @@ -44196,7 +44038,7 @@ gOL gOL ttU ttU -wFh +hmi wXa wXa jQW @@ -44224,7 +44066,7 @@ hPJ ttU ttU ttU -opN +aLl qDO xjr xjr @@ -44358,7 +44200,7 @@ gOL xpA ttU ttU -wFh +hmi wXa aTH aTH @@ -44386,7 +44228,7 @@ hPJ rtF ixT ixT -opN +aLl xjr xjr xjr @@ -44548,7 +44390,7 @@ hPJ ixT ixT ixT -opN +aLl xjr xjr xjr @@ -44587,10 +44429,10 @@ eQy eyv eyv oXR -xss -xss -xss -xss +exG +exG +exG +exG nqC sxb cRA @@ -44682,7 +44524,7 @@ kBN kBN ttU ttU -wFh +hmi wXa oIS ofm @@ -44844,7 +44686,7 @@ kMd enk sVd ttU -wFh +hmi wXa pZd pZd @@ -44871,7 +44713,7 @@ hPJ hPJ ixT ixT -opN +aLl ttU xVh xVh @@ -45033,7 +44875,7 @@ hPz ttU ixT ixT -opN +aLl jKZ kBU kBU @@ -45168,7 +45010,7 @@ aWX ixT tnA ttU -wFh +hmi tmF aTH aTH @@ -45195,7 +45037,7 @@ ixT ixT ixT ixT -opN +aLl jKZ kBU kBU @@ -45330,7 +45172,7 @@ kBN ttU ttU ttU -wFh +hmi wXa qGF ofm @@ -45357,7 +45199,7 @@ hPz ixT ixT ixT -opN +aLl ttU kBU kBU @@ -45519,7 +45361,7 @@ hPz ixT oUs ixT -opN +aLl ttU xVh xVh @@ -45536,7 +45378,7 @@ kBU cIS kBU ivy -sJX +muC jVK djb udl @@ -45652,7 +45494,7 @@ cJC qEB qEB ttU -wFh +hmi uHZ xYA oir @@ -45681,7 +45523,7 @@ hPz ixT ixT ixT -opN +aLl ttU tWY xVh @@ -45814,7 +45656,7 @@ qEB rWM kBN ttU -wFh +hmi fTc bek aCC @@ -45843,7 +45685,7 @@ hPz fvG hPz hPz -opN +aLl ttU xVh xVh @@ -45976,7 +45818,7 @@ kBN rWM kBN ylc -wFh +hmi cvo irB foB @@ -46005,7 +45847,7 @@ hPz hPz hPz hPz -opN +aLl ttU xjr kBU @@ -46138,7 +45980,7 @@ rWM rWM gOL ylc -wFh +hmi aCC aCC aCC @@ -46167,7 +46009,7 @@ hPz hPz hPz hPz -opN +aLl ttU xjr kBU @@ -46301,7 +46143,7 @@ rWM rWM ttU wwg -jBq +cmi gLx wLj pUA @@ -46491,7 +46333,7 @@ ixT oHN hPz hPz -opN +aLl ixT kBU kBU @@ -46653,7 +46495,7 @@ ixT ixT hPz hPz -opN +aLl ixT iOM nUX @@ -46816,7 +46658,7 @@ vEW vEW nBV xHW -jBq +cmi iVL xjr xjr @@ -47112,7 +46954,7 @@ ixT ixT lHO rXv -opN +aLl aCC aCC aCC @@ -47296,10 +47138,10 @@ ttU qhm bMw tey -jBq -jBq -jBq -jBq +cmi +cmi +cmi +cmi uwh ixT ukD @@ -48265,7 +48107,7 @@ bMw bMw bMw bMw -oiA +bNL cLR pOl pOl @@ -48987,7 +48829,7 @@ mgo qJa jhO aqo -pZL +bhY mgo mwy mwy @@ -49149,7 +48991,7 @@ jtl jtl mgo mgo -lyr +esO jtl mwy mwy @@ -49311,7 +49153,7 @@ mwy mwy mwy mgo -lyr +esO jtl mwy mwy @@ -49473,7 +49315,7 @@ mwy mwy mwy jtl -lyr +esO mgo gZI kOT @@ -49635,7 +49477,7 @@ mwy mwy mwy mgo -lyr +esO mgo emb emb @@ -49798,7 +49640,7 @@ mwy mwy mgo qJa -pZL +bhY emb mwy mwy @@ -49960,7 +49802,7 @@ mwy mwy mgo mgo -lyr +esO mgo mwy mwy @@ -50122,7 +49964,7 @@ mwy mwy mwy mgo -lyr +esO mgo mwy mwy @@ -50284,7 +50126,7 @@ mwy mwy mwy jtl -lyr +esO mgo mwy mwy @@ -50446,7 +50288,7 @@ mwy mwy mwy mgo -lyr +esO dsS dsS dsS @@ -50770,7 +50612,7 @@ ylk ylk mwy jtl -lyr +esO dsS wRC cps @@ -50932,7 +50774,7 @@ dSD ylk mwy tSf -lyr +esO dsS esn lhD @@ -51256,7 +51098,7 @@ dSD ylk mwy tSf -lyr +esO dsS dsS dsS @@ -51418,7 +51260,7 @@ aNK ylk mwy tSf -lyr +esO jtl mwy mwy @@ -51580,7 +51422,7 @@ dSD ylk mwy gHn -lyr +esO mgo mwy mwy @@ -51742,7 +51584,7 @@ lJW ylk mwy tSf -lyr +esO pWE mwy jOM @@ -51904,7 +51746,7 @@ bXg ylk mwy tSf -lyr +esO jtl mwy eXV @@ -52066,7 +51908,7 @@ dSD ylk mwy tSf -lyr +esO mgo mwy eXV @@ -52228,7 +52070,7 @@ dSD ylk mwy tSf -lyr +esO jtl mwy eXV @@ -52363,8 +52205,8 @@ aPa aPa vCU qwR -idC -idC +ezw +ezw oiP wxY nDO @@ -52390,7 +52232,7 @@ kyQ ylk mwy tSf -lyr +esO jtl mwy eXV @@ -52552,7 +52394,7 @@ dSD ylk mwy tSf -lyr +esO mgo mwy eXV @@ -52714,7 +52556,7 @@ dSD ylk mwy tSf -lyr +esO mgo mwy eXV @@ -52876,7 +52718,7 @@ dSD ylk mwy gHn -lyr +esO tSf hYh eXV @@ -53038,7 +52880,7 @@ ylk ylk mwy tSf -lyr +esO tSf eXV eXV @@ -53200,7 +53042,7 @@ mwy mwy mwy tSf -lyr +esO tSf krD frn @@ -53370,7 +53212,7 @@ gfC gfC gfC gfC -lzG +hXw oZh iyU iyU @@ -53524,13 +53366,13 @@ mwy mwy mwy mwy -lyr +esO tSf eXV eXV dVt -xOi -xOi +jnK +jnK tTk oSw mZu @@ -53693,7 +53535,7 @@ eXV agh gfC gfC -lzG +hXw sRu nYV eXV @@ -53847,7 +53689,7 @@ mgo mwy mwy mgo -lyr +esO mgo jtl mwy @@ -54009,7 +53851,7 @@ mgo mwy mwy mgo -lyr +esO mgo jqI eXV @@ -54171,7 +54013,7 @@ mgo mwy mwy mgo -lyr +esO mgo mgo eXV @@ -54335,7 +54177,7 @@ mwy mwy pis mwi -eLt +aqo tUf jnK jnK @@ -54495,7 +54337,7 @@ mgo nEM mwy mwy -lyr +esO mgo mgo eXV @@ -54646,7 +54488,7 @@ bUZ bUZ aqo bUZ -vvp +uAP tSf sVS sVS @@ -54657,8 +54499,8 @@ kqq kcm mgo mgo -wLl -pZL +naj +bhY mgo eXV gfC @@ -54970,14 +54812,14 @@ mgo mgo mgo mgo -wLl +naj bUZ bUZ bUZ bUZ nuR -eLt -eLt +aqo +aqo uAF bUZ ntU @@ -56055,7 +55897,7 @@ eNq eNq mwy whU -sGn +kHJ vko whU uvX @@ -56217,7 +56059,7 @@ mwy whU whU vvX -sGn +kHJ whU eNq eNq @@ -56530,7 +56372,7 @@ eNq hCe kra whU -sGn +kHJ eNq dQL fJI @@ -56692,7 +56534,7 @@ wvi wvi wvi fFg -wYx +mWc eNq mwy mwy @@ -57032,7 +56874,7 @@ mwy mwy mwy eNq -lfo +fJI fLA fLA fFg @@ -57242,10 +57084,10 @@ vSL mwy udc yaM -wGL +bUZ ptM -wGL -vvp +bUZ +uAP udc mgo dAi @@ -57403,11 +57245,11 @@ axO vSL vSL dYp -lOA +dAi mgo mgo mgo -lOA +dAi mgo mgo dAi @@ -57565,14 +57407,14 @@ xao xlE vSL udc -lOA +dAi mwy mwy mgo -wLl -wGL -wGL -nOx +naj +bUZ +bUZ +moD mgo mgo mwy @@ -57727,7 +57569,7 @@ xao uFV vSL udc -lOA +dAi mwy mwy mgo @@ -57889,7 +57731,7 @@ siZ vSL vSL udc -lOA +dAi mwy mwy mwy @@ -58208,9 +58050,9 @@ uQD rEb rEb jGr -wGL -wGL -wGL +bUZ +bUZ +bUZ xCp gdo mwy diff --git a/maps/yw/cryogaia-05-main.dmm b/archive/maps/old_yw/yw/cryogaia-05-main.dmm similarity index 99% rename from maps/yw/cryogaia-05-main.dmm rename to archive/maps/old_yw/yw/cryogaia-05-main.dmm index 27647fcf3a..ec7a7ee5a0 100644 --- a/maps/yw/cryogaia-05-main.dmm +++ b/archive/maps/old_yw/yw/cryogaia-05-main.dmm @@ -8302,12 +8302,6 @@ /obj/item/stamp/hop, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) -"dsa" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/maintenance/bridge) "dsc" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/corner/purple{ @@ -11330,21 +11324,6 @@ "eHU" = ( /turf/simulated/wall/titanium, /area/borealis2/outdoors/grounds/tower/northwest) -"eHX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/research_starboard) "eHZ" = ( /obj/machinery/space_heater, /obj/effect/floor_decal/industrial/outline/yellow, @@ -16298,12 +16277,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_processing) -"gEY" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/bridge) "gFj" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_waste) @@ -20486,12 +20459,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/research) -"ixA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/exit) "ixC" = ( /turf/simulated/floor/reinforced, /area/security/hangar) @@ -24986,15 +24953,6 @@ "krl" = ( /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"krm" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/bridge) "kru" = ( /turf/simulated/wall/r_wall, /area/storage/tech) @@ -35013,12 +34971,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/rdoffice) -"ovG" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/wall, -/area/medical/equipstorage) "ovN" = ( /obj/machinery/door/airlock/glass_external/freezable{ frequency = 1379; @@ -35172,15 +35124,6 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/quartermaster/miningwing) -"ozb" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay) "ozf" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, @@ -35695,15 +35638,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"oLV" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/bridge) "oLX" = ( /turf/simulated/floor/tiled/white, /area/medical/medbay_emt_bay) @@ -40684,12 +40618,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/shuttle/security) -"qPj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/civilian/atrium/central) "qPq" = ( /obj/structure/bed/chair/shuttle{ dir = 4; @@ -45620,12 +45548,6 @@ }, /turf/simulated/floor/outdoors/snow/snow/snow2/cryogaia, /area/borealis2/outdoors/grounds/power) -"sUN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker) "sVw" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -45954,12 +45876,6 @@ }, /turf/simulated/floor/tiled/red, /area/security/security_equiptment_storage) -"tep" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/security) "tey" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -48892,12 +48808,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) -"uyE" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay) "uyI" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -50124,12 +50034,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/docking_lounge) -"uZB" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/bridge) "vab" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -54862,12 +54766,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"wYu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/security) "wYx" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -56581,12 +56479,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/medbay) -"xJK" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay) "xJV" = ( /obj/machinery/vending/wallmed1{ name = "Emergency NanoMed"; @@ -62862,17 +62754,17 @@ uDf uDf nnc hBo -xJK -xJK +qBn +qBn wXT coH uPk -xJK +qBn jCo -xJK -xJK -xJK -xJK +qBn +qBn +qBn +qBn xmg nnc aWW @@ -63027,7 +62919,7 @@ eCm aWW aWW aWW -uyE +eCm nJA pZe pZe @@ -63035,7 +62927,7 @@ pZe pZe nJA swQ -uyE +eCm nnc aWW aWW @@ -63189,7 +63081,7 @@ eCm nnc ukZ aWW -uyE +eCm pZe jeE jeE @@ -63197,7 +63089,7 @@ jeE jeE pZe aWW -uyE +eCm fjm aWW aWW @@ -63347,7 +63239,7 @@ ugh eVf eVf oXO -ozb +cVL aWW fYt hSA @@ -66133,7 +66025,7 @@ svV lLS svV mXx -wYu +vYp tTP tTP jGD @@ -66263,7 +66155,7 @@ efL kFu xop qHn -ovG +jGa tUw qBU gYq @@ -66295,7 +66187,7 @@ uRB hnB svV uiJ -wYu +vYp uVX chs uVX @@ -66457,7 +66349,7 @@ uzj xpP svV poh -wYu +vYp uVX ebC knF @@ -66619,7 +66511,7 @@ aSY cLY svV uiJ -wYu +vYp uVX bLq vOa @@ -66781,7 +66673,7 @@ pVh dqu svV xiN -wYu +vYp uVX ahl atJ @@ -66943,7 +66835,7 @@ vKG wBq svV svV -wYu +vYp uVX uVX qDD @@ -67107,9 +66999,9 @@ lje svV ivn nqM -tep +pVO sNO -tep +pVO tIe dJS yiT @@ -67267,7 +67159,7 @@ cha wBq cpF svV -wYu +vYp jkL jkL sDk @@ -67429,7 +67321,7 @@ deu nQk mRg svV -wYu +vYp jkL pcr pOt @@ -67591,7 +67483,7 @@ lVg fKI gpQ svV -wYu +vYp jkL gOL pOt @@ -67753,7 +67645,7 @@ gqK xEv xNN svV -wYu +vYp jkL rHN aAM @@ -67915,7 +67807,7 @@ uzd svV svV svV -wYu +vYp jkL aPh fSD @@ -68841,7 +68733,7 @@ kqm pFD szR pFD -ixA +fGF jrL ndb odu @@ -71325,7 +71217,7 @@ hfp wBK hfp wrO -qPj +pBB ddl qMh xBE @@ -71627,7 +71519,7 @@ raN pWS rZJ wBj -qPj +pBB fVu ddl rZJ @@ -73566,8 +73458,8 @@ uDf uDf xbv aRm -uZB -uZB +dst +dst erT wkW jdZ @@ -73906,7 +73798,7 @@ ubC ubC ubC ubC -dsa +aRm fpL fSN wNP @@ -74230,7 +74122,7 @@ ubC vvB wDh ubC -gEY +aOp xbv xbv xbv @@ -74716,7 +74608,7 @@ iEL mYs pni ubC -gEY +aOp aQA aQA mAC @@ -74864,7 +74756,7 @@ uDf uDf xbv xbv -gEY +aOp xbv ubC xtL @@ -75026,7 +74918,7 @@ uDf uDf uDf xbv -gEY +aOp xbv rsl fQq @@ -75040,7 +74932,7 @@ mrm bbe ubC ubC -gEY +aOp aQA cXR mAC @@ -75095,7 +74987,7 @@ xNr qmv fUL lzM -eHX +bJU qzq kwz kwz @@ -75188,7 +75080,7 @@ uDf uDf uDf xbv -gEY +aOp xbv ubC lJK @@ -75513,7 +75405,7 @@ uDf uDf xbv xbv -krm +gKe ubC pSd mAX @@ -75526,7 +75418,7 @@ kOm bql ubC mDL -gEY +aOp hGQ xBO utl @@ -75688,7 +75580,7 @@ ubC ubC ubC xbv -gEY +aOp aQA saf rcM @@ -76669,7 +76561,7 @@ aac aac qNF qNF -oLV +mFx wZI kaa mkQ @@ -76877,7 +76769,7 @@ kgc gsc aKm clz -sUN +nLs mex aKm kwz diff --git a/maps/yw/cryogaia-06-upper.dmm b/archive/maps/old_yw/yw/cryogaia-06-upper.dmm similarity index 99% rename from maps/yw/cryogaia-06-upper.dmm rename to archive/maps/old_yw/yw/cryogaia-06-upper.dmm index 6e6344987d..4a423c1201 100644 --- a/maps/yw/cryogaia-06-upper.dmm +++ b/archive/maps/old_yw/yw/cryogaia-06-upper.dmm @@ -620,13 +620,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion) -"bC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/cryogaia/station/hallway/primary/upper/south) "bD" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/portables_connector{ @@ -12686,12 +12679,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) -"Zg" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/borealis2/elevator/uppermining) "Zh" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -29808,7 +29795,7 @@ ae ae ae ah -bC +ae xy aS mD @@ -30130,8 +30117,8 @@ mD eT eT Ep -Zg -Zg +af +af yB Ky bR diff --git a/maps/yw/cryogaia-07-misc.dmm b/archive/maps/old_yw/yw/cryogaia-07-misc.dmm similarity index 99% rename from maps/yw/cryogaia-07-misc.dmm rename to archive/maps/old_yw/yw/cryogaia-07-misc.dmm index 933066452f..0c831c6a77 100644 --- a/maps/yw/cryogaia-07-misc.dmm +++ b/archive/maps/old_yw/yw/cryogaia-07-misc.dmm @@ -5018,9 +5018,6 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) -"yO" = ( -/turf/unsimulated/wall, -/area) "yR" = ( /obj/machinery/mech_recharger, /turf/unsimulated/floor{ @@ -10505,7 +10502,7 @@ sv sv sv sv -yO +sv zR Xn Xn diff --git a/maps/yw/cryogaia-09-wilderness.dmm b/archive/maps/old_yw/yw/cryogaia-09-wilderness.dmm similarity index 100% rename from maps/yw/cryogaia-09-wilderness.dmm rename to archive/maps/old_yw/yw/cryogaia-09-wilderness.dmm diff --git a/maps/yw/cryogaia-10-caves.dmm b/archive/maps/old_yw/yw/cryogaia-10-caves.dmm similarity index 100% rename from maps/yw/cryogaia-10-caves.dmm rename to archive/maps/old_yw/yw/cryogaia-10-caves.dmm diff --git a/maps/yw/cryogaia.dm b/archive/maps/old_yw/yw/cryogaia.dm similarity index 100% rename from maps/yw/cryogaia.dm rename to archive/maps/old_yw/yw/cryogaia.dm diff --git a/maps/yw/cryogaia_areas.dm b/archive/maps/old_yw/yw/cryogaia_areas.dm similarity index 100% rename from maps/yw/cryogaia_areas.dm rename to archive/maps/old_yw/yw/cryogaia_areas.dm diff --git a/maps/yw/cryogaia_defines.dm b/archive/maps/old_yw/yw/cryogaia_defines.dm similarity index 100% rename from maps/yw/cryogaia_defines.dm rename to archive/maps/old_yw/yw/cryogaia_defines.dm diff --git a/maps/yw/cryogaia_jobs.dm b/archive/maps/old_yw/yw/cryogaia_jobs.dm similarity index 100% rename from maps/yw/cryogaia_jobs.dm rename to archive/maps/old_yw/yw/cryogaia_jobs.dm diff --git a/maps/yw/cryogaia_shuttle_defs.dm b/archive/maps/old_yw/yw/cryogaia_shuttle_defs.dm similarity index 100% rename from maps/yw/cryogaia_shuttle_defs.dm rename to archive/maps/old_yw/yw/cryogaia_shuttle_defs.dm diff --git a/maps/yw/cryogaia_shuttles.dm b/archive/maps/old_yw/yw/cryogaia_shuttles.dm similarity index 100% rename from maps/yw/cryogaia_shuttles.dm rename to archive/maps/old_yw/yw/cryogaia_shuttles.dm diff --git a/maps/yw/cryogaia_telecomms.dm b/archive/maps/old_yw/yw/cryogaia_telecomms.dm similarity index 100% rename from maps/yw/cryogaia_telecomms.dm rename to archive/maps/old_yw/yw/cryogaia_telecomms.dm diff --git a/maps/yw/cryogaia_things.dm b/archive/maps/old_yw/yw/cryogaia_things.dm similarity index 100% rename from maps/yw/cryogaia_things.dm rename to archive/maps/old_yw/yw/cryogaia_things.dm diff --git a/maps/yw/cryogaia_turfs.dm b/archive/maps/old_yw/yw/cryogaia_turfs.dm similarity index 100% rename from maps/yw/cryogaia_turfs.dm rename to archive/maps/old_yw/yw/cryogaia_turfs.dm diff --git a/maps/yw/elevator_areas.dm b/archive/maps/old_yw/yw/elevator_areas.dm similarity index 100% rename from maps/yw/elevator_areas.dm rename to archive/maps/old_yw/yw/elevator_areas.dm diff --git a/maps/yw/icons/mob/sc_suit.dmi b/archive/maps/old_yw/yw/icons/mob/sc_suit.dmi similarity index 100% rename from maps/yw/icons/mob/sc_suit.dmi rename to archive/maps/old_yw/yw/icons/mob/sc_suit.dmi diff --git a/maps/yw/icons/mob/sc_under.dmi b/archive/maps/old_yw/yw/icons/mob/sc_under.dmi similarity index 100% rename from maps/yw/icons/mob/sc_under.dmi rename to archive/maps/old_yw/yw/icons/mob/sc_under.dmi diff --git a/maps/yw/icons/mob/species/teshari/sc_suit.dmi b/archive/maps/old_yw/yw/icons/mob/species/teshari/sc_suit.dmi similarity index 100% rename from maps/yw/icons/mob/species/teshari/sc_suit.dmi rename to archive/maps/old_yw/yw/icons/mob/species/teshari/sc_suit.dmi diff --git a/maps/yw/icons/mob/species/teshari/sc_uniform.dmi b/archive/maps/old_yw/yw/icons/mob/species/teshari/sc_uniform.dmi similarity index 100% rename from maps/yw/icons/mob/species/teshari/sc_uniform.dmi rename to archive/maps/old_yw/yw/icons/mob/species/teshari/sc_uniform.dmi diff --git a/maps/yw/icons/obj/sc_hats.dmi b/archive/maps/old_yw/yw/icons/obj/sc_hats.dmi similarity index 100% rename from maps/yw/icons/obj/sc_hats.dmi rename to archive/maps/old_yw/yw/icons/obj/sc_hats.dmi diff --git a/maps/yw/icons/obj/sc_suit.dmi b/archive/maps/old_yw/yw/icons/obj/sc_suit.dmi similarity index 100% rename from maps/yw/icons/obj/sc_suit.dmi rename to archive/maps/old_yw/yw/icons/obj/sc_suit.dmi diff --git a/maps/yw/icons/obj/sc_ties.dmi b/archive/maps/old_yw/yw/icons/obj/sc_ties.dmi similarity index 100% rename from maps/yw/icons/obj/sc_ties.dmi rename to archive/maps/old_yw/yw/icons/obj/sc_ties.dmi diff --git a/maps/yw/icons/obj/sc_uniforms.dmi b/archive/maps/old_yw/yw/icons/obj/sc_uniforms.dmi similarity index 100% rename from maps/yw/icons/obj/sc_uniforms.dmi rename to archive/maps/old_yw/yw/icons/obj/sc_uniforms.dmi diff --git a/maps/yw/items/clothing/sc_accessory.dm b/archive/maps/old_yw/yw/items/clothing/sc_accessory.dm similarity index 100% rename from maps/yw/items/clothing/sc_accessory.dm rename to archive/maps/old_yw/yw/items/clothing/sc_accessory.dm diff --git a/maps/yw/items/clothing/sc_suit.dm b/archive/maps/old_yw/yw/items/clothing/sc_suit.dm similarity index 100% rename from maps/yw/items/clothing/sc_suit.dm rename to archive/maps/old_yw/yw/items/clothing/sc_suit.dm diff --git a/maps/yw/items/clothing/sc_under.dm b/archive/maps/old_yw/yw/items/clothing/sc_under.dm similarity index 100% rename from maps/yw/items/clothing/sc_under.dm rename to archive/maps/old_yw/yw/items/clothing/sc_under.dm diff --git a/maps/yw/items/encryptionkey_sc.dm b/archive/maps/old_yw/yw/items/encryptionkey_sc.dm similarity index 100% rename from maps/yw/items/encryptionkey_sc.dm rename to archive/maps/old_yw/yw/items/encryptionkey_sc.dm diff --git a/maps/yw/items/encryptionkey_vr.dm b/archive/maps/old_yw/yw/items/encryptionkey_vr.dm similarity index 100% rename from maps/yw/items/encryptionkey_vr.dm rename to archive/maps/old_yw/yw/items/encryptionkey_vr.dm diff --git a/maps/yw/items/headset_sc.dm b/archive/maps/old_yw/yw/items/headset_sc.dm similarity index 100% rename from maps/yw/items/headset_sc.dm rename to archive/maps/old_yw/yw/items/headset_sc.dm diff --git a/maps/yw/items/headset_vr.dm b/archive/maps/old_yw/yw/items/headset_vr.dm similarity index 100% rename from maps/yw/items/headset_vr.dm rename to archive/maps/old_yw/yw/items/headset_vr.dm diff --git a/maps/yw/items/icepick.dm b/archive/maps/old_yw/yw/items/icepick.dm similarity index 100% rename from maps/yw/items/icepick.dm rename to archive/maps/old_yw/yw/items/icepick.dm diff --git a/maps/yw/job/outfits.dm b/archive/maps/old_yw/yw/job/outfits.dm similarity index 100% rename from maps/yw/job/outfits.dm rename to archive/maps/old_yw/yw/job/outfits.dm diff --git a/maps/yw/job/outfits_yw.dm b/archive/maps/old_yw/yw/job/outfits_yw.dm similarity index 100% rename from maps/yw/job/outfits_yw.dm rename to archive/maps/old_yw/yw/job/outfits_yw.dm diff --git a/maps/yw/residential/_residential.dm b/archive/maps/old_yw/yw/residential/_residential.dm similarity index 100% rename from maps/yw/residential/_residential.dm rename to archive/maps/old_yw/yw/residential/_residential.dm diff --git a/maps/yw/residential/backup/residential.dmm b/archive/maps/old_yw/yw/residential/backup/residential.dmm similarity index 99% rename from maps/yw/residential/backup/residential.dmm rename to archive/maps/old_yw/yw/residential/backup/residential.dmm index ff87db34ec..005eb78867 100644 --- a/maps/yw/residential/backup/residential.dmm +++ b/archive/maps/old_yw/yw/residential/backup/residential.dmm @@ -2527,14 +2527,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/residential/medbay) -"hH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/residential/corridors) "hI" = ( /obj/machinery/power/apc{ dir = 8; @@ -37708,9 +37700,9 @@ gg gG hh hr -hH -hH -hH +eQ +eQ +eQ hN eP aa diff --git a/maps/yw/residential/residential.dmm b/archive/maps/old_yw/yw/residential/residential.dmm similarity index 99% rename from maps/yw/residential/residential.dmm rename to archive/maps/old_yw/yw/residential/residential.dmm index e30406535a..99041eea90 100644 --- a/maps/yw/residential/residential.dmm +++ b/archive/maps/old_yw/yw/residential/residential.dmm @@ -7409,14 +7409,6 @@ /mob/living/bot/cleanbot, /turf/simulated/floor/wood, /area/residential/mansion) -"NT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/residential/corridors) "NV" = ( /obj/item/soap/syndie, /obj/structure/table/marble, @@ -26977,9 +26969,9 @@ Av ap nQ nx -NT -NT -NT +Et +Et +Et Xy YI aZ diff --git a/maps/yw/residential/residential_keys.dm b/archive/maps/old_yw/yw/residential/residential_keys.dm similarity index 100% rename from maps/yw/residential/residential_keys.dm rename to archive/maps/old_yw/yw/residential/residential_keys.dm diff --git a/maps/yw/scratchmap.dmm b/archive/maps/old_yw/yw/scratchmap.dmm similarity index 100% rename from maps/yw/scratchmap.dmm rename to archive/maps/old_yw/yw/scratchmap.dmm diff --git a/maps/yw/service_elevator_things.dm b/archive/maps/old_yw/yw/service_elevator_things.dm similarity index 100% rename from maps/yw/service_elevator_things.dm rename to archive/maps/old_yw/yw/service_elevator_things.dm diff --git a/maps/yw/structures/closets/engineering.dm b/archive/maps/old_yw/yw/structures/closets/engineering.dm similarity index 100% rename from maps/yw/structures/closets/engineering.dm rename to archive/maps/old_yw/yw/structures/closets/engineering.dm diff --git a/maps/yw/structures/closets/medical.dm b/archive/maps/old_yw/yw/structures/closets/medical.dm similarity index 100% rename from maps/yw/structures/closets/medical.dm rename to archive/maps/old_yw/yw/structures/closets/medical.dm diff --git a/maps/yw/structures/closets/misc.dm b/archive/maps/old_yw/yw/structures/closets/misc.dm similarity index 100% rename from maps/yw/structures/closets/misc.dm rename to archive/maps/old_yw/yw/structures/closets/misc.dm diff --git a/maps/yw/structures/closets/misc_vr.dm b/archive/maps/old_yw/yw/structures/closets/misc_vr.dm similarity index 100% rename from maps/yw/structures/closets/misc_vr.dm rename to archive/maps/old_yw/yw/structures/closets/misc_vr.dm diff --git a/maps/yw/structures/closets/research.dm b/archive/maps/old_yw/yw/structures/closets/research.dm similarity index 100% rename from maps/yw/structures/closets/research.dm rename to archive/maps/old_yw/yw/structures/closets/research.dm diff --git a/maps/yw/structures/closets/security.dm b/archive/maps/old_yw/yw/structures/closets/security.dm similarity index 100% rename from maps/yw/structures/closets/security.dm rename to archive/maps/old_yw/yw/structures/closets/security.dm diff --git a/maps/yw/submaps/_cryogaia_submaps.dm b/archive/maps/old_yw/yw/submaps/_cryogaia_submaps.dm similarity index 100% rename from maps/yw/submaps/_cryogaia_submaps.dm rename to archive/maps/old_yw/yw/submaps/_cryogaia_submaps.dm diff --git a/maps/yw/submaps/admin_ships/adminship.dm b/archive/maps/old_yw/yw/submaps/admin_ships/adminship.dm similarity index 100% rename from maps/yw/submaps/admin_ships/adminship.dm rename to archive/maps/old_yw/yw/submaps/admin_ships/adminship.dm diff --git a/maps/yw/submaps/admin_ships/adminship.dmm b/archive/maps/old_yw/yw/submaps/admin_ships/adminship.dmm similarity index 99% rename from maps/yw/submaps/admin_ships/adminship.dmm rename to archive/maps/old_yw/yw/submaps/admin_ships/adminship.dmm index 325215f66f..a0b51fdc06 100644 --- a/maps/yw/submaps/admin_ships/adminship.dmm +++ b/archive/maps/old_yw/yw/submaps/admin_ships/adminship.dmm @@ -190,6 +190,7 @@ frequency = 1380; id_tag = "adminshuttle_docker"; pixel_x = -30; + }, /turf/simulated/shuttle/floor/voidcraft/light, /area/shuttle/adminshuttle) @@ -2740,6 +2741,7 @@ frequency = 1380; id_tag = "adminshuttle_bay"; pixel_x = 30; + }, /turf/simulated/floor/tiled/techfloor, /area/ship/adminships/engine_bay) diff --git a/maps/yw/submaps/admin_use/fun.dm b/archive/maps/old_yw/yw/submaps/admin_use/fun.dm similarity index 100% rename from maps/yw/submaps/admin_use/fun.dm rename to archive/maps/old_yw/yw/submaps/admin_use/fun.dm diff --git a/maps/yw/submaps/admin_use/spa.dmm b/archive/maps/old_yw/yw/submaps/admin_use/spa.dmm similarity index 100% rename from maps/yw/submaps/admin_use/spa.dmm rename to archive/maps/old_yw/yw/submaps/admin_use/spa.dmm diff --git a/maps/yw/submaps/aerostat/_aerostat.dm b/archive/maps/old_yw/yw/submaps/aerostat/_aerostat.dm similarity index 100% rename from maps/yw/submaps/aerostat/_aerostat.dm rename to archive/maps/old_yw/yw/submaps/aerostat/_aerostat.dm diff --git a/maps/yw/submaps/aerostat/aerostat.dmm b/archive/maps/old_yw/yw/submaps/aerostat/aerostat.dmm similarity index 99% rename from maps/yw/submaps/aerostat/aerostat.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/aerostat.dmm index c17d798e34..4ed481360a 100644 --- a/maps/yw/submaps/aerostat/aerostat.dmm +++ b/archive/maps/old_yw/yw/submaps/aerostat/aerostat.dmm @@ -314,12 +314,6 @@ }, /turf/simulated/floor/bluegrid/bor4, /area/cryogaia_away/aerostat/inside) -"aQ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/bluegrid/bor4, -/area/cryogaia_away/aerostat/inside) "aR" = ( /obj/machinery/light/small, /turf/simulated/floor/bluegrid/bor4, @@ -11405,7 +11399,7 @@ cI be ac aK -aQ +aM dn dn dN diff --git a/maps/yw/submaps/aerostat/backup/aerostat.dmm b/archive/maps/old_yw/yw/submaps/aerostat/backup/aerostat.dmm similarity index 99% rename from maps/yw/submaps/aerostat/backup/aerostat.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/backup/aerostat.dmm index 8d5867cc48..ef59c103e8 100644 --- a/maps/yw/submaps/aerostat/backup/aerostat.dmm +++ b/archive/maps/old_yw/yw/submaps/aerostat/backup/aerostat.dmm @@ -314,12 +314,6 @@ }, /turf/simulated/floor/bluegrid/bor4, /area/cryogaia_away/aerostat/inside) -"aQ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/bluegrid/bor4, -/area/cryogaia_away/aerostat/inside) "aR" = ( /obj/machinery/light/small, /turf/simulated/floor/bluegrid/bor4, @@ -11434,7 +11428,7 @@ cI be ac aK -aQ +aM dn dn dN diff --git a/maps/yw/submaps/aerostat/submaps/Blackshuttledown.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Blackshuttledown.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Blackshuttledown.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Blackshuttledown.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Boombase.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Boombase.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Boombase.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Boombase.dmm diff --git a/maps/yw/submaps/aerostat/submaps/CaveS.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/CaveS.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/CaveS.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/CaveS.dmm diff --git a/maps/yw/submaps/aerostat/submaps/DJOutpost1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/DJOutpost1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/DJOutpost1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/DJOutpost1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/DJOutpost2.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/DJOutpost2.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/DJOutpost2.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/DJOutpost2.dmm diff --git a/maps/yw/submaps/aerostat/submaps/DecoupledEngine.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/DecoupledEngine.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/DecoupledEngine.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/DecoupledEngine.dmm diff --git a/maps/yw/submaps/aerostat/submaps/DoomP.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/DoomP.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/DoomP.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/DoomP.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Drugden.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Drugden.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Drugden.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Drugden.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Epod3.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Epod3.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Epod3.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Epod3.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Epod4.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Epod4.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Epod4.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Epod4.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Flake.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Flake.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Flake.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Flake.dmm diff --git a/maps/yw/submaps/aerostat/submaps/GovPatrol.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/GovPatrol.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/GovPatrol.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/GovPatrol.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Lab1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Lab1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Lab1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Lab1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/MCamp1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/MCamp1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/MCamp1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/MCamp1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/MHR.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/MHR.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/MHR.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/MHR.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Manor1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Manor1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Manor1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Manor1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Mudpit.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Mudpit.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Mudpit.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Mudpit.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Musk.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Musk.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Musk.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Musk.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Rocky1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Rocky1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Rocky1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Rocky1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Rocky4.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Rocky4.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Rocky4.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Rocky4.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Rockybase.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Rockybase.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Rockybase.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Rockybase.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Shack1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Shack1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Shack1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Shack1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Smol1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Smol1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Smol1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Smol1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/Snowrock1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/Snowrock1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/Snowrock1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/Snowrock1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Blackshuttledown.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Blackshuttledown.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Blackshuttledown.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Blackshuttledown.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Boombase.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Boombase.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Boombase.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Boombase.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/CaveS.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/CaveS.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/CaveS.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/CaveS.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/DJOutpost1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DJOutpost1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/DJOutpost1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DJOutpost1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/DJOutpost2.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DJOutpost2.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/DJOutpost2.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DJOutpost2.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/DecoupledEngine.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DecoupledEngine.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/DecoupledEngine.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DecoupledEngine.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/DoomP.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DoomP.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/DoomP.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/DoomP.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Drugden.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Drugden.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Drugden.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Drugden.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Epod3.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Epod3.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Epod3.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Epod3.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Epod4.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Epod4.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Epod4.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Epod4.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Flake.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Flake.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Flake.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Flake.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/GovPatrol.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/GovPatrol.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/GovPatrol.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/GovPatrol.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Lab1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Lab1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Lab1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Lab1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/MCamp1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/MCamp1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/MCamp1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/MCamp1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/MHR.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/MHR.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/MHR.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/MHR.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Manor1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Manor1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Manor1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Mudpit.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Mudpit.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Mudpit.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Mudpit.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Rocky1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rocky1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Rocky1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rocky1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Rocky4.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rocky4.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Rocky4.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rocky4.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Rockybase.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rockybase.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Rockybase.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Rockybase.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Shack1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Shack1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Shack1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Smol1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Smol1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Smol1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Smol1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/Snowrock1.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Snowrock1.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/Snowrock1.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/Snowrock1.dmm diff --git a/maps/yw/submaps/aerostat/submaps/backup/butchershack.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/butchershack.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/backup/butchershack.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/backup/butchershack.dmm diff --git a/maps/yw/submaps/aerostat/submaps/butchershack.dmm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/butchershack.dmm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/butchershack.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/butchershack.dmm diff --git a/maps/yw/submaps/aerostat/submaps/virgo2.dm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/virgo2.dm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/virgo2.dm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/virgo2.dm diff --git a/maps/yw/submaps/aerostat/submaps/virgo2_submap_areas.dm b/archive/maps/old_yw/yw/submaps/aerostat/submaps/virgo2_submap_areas.dm similarity index 100% rename from maps/yw/submaps/aerostat/submaps/virgo2_submap_areas.dm rename to archive/maps/old_yw/yw/submaps/aerostat/submaps/virgo2_submap_areas.dm diff --git a/maps/yw/submaps/aerostat/surface.dmm b/archive/maps/old_yw/yw/submaps/aerostat/surface.dmm similarity index 100% rename from maps/yw/submaps/aerostat/surface.dmm rename to archive/maps/old_yw/yw/submaps/aerostat/surface.dmm diff --git a/maps/yw/submaps/alienship/_alienship.dm b/archive/maps/old_yw/yw/submaps/alienship/_alienship.dm similarity index 100% rename from maps/yw/submaps/alienship/_alienship.dm rename to archive/maps/old_yw/yw/submaps/alienship/_alienship.dm diff --git a/maps/yw/submaps/alienship/alienship.dmi b/archive/maps/old_yw/yw/submaps/alienship/alienship.dmi similarity index 100% rename from maps/yw/submaps/alienship/alienship.dmi rename to archive/maps/old_yw/yw/submaps/alienship/alienship.dmi diff --git a/maps/yw/submaps/alienship/alienship.dmm b/archive/maps/old_yw/yw/submaps/alienship/alienship.dmm similarity index 100% rename from maps/yw/submaps/alienship/alienship.dmm rename to archive/maps/old_yw/yw/submaps/alienship/alienship.dmm diff --git a/maps/yw/submaps/backup/cryogaia_plains.dmm b/archive/maps/old_yw/yw/submaps/backup/cryogaia_plains.dmm similarity index 100% rename from maps/yw/submaps/backup/cryogaia_plains.dmm rename to archive/maps/old_yw/yw/submaps/backup/cryogaia_plains.dmm diff --git a/maps/yw/submaps/backup/cryogaia_ships.dmm b/archive/maps/old_yw/yw/submaps/backup/cryogaia_ships.dmm similarity index 100% rename from maps/yw/submaps/backup/cryogaia_ships.dmm rename to archive/maps/old_yw/yw/submaps/backup/cryogaia_ships.dmm diff --git a/maps/yw/submaps/beach/_beach.dm b/archive/maps/old_yw/yw/submaps/beach/_beach.dm similarity index 100% rename from maps/yw/submaps/beach/_beach.dm rename to archive/maps/old_yw/yw/submaps/beach/_beach.dm diff --git a/maps/yw/submaps/beach/backup/beach.dmm b/archive/maps/old_yw/yw/submaps/beach/backup/beach.dmm similarity index 100% rename from maps/yw/submaps/beach/backup/beach.dmm rename to archive/maps/old_yw/yw/submaps/beach/backup/beach.dmm diff --git a/maps/yw/submaps/beach/backup/cave.dmm b/archive/maps/old_yw/yw/submaps/beach/backup/cave.dmm similarity index 100% rename from maps/yw/submaps/beach/backup/cave.dmm rename to archive/maps/old_yw/yw/submaps/beach/backup/cave.dmm diff --git a/maps/yw/submaps/beach/beach.dmm b/archive/maps/old_yw/yw/submaps/beach/beach.dmm similarity index 100% rename from maps/yw/submaps/beach/beach.dmm rename to archive/maps/old_yw/yw/submaps/beach/beach.dmm diff --git a/maps/yw/submaps/beach/beach_old.dmm b/archive/maps/old_yw/yw/submaps/beach/beach_old.dmm similarity index 100% rename from maps/yw/submaps/beach/beach_old.dmm rename to archive/maps/old_yw/yw/submaps/beach/beach_old.dmm diff --git a/maps/yw/submaps/beach/cave.dmm b/archive/maps/old_yw/yw/submaps/beach/cave.dmm similarity index 100% rename from maps/yw/submaps/beach/cave.dmm rename to archive/maps/old_yw/yw/submaps/beach/cave.dmm diff --git a/maps/yw/submaps/beach/cave_old.dmm b/archive/maps/old_yw/yw/submaps/beach/cave_old.dmm similarity index 100% rename from maps/yw/submaps/beach/cave_old.dmm rename to archive/maps/old_yw/yw/submaps/beach/cave_old.dmm diff --git a/maps/yw/submaps/cryogaia_plains.dmm b/archive/maps/old_yw/yw/submaps/cryogaia_plains.dmm similarity index 100% rename from maps/yw/submaps/cryogaia_plains.dmm rename to archive/maps/old_yw/yw/submaps/cryogaia_plains.dmm diff --git a/maps/yw/submaps/cryogaia_plains/cryogaia_plains.dm b/archive/maps/old_yw/yw/submaps/cryogaia_plains/cryogaia_plains.dm similarity index 100% rename from maps/yw/submaps/cryogaia_plains/cryogaia_plains.dm rename to archive/maps/old_yw/yw/submaps/cryogaia_plains/cryogaia_plains.dm diff --git a/maps/yw/submaps/cryogaia_plains/cryogaia_plains.dmm b/archive/maps/old_yw/yw/submaps/cryogaia_plains/cryogaia_plains.dmm similarity index 100% rename from maps/yw/submaps/cryogaia_plains/cryogaia_plains.dmm rename to archive/maps/old_yw/yw/submaps/cryogaia_plains/cryogaia_plains.dmm diff --git a/maps/yw/submaps/gateway/backup/carpfarm.dmm b/archive/maps/old_yw/yw/submaps/gateway/backup/carpfarm.dmm similarity index 100% rename from maps/yw/submaps/gateway/backup/carpfarm.dmm rename to archive/maps/old_yw/yw/submaps/gateway/backup/carpfarm.dmm diff --git a/maps/yw/submaps/gateway/backup/listeningpost.dmm b/archive/maps/old_yw/yw/submaps/gateway/backup/listeningpost.dmm similarity index 100% rename from maps/yw/submaps/gateway/backup/listeningpost.dmm rename to archive/maps/old_yw/yw/submaps/gateway/backup/listeningpost.dmm diff --git a/maps/yw/submaps/gateway/backup/snowfield.dmm b/archive/maps/old_yw/yw/submaps/gateway/backup/snowfield.dmm similarity index 100% rename from maps/yw/submaps/gateway/backup/snowfield.dmm rename to archive/maps/old_yw/yw/submaps/gateway/backup/snowfield.dmm diff --git a/maps/yw/submaps/gateway/carpfarm.dm b/archive/maps/old_yw/yw/submaps/gateway/carpfarm.dm similarity index 100% rename from maps/yw/submaps/gateway/carpfarm.dm rename to archive/maps/old_yw/yw/submaps/gateway/carpfarm.dm diff --git a/maps/yw/submaps/gateway/carpfarm.dmm b/archive/maps/old_yw/yw/submaps/gateway/carpfarm.dmm similarity index 100% rename from maps/yw/submaps/gateway/carpfarm.dmm rename to archive/maps/old_yw/yw/submaps/gateway/carpfarm.dmm diff --git a/maps/yw/submaps/gateway/listeningpost.dm b/archive/maps/old_yw/yw/submaps/gateway/listeningpost.dm similarity index 100% rename from maps/yw/submaps/gateway/listeningpost.dm rename to archive/maps/old_yw/yw/submaps/gateway/listeningpost.dm diff --git a/maps/yw/submaps/gateway/listeningpost.dmm b/archive/maps/old_yw/yw/submaps/gateway/listeningpost.dmm similarity index 100% rename from maps/yw/submaps/gateway/listeningpost.dmm rename to archive/maps/old_yw/yw/submaps/gateway/listeningpost.dmm diff --git a/maps/yw/submaps/gateway/snow_outpost.dm b/archive/maps/old_yw/yw/submaps/gateway/snow_outpost.dm similarity index 100% rename from maps/yw/submaps/gateway/snow_outpost.dm rename to archive/maps/old_yw/yw/submaps/gateway/snow_outpost.dm diff --git a/maps/yw/submaps/gateway/snow_outpost.dmm b/archive/maps/old_yw/yw/submaps/gateway/snow_outpost.dmm similarity index 100% rename from maps/yw/submaps/gateway/snow_outpost.dmm rename to archive/maps/old_yw/yw/submaps/gateway/snow_outpost.dmm diff --git a/maps/yw/submaps/gateway/snowfield.dm b/archive/maps/old_yw/yw/submaps/gateway/snowfield.dm similarity index 100% rename from maps/yw/submaps/gateway/snowfield.dm rename to archive/maps/old_yw/yw/submaps/gateway/snowfield.dm diff --git a/maps/yw/submaps/gateway/snowfield.dmm b/archive/maps/old_yw/yw/submaps/gateway/snowfield.dmm similarity index 100% rename from maps/yw/submaps/gateway/snowfield.dmm rename to archive/maps/old_yw/yw/submaps/gateway/snowfield.dmm diff --git a/maps/yw/submaps/gateway/zoo.dm b/archive/maps/old_yw/yw/submaps/gateway/zoo.dm similarity index 100% rename from maps/yw/submaps/gateway/zoo.dm rename to archive/maps/old_yw/yw/submaps/gateway/zoo.dm diff --git a/maps/yw/submaps/gateway/zoo.dmm b/archive/maps/old_yw/yw/submaps/gateway/zoo.dmm similarity index 100% rename from maps/yw/submaps/gateway/zoo.dmm rename to archive/maps/old_yw/yw/submaps/gateway/zoo.dmm diff --git a/maps/yw/submaps/rogue_mines/groundbase_shuttles.dm b/archive/maps/old_yw/yw/submaps/rogue_mines/groundbase_shuttles.dm similarity index 100% rename from maps/yw/submaps/rogue_mines/groundbase_shuttles.dm rename to archive/maps/old_yw/yw/submaps/rogue_mines/groundbase_shuttles.dm diff --git a/maps/yw/submaps/rogue_mines/groundbase_things.dm b/archive/maps/old_yw/yw/submaps/rogue_mines/groundbase_things.dm similarity index 100% rename from maps/yw/submaps/rogue_mines/groundbase_things.dm rename to archive/maps/old_yw/yw/submaps/rogue_mines/groundbase_things.dm diff --git a/maps/yw/submaps/rogue_mines/rogue_mine1.dmm b/archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine1.dmm similarity index 100% rename from maps/yw/submaps/rogue_mines/rogue_mine1.dmm rename to archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine1.dmm diff --git a/maps/yw/submaps/rogue_mines/rogue_mine2.dmm b/archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine2.dmm similarity index 100% rename from maps/yw/submaps/rogue_mines/rogue_mine2.dmm rename to archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine2.dmm diff --git a/maps/yw/submaps/rogue_mines/rogue_mine3.dmm b/archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine3.dmm similarity index 100% rename from maps/yw/submaps/rogue_mines/rogue_mine3.dmm rename to archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine3.dmm diff --git a/maps/yw/submaps/rogue_mines/rogue_mine4.dmm b/archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine4.dmm similarity index 100% rename from maps/yw/submaps/rogue_mines/rogue_mine4.dmm rename to archive/maps/old_yw/yw/submaps/rogue_mines/rogue_mine4.dmm diff --git a/maps/yw/submaps/space/_debrisfield.dm b/archive/maps/old_yw/yw/submaps/space/_debrisfield.dm similarity index 100% rename from maps/yw/submaps/space/_debrisfield.dm rename to archive/maps/old_yw/yw/submaps/space/_debrisfield.dm diff --git a/maps/yw/submaps/space/_fueldepot.dm b/archive/maps/old_yw/yw/submaps/space/_fueldepot.dm similarity index 100% rename from maps/yw/submaps/space/_fueldepot.dm rename to archive/maps/old_yw/yw/submaps/space/_fueldepot.dm diff --git a/maps/yw/submaps/space/_guttersite.dm b/archive/maps/old_yw/yw/submaps/space/_guttersite.dm similarity index 100% rename from maps/yw/submaps/space/_guttersite.dm rename to archive/maps/old_yw/yw/submaps/space/_guttersite.dm diff --git a/maps/yw/submaps/space/backup/debrisfield.dmm b/archive/maps/old_yw/yw/submaps/space/backup/debrisfield.dmm similarity index 100% rename from maps/yw/submaps/space/backup/debrisfield.dmm rename to archive/maps/old_yw/yw/submaps/space/backup/debrisfield.dmm diff --git a/maps/yw/submaps/space/debrisfield.dmm b/archive/maps/old_yw/yw/submaps/space/debrisfield.dmm similarity index 100% rename from maps/yw/submaps/space/debrisfield.dmm rename to archive/maps/old_yw/yw/submaps/space/debrisfield.dmm diff --git a/maps/yw/submaps/space/debrisfield_old.dmm b/archive/maps/old_yw/yw/submaps/space/debrisfield_old.dmm similarity index 100% rename from maps/yw/submaps/space/debrisfield_old.dmm rename to archive/maps/old_yw/yw/submaps/space/debrisfield_old.dmm diff --git a/maps/yw/submaps/space/fueldepot.dmm b/archive/maps/old_yw/yw/submaps/space/fueldepot.dmm similarity index 100% rename from maps/yw/submaps/space/fueldepot.dmm rename to archive/maps/old_yw/yw/submaps/space/fueldepot.dmm diff --git a/maps/yw/submaps/space/guttersite.dmm b/archive/maps/old_yw/yw/submaps/space/guttersite.dmm similarity index 99% rename from maps/yw/submaps/space/guttersite.dmm rename to archive/maps/old_yw/yw/submaps/space/guttersite.dmm index a2316d7769..52a7234263 100644 --- a/maps/yw/submaps/space/guttersite.dmm +++ b/archive/maps/old_yw/yw/submaps/space/guttersite.dmm @@ -5858,6 +5858,7 @@ pixel_x = -5; pixel_y = -26; req_one_access = list(); + }, /turf/simulated/floor/plating/eris/under/airless, /area/tether_away/guttersite/docking) diff --git a/maps/yw/submaps/space/pois/_templates.dm b/archive/maps/old_yw/yw/submaps/space/pois/_templates.dm similarity index 100% rename from maps/yw/submaps/space/pois/_templates.dm rename to archive/maps/old_yw/yw/submaps/space/pois/_templates.dm diff --git a/maps/yw/submaps/space/pois/asteroids1.dmm b/archive/maps/old_yw/yw/submaps/space/pois/asteroids1.dmm similarity index 100% rename from maps/yw/submaps/space/pois/asteroids1.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/asteroids1.dmm diff --git a/maps/yw/submaps/space/pois/asteroids2.dmm b/archive/maps/old_yw/yw/submaps/space/pois/asteroids2.dmm similarity index 100% rename from maps/yw/submaps/space/pois/asteroids2.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/asteroids2.dmm diff --git a/maps/yw/submaps/space/pois/asteroids3.dmm b/archive/maps/old_yw/yw/submaps/space/pois/asteroids3.dmm similarity index 100% rename from maps/yw/submaps/space/pois/asteroids3.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/asteroids3.dmm diff --git a/maps/yw/submaps/space/pois/carp_asteroids1.dmm b/archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids1.dmm similarity index 100% rename from maps/yw/submaps/space/pois/carp_asteroids1.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids1.dmm diff --git a/maps/yw/submaps/space/pois/carp_asteroids2.dmm b/archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids2.dmm similarity index 100% rename from maps/yw/submaps/space/pois/carp_asteroids2.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids2.dmm diff --git a/maps/yw/submaps/space/pois/carp_asteroids3.dmm b/archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids3.dmm similarity index 100% rename from maps/yw/submaps/space/pois/carp_asteroids3.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids3.dmm diff --git a/maps/yw/submaps/space/pois/carp_asteroids4.dmm b/archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids4.dmm similarity index 100% rename from maps/yw/submaps/space/pois/carp_asteroids4.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/carp_asteroids4.dmm diff --git a/maps/yw/submaps/space/pois/debris1.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris1.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris1.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris1.dmm diff --git a/maps/yw/submaps/space/pois/debris2.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris2.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris2.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris2.dmm diff --git a/maps/yw/submaps/space/pois/debris3.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris3.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris3.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris3.dmm diff --git a/maps/yw/submaps/space/pois/debris4.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris4.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris4.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris4.dmm diff --git a/maps/yw/submaps/space/pois/debris5.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris5.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris5.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris5.dmm diff --git a/maps/yw/submaps/space/pois/debris6.dmm b/archive/maps/old_yw/yw/submaps/space/pois/debris6.dmm similarity index 100% rename from maps/yw/submaps/space/pois/debris6.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/debris6.dmm diff --git a/maps/yw/submaps/space/pois/debrisfield_things.dm b/archive/maps/old_yw/yw/submaps/space/pois/debrisfield_things.dm similarity index 100% rename from maps/yw/submaps/space/pois/debrisfield_things.dm rename to archive/maps/old_yw/yw/submaps/space/pois/debrisfield_things.dm diff --git a/maps/yw/submaps/space/pois/derelict.dmm b/archive/maps/old_yw/yw/submaps/space/pois/derelict.dmm similarity index 97% rename from maps/yw/submaps/space/pois/derelict.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/derelict.dmm index dc20cab6a6..471daa5e7d 100644 --- a/maps/yw/submaps/space/pois/derelict.dmm +++ b/archive/maps/old_yw/yw/submaps/space/pois/derelict.dmm @@ -465,12 +465,6 @@ }, /turf/simulated/floor/reinforced, /area/tether_away/debrisfield/derelict/interior) -"bG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict/interior) "bH" = ( /obj/machinery/door/airlock/alien, /obj/structure/cable{ @@ -523,12 +517,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/debrisfield/derelict/interior) -"bN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict/interior) "bO" = ( /turf/template_noop, /area/tether_away/debrisfield/explored) @@ -539,23 +527,9 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/debrisfield/derelict/interior) -"bQ" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict/interior) "bR" = ( /turf/template_noop, /area/tether_away/debrisfield/unexplored) -"bS" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict/interior) "bT" = ( /obj/cryogaia_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/reinforced, @@ -768,12 +742,6 @@ /obj/cryogaia_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/tiled/steel_ridged, /area/tether_away/debrisfield/derelict/interior) -"cD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict/interior) "cE" = ( /obj/random/humanoidremains, /obj/structure/cable{ @@ -1465,7 +1433,7 @@ bi bi bi av -bG +bp bi av bi @@ -1613,7 +1581,7 @@ aa aa aa ao -bG +bp bi ao aa @@ -1687,7 +1655,7 @@ aa aa aa ao -bG +bp bi ao aa @@ -1761,7 +1729,7 @@ aa aa ao ao -bG +bp bi ao ao @@ -1835,7 +1803,7 @@ aa ao ao ao -bG +bp bi ao ao @@ -2945,7 +2913,7 @@ bx bC bC av -bN +bJ aw av bY @@ -3019,7 +2987,7 @@ by bk bk av -bN +bJ aw av aF @@ -3093,7 +3061,7 @@ bk bx bx av -bN +bJ aw av aD @@ -3167,7 +3135,7 @@ av av av av -bN +bJ aw av cb @@ -3241,7 +3209,7 @@ aF aF aF av -bN +bJ aw av cb @@ -3254,7 +3222,7 @@ aD cv cv aF -cD +cg aF av aF @@ -3389,7 +3357,7 @@ av aF av av -bN +bJ aw av cb @@ -3463,7 +3431,7 @@ av bb bb av -bN +bJ aw av cb @@ -3537,7 +3505,7 @@ av bD cP av -bN +bJ aw av cc @@ -3611,7 +3579,7 @@ ao ao ao ao -bQ +bI aG ao ao @@ -3981,7 +3949,7 @@ ao ao ao ao -bS +bH bU ao ao diff --git a/maps/yw/submaps/space/pois/foodstand.dmm b/archive/maps/old_yw/yw/submaps/space/pois/foodstand.dmm similarity index 100% rename from maps/yw/submaps/space/pois/foodstand.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/foodstand.dmm diff --git a/maps/yw/submaps/space/pois/oldshuttle.dmm b/archive/maps/old_yw/yw/submaps/space/pois/oldshuttle.dmm similarity index 100% rename from maps/yw/submaps/space/pois/oldshuttle.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/oldshuttle.dmm diff --git a/maps/yw/submaps/space/pois/ship_med_crashed.dmm b/archive/maps/old_yw/yw/submaps/space/pois/ship_med_crashed.dmm similarity index 100% rename from maps/yw/submaps/space/pois/ship_med_crashed.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/ship_med_crashed.dmm diff --git a/maps/yw/submaps/space/pois/ship_sci_overrun.dmm b/archive/maps/old_yw/yw/submaps/space/pois/ship_sci_overrun.dmm similarity index 100% rename from maps/yw/submaps/space/pois/ship_sci_overrun.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/ship_sci_overrun.dmm diff --git a/maps/yw/submaps/space/pois/ship_sup_exploded.dmm b/archive/maps/old_yw/yw/submaps/space/pois/ship_sup_exploded.dmm similarity index 100% rename from maps/yw/submaps/space/pois/ship_sup_exploded.dmm rename to archive/maps/old_yw/yw/submaps/space/pois/ship_sup_exploded.dmm diff --git a/maps/yw/submaps/underdark_pois/Corridor.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/Corridor.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/Corridor.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/Corridor.dmm diff --git a/maps/yw/submaps/underdark_pois/_templates.dm b/archive/maps/old_yw/yw/submaps/underdark_pois/_templates.dm similarity index 100% rename from maps/yw/submaps/underdark_pois/_templates.dm rename to archive/maps/old_yw/yw/submaps/underdark_pois/_templates.dm diff --git a/maps/yw/submaps/underdark_pois/abandonded_outpost.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/abandonded_outpost.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/abandonded_outpost.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/abandonded_outpost.dmm diff --git a/maps/yw/submaps/underdark_pois/abandonedshelter.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/abandonedshelter.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/abandonedshelter.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/abandonedshelter.dmm diff --git a/maps/yw/submaps/underdark_pois/blaster.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/blaster.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/blaster.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/blaster.dmm diff --git a/maps/yw/submaps/underdark_pois/boss_mob.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/boss_mob.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/boss_mob.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/boss_mob.dmm diff --git a/maps/yw/submaps/underdark_pois/broken_engine.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/broken_engine.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/broken_engine.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/broken_engine.dmm diff --git a/maps/yw/submaps/underdark_pois/deadminer.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/deadminer.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/deadminer.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/deadminer.dmm diff --git a/maps/yw/submaps/underdark_pois/goldhall.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/goldhall.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/goldhall.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/goldhall.dmm diff --git a/maps/yw/submaps/underdark_pois/guardedloot_hard.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/guardedloot_hard.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/guardedloot_hard.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/guardedloot_hard.dmm diff --git a/maps/yw/submaps/underdark_pois/guardedloot_normal.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/guardedloot_normal.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/guardedloot_normal.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/guardedloot_normal.dmm diff --git a/maps/yw/submaps/underdark_pois/hard_mob.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/hard_mob.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/hard_mob.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/hard_mob.dmm diff --git a/maps/yw/submaps/underdark_pois/mechbay.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/mechbay.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/mechbay.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/mechbay.dmm diff --git a/maps/yw/submaps/underdark_pois/mechwreck.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/mechwreck.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/mechwreck.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/mechwreck.dmm diff --git a/maps/yw/submaps/underdark_pois/mimicry.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/mimicry.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/mimicry.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/mimicry.dmm diff --git a/maps/yw/submaps/underdark_pois/normal_mob.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/normal_mob.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/normal_mob.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/normal_mob.dmm diff --git a/maps/yw/submaps/underdark_pois/old_drone_hive.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/old_drone_hive.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/old_drone_hive.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/old_drone_hive.dmm diff --git a/maps/yw/submaps/underdark_pois/phoron_rat_den.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/phoron_rat_den.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/phoron_rat_den.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/phoron_rat_den.dmm diff --git a/maps/yw/submaps/underdark_pois/puzzle_corridor.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/puzzle_corridor.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/puzzle_corridor.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/puzzle_corridor.dmm diff --git a/maps/yw/submaps/underdark_pois/rad_threat.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/rad_threat.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/rad_threat.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/rad_threat.dmm diff --git a/maps/yw/submaps/underdark_pois/rykka_easter_egg.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/rykka_easter_egg.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/rykka_easter_egg.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/rykka_easter_egg.dmm diff --git a/maps/yw/submaps/underdark_pois/spider_nest.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/spider_nest.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/spider_nest.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/spider_nest.dmm diff --git a/maps/yw/submaps/underdark_pois/subterranean_lake.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/subterranean_lake.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/subterranean_lake.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/subterranean_lake.dmm diff --git a/maps/yw/submaps/underdark_pois/testsite.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/testsite.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/testsite.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/testsite.dmm diff --git a/maps/yw/submaps/underdark_pois/tree_shrine.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/tree_shrine.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/tree_shrine.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/tree_shrine.dmm diff --git a/maps/yw/submaps/underdark_pois/underdark_things.dm b/archive/maps/old_yw/yw/submaps/underdark_pois/underdark_things.dm similarity index 100% rename from maps/yw/submaps/underdark_pois/underdark_things.dm rename to archive/maps/old_yw/yw/submaps/underdark_pois/underdark_things.dm diff --git a/maps/yw/submaps/underdark_pois/vault1.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/vault1.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/vault1.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/vault1.dmm diff --git a/maps/yw/submaps/underdark_pois/vault2.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/vault2.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/vault2.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/vault2.dmm diff --git a/maps/yw/submaps/underdark_pois/vault3.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/vault3.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/vault3.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/vault3.dmm diff --git a/maps/yw/submaps/underdark_pois/wolf_den.dmm b/archive/maps/old_yw/yw/submaps/underdark_pois/wolf_den.dmm similarity index 100% rename from maps/yw/submaps/underdark_pois/wolf_den.dmm rename to archive/maps/old_yw/yw/submaps/underdark_pois/wolf_den.dmm diff --git a/maps/yw/submaps/wild/tether_wild-crash-alt.dmm b/archive/maps/old_yw/yw/submaps/wild/tether_wild-crash-alt.dmm similarity index 100% rename from maps/yw/submaps/wild/tether_wild-crash-alt.dmm rename to archive/maps/old_yw/yw/submaps/wild/tether_wild-crash-alt.dmm diff --git a/maps/yw/submaps/wild/tether_wild-crash.dmm b/archive/maps/old_yw/yw/submaps/wild/tether_wild-crash.dmm similarity index 99% rename from maps/yw/submaps/wild/tether_wild-crash.dmm rename to archive/maps/old_yw/yw/submaps/wild/tether_wild-crash.dmm index 19b2aeed93..fa5255df08 100644 --- a/maps/yw/submaps/wild/tether_wild-crash.dmm +++ b/archive/maps/old_yw/yw/submaps/wild/tether_wild-crash.dmm @@ -767,7 +767,7 @@ icon_state = "plant-09"; name = "Esteban"; pixel_y = 8; - + }, /turf/simulated/shuttle/floor/black/virgo3b, /area/tether/surfacebase/outside/wilderness) diff --git a/maps/yw/submaps/wild/tether_wild-surface.dmm b/archive/maps/old_yw/yw/submaps/wild/tether_wild-surface.dmm similarity index 100% rename from maps/yw/submaps/wild/tether_wild-surface.dmm rename to archive/maps/old_yw/yw/submaps/wild/tether_wild-surface.dmm diff --git a/maps/yw/submaps/wild/tether_wild-temple.dmm b/archive/maps/old_yw/yw/submaps/wild/tether_wild-temple.dmm similarity index 100% rename from maps/yw/submaps/wild/tether_wild-temple.dmm rename to archive/maps/old_yw/yw/submaps/wild/tether_wild-temple.dmm diff --git a/maps/yw/tether_phoronlock.dm b/archive/maps/old_yw/yw/tether_phoronlock.dm similarity index 100% rename from maps/yw/tether_phoronlock.dm rename to archive/maps/old_yw/yw/tether_phoronlock.dm diff --git a/archive/maps/southern_cross/southern_cross-7.dmm b/archive/maps/southern_cross/southern_cross-7.dmm index 33f2c5110b..64768e6cf5 100644 --- a/archive/maps/southern_cross/southern_cross-7.dmm +++ b/archive/maps/southern_cross/southern_cross-7.dmm @@ -115,7 +115,7 @@ "ck" = (/obj/effect/step_trigger/teleporter/landmark{landmark_id = "fall_sif"},/turf/simulated/sky/moving/north,/area/space) "cl" = (/obj/effect/step_trigger/teleporter/landmark{landmark_id = "fall_sif"},/turf/simulated/sky/moving/south,/area/space) "cm" = (/obj/effect/step_trigger/teleporter/landmark{landmark_id = "fall_sif"},/turf/simulated/sky/south,/area/space) -"cn" = (/obj/effect/step_trigger/teleporter/planetary_fall/sif,/turf/simulated/sky/moving/north,/area/space) +"cn" = (/turf/simulated/sky/moving/north/sif/planet_fall,/area/space) "co" = (/obj/effect/landmark/teleport_mark{landmark_id = "fall_sif"},/obj/effect/step_trigger/thrower{affect_ghosts = 1; direction = 2; name = "thrower_throwdown"; nostop = 1; stopper = 0; tiles = 0},/turf/simulated/sky/moving/north,/area/space) "cp" = (/obj/effect/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/simulated/sky/north,/area/space) "cq" = (/obj/effect/step_trigger/thrower{direction = 1; name = "thrower_throwup"; nostop = 0; tiles = 0},/turf/simulated/sky/moving/north,/area/space) diff --git a/archive/maps/southern_cross/turfs/outdoors.dm b/archive/maps/southern_cross/turfs/outdoors.dm index 7f7b39fc4a..a31e008d11 100644 --- a/archive/maps/southern_cross/turfs/outdoors.dm +++ b/archive/maps/southern_cross/turfs/outdoors.dm @@ -162,4 +162,4 @@ // Step trigger to fall down to planet Sif /obj/effect/step_trigger/teleporter/planetary_fall/sif/find_planet() - planet = planet_sif \ No newline at end of file + planet = planet_sif diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index f2d510ffc8..25a6bba618 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -201,53 +201,20 @@ GLOBAL_LIST_EMPTY(tele_landmarks) /obj/effect/step_trigger/teleporter/planetary_fall var/datum/planet/planet = null + +/obj/effect/step_trigger/teleporter/planetary_fall/Destroy() + . = ..() + planet = null + // First time setup, which planet are we aiming for? /obj/effect/step_trigger/teleporter/planetary_fall/proc/find_planet() return /obj/effect/step_trigger/teleporter/planetary_fall/Trigger(var/atom/movable/A) - if(!planet) - find_planet() - - if(planet) - if(!planet.planet_floors.len) - message_admins("ERROR: planetary_fall step trigger's list of outdoor floors was empty.") - return - var/turf/simulated/T = null - var/safety = 100 // Infinite loop protection. - while(!T && safety) - var/turf/simulated/candidate = pick(planet.planet_floors) - if(!istype(candidate) || istype(candidate, /turf/simulated/sky)) - safety-- - continue - else if(candidate && !candidate.is_outdoors()) - safety-- - continue - else - T = candidate - break - - if(!T) - message_admins("ERROR: planetary_fall step trigger could not find a suitable landing turf.") - return - - if(isobserver(A)) - A.forceMove(T) // Harmlessly move ghosts. - return - //VOREStation Edit Start - if(!(A.can_fall())) - return // Phased shifted kin should not fall - //VOREStation Edit End - - A.forceMove(T) - // Living things should probably be logged when they fall... - if(isliving(A)) - message_admins("\The [A] fell out of the sky.") - // ... because they're probably going to die from it. - A.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this. - else - message_admins("ERROR: planetary_fall step trigger lacks a planet to fall onto.") + var/turf/T = get_turf(A) + if(!T) return + T.trigger_fall(A, planet) //Death diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 1d59358035..f03c77770a 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -172,8 +172,8 @@ M.inertia_dir = 0 else M.inertia_dir = 0 - ..() + /turf/simulated/proc/handle_slipping(var/mob/living/M, var/slip_dist, var/dirtslip) PRIVATE_PROC(TRUE) if(!M || !slip_dist) diff --git a/code/game/turfs/simulated/outdoors/sky_effect.dm b/code/game/turfs/simulated/outdoors/sky_effect.dm new file mode 100644 index 0000000000..bf8294ae9d --- /dev/null +++ b/code/game/turfs/simulated/outdoors/sky_effect.dm @@ -0,0 +1,52 @@ +// Those turfs replace the fall from sky step striggers +/turf/Entered(var/atom/movable/am, var/atom/old_loc) + ..() + if(!am.can_fall()) + return + if(isliving(am)) + var/mob/living/L = am + if(L.flying) + return + var/datum/planet/planet = find_planet() + if(!planet) + return + trigger_fall(am, planet) + +/turf/proc/trigger_fall(var/atom/movable/am, var/datum/planet/destination) + if(!destination) + message_admins("ERROR: planetary_fall step trigger lacks a planet to fall onto.") + return + if(!destination.planet_floors.len) + message_admins("ERROR: planetary_fall step trigger's list of outdoor floors was empty.") + return + var/turf/simulated/T = null + var/safety = 100 // Infinite loop protection. + while(!T && safety) + var/turf/simulated/candidate = pick(destination.planet_floors) + if(!istype(candidate) || istype(candidate, /turf/simulated/sky)) + safety-- + continue + else if(candidate && !candidate.is_outdoors()) + safety-- + continue + else + T = candidate + break + + if(!T) + message_admins("ERROR: planetary_fall step trigger could not find a suitable landing turf.") + return + + if(isobserver(am)) + am.forceMove(T) // Harmlessly move ghosts. + return + + am.forceMove(T) + // Living things should probably be logged when they fall... + if(isliving(am)) + message_admins("\The [am] fell out of the sky.") + // ... because they're probably going to die from it. + am.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this. + +/turf/proc/find_planet() + return diff --git a/code/modules/client/preferences/types/game/ui.dm b/code/modules/client/preferences/types/game/ui.dm index cf50190be8..74bb412d1c 100644 --- a/code/modules/client/preferences/types/game/ui.dm +++ b/code/modules/client/preferences/types/game/ui.dm @@ -36,7 +36,7 @@ /datum/preference/toggle/tgui_input_mode category = PREFERENCE_CATEGORY_GAME_PREFERENCES savefile_key = "tgui_input_mode" - default_value = FALSE + default_value = TRUE savefile_identifier = PREFERENCE_PLAYER /datum/preference/toggle/tgui_large_buttons diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index 1d9bfbdd17..692a581a56 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -41,7 +41,7 @@ if(generate_id_gender) identifying_gender = pick(list(MALE, FEMALE, PLURAL, NEUTER)) - ..(loc, generate_species) + . = ..(mapload, generate_species) species.produceCopy(species.traits.Copy(),src,null,FALSE) diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 50dd87d839..c8ed3c4ea3 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -678,8 +678,7 @@ /turf/unsimulated/wall, /area/ai_multicam_room) "ce" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/transit/south, +/turf/space/transit/south/virgo3b/planet_fall /area/space) "cf" = ( /turf/space/transit/south, @@ -2319,8 +2318,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "oI" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/space/transit/east, +/turf/space/transit/east/virgo3b/planet_fall, /area/space) "oL" = ( /obj/effect/floor_decal/techfloor/orange{ @@ -2881,8 +2879,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) "Lz" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b, -/turf/simulated/sky/virgo3b/south, +/turf/simulated/sky/virgo3b/south/planet_fall, /area/space) "Me" = ( /turf/simulated/floor/smole/desert, diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm index d8a3bd4319..8cc53d9be2 100644 --- a/maps/tether/tether_turfs.dm +++ b/maps/tether/tether_turfs.dm @@ -272,15 +272,6 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) add_vis_overlay('icons/effects/effects.dmi', "white", plane = SPACE_PLANE, add_vis_flags = VIS_INHERIT_ID|VIS_UNDERLAY) -/turf/space/v3b_midpoint/Initialize(mapload) - . = ..() - new /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b(src) - -/turf/space/v3b_midpoint/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors) - . = ..() - for(var/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/F in src) - qdel(F) - /turf/space/v3b_midpoint/CanZPass(atom, direction) return 0 // We're not Space @@ -288,3 +279,16 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor) /turf/simulated/floor/tiled/techfloor/grid/transit icon = 'icons/turf/transit_vr.dmi' initial_flooring = null + +// Virgo 3b trufs +/turf/space/transit/south/virgo3b/planet_fall/find_planet() + return planet_virgo3b + +/turf/space/transit/east/virgo3b/planet_fall/find_planet() + return planet_virgo3b + +/turf/simulated/sky/virgo3b/south/planet_fall/find_planet() + return planet_virgo3b + +/turf/space/v3b_midpoint/find_planet() + return planet_virgo3b diff --git a/modular_chomp/maps/relic_base/relicbase-13.dmm b/modular_chomp/maps/relic_base/relicbase-13.dmm index 60a214e0e1..24aece9ce9 100644 --- a/modular_chomp/maps/relic_base/relicbase-13.dmm +++ b/modular_chomp/maps/relic_base/relicbase-13.dmm @@ -300,12 +300,6 @@ }, /turf/simulated/sky/moving/south, /area/space) -"sG" = ( -/obj/effect/step_trigger/teleporter/planetary_fall{ - planet = null - }, -/turf/simulated/sky/moving/south, -/area/space) "sX" = ( /turf/simulated/wall/thull, /area/shuttle/arrival/pre_game/simulated_grid) @@ -566,12 +560,6 @@ /obj/effect/floor_decal/corner/blue/border, /turf/simulated/shuttle/floor, /area/shuttle/arrival/pre_game/simulated_grid) -"Hi" = ( -/obj/effect/step_trigger/teleporter/planetary_fall{ - planet = null - }, -/turf/simulated/sky/south, -/area/space) "Hp" = ( /obj/machinery/ai_status_display, /turf/simulated/wall/thull, @@ -1437,58 +1425,58 @@ Ti Ti pL pL -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO pL rU rU @@ -1694,7 +1682,6 @@ Ti Ti pL pL -sG kO kO kO @@ -1745,7 +1732,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -1951,7 +1939,6 @@ Ti Ti pL pL -sG kO kO kO @@ -2002,7 +1989,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -2208,7 +2196,6 @@ Ti Ti pL pL -sG kO kO kO @@ -2259,7 +2246,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -2465,7 +2453,6 @@ Ti Ti pL pL -sG kO kO kO @@ -2516,7 +2503,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -2722,7 +2710,6 @@ Ti Ti pL pL -sG kO kO kO @@ -2773,7 +2760,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -2979,7 +2967,6 @@ Ti Ti pL pL -sG kO kO kO @@ -3030,7 +3017,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -3236,7 +3224,6 @@ Ti Ti pL pL -sG kO kO kO @@ -3287,7 +3274,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -3493,7 +3481,6 @@ Ti Ti pL pL -sG kO kO kO @@ -3544,7 +3531,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -3750,7 +3738,6 @@ Ti Ti pL pL -sG kO kO kO @@ -3801,7 +3788,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -4007,7 +3995,6 @@ Ti Ti pL pL -sG kO kO kO @@ -4058,7 +4045,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -4264,7 +4252,6 @@ Ti Ti pL pL -sG kO kO kO @@ -4315,7 +4302,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -4521,7 +4509,6 @@ Ti Ti pL pL -sG kO kO kO @@ -4572,7 +4559,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -4778,7 +4766,6 @@ Ti Ti pL pL -sG kO kO kO @@ -4829,7 +4816,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -5035,7 +5023,6 @@ Ti Ti pL pL -sG kO kO kO @@ -5086,7 +5073,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -5292,7 +5280,6 @@ Ti Ti pL pL -sG kO kO kO @@ -5343,7 +5330,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -5549,7 +5537,6 @@ Ti Ti pL pL -sG kO kO kO @@ -5600,7 +5587,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -5806,7 +5794,6 @@ Ti Ti pL pL -sG kO kO kO @@ -5857,7 +5844,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -6063,7 +6051,6 @@ Ti Ti pL pL -sG kO kO kO @@ -6114,7 +6101,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -6320,7 +6308,6 @@ Ti Ti pL pL -sG kO kO kO @@ -6371,7 +6358,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -6577,7 +6565,6 @@ Ti Ti pL pL -sG kO kO kO @@ -6628,7 +6615,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -6834,7 +6822,6 @@ Ti Ti pL pL -sG kO kO kO @@ -6885,7 +6872,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -7091,7 +7079,6 @@ Ti Ti pL pL -sG kO kO kO @@ -7142,7 +7129,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -7348,7 +7336,6 @@ Ti Ti pL pL -sG kO kO kO @@ -7399,7 +7386,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -7605,7 +7593,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -7656,7 +7644,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -7862,7 +7850,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -7913,7 +7901,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -8119,7 +8107,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -8170,7 +8158,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -8376,7 +8364,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -8427,7 +8415,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -8633,7 +8621,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -8684,7 +8672,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -8890,7 +8878,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -8941,7 +8929,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -9147,7 +9135,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -9198,7 +9186,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -9404,7 +9392,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -9455,7 +9443,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -9661,7 +9649,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -9712,7 +9700,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -9918,7 +9906,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -9969,7 +9957,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -10175,7 +10163,7 @@ Ti Ti pL pL -sG +kO kO kO kO @@ -10226,7 +10214,7 @@ kO kO kO kO -sG +kO pL rU Pi @@ -10432,7 +10420,6 @@ Ti Ti pL pL -sG kO kO kO @@ -10483,7 +10470,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -10689,7 +10677,6 @@ Ti Ti pL pL -sG kO kO kO @@ -10740,7 +10727,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -10946,7 +10934,6 @@ Ti Ti pL pL -sG kO kO kO @@ -10997,7 +10984,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -11203,7 +11191,6 @@ Ti Ti pL pL -sG kO kO kO @@ -11254,7 +11241,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -11460,7 +11448,6 @@ Ti Ti pL pL -sG kO kO kO @@ -11511,7 +11498,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -11717,7 +11705,6 @@ Ti Ti pL pL -sG kO kO kO @@ -11768,7 +11755,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -11974,7 +11962,6 @@ Ti Ti pL pL -sG kO kO kO @@ -12025,7 +12012,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -12231,7 +12219,6 @@ Ti Ti pL pL -sG kO kO kO @@ -12282,7 +12269,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -12488,7 +12476,6 @@ Ti Ti pL pL -sG kO kO kO @@ -12539,7 +12526,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -12745,7 +12733,6 @@ Ti Ti pL pL -sG kO kO kO @@ -12796,7 +12783,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -13002,7 +12990,6 @@ Ti Ti pL pL -sG kO kO kO @@ -13053,7 +13040,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -13259,7 +13247,6 @@ Ti Ti pL pL -sG kO kO kO @@ -13310,7 +13297,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -13516,7 +13504,6 @@ Ti Ti pL pL -sG kO kO kO @@ -13567,7 +13554,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -13773,7 +13761,6 @@ Ti Ti pL pL -sG kO kO kO @@ -13824,7 +13811,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -14030,7 +14018,6 @@ Ti Ti pL pL -sG kO kO kO @@ -14081,7 +14068,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -14287,7 +14275,6 @@ Ti Ti pL pL -sG kO kO kO @@ -14338,7 +14325,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -14544,7 +14532,6 @@ Ti Ti pL pL -sG kO kO kO @@ -14595,7 +14582,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -14801,7 +14789,6 @@ Ti Ti pL pL -sG kO kO kO @@ -14852,7 +14839,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -15058,7 +15046,6 @@ Ti Ti pL pL -sG kO kO kO @@ -15109,7 +15096,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -15315,7 +15303,6 @@ Ti Ti pL pL -sG kO kO kO @@ -15366,7 +15353,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -15572,7 +15560,6 @@ Ti Ti pL pL -sG kO kO kO @@ -15623,7 +15610,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -15829,7 +15817,6 @@ Ti Ti pL pL -sG kO kO kO @@ -15880,7 +15867,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -16086,7 +16074,6 @@ Ti Ti pL pL -sG kO kO kO @@ -16137,7 +16124,8 @@ kO kO kO kO -sG +kO +kO pL rU Pi @@ -16343,58 +16331,58 @@ Ti Ti pL pL -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG -sG +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO +kO pL rU rU @@ -16858,48 +16846,48 @@ Ti pL pL pL -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ pL pL pL @@ -17115,7 +17103,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -17156,7 +17143,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -17372,7 +17360,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -17413,7 +17400,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -17629,7 +17617,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -17670,7 +17657,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -17886,7 +17874,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -17927,7 +17914,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -18143,7 +18131,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -18184,7 +18171,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -18400,7 +18388,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -18441,7 +18428,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -18657,7 +18645,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -18698,7 +18685,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -18914,7 +18902,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -18955,7 +18942,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -19171,7 +19159,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -19212,7 +19199,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -19428,7 +19416,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -19469,7 +19456,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -19685,7 +19673,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -19726,7 +19713,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -19942,7 +19930,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -19983,7 +19970,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -20199,7 +20187,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -20240,7 +20227,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -20456,7 +20444,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -20497,7 +20484,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -20713,7 +20701,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -20754,7 +20741,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -20970,7 +20958,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -21011,7 +20998,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -21227,7 +21215,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -21268,7 +21255,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -21484,7 +21472,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -21525,7 +21512,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -21741,7 +21729,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -21782,7 +21769,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -21998,7 +21986,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -22039,7 +22026,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -22255,7 +22243,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -22296,7 +22284,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -22512,7 +22500,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -22553,7 +22541,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -22769,7 +22757,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -22810,7 +22798,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -23026,7 +23014,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -23067,7 +23055,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -23283,7 +23271,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -23324,7 +23312,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -23540,7 +23528,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -23581,7 +23569,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -23797,7 +23785,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -23838,7 +23826,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -24054,7 +24042,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -24095,7 +24083,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -24311,7 +24299,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -24352,7 +24340,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -24568,7 +24556,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -24609,7 +24597,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -24825,7 +24813,7 @@ Ti pL pL pL -Hi +hQ hQ hQ hQ @@ -24866,7 +24854,7 @@ hQ hQ hQ hQ -Hi +hQ pL pL pL @@ -25082,7 +25070,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -25123,7 +25110,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -25339,7 +25327,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -25380,7 +25367,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -25596,7 +25584,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -25637,7 +25624,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -25853,7 +25841,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -25894,7 +25881,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -26110,7 +26098,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -26151,7 +26138,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -26367,7 +26355,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -26408,7 +26395,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -26624,7 +26612,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -26665,7 +26652,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -26881,7 +26869,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -26922,7 +26909,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -27138,7 +27126,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -27179,7 +27166,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -27395,7 +27383,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -27436,7 +27423,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -27652,7 +27640,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -27693,7 +27680,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -27909,7 +27897,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -27950,7 +27937,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -28166,7 +28154,6 @@ Ti pL pL pL -Hi hQ hQ hQ @@ -28207,7 +28194,8 @@ hQ hQ hQ hQ -Hi +hQ +hQ pL pL pL @@ -28423,48 +28411,48 @@ Ti pL pL pL -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi -Hi +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ +hQ pL pL pL diff --git a/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm b/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm index 8981c3c4e6..d19730399e 100644 --- a/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm +++ b/modular_chomp/maps/soluna_nexus/soluna_nexus-8.dmm @@ -6,8 +6,7 @@ /turf/space/transit/west, /area/shuttle/escape_pod6/transit) "ag" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/sif, -/turf/simulated/sky/moving/north, +/turf/simulated/sky/moving/north/sif/planet_fall, /area/space) "ah" = ( /obj/effect/step_trigger/teleporter/random{ diff --git a/modular_chomp/maps/southern_cross/southern_cross-9.dmm b/modular_chomp/maps/southern_cross/southern_cross-9.dmm index 3ee729ace0..3ae427c08c 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-9.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-9.dmm @@ -3,8 +3,7 @@ /turf/space, /area/space) "ag" = ( -/obj/effect/step_trigger/teleporter/planetary_fall/sif, -/turf/simulated/sky/moving/north, +/turf/simulated/sky/moving/north/sif/planet_fall, /area/space) "ah" = ( /obj/effect/step_trigger/teleporter/random{ diff --git a/modular_chomp/maps/southern_cross/turfs/outdoors.dm b/modular_chomp/maps/southern_cross/turfs/outdoors.dm index d0d7e398a3..e3e5fc54cb 100644 --- a/modular_chomp/maps/southern_cross/turfs/outdoors.dm +++ b/modular_chomp/maps/southern_cross/turfs/outdoors.dm @@ -220,3 +220,6 @@ user.put_in_hands(S) visible_message("[user] scoops up a pile of snow.", "You scoop up a pile of snow.") return + +/turf/simulated/sky/moving/north/sif/planet_fall/find_planet() + return planet_sif diff --git a/tgui/packages/tgui-dev-server/dreamseeker.ts b/tgui/packages/tgui-dev-server/dreamseeker.js similarity index 90% rename from tgui/packages/tgui-dev-server/dreamseeker.ts rename to tgui/packages/tgui-dev-server/dreamseeker.js index af95debedf..d1ca2a9ac5 100644 --- a/tgui/packages/tgui-dev-server/dreamseeker.ts +++ b/tgui/packages/tgui-dev-server/dreamseeker.js @@ -16,10 +16,6 @@ const logger = createLogger('dreamseeker'); const instanceByPid = new Map(); export class DreamSeeker { - pid: number; - addr: string; - client: any; - static getInstancesByPids: (pids: any) => Promise; constructor(pid, addr) { this.pid = pid; this.addr = addr; @@ -41,8 +37,6 @@ export class DreamSeeker { } } -type Entry = { pid: number; addr: string }; - /** * @param {number[]} pids * @returns {DreamSeeker[]} @@ -51,8 +45,8 @@ DreamSeeker.getInstancesByPids = async (pids) => { if (process.platform !== 'win32') { return []; } - const instances: any[] = []; - const pidsToResolve: number[] = []; + const instances = []; + const pidsToResolve = []; for (let pid of pids) { const instance = instanceByPid.get(pid); if (instance) { @@ -70,7 +64,7 @@ DreamSeeker.getInstancesByPids = async (pids) => { }); // Line format: // proto addr mask mode pid - const entries: Entry[] = []; + const entries = []; const lines = stdout.split('\r\n'); for (let line of lines) { const words = line.match(/\S+/g); diff --git a/tgui/packages/tgui-dev-server/index.ts b/tgui/packages/tgui-dev-server/index.js similarity index 100% rename from tgui/packages/tgui-dev-server/index.ts rename to tgui/packages/tgui-dev-server/index.js diff --git a/tgui/packages/tgui-dev-server/link/retrace.ts b/tgui/packages/tgui-dev-server/link/retrace.js similarity index 93% rename from tgui/packages/tgui-dev-server/link/retrace.ts rename to tgui/packages/tgui-dev-server/link/retrace.js index 4deb7df38c..083ddb37d1 100644 --- a/tgui/packages/tgui-dev-server/link/retrace.ts +++ b/tgui/packages/tgui-dev-server/link/retrace.js @@ -16,15 +16,13 @@ const { parse: parseStackTrace } = require('stacktrace-parser'); const logger = createLogger('retrace'); -type SourceMapData = { file: string; consumer: any }; - const { SourceMapConsumer } = SourceMap; -const sourceMaps: SourceMapData[] = []; +const sourceMaps = []; export const loadSourceMaps = async (bundleDir) => { // Destroy and garbage collect consumers while (sourceMaps.length !== 0) { - const { consumer } = sourceMaps.shift() as SourceMapData; + const { consumer } = sourceMaps.shift(); consumer.destroy(); } // Load new sourcemaps diff --git a/tgui/packages/tgui-dev-server/link/server.ts b/tgui/packages/tgui-dev-server/link/server.js similarity index 97% rename from tgui/packages/tgui-dev-server/link/server.ts rename to tgui/packages/tgui-dev-server/link/server.js index 45c5633b1e..2a1f551bf6 100644 --- a/tgui/packages/tgui-dev-server/link/server.ts +++ b/tgui/packages/tgui-dev-server/link/server.js @@ -22,11 +22,6 @@ export { loadSourceMaps }; export const setupLink = () => new LinkServer(); class LinkServer { - wss: any; - httpServer: http.Server< - typeof http.IncomingMessage, - typeof http.ServerResponse - >; constructor() { logger.log('setting up'); this.wss = null; diff --git a/tgui/packages/tgui-dev-server/logging.ts b/tgui/packages/tgui-dev-server/logging.js similarity index 100% rename from tgui/packages/tgui-dev-server/logging.ts rename to tgui/packages/tgui-dev-server/logging.js diff --git a/tgui/packages/tgui-dev-server/reloader.ts b/tgui/packages/tgui-dev-server/reloader.js similarity index 95% rename from tgui/packages/tgui-dev-server/reloader.ts rename to tgui/packages/tgui-dev-server/reloader.js index 7dc3cd9c6f..cb477a6523 100644 --- a/tgui/packages/tgui-dev-server/reloader.ts +++ b/tgui/packages/tgui-dev-server/reloader.js @@ -29,7 +29,7 @@ const SEARCH_LOCATIONS = [ `/mnt/c/Users/*/*/BYOND/cache`, ]; -let cacheRoot: string; +let cacheRoot; export const findCacheRoot = async () => { if (cacheRoot) { @@ -83,10 +83,9 @@ export const reloadByondCache = async (bundleDir) => { return; } // Get dreamseeker instances - const pids = cacheDirs.map((cacheDir) => { - const ourDir = cacheDir.split('/cache/tmp').pop(); - return parseInt(ourDir ? ourDir : '', 10); - }); + const pids = cacheDirs.map((cacheDir) => + parseInt(cacheDir.split('/cache/tmp').pop(), 10), + ); const dssPromise = DreamSeeker.getInstancesByPids(pids); // Copy assets const assets = await resolveGlob( diff --git a/tgui/packages/tgui-dev-server/require.ts b/tgui/packages/tgui-dev-server/require.js similarity index 100% rename from tgui/packages/tgui-dev-server/require.ts rename to tgui/packages/tgui-dev-server/require.js diff --git a/tgui/packages/tgui-dev-server/util.ts b/tgui/packages/tgui-dev-server/util.js similarity index 94% rename from tgui/packages/tgui-dev-server/util.ts rename to tgui/packages/tgui-dev-server/util.js index 95258c63f9..13fbef3b21 100644 --- a/tgui/packages/tgui-dev-server/util.ts +++ b/tgui/packages/tgui-dev-server/util.js @@ -22,7 +22,7 @@ export const resolveGlob = (...sections) => { silent: true, windowsPathsNoEscape: true, }); - const safePaths: string[] = []; + const safePaths = []; for (let path of unsafePaths) { try { fs.statSync(path); diff --git a/tgui/packages/tgui-dev-server/webpack.ts b/tgui/packages/tgui-dev-server/webpack.js similarity index 97% rename from tgui/packages/tgui-dev-server/webpack.ts rename to tgui/packages/tgui-dev-server/webpack.js index 7aeb4c57c9..e4fbdeb9f1 100644 --- a/tgui/packages/tgui-dev-server/webpack.ts +++ b/tgui/packages/tgui-dev-server/webpack.js @@ -26,9 +26,6 @@ export const createCompiler = async (options) => { }; class WebpackCompiler { - webpack: any; - config: any; - bundleDir: string; async setup(options) { // Create a require context that is relative to project root // and retrieve all necessary dependencies. diff --git a/tgui/packages/tgui-dev-server/winreg.ts b/tgui/packages/tgui-dev-server/winreg.js similarity index 100% rename from tgui/packages/tgui-dev-server/winreg.ts rename to tgui/packages/tgui-dev-server/winreg.js diff --git a/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx b/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx index cb4e19ab11..889dd19f55 100644 --- a/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx +++ b/tgui/packages/tgui-panel/audio/NowPlayingWidget.tsx @@ -16,9 +16,10 @@ import { toFixed } from 'tgui-core/math'; import { useSettings } from '../settings'; import { selectAudio } from './selectors'; +import type { AudioState } from './types'; export const NowPlayingWidget = (props) => { - const audio = useSelector(selectAudio), + const audio: AudioState = useSelector(selectAudio), dispatch = useDispatch(), settings = useSettings(), title = audio.meta?.title, @@ -27,7 +28,7 @@ export const NowPlayingWidget = (props) => { upload_date = audio.meta?.upload_date || 'Unknown Date', album = audio.meta?.album || 'Unknown Album', duration = audio.meta?.duration, - date = !isNaN(upload_date) + date = !isNaN(Number(upload_date)) ? upload_date?.substring(0, 4) + '-' + upload_date?.substring(4, 6) + diff --git a/tgui/packages/tgui-panel/audio/reducer.ts b/tgui/packages/tgui-panel/audio/reducer.ts index 17684060ff..2d6005c6d3 100644 --- a/tgui/packages/tgui-panel/audio/reducer.ts +++ b/tgui/packages/tgui-panel/audio/reducer.ts @@ -4,7 +4,9 @@ * @license MIT */ -const initialState = { +import type { AudioState } from './types'; + +const initialState: AudioState = { visible: false, playing: false, track: null, diff --git a/tgui/packages/tgui-panel/audio/types.ts b/tgui/packages/tgui-panel/audio/types.ts new file mode 100644 index 0000000000..0ca43480bb --- /dev/null +++ b/tgui/packages/tgui-panel/audio/types.ts @@ -0,0 +1,13 @@ +export type AudioState = { + visible: boolean; + playing: boolean; + track: null | string; + meta?: { + title: string; + link: string; + duration: number; + artist?: string; + upload_date?: string; + album?: string; + }; +}; diff --git a/tgui/packages/tgui-panel/chat/ChatTabs.tsx b/tgui/packages/tgui-panel/chat/ChatTabs.tsx index d80be6eff3..5c2e9a5978 100644 --- a/tgui/packages/tgui-panel/chat/ChatTabs.tsx +++ b/tgui/packages/tgui-panel/chat/ChatTabs.tsx @@ -10,8 +10,9 @@ import { Box, Button, Stack, Tabs } from 'tgui-core/components'; import { openChatSettings } from '../settings/actions'; import { addChatPage, changeChatPage } from './actions'; import { selectChatPages, selectCurrentChatPage } from './selectors'; +import { Page } from './types'; -const UnreadCountWidget = ({ value }) => ( +const UnreadCountWidget = ({ value }: { value: number }) => ( { - {pages.map((page) => ( + {pages.map((page: Page) => ( r.keys().map((path) => r(path)); export const KitchenSink = (props: { panel: boolean }) => { const { panel } = props; - const [theme] = useState(undefined); + const [theme, setTheme] = useState(undefined); const [pageIndex, setPageIndex] = useState(0); const stories = getStories(); const story = stories[pageIndex]; @@ -48,7 +48,9 @@ export const KitchenSink = (props: { panel: boolean }) => { - {story.meta.render()} + + {story.meta.render(theme, setTheme)} + diff --git a/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.tsx b/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.tsx index ed1c38ac16..047f9e4cff 100644 --- a/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.tsx +++ b/tgui/packages/tgui/interfaces/common/InterfaceLockNoticeBox.tsx @@ -22,7 +22,15 @@ type Data = { * All props can be redefined if you want custom behavior, but * it's preferred to stick to defaults. */ -export const InterfaceLockNoticeBox = (props) => { +export const InterfaceLockNoticeBox = (props: { + readonly siliconUser?: BooleanLike; + readonly locked?: BooleanLike; + readonly onLockStatusChange?: (status: BooleanLike) => void; + readonly accessText?: string; + readonly preventLocking?: BooleanLike; + readonly deny?: BooleanLike; + readonly denialMessage?: React.JSX.Element | string; +}) => { const { act, data } = useBackend(); const { siliconUser = data.siliconUser, @@ -30,7 +38,12 @@ export const InterfaceLockNoticeBox = (props) => { onLockStatusChange = () => act('lock'), accessText = 'an ID card', preventLocking = data.preventLocking, + deny = false, + denialMessage = 'Error.', } = props; + if (deny) { + return denialMessage; + } // For silicon users if (siliconUser) { return ( diff --git a/tools/mapmerge2/requirements.txt b/tools/mapmerge2/requirements.txt new file mode 100644 index 0000000000..0d0c95b2ff --- /dev/null +++ b/tools/mapmerge2/requirements.txt @@ -0,0 +1,3 @@ +pygit2 +bidict==0.22.1 +Pillow==11.0.0 diff --git a/vorestation.dme b/vorestation.dme index e6db966a9a..4a9cb88536 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1944,6 +1944,7 @@ #include "code\game\turfs\simulated\outdoors\outdoors.dm" #include "code\game\turfs\simulated\outdoors\outdoors_ch.dm" #include "code\game\turfs\simulated\outdoors\sky.dm" +#include "code\game\turfs\simulated\outdoors\sky_effect.dm" #include "code\game\turfs\simulated\outdoors\snow.dm" #include "code\game\turfs\simulated\outdoors\survival_action_vr.dm" #include "code\game\turfs\snow\snow.dm"