diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm index 26a7357d4e..691dd5235e 100644 --- a/code/modules/client/stored_item.dm +++ b/code/modules/client/stored_item.dm @@ -199,7 +199,7 @@ persist_storable = FALSE /obj/item/weapon/hand_tele persist_storable = FALSE -/obj/item/weapon/paper/dockingcodes +/obj/item/weapon/paper persist_storable = FALSE /obj/item/weapon/backup_implanter persist_storable = FALSE @@ -216,4 +216,28 @@ /obj/item/weapon/gun/energy/sizegun/admin persist_storable = FALSE /obj/item/weapon/gun/energy/sizegun/abductor - persist_storable = FALSE \ No newline at end of file +<<<<<<< HEAD + persist_storable = FALSE +======= + persist_storable = FALSE +/obj/item/stack + persist_storable = FALSE +/obj/item/weapon/book + persist_storable = FALSE +/obj/item/weapon/melee/cursedblade + persist_storable = FALSE +/obj/item/device/paicard + persist_storable = FALSE +/obj/item/organ + persist_storable = FALSE +/obj/item/device/soulstone + persist_storable = FALSE +/obj/item/device/aicard + persist_storable = FALSE +/obj/item/device/mmi + persist_storable = FALSE +/obj/item/seeds + persist_storable = FALSE +/obj/item/weapon/reagent_containers/food/snacks/grown + persist_storable = FALSE +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index 796de72a92..520792b7d0 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -269,7 +269,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable /obj/item/device/nif/proc/handle_install() if(human.stat || !human.mind) //No stuff while KO or not sleeved return FALSE - + persist_storable = FALSE //VOREStation edit - I am not sure if polaris has nifs, but just in case. //Firsties if(!install_done) if(human.mind.name == owner) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 1ea3e6f625..8e7071e0a9 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -6130,6 +6130,9 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/public_garden_one) "aks" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "akt" = ( @@ -8473,6 +8476,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "anZ" = ( @@ -20300,6 +20304,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aHe" = ( @@ -27951,6 +27956,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aVd" = ( @@ -32206,6 +32212,10 @@ "cAR" = ( /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) +"cCx" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) @@ -32268,6 +32278,30 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +<<<<<<< HEAD +======= +"cKo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +"cKr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/engineering/atmos/processing) +"cMk" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/hardstorage) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "cNL" = ( /obj/machinery/light/small{ dir = 8 @@ -33066,6 +33100,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"fOk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/lino, +/area/crew_quarters/visitor_dining) "fOy" = ( /obj/machinery/shower{ pixel_y = 16 @@ -35875,6 +35919,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"nBZ" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "nDD" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -36448,6 +36496,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +<<<<<<< HEAD +======= +"ppS" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/storage/primary) +"prr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/turf/simulated/floor/plating, +/area/maintenance/engineering/atmos/airlock/gas) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "ptv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4 @@ -36531,6 +36590,29 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +<<<<<<< HEAD +======= +"pMd" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/grass, +/area/tether/surfacebase/surface_one_hall) +"pPF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/atmos/airlock/gas) +"pUw" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "pUI" = ( /obj/structure/railing{ dir = 1 @@ -36859,6 +36941,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/crew_quarters/locker) +"qOV" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "qPs" = ( /obj/structure/railing{ dir = 1 @@ -37113,6 +37199,12 @@ /obj/item/weapon/material/minihoe, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) +"rCj" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/vacant/vacant_site/east) "rDJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38070,6 +38162,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) +"uHq" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "uHS" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -38957,6 +39053,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xFG" = ( @@ -42742,6 +42839,28 @@ aah aah aah aah +<<<<<<< HEAD +======= +ajL +akV +bde +ajT +ajY +akb +akh +akk +akq +akw +akE +bdG +akW +cCx +aly +alN +amf +amA +ajS +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aah aah aah @@ -43891,6 +44010,82 @@ aah aah aah aah +<<<<<<< HEAD +======= +akB +akB +akB +waR +dCs +waR +vhI +waR +nwH +eFp +bOd +lSW +uiK +ajM +bcY +bdn +bdn +bdB +akS +ald +alo +ahl +ahl +ami +amC +atH +akR +atG +atH +atH +ahM +nBZ +aju +aoE +apl +apl +apl +apl +apl +apo +apl +aqy +apl +apl +auK +rJv +rJv +rJv +avM +aws +abN +abW +acp +afe +aeR +aeR +agG +aha +ahy +aiB +ajm +abN +kyE +aGX +adn +adn +adn +aCK +aKa +aKL +aKL +aKL +aKL +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aah aah aah @@ -45577,6 +45772,113 @@ aad aad aad aad +<<<<<<< HEAD +======= +aad +aad +aad +aad +aad +ano +aad +aad +aad +pCj +wjq +wjq +tdh +lQu +dPC +tdh +qmc +ofW +qoK +uzs +kEs +hMu +iKy +anp +aeW +aml +afT +ppS +afT +agJ +anj +anu +anC +adh +adO +ahl +bcn +axS +bcl +azb +apW +apW +apW +bbX +aiC +alt +alv +alv +apu +bcq +avT +avT +axe +avT +avT +avT +avT +aBJ +aAw +aDi +aDQ +aEt +aFj +aDi +aah +aah +aBO +aIa +aIG +aJF +aJF +aJF +aJF +aJF +aJF +aJF +aJF +aJF +aIh +aPp +aPl +aQt +aQU +aRz +ajn +aSA +aTg +aOR +aTW +aUB +ajf +ajg +ajh +aVU +aVU +aWO +fVv +aTW +aTW +aad +aah +aah +aah +aah +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aah aah akB @@ -48654,6 +48956,7 @@ aad aad adK aad +<<<<<<< HEAD aad aad pCj @@ -48711,6 +49014,64 @@ aDQ aEt aFj aDi +======= +aao +aay +aaL +aaZ +adb +acn +awy +adQ +aao +yaU +afO +aBB +aCr +aDC +aEh +aDt +aCr +aGk +aDA +aHQ +aJy +aKI +aRR +aGj +bbl +anX +aoj +aoS +apC +aqf +aqf +arg +arA +arz +hzr +arz +asO +apC +aqf +aqf +arg +aoS +pMd +awI +axo +ayh +ayS +iwE +nmD +aBT +aCF +aDn +ayh +aBc +aFl +aBO +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aah aah aBO @@ -49798,7 +50159,7 @@ agM aCJ aCJ aCJ -aCJ +rCj aCJ aCJ agM @@ -61727,6 +62088,129 @@ aad aad aad <<<<<<< HEAD +<<<<<<< HEAD +======= +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aff +auo +adG +ayf +aff +oto +aAI +jOI +afy +azT +aAa +uVK +ojM +cUB +wOK +fFT +rxD +bbj +agT +ahr +ajR +alu +anr +fDO +abM +abJ +abJ +abO +abS +arC +apF +aah +ash +asy +asV +atw +atV +auz +auR +avz +awh +awQ +axx +auR +azk +kBW +tNJ +agM +aCS +aCO +aDY +aEL +aFA +aEL +aEL +aEL +aDu +aIt +aJn +aJV +aDu +aLj +aLU +aMF +aNr +aNS +aOs +aON +aPh +aPK +aQk +aQN +aRq +aPK +aSs +aSY +aTF +aSo +afZ +bcT +aVf +aVB +aVf +cKo +aUP +aWY +aUm +bcE +aUP +bcL +aUm +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aad aad aad @@ -61769,6 +62253,7 @@ aah aah aah aah +<<<<<<< HEAD auD >>>>>>> d963833121... Orange Line Upgrade (#11391) aud @@ -61840,6 +62325,125 @@ aud aud auD >>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping +======= +aah +aah +aah +aah +aah +aah +aeE +aeE +aeE +afm +afm +axb +afm +afm +aeE +aeE +azV +azV +azV +aAb +aAD +uVK +bbj +bbj +bbj +bbj +bbj +ahg +ahz +ajZ +alD +anL +fgm +ruj +lry +lry +lry +aql +arl +apF +aah +ash +ash +ash +ash +ash +ash +auR +auR +auR +auR +auR +ayn +azd +jAo +vDb +aAR +agM +aCO +aDZ +aEM +aFB +aFS +aEM +aHm +aDu +fOk +aJo +aDu +aKJ +aLj +aLV +aME +aNs +aNS +aOt +aOM +aPi +aPK +aQl +aQM +aRr +aPK +aSt +aSX +aTG +aSo +arm +bcT +aVf +aUs +aUu +iee +aVP +aWZ +bcj +bcF +gzO +bcM +aUm +aUm +aUm +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aad +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aad aad aad @@ -62189,6 +62793,85 @@ aad aad aad aad +<<<<<<< HEAD +======= +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +aah +naC +ajb +awu +lMK +ayx +ayN +azA +naC +aah +aah +fWT +rzF +lXE +gIt +wvv +tXi +fWT +aAD +aAD +aAD +aAD +aAD +aAD +aah +lry +kuT +kuT +lry +lry +aah +aah +aah +aah +aah +aah +atx +aDw +aFF +aFF +aFF +aFW +auB +auB +auB +qOV +auB +auU +auB +uHq +auB +auB +auB +auB +auB +auB +auB +ovr +ird +mZQ +auB +atx +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aad aad aad diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 7705a3df67..c2bd0b65af 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -2779,6 +2779,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "aei" = ( @@ -7959,6 +7960,7 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "amn" = ( @@ -8775,6 +8777,7 @@ /obj/structure/table/glass, /obj/item/weapon/deck/cards, /obj/structure/table/glass, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "anG" = ( @@ -14952,6 +14955,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 }, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "ayB" = ( @@ -16543,6 +16549,9 @@ dir = 4 }, /obj/machinery/light/small, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "aCg" = ( @@ -19695,6 +19704,9 @@ dir = 1; pixel_y = -22 }, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor, /area/maintenance/lower/rnd) "aIk" = ( @@ -21425,6 +21437,7 @@ "aLM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aLN" = ( @@ -33118,6 +33131,22 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +<<<<<<< HEAD +======= +"dnD" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppersouthstairwell) +"dzE" = ( +/obj/effect/floor_decal/chapel{ + dir = 8 + }, +/obj/structure/sign/painting/chapel_secure{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/main) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "dAB" = ( /obj/structure/cable/orange{ d1 = 4; @@ -33451,6 +33480,13 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/tether/surfacebase/fish_farm) +"grX" = ( +/obj/effect/floor_decal/rust, +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "gsU" = ( /obj/structure/table/rack, /obj/random/maintenance/engineering, @@ -33630,6 +33666,34 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +<<<<<<< HEAD +======= +"iLF" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) +"jcd" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/east_stairs_two) +"jiy" = ( +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 + }, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) +"jlG" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/centralhall) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "jtj" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/readingrooms) @@ -34012,12 +34076,38 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) <<<<<<< HEAD +<<<<<<< HEAD ||||||| parent of 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid "lOO" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/chapel/main) ======= +======= +"lvb" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) +"lJc" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "lMw" = ( /obj/item/device/radio/intercom/locked/ai_private{ dir = 4; @@ -34029,6 +34119,10 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/chapel/main) +"lUN" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_two) "lZx" = ( /turf/simulated/wall/r_wall, /area/maintenance/readingrooms) @@ -34136,6 +34230,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload_foyer) +"mNT" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "mNZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -34146,7 +34246,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +<<<<<<< HEAD >>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid +======= +"mQc" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "mUP" = ( /obj/structure/bed/padded, /obj/effect/floor_decal/techfloor, @@ -34173,6 +34282,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload_foyer) +"ncG" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "ndB" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -34379,7 +34492,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/ai) +<<<<<<< HEAD >>>>>>> 926c35deb7... Merge pull request #10416 from Enzo-Leon/mapfix-02 +======= +"pny" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "pqb" = ( /obj/structure/sink/puddle, /turf/simulated/floor/beach/sand/desert, @@ -34548,11 +34670,23 @@ /area/maintenance/lower/bar) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> c9bc676ff0... Merge pull request #9472 from Very-Soft/littlefix ||||||| parent of 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid ======= ||||||| parent of 926c35deb7... Merge pull request #10416 from Enzo-Leon/mapfix-02 ======= +======= +"qGR" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "qKR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -34582,6 +34716,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) +"rjM" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/beach/sand/desert, +/area/tether/surfacebase/fish_farm) "rlN" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/ai) @@ -34624,7 +34762,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) +<<<<<<< HEAD >>>>>>> 45e710fa51... Merge pull request #10235 from Enzo-Leon/asteroid +======= +"rAv" = ( +/obj/machinery/vending/wardrobe/chapdrobe, +/turf/simulated/floor/lino, +/area/chapel/office) +"rBf" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "rJc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/landmark/start{ @@ -35060,6 +35209,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"tZD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "tZV" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -39833,6 +39989,38 @@ adt adt adt adt +<<<<<<< HEAD +======= +aHm +aHm +aHm +aHE +aHE +aIJ +mNT +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +aHE +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun adt adt adt @@ -39867,6 +40055,91 @@ aab aab aab aab +<<<<<<< HEAD +======= +abn +abn +abn +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +adt +akX +akX +aoi +apt +aqz +lUN +ars +atI +akX +akX +aPv +aPD +aRf +ajV +ajV +azs +axO +bCs +grL +azs +azs +azs +azs +azs +azs +azs +azs +aHm +aHm +aHm +aHm +aqp +aYD +arg +aJz +arm +arm +arm +arm +arm +ask +aOb +aOb +arm +aQt +arm +ats +atw +arm +aOb +arm +arm +arm +aQt +ayA +aHE +adt +adt +adt +adt +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aab aab aab @@ -40746,6 +41019,7 @@ aab aab aab aab +<<<<<<< HEAD aab aab aab @@ -41608,10 +41882,13 @@ aab abn abn abn +======= +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun abn abn abn abn +<<<<<<< HEAD adt adt adt @@ -41747,6 +42024,8 @@ aab aab aab abn +======= +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun abn abn abn @@ -41754,6 +42033,7 @@ abn abn abn abn +<<<<<<< HEAD adt adt adt @@ -41778,10 +42058,79 @@ ajV adt adt adt +======= +acm +acm +acm +acm +acm +acm +acm +ahd +ahR +aiY +ajW +alb +ald +agr +aok +apy +aqF +arx +asz +atK +aum +aqF +avS +ajV +awY +axQ +axR +ayw +azq +azq +azq +aBd +aBd +aCq +aDm +aDm +aEB +aEB +aEB +axR +awY +aGy +aql +aIi +aIN +aJh +aJB +aKb +aKN +aLv +aMi +aMR +aNt +aMR +aOU +aKb +aQw +aQw +pny +aQw +aRj +aHE +aUW +aHE +aHE +aHE +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun adt adt adt adt +<<<<<<< HEAD azs azq aAw @@ -41819,15 +42168,23 @@ aJf ayj ayG aHE +======= +adt +adt +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun adt adt adt adt +<<<<<<< HEAD aab aab aab aab aab +======= +abn +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aab aab aab @@ -41836,6 +42193,7 @@ aab aab aab bdS +<<<<<<< HEAD bek bek bfq @@ -41998,6 +42356,28 @@ bek bek bek bmk +======= +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +bdS +blQ +blQ +blQ +bdS +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun bdS aab aab @@ -42495,7 +42875,7 @@ azq azq azq ayw -axR +rjM axR axR axR @@ -43642,7 +44022,7 @@ aGw aGw aqZ arf -aEc +lvb aJJ aKh aKU @@ -44656,7 +45036,7 @@ aRm aPJ aYd aWH -aQw +pny aXx aXx aXx @@ -44914,7 +45294,7 @@ aEa avD aFh aFl -aEc +lvb aGy aGy aGy @@ -44955,7 +45335,7 @@ baz aHn aHI baz -aIg +grX baU baU baz @@ -45676,7 +46056,7 @@ baU beQ aKK baz -baU +mQc baU biS bjr @@ -47233,7 +47613,7 @@ baz aIM baU baU -baU +mQc baz bfR bgx @@ -47758,7 +48138,7 @@ aGH aHb aHs aHM -aGF +ncG aIU aGE aAG @@ -48360,7 +48740,7 @@ aLY bbm bbM aZr -aZr +iLF aLY adt adt @@ -49586,7 +49966,7 @@ asV awj avD axF -ayc +tZD ayd azg ayh @@ -49610,7 +49990,7 @@ ayd ayd aKA ayd -ayd +rBf aMG avD asm @@ -49852,7 +50232,7 @@ aex afj agh aaU -aam +jlG aiP akq alS @@ -50348,7 +50728,7 @@ aLX aPx aPx aLY -aRC +qGR bcM atW aUc @@ -50887,7 +51267,7 @@ aks akF akJ akJ -akJ +dnD akJ alY amJ @@ -51408,7 +51788,7 @@ aLY aLY aZr aZr -aZr +iLF baO bax <<<<<<< HEAD diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2567a3e9bb..0410563590 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -20287,6 +20287,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aGw" = ( @@ -20549,6 +20550,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aGW" = ( @@ -38330,6 +38332,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cmQ" = ( @@ -38834,6 +38837,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"eaj" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eeD" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -38901,6 +38914,31 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +<<<<<<< HEAD +======= +"enD" = ( +/obj/effect/landmark/vermin, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether/surfacebase/public_garden_three) +"eqZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/shuttle_pad) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "erS" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -38936,6 +38974,10 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"eDc" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "eEW" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -39058,7 +39100,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +<<<<<<< HEAD >>>>>>> 4a2211ba08... Fancy Lifeboats (#11392) +======= +"eOP" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "eQN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -39447,6 +39496,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gDk" = ( @@ -39526,6 +39576,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gUL" = ( @@ -39797,6 +39848,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"ieh" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "ieo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -40002,6 +40057,26 @@ /obj/structure/window/reinforced, /turf/simulated/wall, /area/tether/surfacebase/medical/storage) +"iUz" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/upperhall) "iXM" = ( /obj/structure/cable/green{ d1 = 1; @@ -40527,6 +40602,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"kFE" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "kFJ" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -40655,6 +40734,38 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +<<<<<<< HEAD +======= +"lli" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"llH" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun "lmq" = ( /obj/machinery/computer/general_air_control/fuel_injection{ device_tag = "riot_inject"; @@ -41278,6 +41389,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"nSh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "nSq" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -305146,11 +305267,25 @@ aac aac aac aac +<<<<<<< HEAD aCY aDe aDe aDn aju +======= +aac +aac +aiF +aDL +aVr +aUF +xFm +aDn +hMw +enD +akm +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun aDi aDs aDs @@ -305445,7 +305580,7 @@ aDT arW arW aVE -aWF +lli akn alP aac @@ -306013,7 +306148,7 @@ aac aac agw aVG -aWF +nSh aTO akS aly @@ -309415,7 +309550,7 @@ bzK agg adW qAt -snE +iUz ajJ aTX aVI @@ -312739,7 +312874,7 @@ bmr acR blA bmI -acR +eDc aim ake aGm @@ -313321,7 +313456,7 @@ aeG ajh avG akn -alk +eaj alk bdD ayx @@ -313493,7 +313628,7 @@ beX beX bcY bdq -bbk +eOP bbk beS beX @@ -313977,7 +314112,7 @@ biH dyV bja biL -biL +ieh bju biF adG @@ -315395,11 +315530,19 @@ axt avA aCi asX +<<<<<<< HEAD asX asX aIh bdw bbL +======= +aLd +bbU +baF +kFE +aLd +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun bbU bdJ aAG diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index dc437b011f..42558a35ec 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -124,10 +124,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +<<<<<<< HEAD "k" = ( /obj/machinery/light{ dir = 8; icon_state = "tube1" +======= +"cC" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"cH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced{ + dir = 4 +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun }, /obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/wood, @@ -804,6 +817,10 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"zr" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/wood, +/area/tether/midpoint) "zG" = ( >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /obj/structure/disposalpipe/segment{ @@ -21640,6 +21657,7 @@ kz kz kz kz +<<<<<<< HEAD kz kz NJ @@ -21660,6 +21678,28 @@ Qc zP kz kz +======= +Et +zi +pK +zr +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +Or +pK +pK +zi +Et +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun kz kz kz @@ -23486,8 +23526,24 @@ kz kz kz Et +<<<<<<< HEAD Wf Wf +======= +Pz +Or +cC +pK +pK +Tz +It +tB +tB +tB +tB +tn +sR +>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun pK pK VB diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 1dd18d3ff0..cc1f065593 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -20501,6 +20501,12 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"gCZ" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "gDl" = ( /obj/machinery/light_switch{ dir = 1; @@ -23535,6 +23541,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/quartermaster/office) "jiq" = ( @@ -24834,6 +24841,10 @@ }, /turf/simulated/floor/airless, /area/ai_monitored/storage/eva) +"kpK" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/exploration/crew) "kqW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25370,6 +25381,7 @@ dir = 10 }, /obj/item/device/radio/beacon, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kOF" = ( @@ -27599,6 +27611,13 @@ }, /turf/simulated/wall/r_wall, /area/maintenance/substation/civilian) +"mBL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "mBY" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -29396,6 +29415,10 @@ }, /turf/simulated/floor, /area/maintenance/cargo) +"ohH" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "ohT" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, @@ -30750,6 +30773,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) +"qaA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "qbk" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{ frequency = 1380; @@ -30812,6 +30845,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "qdG" = ( @@ -31485,6 +31519,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"qKp" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "qKr" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34530,6 +34568,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/engineering/foyer) "uhN" = ( @@ -37540,6 +37579,13 @@ /obj/structure/railing, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"xRE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "xSF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -41261,7 +41307,7 @@ gTz trn gTz gTz -gTz +xRE gTz gTz trn @@ -44619,7 +44665,7 @@ alt alt alv tMV -bVP +mBL pfh bgG aaa @@ -45863,7 +45909,7 @@ aEk aXR bbb ahP -brX +qKp ank byy byy @@ -47153,7 +47199,7 @@ dyq fca hcW qHy -ack +gCZ fgA ach abC @@ -48895,7 +48941,7 @@ fMv gnc gMr pPa -eWv +qaA ops pny acH @@ -49686,7 +49732,7 @@ aBW aBW aBW aBW -aDz +ohH aEc gcc awN @@ -50060,7 +50106,7 @@ pXr scu iiU ajj -ajj +kpK kfa alj vmt