diff --git a/ModularTegustation/Teguicons/toolabnormalities.dmi b/ModularTegustation/Teguicons/toolabnormalities.dmi index 6b4e8b6649a2..633fbec00ac8 100644 Binary files a/ModularTegustation/Teguicons/toolabnormalities.dmi and b/ModularTegustation/Teguicons/toolabnormalities.dmi differ diff --git a/_maps/map_files/Alpha/alphacorp.dmm b/_maps/map_files/Alpha/alphacorp.dmm index edca8254d83e..1cc941b5cab9 100644 --- a/_maps/map_files/Alpha/alphacorp.dmm +++ b/_maps/map_files/Alpha/alphacorp.dmm @@ -397,6 +397,10 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/central) +"dn" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/department_main/control) "do" = ( /obj/effect/turf_decal/bot, /obj/machinery/telecomms/hub/preset, @@ -515,6 +519,10 @@ /obj/structure/chair/comfy/teal, /turf/open/floor/wood, /area/department_main/command) +"dU" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "dX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/bar, @@ -1777,6 +1785,10 @@ /obj/effect/turf_decal/siding/yellow, /turf/open/floor/wood, /area/department_main/command) +"nU" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "nY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1848,12 +1860,9 @@ /turf/open/floor/plasteel, /area/facility_hallway/north) "oE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/department_main/safety) +/obj/effect/spawner/structure/window/reinforced, +/turf/closed/indestructible/reinforced, +/area/facility_hallway/north) "oF" = ( /obj/structure/table/glass, /obj/structure/lootcrate/l_corp, @@ -2260,6 +2269,10 @@ }, /turf/open/floor/carpet/orange, /area/department_main/training) +"ry" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/control) "rB" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -2979,6 +2992,9 @@ id = "cremawheat" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/department_main/safety) "wB" = ( @@ -3951,6 +3967,13 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/east) +"Es" = ( +/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium, +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/control) "Ex" = ( /obj/effect/turf_decal/siding/purple/corner{ dir = 8 @@ -4019,6 +4042,9 @@ /obj/structure/chair, /turf/open/floor/plasteel/dark, /area/facility_hallway/south) +"Fk" = ( +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Fs" = ( /obj/machinery/light/cold{ dir = 4 @@ -4316,9 +4342,8 @@ /turf/open/floor/carpet/red, /area/department_main/control) "Ib" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/warning/nosmoking{ - pixel_x = -32 +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" }, /turf/open/floor/plasteel/dark, /area/department_main/safety) @@ -4547,6 +4572,10 @@ /obj/item/reagent_containers/hypospray/medipen/mental, /turf/open/floor/wood, /area/facility_hallway/north) +"JB" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "JC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -5050,6 +5079,10 @@ /mob/living/simple_animal/bot/cleanbot, /turf/open/floor/wood, /area/department_main/command) +"Nw" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/department_main/control) "ND" = ( /obj/structure/sign/warning, /turf/closed/indestructible/reinforced, @@ -5109,6 +5142,12 @@ /obj/item/papercutter, /turf/open/floor/carpet/purple, /area/department_main/information) +"Od" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Oi" = ( /obj/structure/chair/comfy/beige, /obj/item/toy/plush/hod, @@ -5570,6 +5609,12 @@ }, /turf/open/floor/plasteel/elevatorshaft, /area/department_main/training) +"RQ" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/department_main/control) "RU" = ( /obj/effect/turf_decal/siding/brown{ dir = 8 @@ -28463,11 +28508,11 @@ ZL ZL ZL ZL -ZL -ZL -ZL -ZL -ZL +cu +cu +cu +cu +cu ZL ZL ZL @@ -28720,11 +28765,11 @@ ZL ZL ZL ZL -ZL -ZL -ZL -ZL -ZL +cu +nU +Fk +Fk +cu ZL ZL ZL @@ -28977,11 +29022,11 @@ ZL ZL ZL ZL -ZL -ZL -ZL -ZL -ZL +cu +Od +dU +Fk +cu ZL ZL ZL @@ -29234,11 +29279,11 @@ ZL ZL ZL ZL -ZL -ZL -ZL -ZL -ZL +cu +Fk +Fk +Fk +cu ZL ZL ZL @@ -29492,9 +29537,9 @@ ZL ZL cu cu -cu -cu -cu +JB +Ib +JB cu cu ZL @@ -29750,8 +29795,8 @@ ZL cu wz CC -Ib -oE +CC +CC cO cu cu @@ -37955,7 +38000,7 @@ rg rg rg hl -ve +Es rg ng ve @@ -39007,7 +39052,7 @@ vs vs vs vs -vs +oE ru oA PR @@ -42588,9 +42633,9 @@ BA Iq Iq rg -ZL -ZL -ZL +rg +rg +rg vs mA mA @@ -42844,10 +42889,10 @@ ZL BA Iq Iq -rg -ZL -ZL -ZL +ry +hc +Iq +Iq vs mA mA @@ -43101,10 +43146,10 @@ ZL BA Iq Iq -rg -ZL -ZL -ZL +RQ +Iq +dn +Nw vs mA mA @@ -43358,10 +43403,10 @@ ZL BA Iq RA -rg -ZL -ZL -ZL +ry +Iq +Iq +Iq vs vs vs @@ -43616,10 +43661,10 @@ rg rg rg rg -ZL -ZL -ZL -ZL +rg +rg +rg +rg ZL ZL ZL diff --git a/_maps/map_files/Beta/betacorp.dmm b/_maps/map_files/Beta/betacorp.dmm index d915adb25728..8da953c01df2 100644 --- a/_maps/map_files/Beta/betacorp.dmm +++ b/_maps/map_files/Beta/betacorp.dmm @@ -61,11 +61,8 @@ /turf/open/floor/plasteel, /area/facility_hallway/north) "ap" = ( -/obj/machinery/computer/operating, -/obj/machinery/smartfridge/organ{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "ar" = ( /obj/structure/disposalpipe/segment{ @@ -78,9 +75,10 @@ /turf/open/floor/plasteel, /area/facility_hallway/north) "as" = ( -/obj/item/clothing/suit/apron/surgical, -/obj/structure/table/reinforced, -/turf/open/floor/plasteel/white, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "at" = ( /obj/effect/turf_decal/siding/green{ @@ -372,9 +370,8 @@ /turf/open/floor/wood, /area/facility_hallway/south) "bG" = ( -/obj/item/stack/medical/bone_gel, -/obj/item/stack/sticky_tape/surgical, /obj/structure/table/reinforced, +/obj/item/clothing/suit/apron/surgical, /turf/open/floor/plasteel/white, /area/department_main/safety) "bI" = ( @@ -407,12 +404,14 @@ /turf/open/floor/facility, /area/facility_hallway/north) "bV" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, /obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, /turf/open/floor/plasteel/white, /area/department_main/safety) "bW" = ( -/obj/machinery/iv_drip, +/obj/machinery/computer/operating{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/department_main/safety) "bY" = ( @@ -599,12 +598,14 @@ /turf/open/floor/plasteel/dark, /area/department_main/control) "di" = ( -/obj/machinery/camera/autoname, -/obj/structure/chair/sofa/corp, -/obj/effect/turf_decal/siding{ +/obj/effect/turf_decal/siding/white/corner{ color = "#440000"; dir = 1 }, +/obj/effect/turf_decal/siding/white/corner{ + color = "#440000"; + dir = 4 + }, /turf/open/floor/plasteel, /area/facility_hallway/discipline) "dj" = ( @@ -1064,11 +1065,7 @@ /turf/closed/indestructible/reinforced, /area/facility_hallway/welfare) "fg" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/vending/snack/green, -/turf/open/floor/carpet/green, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "fh" = ( /obj/effect/turf_decal/siding/blue{ @@ -1350,6 +1347,12 @@ }, /turf/open/floor/facility/dark, /area/department_main/records) +"gX" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/department_main/safety) "gY" = ( /turf/open/floor/plasteel, /area/facility_hallway/north) @@ -1489,6 +1492,12 @@ }, /turf/open/floor/noslip, /area/facility_hallway/north) +"hP" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "hU" = ( /obj/machinery/computer/med_data{ dir = 1; @@ -1498,11 +1507,11 @@ /turf/open/floor/carpet/black, /area/department_main/records) "hV" = ( -/obj/structure/chair/sofa/corp/left, /obj/effect/turf_decal/siding{ color = "#440000"; dir = 5 }, +/obj/machinery/camera/autoname, /turf/open/floor/plasteel, /area/facility_hallway/discipline) "hW" = ( @@ -3416,6 +3425,10 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/control) +"qR" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "qS" = ( /obj/structure/chair/office/light{ dir = 1 @@ -3758,6 +3771,10 @@ }, /turf/open/floor/plasteel/white, /area/department_main/training) +"sC" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/discipline) "sD" = ( /obj/structure/sign/poster/lobotomycorp/random, /turf/closed/indestructible/reinforced, @@ -3820,6 +3837,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/department_main/control) +"sU" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/discipline) "sV" = ( /obj/structure/chair/plastic{ dir = 4 @@ -4528,8 +4551,8 @@ /turf/closed/indestructible/reinforced, /area/department_main/welfare) "vO" = ( -/obj/structure/sign/poster/lobotomycorp/bearbeer, -/turf/closed/indestructible/reinforced, +/obj/effect/turf_decal/siding/green, +/turf/open/floor/plasteel/white, /area/department_main/safety) "vP" = ( /obj/effect/landmark/salesspawn, @@ -4804,6 +4827,10 @@ /obj/machinery/vending/snack, /turf/open/floor/carpet/red, /area/department_main/discipline) +"xE" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "xF" = ( /obj/structure/sign/departments/records{ pixel_y = -32 @@ -6611,13 +6638,11 @@ /turf/open/floor/plasteel, /area/facility_hallway/welfare) "Ho" = ( -/obj/structure/chair/sofa/corp/right, -/obj/effect/turf_decal/siding{ - color = "#440000"; - dir = 9 +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" }, -/turf/open/floor/plasteel, -/area/facility_hallway/discipline) +/turf/open/floor/plasteel/dark, +/area/department_main/discipline) "Hr" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -7509,6 +7534,13 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/discipline) +"LT" = ( +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, +/obj/machinery/iv_drip, +/turf/open/floor/facility/white, +/area/department_main/safety) "LW" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -7607,6 +7639,10 @@ "Mz" = ( /turf/open/floor/plasteel/showroomfloor, /area/facility_hallway/south) +"MA" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/department_main/discipline) "MD" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -8063,6 +8099,10 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/information) +"OL" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/discipline) "OM" = ( /obj/machinery/telecomms/message_server/preset, /turf/open/floor/circuit/telecomms/mainframe, @@ -8812,6 +8852,10 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/discipline) +"Sy" = ( +/obj/machinery/vending/snack/green, +/turf/open/floor/carpet/green, +/area/department_main/safety) "Sz" = ( /obj/structure/sign/poster/official/we_watch, /turf/closed/indestructible/reinforced, @@ -8840,6 +8884,12 @@ }, /turf/open/floor/carpet/orange, /area/department_main/training) +"SM" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/department_main/safety) "SO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/facility, @@ -9558,6 +9608,12 @@ }, /turf/open/floor/carpet, /area/department_main/control) +"Wv" = ( +/obj/machinery/smartfridge/organ{ + pixel_y = 32 + }, +/turf/closed/indestructible/reinforced, +/area/department_main/safety) "Ww" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -34391,11 +34447,11 @@ JB JB JB JB -JB -JB -JB -JB -cQ +rS +rS +rS +rS +rS cQ St qA @@ -34648,12 +34704,12 @@ JB JB JB JB -JB -JB -JB -JB -cQ -Ho +rS +OL +PG +PG +sC +ZD RY qA lU @@ -34905,11 +34961,11 @@ JB JB JB JB -JB -JB -JB -JB -Bl +rS +sU +MA +PG +Ho di ot qA @@ -35162,11 +35218,11 @@ JB JB JB JB -JB -JB -JB -JB -cQ +rS +PG +PG +PG +sC hV ba qA @@ -35419,11 +35475,11 @@ JB JB JB JB -JB -JB -JB -JB -cQ +rS +rS +rS +rS +rS cQ St qA @@ -40241,9 +40297,9 @@ JB JB an ai -bV +bW Cc -dz +LT dz dz bC @@ -40749,13 +40805,13 @@ JB JB JB JB -JB -JB -JB -JB an -ap -bW +an +an +an +an +an +Wv Cc eG at @@ -41006,14 +41062,14 @@ JB JB JB JB -JB -JB -JB -JB -an -as -ca an +xE +fg +fg +ap +cu +SM +vO eY Pe bw @@ -41263,18 +41319,18 @@ JB JB JB JB -JB -JB -JB -JB -an -an an -vO +as +qR fg +hP +cu +cu +vO Pe -oB Pe +oB +Sy am Tz jn @@ -41520,14 +41576,14 @@ JB JB JB JB -JB -JB -JB -JB -an -as -ca an +fg +fg +fg +ap +cu +gX +vO fo Pe vu @@ -41777,13 +41833,13 @@ JB JB JB JB -JB -JB -JB -JB an -ap -bW +an +an +an +an +an +an Cc fy dz @@ -42039,7 +42095,7 @@ JB JB JB an -al +ca cu dv cu diff --git a/_maps/map_files/Delta/deltacorp.dmm b/_maps/map_files/Delta/deltacorp.dmm index b76765b27c1d..5b15e96e09db 100644 --- a/_maps/map_files/Delta/deltacorp.dmm +++ b/_maps/map_files/Delta/deltacorp.dmm @@ -373,6 +373,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/dark, /area/department_main/discipline) +"ba" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/control) "bd" = ( /obj/effect/turf_decal/siding/red/corner, /obj/effect/decal/cleanable/dirt/dust, @@ -1331,6 +1335,10 @@ /obj/structure/sign/departments/control, /turf/closed/indestructible/reinforced, /area/department_main/safety) +"dK" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/control) "dM" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/circuit/telecomms/mainframe, @@ -1453,6 +1461,10 @@ "eg" = ( /turf/open/floor/carpet/red, /area/department_main/discipline) +"eh" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/control) "ej" = ( /obj/structure/table/reinforced, /obj/item/choice_beacon/ingredient, @@ -3190,6 +3202,9 @@ }, /turf/open/floor/plasteel, /area/department_main/control) +"jY" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/control) "ka" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -4466,13 +4481,22 @@ /turf/open/floor/plating, /area/department_main/discipline) "np" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/mimicry{ - armor = null +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/obj/structure/lattice/catwalk, -/turf/open/floor/plating, -/area/department_main/discipline) +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#7D6521"; + dir = 10 + }, +/obj/machinery/light/cold/no_nightlight{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "ns" = ( /obj/effect/turf_decal/siding/brown/corner, /turf/open/floor/carpet/orange, @@ -4867,9 +4891,6 @@ /area/facility_hallway/east) "ov" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/mockery{ - armor = null - }, /obj/machinery/light{ dir = 4 }, @@ -4894,15 +4915,6 @@ /obj/item/book/fish_catalog{ pixel_x = -5 }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, /obj/item/fish_feed, /obj/machinery/status_display{ pixel_y = -32 @@ -5392,6 +5404,10 @@ }, /turf/open/floor/engine, /area/facility_hallway/east) +"pZ" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/control) "qa" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, @@ -5855,9 +5871,6 @@ /area/facility_hallway/control) "rn" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/goldrush{ - armor = 0 - }, /obj/structure/lattice/catwalk, /turf/open/floor/plating, /area/department_main/discipline) @@ -7347,6 +7360,10 @@ }, /turf/open/floor/plasteel/dark, /area/facility_hallway/west) +"vJ" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "vL" = ( /obj/machinery/light/cold/no_nightlight, /obj/effect/turf_decal/tile/purple{ @@ -8149,11 +8166,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/siding/red, -/obj/structure/sign/poster/lobotomycorp/random{ - pixel_y = -32 +/obj/effect/turf_decal/siding/red/corner, +/obj/effect/turf_decal/siding/red/corner{ + dir = 8 }, -/obj/machinery/light/cold/no_nightlight, /turf/open/floor/plasteel, /area/facility_hallway/control) "yd" = ( @@ -8176,6 +8192,9 @@ /obj/effect/turf_decal/siding/red{ dir = 6 }, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, /turf/open/floor/plasteel, /area/facility_hallway/control) "yg" = ( @@ -8269,6 +8288,10 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/plasteel/dark, /area/department_main/command) +"yq" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "yr" = ( /obj/effect/turf_decal/siding/blue/corner{ color = "#3234B9"; @@ -12129,17 +12152,7 @@ /turf/open/floor/carpet/green, /area/facility_hallway/safety) "Kj" = ( -/obj/machinery/light/cold/no_nightlight, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#7D6521" - }, -/obj/structure/sign/poster/lobotomycorp/random{ - pixel_y = -32 - }, +/obj/machinery/light, /turf/open/floor/plasteel/dark, /area/facility_hallway/extraction) "Kk" = ( @@ -13773,7 +13786,7 @@ name = "Extraction Hallway" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/facility/halls, +/turf/open/floor/plasteel/dark, /area/department_main/extraction) "OK" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -14632,6 +14645,12 @@ }, /turf/open/floor/plasteel/dark, /area/facility_hallway/information) +"QX" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "QY" = ( /obj/structure/chair/sofa/corp/left, /turf/open/floor/carpet, @@ -14651,6 +14670,10 @@ }, /turf/open/floor/plasteel/dark, /area/facility_hallway/information) +"Rb" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "Rc" = ( /obj/item/kirbyplants/random, /turf/open/floor/carpet/purple, @@ -15186,6 +15209,9 @@ color = "#7D6521"; dir = 6 }, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/facility_hallway/extraction) "St" = ( @@ -16963,6 +16989,22 @@ }, /turf/open/floor/wood, /area/department_main/command) +"WV" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red{ + dir = 10 + }, +/obj/machinery/light/cold/no_nightlight{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/facility_hallway/control) "WW" = ( /obj/structure/chair/wood{ dir = 8 @@ -18025,9 +18067,6 @@ /obj/item/storage/box/aquarium_props{ pixel_y = 10 }, -/obj/item/storage/fish_case/random, -/obj/item/storage/fish_case/random, -/obj/item/storage/fish_case/random, /obj/item/fish_feed, /turf/open/floor/carpet/royalblue, /area/department_main/welfare) @@ -18039,15 +18078,6 @@ /obj/item/book/fish_catalog{ pixel_x = -5 }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, -/obj/item/storage/fish_case/random/freshwater{ - pixel_x = 5 - }, /obj/item/fish_feed, /turf/open/floor/carpet/royalblue, /area/department_main/welfare) @@ -18084,6 +18114,12 @@ /obj/structure/lootcrate/l_corp, /turf/open/floor/carpet, /area/department_main/control) +"ZW" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/closed/indestructible/reinforced, +/area/facility_hallway/control) "ZX" = ( /obj/effect/turf_decal/tile/blue{ color = "#3234B9"; @@ -35451,10 +35487,10 @@ lo tn je je -JB -JB -JB -JB +je +je +je +je JB JB JB @@ -35706,7 +35742,11 @@ mo mo Jl KU -nC +WV +dK +ba +jY +jY je JB JB @@ -35828,10 +35868,6 @@ JB JB JB JB -JB -JB -JB -JB "} (70,1,1) = {" JB @@ -35964,6 +36000,10 @@ mn mn lL yc +ZW +jY +eh +pZ je JB JB @@ -36085,10 +36125,6 @@ JB JB JB JB -JB -JB -JB -JB "} (71,1,1) = {" JB @@ -36221,6 +36257,10 @@ Dg CT Le yf +dK +jY +jY +jY je JB JB @@ -36342,10 +36382,6 @@ JB JB JB JB -JB -JB -JB -JB "} (72,1,1) = {" JB @@ -36479,10 +36515,10 @@ mT tn je je -JB -JB -JB -JB +je +je +je +je JB JB JB @@ -56984,7 +57020,7 @@ lq ac ac ac -np +rn ov rn cP @@ -63466,10 +63502,10 @@ RB Sb OP OP -JB -JB -JB -JB +OP +OP +OP +OP JB JB JB @@ -63721,7 +63757,11 @@ QM Rp RC QM -Sq +np +Rb +vJ +Ql +Ql OP JB JB @@ -63841,10 +63881,6 @@ JB JB JB JB -JB -JB -JB -JB "} (179,1,1) = {" JB @@ -63978,6 +64014,10 @@ RG RG RG qK +Sb +QX +Ql +yq Kj OP JB @@ -64098,10 +64138,6 @@ JB JB JB JB -JB -JB -JB -JB "} (180,1,1) = {" JB @@ -64236,6 +64272,10 @@ Nx Px QS Sr +Rb +Ql +Ql +Ql OP JB JB @@ -64355,10 +64395,6 @@ JB JB JB JB -JB -JB -JB -JB "} (181,1,1) = {" JB @@ -64494,10 +64530,10 @@ RH Sb OP OP -JB -JB -JB -JB +OP +OP +OP +OP JB JB JB diff --git a/_maps/map_files/Epsilon/epsiloncorp.dmm b/_maps/map_files/Epsilon/epsiloncorp.dmm index 30ae2a1d1e81..af4f7a7955d8 100644 --- a/_maps/map_files/Epsilon/epsiloncorp.dmm +++ b/_maps/map_files/Epsilon/epsiloncorp.dmm @@ -75,6 +75,10 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/welfare) +"bx" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "bA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -534,13 +538,9 @@ /turf/open/floor/plasteel/dark, /area/department_main/control) "is" = ( -/obj/machinery/light, -/obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/goldrush{ - armor = 0 - }, +/obj/structure/toolabnormality/wishwell, /turf/open/floor/plasteel/dark, -/area/department_main/discipline) +/area/department_main/extraction) "it" = ( /obj/effect/turf_decal/siding/purple{ dir = 4 @@ -551,6 +551,7 @@ /obj/effect/turf_decal/siding/green{ dir = 9 }, +/obj/machinery/vending/cola/shamblers, /turf/open/indestructible/white, /area/department_main/safety) "iz" = ( @@ -666,6 +667,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/vending/cigarette, /turf/open/indestructible/white, /area/department_main/safety) "kB" = ( @@ -1058,6 +1060,17 @@ /turf/open/floor/plasteel/dark, /area/facility_hallway/welfare) "qf" = ( +/obj/structure/table/wood/fancy/green, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, +/obj/item/clothing/accessory/armband/lobotomy/safety, /obj/effect/landmark/department_center, /turf/open/floor/carpet/green, /area/department_main/safety) @@ -1335,18 +1348,8 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/department_main/information) "uF" = ( -/obj/structure/table/wood/fancy/green, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/obj/item/clothing/accessory/armband/lobotomy/safety, -/turf/open/floor/carpet/green, +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "uJ" = ( /obj/machinery/telecomms/broadcaster/preset_right, @@ -1727,6 +1730,10 @@ }, /turf/open/floor/plasteel/dark, /area/facility_hallway/control) +"AJ" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "AN" = ( /obj/effect/turf_decal/siding/green/corner, /turf/open/indestructible/white, @@ -2051,12 +2058,11 @@ /turf/open/floor/carpet/royalblack, /area/department_main/extraction) "Fn" = ( -/obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/praetorian{ - armor = null +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" }, /turf/open/floor/plasteel/dark, -/area/department_main/discipline) +/area/department_main/extraction) "Fx" = ( /obj/effect/turf_decal/siding/brown{ dir = 8 @@ -2101,6 +2107,12 @@ /obj/machinery/blackbox_recorder, /turf/open/floor/plasteel/dark, /area/department_main/information) +"Gw" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "GA" = ( /obj/machinery/light, /obj/structure/rack, @@ -2130,9 +2142,6 @@ "Hf" = ( /obj/machinery/light, /obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/mimicry{ - armor = null - }, /turf/open/floor/plasteel/dark, /area/department_main/discipline) "Hh" = ( @@ -2161,10 +2170,10 @@ /turf/open/floor/plasteel/dark, /area/department_main/extraction) "HE" = ( -/obj/effect/turf_decal/siding/green{ - dir = 6 +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" }, -/turf/open/floor/carpet/green, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "HH" = ( /obj/machinery/camera/autoname, @@ -2395,11 +2404,13 @@ /turf/open/floor/plasteel/dark, /area/department_main/discipline) "Li" = ( -/obj/effect/spawner/randomsnackvend, +/obj/effect/turf_decal/siding/green{ + dir = 8 + }, /obj/effect/turf_decal/siding/green{ dir = 10 }, -/turf/open/indestructible/white, +/turf/open/floor/carpet/green, /area/department_main/safety) "Ln" = ( /obj/structure/closet/crate, @@ -2411,16 +2422,16 @@ /turf/open/floor/plasteel/elevatorshaft, /area/facility_hallway/safety) "LR" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/siding/green, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/obj/effect/spawner/randomsnackvend, /turf/open/indestructible/white, /area/department_main/safety) "Mc" = ( -/obj/machinery/vending/cola/shamblers, /obj/effect/turf_decal/siding/green{ dir = 6 }, -/obj/machinery/light, /turf/open/indestructible/white, /area/department_main/safety) "Mf" = ( @@ -2444,6 +2455,10 @@ /obj/machinery/ntnet_relay, /turf/open/floor/circuit/telecomms/mainframe, /area/department_main/information) +"Ms" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "Mu" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -2723,8 +2738,12 @@ /area/department_main/discipline) "Pi" = ( /obj/effect/turf_decal/siding/green{ - dir = 10 + dir = 4 + }, +/obj/effect/turf_decal/siding/green{ + dir = 6 }, +/obj/effect/turf_decal/siding/green, /turf/open/floor/carpet/green, /area/department_main/safety) "Pj" = ( @@ -2781,6 +2800,10 @@ /obj/effect/spawner/abnormality_room, /turf/closed/indestructible/reinforced, /area/facility_hallway/information) +"Qx" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "QC" = ( /obj/effect/turf_decal/siding/blue{ color = "#3234B9"; @@ -2989,9 +3012,6 @@ /area/facility_hallway/safety) "Tw" = ( /obj/structure/rack, -/obj/item/clothing/suit/armor/ego_gear/mockery{ - armor = null - }, /turf/open/floor/plasteel/dark, /area/department_main/discipline) "TF" = ( @@ -3265,7 +3285,8 @@ /turf/open/floor/carpet/red, /area/department_main/discipline) "Xz" = ( -/turf/open/floor/carpet/green, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "XE" = ( /turf/closed/indestructible/reinforced, @@ -18699,8 +18720,8 @@ dq YP Uh oS -oS -Pi +Li +HR HR TF Mm @@ -18955,10 +18976,10 @@ YS Hw rz HM -Xz sW Hk HR +HR Kd Mm MF @@ -19212,10 +19233,10 @@ YS YS iz HM -Xz tz Hk AN +mv Kw Mm MD @@ -19470,12 +19491,12 @@ YS iK HM qf -uF Hk HX YS YS YS +YS Zs rn Su @@ -19726,13 +19747,13 @@ VI VI YP HM -Xz xc Hk -HX -YS -YS -QD +Is +Qx +bx +VI +VI Zs qW ru @@ -19983,13 +20004,13 @@ VI VI YP HM -Xz yp Hk -Is -Li -YS -QD +HR +HE +VI +uF +Xz Zs qW ru @@ -20241,12 +20262,12 @@ VI YP kJ vm -vm -HE -HR -LR -YS -QD +Pi +AN +Qx +VI +VI +VI Zs qW ru @@ -20496,14 +20517,14 @@ YS YS YS nE -mv +LR BR -HR AN -mv Mc YS -QD +YS +YS +YS Zs qW ru @@ -52707,7 +52728,7 @@ pw RO nn yq -Fn +Tw XE QD QD @@ -53221,7 +53242,7 @@ pw KM jE yq -is +Hf XE QD QD @@ -56031,9 +56052,9 @@ QD KP KP KP -KP -KP -KP +Ms +Fn +Ms KP QD QD @@ -56287,11 +56308,11 @@ QD QD QD QD -QD -QD -QD -QD -QD +KP +AJ +kU +kU +KP QD QD QD @@ -56544,11 +56565,11 @@ QD QD QD QD -QD -QD -QD -QD -QD +KP +Gw +is +kU +KP QD QD QD @@ -56801,11 +56822,11 @@ QD QD QD QD -QD -QD -QD -QD -QD +KP +kU +kU +kU +KP QD QD QD @@ -57058,11 +57079,11 @@ QD QD QD QD -QD -QD -QD -QD -QD +KP +KP +KP +KP +KP QD QD QD diff --git a/_maps/map_files/Eta/etacorp.dmm b/_maps/map_files/Eta/etacorp.dmm index 073b4aad0e99..8606a4800f49 100644 --- a/_maps/map_files/Eta/etacorp.dmm +++ b/_maps/map_files/Eta/etacorp.dmm @@ -296,6 +296,12 @@ /obj/structure/disposalpipe/junction, /turf/open/floor/carpet/stellar, /area/facility_hallway/command) +"bh" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/closed/indestructible/reinforced, +/area/facility_hallway/safety) "bj" = ( /obj/effect/turf_decal/siding{ color = "#7D6521"; @@ -450,6 +456,9 @@ /obj/machinery/light/cold/no_nightlight, /turf/open/floor/plasteel/white, /area/department_main/command) +"bL" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/safety) "bM" = ( /obj/structure/rack{ pixel_x = -1 @@ -605,15 +614,9 @@ /turf/open/floor/plasteel/white, /area/department_main/safety) "cl" = ( -/obj/machinery/light/cold/no_nightlight{ - dir = 4 - }, /obj/effect/turf_decal/siding/green{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/carpet/green, /area/facility_hallway/safety) "cn" = ( @@ -1045,6 +1048,10 @@ }, /turf/open/floor/facility/dark, /area/department_main/extraction) +"dK" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/safety) "dL" = ( /obj/effect/turf_decal/siding/green{ dir = 4 @@ -1391,6 +1398,10 @@ /obj/machinery/camera/autoname, /turf/open/floor/plasteel/dark, /area/department_main/records) +"eY" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "eZ" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/siding/purple{ @@ -4619,6 +4630,10 @@ }, /turf/open/floor/facility/white, /area/department_main/safety) +"qt" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/safety) "qu" = ( /obj/structure/table/wood, /obj/item/safety_kit, @@ -5508,13 +5523,9 @@ /turf/open/floor/carpet/red, /area/facility_hallway/discipline) "tz" = ( -/obj/machinery/disposal/bin, /obj/effect/turf_decal/siding/green{ dir = 6 }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /turf/open/floor/carpet/green, /area/facility_hallway/safety) "tA" = ( @@ -5909,13 +5920,13 @@ /turf/open/floor/plasteel/sepia, /area/department_main/information) "uS" = ( -/obj/machinery/light/cold/no_nightlight{ - dir = 1 - }, /obj/effect/turf_decal/siding{ color = "#7D6521"; dir = 5 }, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, /turf/open/floor/carpet/royalblack, /area/facility_hallway/extraction) "uT" = ( @@ -6289,6 +6300,12 @@ }, /turf/open/floor/carpet/red, /area/department_main/command) +"vZ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/safety) "wb" = ( /obj/effect/turf_decal/siding/yellow{ dir = 6 @@ -6432,13 +6449,19 @@ /turf/open/floor/carpet, /area/facility_hallway/control) "wG" = ( -/obj/machinery/light/cold/no_nightlight, /obj/effect/turf_decal/siding{ color = "#7D6521"; dir = 6 }, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, /turf/open/floor/carpet/royalblack, /area/facility_hallway/extraction) +"wJ" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "wK" = ( /obj/effect/turf_decal/siding/brown, /obj/machinery/light/cold/no_nightlight, @@ -6510,6 +6533,12 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel/white, /area/department_main/command) +"wT" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "wW" = ( /obj/structure/window/reinforced/spawner/north{ max_integrity = 25 @@ -7737,6 +7766,10 @@ }, /turf/open/floor/facility/halls, /area/department_main/welfare) +"Bh" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/safety) "Bi" = ( /obj/effect/turf_decal/siding/purple{ dir = 10 @@ -10129,6 +10162,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/dark, /area/facility_hallway/north) +"JS" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/carpet/green, +/area/facility_hallway/safety) "JU" = ( /obj/effect/turf_decal/siding{ color = "#7D6521"; @@ -10510,6 +10549,9 @@ /obj/machinery/camera/autoname, /turf/open/floor/carpet/royalblack, /area/department_main/extraction) +"Lj" = ( +/turf/open/floor/carpet/green, +/area/facility_hallway/safety) "Lk" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 4 @@ -10716,6 +10758,10 @@ }, /turf/open/floor/facility/white, /area/department_main/safety) +"LQ" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "LR" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -11159,6 +11205,14 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/welfare) +"Nv" = ( +/obj/effect/turf_decal/siding/green, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/turf/open/floor/carpet/green, +/area/facility_hallway/safety) "Nw" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -13774,6 +13828,9 @@ }, /turf/open/floor/plasteel/white, /area/department_main/command) +"Ww" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "Wz" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -13851,6 +13908,10 @@ }, /turf/open/floor/carpet/royalblack, /area/department_main/extraction) +"WW" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "WZ" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/siding/red{ @@ -46069,10 +46130,10 @@ Xt sS fJ Im -wd -wd -wd -wd +Im +Im +Im +Im wd ZP Hd @@ -46295,12 +46356,12 @@ Im MY sS xS +WW +wJ +Ww +Ww Im wd -wd -wd -wd -wd ZP ZP ZP @@ -46521,7 +46582,11 @@ Im Im MY sS -QL +xS +wT +Ww +LQ +eY Im wd wd @@ -46529,10 +46594,6 @@ wd wd wd wd -wd -wd -wd -wd jZ Is Jf @@ -46749,6 +46810,10 @@ Im uS RC wG +WW +Ww +Ww +Ww Im wd wd @@ -46756,10 +46821,6 @@ wd wd wd wd -wd -wd -wd -wd jZ Cp Jf @@ -46977,10 +47038,10 @@ fM lK fM Gh -wd -wd -wd -wd +Im +Im +Im +Im wd wd wd @@ -49498,8 +49559,8 @@ WB WB qg yj -pR -hO +JS +Nv qg wd wd @@ -49725,7 +49786,7 @@ qg qg qg yj -pR +Lj hO qg wd @@ -50178,9 +50239,9 @@ wd wd wd qg -qg -qg -qg +dK +bh +dK qg wd wd @@ -50404,11 +50465,11 @@ wd wd wd wd -wd -wd -wd -wd -wd +qg +Bh +bL +bL +qg wd wd wd @@ -50631,11 +50692,11 @@ wd wd wd wd -wd -wd -wd -wd -wd +qg +vZ +qt +bL +qg wd wd wd @@ -50858,11 +50919,11 @@ wd wd wd wd -wd -wd -wd -wd -wd +qg +bL +bL +bL +qg wd wd wd @@ -51085,11 +51146,11 @@ wd wd wd wd -wd -wd -wd -wd -wd +qg +qg +qg +qg +qg wd wd wd diff --git a/_maps/map_files/Gamma/gammacorp.dmm b/_maps/map_files/Gamma/gammacorp.dmm index 649bd7936227..891a68065e10 100644 --- a/_maps/map_files/Gamma/gammacorp.dmm +++ b/_maps/map_files/Gamma/gammacorp.dmm @@ -745,6 +745,10 @@ }, /turf/open/floor/plasteel/dark, /area/facility_hallway/north) +"fF" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "fH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -799,6 +803,10 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/safety) +"gc" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "gk" = ( /obj/effect/spawner/randomcolavend, /turf/open/floor/plasteel/dark, @@ -894,6 +902,12 @@ "hn" = ( /turf/open/floor/plating, /area/facility_hallway/south) +"ho" = ( +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "hr" = ( /obj/machinery/door/airlock/hatch, /turf/open/floor/wood, @@ -1468,9 +1482,7 @@ /turf/open/floor/facility/white, /area/department_main/training) "li" = ( -/obj/structure/table, -/obj/machinery/light, -/turf/open/floor/facility, +/turf/open/floor/plasteel/dark, /area/department_main/safety) "ll" = ( /obj/effect/landmark/latejoin, @@ -2586,6 +2598,10 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/north) +"so" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "sp" = ( /obj/structure/table/wood, /turf/open/floor/facility, @@ -3233,6 +3249,10 @@ }, /turf/open/floor/plasteel, /area/facility_hallway/information) +"wx" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "wF" = ( /obj/effect/turf_decal/siding/yellow/corner{ dir = 8 @@ -3289,6 +3309,10 @@ }, /turf/open/floor/carpet/green, /area/department_main/safety) +"wQ" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "wT" = ( /obj/effect/turf_decal/siding/brown{ dir = 4 @@ -4038,6 +4062,10 @@ /obj/structure/fluff/hedge, /turf/open/floor/carpet/stellar, /area/department_main/command) +"BW" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "BZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4257,6 +4285,10 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/control) +"DC" = ( +/obj/structure/rack, +/turf/open/floor/carpet/royalblack, +/area/facility_hallway/extraction) "DD" = ( /obj/effect/turf_decal/plaque{ alpha = 230; @@ -4345,6 +4377,9 @@ }, /turf/open/floor/facility/halls, /area/department_main/welfare) +"Ew" = ( +/turf/closed/indestructible/reinforced, +/area/facility_hallway/extraction) "Ex" = ( /obj/structure/disposalpipe/segment, /turf/closed/indestructible/reinforced, @@ -6059,6 +6094,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/facility/halls, /area/department_main/training) +"PQ" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/closed/indestructible/reinforced, +/area/department_main/safety) "PR" = ( /obj/machinery/light{ dir = 1 @@ -6215,6 +6256,9 @@ }, /turf/open/floor/plasteel, /area/department_main/control) +"QL" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/extraction) "QM" = ( /obj/structure/table, /obj/item/paper_bin, @@ -6602,6 +6646,10 @@ "Tb" = ( /turf/open/floor/plasteel/showroomfloor, /area/facility_hallway/west) +"Td" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Te" = ( /obj/structure/rack, /obj/structure/railing/corner{ @@ -7550,6 +7598,12 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/facility_hallway/south) +"ZB" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/carpet/royalblack, +/area/facility_hallway/extraction) "ZI" = ( /obj/effect/turf_decal/siding/brown/corner, /turf/open/floor/facility, @@ -26782,9 +26836,9 @@ uI wP uI VM -kb -kb -mj +QM +uJ +YU Oq PD PD @@ -27039,14 +27093,14 @@ uI wP uI VM -kb +Df kb DY Oq -PD -PD -PD -PD +Oq +Oq +Oq +Oq PD PD PD @@ -27296,9 +27350,13 @@ uI wP uI VM -Df -uJ -YU +kb +kb +kb +fF +li +li +ho Oq PD PD @@ -27417,10 +27475,6 @@ PD PD PD PD -PD -PD -PD -PD "} (78,1,1) = {" PD @@ -27553,9 +27607,13 @@ uI Mm uI VM -QM -Ug -Ug +kb +kb +kb +PQ +li +Td +wQ Oq PD PD @@ -27674,10 +27732,6 @@ PD PD PD PD -PD -PD -PD -PD "} (79,1,1) = {" PD @@ -27812,7 +27866,11 @@ uI VM kb kb -uN +kb +fF +li +li +li Oq PD PD @@ -27931,10 +27989,6 @@ PD PD PD PD -PD -PD -PD -PD "} (80,1,1) = {" PD @@ -28069,12 +28123,12 @@ uI VM Ao NX -li +uN +Oq +Oq +Oq +Oq Oq -PD -PD -PD -PD PD PD PD @@ -28326,7 +28380,7 @@ uI VM QM Ug -Ug +mj Oq PD PD @@ -34772,11 +34826,11 @@ Hd Hd Hd Hd -ZQ -PD -PD -PD -PD +Ew +Ew +Ew +Ew +Ew PD PD PD @@ -35028,12 +35082,12 @@ Ib zk tY hG -OM -jt -PD -PD -PD -PD +DC +wx +so +QL +QL +Ew PD PD PD @@ -35286,11 +35340,11 @@ bX bX bX bX -jt -PD -PD -PD -PD +ZB +QL +BW +gc +Ew PD PD PD @@ -35543,11 +35597,11 @@ Lx fx Ys Lx -jt -PD -PD -PD -PD +wx +QL +QL +QL +Ew PD PD PD @@ -35800,11 +35854,11 @@ jt jt jt jt -jt -PD -PD -PD -PD +Ew +Ew +Ew +Ew +Ew PD PD PD diff --git a/_maps/map_files/Lambda/lambdacorp.dmm b/_maps/map_files/Lambda/lambdacorp.dmm index d352bd8a19e4..f92c4353a1c4 100644 --- a/_maps/map_files/Lambda/lambdacorp.dmm +++ b/_maps/map_files/Lambda/lambdacorp.dmm @@ -354,6 +354,10 @@ /obj/machinery/light/cold/no_nightlight, /turf/open/floor/carpet/orange, /area/department_main/training) +"bd" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "be" = ( /obj/machinery/door/poddoor/preopen{ id = "managerlockdown"; @@ -369,6 +373,10 @@ "bg" = ( /turf/open/floor/plasteel/sepia, /area/department_main/discipline) +"bj" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/department_main/information) "bk" = ( /obj/structure/window/reinforced/spawner/north{ max_integrity = 25 @@ -3825,6 +3833,9 @@ }, /turf/open/floor/plasteel/white, /area/department_main/safety) +"nq" = ( +/turf/open/floor/plasteel/dark, +/area/department_main/information) "ns" = ( /obj/docking_port/stationary{ dwidth = 3; @@ -4164,6 +4175,10 @@ /obj/effect/landmark/abnormality_spawn/training_rabbit, /turf/open/floor/facility/dark, /area/department_main/training) +"oQ" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "oR" = ( /obj/structure/chair/office{ dir = 8 @@ -7432,6 +7447,10 @@ }, /turf/open/floor/plasteel/sepia, /area/department_main/discipline) +"Bl" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Bm" = ( /obj/effect/turf_decal/siding/red{ color = "#440000"; @@ -8168,6 +8187,10 @@ }, /obj/item/storage/belt/ego, /obj/item/storage/belt/ego, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, +/obj/item/storage/belt/ego, /turf/open/floor/plasteel/sepia, /area/department_main/information) "DL" = ( @@ -8778,6 +8801,10 @@ }, /turf/open/floor/plasteel/sepia, /area/facility_hallway/safety) +"FP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/information) "FV" = ( /obj/effect/turf_decal/siding/blue{ color = "#3234B9"; @@ -9484,6 +9511,12 @@ }, /turf/open/floor/plasteel/sepia, /area/department_main/command) +"IZ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/department_main/information) "Jc" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -9502,6 +9535,10 @@ }, /turf/open/floor/facility/halls, /area/department_main/discipline) +"Je" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Jf" = ( /obj/structure/window/reinforced/spawner{ max_integrity = 25 @@ -10356,6 +10393,12 @@ }, /turf/open/floor/plasteel/sepia, /area/facility_hallway/welfare) +"Mn" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "Mp" = ( /obj/structure/rack{ pixel_x = -1 @@ -10747,10 +10790,20 @@ }, /turf/open/floor/plasteel/sepia, /area/department_main/welfare) +"NJ" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/department_main/information) "NM" = ( /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel/sepia, /area/facility_hallway/safety) +"NN" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/department_main/information) "NP" = ( /obj/effect/turf_decal/siding/brown{ dir = 6 @@ -11778,6 +11831,10 @@ }, /obj/item/storage/belt/ego, /obj/item/storage/belt/ego, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, +/obj/item/storage/belt/ego, /turf/open/floor/plasteel/sepia, /area/department_main/information) "Rq" = ( @@ -12034,9 +12091,6 @@ /turf/open/floor/carpet/red, /area/department_main/discipline) "Sb" = ( -/obj/structure/rack{ - pixel_x = -1 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4; color = "#000000" @@ -12052,14 +12106,6 @@ dir = 8; color = "#000000" }, -/obj/machinery/light/cold/no_nightlight{ - dir = 4 - }, -/obj/machinery/camera/autoname{ - dir = 9 - }, -/obj/item/storage/belt/ego, -/obj/item/storage/belt/ego, /turf/open/floor/plasteel/sepia, /area/department_main/information) "Sg" = ( @@ -12425,6 +12471,9 @@ }, /turf/open/floor/plasteel/sepia, /area/department_main/information) +"Tz" = ( +/turf/open/floor/plasteel/dark, +/area/department_main/safety) "TA" = ( /obj/structure/bed/pod, /turf/open/floor/plasteel/sepia, @@ -13648,7 +13697,6 @@ /obj/structure/rack{ pixel_x = -1 }, -/obj/structure/window/reinforced/spawner/north, /obj/effect/turf_decal/tile/neutral{ dir = 4; color = "#000000" @@ -13665,6 +13713,14 @@ color = "#000000" }, /obj/item/toy/plush/bigbird, +/obj/structure/window/reinforced/spawner/north{ + max_integrity = 25; + pixel_y = 2; + dir = 2 + }, +/obj/machinery/camera/autoname{ + dir = 9 + }, /turf/open/floor/plasteel/sepia, /area/department_main/information) "XW" = ( @@ -49893,11 +49949,11 @@ xQ nT nT nT -nT -nT lZ -nT -nT +FP +NN +FP +lZ nT kq nT @@ -50150,11 +50206,11 @@ xQ sI sI sI -sI -sI -sI -sI -sI +nT +NJ +nq +nq +nT sI RG uk @@ -50407,11 +50463,11 @@ xQ sI sI sI -sI -sI -sI -sI -sI +nT +IZ +bj +nq +nT sI sI xy @@ -50664,11 +50720,11 @@ xQ sI sI sI -sI -sI -sI -sI -sI +nT +nq +nq +nq +nT sI sI xy @@ -50924,7 +50980,7 @@ aF aF aF aF -Ds +xy Ds Ds Ds @@ -54798,9 +54854,9 @@ sd ke sd qW -qW -qW -qW +bd +Mn +bd qW sI Ds @@ -55055,10 +55111,10 @@ Lt QM fg xy -sI -sI -sI -sI +Bl +Tz +Tz +qW sI Ds yX @@ -55312,10 +55368,10 @@ wE Kc qY xy -sI -sI -sI -sI +Tz +Je +oQ +qW sI Ds yX @@ -55569,10 +55625,10 @@ wE Kc qY xy -sI -sI -sI -sI +Tz +Tz +Tz +qW sI Ds Ds @@ -55826,10 +55882,10 @@ wE Kc qY xy -sI -sI -sI -sI +qW +qW +qW +qW sI sI sI diff --git a/_maps/map_files/Psi/psicorp.dmm b/_maps/map_files/Psi/psicorp.dmm index df73bb4b865b..93cdfeb266c8 100644 --- a/_maps/map_files/Psi/psicorp.dmm +++ b/_maps/map_files/Psi/psicorp.dmm @@ -684,10 +684,13 @@ /turf/open/floor/plasteel/dark, /area/facility_hallway/welfare) "en" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Records Office Secure Area" +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" }, -/turf/open/floor/facility/halls, +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, /area/department_main/extraction) "eo" = ( /obj/effect/turf_decal/siding/blue{ @@ -3200,6 +3203,10 @@ }, /turf/open/floor/holofloor/white, /area/facility_hallway/discipline) +"rA" = ( +/obj/machinery/light, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "rJ" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -3543,6 +3550,10 @@ }, /turf/open/floor/plasteel/sepia, /area/facility_hallway/command) +"ts" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "tw" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -3918,6 +3929,9 @@ /obj/effect/turf_decal/tile/bar{ dir = 4 }, +/obj/machinery/camera/autoname{ + dir = 1 + }, /turf/open/floor/holofloor/white, /area/facility_hallway/discipline) "vA" = ( @@ -5939,6 +5953,10 @@ }, /turf/open/floor/holofloor/white, /area/facility_hallway/discipline) +"Fg" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "Fi" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -6110,6 +6128,10 @@ }, /turf/open/floor/carpet/stellar, /area/department_main/command) +"FY" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "Ga" = ( /obj/effect/turf_decal/siding/brown/corner{ dir = 4 @@ -6562,6 +6584,9 @@ }, /turf/open/floor/holofloor/white, /area/facility_hallway/discipline) +"Jc" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "Jd" = ( /obj/effect/turf_decal/siding/blue/corner{ color = "#3234B9" @@ -6661,6 +6686,12 @@ }, /turf/open/floor/carpet/green, /area/department_main/control) +"JF" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "JK" = ( /obj/effect/turf_decal/plaque{ alpha = 230; @@ -8238,6 +8269,12 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/holofloor/white, /area/facility_hallway/east) +"Sy" = ( +/obj/machinery/camera/autoname{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "Sz" = ( /obj/effect/turf_decal/plaque{ alpha = 230; @@ -8918,6 +8955,10 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/extraction) +"VA" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/discipline) "VH" = ( /obj/machinery/door/airlock/highsecurity{ name = "Records Office" @@ -9869,6 +9910,15 @@ "ZU" = ( /turf/open/floor/carpet/royalblue, /area/department_main/command) +"ZX" = ( +/obj/effect/turf_decal/siding/green{ + dir = 4 + }, +/obj/machinery/door/airlock/vault{ + name = "Dont Touch Me containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/department_main/extraction) "ZZ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -26125,7 +26175,7 @@ Zq aT jc jc -ml +jc jc jc jc @@ -26352,8 +26402,8 @@ Ct Bf Ql jc -jc -jc +sO +Fg BC LT BC @@ -26582,7 +26632,7 @@ yb sO en BC -oA +ts bs jc ml @@ -26807,7 +26857,7 @@ BC BC AS Ql -jc +Fg BC UJ BC @@ -27031,7 +27081,7 @@ lc fS Wu BC -BC +oA AS Hk jc @@ -27261,7 +27311,7 @@ BC BC AS Ql -jc +Fg BC LT BC @@ -27488,7 +27538,7 @@ Jl RX Cw sO -en +ZX BC Su bs @@ -27714,8 +27764,8 @@ tA Aw Ql jc -jc -jc +sO +Fg BC UJ BC @@ -27941,7 +27991,7 @@ mk yy jc jc -ml +jc jc jc jc @@ -42222,11 +42272,11 @@ TP qB GB GB -ge +zZ +TP +TP +TP TP -ml -ml -ml TP cH cH @@ -42449,11 +42499,11 @@ TP yT GB GB -zZ -TP -ml -ml -ml +ge +VA +Jc +Jc +Sy TP cH cH @@ -42677,10 +42727,10 @@ qB GB GB ge -TP -ml -ml -ml +JF +Jc +FY +rA TP cH cH @@ -42903,11 +42953,11 @@ TP qB GB GB -WX -TP -ml -ml -ml +ge +VA +Jc +Jc +Jc TP TP TP diff --git a/_maps/map_files/Zeta/zetacorp.dmm b/_maps/map_files/Zeta/zetacorp.dmm index 30581b5b5ea4..1e4feef96796 100644 --- a/_maps/map_files/Zeta/zetacorp.dmm +++ b/_maps/map_files/Zeta/zetacorp.dmm @@ -404,6 +404,12 @@ }, /turf/open/floor/wood, /area/facility_hallway/information) +"cr" = ( +/obj/machinery/door/airlock/vault{ + name = "Wishing Well containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/training) "cv" = ( /obj/structure/bed, /obj/item/bedsheet/syndie, @@ -1176,7 +1182,8 @@ /turf/open/floor/carpet/red, /area/department_main/control) "hK" = ( -/turf/closed/indestructible/rock, +/obj/machinery/light, +/turf/open/floor/plasteel/dark, /area/facility_hallway/training) "hN" = ( /obj/effect/turf_decal/siding/wood{ @@ -1611,6 +1618,10 @@ /obj/effect/spawner/abnormality_room, /turf/closed/indestructible/reinforced, /area/facility_hallway/training) +"lc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/east) "lf" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -3246,6 +3257,10 @@ /obj/effect/turf_decal/siding/white, /turf/open/floor/carpet/black, /area/department_main/command) +"vb" = ( +/obj/structure/toolabnormality/wishwell, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/training) "vc" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -3939,7 +3954,7 @@ /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/light/cold/no_nightlight{ - dir = 1 + dir = 4 }, /turf/open/floor/wood, /area/facility_hallway/training) @@ -4194,6 +4209,9 @@ }, /turf/open/floor/wood, /area/facility_hallway/safety) +"Ad" = ( +/turf/open/floor/plasteel/dark, +/area/facility_hallway/training) "Af" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -4485,6 +4503,12 @@ }, /turf/closed/indestructible/rock, /area/space) +"Bx" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/east) "BL" = ( /obj/machinery/fat_sucker, /obj/effect/turf_decal/siding/green{ @@ -4734,6 +4758,12 @@ }, /turf/open/floor/carpet/green, /area/department_main/safety) +"Dm" = ( +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/training) "Dp" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/wood, @@ -5122,8 +5152,27 @@ dir = 6 }, /obj/machinery/light/cold/no_nightlight, +/obj/machinery/light/cold/no_nightlight{ + dir = 4 + }, /turf/open/floor/wood, /area/facility_hallway/training) +"FB" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/camera/autoname{ + dir = 10 + }, +/turf/open/floor/plasteel/sepia, +/area/facility_hallway/east) "FG" = ( /turf/closed/indestructible/fakeglass, /area/facility_hallway/safety) @@ -5786,6 +5835,10 @@ }, /turf/open/floor/wood, /area/facility_hallway/south) +"JL" = ( +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/east) "JV" = ( /obj/structure/railing{ dir = 6; @@ -5914,23 +5967,7 @@ /turf/open/floor/facility/dark, /area/department_main/control) "Kz" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/cryopod{ - dir = 1 - }, -/obj/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/plasteel/sepia, +/turf/open/floor/plasteel/dark, /area/facility_hallway/east) "KA" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -6193,6 +6230,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/facility_hallway/training) +"Mt" = ( +/obj/machinery/door/airlock/vault{ + name = "Shelter From The 27th Of March containment zone" + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/east) "Mw" = ( /obj/machinery/door/airlock/highsecurity{ name = "Central Command Department" @@ -6971,6 +7014,10 @@ }, /turf/open/floor/carpet/black, /area/department_main/command) +"Qv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/training) "Qy" = ( /obj/effect/light_emitter{ light_power = 4; @@ -7061,6 +7108,10 @@ /obj/machinery/light/cold/no_nightlight, /turf/open/floor/wood, /area/facility_hallway/safety) +"QW" = ( +/obj/structure/toolabnormality/shelter/entrance, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/east) "QY" = ( /turf/open/floor/wood, /area/department_main/safety) @@ -37025,10 +37076,10 @@ Tz TE MI pH -Tz -hK -hK -hK +Qv +Ad +Ad +Dm Tz TE MI @@ -37282,9 +37333,9 @@ Tz TE MI pH -Tz -hK -hK +cr +Ad +vb hK Tz TE @@ -37539,10 +37590,10 @@ Tz yV Ii Fu -Tz -hK -hK -hK +Qv +Ad +Ad +Ad Tz Gx rm @@ -43716,10 +43767,10 @@ yH MS ue vO -uw -uw -uw -uw +JL +Kz +Kz +fM NT ag ag @@ -43973,10 +44024,10 @@ KS PC bw vO -uw -uw -uw -uw +Bx +QW +Kz +fM NT ag ag @@ -44230,10 +44281,10 @@ vO vO vO vO -uw -uw -uw -uw +Kz +Kz +Kz +fM NT NT NT @@ -44487,9 +44538,9 @@ qT qT fM fM -fM -fM -fM +lc +Mt +lc fM fM fM @@ -44745,7 +44796,7 @@ Wd pz js mE -Kz +mP mE js fM @@ -45004,7 +45055,7 @@ mP HD HD HD -mP +FB fM Id kQ diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 3959b95641e3..27134f6754c5 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -781,17 +781,6 @@ "dN" = ( /turf/open/floor/circuit/telecomms/mainframe, /area/department_main/manager) -"dP" = ( -/obj/machinery/door/airlock/public/glass{ - hackProof = 1; - max_integrity = 250000000; - name = "Sefirot Offices"; - normal_integrity = 250000000; - req_access_txt = "67"; - whitelist_door = 1 - }, -/turf/open/floor/facility/dark, -/area/facility_hallway/manager) "dQ" = ( /obj/structure/chair/office/light{ dir = 1 @@ -943,6 +932,13 @@ }, /turf/open/floor/plasteel/white, /area/facility_hallway/manager) +"eM" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "eO" = ( /obj/machinery/light, /obj/machinery/camera/autoname{ @@ -2347,6 +2343,10 @@ name = "WARP Station Exit" }, /area/centcom/control) +"jF" = ( +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "jH" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -2373,6 +2373,17 @@ dir = 10 }, /area/tdome/tdomeadmin) +"jS" = ( +/obj/machinery/door/airlock/public/glass{ + hackProof = 1; + max_integrity = 250000000; + name = "Representative Offices"; + normal_integrity = 250000000; + req_access_txt = "69"; + whitelist_door = 1 + }, +/turf/open/floor/facility/dark, +/area/facility_hallway/manager) "jV" = ( /turf/closed/indestructible/fakedoor{ name = "CentCom Warehouse" @@ -3225,6 +3236,13 @@ }, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"nY" = ( +/obj/machinery/light, +/obj/effect/turf_decal/siding/wood{ + dir = 7 + }, +/turf/open/floor/wood, +/area/facility_hallway/manager) "oe" = ( /obj/machinery/door/poddoor/shutters{ id = "ccdroppod"; @@ -3971,10 +3989,6 @@ /obj/item/weldingtool/experimental, /turf/open/floor/plasteel/dark, /area/centcom/ferry) -"rv" = ( -/obj/effect/landmark/salesspawn, -/turf/closed/indestructible/reinforced, -/area/facility_hallway/manager) "rx" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -4282,17 +4296,11 @@ }, /turf/open/floor/plasteel/dark, /area/department_main/manager) -"sJ" = ( -/obj/machinery/door/airlock/hatch{ - hackProof = 1; - max_integrity = 25000000; - name = "Arcade Secure Storage"; - normal_integrity = 25000000; - req_access_txt = "69"; - whitelist_door = null - }, -/turf/open/floor/plasteel/dark, -/area/facility_hallway/manager) +"sI" = ( +/obj/machinery/light/small, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "sK" = ( /obj/structure/chair/sofa/corp, /turf/open/floor/plasteel/dark, @@ -5235,6 +5243,22 @@ dir = 1 }, /area/tdome/tdomeobserve) +"wt" = ( +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/structure/closet/crate/pcorp, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "wu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -5332,6 +5356,9 @@ }, /turf/open/floor/plasteel/white, /area/centcom/hub) +"wU" = ( +/turf/closed/indestructible/reinforced, +/area/shelter) "wV" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -6115,6 +6142,10 @@ /obj/machinery/cell_charger, /turf/open/floor/plasteel/dark, /area/centcom/ferry) +"zC" = ( +/obj/effect/landmark/salesspawn, +/turf/closed/indestructible/reinforced, +/area/facility_hallway/manager) "zD" = ( /obj/effect/turf_decal/tile{ color = "#CC5500"; @@ -6341,6 +6372,16 @@ }, /turf/open/floor/facility/dark, /area/department_main/manager) +"AG" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Representative"; + payment_department = "SEC"; + pixel_y = -32 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/carpet/black, +/area/facility_hallway/manager) "AH" = ( /turf/open/floor/plasteel, /area/centcom/supplypod/loading/one) @@ -7232,13 +7273,6 @@ }, /turf/open/floor/carpet/black, /area/facility_hallway/manager) -"EQ" = ( -/obj/machinery/light, -/obj/effect/turf_decal/siding/wood{ - dir = 7 - }, -/turf/open/floor/wood, -/area/facility_hallway/manager) "EV" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 5 @@ -7424,6 +7458,9 @@ dir = 1 }, /area/tdome/tdomeobserve) +"FI" = ( +/turf/closed/indestructible/rock, +/area/shelter) "FJ" = ( /obj/structure/table, /obj/item/pen/fourcolor, @@ -7463,16 +7500,10 @@ "FX" = ( /turf/open/floor/plasteel/stairs, /area/centcom/holding) -"Gc" = ( -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Representative"; - payment_department = "SEC"; - pixel_y = -32 - }, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/carpet/black, -/area/facility_hallway/manager) +"Gh" = ( +/obj/item/jammer/self_activated, +/turf/closed/indestructible/rock, +/area/shelter) "Gj" = ( /obj/effect/turf_decal/siding/white/corner{ dir = 8 @@ -7669,17 +7700,6 @@ }, /turf/open/floor/holofloor/hyperspace, /area/centcom/supplypod/supplypod_temp_holding) -"Hs" = ( -/obj/machinery/door/airlock/public/glass{ - hackProof = 1; - max_integrity = 250000000; - name = "Representative Offices"; - normal_integrity = 250000000; - req_access_txt = "69"; - whitelist_door = 1 - }, -/turf/open/floor/facility/dark, -/area/facility_hallway/manager) "Ht" = ( /obj/docking_port/stationary{ dir = 2; @@ -7853,6 +7873,17 @@ "Ie" = ( /turf/closed/indestructible/riveted, /area/tdome/arena) +"If" = ( +/obj/machinery/door/airlock/hatch{ + hackProof = 1; + max_integrity = 25000000; + name = "Arcade Secure Storage"; + normal_integrity = 25000000; + req_access_txt = "69"; + whitelist_door = null + }, +/turf/open/floor/plasteel/dark, +/area/facility_hallway/manager) "Il" = ( /turf/closed/indestructible/fakeglass, /area/tdome/tdomeobserve) @@ -10349,6 +10380,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) +"Sf" = ( +/obj/structure/closet/crate/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "Si" = ( /turf/open/floor/plasteel, /area/centcom/supplypod/loading/two) @@ -10858,6 +10898,17 @@ }, /turf/open/floor/wood, /area/facility_hallway/manager) +"UM" = ( +/obj/machinery/door/airlock/public/glass{ + hackProof = 1; + max_integrity = 250000000; + name = "Sefirot Offices"; + normal_integrity = 250000000; + req_access_txt = "67"; + whitelist_door = 1 + }, +/turf/open/floor/facility/dark, +/area/facility_hallway/manager) "UP" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -11256,6 +11307,18 @@ /obj/machinery/light/floor, /turf/open/floor/plasteel, /area/centcom/hub) +"WO" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/crate/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "WQ" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -11501,6 +11564,11 @@ }, /turf/open/floor/plasteel, /area/centcom/hub) +"XJ" = ( +/obj/structure/toolabnormality/shelter/exit, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "XL" = ( /obj/machinery/door/airlock/wood, /turf/open/floor/wood, @@ -11669,6 +11737,18 @@ /obj/structure/closet/secure_closet/freezer/fridge/open, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) +"Yw" = ( +/obj/structure/closet/crate/pcorp, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/item/storage/box/pcorp, +/obj/effect/shelter_forcefield, +/turf/open/floor/shelter, +/area/shelter) "YA" = ( /turf/closed/indestructible/fakeglass, /area/centcom/hub) @@ -15093,7 +15173,7 @@ uN UG Sa sA -sJ +If sA sA xR @@ -17142,7 +17222,7 @@ pE OX ew Xc -Hs +jS dz RE NM @@ -17152,7 +17232,7 @@ RE Sp OX OX -Gc +AG qp aa aa @@ -17405,8 +17485,8 @@ RE uQ dY Ez -EQ -rv +nY +zC bn OX ew @@ -17663,7 +17743,7 @@ tL tL tL TK -rv +zC aH cO nH @@ -23049,9 +23129,9 @@ qp qp qp JP -dP +UM JP -dP +UM JP qp qp @@ -71666,15 +71746,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +FI +FI +FI +FI +FI +FI +FI aa aa aa @@ -71923,15 +72003,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +FI +FI +FI +FI +FI +FI +FI aa aa aa @@ -72180,15 +72260,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +wU +wU +wU +wU +FI +FI aa aa aa @@ -72437,15 +72517,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +Sf +WO +wt +wU +FI +FI aa aa aa @@ -72694,15 +72774,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +jF +jF +jF +wU +FI +FI aa aa aa @@ -72951,15 +73031,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +eM +XJ +sI +wU +Gh +FI aa aa aa @@ -73208,15 +73288,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +jF +jF +jF +wU +FI +FI aa aa aa @@ -73465,15 +73545,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +Sf +Yw +wt +wU +FI +FI aa aa aa @@ -73722,15 +73802,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +wU +wU +wU +wU +wU +FI +FI aa aa aa @@ -73979,15 +74059,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +FI +FI +FI +FI +FI +FI +FI aa aa aa @@ -74236,15 +74316,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +FI +FI +FI +FI +FI +FI +FI +FI +FI aa aa aa diff --git a/code/game/area/areas/lobotomy_corp.dm b/code/game/area/areas/lobotomy_corp.dm index ca219eb53f8b..c1b96fd348f7 100644 --- a/code/game/area/areas/lobotomy_corp.dm +++ b/code/game/area/areas/lobotomy_corp.dm @@ -294,3 +294,20 @@ /area/city/backstreets_room name = "Backstreets Room" icon_state = "hallA" + +//Miscellaneous Areas +/area/shelter + name = "Shelter" + icon_state = "shelter" + requires_power = FALSE + has_gravity = STANDARD_GRAVITY + sound_environment = SOUND_AREA_TUNNEL_ENCLOSED + dynamic_lighting = DYNAMIC_LIGHTING_FORCED + +/area/shelter/Entered(atom/movable/M) + . = ..() + if(!ishostile(M)) // kick out any hostile mobs + return + var/list/potential_locs = shuffle(GLOB.department_centers) + var/turf/T = pick(potential_locs) + M.forceMove(T) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 3f80d8ce2248..d786b10b35a6 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -264,6 +264,13 @@ effective or pretty fucking useless. GLOB.active_jammers -= src update_icon() +/obj/item/jammer/self_activated + +/obj/item/jammer/self_activated/Initialize() + . = ..() + GLOB.active_jammers |= src + update_icon() + /obj/item/storage/toolbox/emergency/turret desc = "You feel a strange urge to hit this with a wrench." @@ -283,5 +290,4 @@ effective or pretty fucking useless. var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc)) turret.faction = list("[REF(user)]") qdel(src) - ..() diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/he/shelter.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/he/shelter.dm new file mode 100644 index 000000000000..8097e8ea4314 --- /dev/null +++ b/code/modules/mob/living/simple_animal/abnormality/_tools/he/shelter.dm @@ -0,0 +1,158 @@ +/obj/structure/toolabnormality/shelter + name = "shelter from the 27th of March" + desc = "The safest place on earth." + can_buckle = TRUE + max_buckled_mobs = 1 + var/obj/structure/toolabnormality/shelter/linked_structure + +/obj/structure/toolabnormality/shelter/proc/travel(mob/living/carbon/human/user) + if(!linked_structure) //Here we do nothing, just set it up for the substypes + return + var/turf/T = get_turf(linked_structure) + var/atom/movable/AM + if(user.pulling) + AM = user.pulling + AM.forceMove(T) + user.forceMove(T) + if(AM) + user.start_pulling(AM) + +/obj/structure/toolabnormality/shelter/attack_hand(mob/living/carbon/human/user) + travel_check(user) + return + +/obj/structure/toolabnormality/shelter/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE) + if (!istype(M, /mob/living/carbon/human)) + to_chat(usr, "It doesn't look like I can't quite fit in.") + return FALSE // Can only extract from humans. + + if(M != user) + to_chat(user, "It's hard enough to get into the shelter on your own!") + return FALSE + travel_check(M) + return + +/obj/structure/toolabnormality/shelter/proc/travel_check(mob/living/carbon/human/user) + icon_state = "shelter_in_opening" + if(!do_after(user, 30 SECONDS, user)) + to_chat(user, "You decide not to enter [src].") + icon_state = "shelter_in" + return + to_chat(user, "You open the hatch and climb inside.") + travel(user) + icon_state = "shelter_in" + +/obj/structure/toolabnormality/shelter/entrance + icon_state = "shelter_in" + +/obj/structure/toolabnormality/shelter/entrance/travel(mob/living/carbon/human/user) + if(!linked_structure) + linked_structure = locate(/obj/structure/toolabnormality/shelter/exit) in world.contents + playsound(src, 'sound/abnormalities/shelter/open.ogg', 80, TRUE, -3) + ..() + +/obj/structure/toolabnormality/shelter/exit + name = "exit" + desc = "Probably doesn't lead to the safest place on earth." + icon_state = "shelter_out" + +/obj/structure/toolabnormality/shelter/exit/travel_check(mob/living/carbon/human/user) + if(!do_after(user, 3 SECONDS, user)) + to_chat(user, "You decide it's safer in the shelter.") + return + to_chat(user, "You open the hatch and climb out.") + for(var/obj/item/storage/box/pcorp/foodbox in user.GetAllContents()) + user.dropItemToGround(foodbox, TRUE) + for(var/obj/item/food/canned/pcorp/foodcan in user.GetAllContents()) + user.dropItemToGround(foodcan, TRUE) + travel(user) + +/obj/structure/toolabnormality/shelter/exit/travel(mob/living/carbon/human/user) + if(!linked_structure) + linked_structure = locate(/obj/structure/toolabnormality/shelter/entrance) in world.contents + ..() + user.Stun(15 SECONDS) + to_chat(user, "You are suddenly overcome with fear and hesitation! What horrors could be lurking out here?") + +// Shelter contents +// Crate +/obj/structure/closet/crate/pcorp + name = "p-corp crate" + desc = "A dark steel crate emblazoned with the symbol of P corp." + icon = 'icons/obj/crates.dmi' + icon_state = "pcorp_crate" + +// Food Box +/obj/item/storage/box/pcorp + name = "box of p-corp canned rations" + desc = "Instructions: Open and serve immediately." + icon_state = "pcorp_box" + illustration=null + var/foodtype = /obj/item/food/canned/pcorp + +/obj/item/storage/box/pcorp/PopulateContents() + for(var/i in 1 to 6) + new foodtype(src) + +/obj/item/storage/box/pcorp/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.set_holdable(list(/obj/item/food/canned/pcorp)) + +// Food +/obj/item/food/canned/pcorp + name = "p-corp canned bread" + desc = "P corp's specialty canned bread." + icon_state = "pcorp_can" + trash_type = /obj/item/trash/can/food/pcorp + food_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 9) + tastes = list("waffles" = 7, "dough" = 2, "buttery sweetness" = 1) + foodtypes = GRAIN + +// Food Trash +/obj/item/trash/can/food/pcorp + name = "canned bread" + icon = 'icons/obj/food/food.dmi' + icon_state = "pcorp_can_empty" + +// Tiles +/turf/open/floor/shelter + name = "shelter floor" + desc = "Extremely sturdy." + icon_state = "engine" + holodeck_compatible = TRUE + thermal_conductivity = 0.025 + heat_capacity = INFINITY + floor_tile = /obj/item/stack/rods + footstep = FOOTSTEP_PLATING + barefootstep = FOOTSTEP_HARD_BAREFOOT + clawfootstep = FOOTSTEP_HARD_CLAW + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + tiled_dirt = FALSE + +/turf/open/floor/shelter/break_tile() + return //unbreakable + +/turf/open/floor/shelter/burn_tile() + return //unburnable + +/turf/open/floor/shelter/make_plating(force = FALSE) + if(force) + return ..() + return //unplateable + +/obj/effect/shelter_forcefield + name = "forcefield" + desc = "Keeps monsters out." + icon = 'icons/turf/floors.dmi' + icon_state = "transparent" + layer = TURF_LAYER + anchored = TRUE + +/obj/effect/shelter_forcefield/Crossed(atom/movable/M) + . = ..() + if(!ishostile(M)) // kick out any hostile mobs + return + var/list/potential_locs = shuffle(GLOB.department_centers) + var/turf/T = pick(potential_locs) + M.forceMove(T) //send them to brazil diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/tool_abnormality.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/tool_abnormality.dm index b09ff6314415..e5807ef1c62d 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_tools/tool_abnormality.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_tools/tool_abnormality.dm @@ -22,8 +22,7 @@ GLOBAL_LIST_INIT(unspawned_tools, list( /obj/structure/toolabnormality/skin, /obj/structure/toolabnormality/snake_oil, /obj/structure/toolabnormality/theresia, - /obj/structure/toolabnormality/mirror, - /obj/structure/toolabnormality/wishwell + /obj/structure/toolabnormality/mirror )) /obj/effect/landmark/toolspawn diff --git a/code/modules/paperwork/records/info/tools.dm b/code/modules/paperwork/records/info/tools.dm index e89a7538df09..30bd653baf6c 100644 --- a/code/modules/paperwork/records/info/tools.dm +++ b/code/modules/paperwork/records/info/tools.dm @@ -151,3 +151,13 @@ - For every use beyond the first, the employee will become vulnerable to PALE damage.
- WARNING! Employees who use this abnormality have reported being attacked by an unknown entity when hurt by PALE damage, or otherwise injured significantly.
- Such attacks seem to harmlessly pass through other employees who are not affected by this abnormality. In addition, the attacks become larger and take more time to prepare with more uses."} + +//Shelter From The 27th Of March +/obj/item/paper/fluff/info/tool/shelter + name = "T-09-82" + info = {"

T-09-82


+ Name : Shelter From The 27th Of March
+ Risk Class : HE
+ - A bomb shelter that completely protects its interior from all hazardous influences of the outside world, including light.
+ - Those who take refuge inside were perfectly shielded from physical and psychological attacks, even as far as being shielded from radio communications.
+ - However, this shelter, while perfectly safe on the inside, alters the reality of the outside to be even more hopeless. By keeping agents safely contained, it literally makes itself into the safest place on Earth."} diff --git a/icons/obj/crates.dmi b/icons/obj/crates.dmi index 3f15cc67b227..443a8853c98c 100644 Binary files a/icons/obj/crates.dmi and b/icons/obj/crates.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index be6b1c6aeda5..b140593a8c5c 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 2c1f33afa15e..81462c4b777d 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 3014b4ce0f4c..6383e6deae03 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index ca4042e1c857..ee78e1ae0ab0 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -2647,6 +2647,7 @@ #include "code\modules\mob\living\simple_animal\abnormality\_tools\tool_abnormality.dm" #include "code\modules\mob\living\simple_animal\abnormality\_tools\he\dr_jekyll.dm" #include "code\modules\mob\living\simple_animal\abnormality\_tools\he\fateloom.dm" +#include "code\modules\mob\living\simple_animal\abnormality\_tools\he\shelter.dm" #include "code\modules\mob\living\simple_animal\abnormality\_tools\he\theonite_slab.dm" #include "code\modules\mob\living\simple_animal\abnormality\_tools\he\treesap.dm" #include "code\modules\mob\living\simple_animal\abnormality\_tools\he\vivavoce.dm" diff --git a/sound/abnormalities/shelter/open.ogg b/sound/abnormalities/shelter/open.ogg new file mode 100644 index 000000000000..5fc9f5e45696 Binary files /dev/null and b/sound/abnormalities/shelter/open.ogg differ