diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 553444a3c70..f58e6daf505 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1320,6 +1320,11 @@ }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) +"acR" = ( +/obj/structure/table/glass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "acV" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -7167,6 +7172,11 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal) +"asj" = ( +/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "ask" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -19348,6 +19358,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel, /area/security/checkpoint/supply) +"aSk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 6 + }, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "aSl" = ( /obj/machinery/power/apc{ areastring = "/area/quartermaster/storage"; @@ -89249,6 +89267,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/white, /area/science/research) +"dwv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/sign/poster/official/safety_eye_protection{ + pixel_x = -32; + pixel_y = -32 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "dww" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -96927,10 +96956,9 @@ /turf/open/floor/plating, /area/security/detectives_office/private_investigators_office) "dNn" = ( -/obj/structure/lattice/catwalk, -/obj/effect/landmark/xeno_spawn, -/turf/open/space, -/area/solar/starboard/aft) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/airless, +/area/space/nearstation) "dNo" = ( /obj/structure/chair{ dir = 4 @@ -106108,6 +106136,24 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"eTV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/office/light, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/sign/poster/official/safety_internals{ + pixel_x = 32; + pixel_y = -32 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) +"eVg" = ( +/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "eVx" = ( /obj/machinery/light{ dir = 8 @@ -106278,6 +106324,10 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"fsE" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "fuE" = ( /obj/machinery/door/airlock/security{ name = "Isolation Cell"; @@ -106393,6 +106443,20 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"fEm" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/obj/structure/sign/poster/official/science{ + pixel_x = 32; + pixel_y = 32 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "fIc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/flasher{ @@ -106496,6 +106560,17 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"fRu" = ( +/obj/structure/frame/computer{ + anchored = 1; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "fRT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -106742,6 +106817,10 @@ /obj/effect/turf_decal/arrows/white, /turf/open/floor/plasteel, /area/engine/atmos) +"gCX" = ( +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "gDF" = ( /obj/machinery/airalarm{ dir = 8; @@ -107052,6 +107131,13 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"hij" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "hjf" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -107098,6 +107184,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/dark, /area/security/execution/education) +"hos" = ( +/obj/structure/table/glass, +/obj/item/paper_bin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "hpy" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -107381,6 +107473,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"hUm" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 9 + }, +/obj/machinery/vending/coffee, +/turf/open/space/basic, +/area/space/nearstation) "hVS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -107910,6 +108010,11 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"jdJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/glass, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "jdO" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -108015,6 +108120,13 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"jqI" = ( +/obj/machinery/door/airlock/external{ + name = "Observatory"; + req_access_txt = "13" + }, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "jqM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -108089,6 +108201,10 @@ }, /turf/open/floor/plasteel, /area/security/prison/safe) +"jwg" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating/airless, +/area/space/nearstation) "jwH" = ( /mob/living/simple_animal/mouse/brown/tom, /turf/open/floor/plasteel, @@ -108687,6 +108803,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"kUH" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/closet/crate, +/turf/open/space/basic, +/area/space/nearstation) "kXg" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plasteel, @@ -109087,6 +109211,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/engine/engineering) +"lAw" = ( +/obj/item/chair/plastic, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 9 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "lEl" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -109674,6 +109806,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"mQX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "mRz" = ( /obj/structure/table/glass, /obj/item/storage/firstaid/regular, @@ -109806,6 +109942,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"ncv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/sign/poster/official/bless_this_spess{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "ncP" = ( /obj/item/radio/intercom{ pixel_y = -32 @@ -110090,6 +110237,11 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"nHf" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/space/basic, +/area/space/nearstation) "nJb" = ( /obj/structure/sign/departments/chemistry{ pixel_x = -32 @@ -110337,6 +110489,10 @@ }, /turf/open/floor/plasteel, /area/security/prison/safe) +"oub" = ( +/obj/structure/sign/warning/vacuum/external, +/turf/closed/wall, +/area/maintenance/starboard/aft) "ovb" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -110962,6 +111118,14 @@ }, /turf/open/floor/plasteel, /area/engine/storage_shared) +"pCQ" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 5 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/space/basic, +/area/space/nearstation) "pDb" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible/layer4, /obj/machinery/atmospherics/pipe/manifold/general/visible/layer2{ @@ -111114,6 +111278,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) +"pYz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "qcx" = ( /obj/machinery/firealarm{ dir = 4; @@ -111194,6 +111365,10 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab/range) +"qhQ" = ( +/obj/effect/turf_decal/delivery/white, +/turf/open/floor/plating/airless, +/area/space/nearstation) "qiJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -111970,6 +112145,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"rKA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "rKN" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -112040,6 +112219,16 @@ }, /turf/open/floor/plasteel, /area/medical/surgery/room_b) +"rNd" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Observatory"; + req_access_txt = "13" + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "rOf" = ( /obj/item/kirbyplants/random, /obj/machinery/light_switch{ @@ -112643,6 +112832,12 @@ heat_capacity = 1e+006 }, /area/maintenance/starboard/aft) +"tgu" = ( +/obj/structure/table/glass, +/obj/item/food/pizzaslice/vegetable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut/observatory) "tju" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/cafeteria, @@ -112937,6 +113132,9 @@ }, /turf/open/floor/plasteel/cafeteria, /area/security/prison) +"tKr" = ( +/turf/closed/wall, +/area/maintenance/space_hut/observatory) "tLN" = ( /obj/machinery/atmospherics/pipe/manifold4w/green/visible, /obj/effect/turf_decal/stripes/line{ @@ -113695,6 +113893,13 @@ }, /turf/open/floor/plating, /area/engine/engineering) +"vpk" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) "vqo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -114017,6 +114222,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/engine/atmos) +"wao" = ( +/obj/structure/frame/computer{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 10 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "wav" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -114214,6 +114429,16 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"wvA" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Observatory"; + req_access_txt = "13" + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "wvD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 @@ -114313,6 +114538,16 @@ /obj/structure/bookcase/random, /turf/open/floor/wood, /area/library/abandoned) +"wIU" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 10 + }, +/obj/item/toy/plush/lizardplushie/space{ + name = "Meets-the-Ore" + }, +/turf/open/space/basic, +/area/space/nearstation) "wJo" = ( /obj/machinery/status_display/evac{ pixel_x = -32 @@ -114669,6 +114904,13 @@ /obj/machinery/computer/shuttle/mining/common, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"xBA" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "xDZ" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line, @@ -114687,6 +114929,12 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"xEm" = ( +/obj/item/chair/plastic, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "xER" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral{ @@ -114821,6 +115069,13 @@ /obj/structure/punching_bag, /turf/open/floor/plating, /area/security/prison) +"xPy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/siding/purple{ + dir = 4 + }, +/turf/open/floor/glass, +/area/maintenance/space_hut/observatory) "xRb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -114891,6 +115146,14 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"ybr" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 6 + }, +/obj/structure/closet/crate, +/turf/open/space/basic, +/area/space/nearstation) "ybK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -114935,6 +115198,9 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"yhJ" = ( +/turf/open/floor/plating/airless, +/area/space/nearstation) "yiv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -167846,8 +168112,8 @@ dkQ cHU dkQ cHU -cHU -dfX +oub +rNd cHU cHU dkQ @@ -168104,7 +168370,7 @@ cHU dnW dpK cHU -aad +cIW cHU dvQ iVw @@ -168361,7 +168627,7 @@ cHU dnX dpL dfX -aaa +wvA dfX dvR dxz @@ -168618,7 +168884,7 @@ cHU dnY dpM dfX -aad +abj dfX dvS dxA @@ -168875,7 +169141,7 @@ cHU cHU dfX dfX -aaa +vVc dfX dfX cHU @@ -169126,16 +169392,16 @@ ddw cuM aad aad +eqU +eqU +eqU +aad +eqU +aad +abj aad aad -aad -aad -aad -aad -aad -aad -aad -aad +eqU aad dyV dBL @@ -169383,16 +169649,16 @@ ddx cuM aad aaa -ajr -ajr -ajr -ajr -ajr aaa -ajr aaa -ajr -ajr +aaa +aaa +aaa +aaa +vVc +aaa +aaa +aaa aad dyV dBM @@ -169639,19 +169905,19 @@ dbI cDL cuM aad +qYo aaa aaa aaa aaa aaa -aaa -aaa -aaa +ajr +vVc aaa aaa aaa aad -aaa +qYo dLB aad aad @@ -169897,17 +170163,17 @@ dbJ cuM aad ajr -aaa -aaa -aaa -aaa -aaa -aaa +qYo aaa aaa aaa aaa ajr +vVc +aaa +aaa +aaa +aaa aad dLB aad @@ -170155,15 +170421,15 @@ cuM aad ajr aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qYo +qYo +qYo +qYo +qYo +vVc +qYo +qYo +qYo aad aaa dLB @@ -170410,18 +170676,18 @@ dbJ ddy cuM aad +qYo +qYo aaa aaa aaa aaa aaa +vVc aaa aaa aaa aaa -aaa -aaa -ajr aad dLB aad @@ -170667,19 +170933,19 @@ dbK ddz cuM aad -ajr +mIc +aaa +qYo aaa aaa aaa aaa +vVc aaa aaa aaa aaa aaa -aaa -ajr -aaa dBO aad aad @@ -170924,18 +171190,18 @@ dbL ddA cuM aad -ajr -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +mIc aaa aaa ajr +aaa +hUm +vpk +asj +wIU +aaa +aaa +aaa aad dBO aad @@ -171181,19 +171447,19 @@ cuM cuM cuL aad +qYo +qYo +qYo +qYo +qYo +kUH +yhJ +yhJ +nHf aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aad -aaa +eqU +qYo dBO aad aaa @@ -171438,19 +171704,20 @@ aad aad aad aad +mIc +ajr ajr aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -ajr -aad +kUH +jwg +yhJ +eVg +asj +vVc +vVc +abj +dBO dBO dBO dBO @@ -171460,7 +171727,6 @@ dBO dBO dBO dBO -dNn dBO dOK dBO @@ -171693,17 +171959,17 @@ cuM aad aaa aaa -ajr -ajr -ajr -aaa -aaa -aaa -aaa +mIc +mIc +mIc aaa aaa aaa aaa +pCQ +xBA +asj +ybr aaa aaa ajr @@ -171950,19 +172216,19 @@ cuM aad ajr aaa +qYo aaa aaa aaa aaa aaa aaa +qYo +aaa +vVc aaa aaa -aaa -aaa -aaa -aaa -aaa +qYo ajr ajr aad @@ -172207,19 +172473,19 @@ cuM aad ajr aaa +qYo aaa aaa aaa aaa aaa aaa +qYo aaa +vVc aaa -aaa -aaa -aaa -aaa -aaa +qYo +ajr aaa aaa aaa @@ -172464,18 +172730,18 @@ cuM aad ajr aaa +qYo +aaa +qYo aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qYo +ajr +vVc +ajr +qYo aaa aaa aaa @@ -172720,19 +172986,19 @@ aad cuL aad ajr +qYo +ajr +ajr +ajr +qYo +qYo aaa +qYo +ajr aaa +vVc aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ajr aaa aaa aaa @@ -172982,18 +173248,18 @@ aaa aaa aaa aaa +ajr +ajr +qYo +aaa +qYo +vVc +aaa +qYo aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +gCX ajr aaa dFy @@ -173240,17 +173506,17 @@ aaa aaa aab aaa +qYo +mIc +aaa +aaa +vVc +aaa +qYo aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +gCX ajr aaa aaa @@ -173490,15 +173756,7 @@ cVi aad cuM aad -mbS -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +ajr aaa aaa aaa @@ -173506,8 +173764,16 @@ aaa aaa aaa aaa +qYo +aaa +qhQ +vVc +qhQ +qYo aaa aaa +gCX +gCX ajr ajr aad @@ -173746,29 +174012,29 @@ bry cVk aaa cuM -nOg +aad +ajr +aaa +aaa +aaa +aaa +aaa +aaa +aaa +qYo +tKr +fsE +jqI +fsE +tKr +aaa +gCX mbS aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa ajr ajr aad @@ -174003,15 +174269,7 @@ aad aaa aaa cuM -nOg -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad aaa aaa aaa @@ -174020,6 +174278,14 @@ aaa aaa aaa aaa +tKr +tKr +tgu +mQX +hos +tKr +tKr +gCX aaa aaa aaa @@ -174260,16 +174526,7 @@ cuM cuM cuM cuM -nOg -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad aaa aaa aaa @@ -174277,6 +174534,15 @@ aaa aaa aaa aaa +dNn +fsE +lAw +ncv +hij +dwv +wao +fsE +dNn aaa aaa aaa @@ -174517,14 +174783,7 @@ aad aad aad aad -nOg -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad aaa aaa aaa @@ -174533,6 +174792,13 @@ aaa aaa aaa aaa +fsE +pYz +rKA +rKA +rKA +xEm +fsE aaa aaa aaa @@ -174782,15 +175048,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +dNn +fsE +fRu +fEm +xPy +eTV +aSk +fsE +dNn aaa aaa aaa @@ -175040,13 +175306,13 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tKr +tKr +acR +jdJ +acR +tKr +tKr aaa aaa aaa @@ -175298,11 +175564,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +tKr +fsE +fsE +fsE +tKr aaa aaa aaa @@ -175556,9 +175822,9 @@ aaa aaa aaa aaa +dNn aaa -aaa -aaa +dNn aaa aaa aaa diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index bb7dd36e0d5..95be4fdd9a5 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -49236,6 +49236,10 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, /area/science/mixing) +"dOB" = ( +/obj/structure/chair/wood, +/turf/open/floor/carpet, +/area/maintenance/space_hut/cabin) "dPH" = ( /obj/machinery/light, /obj/structure/cable, @@ -49361,6 +49365,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"emN" = ( +/obj/effect/loot_site_spawner, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/maintenance/space_hut/cabin) "epk" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -50175,10 +50185,21 @@ /obj/structure/cable, /turf/open/floor/plating, /area/construction) +"gXk" = ( +/obj/structure/mineral_door/wood, +/obj/structure/barricade/wooden/crude/snow, +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "gYE" = ( /obj/effect/spawner/lootdrop/gross_decal_spawner, /turf/open/floor/wood, /area/maintenance/port/aft) +"gZj" = ( +/obj/item/chair/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/space_hut/cabin) "gZK" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -50358,6 +50379,11 @@ }, /turf/open/openspace, /area/science/xenobiology) +"hEs" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "hFg" = ( /obj/machinery/door/airlock/external{ name = "Port Docking Bay 1"; @@ -50407,6 +50433,10 @@ }, /turf/open/floor/plasteel, /area/medical/virology) +"hJM" = ( +/obj/item/chair/wood, +/turf/open/floor/carpet, +/area/maintenance/space_hut/cabin) "hKu" = ( /obj/machinery/modular_computer/console/preset/civilian, /turf/open/floor/plasteel/white, @@ -51432,6 +51462,9 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) +"krt" = ( +/turf/open/floor/carpet, +/area/maintenance/space_hut/cabin) "krJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -53241,6 +53274,10 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/dark, /area/chapel/main) +"oCP" = ( +/obj/structure/flora/tree/pine, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "oDF" = ( /obj/machinery/light, /turf/open/floor/plating, @@ -53546,6 +53583,14 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) +"prX" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/space_hut/cabin) "psm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, @@ -54132,6 +54177,11 @@ "qzO" = ( /turf/open/floor/plasteel/showroomfloor, /area/hallway/secondary/service) +"qAP" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/space_hut/cabin) "qDH" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 10 @@ -54310,6 +54360,9 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/medical/medbay/central) +"ryI" = ( +/turf/closed/wall/mineral/wood, +/area/maintenance/space_hut/cabin) "rzl" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -54381,6 +54434,10 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, /area/science/genetics) +"rGb" = ( +/obj/structure/fireplace, +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "rKc" = ( /obj/machinery/door/window/eastright{ base_state = "left"; @@ -54542,6 +54599,10 @@ /obj/machinery/camera, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"rWU" = ( +/obj/structure/bookcase/random/fiction, +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "rZR" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -55290,6 +55351,12 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) +"ueK" = ( +/obj/structure/window/reinforced/fulltile/ice{ + name = "frozen window" + }, +/turf/open/floor/plating, +/area/maintenance/space_hut/cabin) "ufp" = ( /obj/effect/spawner/lootdrop/gross_decal_spawner, /turf/open/floor/plating, @@ -55452,6 +55519,15 @@ /obj/structure/lattice/catwalk, /turf/open/openspace, /area/science/server) +"uzt" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/mug/coco{ + desc = "Still hot!"; + pixel_x = -4; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "uzB" = ( /obj/structure/displaycase/labcage, /obj/effect/turf_decal/stripes/end{ @@ -55816,6 +55892,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/plasteel/white, /area/science/mixing) +"vAX" = ( +/obj/item/chair/wood, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/space_hut/cabin) "vCt" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -56808,6 +56890,9 @@ }, /turf/open/floor/plasteel/dark, /area/medical/virology) +"xUW" = ( +/turf/open/floor/wood, +/area/maintenance/space_hut/cabin) "xVA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56903,6 +56988,10 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"yao" = ( +/obj/structure/barricade/wooden/snowed, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/surface/outdoors) "yay" = ( /obj/machinery/computer/med_data, /turf/open/floor/plasteel/grimy, @@ -96545,8 +96634,8 @@ ccM jaC bAw bzs -bzs -bzs +boP +boP boP boP boP @@ -96801,14 +96890,14 @@ bzs bzs cdL bAw -bAw -bXZ -bzs bzs boP boP boP boP +oCP +boP +boP boP boP boP @@ -97058,9 +97147,6 @@ vKc bzs cdL bAw -bAw -bAw -bAw bPn boP boP @@ -97075,6 +97161,9 @@ boP boP boP boP +boP +boP +boP cua cua cua @@ -97315,9 +97404,6 @@ bAw bAw cdL cfp -bAw -bAw -bAw bPn boP boP @@ -97326,11 +97412,14 @@ boP boP boP boP +ryI +ryI +ryI +ryI +ryI boP boP -boP -boP -boP +oCP boP boP boP @@ -97572,9 +97661,6 @@ bAw bzs cdL bAw -bAw -bAw -bAw bPn boP boP @@ -97583,8 +97669,11 @@ boP boP boP boP -boP -boP +ryI +prX +qAP +hEs +ueK boP boP boP @@ -97828,9 +97917,6 @@ bAw bAw bzs cdL -bAw -bAw -bAw ceF bzs boP @@ -97840,8 +97926,11 @@ boP boP boP boP -boP -boP +ryI +rGb +hJM +xUW +ueK boP boP boP @@ -98087,18 +98176,18 @@ bzs cdL jsP bzs -cfn bzs +bPn bzs cng boP -boP -boP -boP -boP -boP -boP -boP +bte +yao +ryI +vAX +krt +emN +ryI boP boP boP @@ -98343,19 +98432,19 @@ bXZ bzs cdL ciF -bzs +cfn bAw bAw cfn cng boP boP -boP -boP -boP -boP -boP -boP +yao +gXk +xUW +dOB +uzt +ueK boP boP boP @@ -98603,16 +98692,16 @@ bRa bRa bzs bPn -bPn +bzs cng boP -boP -boP -boP -boP -boP -boP -boP +bte +yao +ryI +rWU +gZj +uzt +ueK boP boP boP @@ -98865,11 +98954,11 @@ boP boP boP boP -boP -boP -boP -boP -sNY +ryI +ryI +ueK +ryI +ryI boP boP boP @@ -99375,7 +99464,7 @@ czY bPn boP boP -boP +oCP boP boP boP @@ -99639,7 +99728,7 @@ boP boP boP boP -boP +oCP boP boP boP diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 1b301bb155b..df2090686d7 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -88404,6 +88404,18 @@ "dvN" = ( /turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) +"dyq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/rebels_unite{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "dEI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ dir = 1 @@ -88494,6 +88506,14 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/security/prison) +"eiW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "eja" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -88794,6 +88814,9 @@ }, /turf/open/floor/plating, /area/security/prison) +"gpw" = ( +/turf/closed/wall/rust, +/area/maintenance/space_hut/plasmaman) "gwd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 @@ -89273,6 +89296,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /turf/open/floor/carpet/green, /area/maintenance/port) +"jTL" = ( +/obj/structure/grille/broken, +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "kfw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4, @@ -89526,6 +89558,13 @@ /obj/machinery/microwave, /turf/open/floor/plasteel/white, /area/security/prison) +"lGO" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "lLc" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -90036,6 +90075,11 @@ }, /turf/open/floor/carpet/green, /area/maintenance/port) +"pqf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/purple/filled/line, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "prO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -90073,6 +90117,11 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/security/prison) +"pFC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/holosign/barrier/atmos, +/turf/open/floor/plating/airless, +/area/maintenance/space_hut/plasmaman) "pGW" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/grassybush, @@ -90255,6 +90304,23 @@ /obj/structure/cable, /turf/open/floor/grass, /area/security/prison) +"qBh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/rebels_unite{ + pixel_x = 32; + pixel_y = 32 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/obj/item/toy/plush/plasmamanplushie{ + name = "Lithium II" + }, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "qCd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -90273,6 +90339,13 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel/grimy, /area/security/prison) +"qDp" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/space/basic, +/area/space/nearstation) "qFC" = ( /obj/structure/rack, /obj/item/restraints/handcuffs, @@ -91030,6 +91103,11 @@ icon_state = "platingdmg3" }, /area/maintenance/port/aft) +"viq" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/space/basic, +/area/space/nearstation) "vmE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -91072,6 +91150,13 @@ }, /turf/open/floor/plasteel/grimy, /area/security/prison/safe) +"vzj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "vAM" = ( /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel/white, @@ -91205,6 +91290,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/maintenance/port) +"wiR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tank/internals/plasmaman/belt/full, +/obj/structure/table, +/obj/structure/sign/poster/contraband/rebels_unite{ + pixel_x = 32; + pixel_y = -32 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner, +/obj/item/flashlight/lamp, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "wqI" = ( /obj/structure/rack, /obj/item/stack/medical/gauze, @@ -91484,6 +91584,23 @@ icon_state = "platingdmg1" }, /area/maintenance/port/aft) +"xUP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/poster/contraband/rebels_unite{ + pixel_x = -32; + pixel_y = -32 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/item/toy/plush/plasmamanplushie{ + name = "Dianion XV" + }, +/turf/open/floor/plating/rust/plasma, +/area/maintenance/space_hut/plasmaman) "xWh" = ( /obj/machinery/newscaster, /turf/closed/wall/r_wall, @@ -135623,7 +135740,7 @@ aaa acm aaa acm -acK +qDp acm aaa aaa @@ -135880,7 +135997,7 @@ aaa acm aaa acm -aaa +qDp aaa aaa aaa @@ -136137,7 +136254,7 @@ aaa acm aaa acm -aaa +eiW aaa aaa aaa @@ -136394,7 +136511,7 @@ aaa acK acm acK -aaa +viq aaa aaa aaa @@ -136651,7 +136768,7 @@ acm acm aaa acm -aaa +viq aaa aaa aaa @@ -136908,7 +137025,7 @@ aaa acm aaa acm -aaa +acK aaa qJs acm @@ -137165,7 +137282,7 @@ aaa aeo aaa acm -acm +acK acm aaQ aeo @@ -137422,7 +137539,7 @@ aeu aeo aaa acm -aaa +acK aaa aaa acm @@ -137679,7 +137796,7 @@ aeu aaQ aaa acm -acm +qDp aaQ aeo aeo @@ -137936,7 +138053,7 @@ aeu acm aaa acm -aaa +eiW aaa acm aaa @@ -138193,7 +138310,7 @@ acm acm aaa acm -aaQ +jTL aeo aeo aaa @@ -138450,7 +138567,7 @@ aaa acK acm acK -aaa +acK acm aaa aaa @@ -138707,7 +138824,7 @@ aaa acm aaa aaQ -acm +acK aeo aaa aaa @@ -138964,7 +139081,7 @@ aaa acm aaa aeo -aaa +viq aaa aaa aaa @@ -139221,7 +139338,7 @@ aaa acm aaa aeo -acm +acK aeo aaQ aaa @@ -139478,7 +139595,7 @@ aaa aaQ aaa aeo -aaa +acK aaa aaa aaa @@ -139735,7 +139852,7 @@ aaa aeo aaa acm -aaa +viq aaa aaa aaa @@ -139992,7 +140109,7 @@ aaa aeo aaa aaQ -aaa +eiW aaa aaa aaa @@ -140249,7 +140366,7 @@ aaa acm aaa acm -aaa +acK aaa aaa aaa @@ -140506,7 +140623,7 @@ acm acK acm acK -acm +acK aaQ aeo acm @@ -140763,11 +140880,11 @@ aaa acm aaa acm -aaa -aaa -aaa -aaa -aaa +lGO +acK +acK +acK +aeo aaa aaa aaa @@ -141020,12 +141137,12 @@ aaa acm aaa aeo -aaa -aaa -aaa -aaa -aaa -aaa +acm +gpw +pFC +pFC +gpw +aeo aaa aaa aaa @@ -141278,11 +141395,11 @@ aeo aaa aeo aaa -aaa -aaa -aaa -aaa -aaa +pFC +dyq +xUP +pFC +viq aaa aaa aaa @@ -141535,11 +141652,11 @@ acm aaa aaQ aaa -aaa -aaa -aaa -aaa -aaa +pFC +pqf +vzj +pFC +viq aaa aaa aaa @@ -141792,11 +141909,11 @@ aeo aaa aeo aaa -aaa -aaa -aaa -aaa -aaa +pFC +qBh +wiR +pFC +viq aaa aaa aaa @@ -142048,12 +142165,12 @@ aaa aeo aaa acm -aaa -aaa -aaa -aaa -aaa -aaa +acm +gpw +pFC +pFC +gpw +aeo aaa aaa aaa @@ -142307,9 +142424,9 @@ aaa acm aaa aaa -aaa -aaa -aaa +acK +acK +aeo aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c9e6f5d58ba..8dc236aa27b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -46873,6 +46873,13 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"cli" = ( +/obj/machinery/door/airlock/external{ + name = "Space Shack"; + req_access_txt = "13" + }, +/turf/open/floor/plating, +/area/maintenance/space_hut) "clj" = ( /obj/structure/sink{ dir = 4; @@ -51114,11 +51121,8 @@ /turf/closed/wall/r_wall, /area/science/misc_lab/range) "cva" = ( -/obj/structure/table, -/obj/item/trash/plate, -/obj/item/candle, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/turf/closed/wall, +/area/maintenance/space_hut) "cvl" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -51132,7 +51136,11 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "cvn" = ( -/obj/structure/chair{ +/obj/machinery/door/airlock/external{ + name = "Space Shack"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, /turf/open/floor/plating, @@ -65063,6 +65071,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"eAh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut) "eBl" = ( /obj/structure/lattice/catwalk, /obj/structure/chair/stool/bar, @@ -65286,6 +65298,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/psychology) +"eQF" = ( +/obj/machinery/door/airlock/external{ + name = "Space Shack"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/port/aft) "eSm" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/light_construct{ @@ -65554,6 +65576,20 @@ }, /turf/open/floor/wood, /area/maintenance/port/aft) +"fiq" = ( +/obj/machinery/mass_driver/shack{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/maintenance/space_hut) "fiI" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -65944,6 +65980,21 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"fGM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "fHp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -66031,6 +66082,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /turf/open/floor/plasteel/white, /area/security/prison) +"fMS" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/space_hut) "fNk" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall, @@ -67661,6 +67718,13 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"hTU" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/space_hut) "hUA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -69293,6 +69357,14 @@ "kge" = ( /turf/open/floor/plasteel/white, /area/medical/pharmacy) +"kgg" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "kgI" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/trinary/filter{ @@ -69900,6 +69972,9 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab/range) +"kOK" = ( +/turf/open/space/basic, +/area/maintenance/port/aft) "kPy" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -70638,6 +70713,9 @@ /obj/structure/table, /turf/open/floor/plasteel, /area/crew_quarters/bar) +"lWO" = ( +/turf/open/floor/plasteel, +/area/maintenance/space_hut) "lWY" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -72811,6 +72889,10 @@ /obj/item/electropack, /turf/open/floor/engine, /area/science/xenobiology) +"oXy" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/maintenance/space_hut) "oXP" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -72823,6 +72905,24 @@ }, /turf/open/floor/plasteel/white, /area/security/prison) +"oYa" = ( +/obj/machinery/door/window{ + dir = 1; + name = "Mass Driver"; + req_access_txt = "12" + }, +/obj/machinery/door/window{ + name = "Mass Driver"; + req_access_txt = "12" + }, +/obj/effect/turf_decal/loading_area{ + dir = 1 + }, +/obj/machinery/computer/pod/old/mass_driver_controller/shack{ + pixel_x = -24 + }, +/turf/open/floor/plating, +/area/maintenance/space_hut) "oYd" = ( /obj/machinery/flasher{ id = "visitorflash"; @@ -75657,11 +75757,22 @@ /turf/closed/wall/r_wall, /area/space/nearstation) "sof" = ( -/obj/structure/chair{ +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/plating, -/area/maintenance/port/aft) +/obj/effect/turf_decal/stripes/red/line, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/airless, +/area/maintenance/space_hut) "spa" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -75958,6 +76069,10 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/break_room) +"sNv" = ( +/obj/structure/statue/sandstone/assistant, +/turf/open/floor/plating, +/area/space/nearstation) "sPc" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -78448,6 +78563,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/white, /area/medical/surgery) +"wpI" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/space_hut) "wqm" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/tile/neutral{ @@ -78880,6 +79001,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/maintenance/starboard) +"wQf" = ( +/obj/structure/table, +/obj/item/trash/plate, +/obj/item/candle, +/obj/effect/decal/cleanable/dirt/dust, +/obj/item/radio{ + desc = "An old handheld radio. You could use it, if you really wanted to."; + icon_state = "radio"; + name = "old radio"; + pixel_y = 15 + }, +/turf/open/floor/plating, +/area/maintenance/space_hut) "wQr" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -79475,6 +79609,13 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"xFA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/maintenance/space_hut) "xHh" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -90256,7 +90397,7 @@ aaa aaa aaa aaa -aaa +kgg aaa aaa aaa @@ -90512,12 +90653,12 @@ aaa aaa aaa aaa +lMJ +fGM aaa aaa aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -90769,13 +90910,13 @@ aaa aaa aaa aaa +lMJ +fGM +fwb +fwb +fwb aaa -aaa -aaa -aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -91025,14 +91166,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +fwb +cva +sof +cva +cva +cva +cva +fwb aaa aaa aaa @@ -91281,16 +91422,16 @@ aaa aaa aaa aaa +lMJ aaa +cva +fiq +oYa +xFA +wpI +oXy aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -91540,14 +91681,14 @@ aaa aaa aaa aaa +cva +cva +cva +fMS +wQf +oXy aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sNv aaa aaa aaa @@ -91797,14 +91938,14 @@ aaa aaa aaa aaa +lMJ +oXy +eAh +lWO +hTU +oXy aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -92053,14 +92194,14 @@ aaa aaa aaa aaa +fwb aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cva +cli +cva +cva +cva +fwb aaa aaa aaa @@ -92310,14 +92451,14 @@ lMJ aaa aaa aaa +lMJ +aaa +aaa +aox aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -92566,15 +92707,15 @@ aaa lMJ aaa aaa +lMJ +aaa +lMJ +aaa +aox aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -92827,12 +92968,12 @@ fwb fwb nYJ aaa +aox aaa aaa +lMJ aaa -aaa -aaa -aaa +lMJ aaa aaa aaa @@ -93084,7 +93225,7 @@ aaa aaa lMJ fwb -fwb +aox fwb fwb lMJ @@ -93341,7 +93482,7 @@ aaa aaa lMJ aaa -aaa +aox aaa aaa aaa @@ -93598,7 +93739,7 @@ aaf aaa lMJ aaa -aaa +aox fwb fwb lMJ @@ -93855,7 +93996,7 @@ aaf anT anT fwb -lMJ +aox lMJ aaa aaa @@ -94112,7 +94253,7 @@ aaa lMJ aaa aaa -aaa +aox lMJ aaa aaa @@ -94368,10 +94509,10 @@ ckN aaa lMJ lMJ -fwb -fwb -fwb -fwb +aaa +aox +aaa +aaa lMJ cBR bXv @@ -94626,9 +94767,9 @@ lMJ lMJ lMJ dux -ckN -ckN +eQF dux +kOK lMJ cBR eds @@ -94883,9 +95024,9 @@ dux dux dux dux -cva -sof -dux +bXE +ckN +kOK lMJ cBR hEP @@ -95141,7 +95282,7 @@ yfG xXZ dux cvn -bXE +dux dux lMJ cBR diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index d5a1134f8f6..4b90fb2a181 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -140,3 +140,4 @@ #define MASSDRIVER_TOXINS "toxinsdriver" #define MASSDRIVER_CHAPEL "chapelgun" #define MASSDRIVER_DISPOSALS "trash" +#define MASSDRIVER_SHACK "shack" diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 639a3da3852..5d84f6370e4 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -246,6 +246,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Incinerator" icon_state = "incinerator" +/area/maintenance/space_hut + name = "Space Hut" + icon_state = "spacehut" + +/area/maintenance/space_hut/cabin + name = "Abandoned Cabin" + +/area/maintenance/space_hut/plasmaman + name = "Abandoned Plasmaman Friendly Startup" + +/area/maintenance/space_hut/observatory + name = "Space Observatory" //Hallway /area/hallway diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index cd14c6330fa..b4d0f00499a 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -161,6 +161,9 @@ /obj/machinery/computer/pod/old/mass_driver_controller/trash id = MASSDRIVER_DISPOSALS +/obj/machinery/computer/pod/old/mass_driver_controller/shack + id = MASSDRIVER_SHACK + /obj/machinery/computer/pod/old/syndicate name = "\improper ProComp Executive IIc" desc = "The Syndicate operate on a tight budget. Operates external airlocks." diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 3278a4bd422..5c0ce82b24c 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -21,6 +21,9 @@ /obj/machinery/mass_driver/trash id = MASSDRIVER_DISPOSALS +/obj/machinery/mass_driver/shack + id = MASSDRIVER_SHACK + /obj/machinery/mass_driver/Destroy() for(var/obj/machinery/computer/pod/control in GLOB.machines) if(control.id == id) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 032fd987eae..a56ad2644ac 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -505,6 +505,12 @@ attack_verb_simple = list("claw", "hiss", "tail slap") squeak_override = list('sound/weapons/slash.ogg' = 1) +/obj/item/toy/plush/lizardplushie/space + name = "space lizard plushie" + desc = "An adorable stuffed toy that resembles a very determined spacefaring lizardperson. To infinity and beyond, little guy." + icon_state = "plushie_spacelizard" + inhand_icon_state = "plushie_spacelizard" + /obj/item/toy/plush/snakeplushie name = "snake plushie" desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." @@ -523,6 +529,15 @@ attack_verb_simple = list("shoot", "nuke", "detonate") squeak_override = list('sound/effects/hit_punch.ogg' = 1) +/obj/item/toy/plush/plasmamanplushie + name = "plasmaman plushie" + desc = "A stuffed toy that resembles your purple coworkers. Mmm, yeah, in true plasmaman fashion, it's not cute at all despite the designer's best efforts." + icon_state = "plushie_pman" + inhand_icon_state = "plushie_pman" + attack_verb_continuous = list("burns", "space beasts", "fwooshes") + attack_verb_simple = list("burn", "space beast", "fwoosh") + squeak_override = list('sound/effects/extinguish.ogg' = 1) + /obj/item/toy/plush/slimeplushie name = "slime plushie" desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack." diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index 14ad56a3cdb..a1ea9605903 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -183,5 +183,8 @@ desc = "Corrupted steel." icon_state = "plating_rust" +/turf/open/floor/plating/rust/plasma + initial_gas_mix = "plasma=104;TEMP=293.15" + /turf/open/floor/plating/rust/rust_heretic_act() return diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index 7f6462a62e6..9574a6d14f8 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 9e7aa3e26c8..fccfe9da0c7 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ