diff --git a/_maps/__MAP_DEFINES.dm b/_maps/__MAP_DEFINES.dm index 416d116e379..1a5a8132f23 100644 --- a/_maps/__MAP_DEFINES.dm +++ b/_maps/__MAP_DEFINES.dm @@ -31,6 +31,8 @@ #define SPAWN_RUINS "Spawn Ruins" // Ghost role Taipan z-level. #define TAIPAN "RaMSS Taipan" + // Reserved z-level used only by shuttles + #define RESERVED_LEVEL "Transit/Reserved" // Level names #define CENTCOMM "CentComm" @@ -41,9 +43,13 @@ #define EMPTY_AREA "Empty Area" #define AWAY_MISSION "Away Mission" #define RAMSS_TAIPAN "RAMSS Taipan" + #define RESERVED_ZONE "Transit/Reserved" /* -2024-01-14, the typical z-levels for a single-level station are: +You can change orders for z-level(from 3 to last cause centcom and admin are compiled right into) and everything shouldn't break +If something breaks due to z order change, it means it's hardcoded and then it means someone fucked up in coding. + +2024-06-18, the typical z-levels for a single-level station are: 1: CentCom 2: Admin Zone 3: Station @@ -51,6 +57,7 @@ 5: Taipan 6: Away mission 7-11: Randomized space +last: Transit */ // Whether this z level is linked up/down. Bool. @@ -81,3 +88,6 @@ #define PLACE_LAVA_RUIN "lavaland" #define MAX_RUIN_SIZE_VALUE 170 // Which ruin should be considered large and create a separate level of space for it. + +//Reserved/Transit turf type +#define RESERVED_TURF_TYPE /turf/space diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e1b88a5d516..c7eb23c4b24 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -895,16 +895,6 @@ icon_state = "brown" }, /area/quartermaster/delivery) -"ajG" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, -/area/space) "ajM" = ( /obj/structure/spacepoddoor{ luminosity = 3 @@ -1466,6 +1456,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) +"apg" = ( +/obj/machinery/camera{ + c_tag = "Research Central Hallway"; + network = list("Research","SS13") + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/research/nhallway) "aph" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -1656,15 +1659,6 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/fore) -"aqe" = ( -/obj/effect/landmark/start/trainee_engineer, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "aqf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1696,6 +1690,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/kitchen) +"aqk" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plating/airless, +/area/space) "aqq" = ( /obj/structure/rack, /obj/item/clothing/shoes/magboots{ @@ -13398,23 +13402,6 @@ icon_state = "dark" }, /area/storage/tech) -"bGW" = ( -/obj/effect/decal/warning_stripes/southwestcorner, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/engine, -/area/toxins/sm_test_chamber) "bGY" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -13819,6 +13806,21 @@ icon_state = "blue" }, /area/bridge/checkpoint/north) +"bJx" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "bJy" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -14017,6 +14019,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) +"bKL" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/decal/warning_stripes/northeast, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "bKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -15722,6 +15734,13 @@ /obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/hydroponics) +"bSy" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/engineering/controlroom) "bSA" = ( /obj/structure/sink{ pixel_y = 22 @@ -17365,18 +17384,6 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/bar) -"cam" = ( -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/engineering/controlroom) "cas" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -17978,6 +17985,14 @@ icon_state = "dark" }, /area/crew_quarters/serviceyard) +"ccU" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/northeastcorner, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "ccW" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -17996,16 +18011,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet, /area/maintenance/casino) -"cdd" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "cdj" = ( /obj/structure/table/reinforced, /obj/item/pen, @@ -19744,16 +19749,6 @@ /obj/effect/decal/remains/mouse, /turf/simulated/floor/plating, /area/maintenance/banya) -"cml" = ( -/obj/machinery/vending/autodrobe, -/obj/machinery/camera{ - c_tag = "Clown Office"; - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/clownoffice) "cmm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/westleft, @@ -19859,24 +19854,6 @@ icon_state = "barber" }, /area/civilian/barber) -"cmO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "cmP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -19884,33 +19861,6 @@ icon_state = "green" }, /area/hydroponics) -"cmR" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) -"cmV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/fire{ - pixel_x = 32 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "cmX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19999,19 +19949,6 @@ /obj/item/storage/box/mousetraps, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) -"cnq" = ( -/obj/structure/bed, -/obj/item/bedsheet/clown, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/clownoffice) "cnx" = ( /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow, @@ -20029,20 +19966,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/office) -"cnB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "cnD" = ( /obj/structure/cable, /obj/structure/cable{ @@ -20408,20 +20331,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/storage/secure) -"cpo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "cpr" = ( /obj/machinery/power/emitter, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -20740,10 +20649,6 @@ icon_state = "caution" }, /area/atmos) -"crr" = ( -/obj/machinery/suit_storage_unit/blueshield, -/turf/simulated/floor/wood/fancy/light, -/area/blueshield) "crv" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -21158,15 +21063,6 @@ /obj/machinery/status_display, /turf/simulated/wall, /area/hydroponics) -"ctV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/controlroom) "cua" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -21508,13 +21404,6 @@ icon_state = "dark" }, /area/gateway) -"cvI" = ( -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/engineering/controlroom) "cvJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/hydroponics/soil, @@ -24354,6 +24243,15 @@ icon_state = "redfull" }, /area/crew_quarters/kitchen) +"cHj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "cHm" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster{ @@ -24384,20 +24282,6 @@ icon_state = "whitepurple" }, /area/medical/research) -"cHz" = ( -/obj/structure/bed, -/obj/item/bedsheet/mime, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "tranquillite" - }, -/area/mimeoffice) "cHC" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/cable{ @@ -26059,21 +25943,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"cOT" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 26 - }, -/obj/structure/filingcabinet/chestdrawer, -/obj/item/radio/intercom{ - pixel_y = -26; - pixel_x = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" - }, -/area/toxins/explab) "cOU" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/heat_exchanging, @@ -26819,16 +26688,6 @@ /obj/machinery/atmospherics/meter, /turf/simulated/floor/plasteel, /area/engineering/controlroom) -"cRT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northeastcorner, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel, -/area/engineering/controlroom) "cRU" = ( /obj/effect/decal/warning_stripes/northeast, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -26874,14 +26733,6 @@ icon_state = "purplefull" }, /area/toxins/test_chamber) -"cSa" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/effect/decal/warning_stripes/north, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/engineering/controlroom) "cSb" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -28141,19 +27992,6 @@ icon_state = "white" }, /area/medical/chemistry) -"cXs" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -28 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whiteyellow" - }, -/area/medical/chemistry) "cXv" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -31508,6 +31346,25 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) +"dmd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/door/poddoor/preopen{ + id_tag = "Singularity"; + name = "Singularity Blast Doors" + }, +/turf/simulated/floor/plating, +/area/engineering/engine) "dmj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -33412,6 +33269,21 @@ /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/engineering/controlroom) +"duH" = ( +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_x = 26 + }, +/obj/structure/filingcabinet/chestdrawer, +/obj/item/radio/intercom{ + pixel_y = -26; + pixel_x = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitepurple" + }, +/area/toxins/explab) "duI" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -33439,21 +33311,6 @@ icon_state = "dark" }, /area/security/permabrig) -"duO" = ( -/obj/machinery/power/terminal, -/obj/effect/decal/warning_stripes/south, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/engineering/controlroom) "duT" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -33682,6 +33539,20 @@ }, /turf/simulated/floor/engine/co2, /area/atmos) +"dvO" = ( +/obj/structure/bed, +/obj/item/bedsheet/mime, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "tranquillite" + }, +/area/mimeoffice) "dvP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -33756,6 +33627,21 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/bar/atrium) +"dwp" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "engineering_east_airlock"; + name = "exterior access button"; + pixel_x = 20; + pixel_y = 20; + req_access = list(10,13) + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "dws" = ( /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ @@ -34859,11 +34745,6 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) -"dBp" = ( -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dBr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -35078,19 +34959,6 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) -"dCv" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/engineering_guide{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/book/manual/engineering_particle_accelerator, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, -/area/engineering/engine) "dCw" = ( /obj/structure/table, /obj/machinery/computer/library/public, @@ -35576,12 +35444,6 @@ }, /turf/simulated/floor/engine/o2, /area/atmos) -"dEs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dEt" = ( /turf/simulated/wall, /area/maintenance/banya) @@ -36751,18 +36613,6 @@ }, /turf/simulated/floor/engine, /area/maintenance/turbine) -"dJh" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "dJi" = ( /obj/machinery/field/generator{ anchored = 1; @@ -37983,13 +37833,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space) -"dOM" = ( -/obj/effect/decal/warning_stripes/northwest, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dON" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -38362,16 +38205,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine) -"dQA" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine) "dQB" = ( /obj/machinery/light{ dir = 4 @@ -38429,15 +38262,6 @@ icon_state = "neutralfull" }, /area/quartermaster/miningdock) -"dQQ" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/west, -/obj/machinery/computer/security/telescreen/singularity{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dQR" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/vodka{ @@ -38449,32 +38273,6 @@ icon_state = "brown" }, /area/quartermaster/storage) -"dQS" = ( -/obj/effect/landmark/start/engineer, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/engine) -"dQT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "dQV" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -38510,36 +38308,6 @@ /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"dRd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) -"dRe" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "dRf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38639,14 +38407,6 @@ icon_state = "dark" }, /area/chapel/office) -"dRw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "dRB" = ( /obj/machinery/alarm{ dir = 4; @@ -38861,21 +38621,6 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) -"dSy" = ( -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/engineering/engine) -"dSz" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Singularity"; - name = "Singularity Blast Doors" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dSA" = ( /obj/item/radio/intercom{ pixel_x = -28 @@ -38890,13 +38635,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/plating, /area/maintenance/library) -"dSC" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "dSD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39356,19 +39094,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) -"dUA" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plating, -/area/engineering/engine) "dUC" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -39733,13 +39458,6 @@ icon_state = "green" }, /area/hydroponics) -"dVW" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating, -/area/engineering/engine) "dVX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -40166,16 +39884,6 @@ icon_state = "white" }, /area/medical/medbay) -"dXn" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/engineering/engine) "dXo" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -41895,6 +41603,14 @@ icon_state = "whitepurple" }, /area/medical/research/restroom) +"eki" = ( +/obj/machinery/door/window/eastleft{ + dir = 1; + req_access = list(10) + }, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "ekj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -42829,6 +42545,13 @@ }, /turf/simulated/floor/wood/fancy/light, /area/crew_quarters/courtroom) +"exf" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plating, +/area/engineering/engine) "exh" = ( /obj/machinery/door/airlock/maintenance{ req_access = list(47) @@ -43084,6 +42807,18 @@ }, /turf/simulated/floor/carpet, /area/maintenance/tourist) +"eAh" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/engineering/engine) "eAm" = ( /obj/machinery/camera/motion{ c_tag = "Minisat AI Core North"; @@ -44045,16 +43780,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"eLU" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "eMg" = ( /obj/machinery/door/airlock/glass{ name = "Cabin" @@ -44960,14 +44685,6 @@ }, /turf/simulated/floor/plasteel, /area/security/main) -"eWl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "eWs" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46265,6 +45982,13 @@ icon_state = "grimy" }, /area/hallway/secondary/entry/lounge) +"fme" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "fmw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -46845,16 +46569,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/office) -"fui" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/power/smes{ - charge = 2e+006 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "fuj" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -47090,6 +46804,18 @@ /obj/item/clothing/head/welding, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"fxD" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "fxR" = ( /obj/effect/decal/warning_stripes/red/hollow, /obj/structure/table/reinforced, @@ -47184,15 +46910,6 @@ icon_state = "red" }, /area/security/customs) -"fyJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/toxins/sm_test_chamber) "fzv" = ( /obj/structure/cable{ icon_state = "2-4" @@ -47924,24 +47641,6 @@ }, /turf/space, /area/turret_protected/ai) -"fId" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id_tag = "engstorage"; - name = "Secure Storage Blast Doors" - }, -/obj/effect/decal/warning_stripes/west, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "fIg" = ( /obj/machinery/light/small{ dir = 1 @@ -48007,6 +47706,18 @@ }, /turf/simulated/wall/r_wall, /area/tcommsat/chamber) +"fIM" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "fIS" = ( /obj/machinery/light/small{ dir = 8 @@ -48450,14 +48161,6 @@ icon_state = "neutralfull" }, /area/engineering/engine) -"fPD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/engine) "fPF" = ( /obj/structure/closet/secure_closet/security, /obj/effect/decal/warning_stripes/red/hollow, @@ -48517,13 +48220,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) -"fQv" = ( -/obj/effect/decal/warning_stripes/west, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "fQD" = ( /obj/structure/chair/comfy/red{ dir = 4 @@ -49391,6 +49087,14 @@ /obj/item/radio/beacon/engine/tesling, /turf/simulated/floor/plating/airless, /area/space) +"fZE" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/engine) "fZK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet/royalblack, @@ -49710,13 +49414,6 @@ icon_state = "wood-broken3" }, /area/maintenance/kitchen) -"geb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, -/area/engineering/engine) "geg" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -50279,20 +49976,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint3) -"gmI" = ( -/obj/machinery/camera{ - c_tag = "Engine Room South"; - dir = 1; - network = list("Engineering","SS13") - }, -/obj/effect/decal/warning_stripes/south, -/obj/structure/window/reinforced{ - dir = 8 - }, -/mob/living/simple_animal/possum/Poppy, -/obj/structure/bed/dogbed/pet, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "gmO" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -50446,21 +50129,6 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/maintenance/asmaint3) -"goI" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "goM" = ( /obj/structure/flora/grass/jungle, /turf/simulated/floor/grass, @@ -50807,6 +50475,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/asmaint4) +"gtz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "gtC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -51247,6 +50925,13 @@ icon_state = "grimy" }, /area/chapel/office) +"gzM" = ( +/obj/effect/decal/warning_stripes/northeastcorner, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "gzO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/window/reinforced{ @@ -51272,25 +50957,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/storage) -"gzX" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/west, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Singularity"; - name = "Singularity Blast Doors" - }, -/turf/simulated/floor/plating, -/area/engineering/engine) "gAB" = ( /obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, @@ -51550,14 +51216,6 @@ }, /turf/simulated/floor/plating, /area/toxins/xenobiology) -"gDQ" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "gDV" = ( /obj/machinery/alarm{ dir = 1; @@ -52968,6 +52626,20 @@ icon_state = "dark" }, /area/turret_protected/ai) +"gQU" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/sign/fire{ + pixel_x = 32 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "gQV" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -53552,6 +53224,24 @@ icon_state = "white" }, /area/medical/medbay) +"gYo" = ( +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "gYp" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -54012,6 +53702,13 @@ icon_state = "whitebluefull" }, /area/medical/reception) +"hfl" = ( +/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "hfp" = ( /obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable, @@ -54114,6 +53811,12 @@ }, /turf/simulated/floor/plating, /area/security/warden) +"hgP" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "hgQ" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -55581,6 +55284,15 @@ /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plating, /area/maintenance/disposal) +"hAy" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellow" + }, +/area/engineering/engine) "hAC" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ desc = "Труба содержит газ для обработки и после возвращает его обратно в трубу смешивания"; @@ -56224,6 +55936,21 @@ }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) +"hJr" = ( +/obj/machinery/power/terminal, +/obj/effect/decal/warning_stripes/south, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/engineering/controlroom) "hJA" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/carpet, @@ -56785,6 +56512,16 @@ }, /turf/simulated/floor/wood/fancy/light, /area/crew_quarters/courtroom) +"hPZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "hQg" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57591,6 +57328,13 @@ icon_state = "caution" }, /area/maintenance/asmaint4) +"iaH" = ( +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "ibj" = ( /obj/structure/cable{ icon_state = "0-8" @@ -59021,6 +58765,18 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/fpmaint) +"isc" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "iso" = ( /obj/structure/chair{ dir = 4 @@ -59557,6 +59313,15 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/courtroom) +"izn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/toxins/sm_test_chamber) "izC" = ( /obj/structure/rack{ dir = 8; @@ -61440,15 +61205,6 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plating, /area/maintenance/portsolar) -"iYh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/storage/secure) "iYl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61701,6 +61457,17 @@ icon_state = "purple" }, /area/quartermaster/miningdock) +"jbg" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "jby" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -61929,6 +61696,20 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"jeu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "jev" = ( /obj/structure/chair/comfy/red{ dir = 8 @@ -62104,22 +61885,6 @@ /obj/structure/grille, /turf/space, /area/space) -"jhc" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/machinery/r_n_d/circuit_imprinter{ - pixel_x = -1; - pixel_y = 3 - }, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Research Request Console"; - pixel_x = 30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/toxins/lab) "jhm" = ( /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -62526,6 +62291,26 @@ icon_state = "solarpanel" }, /area/solar/starboard) +"jmF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "purplefull" + }, +/area/medical/research/nhallway) "jmK" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -66064,21 +65849,6 @@ icon_state = "dark" }, /area/security/permabrig) -"kfr" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "engineering_west_airlock"; - name = "exterior access button"; - pixel_x = 20; - pixel_y = 20; - req_access = list(10,13) - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "kfS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -66715,6 +66485,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/starboard) +"knT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "knU" = ( /obj/machinery/door/window/brigdoor{ dir = 2; @@ -68121,20 +67898,6 @@ /obj/effect/spawner/lootdrop/maintenance/double, /turf/simulated/floor/plating, /area/maintenance/trading) -"kHo" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/light, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "kHz" = ( /obj/structure/cable{ icon_state = "4-8" @@ -68228,6 +67991,19 @@ icon_state = "bar" }, /area/clownoffice) +"kIL" = ( +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 26 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/research/nhallway) "kJi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -68376,6 +68152,13 @@ icon_state = "chapel" }, /area/chapel/main) +"kKE" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "kKR" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -68457,6 +68240,22 @@ }, /turf/simulated/floor/plasteel, /area/assembly/robotics) +"kMe" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/r_n_d/circuit_imprinter{ + pixel_x = -1; + pixel_y = 3 + }, +/obj/machinery/requests_console{ + department = "Research"; + departmentType = 2; + name = "Research Request Console"; + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/toxins/lab) "kMl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -69287,15 +69086,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/toxins/test_chamber) -"kZJ" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/north, -/obj/machinery/light, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "kZL" = ( /obj/structure/table/wood, /obj/machinery/status_display{ @@ -72543,6 +72333,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/arcade, /area/crew_quarters/fitness) +"lPI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id_tag = "engstorage"; + name = "Secure Storage Blast Doors" + }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "lPJ" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/camera{ @@ -72875,6 +72683,21 @@ icon_state = "dark" }, /area/security/permabrig) +"lUn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "lUL" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -73202,14 +73025,6 @@ icon_state = "dark" }, /area/security/warden) -"lYo" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "lYu" = ( /obj/effect/decal/warning_stripes/southeastcorner, /obj/machinery/light/small{ @@ -74039,6 +73854,15 @@ }, /turf/simulated/wall, /area/quartermaster/office) +"mjo" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "mjr" = ( /obj/structure/cable{ icon_state = "1-4" @@ -75108,6 +74932,22 @@ icon_state = "whitepurple" }, /area/toxins/test_chamber) +"mvm" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/applicator/burn, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_x = -2; + pixel_y = 25 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/genetics) "mvI" = ( /obj/machinery/door_timer/cell_1{ dir = 1; @@ -75242,6 +75082,26 @@ /obj/structure/lattice/catwalk, /turf/space, /area/solar/port) +"mxh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/hologram/holopad, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "mxr" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -76140,21 +76000,6 @@ icon_state = "whiteblue" }, /area/medical/medbay2) -"mGs" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "mGt" = ( /obj/structure/table/glass, /obj/item/storage/toolbox/surgery{ @@ -76343,6 +76188,15 @@ icon_state = "grimy" }, /area/maintenance/library) +"mJD" = ( +/obj/effect/landmark/start/trainee_engineer, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "mJH" = ( /obj/structure/cable{ icon_state = "1-8" @@ -78169,18 +78023,6 @@ icon_state = "seadeep" }, /area/crew_quarters/fitness) -"nfv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "nfN" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -78761,13 +78603,6 @@ icon_state = "purplecorner" }, /area/medical/virology/lab) -"nml" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating, -/area/engineering/engine) "nmp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -78794,6 +78629,14 @@ /obj/machinery/computer/security, /turf/simulated/floor/wood, /area/security/hos) +"nnh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/decal/warning_stripes/north, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/engineering/controlroom) "nnt" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -79427,24 +79270,6 @@ /obj/structure/falsewall, /turf/simulated/floor/plating, /area/maintenance/brig) -"nth" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/engineering/engine) "ntj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille, @@ -79900,13 +79725,6 @@ icon_state = "red" }, /area/security/prison/cell_block/A) -"nAz" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, -/area/engineering/engine) "nAA" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light{ @@ -80058,6 +79876,14 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/asmaint4) +"nCi" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor/preopen{ + id_tag = "Singularity"; + name = "Singularity Blast Doors" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "nCm" = ( /obj/machinery/firealarm{ dir = 8; @@ -80465,29 +80291,24 @@ icon_state = "neutralfull" }, /area/engineering/gravitygenerator) -"nGC" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"nGs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) -"nGG" = ( -/obj/machinery/vending/autodrobe, -/obj/machinery/camera{ - c_tag = "Mime Office"; - dir = 8 +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "tranquillite" + icon_state = "neutralfull" }, -/area/mimeoffice) +/area/storage/secure) "nGI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -80510,6 +80331,13 @@ icon_state = "white" }, /area/toxins/lab) +"nGT" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "nGY" = ( /obj/structure/particle_accelerator/particle_emitter/right{ dir = 8 @@ -83291,17 +83119,6 @@ icon_state = "neutralcorner" }, /area/bridge/vip) -"oqc" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "oqp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -83496,6 +83313,23 @@ }, /turf/simulated/floor/plating, /area/maintenance/disposal) +"osi" = ( +/obj/effect/decal/warning_stripes/southwestcorner, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/engine, +/area/toxins/sm_test_chamber) "osl" = ( /obj/machinery/recharge_station, /turf/simulated/floor/plasteel{ @@ -83823,6 +83657,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/asmaint4) +"owx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "owB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -83892,6 +83734,14 @@ icon_state = "wood-broken" }, /area/maintenance/asmaint4) +"oya" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "oyq" = ( /obj/structure/cable{ icon_state = "1-8" @@ -84316,19 +84166,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/fpmaint) -"oBM" = ( -/obj/machinery/camera{ - c_tag = "Research Central Hallway"; - network = list("Research","SS13") - }, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/research/nhallway) "oCc" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -84401,6 +84238,20 @@ icon_state = "dark" }, /area/crew_quarters/fitness) +"oDd" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/engine) "oDk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -84423,6 +84274,22 @@ }, /turf/simulated/floor/engine, /area/engineering/controlroom) +"oDt" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "oDx" = ( /obj/machinery/camera/motion{ c_tag = "Vault"; @@ -85052,6 +84919,13 @@ icon_state = "whiteblue" }, /area/medical/medbay2) +"oKO" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plating, +/area/engineering/engine) "oKQ" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ @@ -85300,6 +85174,21 @@ icon_state = "chapel" }, /area/chapel/main) +"oOf" = ( +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1379; + master_tag = "engineering_west_airlock"; + name = "exterior access button"; + pixel_x = 20; + pixel_y = 20; + req_access = list(10,13) + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "oOg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -85882,6 +85771,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/detectives_office) +"oVt" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engineering/engine) "oVx" = ( /obj/structure/table, /obj/item/storage/fancy/donut_box, @@ -85897,6 +85796,18 @@ icon_state = "red" }, /area/security/main) +"oVB" = ( +/obj/machinery/suit_storage_unit/blueshield, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Blueshield"; + departmentType = 5; + name = "Blueshield Requests Console"; + pixel_x = -30; + pixel_y = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/blueshield) "oVM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -85923,26 +85834,6 @@ icon_state = "neutralfull" }, /area/hallway/primary/central/nw) -"oWk" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research/nhallway) "oWp" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -86623,6 +86514,13 @@ /obj/item/chair/wood/wings, /turf/simulated/floor/carpet/black, /area/crew_quarters/theatre) +"pfb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/engineering/engine) "pfs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -87909,13 +87807,18 @@ /obj/effect/spawner/random_spawners/rodent, /turf/simulated/floor/plating, /area/maintenance/garden) -"ptE" = ( -/obj/effect/decal/warning_stripes/northeastcorner, +"ptU" = ( /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/space) "pua" = ( /obj/structure/cable{ icon_state = "4-8" @@ -90371,14 +90274,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/assembly/chargebay) -"pUS" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "pVa" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -90875,6 +90770,18 @@ }, /turf/simulated/floor/plasteel, /area/toxins/launch) +"pZY" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/engineering/controlroom) "qac" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating, @@ -91959,13 +91866,6 @@ icon_state = "darkred" }, /area/security/interrogation) -"qlZ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "qme" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -94016,15 +93916,6 @@ icon_state = "neutralfull" }, /area/storage/tech) -"qJy" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" - }, -/area/engineering/engine) "qJB" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -94126,6 +94017,14 @@ icon_state = "neutralcorner" }, /area/maintenance/asmaint4) +"qKJ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "qKK" = ( /obj/machinery/teleport/station, /obj/effect/decal/warning_stripes/south, @@ -94185,14 +94084,6 @@ }, /turf/simulated/floor/plating, /area/security/permahallway) -"qKZ" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "qLa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -95056,6 +94947,15 @@ }, /turf/simulated/floor/engine, /area/toxins/test_chamber) +"qVS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/controlroom) "qWg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -95846,14 +95746,6 @@ icon_state = "whitepurple" }, /area/toxins/xenobiology) -"rfz" = ( -/obj/effect/decal/warning_stripes/south, -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "rfA" = ( /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -96326,6 +96218,12 @@ color = "orange" }, /area/crew_quarters/courtroom) +"rlQ" = ( +/obj/effect/landmark/start/engineer, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/engine) "rma" = ( /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ @@ -97729,6 +97627,14 @@ }, /turf/space, /area/space) +"rDo" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/engineering/engine) "rDp" = ( /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel/airless, @@ -98828,6 +98734,20 @@ }, /turf/simulated/floor/plating, /area/engineering/engine) +"rQX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/engine) "rRf" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "engineering_east_airlock"; @@ -99150,16 +99070,6 @@ }, /turf/simulated/floor/plating, /area/security/prison/cell_block/A) -"rVk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 26 - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "rVt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -99952,6 +99862,25 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/maintenance/asmaint4) +"sgj" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = -28 + }, +/obj/machinery/requests_console{ + department = "Chemistry"; + departmentType = 2; + name = "Chemistry Requests Console"; + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whiteyellow" + }, +/area/medical/chemistry) "sgu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -100978,20 +100907,6 @@ icon_state = "dark" }, /area/security/prisonershuttle) -"srT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/engine) "srW" = ( /obj/structure/cable{ icon_state = "1-8" @@ -101145,22 +101060,6 @@ icon_state = "whitepurple" }, /area/toxins/explab) -"sui" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "sum" = ( /obj/structure/table/wood, /obj/item/pen/multi{ @@ -101403,6 +101302,19 @@ }, /turf/simulated/floor/wood/fancy/light, /area/crew_quarters/captain/bedroom) +"sxl" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plating, +/area/engineering/engine) "sxp" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -101953,6 +101865,16 @@ icon_state = "darkred" }, /area/security/execution) +"sDg" = ( +/obj/machinery/vending/autodrobe, +/obj/machinery/camera{ + c_tag = "Clown Office"; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/clownoffice) "sDo" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/northleft{ @@ -103078,6 +103000,21 @@ icon_state = "neutralfull" }, /area/bridge/checkpoint/south) +"sSy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "sSD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -105194,6 +105131,16 @@ /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/consarea_virology) +"ttD" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/smes{ + charge = 2e+006 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "ttY" = ( /obj/structure/table, /obj/item/stack/sheet/cloth/ten, @@ -105418,6 +105365,14 @@ icon_state = "whitehall" }, /area/maintenance/tourist) +"twj" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "two" = ( /obj/machinery/firealarm{ dir = 4; @@ -105823,6 +105778,20 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"tBz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "tBB" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -105968,6 +105937,20 @@ icon_state = "grimy" }, /area/chapel/main) +"tDk" = ( +/obj/machinery/camera{ + c_tag = "Engine Room South"; + dir = 1; + network = list("Engineering","SS13") + }, +/obj/effect/decal/warning_stripes/south, +/obj/structure/window/reinforced{ + dir = 8 + }, +/mob/living/simple_animal/possum/Poppy, +/obj/structure/bed/dogbed/pet, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "tDv" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/external{ @@ -106062,20 +106045,6 @@ icon_state = "white" }, /area/medical/research/shallway) -"tED" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/engine) "tEE" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -107901,6 +107870,19 @@ icon_state = "purple" }, /area/quartermaster/miningdock) +"tXL" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/engineering_guide{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/book/manual/engineering_particle_accelerator, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellow" + }, +/area/engineering/engine) "tXP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -108138,19 +108120,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/toxins/xenobiology) -"ual" = ( -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 26 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/research/nhallway) "uaF" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/warning_stripes/yellow, @@ -109230,6 +109199,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"unX" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plating, +/area/engineering/engine) "uob" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -110382,16 +110358,6 @@ "uCn" = ( /turf/simulated/wall, /area/maintenance/asmaint) -"uCs" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/northeast, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "uCv" = ( /obj/effect/decal/warning_stripes/red/hollow, /obj/machinery/suit_storage_unit/security, @@ -110919,21 +110885,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engineering/engine) -"uJj" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "engineering_east_airlock"; - name = "exterior access button"; - pixel_x = 20; - pixel_y = 20; - req_access = list(10,13) - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "uJo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -111052,6 +111003,19 @@ icon_state = "redcorner" }, /area/security/brig) +"uKB" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/clownoffice) "uKK" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -111477,6 +111441,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint4) +"uPO" = ( +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/engineering/engine) "uPT" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -112085,18 +112056,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/ne) -"uXS" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating, -/area/engineering/engine) "uXU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -112890,15 +112849,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"vhR" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/applicator/burn, -/obj/item/reagent_containers/glass/bottle/charcoal, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/genetics) "vhV" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southeast, @@ -114760,18 +114710,6 @@ icon_state = "neutralfull" }, /area/engineering/break_room) -"vCh" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "vCj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -115469,6 +115407,14 @@ icon_state = "whiteblue" }, /area/medical/medbay) +"vMn" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "vMS" = ( /obj/structure/chair/office{ dir = 4 @@ -115882,6 +115828,18 @@ }, /turf/space, /area/space) +"vRz" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "vSn" = ( /obj/structure/table/glass, /obj/item/defibrillator/loaded, @@ -116673,18 +116631,6 @@ }, /turf/simulated/floor/plating, /area/security/prisonershuttle) -"wav" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "waC" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -116876,19 +116822,6 @@ icon_state = "dark" }, /area/engineering/aienter) -"wcz" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/east, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "wcB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -117213,6 +117146,19 @@ "whO" = ( /turf/simulated/wall/r_wall/coated, /area/crew_quarters/hor) +"whQ" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/effect/decal/warning_stripes/east, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "wie" = ( /obj/machinery/camera{ c_tag = "Departure Lounge South-West"; @@ -118319,6 +118265,20 @@ icon_state = "neutralcorner" }, /area/crew_quarters/locker) +"wvh" = ( +/obj/structure/grille, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light, +/turf/simulated/floor/plating/airless, +/area/engineering/engine) "wvA" = ( /obj/item/radio/intercom{ pixel_y = -28 @@ -118768,6 +118728,16 @@ icon_state = "darkredcorners" }, /area/security/warden) +"wAW" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "wBo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -118941,6 +118911,19 @@ icon_state = "neutralfull" }, /area/crew_quarters/fitness) +"wDx" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "wDB" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/newscaster{ @@ -120481,14 +120464,6 @@ icon_state = "tranquillite" }, /area/maintenance/kitchen) -"wXm" = ( -/obj/machinery/door/window/eastleft{ - dir = 1; - req_access = list(10) - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "wXn" = ( /obj/item/storage/box/donkpockets, /turf/simulated/floor/plasteel{ @@ -120643,6 +120618,16 @@ icon_state = "dark" }, /area/security/permabrig) +"xaq" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/northeastcorner, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel, +/area/engineering/controlroom) "xas" = ( /obj/machinery/firealarm{ dir = 8; @@ -121055,6 +121040,11 @@ }, /turf/simulated/floor/plasteel, /area/toxins/storage) +"xeN" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "xeP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/coatrack, @@ -121213,6 +121203,14 @@ icon_state = "redcorner" }, /area/security/customs) +"xgj" = ( +/obj/effect/decal/warning_stripes/south, +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "xgm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -121239,6 +121237,15 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/security/detectives_office) +"xgv" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/computer/security/telescreen/singularity{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "xgy" = ( /obj/machinery/gateway{ dir = 1 @@ -121443,13 +121450,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/engineering) -"xiR" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/lattice/catwalk, -/turf/space, -/area/space) "xji" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/comfy/beige{ @@ -122013,14 +122013,6 @@ "xqu" = ( /turf/simulated/wall/r_wall, /area/security/range) -"xqC" = ( -/obj/structure/grille, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plating/airless, -/area/engineering/engine) "xqE" = ( /obj/vehicle/ridden/secway, /turf/simulated/floor/plasteel{ @@ -122333,6 +122325,21 @@ icon_state = "darkblue" }, /area/chapel/main) +"xul" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/storage/secure) "xun" = ( /obj/structure/table, /obj/item/paper_bin, @@ -122666,6 +122673,16 @@ icon_state = "darkblue" }, /area/construction/hallway) +"xwJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/engineering/engine) "xwL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, @@ -125714,13 +125731,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/engineering) -"ybT" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel, -/area/engineering/engine) "ybU" = ( /obj/structure/grille, /obj/effect/decal/warning_stripes/west, @@ -125965,6 +125975,17 @@ "ydS" = ( /turf/simulated/wall, /area/crew_quarters/courtroom) +"ydT" = ( +/obj/machinery/vending/autodrobe, +/obj/machinery/camera{ + c_tag = "Mime Office"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "tranquillite" + }, +/area/mimeoffice) "yek" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -144370,7 +144391,7 @@ xXS dON qta pnU -bGW +osi tIx vor cTi @@ -144602,19 +144623,19 @@ bXU cbb rLd aaq -xiR +kKE pnx pnx -dJh +fxD pnx pnx -goI +bJx pnx pnx -nGC +isc pnx pnx -qlZ +fme aaq hdZ cbb @@ -145112,7 +145133,7 @@ coE sPe coE bXU -oqc +jbg qCX lEd aaq @@ -145132,7 +145153,7 @@ efA aaq rfZ pyN -kZJ +mjo bXU wUr pIc @@ -145373,7 +145394,7 @@ bZl cbb lEd coE -wav +fIM dUE coE aaq @@ -145385,7 +145406,7 @@ aaq aaq coE cZc -nfv +ptU coE rfZ cbb @@ -145400,7 +145421,7 @@ cJK lFw uBx tgM -fyJ +izn qbq idK jYB @@ -145627,7 +145648,7 @@ wXY coB bXU keL -gDQ +oya lEd aaq efA @@ -145645,7 +145666,7 @@ dZb efA aaq rfZ -pUS +twj ufl bXU nlR @@ -146144,7 +146165,7 @@ bXU qvF cbb coE -wav +fIM dUE aaq coE @@ -146156,7 +146177,7 @@ acF coE aaq cZc -nfv +ptU coE cbb pBi @@ -146654,7 +146675,7 @@ dgF uSR dnN bXU -qKZ +vMn ffP lEd aaq @@ -146674,7 +146695,7 @@ efA aaq rfZ oak -xqC +ccU bXU ohF nBj @@ -146915,7 +146936,7 @@ bZl cbb lEd coE -wav +fIM dUE coE aaq @@ -146927,7 +146948,7 @@ aaq aaq coE cZc -nfv +ptU coE rfZ cbb @@ -147168,7 +147189,7 @@ sBX dkZ dog bXU -sui +oDt qCX lEd aaq @@ -147188,7 +147209,7 @@ efA aaq rfZ pyN -kHo +wvh bXU aKV pxR @@ -147683,7 +147704,7 @@ uWf dom bXU buf -kfr +oOf kAV aaq bep @@ -147692,7 +147713,7 @@ nsT nsT nsT nsT -ajG +aqk nsT nsT nsT @@ -147701,7 +147722,7 @@ tgT hHu aaq tgf -uJj +dwp gHc bXU dhw @@ -148204,11 +148225,11 @@ cwu cwu cwu cwu -dVW -nAz +exf +unX hWL eQV -nml +oKO cwu cwu cwu @@ -148715,7 +148736,7 @@ wgm bXU rQP mWV -gzX +dmd wNB gcj oON @@ -148725,7 +148746,7 @@ tKz jGo gcj mWV -gzX +dmd wNB rQP bXU @@ -148975,7 +148996,7 @@ tPh dDP jJc tXp -uXS +eAh nnT aIo oFs @@ -149229,14 +149250,14 @@ fPA bZn gHz wUB -nth +gYo pGB pvn -dXn +xwJ pEz dQz pEz -dUA +sxl pvn pGB ejp @@ -149430,13 +149451,13 @@ ccb bHp bdL caN -cvI -cam -cam +bSy +pZY +pZY cDO cfi cPq -cRT +xaq ctK cxV dnz @@ -149483,16 +149504,16 @@ dor bUg mPg cCp -dBp -dCv -eWl -lYo +xeN +tXL +qKJ +rDo dQD bXU dXo -dSy -dQA -dSy +uPO +oVt +uPO dUC bXU fFR @@ -149500,8 +149521,8 @@ tzM tzM tny uyI -fPD -rfz +fZE +xgj bXU hLD qUe @@ -149743,13 +149764,13 @@ eIu dUI dCy tzM -aqe +mJD dQD bXU bXU -dSz +nCi bXU -dSz +nCi bXU bXU dXr @@ -149758,7 +149779,7 @@ mQp eAb uyI eIu -wXm +eki gVN pgt qac @@ -149951,7 +149972,7 @@ tGE cga boL crk -ctV +qVS btC bVk cDV @@ -150000,13 +150021,13 @@ dza dUI dCz egF -qJy +hAy xNt dJD pei -dOM -dQQ -dSC +hfl +xgv +knT dUO dVY vUJ @@ -150015,7 +150036,7 @@ egF nQt uyI dza -gmI +tDk bXU hLD cbC @@ -150257,12 +150278,12 @@ eIu cbc tPh tPh -fQv +iaH tPh tPh tPh rzf -dQS +rlQ dSF tPh tPh @@ -150271,8 +150292,8 @@ tPh tPh tPh cPX -mGs -eLU +lUn +hPZ cCh dVy cbC @@ -150514,12 +150535,12 @@ ryM dXD nkf dXD -srT +oDd dXD nkf dXD qlu -dQT +mxh dSH dXD nkf @@ -150768,15 +150789,15 @@ cnj oQC xMX iFH -ybT +nGT cbj cbj -wcz +whQ cbj cbj -vCh -ptE -tED +vRz +gzM +rQX cpi tPv etT @@ -151031,9 +151052,9 @@ ehG xsj eeG vtm -fui -uCs -cmR +ttD +bKL +wDx cod cpl mDe @@ -151282,15 +151303,15 @@ bWn xnf xSn dzm -cdd -geb -dEs +wAW +pfb +hgP eci iTM utt cpm nqL -fId +lPI nqL cpm mDe @@ -151492,7 +151513,7 @@ aCi tGE cga aDe -cSa +nnh aHc aHo bVk @@ -151547,7 +151568,7 @@ iNf utt wQP rSt -cnB +jeu cof cpn mDe @@ -151804,7 +151825,7 @@ bXU utt wUC dWc -cpo +tBz cqU tZR mDe @@ -152010,7 +152031,7 @@ aFl cul aEn aHe -duO +hJr dzx aOg dLe @@ -152061,7 +152082,7 @@ cbn utt igP dOZ -dRd +sSy cpk csm mDe @@ -152318,7 +152339,7 @@ vWF utt wUC dOZ -dRd +sSy cso cso mDe @@ -152575,7 +152596,7 @@ cij dJU lTF xKq -cmO +nGs cso cpr mDe @@ -152832,7 +152853,7 @@ oZH utt uqq pus -dRe +xul rHz cqX mDe @@ -153089,7 +153110,7 @@ jem utt dNd qFn -dRw +owx dWc kpR mDe @@ -153346,7 +153367,7 @@ eir utt qFn teJ -dRw +owx dWc xvB mDe @@ -153603,7 +153624,7 @@ dkj utt gxS cna -iYh +cHj aAb tEE mDe @@ -153860,8 +153881,8 @@ onj utt jtS coh -cmV -rVk +gQU +gtz ufR mDe smf @@ -157482,9 +157503,9 @@ mAn ipb suf wAv -cOT +duH ddi -oBM +apg oUh dpZ isM @@ -157998,8 +158019,8 @@ cUT cQV aEh uHA -ual -oWk +kIL +jmF dgk iZG kxQ @@ -158937,7 +158958,7 @@ eTZ woa cbs cEJ -cHz +dvO gZH cwA dOY @@ -159194,7 +159215,7 @@ aVS fOa cgR cEJ -nGG +ydT cFQ baG dpg @@ -159708,7 +159729,7 @@ aVS dLf cei ckh -cml +sDg dbu cxA kIA @@ -159965,7 +159986,7 @@ eTZ woa cbs ckh -cnq +uKB bfY bVz gpo @@ -163137,7 +163158,7 @@ dxF hXm ohz cUZ -jhc +kMe pBD wEb daF @@ -165460,7 +165481,7 @@ vec ueo djS dfv -vhR +mvm vkl dvr drE @@ -166691,7 +166712,7 @@ lVo byU bCr pty -crr +oVB tOA iLo bHx @@ -168785,7 +168806,7 @@ dzf pfD cKR cMr -cXs +sgj jsJ dix gra diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index 568844c53bd..675ecd49b30 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -80,7 +80,8 @@ height = 30; id = "freegolem"; name = "Free Golem Ship"; - width = 20 + width = 20; + preferred_direction = 4 }, /turf/simulated/floor/pod/dark, /area/shuttle/freegolem) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm index 59a86c8b3df..8c6ae22ad20 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/whiteship.dmm @@ -1358,7 +1358,8 @@ id = "whiteship"; name = "NT Medical Ship"; rebuildable = 1; - width = 17 + width = 17; + preferred_direction = 4 }, /turf/simulated/floor/plating, /area/shuttle/abandoned) diff --git a/_maps/map_files/RandomZLevels/spacehotel.dmm b/_maps/map_files/RandomZLevels/spacehotel.dmm index 7cc03a0221f..d38b58e3c14 100644 --- a/_maps/map_files/RandomZLevels/spacehotel.dmm +++ b/_maps/map_files/RandomZLevels/spacehotel.dmm @@ -148,15 +148,6 @@ icon_state = "metal9" }, /area/awaymission/spacehotel/amazing_place) -"aO" = ( -/obj/effect/visual_portal{ - id = "cultroom"; - radius = 0; - distance = 0; - teleport = 0 - }, -/turf/template_noop, -/area/template_noop) "aP" = ( /obj/machinery/light{ dir = 8 @@ -2099,12 +2090,6 @@ "hJ" = ( /turf/simulated/wall/indestructible/invisible/view_portal, /area/awaymission/spacehotel/snowland) -"hK" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "hL" = ( /obj/machinery/light/built{ dir = 1 @@ -3183,9 +3168,6 @@ name = "engraved floor" }, /area/awaymission/spacehotel) -"lp" = ( -/turf/simulated/wall/indestructible/invisible/view_portal, -/area/shuttle/arrival/station) "lv" = ( /turf/simulated/wall/indestructible{ icon_state = "metal1" @@ -3194,12 +3176,6 @@ "ng" = ( /turf/simulated/floor/indestructible/carpet, /area/awaymission/spacehotel/amazing_place) -"ny" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "oJ" = ( /obj/machinery/light{ dir = 4 @@ -3230,49 +3206,22 @@ icon_state = "floor" }, /area/awaymission/spacehotel/amazing_place) -"tS" = ( -/obj/structure/closet/emcloset, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) -"vs" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "vO" = ( /turf/simulated/wall/indestructible{ icon_state = "metal7" }, /area/awaymission/spacehotel/amazing_place) -"wc" = ( -/obj/effect/visual_portal{ - dir = 1; - id = "test"; - frustrum = 1; - radius = 1; - distance = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "wz" = ( /obj/structure/bed, /obj/item/bedsheet/purple, /turf/simulated/floor/indestructible/carpet, /area/awaymission/spacehotel/amazing_place) -"wY" = ( -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "xl" = ( /obj/machinery/door/airlock/sandstone, /turf/simulated/floor/indestructible{ icon_state = "floor" }, /area/awaymission/spacehotel/amazing_place) -"ya" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "yE" = ( /turf/simulated/wall/indestructible/invisible/view_portal, /area/awaymission/spacehotel) @@ -3325,22 +3274,9 @@ icon_state = "metal6" }, /area/awaymission/spacehotel/amazing_place) -"Ed" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "EF" = ( /turf/simulated/floor/indestructible/view_portal, /area/awaymission) -"FN" = ( -/obj/effect/visual_portal{ - id = "test"; - radius = 1; - frustrum = 1; - distance = 4 - }, -/turf/simulated/floor/plasteel, -/area/shuttle/arrival/station) "Jk" = ( /obj/structure/bed, /obj/item/bedsheet/cult, @@ -3356,12 +3292,6 @@ }, /turf/simulated/floor/indestructible/carpet, /area/awaymission/spacehotel/amazing_place) -"Mx" = ( -/turf/simulated/wall, -/area/shuttle/arrival/station) -"MQ" = ( -/turf/simulated/floor/indestructible/view_portal, -/area/shuttle/arrival/station) "Nj" = ( /turf/simulated/wall/indestructible/invisible/view_portal, /area/awaymission) @@ -30152,22 +30082,22 @@ ah ah ah ah -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30282,22 +30212,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -hK -wY -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30412,22 +30342,22 @@ ah ah ah ah -Mx -vs -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -Ed -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30542,22 +30472,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -Mx -Mx -Mx -Mx -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30672,22 +30602,22 @@ ah ah ah ah -Mx -wY -tS -wY -wY -Mx -lp -lp -Mx -wY -wY -wY -ya -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30792,7 +30722,6 @@ ah ah ah ah -aO ah ah ah @@ -30802,22 +30731,23 @@ ah ah ah ah -Mx -wY -wY -wY -wY -Mx -lp -MQ -wc -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -30932,22 +30862,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -Mx -lp -lp -Mx -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31062,22 +30992,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -Mx -Mx -Mx -Mx -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31192,22 +31122,22 @@ ah ah ah ah -Mx -vs -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -Ed -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31322,22 +31252,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -ny -wY -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31452,22 +31382,22 @@ ah ah ah ah -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31582,22 +31512,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -wY -hK -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31712,22 +31642,22 @@ ah ah ah ah -Mx -vs -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -Ed -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31842,22 +31772,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -Mx -Mx -Mx -Mx -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -31972,22 +31902,22 @@ ah ah ah ah -Mx -wY -tS -wY -wY -wY -wY -Mx -lp -lp -Mx -wY -ya -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32102,22 +32032,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -FN -MQ -lp -Mx -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32232,22 +32162,22 @@ ah ah ah ah -Mx -wY -tS -wY -wY -wY -wY -Mx -lp -lp -Mx -wY -ya -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32362,22 +32292,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -Mx -Mx -Mx -Mx -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32492,22 +32422,22 @@ ah ah ah ah -Mx -vs -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -wY -Ed -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32622,22 +32552,22 @@ ah ah ah ah -Mx -wY -wY -wY -wY -wY -wY -wY -ny -wY -wY -wY -wY -wY -wY -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah @@ -32752,22 +32682,22 @@ ah ah ah ah -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx -Mx +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah ah ah ah diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm index f1e41c891cd..6beccf0f394 100644 --- a/_maps/map_files/RandomZLevels/wildwest.dmm +++ b/_maps/map_files/RandomZLevels/wildwest.dmm @@ -187,17 +187,6 @@ "aG" = ( /turf/simulated/mineral, /area/space/nearstation) -"aH" = ( -/obj/machinery/door/airlock/vault{ - locked = 1; - use_power = 0 - }, -/obj/machinery/door/airlock/vault{ - locked = 1; - use_power = 0 - }, -/turf/simulated/floor/engine/cult, -/area/awaymission/wwvault) "aK" = ( /obj/effect/mob_spawn/human/miner, /turf/simulated/floor/engine/cult, @@ -24237,7 +24226,7 @@ ac ac ab aF -aH +aF ab ab ab diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm index 1372e974525..93674e986d9 100644 --- a/_maps/map_files/celestation/celestation.dmm +++ b/_maps/map_files/celestation/celestation.dmm @@ -2201,6 +2201,21 @@ /obj/structure/barricade/wooden, /turf/simulated/floor/plating, /area/maintenance/cele/medbay) +"ath" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/conveyor{ + dir = 1; + id = "CargoTransfer" + }, +/obj/structure/disposaloutlet{ + dir = 1; + eject_range = 2 + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "atm" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -7410,16 +7425,6 @@ icon_state = "dark" }, /area/engineering/gravitygenerator) -"bfw" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/conveyor/inverted{ - dir = 5; - id = "garbage" - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "bfB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17785,15 +17790,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/hallway/secondary/exit) -"cps" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "red" - }, -/area/security/checkpoint/south) "cpt" = ( /obj/machinery/firealarm{ dir = 8; @@ -20196,6 +20192,15 @@ }, /turf/simulated/floor/plasteel/white, /area/toxins/xenobiology) +"cGM" = ( +/obj/machinery/requests_console{ + department = "Detective"; + name = "Detective Requests Console"; + pixel_y = -30 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/carpet, +/area/security/detectives_office) "cGY" = ( /obj/machinery/light_switch{ pixel_x = -26 @@ -23639,21 +23644,6 @@ "deL" = ( /turf/simulated/wall/r_wall, /area/toxins/test_area) -"dfl" = ( -/obj/machinery/requests_console{ - department = "Tool Storage"; - name = "Tool Storage Requests Console"; - pixel_y = 30 - }, -/obj/structure/table, -/obj/item/storage/toolbox/electrical, -/obj/item/multitool, -/obj/item/stack/cable_coil, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/storage/primary) "dfq" = ( /obj/structure/flora/ausbushes/genericbush, /obj/machinery/light{ @@ -29520,24 +29510,6 @@ icon_state = "neutralfull" }, /area/janitor) -"eln" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/sign/directions/floor/alt{ - dir = 6; - pixel_y = 32 - }, -/obj/structure/disposaloutlet{ - dir = 8; - eject_range = 2 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "elp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/orange{ @@ -33317,6 +33289,17 @@ /obj/structure/ladder, /turf/simulated/floor/glass/reinforced, /area/engineering/gravitygenerator) +"eZF" = ( +/obj/machinery/requests_console{ + department = "Locker Room"; + name = "Locker Room Requests Console"; + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/crew_quarters/locker) "eZH" = ( /turf/simulated/wall/r_wall, /area/teleporter/quantum/docking) @@ -40500,6 +40483,17 @@ icon_state = "navybluealt" }, /area/teleporter/quantum/docking) +"gpO" = ( +/obj/structure/closet/l3closet/janitor, +/obj/item/reagent_containers/spray/cleaner/janitor, +/obj/machinery/requests_console{ + department = "Janitorial"; + departmentType = 1; + name = "Janitor Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel, +/area/janitor) "gpR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -44299,30 +44293,6 @@ /obj/effect/spawner/lootdrop/maintenance/double, /turf/simulated/floor/plating/asteroid, /area/maintenance/asmaint5) -"hbq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/obj/structure/table/reinforced{ - layer = 2.5 - }, -/obj/machinery/door_control{ - desc = "A remote control-switch to lock down the prison wing's blast doors"; - id = "Prison Gate"; - name = "Prison Wing Lockdown"; - pixel_x = -7; - req_access = list(2) - }, -/obj/machinery/door_control{ - id = "Secure Gate"; - name = "Security Lockdown"; - pixel_x = 7; - req_access = list(2) - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" - }, -/area/security/warden) "hbt" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -45999,6 +45969,21 @@ }, /turf/simulated/floor/carpet/royalblack, /area/ntrep) +"hrJ" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellow" + }, +/area/engineering/engine/smes) "hrL" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -48297,6 +48282,21 @@ }, /turf/simulated/floor/plating/airless, /area/solar/auxstarboard) +"hPF" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "red" + }, +/area/security/checkpoint/south) "hPG" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -50470,17 +50470,6 @@ icon_state = "dark" }, /area/medical/research) -"ini" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor/inverted{ - dir = 10; - id = "garbage" - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "ink" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -51894,12 +51883,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/toxins/server) -"iAb" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/crew_quarters/locker) "iAe" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -52291,14 +52274,6 @@ }, /turf/simulated/floor/plating, /area/security/prisonlockers) -"iEd" = ( -/obj/structure/sign/beautyplaque{ - pixel_y = 32; - name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Селестии"; - desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование Селестии по всем стандартам НаноТрейзен. Благодарим вас за труд, Saad_f603. Слава НаноТрейзен!" - }, -/turf/simulated/floor/carpet/black, -/area/bridge) "iEf" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -53222,19 +53197,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/crew_quarters/bar) -"iNt" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = -30 - }, -/obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" - }, -/area/toxins/lab) "iNx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -55183,21 +55145,6 @@ icon_state = "navyblue" }, /area/turret_protected/aisat_interior/secondary) -"jfp" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/conveyor{ - dir = 1; - id = "CargoTransfer" - }, -/obj/structure/disposaloutlet{ - dir = 1; - eject_range = 2 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "jfE" = ( /obj/structure/bed, /obj/item/bedsheet, @@ -59273,6 +59220,19 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/aisat/atmospherics) +"jWE" = ( +/obj/machinery/requests_console{ + department = "Research"; + departmentType = 2; + name = "Research Requests Console"; + pixel_x = -30 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple" + }, +/area/toxins/lab) "jWF" = ( /obj/structure/railing/corner{ dir = 4 @@ -59313,6 +59273,24 @@ icon_state = "whiteyellowfull" }, /area/medical/chemistry) +"jWV" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/sign/directions/floor/alt{ + dir = 6; + pixel_y = 32 + }, +/obj/structure/disposaloutlet{ + dir = 8; + eject_range = 2 + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "jWW" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -62071,6 +62049,23 @@ icon_state = "darkred" }, /area/security/podbay) +"kxt" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/light_switch{ + pixel_x = 26 + }, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel, +/area/toxins/launch) "kxC" = ( /obj/structure/chair/comfy{ dir = 8 @@ -62507,6 +62502,22 @@ icon_state = "grimy" }, /area/security/detectives_office) +"kCl" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/effect/landmark/start/atmospheric, +/obj/machinery/requests_console{ + department = "Atmospherics"; + departmentType = 3; + name = "Atmospherics Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "caution" + }, +/area/atmos/control) "kCm" = ( /obj/structure/railing{ dir = 4 @@ -62890,16 +62901,6 @@ icon_state = "neutralfull" }, /area/atmos/distribution) -"kEQ" = ( -/obj/machinery/light_switch{ - pixel_y = 26 - }, -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/mint, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/crew_quarters/kitchen) "kEV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -63046,6 +63047,16 @@ icon_state = "darkred" }, /area/security/warden) +"kGA" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/conveyor/inverted{ + dir = 5; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "kGH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65521,17 +65532,6 @@ }, /turf/simulated/floor/carpet/blue, /area/blueshield) -"lgC" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light_switch{ - pixel_x = 26 - }, -/turf/simulated/floor/plasteel, -/area/toxins/launch) "lgJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -69704,21 +69704,6 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/grass, /area/hallway/primary/fore) -"lYL" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/applicator/burn, -/obj/item/reagent_containers/glass/bottle/charcoal, -/obj/machinery/requests_console{ - department = "Medbay"; - departmentType = 1; - name = "Genetics Requests Console"; - pixel_y = 30 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/genetics) "lYT" = ( /obj/structure/table, /obj/item/reagent_containers/food/snacks/fried_vox, @@ -70695,18 +70680,6 @@ icon_state = "dark" }, /area/engineering/engine/smes) -"miy" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/machinery/atmospherics/pipe/multiz{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/chapel/office) "miQ" = ( /obj/machinery/camera/motion{ c_tag = "Minisat Teleporter Room"; @@ -71256,15 +71229,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/crew_quarters/captain/bedroom) -"mor" = ( -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellow" - }, -/area/engineering/engine/smes) "moz" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -82676,13 +82640,6 @@ /obj/structure/transit_tube/crossing, /turf/space/openspace, /area/space) -"oDP" = ( -/obj/structure/closet/secure_closet/security, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkred" - }, -/area/security/checkpoint) "oDQ" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -89612,6 +89569,19 @@ }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) +"pPm" = ( +/obj/structure/closet/secure_closet/security, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/security/checkpoint) "pPn" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -96208,6 +96178,21 @@ /obj/effect/spawner/random_spawners/rock_50, /turf/simulated/floor/plating/asteroid, /area/maintenance/port) +"rhu" = ( +/obj/machinery/requests_console{ + department = "Primary Tool Storage"; + name = "Primary Tool Storage Requests Console"; + pixel_y = 30 + }, +/obj/structure/table, +/obj/item/storage/toolbox/electrical, +/obj/item/multitool, +/obj/item/stack/cable_coil, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/storage/primary) "rhy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -96442,6 +96427,24 @@ icon_state = "darkyellow" }, /area/atmos) +"rjn" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/machinery/atmospherics/pipe/multiz{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/carpet/black, +/area/chapel/office) "rjo" = ( /turf/simulated/wall/r_wall, /area/maintenance/ai) @@ -106754,6 +106757,22 @@ /obj/effect/spawner/random_spawners/grille_50, /turf/simulated/floor/plating, /area/maintenance/cele/medbay) +"tiS" = ( +/obj/machinery/light_switch{ + pixel_y = 26 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/mint, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + name = "Kitchen Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/crew_quarters/kitchen) "tiY" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange{ @@ -108277,6 +108296,17 @@ icon_state = "whiteblue" }, /area/medical/patients_rooms) +"txd" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor/inverted{ + dir = 10; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "txf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -117356,6 +117386,14 @@ }, /turf/simulated/floor/engine, /area/toxins/xenobiology) +"viZ" = ( +/obj/structure/sign/beautyplaque{ + desc = "Важное Уточнение! Рабочие пожелали оставаться анонимными, поэтому, обойдёмся их прозвищами. За выдающиеся успехи в области инженерного менеджмента, а также успешное проектирование Селестии по всем стандартам НаноТрейзен. Благодарим вас за труд, Saad_f603. Слава НаноТрейзен!"; + name = "Благодарственное Письмо Для Бригадира Команды Архитекторов Селестии"; + pixel_y = 32 + }, +/turf/simulated/floor/carpet/black, +/area/bridge) "vje" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -118778,14 +118816,6 @@ icon_state = "dark" }, /area/hallway/primary/fore) -"vyB" = ( -/obj/machinery/requests_console{ - name = "Detective Requests Console"; - pixel_y = -30 - }, -/obj/machinery/photocopier, -/turf/simulated/floor/carpet, -/area/security/detectives_office) "vyQ" = ( /obj/structure/table, /obj/item/multitool, @@ -119096,6 +119126,21 @@ icon_state = "whitepurple" }, /area/toxins/hallway) +"vBG" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/applicator/burn, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/genetics) "vBM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -129305,16 +129350,6 @@ icon_state = "neutral" }, /area/hallway/primary/fore/east) -"xye" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/obj/effect/landmark/start/atmospheric, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "caution" - }, -/area/atmos/control) "xyf" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -130124,6 +130159,36 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) +"xFO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/machinery/door_control{ + desc = "A remote control-switch to lock down the prison wing's blast doors"; + id = "Prison Gate"; + name = "Prison Wing Lockdown"; + pixel_x = -7; + req_access = list(2) + }, +/obj/machinery/door_control{ + id = "Secure Gate"; + name = "Security Lockdown"; + pixel_x = 7; + req_access = list(2) + }, +/obj/machinery/requests_console{ + department = "Warden"; + departmentType = 7; + name = "Warden's Requests Console"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/security/warden) "xFQ" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -207544,7 +207609,7 @@ olV wha bbD dsd -dfl +rhu gBF jBm baI @@ -207574,7 +207639,7 @@ hQg hna ljI vzB -miy +rjn kTD hHU nor @@ -212243,7 +212308,7 @@ ryZ ryZ wQW wQW -lgC +kxt pEF wLz nWt @@ -213879,7 +213944,7 @@ gSu gcz jns fwp -hbq +xFO rMr pKM mVc @@ -213979,7 +214044,7 @@ ska pkj ska frt -kEQ +tiS ceP vfW chR @@ -216095,7 +216160,7 @@ eOu bwu aBP sxu -iNt +jWE kpW uZc cpy @@ -217249,7 +217314,7 @@ peG gme jEc mNY -vyB +cGM eyQ orm orm @@ -231217,7 +231282,7 @@ cOP nfw cOP bgc -xye +kCl fdb vyQ hYj @@ -235595,7 +235660,7 @@ tjl xYY jBR naw -mor +hrJ wBv klO jfm @@ -237519,7 +237584,7 @@ wVh bjT wFn eQF -iEd +viZ bNj qee cVq @@ -243071,7 +243136,7 @@ dXS ktv rdQ jVG -oDP +pPm qUD gAP gQP @@ -253292,7 +253357,7 @@ lQa gCe hQU mDJ -lYL +vBG wiV laG cPh @@ -255137,7 +255202,7 @@ hod dFU qIy xNH -cps +hPF hod sfL pbn @@ -273334,7 +273399,7 @@ oXc pNI fIm prd -iAb +eZF nuI fGN snX @@ -275635,7 +275700,7 @@ oqZ aeM aeM wMM -kLd +gpO tTe jHd duy @@ -314871,7 +314936,7 @@ orm idQ wNk nuW -jfp +ath cQw spN rlk @@ -316668,7 +316733,7 @@ orm ukB vgw gyR -ini +txd jmP pNB kUl @@ -316925,7 +316990,7 @@ orm cNk cNk cNk -bfw +kGA xlt pQi vhk @@ -317439,7 +317504,7 @@ orm orm orm idQ -eln +jWV iys oPx eUM diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 9e55a1207db..dd37d32655f 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -20248,6 +20248,12 @@ /obj/machinery/computer/guestpass{ pixel_y = -28 }, +/obj/machinery/requests_console{ + department = "Warden"; + departmentType = 7; + name = "Warden's Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkred" @@ -25453,6 +25459,12 @@ dir = 1; network = list("Medical","SS13") }, +/obj/machinery/requests_console{ + department = "Virology"; + departmentType = 3; + name = "Virology Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -30446,8 +30458,8 @@ /area/maintenance/port) "eLR" = ( /obj/machinery/requests_console{ - department = "Tool Storage"; - name = "Tool Storage Requests Console"; + department = "Primary Tool Storage"; + name = "Primary Tool Storage Requests Console"; pixel_y = 30 }, /obj/structure/disposalpipe/segment{ @@ -62776,6 +62788,12 @@ /area/security/detectives_office) "obz" = ( /obj/machinery/cooker/deepfryer, +/obj/machinery/requests_console{ + department = "Kitchen"; + departmentType = 2; + name = "Kitchen Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -62825,6 +62843,12 @@ dir = 5 }, /obj/item/twohanded/required/kirbyplants, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/carpet/black, /area/chapel/office) "ocC" = ( @@ -64585,6 +64609,12 @@ /area/maintenance/atmospherics) "oDP" = ( /obj/structure/closet/secure_closet/security, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -64833,7 +64863,7 @@ /area/crew_quarters/bar) "oHw" = ( /obj/machinery/requests_console{ - department = "Medbay"; + department = "Genetics"; departmentType = 1; name = "Genetics Requests Console"; pixel_y = 30 @@ -78330,9 +78360,9 @@ /area/medical/cmo) "sxu" = ( /obj/machinery/requests_console{ - department = "Science"; + department = "Research"; departmentType = 2; - name = "Science Requests Console"; + name = "Research Requests Console"; pixel_x = -30 }, /obj/machinery/r_n_d/destructive_analyzer, @@ -82324,6 +82354,12 @@ /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, /obj/item/clothing/glasses/welding, +/obj/machinery/requests_console{ + department = "Engineering"; + departmentType = 3; + name = "Engineering Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -84394,6 +84430,11 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "umA" = ( +/obj/machinery/requests_console{ + department = "Locker Room"; + name = "Locker Room Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -88231,6 +88272,7 @@ /area/hallway/primary/port/north) "vyB" = ( /obj/machinery/requests_console{ + department = "Detective"; name = "Detective Requests Console"; pixel_y = -30 }, @@ -96782,6 +96824,12 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/requests_console{ + department = "Science"; + departmentType = 2; + name = "Science Requests Console"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel, /area/toxins/launch) "xTW" = ( diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 85289102a09..9342f86ef13 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -14424,26 +14424,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"aVg" = ( -/obj/structure/table, -/obj/machinery/camera{ - c_tag = "Primary Tool Storage" - }, -/obj/machinery/requests_console{ - department = "Tool Storage"; - name = "Tool Storage Requests Console"; - pixel_y = 30 - }, -/obj/item/assembly/igniter{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/assembly/igniter, -/obj/item/screwdriver{ - pixel_y = 16 - }, -/turf/simulated/floor/plasteel, -/area/storage/primary) "aVh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24290,28 +24270,6 @@ /obj/item/storage/fancy/donut_box, /turf/simulated/floor/carpet, /area/crew_quarters/captain) -"byT" = ( -/obj/structure/table/wood, -/obj/item/storage/photo_album{ - pixel_y = -10 - }, -/obj/item/camera_film, -/obj/item/camera_film, -/obj/item/camera{ - desc = "A one use - polaroid camera. 30 photos left."; - name = "detectives camera"; - pictures_left = 30 - }, -/obj/machinery/requests_console{ - name = "Detective Requests Console"; - pixel_y = -30 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/storage/box/tapes, -/turf/simulated/floor/wood, -/area/security/detectives_office) "byU" = ( /turf/simulated/floor/carpet, /area/library) @@ -32651,16 +32609,6 @@ icon_state = "whitepurple" }, /area/medical/genetics) -"bZz" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start/geneticist, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" - }, -/area/medical/genetics) "bZA" = ( /obj/structure/table/glass, /obj/item/storage/box/disks, @@ -44024,15 +43972,6 @@ /obj/structure/grille/broken, /turf/simulated/floor/plating, /area/maintenance/asmaint) -"cIa" = ( -/obj/structure/table/wood, -/obj/item/pen, -/obj/item/reagent_containers/food/drinks/bottle/holywater, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/chapel/office) "cIb" = ( /obj/item/radio/intercom{ name = "north station intercom (General)"; @@ -45586,24 +45525,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/engine, /area/toxins/xenobiology) -"cMl" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_y = 30 - }, -/obj/machinery/camera{ - c_tag = "Xenobiology Module North"; - network = list("Research","SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/xenobiology) "cMm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53170,6 +53091,17 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"dic" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/status_display/supply_display{ + pixel_y = -32 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "did" = ( /obj/machinery/camera{ c_tag = "Bridge East" @@ -65778,14 +65710,6 @@ /obj/machinery/vending/assist, /turf/simulated/floor/plating, /area/storage/tech) -"jRJ" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteyellow" - }, -/area/medical/chemistry) "jRL" = ( /obj/effect/spawner/random_spawners/grille_13, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -69830,6 +69754,40 @@ icon_state = "vault" }, /area/toxins/misc_lab) +"myk" = ( +/obj/structure/table, +/obj/machinery/camera{ + c_tag = "Primary Tool Storage" + }, +/obj/machinery/requests_console{ + department = "Primary Tool Storage"; + name = "Primary Tool Storage Requests Console"; + pixel_y = 30 + }, +/obj/item/assembly/igniter{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/assembly/igniter, +/obj/item/screwdriver{ + pixel_y = 16 + }, +/turf/simulated/floor/plasteel, +/area/storage/primary) +"myy" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/obj/machinery/requests_console{ + department = "Chemistry"; + departmentType = 2; + name = "Chemistry Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whiteyellow" + }, +/area/medical/chemistry) "mzq" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -70315,6 +70273,17 @@ /obj/structure/transit_tube/horizontal, /turf/simulated/floor/plating, /area/maintenance/atmospherics) +"mOu" = ( +/obj/machinery/door/poddoor{ + id_tag = "QMLoaddoor"; + name = "supply dock loading door" + }, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "mOw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -70690,17 +70659,6 @@ icon_state = "white" }, /area/assembly/robotics) -"nfM" = ( -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Science Requests Console"; - pixel_x = -30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) "nfX" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -72242,6 +72200,21 @@ icon_state = "blue" }, /area/medical/cmostore) +"omn" = ( +/obj/structure/table/wood, +/obj/item/pen, +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/requests_console{ + department = "Chapel"; + departmentType = 2; + name = "Chapel Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/carpet/black, +/area/chapel/office) "omV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/scientist, @@ -74457,6 +74430,29 @@ icon_state = "whitebluefull" }, /area/medical/reception) +"pHL" = ( +/obj/structure/table/wood, +/obj/item/storage/photo_album{ + pixel_y = -10 + }, +/obj/item/camera_film, +/obj/item/camera_film, +/obj/item/camera{ + desc = "A one use - polaroid camera. 30 photos left."; + name = "detectives camera"; + pictures_left = 30 + }, +/obj/machinery/requests_console{ + department = "Detective"; + name = "Detective Requests Console"; + pixel_y = -30 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/storage/box/tapes, +/turf/simulated/floor/wood, +/area/security/detectives_office) "pIm" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/southwest, @@ -79226,6 +79222,14 @@ icon_state = "dark" }, /area/toxins/mixing) +"sJo" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "sJv" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -79331,6 +79335,24 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/r_wall, /area/maintenance/xenozoo) +"sMs" = ( +/obj/machinery/camera{ + c_tag = "Xenobiology Module North"; + network = list("Research","SS13") + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/requests_console{ + department = "Xenobiology"; + departmentType = 2; + name = "Xenobiology Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/xenobiology) "sMY" = ( /obj/structure/extinguisher_cabinet{ name = "east extinguisher cabinet"; @@ -81331,6 +81353,15 @@ icon_state = "white" }, /area/medical/chemistry) +"uck" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/light, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "ucp" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -84084,6 +84115,17 @@ }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) +"vWf" = ( +/obj/machinery/requests_console{ + department = "Research"; + departmentType = 2; + name = "Research Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) "vWk" = ( /obj/effect/decal/warning_stripes/west, /obj/structure/cable{ @@ -85367,6 +85409,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/toxins/storage) +"wGQ" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/landmark/start/geneticist, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitepurple" + }, +/area/medical/genetics) "wHa" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Airlock" @@ -87423,31 +87481,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/fsmaint2) -"xTp" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "xTI" = ( /obj/structure/rack, /obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/port) -"xTK" = ( -/obj/machinery/door/poddoor{ - id_tag = "QMLoaddoor"; - name = "supply dock loading door" - }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "xTV" = ( /obj/structure/extinguisher_cabinet{ name = "north extinguisher cabinet"; @@ -87459,17 +87498,6 @@ }, /turf/simulated/floor/plasteel, /area/engineering/controlroom) -"xTY" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/status_display/supply_display{ - pixel_y = -32 - }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "xVm" = ( /obj/machinery/newscaster{ name = "north newscaster"; @@ -87593,15 +87621,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) -"xYm" = ( -/obj/effect/decal/warning_stripes/north, -/obj/machinery/light, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad2" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "xZm" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ @@ -104540,7 +104559,7 @@ tst uXX syu uXX -xTp +sJo syu uTI uTI @@ -104797,7 +104816,7 @@ tsS uZo rmn uZo -xTK +mOu rmn uTI uTI @@ -105020,7 +105039,7 @@ aMA aMA aSa bdd -aVg +myk aWl aXQ aXQ @@ -105054,7 +105073,7 @@ tst uXX rmn uXX -xTp +sJo rmn uTI uTI @@ -105311,7 +105330,7 @@ nMQ vaY whv vaY -xTY +dic bxb uTI uTI @@ -105568,7 +105587,7 @@ nMQ bKz dSG bWL -xYm +uck bxb uTI uTI @@ -117343,7 +117362,7 @@ boN aEi aFw bxc -byT +pHL axe aKy aMj @@ -124574,7 +124593,7 @@ uwX rgv uwX bOD -jRJ +myy bJP bJP bGt @@ -128701,7 +128720,7 @@ bZY ccc bWE bWE -bZz +wGQ cjF gab vvD @@ -132579,7 +132598,7 @@ qus qus bIi bIi -cMl +sMs cWi cEH cPm @@ -133292,7 +133311,7 @@ baz xDP ndQ baz -cIa +omn cKT bel bfW @@ -133828,7 +133847,7 @@ bwv tGd kBi bGF -nfM +vWf bNk bPd bRP diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm index 1135d1e919e..23a34ab390d 100644 --- a/_maps/map_files/event/Station/delta_old.dmm +++ b/_maps/map_files/event/Station/delta_old.dmm @@ -3392,18 +3392,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/fore) -"aGE" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/delivery) "aGF" = ( /obj/machinery/camera{ c_tag = "Arrivals Shuttle South West"; @@ -4061,13 +4049,6 @@ "aKD" = ( /turf/simulated/floor/plating, /area/maintenance/casino) -"aKF" = ( -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "aKK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4130,6 +4111,31 @@ }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) +"aKW" = ( +/obj/machinery/autolathe, +/obj/machinery/door/window/brigdoor{ + dir = 1; + id = "Autolathe"; + name = "Autolathe Access"; + req_access = list(47) + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/door/firedoor, +/obj/item/stack/sheet/metal{ + amount = 10 + }, +/obj/item/stack/sheet/glass{ + amount = 10 + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id_tag = "researchdesk1"; + name = "Research Desk Shutters" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) "aKY" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Turbine Generator Access"; @@ -4703,6 +4709,17 @@ icon_state = "brown" }, /area/crew_quarters/chief) +"aOC" = ( +/obj/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "aOF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5247,20 +5264,6 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) -"aSl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "aSy" = ( /turf/simulated/wall/r_wall, /area/maintenance/turbine) @@ -6807,17 +6810,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"bcz" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) "bcA" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/vacuum, @@ -9076,18 +9068,6 @@ }, /turf/simulated/floor/plasteel, /area/atmos) -"brF" = ( -/obj/structure/plasticflaps/mining, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "brG" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Mechanic Workshop"; @@ -9372,13 +9352,6 @@ icon_state = "brown" }, /area/quartermaster/storage) -"bta" = ( -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 9 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "btd" = ( /turf/simulated/wall/r_wall, /area/turret_protected/ai) @@ -11549,17 +11522,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/disposal) -"bCh" = ( -/obj/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "bCj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11890,6 +11852,14 @@ icon_state = "vault" }, /area/storage/tech) +"bDE" = ( +/obj/machinery/recycler, +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "bDG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -12110,6 +12080,13 @@ }, /turf/space, /area/space) +"bEE" = ( +/obj/effect/decal/warning_stripes/southeastcorner, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "bEG" = ( /obj/effect/decal/warning_stripes/south, /obj/structure/disposalpipe/segment, @@ -13186,30 +13163,12 @@ icon_state = "dark" }, /area/bridge/meeting_room) -"bKF" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "bKH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai_upload) -"bKK" = ( -/obj/machinery/recycler, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "bKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14007,20 +13966,6 @@ /obj/machinery/ai_status_display, /turf/simulated/wall, /area/hallway/secondary/entry/lounge) -"bOT" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/bed/dogbed, -/mob/living/simple_animal/pet/sloth/paperwork, -/obj/machinery/computer/guestpass{ - pixel_x = 30 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "brown" - }, -/area/quartermaster/qm) "bOU" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -17359,25 +17304,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/maintcentral) -"cdQ" = ( -/obj/effect/decal/warning_stripes/east, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"cdR" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/conveyor/inverted{ - id = "QMLoad2"; - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "cdS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18904,14 +18830,6 @@ /obj/structure/chair/comfy/brown, /turf/simulated/floor/carpet/black, /area/bridge/vip) -"clQ" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "clT" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -19415,20 +19333,6 @@ icon_state = "arrival" }, /area/hallway/secondary/entry/commercial) -"cod" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) -"cof" = ( -/obj/effect/decal/warning_stripes/southeast, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "coh" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -19650,22 +19554,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine) -"cpi" = ( -/obj/effect/decal/warning_stripes/southeastcorner, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/engineering/engine) -"cpk" = ( -/obj/machinery/power/tesla_coil, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "cpl" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -19943,14 +19831,6 @@ icon_state = "purplefull" }, /area/janitor) -"cqU" = ( -/obj/machinery/pipedispenser/disposal, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "cqW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -19976,40 +19856,6 @@ }, /turf/simulated/wall, /area/janitor) -"cqZ" = ( -/obj/structure/plasticflaps, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) -"cra" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) -"crg" = ( -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) -"crh" = ( -/obj/machinery/camera{ - c_tag = "Cargo Backroom" - }, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) "crj" = ( /obj/machinery/atmospherics/trinary/tvalve/digital{ dir = 8 @@ -20181,17 +20027,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/storage/secure) -"csn" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) "cso" = ( /obj/machinery/power/emitter, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -20253,17 +20088,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/serviceyard) -"csv" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) "csz" = ( /obj/structure/table/wood, /obj/item/radio/intercom{ @@ -23752,15 +23576,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/serviceyard) -"cGl" = ( -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "cGm" = ( /obj/effect/landmark/marauder_entry, /turf/simulated/floor/plasteel{ @@ -25169,22 +24984,6 @@ icon_state = "whiteyellow" }, /area/medical/chemistry) -"cMr" = ( -/obj/structure/table/glass, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteyellow" - }, -/area/medical/chemistry) "cMs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26309,31 +26108,6 @@ tag = "icon-whitepurple (NORTHWEST)" }, /area/medical/genetics) -"cRb" = ( -/obj/machinery/autolathe, -/obj/machinery/door/window/brigdoor{ - dir = 1; - id = "Autolathe"; - name = "Autolathe Access"; - req_access = list(47) - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/door/firedoor, -/obj/item/stack/sheet/metal{ - amount = 10 - }, -/obj/item/stack/sheet/glass{ - amount = 10 - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) "cRe" = ( /obj/structure/chair{ dir = 4 @@ -26536,6 +26310,22 @@ }, /turf/simulated/floor/plasteel, /area/engineering/controlroom) +"cRL" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/applicator/burn, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_x = -2; + pixel_y = 25 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/medical/genetics) "cRT" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -27111,6 +26901,13 @@ tag = "icon-whiteblue (SOUTHWEST)" }, /area/medical/biostorage) +"cUm" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "cUn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -27339,22 +27136,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"cVs" = ( -/obj/machinery/camera{ - c_tag = "Research and Development"; - dir = 9; - network = list("Research","SS13") - }, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Research Request Console"; - pixel_x = 30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/toxins/lab) "cVy" = ( /obj/structure/chair/comfy/teal, /turf/simulated/floor/plasteel{ @@ -28946,19 +28727,6 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/grass, /area/medical/sleeper) -"dcq" = ( -/obj/structure/plasticflaps, -/obj/structure/closet/crate/internals, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/sorting) "dcs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30962,13 +30730,6 @@ icon_state = "white" }, /area/medical/research) -"dko" = ( -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 5 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "dkp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -33757,6 +33518,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"dvH" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "dvJ" = ( /obj/structure/closet/secure_closet/medical2, /obj/structure/cable{ @@ -35918,14 +35686,6 @@ icon_state = "whitepurplecorner" }, /area/medical/research/restroom) -"dFo" = ( -/obj/machinery/power/emitter, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "dFp" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -37675,14 +37435,6 @@ /obj/structure/chair/stool, /turf/simulated/floor/plating, /area/engineering/engine) -"dMs" = ( -/obj/structure/plasticflaps, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/delivery) "dMu" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -39182,22 +38934,6 @@ }, /turf/simulated/floor/plasteel, /area/engineering/engine) -"dSH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engineering/engine) "dSI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -41776,14 +41512,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/starboard/east) -"egs" = ( -/obj/machinery/light, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/sorting) "egu" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -41877,6 +41605,13 @@ icon_state = "whitegreencorner" }, /area/medical/virology) +"ehy" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/engineering/engine) "ehA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42450,17 +42185,6 @@ /obj/item/toy/figure/detective, /turf/simulated/floor/wood, /area/security/detectives_office) -"eqQ" = ( -/obj/machinery/door/poddoor{ - id_tag = "QMLoaddoor2"; - name = "supply dock loading door" - }, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) "eqY" = ( /obj/machinery/photocopier, /turf/simulated/floor/plasteel{ @@ -42512,6 +42236,20 @@ /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/wood, /area/maintenance/library) +"erM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/conveyor{ + dir = 9; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "erO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42829,16 +42567,12 @@ icon_state = "neutralfull" }, /area/crew_quarters/locker) -"ewf" = ( +"ewr" = ( +/obj/machinery/power/tesla_coil, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 + icon_state = "4-8" }, /turf/simulated/floor/plasteel, /area/storage/secure) @@ -43017,6 +42751,16 @@ tag = "icon-whiteblue (NORTH)" }, /area/medical/sleeper) +"eyz" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "eyI" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -45224,6 +44968,14 @@ icon_state = "grimy" }, /area/crew_quarters/heads/hop) +"fbZ" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/delivery) "fcN" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -45231,6 +44983,17 @@ icon_state = "neutralfull" }, /area/crew_quarters/locker) +"fcP" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "fcZ" = ( /obj/machinery/door/airlock/hatch/gamma{ locked = 1; @@ -45543,6 +45306,18 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/cabin3) +"fin" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor{ + id_tag = "engstorage"; + name = "Secure Storage Blast Doors" + }, +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "fiH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -45971,18 +45746,6 @@ icon_state = "purplefull" }, /area/medical/research/nhallway) -"fnW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id_tag = "engstorage"; - name = "Secure Storage Blast Doors" - }, -/obj/effect/decal/warning_stripes/west, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "foa" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/carpet/arcade, @@ -48710,16 +48473,6 @@ /obj/effect/landmark/event/blobstart, /turf/simulated/floor/plating, /area/maintenance/engineering) -"fZe" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "fZf" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/unary/vent_scrubber{ @@ -49376,6 +49129,28 @@ }, /turf/simulated/floor/engine, /area/toxins/test_chamber) +"gkH" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "gkQ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -49538,6 +49313,16 @@ icon_state = "red" }, /area/security/customs) +"gmf" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "gmk" = ( /obj/structure/cult/archives, /obj/machinery/newscaster{ @@ -51890,24 +51675,15 @@ icon_state = "dark" }, /area/security/permabrig) -"gOq" = ( -/obj/structure/table/reinforced, -/obj/item/folder, -/obj/item/pen, -/obj/machinery/door/window/southleft{ - name = "Research Lab Desk"; - req_access = list(47) - }, -/obj/machinery/door/window/northleft, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - dir = 1 +"gOs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/plasteel, -/area/toxins/lab) +/area/storage/secure) "gOv" = ( /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating/airless, @@ -52975,6 +52751,14 @@ /obj/item/stock_parts/cell/high, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) +"hdD" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "hdG" = ( /turf/simulated/floor/plasteel{ dir = 1 @@ -54190,6 +53974,27 @@ /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plating/airless, /area/engineering/engine) +"hvS" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/pet/sloth/paperwork, +/obj/machinery/computer/guestpass{ + pixel_x = 30 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "brown" + }, +/area/quartermaster/qm) "hvW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, @@ -55946,6 +55751,27 @@ /obj/structure/sign/securearea, /turf/simulated/wall, /area/engineering/engine) +"hUu" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "hUH" = ( /obj/structure/sign/biohazard, /turf/simulated/wall, @@ -56041,6 +55867,16 @@ icon_state = "dark" }, /area/maintenance/asmaint2) +"hVE" = ( +/obj/machinery/camera{ + c_tag = "Cargo Backroom" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "hVL" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "engineering_west_airlock"; @@ -56097,6 +55933,13 @@ icon_state = "brown" }, /area/quartermaster/miningdock) +"hWy" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "hWA" = ( /turf/simulated/floor/wood{ icon_state = "wood-broken"; @@ -56177,6 +56020,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/asmaint) +"hXP" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "hYi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -57716,20 +57568,6 @@ icon_state = "purple" }, /area/quartermaster/miningdock) -"iuG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "iuQ" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ @@ -59495,18 +59333,6 @@ icon_state = "purple" }, /area/maintenance/xenozoo) -"iVt" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - dir = 1 - }, -/turf/simulated/floor/plating, -/area/toxins/lab) "iVE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -59554,6 +59380,13 @@ icon_state = "white" }, /area/medical/research/restroom) +"iVR" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "iWe" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -60698,6 +60531,14 @@ }, /turf/simulated/floor/plating, /area/security/checkpoint/south) +"jnm" = ( +/obj/machinery/pipedispenser/disposal, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "jnn" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -61664,16 +61505,6 @@ icon_state = "dark" }, /area/hydroponics) -"jyC" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "jyF" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -62657,6 +62488,16 @@ icon_state = "escape" }, /area/crew_quarters/fitness) +"jMU" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/conveyor/inverted{ + dir = 10; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "jNa" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63249,15 +63090,6 @@ tag = "icon-stage_stairs" }, /area/medical/reception) -"jWn" = ( -/obj/structure/plasticflaps, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/sorting) "jWq" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -63546,6 +63378,18 @@ icon_state = "dark" }, /area/crew_quarters/courtroom) +"kaU" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/sorting) "kaX" = ( /obj/structure/cable{ icon_state = "1-2" @@ -63836,6 +63680,22 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/xenozoo) +"kgT" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "yellowfull" + }, +/area/engineering/engine) "khf" = ( /obj/structure/cable{ icon_state = "2-4" @@ -65030,18 +64890,6 @@ tag = "icon-whiteblue (WEST)" }, /area/medical/medbay) -"kyY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "kzc" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -65770,27 +65618,6 @@ icon_state = "white" }, /area/medical/chemistry) -"kKd" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/conveyor{ - id = "garbage"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "kKi" = ( /obj/structure/cable{ icon_state = "4-8" @@ -67941,6 +67768,18 @@ tag = "icon-whiteblue (WEST)" }, /area/medical/ward) +"luH" = ( +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id_tag = "researchdesk1"; + name = "Research Desk Shutters" + }, +/turf/simulated/floor/plating, +/area/toxins/lab) "luK" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/closet/crate/internals, @@ -68332,6 +68171,18 @@ icon_state = "yellow" }, /area/engineering/break_room) +"lAj" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/obj/machinery/conveyor{ + dir = 1; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/delivery) "lAr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -72525,16 +72376,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/west) -"mEg" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "mEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -73038,6 +72879,13 @@ icon_state = "green" }, /area/hallway/secondary/exit) +"mLQ" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "mLS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -73083,6 +72931,18 @@ icon_state = "darkred" }, /area/security/warden) +"mMj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced, +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "mMo" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/unary/vent_scrubber{ @@ -73140,14 +73000,6 @@ icon_state = "darkblue" }, /area/aisat/maintenance) -"mME" = ( -/obj/structure/plasticflaps, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/delivery) "mMH" = ( /obj/structure/sign/poster/official/work_for_a_future{ pixel_x = 32 @@ -73791,6 +73643,19 @@ }, /turf/simulated/floor/plating, /area/engineering/engine) +"mWW" = ( +/obj/structure/plasticflaps, +/obj/structure/closet/crate/internals, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" + }, +/obj/machinery/conveyor{ + dir = 1; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/sorting) "mWY" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -73879,6 +73744,21 @@ icon_state = "darkblue" }, /area/turret_protected/ai) +"mYP" = ( +/obj/structure/table/wood, +/obj/item/camera_film, +/obj/item/book/manual/security_space_law, +/obj/item/reagent_containers/food/drinks/flask/detflask, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/requests_console{ + department = "Detective"; + name = "Detective Requests Console"; + pixel_x = -32 + }, +/turf/simulated/floor/carpet, +/area/security/detectives_office) "mYX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -76835,13 +76715,6 @@ icon_state = "dark" }, /area/security/permahallway) -"nNc" = ( -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "nNj" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow, @@ -78251,13 +78124,6 @@ /obj/effect/landmark/event/xeno_spawn, /turf/simulated/floor/plating, /area/maintenance/library) -"oht" = ( -/obj/machinery/conveyor{ - id = "garbage"; - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/disposal) "ohx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -79477,28 +79343,6 @@ temperature = 80 }, /area/toxins/server) -"oyI" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "oyP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -82079,6 +81923,17 @@ icon_state = "red" }, /area/security/processing) +"pir" = ( +/obj/machinery/door/poddoor{ + id_tag = "QMLoaddoor2"; + name = "supply dock loading door" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "piB" = ( /obj/machinery/light/small{ dir = 4 @@ -83427,6 +83282,16 @@ icon_state = "whitepurple" }, /area/medical/research/nhallway) +"pAK" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/conveyor/inverted{ + dir = 6; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "pAL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -83934,6 +83799,17 @@ }, /turf/simulated/floor/plasteel, /area/atmos) +"pGs" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "pGt" = ( /obj/structure/sign/greencross, /turf/simulated/wall, @@ -86539,6 +86415,20 @@ }, /turf/simulated/floor/wood, /area/maintenance/gambling_den) +"qnZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "qol" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/machinery/power/apc{ @@ -88634,15 +88524,6 @@ /obj/item/folder/blue, /turf/simulated/floor/carpet, /area/bridge/meeting_room) -"qRa" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/east, -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "qRn" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -89590,6 +89471,13 @@ icon_state = "dark" }, /area/security/permahallway) +"rdz" = ( +/obj/machinery/conveyor{ + dir = 5; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "rdB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -91690,13 +91578,6 @@ icon_state = "vault" }, /area/security/securearmory) -"rHh" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "rHl" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; @@ -91724,34 +91605,6 @@ icon_state = "neutralcorner" }, /area/crew_quarters/fitness) -"rHz" = ( -/obj/structure/closet/crate{ - name = "solar pack crate" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/item/paper/solar, -/obj/item/circuitboard/solar_control, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/solar_assembly, -/obj/item/tracker_electronics, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel, -/area/storage/secure) "rHD" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light{ @@ -92283,6 +92136,19 @@ "rPI" = ( /turf/simulated/wall/rust, /area/toxins/mixing) +"rPM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "rPP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -92810,6 +92676,14 @@ }, /turf/simulated/floor/plating, /area/medical/virology) +"rWG" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "rWW" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -93825,6 +93699,14 @@ icon_state = "dark" }, /area/bridge) +"snO" = ( +/obj/machinery/light, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/sorting) "snP" = ( /turf/simulated/wall, /area/maintenance/disposal) @@ -94778,6 +94660,34 @@ icon_state = "darkred" }, /area/security/securearmory) +"szN" = ( +/obj/structure/closet/crate{ + name = "solar pack crate" + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/paper/solar, +/obj/item/circuitboard/solar_control, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/solar_assembly, +/obj/item/tracker_electronics, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "szQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -94802,6 +94712,13 @@ icon_state = "purplecorner" }, /area/hallway/primary/aft) +"sAe" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "sAv" = ( /obj/machinery/light/small, /obj/effect/decal/warning_stripes/yellow, @@ -96125,6 +96042,28 @@ tag = "icon-cult" }, /area/lawoffice) +"sTN" = ( +/obj/structure/table/glass, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; + name = "Chemistry Cleaner" + }, +/obj/machinery/requests_console{ + department = "Chemistry"; + departmentType = 2; + name = "Chemistry Requests Console"; + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteyellow" + }, +/area/medical/chemistry) "sTO" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -96375,6 +96314,14 @@ icon_state = "darkblue" }, /area/security/detectives_office) +"sYg" = ( +/obj/machinery/power/emitter, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/storage/secure) "sYB" = ( /obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; @@ -96420,6 +96367,24 @@ }, /turf/simulated/floor/carpet/black, /area/bridge/vip) +"sZd" = ( +/obj/structure/table/reinforced, +/obj/item/folder, +/obj/item/pen, +/obj/machinery/door/window/southleft{ + name = "Research Lab Desk"; + req_access = list(47) + }, +/obj/machinery/door/window/northleft, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id_tag = "researchdesk1"; + name = "Research Desk Shutters" + }, +/turf/simulated/floor/plasteel, +/area/toxins/lab) "sZg" = ( /obj/effect/decal/remains/xeno, /obj/effect/decal/cleanable/blood/xeno, @@ -102013,15 +101978,6 @@ icon_state = "dark" }, /area/turret_protected/aisat) -"uAf" = ( -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "uAh" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/iv_bag/blood/OMinus, @@ -102479,6 +102435,15 @@ icon_state = "neutralfull" }, /area/crew_quarters/locker) +"uHj" = ( +/obj/structure/plasticflaps, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/conveyor{ + dir = 1; + id = "cargodisposals" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/sorting) "uHk" = ( /obj/structure/closet/secure_closet/security, /obj/machinery/alarm{ @@ -102841,6 +102806,16 @@ }, /turf/simulated/floor/bluegrid, /area/aisat) +"uKS" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 1; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "uKT" = ( /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 @@ -104521,15 +104496,6 @@ }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) -"vhR" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/applicator/burn, -/obj/item/reagent_containers/glass/bottle/charcoal, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/genetics) "vhU" = ( /obj/machinery/light/small{ dir = 1 @@ -106756,6 +106722,15 @@ "vKJ" = ( /turf/simulated/wall/r_wall, /area/security/detectives_office) +"vKP" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "vLk" = ( /obj/structure/cable{ icon_state = "1-4" @@ -106936,16 +106911,6 @@ icon_state = "whitepurple" }, /area/medical/genetics) -"vOC" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/conveyor/inverted{ - id = "QMLoad"; - dir = 10 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) "vOF" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -107488,20 +107453,6 @@ icon_state = "white" }, /area/medical/ward) -"vUq" = ( -/obj/structure/table/wood, -/obj/item/camera_film, -/obj/item/book/manual/security_space_law, -/obj/item/reagent_containers/food/drinks/flask/detflask, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/requests_console{ - name = "Detective Requests Console"; - pixel_x = -32 - }, -/turf/simulated/floor/carpet, -/area/security/detectives_office) "vUu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -107788,18 +107739,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central/south) -"vXN" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, -/obj/machinery/conveyor{ - id = "cargodelivery"; - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/quartermaster/sorting) "vYj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -107979,6 +107918,15 @@ icon_state = "red" }, /area/security/customs) +"vZC" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/conveyor{ + dir = 4; + id = "QMLoad" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "vZG" = ( /obj/structure/chair/office/dark, /obj/structure/cable{ @@ -108610,16 +108558,6 @@ icon_state = "whitepurple" }, /area/assembly/robotics) -"wjh" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "wjj" = ( /turf/simulated/wall/rust, /area/maintenance/library) @@ -110281,6 +110219,18 @@ icon_state = "dark" }, /area/engineering/hardsuitstorage) +"wEG" = ( +/obj/structure/plasticflaps/mining, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plating, +/area/quartermaster/storage) "wEJ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -111676,6 +111626,22 @@ dir = 1 }, /area/security/customs) +"wYP" = ( +/obj/machinery/camera{ + c_tag = "Research and Development"; + dir = 9; + network = list("Research","SS13") + }, +/obj/machinery/requests_console{ + department = "Research"; + departmentType = 2; + name = "Research Request Console"; + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) "wYQ" = ( /turf/simulated/floor/wood{ broken = 1; @@ -111776,6 +111742,15 @@ /obj/structure/bookcase, /turf/simulated/floor/wood, /area/library) +"xaw" = ( +/obj/effect/decal/warning_stripes/east, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "xaE" = ( /obj/structure/cable{ icon_state = "4-8" @@ -112643,6 +112618,14 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) +"xkL" = ( +/obj/structure/plasticflaps, +/obj/machinery/conveyor{ + dir = 4; + id = "cargodelivery" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/delivery) "xkY" = ( /obj/structure/lattice/catwalk, /turf/space, @@ -113466,6 +113449,13 @@ icon_state = "bluecorner" }, /area/hallway/primary/central/south) +"xuw" = ( +/obj/machinery/conveyor{ + dir = 9; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "xux" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -114389,6 +114379,17 @@ icon_state = "white" }, /area/assembly/robotics) +"xFg" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/conveyor{ + dir = 8; + id = "cargodisposals" + }, +/turf/simulated/floor/plating, +/area/quartermaster/sorting) "xFk" = ( /obj/machinery/ai_status_display{ pixel_y = -32 @@ -115135,6 +115136,16 @@ icon_state = "neutralcorner" }, /area/toxins/mixing) +"xNv" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 5; + id = "garbage" + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "xNy" = ( /obj/item/radio/intercom{ dir = 4; @@ -115801,6 +115812,16 @@ }, /turf/simulated/floor/plating, /area/maintenance/fpmaint) +"xWf" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/conveyor{ + dir = 8; + id = "QMLoad2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "xWh" = ( /obj/structure/cable{ icon_state = "2-8" @@ -140961,7 +140982,7 @@ nkf dXD qlu dQT -dSH +kgT dXD nkf dXD @@ -141218,7 +141239,7 @@ cbj vCh ptE tED -cpi +bEE tPv etT sMJ @@ -141475,7 +141496,7 @@ vtm fui uCs cmR -cod +ehy cpl mDe mDe @@ -141732,7 +141753,7 @@ utt cpm nqL fId -fnW +fin cpm mDe bQr @@ -141989,7 +142010,7 @@ utt wQP rSt cnB -cof +cUm cpn mDe vSK @@ -142246,7 +142267,7 @@ utt wUC dWc cpo -cqU +jnm tZR mDe vly @@ -142503,7 +142524,7 @@ utt igP dOZ dRd -cpk +ewr csm mDe feE @@ -142760,7 +142781,7 @@ utt wUC dOZ dRd -dFo +sYg cso mDe vDd @@ -143017,7 +143038,7 @@ dJU lTF xKq cmO -dFo +sYg cpr mDe iVc @@ -143274,7 +143295,7 @@ utt uqq pus dRe -rHz +szN cqX mDe hCy @@ -143531,7 +143552,7 @@ utt dNd qFn dRw -rHh +iVR kpR mDe yfQ @@ -143788,7 +143809,7 @@ utt qFn teJ dRw -rHh +iVR xvB mDe vly @@ -144045,7 +144066,7 @@ utt gxS cna iYh -cra +gOs tEE mDe prK @@ -144302,7 +144323,7 @@ utt jtS coh cmV -ewf +rPM ufR mDe smf @@ -152289,7 +152310,7 @@ oBH hnE ugy iQQ -cRb +aKW oIq fVX nsS @@ -153060,7 +153081,7 @@ qhT dkn iQQ tot -iVt +luH gjV cTR cTU @@ -153317,11 +153338,11 @@ bJP vyT ugy tot -gOq +sZd aiF cTB cUY -cVs +wYP oIq cYB daE @@ -153574,7 +153595,7 @@ qhT dkn bNH wId -iVt +luH hXm ohz cUZ @@ -155033,14 +155054,14 @@ rVF avf axj ayA -bcz +xFg ays tZI rxE cKZ cOv cQU -vXN +kaU ayA kiI blB @@ -155290,21 +155311,21 @@ bZN bEO chC ayA -crg -jWn +hWy +uHj dQc cLc cLc cOw pqC -egs +snO ayA deG -mME +xkL dfM bxv dfM -dMs +fbZ deG grq eqN @@ -155547,7 +155568,7 @@ nhF jWD jWD ayA -cqZ +rWG ayA azs cLc @@ -155555,8 +155576,8 @@ cLc cOw cnp csF -dcq -aGE +mWW +lAj dqv cGc cKb @@ -155804,7 +155825,7 @@ aSd bbl avb ayA -crg +hWy cyH cBM cLc @@ -155901,7 +155922,7 @@ vec ueo djS dfv -vhR +cRL vkl dvr drE @@ -156061,7 +156082,7 @@ bZO bbl bNA ayA -crh +hVE bXh aCx aEB @@ -156318,7 +156339,7 @@ bZP bbl bNC ayA -csn +fcP bXh cLc cdN @@ -156575,7 +156596,7 @@ dgP wff jWD ayA -crg +hWy bXh cLc cdN @@ -156832,7 +156853,7 @@ qsv bFv bAf ayA -csv +pGs bXB azv cdN @@ -159148,7 +159169,7 @@ hCZ cua mdr aBS -oyI +gkH nKJ bzc lXS @@ -159156,7 +159177,7 @@ ctv vgm qpZ djV -cGl +hXP eZs hXt cSh @@ -159225,7 +159246,7 @@ pbX dzf pfD cKR -cMr +sTN cXs jsJ dix @@ -159405,7 +159426,7 @@ hSN cue ric tiq -uAf +vKP nKJ bzc iGN @@ -159413,7 +159434,7 @@ dmq pHT gus djV -mEg +eyz eZs luK cSh @@ -159662,7 +159683,7 @@ rsC aCE dri bxD -fZe +xWf pNE cOS lwr @@ -159670,7 +159691,7 @@ ctv eZs cYL eZs -cGl +hXP djV vKa wTS @@ -159701,7 +159722,7 @@ iGw vKJ bFQ cLe -vUq +mYP vcG vTX wwg @@ -159919,7 +159940,7 @@ dmq cuw bYJ hVC -wjh +gmf nKJ aJg vKa @@ -159927,7 +159948,7 @@ eZs vKa sZV djV -cGl +hXP eZs vKa cSh @@ -160176,7 +160197,7 @@ dmq cux gNy jvq -uAf +vKP cKW aJg dAZ @@ -160184,7 +160205,7 @@ tFA tNh hOD eZs -cGl +hXP eZs vKa dNf @@ -160433,7 +160454,7 @@ dmq cuz gNy hVC -uAf +vKP nKJ oZo eZs @@ -160441,7 +160462,7 @@ djV djV aJm eZs -cGl +hXP ebV rup cSh @@ -160690,7 +160711,7 @@ dmq cuO bZh mHQ -cdQ +xaw cLd mHQ mHQ @@ -160698,7 +160719,7 @@ dHr dHr dHr vfD -qRa +vZC dHr dHr dNr @@ -160947,15 +160968,15 @@ dmq cuS cSf cSf -cdR -aKF -bta +pAK +sAe +xuw ddO cYX ddO -dko -nNc -vOC +rdz +mLQ +jMU tkx eWq jgZ @@ -161206,7 +161227,7 @@ bBM bBM bBM bBM -brF +wEG nyK bBM nyK @@ -161463,7 +161484,7 @@ iGw iGw iGw eqA -eqQ +pir qak cOy mbm @@ -161720,7 +161741,7 @@ aaa aaa iGw bBM -clQ +hdD nyK bBM nyK @@ -161735,7 +161756,7 @@ bSJ duw bIp duw -bOT +hvS dDb cqB dXb @@ -162222,10 +162243,10 @@ aaa aaa iGw puN -bKF -jyC -jyC -aSl +xNv +uKS +uKS +erM aUq snP iGw @@ -162479,10 +162500,10 @@ aaa aaa iGw puN -bKK +bDE snP snP -bCh +aOC jkM snP iGw @@ -162736,10 +162757,10 @@ aaa aaa aaa bBS -oht +dvH qBA hrt -kyY +mMj qyB bBS iGw @@ -162993,10 +163014,10 @@ aaa aaa iGw bBS -oht +dvH ocv eMA -iuG +qnZ ose bBS aaa @@ -163250,10 +163271,10 @@ aaa iGw iGw bBS -oht +dvH wyH dWk -kKd +hUu hnU bBS iGw diff --git a/_maps/map_files/event/Station/towerstation.dmm b/_maps/map_files/event/Station/towerstation.dmm index 80238a9e039..dca0de25e48 100644 --- a/_maps/map_files/event/Station/towerstation.dmm +++ b/_maps/map_files/event/Station/towerstation.dmm @@ -704,8 +704,8 @@ req_access = list(39) }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 6 + dir = 6; + icon_state = "whitegreen" }, /area/medical/virology) "atz" = ( @@ -858,8 +858,8 @@ pixel_y = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 10 + dir = 10; + icon_state = "whitegreen" }, /area/medical/virology) "axJ" = ( @@ -916,8 +916,8 @@ /area/hallway/secondary/exit) "azA" = ( /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /obj/structure/sign/deathsposal{ pixel_y = -32 @@ -972,9 +972,9 @@ "aBP" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "chemshuts"; - name = "Chemistry Shutters"; - dir = 2 + name = "Chemistry Shutters" }, /turf/simulated/floor/plating, /area/medical/chemistry) @@ -1319,8 +1319,8 @@ "aPe" = ( /obj/machinery/door/window{ dir = 1; - req_access = list(61); - name = "Telecommunications Access" + name = "Telecommunications Access"; + req_access = list(61) }, /turf/simulated/floor/plasteel/dark/telecomms, /area/tcommsat/server) @@ -2213,8 +2213,8 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 8 + dir = 8; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "bvB" = ( @@ -2766,8 +2766,8 @@ /obj/machinery/door_control{ id = "researchshuts"; name = "Research Shutters Control"; - req_access = list(33); - pixel_y = 26 + pixel_y = 26; + req_access = list(33) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -3239,8 +3239,8 @@ /obj/machinery/door_control{ id = "brigshuts"; name = "Brig Shutters Control"; - req_access = list(1,4); - pixel_y = 36 + pixel_y = 36; + req_access = list(1,4) }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -3309,8 +3309,8 @@ /area/space) "cdz" = ( /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 9 + dir = 9; + icon_state = "whitegreen" }, /area/medical/virology) "cdB" = ( @@ -3416,9 +3416,9 @@ pixel_x = -8 }, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "kitchen"; - name = "Kitchen Shutters"; - dir = 2 + name = "Kitchen Shutters" }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) @@ -3815,9 +3815,9 @@ "cyG" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; id_tag = "brigshuts"; - name = "Brig Shutters"; - dir = 1 + name = "Brig Shutters" }, /turf/simulated/floor/plating, /area/security/main) @@ -3908,8 +3908,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue"; - dir = 8 + dir = 8; + icon_state = "whiteblue" }, /area/medical/sleeper) "cAL" = ( @@ -4244,8 +4244,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue"; - dir = 8 + dir = 8; + icon_state = "whiteblue" }, /area/medical/sleeper) "cRi" = ( @@ -5063,8 +5063,8 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 + dir = 4; + icon_state = "whitepurple" }, /area/toxins/mixing) "dsw" = ( @@ -5721,9 +5721,9 @@ /obj/item/storage/fancy/donut_box, /obj/item/reagent_containers/food/snacks/soup/misosoup, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "kitchen"; - name = "Kitchen Shutters"; - dir = 2 + name = "Kitchen Shutters" }, /turf/simulated/floor/plasteel/white, /area/crew_quarters/kitchen) @@ -5779,8 +5779,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 1 + dir = 1; + icon_state = "whitepurple" }, /area/toxins/mixing) "dTl" = ( @@ -6956,9 +6956,9 @@ "eIB" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; id_tag = "brigshuts"; - name = "Brig Shutters"; - dir = 8 + name = "Brig Shutters" }, /turf/simulated/floor/plating, /area/security/main) @@ -7237,6 +7237,17 @@ /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/shuttle, /area/shuttle/arrival/station) +"eTD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Quartermaster's Desk"; + departmentType = 5; + name = "Quartermaster Requests Console"; + pixel_x = -30 + }, +/turf/simulated/floor/carpet/black, +/area/quartermaster/storage) "eTG" = ( /obj/structure/rack, /obj/item/ammo_box/shotgun/beanbag, @@ -7608,8 +7619,8 @@ }, /obj/effect/landmark/start/virologist, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 8 + dir = 8; + icon_state = "whitegreen" }, /area/medical/virology) "feZ" = ( @@ -8404,6 +8415,12 @@ "fBs" = ( /obj/effect/turf_decal/delivery, /obj/machinery/computer/scan_consolenew, +/obj/machinery/requests_console{ + department = "Genetics"; + departmentType = 1; + name = "Genetics Requests Console"; + pixel_x = -30 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" @@ -8749,8 +8766,8 @@ /obj/effect/decal/warning_stripes/yellow, /obj/machinery/plantgenes, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 1 + dir = 1; + icon_state = "blue" }, /area/hydroponics) "fIT" = ( @@ -9119,8 +9136,8 @@ icon_state = "2-4" }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 1 + dir = 1; + icon_state = "whitepurple" }, /area/toxins/mixing) "fXq" = ( @@ -9604,8 +9621,8 @@ "gpQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -10735,8 +10752,8 @@ }, /obj/machinery/computer/card/minor/hos, /obj/item/radio/intercom{ - pixel_y = -28; - pixel_x = 28 + pixel_x = 28; + pixel_y = -28 }, /obj/machinery/keycard_auth{ pixel_x = 28; @@ -10904,8 +10921,8 @@ }, /obj/structure/plasticflaps, /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -11157,10 +11174,10 @@ /area/toxins/lab) "hjb" = ( /obj/machinery/atmospherics/trinary/filter{ + dir = 4; filter_type = "n2"; name = "nitrogen filter"; - on = 1; - dir = 4 + on = 1 }, /turf/simulated/floor/plasteel, /area/atmos) @@ -11352,8 +11369,8 @@ /obj/machinery/door_control{ id = "briglock"; name = "Brig Lockdown"; - req_access = list(3); - pixel_x = -26 + pixel_x = -26; + req_access = list(3) }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -12655,8 +12672,8 @@ dir = 4 }, /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -13288,9 +13305,9 @@ name = "Access Queue" }, /obj/machinery/door/window/brigdoor/northleft{ + dir = 8; name = "Access Desk"; - req_access = list(57); - dir = 8 + req_access = list(57) }, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; @@ -13372,8 +13389,8 @@ /obj/machinery/light, /obj/machinery/chem_master, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 6 + dir = 6; + icon_state = "blue" }, /area/hydroponics) "iGn" = ( @@ -13474,9 +13491,9 @@ pixel_x = 30 }, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "kitchen"; - name = "Kitchen Shutters"; - dir = 2 + name = "Kitchen Shutters" }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) @@ -14164,8 +14181,8 @@ }, /obj/machinery/door/window/brigdoor/security{ dir = 2; - req_access = list(63); - name = "Brig Medical Bay" + name = "Brig Medical Bay"; + req_access = list(63) }, /turf/simulated/floor/plasteel{ dir = 4; @@ -14833,8 +14850,8 @@ }, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ - icon_state = "green"; - dir = 10 + dir = 10; + icon_state = "green" }, /area/hydroponics) "jAi" = ( @@ -15189,6 +15206,18 @@ }, /turf/simulated/floor/plasteel, /area/security/main) +"jMQ" = ( +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Blueshield"; + departmentType = 5; + name = "Blueshield Requests Console"; + pixel_y = 30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "bcarpet05" + }, +/area/bridge) "jMV" = ( /obj/structure/window/reinforced{ dir = 4 @@ -15393,9 +15422,9 @@ "jUc" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "kitchen"; - name = "Kitchen Shutters"; - dir = 2 + name = "Kitchen Shutters" }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) @@ -16500,8 +16529,8 @@ /obj/machinery/door_control{ id = "briglock"; name = "Brig Lockdown"; - req_access = list(3); - pixel_x = -26 + pixel_x = -26; + req_access = list(3) }, /turf/simulated/wall/r_wall, /area/security/warden) @@ -17305,18 +17334,18 @@ /obj/machinery/door_control{ id = "engsm"; name = "Supermatter Blast Doors"; + pixel_x = -24; pixel_y = -8; - req_access = list(10); - pixel_x = -24 + req_access = list(10) }, /obj/machinery/door_control{ id = "smbolts"; name = "Supermatter Bolt Control"; normaldoorcontrol = 1; + pixel_x = -24; pixel_y = 8; req_access = list(56); - specialfunctions = 4; - pixel_x = -24 + specialfunctions = 4 }, /turf/simulated/floor/engine, /area/engineering/engine) @@ -17884,9 +17913,9 @@ "lCt" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "kitchen"; - name = "Kitchen Shutters"; - dir = 2 + name = "Kitchen Shutters" }, /turf/simulated/floor/plasteel/white, /area/crew_quarters/kitchen) @@ -18580,8 +18609,8 @@ dir = 8 }, /turf/simulated/floor/glass/reinforced{ - oxygen = 0; nitrogen = 0; + oxygen = 0; temperature = 2.7 }, /area/space) @@ -19057,8 +19086,8 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue"; - dir = 8 + dir = 8; + icon_state = "whiteblue" }, /area/medical/sleeper) "mmJ" = ( @@ -19131,8 +19160,8 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 + dir = 4; + icon_state = "whitepurple" }, /area/toxins/mixing) "mqd" = ( @@ -19681,8 +19710,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 8 + dir = 8; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "mIi" = ( @@ -20714,8 +20743,8 @@ /area/turret_protected/ai_upload) "nrB" = ( /obj/machinery/atmospherics/trinary/filter{ - dir = 8; desc = "Отфильтровывает углекислый газ из трубы и отправляет его в камеру хранения"; + dir = 8; filter_type = 3; name = "Фильтр Углекислого Газа (СO2)"; on = 1; @@ -21522,8 +21551,8 @@ /area/gateway) "nSq" = ( /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 1 + dir = 1; + icon_state = "blue" }, /area/hydroponics) "nTs" = ( @@ -22233,9 +22262,9 @@ req_access = list(35) }, /obj/machinery/door/window/eastleft{ + dir = 8; name = "Kitchen Desk"; - req_access = list(28); - dir = 8 + req_access = list(28) }, /turf/simulated/floor/plating, /area/crew_quarters/kitchen) @@ -22256,8 +22285,8 @@ /area/crew_quarters/dorms) "oqA" = ( /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 9 + dir = 9; + icon_state = "whitepurple" }, /area/toxins/mixing) "orb" = ( @@ -22312,8 +22341,8 @@ /area/medical/medbay) "otM" = ( /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 1 + dir = 1; + icon_state = "whitepurple" }, /area/toxins/mixing) "ouf" = ( @@ -22842,8 +22871,8 @@ /area/hallway/primary/aft) "oLj" = ( /turf/simulated/floor/glass/reinforced{ - oxygen = 0; nitrogen = 0; + oxygen = 0; temperature = 2.7 }, /area/space) @@ -23023,8 +23052,8 @@ /area/hallway/primary/starboard) "oSt" = ( /obj/machinery/atmospherics/trinary/filter{ - dir = 8; desc = "Отфильтровывает оксид азота из трубы и отправляет его в камеру хранения."; + dir = 8; filter_type = 4; name = "Фильтр Оксида Азота (N2O)"; on = 1; @@ -23428,8 +23457,8 @@ pixel_y = -32 }, /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -23860,8 +23889,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/medical/virology) "pxE" = ( @@ -24150,9 +24179,9 @@ "pFi" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; id_tag = "chemshuts"; - name = "Chemistry Shutters"; - dir = 1 + name = "Chemistry Shutters" }, /turf/simulated/floor/plating, /area/medical/chemistry) @@ -24207,9 +24236,9 @@ dir = 4 }, /obj/machinery/door/window/southleft{ + dir = 8; name = "Research Lab Desk"; - req_access = list(47); - dir = 8 + req_access = list(47) }, /obj/machinery/door/poddoor/shutters/preopen{ id_tag = "researchshuts"; @@ -24294,8 +24323,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 1 + dir = 1; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "pHL" = ( @@ -24630,8 +24659,8 @@ dir = 1 }, /obj/item/radio/intercom{ - pixel_y = -28; - pixel_x = -28 + pixel_x = -28; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ icon_state = "bcarpet05" @@ -24716,8 +24745,8 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 + dir = 4; + icon_state = "whitepurple" }, /area/toxins/mixing) "pVk" = ( @@ -24770,8 +24799,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 1 + dir = 1; + icon_state = "whitepurple" }, /area/toxins/mixing) "pWM" = ( @@ -24917,8 +24946,8 @@ /area/security/permabrig) "qcu" = ( /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) @@ -25181,8 +25210,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 5 + dir = 5; + icon_state = "whitepurple" }, /area/toxins/mixing) "qkI" = ( @@ -25295,8 +25324,8 @@ pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 + dir = 4; + icon_state = "whitepurple" }, /area/toxins/mixing) "qph" = ( @@ -25509,12 +25538,12 @@ pixel_x = 32 }, /obj/item/radio/intercom/custom{ - pixel_y = 14; - pixel_x = 32 + pixel_x = 32; + pixel_y = 14 }, /obj/item/radio/intercom{ - pixel_y = -15; - pixel_x = 32 + pixel_x = 32; + pixel_y = -15 }, /turf/simulated/floor/greengrid, /area/turret_protected/aisat) @@ -25532,8 +25561,8 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 1 + dir = 1; + icon_state = "whitepurple" }, /area/toxins/mixing) "qxq" = ( @@ -26493,8 +26522,8 @@ "rdP" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 6 + dir = 6; + icon_state = "blue" }, /area/atmos) "ree" = ( @@ -27228,8 +27257,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 8 + dir = 8; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "rBV" = ( @@ -27690,6 +27719,12 @@ pixel_x = 26; req_access = list(33) }, +/obj/machinery/requests_console{ + department = "Chemistry"; + departmentType = 2; + name = "Chemistry Requests Console"; + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteyellow" @@ -28627,7 +28662,7 @@ pixel_y = 3 }, /obj/machinery/requests_console{ - department = "Science"; + department = "Research"; departmentType = 2; name = "Research Request Console"; pixel_x = 30 @@ -29656,8 +29691,8 @@ req_access = list(39) }, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue"; - dir = 8 + dir = 8; + icon_state = "whiteblue" }, /area/medical/sleeper) "tiH" = ( @@ -30111,8 +30146,8 @@ /area/hallway/secondary/entry) "tzj" = ( /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 8 + dir = 8; + icon_state = "whitepurple" }, /area/toxins/mixing) "tzx" = ( @@ -30151,8 +30186,8 @@ created_name = "Officer Podsky"; desc = "Ты не узнаешь ценность чего-либо, пока не потеряешь это..."; name = "Обломки офицера Подски"; - pixel_y = 14; - pixel_x = -5 + pixel_x = -5; + pixel_y = 14 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -30491,8 +30526,8 @@ tag_interior_door = "viro_lab_airlock_interior" }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 4 + dir = 4; + icon_state = "whitegreen" }, /area/medical/virology) "tKy" = ( @@ -30606,8 +30641,8 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 1 + dir = 1; + icon_state = "blue" }, /area/hydroponics) "tQb" = ( @@ -31511,8 +31546,8 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/security{ - req_access = list(2); - name = "Rrocessing" + name = "Rrocessing"; + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 1; @@ -31806,8 +31841,8 @@ /obj/machinery/door_control{ id = "execblast"; name = "Vacuum Execution"; - req_access = list(2); - pixel_x = -26 + pixel_x = -26; + req_access = list(2) }, /turf/simulated/floor/plasteel{ dir = 9; @@ -32309,8 +32344,8 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 1 + dir = 1; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "uQL" = ( @@ -32433,8 +32468,8 @@ /obj/machinery/chem_dispenser/botanical, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 9 + dir = 9; + icon_state = "blue" }, /area/hydroponics) "uUg" = ( @@ -32548,8 +32583,8 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 5 + dir = 5; + icon_state = "whitegreen" }, /area/medical/virology) "vbn" = ( @@ -33519,9 +33554,9 @@ "vDD" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; id_tag = "brigshuts"; - name = "Brig Shutters"; - dir = 1 + name = "Brig Shutters" }, /obj/machinery/door/poddoor{ density = 0; @@ -33676,10 +33711,10 @@ "vIe" = ( /obj/structure/showcase{ dir = 4; - pixel_x = -9; icon = 'icons/mob/robots.dmi'; icon_state = "Robot-STD"; name = "Cyborg Statue"; + pixel_x = -9; pixel_y = 2 }, /turf/simulated/floor/bluegrid, @@ -33898,9 +33933,9 @@ "vNU" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; id_tag = "chemshuts"; - name = "Chemistry Shutters"; - dir = 8 + name = "Chemistry Shutters" }, /turf/simulated/floor/plating, /area/medical/chemistry) @@ -34145,9 +34180,9 @@ "vXi" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; id_tag = "brigshuts"; - name = "Brig Shutters"; - dir = 2 + name = "Brig Shutters" }, /obj/machinery/door/poddoor{ density = 0; @@ -34789,9 +34824,9 @@ "wqQ" = ( /obj/machinery/biogenerator, /obj/machinery/door/window/eastleft{ + dir = 1; name = "Hydroponics Desk"; - req_access = list(35); - dir = 1 + req_access = list(35) }, /turf/simulated/floor/plating, /area/hydroponics) @@ -36166,8 +36201,8 @@ "xef" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "whitegreen"; - dir = 8 + dir = 8; + icon_state = "whitegreen" }, /area/medical/virology) "xeu" = ( @@ -36209,8 +36244,8 @@ }, /obj/item/toy/figure/roboticist, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 5 + dir = 5; + icon_state = "whitepurple" }, /area/assembly/robotics) "xeR" = ( @@ -37108,8 +37143,8 @@ dir = 4 }, /obj/machinery/conveyor{ - id = "cargodisposals"; - dir = 4 + dir = 4; + id = "cargodisposals" }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -37553,8 +37588,8 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plasteel{ - icon_state = "blue"; - dir = 8 + dir = 8; + icon_state = "blue" }, /area/hydroponics) "xYz" = ( @@ -37865,15 +37900,15 @@ pixel_y = 2 }, /obj/item/clothing/gloves/combat{ - pixel_y = -3; - pixel_x = -3 + pixel_x = -3; + pixel_y = -3 }, /obj/item/clothing/gloves/combat{ pixel_y = -3 }, /obj/item/clothing/gloves/combat{ - pixel_y = -3; - pixel_x = 3 + pixel_x = 3; + pixel_y = -3 }, /obj/item/shield/riot{ pixel_x = 3; @@ -37913,8 +37948,8 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner"; - dir = 8 + dir = 8; + icon_state = "whitebluecorner" }, /area/medical/sleeper) "yjR" = ( @@ -337765,7 +337800,7 @@ vvq uJy cxo uYB -cYO +eTD cYO wwa jxt @@ -590154,7 +590189,7 @@ nOE vtz tMi kFM -qiF +jMQ ckr eBD rgz diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm index 4e984801dc8..4041cb454c2 100644 --- a/_maps/map_files/generic/CentComm.dmm +++ b/_maps/map_files/generic/CentComm.dmm @@ -26,6 +26,10 @@ icon_state = "warning" }, /area/shuttle/escape) +"aab" = ( +/mob/living/simple_animal/turkey, +/turf/simulated/floor/grass, +/area/centcom/evac) "aac" = ( /obj/structure/window/reinforced{ dir = 4 @@ -57,6 +61,21 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"aag" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/box/white/corners{ + dir = 8 + }, +/obj/structure/weightmachine/stacklifter, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/jail) "aao" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -76,16 +95,6 @@ icon_state = "rampbottom" }, /area/syndicate_mothership) -"aat" = ( -/obj/machinery/door/airlock/centcom{ - name = "ERT Service Room"; - opacity = 1; - req_access = list(109) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "aaA" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -122,23 +131,21 @@ /obj/machinery/plantgenes, /turf/simulated/floor/wood, /area/centcom/evac) -"abg" = ( -/obj/structure/table/glass, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/turf/simulated/floor/carpet, -/area/centcom/specops) "abk" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "navybluealt" }, /area/centcom/specops) +"abn" = ( +/obj/structure/sign/poster/official/space_cops{ + pixel_x = -32 + }, +/turf/simulated/floor/indestructible{ + dir = 9; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "abs" = ( /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; @@ -156,12 +163,11 @@ name = "floor" }, /area/vox_station) -"acu" = ( -/obj/machinery/vending/nta/ertarmory/yellow{ - req_access = list(104,109) - }, +"acx" = ( +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "navyblue" + dir = 5; + icon_state = "darkredalt" }, /area/centcom/specops) "acz" = ( @@ -194,18 +200,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone2) -"adj" = ( -/obj/structure/chair/sofa/corp/right, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"adl" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "ads" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/bot_red, @@ -214,20 +208,59 @@ name = "floor" }, /area/vox_station) +"adC" = ( +/obj/structure/table/glass, +/obj/item/folder/blue{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/paper/rnd_logs_key{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/paper/monitorkey{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/paper/safe_code{ + owner = "captain"; + pixel_y = 1 + }, +/obj/item/paper/safe_code{ + owner = "hos"; + pixel_y = -2; + pixel_x = -3 + }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"adL" = ( +/obj/structure/safe{ + known_by = list("NNC") + }, +/obj/item/reagent_containers/food/drinks/bottle/goldschlager, +/obj/item/coin/gold, +/obj/item/toy/plushie/corgi, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/stack/spacecash/c1000000{ + name = "1000000 Credit" + }, +/obj/item/stack/spacecash/c1000000{ + name = "1000000 Credit" + }, +/obj/item/stack/spacecash/c1000000{ + name = "1000000 Credit" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "adM" = ( /obj/item/bedsheet/brown, /obj/structure/bed, /turf/simulated/floor/carpet/blue, /area/shuttle/trade/sol) -"adO" = ( -/obj/effect/turf_decal/tile/neutral{ - alpha = 150; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "adQ" = ( /obj/item/flag/species/greys, /turf/simulated/floor/plasteel{ @@ -239,6 +272,14 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"adZ" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "aef" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/indestructible/vox{ @@ -262,12 +303,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"aeD" = ( -/turf/simulated/floor/wood{ - icon_state = "wood-broken7"; - tag = "icon-wood-broken7" - }, -/area/centcom/zone2) "aeF" = ( /obj/structure/railing{ dir = 1 @@ -276,12 +311,6 @@ icon_state = "darkredcorners" }, /area/syndicate_mothership/elite_squad) -"aeH" = ( -/obj/effect/turf_decal/stripes/gold{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "aeY" = ( /obj/item/deck/cards, /obj/structure/table/wood, @@ -289,49 +318,61 @@ icon_state = "grimy" }, /area/centcom/jail) -"afa" = ( -/turf/space/transit/east{ - icon_state = "black" - }, -/area/space) "afP" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/supply) -"agC" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 8; - id_tag = "ERT_Drop" +"agb" = ( +/obj/structure/closet/l3closet/security, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/watertank/janitor{ + max_integrity = 1500; + volume = 1500 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" +/obj/item/grenade/chem_grenade/cleaner, +/turf/simulated/floor/indestructible{ + dir = 9; + icon_state = "darkpurple" }, /area/centcom/specops) -"agG" = ( -/obj/structure/closet/secure_closet/guncabinet{ - layer = 2.9; - name = "L.W.A.P. Sniper Rifle" - }, -/obj/item/gun/energy/sniperrifle, -/obj/item/gun/energy/sniperrifle, -/obj/machinery/light/spot{ - dir = 4; - tag = "icon-tube1 (EAST)" - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 +"agl" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id_tag = "adminshuttleshutters"; + name = "Blast Shutters" }, +/turf/simulated/floor/plating, +/area/shuttle/administration) +"ago" = ( /obj/structure/window/reinforced{ - dir = 1 + dir = 8 }, /obj/structure/window/reinforced{ - dir = 4 + layer = 2.9 + }, +/obj/structure/table, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"agB" = ( +/obj/machinery/computer/shuttle/ert, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching the Special Ops team."; + name = "Spec Ops Monitor"; + network = list("ERT"); + pixel_x = -30 }, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, -/area/shuttle/gamma) +/area/shuttle/specops) "ahk" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/decal/cleanable/blood/oil, @@ -383,6 +424,16 @@ name = "floor" }, /area/vox_station) +"ahD" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted{ + dir = 1; + pixel_y = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ahK" = ( /obj/structure/barricade/wooden{ layer = 3.5 @@ -404,6 +455,32 @@ name = "floor" }, /area/vox_station) +"aie" = ( +/obj/structure/window/full/reinforced{ + layer = 2 + }, +/obj/machinery/door/poddoor/shutters/invincible{ + density = 0; + dir = 1; + icon_state = "open"; + id_tag = "CC_space_jail_sec"; + layer = 50; + level = 3; + locked = 1; + name = "Central Command Jail"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/centcom/jail) +"aig" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" + }, +/area/centcom/jail) "aim" = ( /obj/structure/chair{ dir = 4 @@ -431,20 +508,19 @@ name = "floor" }, /area/vox_station) -"aix" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding{ - color = "#444444" +"aiz" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"aiy" = ( -/turf/simulated/wall/shuttle/nosmooth{ - dir = 9; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners" +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone3) +"aiQ" = ( +/obj/structure/table, +/obj/item/storage/box/cups, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/ussp) +/area/centcom/specops) "aji" = ( /obj/machinery/light{ dir = 8 @@ -454,6 +530,35 @@ icon_state = "darkredalt" }, /area/centcom/jail) +"ajk" = ( +/obj/machinery/vending/wallmed{ + layer = 3.3; + name = "Emergency NanoMed"; + pixel_y = 32 + }, +/obj/structure/rack, +/obj/item/roller/holo, +/obj/item/roller/holo, +/obj/item/roller/holo, +/obj/item/roller/holo, +/obj/item/roller/holo, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkbluealt" + }, +/area/centcom/specops) +"ajs" = ( +/obj/item/radio/intercom/specops{ + pixel_x = -10; + pixel_y = 35 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) "ajJ" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -463,20 +568,35 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) +"ajM" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ajO" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/zone1) +"ajU" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkyellow" + }, +/area/centcom/specops) "akg" = ( /obj/structure/flora/rock/jungle, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"akv" = ( -/turf/simulated/wall/shuttle/nosmooth{ - dir = 5; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners" +"akk" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "Zone3_bathroom2"; + name = "Bathroom"; + opacity = 1 }, -/area/shuttle/ussp) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/zone3) "akD" = ( /obj/machinery/door/window/brigdoor{ color = "#d70000"; @@ -487,32 +607,11 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"akQ" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkredalt" - }, -/area/centcom/jail) "akW" = ( /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership/control) -"akY" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "O2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "ald" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -525,15 +624,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"alp" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) "alt" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -552,6 +642,28 @@ icon_state = "light-fancy-wood" }, /area/syndicate_mothership/control) +"alw" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/table/wood/fancy/royalblack, +/obj/item/reagent_containers/food/drinks/bottle/wine{ + pixel_x = -12; + pixel_y = 10 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "alF" = ( /obj/effect/turf_decal{ dir = 5; @@ -601,26 +713,11 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"alO" = ( -/obj/structure/chair/comfy/shuttle{ +"alR" = ( +/obj/effect/landmark/ert_director, +/obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) -"alU" = ( -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_y = -32 - }, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444" - }, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444"; - dir = 8 - }, /turf/simulated/floor/carpet/black, /area/centcom/specops) "amE" = ( @@ -634,15 +731,12 @@ name = "floor" }, /area/vox_station) -"amO" = ( -/obj/structure/fans/tiny, -/obj/effect/turf_decal/stripes/full, -/obj/machinery/door/poddoor/impassable{ - id_tag = "Admin_shuttle_access" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"amK" = ( +/obj/machinery/photocopier, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 }, +/turf/simulated/floor/carpet/black, /area/centcom/zone3) "amV" = ( /obj/machinery/vending/dinnerware, @@ -679,94 +773,44 @@ name = "floor" }, /area/vox_station) -"anJ" = ( -/obj/machinery/conveyor{ - id = "CC_crate"; +"anE" = ( +/obj/item/flag/nt, +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"anL" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 +/area/shuttle/administration) +"anK" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkyellowaltstrip" }, -/obj/effect/turf_decal/siding/yellow, -/turf/simulated/floor/carpet, -/area/centcom/evac) +/area/centcom/specops) "aoc" = ( /obj/structure/window/full/reinforced{ layer = 2 }, /turf/simulated/floor/plating, /area/centcom/bridge) -"aok" = ( -/obj/structure/bookcase, -/turf/simulated/floor/wood{ - icon_state = "wood-broken7"; - tag = "icon-wood-broken7" - }, -/area/centcom/zone2) -"aov" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp/green, -/obj/item/stamp/centcom{ - pixel_x = -5; - pixel_y = -7 - }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) -"aoA" = ( -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) -"aoZ" = ( -/obj/structure/table/reinforced, -/obj/item/pizzabox/meat, -/obj/item/pizzabox/meat, -/obj/item/pizzabox/meat, -/obj/item/pizzabox/meat, -/obj/item/pizzabox/margherita, -/obj/item/pizzabox/margherita, -/obj/item/pizzabox/margherita, -/obj/item/pizzabox/hawaiian, -/obj/item/pizzabox/hawaiian, -/obj/item/pizzabox/hawaiian, -/obj/item/pizzabox/vegetable, -/obj/item/pizzabox/vegetable, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"aoS" = ( +/turf/simulated/floor/indestructible{ + dir = 1; + icon_state = "darkgreynavyblue" }, /area/centcom/specops) -"apo" = ( -/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ - dir = 2; - id_tag = "ERT_Quarantine" - }, -/obj/machinery/porta_turret/centcom/pulse{ - armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - color = "#666666"; - damtype = "burn"; - health = 1250; - region_max = 12; - scan_range = 12; - shot_delay = 8; - name = "Quarantine Pulse Turret" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"aoW" = ( +/obj/structure/railing, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/specops) +"apl" = ( +/obj/structure/falsewall/reinforced{ + req_access = list(114); + layer = 5 }, +/turf/simulated/floor/fakespace, /area/centcom/specops) "app" = ( /obj/structure/window/reinforced{ @@ -786,83 +830,45 @@ /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"apZ" = ( -/obj/machinery/photocopier, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 +"apC" = ( +/obj/machinery/computer/communications, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/wood/fancy/light, +/turf/simulated/floor/carpet, /area/centcom/specops) -"aqe" = ( -/obj/structure/sign/securearea{ - pixel_y = -32 +"apH" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom SOO"; + opacity = 1; + req_access = list(114) + }, +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 2; + id_tag = "ERT_director_office_shutters2"; + layer = 5; + locked = 1; + name = "CentCom SOO Briefing" }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealt" + dir = 1; + icon_state = "navybluecorners" }, /area/centcom/specops) -"aqo" = ( -/obj/structure/table, -/obj/item/clothing/gloves/boxing/hologlove{ - icon_state = "boxinggreen"; - item_state = "boxinggreen" - }, -/obj/item/clothing/gloves/boxing/hologlove{ - icon_state = "boxinggreen"; - item_state = "boxinggreen" +"aqV" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 }, -/obj/item/clothing/gloves/boxing/hologlove{ - icon_state = "boxinggreen"; - item_state = "boxinggreen" - }, -/obj/item/clothing/gloves/boxing/hologlove, -/obj/item/clothing/gloves/boxing/hologlove, -/obj/item/clothing/gloves/boxing/hologlove, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone1) -"aqp" = ( -/obj/structure/table/reinforced{ - color = "#444444" - }, -/obj/item/radio/intercom/specops{ - pixel_x = 30 - }, -/obj/item/assault_pod/nt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"aqG" = ( -/obj/structure/toilet{ - dir = 8; - name = "Трон старшего администратора" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "CC_toilet_unit11"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/specops) -"arg" = ( -/obj/item/broken_bottle, -/turf/simulated/floor/shuttle/objective_check/vox, -/area/shuttle/vox) -"art" = ( -/obj/structure/window/reinforced{ - dir = 1 +/turf/simulated/floor/carpet, +/area/centcom/evac) +"arg" = ( +/obj/item/broken_bottle, +/turf/simulated/floor/shuttle/objective_check/vox, +/area/shuttle/vox) +"art" = ( +/obj/structure/window/reinforced{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -880,14 +886,6 @@ name = "floor" }, /area/vox_station) -"arK" = ( -/obj/structure/table/glass, -/obj/machinery/light, -/obj/item/storage/ashtray/glass, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) "arL" = ( /obj/structure/table/wood, /turf/simulated/floor/wood, @@ -905,6 +903,31 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"arZ" = ( +/obj/effect/decal/nanotrasen_logo{ + icon_state = "logo3"; + pixel_x = 16 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"ase" = ( +/obj/structure/table/glass, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) +"ash" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ask" = ( /obj/structure/rack/holorack, /obj/effect/turf_decal/box/white, @@ -924,6 +947,15 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"asJ" = ( +/obj/machinery/newscaster{ + pixel_x = -32 + }, +/turf/simulated/floor/indestructible{ + dir = 8; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "asM" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, @@ -959,6 +991,15 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) +"atQ" = ( +/obj/machinery/computer/card/centcom, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "atT" = ( /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) @@ -1003,18 +1044,18 @@ }, /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) -"aus" = ( -/obj/structure/table/glass, -/obj/item/storage/box/bodybags, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/paper/Cloning{ - pixel_x = 6 +"aux" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 }, +/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whiteblue" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) "auB" = ( /obj/structure/table, /obj/item/storage/toolbox/surgery, @@ -1026,6 +1067,22 @@ icon_state = "white" }, /area/centcom/zone1) +"auF" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 5; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/administration) +"avx" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "avP" = ( /obj/effect/turf_decal/box/white/corners, /turf/simulated/floor/plasteel{ @@ -1033,150 +1090,12 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"avR" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/under/assistantformal, -/obj/item/clothing/under/captain_fly{ - name = "rogue uniform" - }, -/obj/item/clothing/under/captainparade{ - name = "parade uniform" - }, -/obj/item/clothing/under/captainparade{ - name = "parade uniform" - }, -/obj/item/clothing/under/captain_fly{ - name = "rogue uniform" - }, -/obj/item/clothing/under/assistantformal, -/obj/item/clothing/under/fluff/benjaminfallout, -/obj/item/clothing/under/fluff/benjaminfallout, -/obj/item/clothing/under/fluff/elishirt, -/obj/item/clothing/under/fluff/elishirt, -/obj/item/clothing/under/fluff/jay_turtleneck, -/obj/item/clothing/under/fluff/jay_turtleneck, -/obj/item/clothing/under/lawyer/black, -/obj/item/clothing/under/lawyer/black, -/obj/item/clothing/under/lawyer/blue, -/obj/item/clothing/under/lawyer/blue, -/obj/item/clothing/under/lawyer/bluesuit, -/obj/item/clothing/under/lawyer/bluesuit, -/obj/item/clothing/under/lawyer/female, -/obj/item/clothing/under/lawyer/female, -/obj/item/clothing/under/lawyer/oldman, -/obj/item/clothing/under/lawyer/oldman, -/obj/item/clothing/under/lawyer/red, -/obj/item/clothing/under/lawyer/red, -/obj/item/clothing/under/mafia{ - name = "black outfit" - }, -/obj/item/clothing/under/mafia{ - name = "black outfit" - }, -/obj/item/clothing/under/mafia/white{ - name = "white outfit" - }, -/obj/item/clothing/under/mafia/white{ - name = "white outfit" - }, -/obj/item/clothing/under/misc/durathread, -/obj/item/clothing/under/misc/durathread, -/obj/item/clothing/under/retro/engineering, -/obj/item/clothing/under/retro/engineering, -/obj/item/clothing/under/retro/medical, -/obj/item/clothing/under/retro/medical, -/obj/item/clothing/under/retro/science, -/obj/item/clothing/under/retro/science, -/obj/item/clothing/under/retro/security, -/obj/item/clothing/under/retro/security, -/obj/item/clothing/under/color/black{ - icon_state = "hosblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hostanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hostanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officertanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officertanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardenblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardenblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardendnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardendnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardentanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardentanclothes"; - name = "jumpsuit" - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "awg" = ( /obj/structure/chair/sofa{ dir = 8 }, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"awn" = ( -/obj/machinery/clonepod/upgraded, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whiteblue"; - tag = "icon-whiteblue (NORTHEAST)" - }, -/area/centcom/specops) "awu" = ( /obj/structure/energy_caltrops/noselfdestroy, /obj/structure/flora/grass/both, @@ -1201,19 +1120,17 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"awU" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "axc" = ( /obj/structure/energy_caltrops/noselfdestroy, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"axr" = ( +/obj/structure/filingcabinet/security, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkredalt" + }, +/area/centcom/jail) "axB" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -1223,42 +1140,15 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"axF" = ( -/obj/structure/window/reinforced{ - dir = 8; - layer = 9.1 - }, -/obj/structure/flora/rock, -/obj/structure/flora/ausbushes/stalkybush, -/obj/effect/turf_decal/tile/neutral{ - alpha = 85; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' - }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, -/area/centcom/specops) -"axM" = ( -/obj/machinery/vending/chinese/free, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) -"axQ" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/library, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 +"axP" = ( +/obj/machinery/bodyscanner{ + dir = 4; + layer = 3.5 }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/turf/simulated/floor/shuttle{ + icon_state = "floor3" }, -/area/centcom/jail) +/area/shuttle/administration) "axR" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/superbiteburger, @@ -1270,6 +1160,21 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) +"axT" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whiteblue" + }, +/area/centcom/specops) "axW" = ( /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/indestructible/vox{ @@ -1277,6 +1182,15 @@ name = "floor" }, /area/vox_station) +"aya" = ( +/obj/structure/window/reinforced, +/obj/structure/sign/poster/official/random{ + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "ayi" = ( /obj/effect/turf_decal{ dir = 1; @@ -1317,6 +1231,12 @@ icon_state = "warnwhite" }, /area/centcom/zone1) +"ayG" = ( +/obj/effect/turf_decal/siding/brown, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "ayR" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -1329,6 +1249,14 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) +"azd" = ( +/obj/machinery/vending/cola/free, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "azv" = ( /turf/simulated/wall/indestructible/fakeglass{ base_icon_state = "fake_plastitanium_glass"; @@ -1362,12 +1290,6 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"aAm" = ( -/obj/structure/closet/walllocker{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel/freezer, -/area/centcom/specops) "aAn" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -1377,12 +1299,32 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"aAr" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"aAF" = ( +/obj/effect/turf_decal/siding/yellow/corner, +/turf/simulated/floor/carpet, +/area/centcom/evac) "aAL" = ( /turf/simulated/floor/indestructible/vox{ icon_state = "darkfull"; name = "floor" }, /area/vox_station) +"aAP" = ( +/obj/machinery/status_display{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "navybluealt" + }, +/area/centcom/specops) "aAR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1426,21 +1368,18 @@ name = "floor" }, /area/vox_station) +"aBV" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_r" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/transport) "aBX" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/bridge) -"aCb" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) "aCe" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1449,6 +1388,35 @@ /obj/machinery/recharger, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"aCs" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -8; + pixel_y = 30 + }, +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_x = 6; + pixel_y = 30 + }, +/turf/simulated/floor/wood, +/area/centcom/zone2) +"aCC" = ( +/obj/machinery/door_control/secure{ + id = "CC_BSA"; + name = "BSA room"; + pixel_x = -24; + pixel_y = 24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navybluealtstrip" + }, +/area/centcom/specops) +"aCM" = ( +/obj/item/flag/nt, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "aDf" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/red/line{ @@ -1460,6 +1428,14 @@ name = "floor" }, /area/vox_station) +"aDh" = ( +/obj/machinery/vending/security/ert{ + density = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "aDl" = ( /obj/structure/shuttle/engine/huge, /turf/space, @@ -1532,31 +1508,15 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"aFy" = ( -/obj/machinery/portable_atmospherics/canister/toxins{ - maximum_pressure = 50000 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/conveyor{ - id = "Toxin"; +"aFM" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) -"aFB" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) +/area/centcom/bridge) "aFT" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -1568,36 +1528,31 @@ name = "floor" }, /area/vox_station) -"aFX" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/red{ +"aGw" = ( +/turf/simulated/floor/plasteel{ dir = 4; - req_access = list(104,109) + icon_state = "darkred" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkredfull" +/area/syndicate_mothership/elite_squad) +"aGx" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/area/centcom/specops) -"aGt" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluealt" }, -/obj/effect/turf_decal/siding{ - color = "#444444" +/area/centcom/zone2) +"aGD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -5 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/bridge) -"aGw" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" - }, -/area/syndicate_mothership/elite_squad) +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "aGX" = ( /obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3; @@ -1641,17 +1596,6 @@ name = "floor" }, /area/vox_station) -"aHN" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_GYGAX" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "aHO" = ( /obj/structure/sink{ dir = 4; @@ -1675,31 +1619,81 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"aIb" = ( -/obj/structure/table/wood, -/obj/item/paicard, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/carpet/black, -/area/centcom/zone1) -"aIk" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 32; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"aHU" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" }, -/area/centcom/specops) -"aIq" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" }, -/turf/simulated/floor/carpet/black, -/area/trader_station/sol) -"aIr" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navyblue" + }, +/area/centcom/specops) +"aIb" = ( +/obj/structure/table/wood, +/obj/item/paicard, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/carpet/black, +/area/centcom/zone1) +"aIq" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, +/area/trader_station/sol) +"aIr" = ( +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) @@ -1784,11 +1778,8 @@ name = "floor" }, /area/vox_station) -"aKm" = ( -/obj/effect/decal/nanotrasen_logo{ - icon_state = "logo6"; - pixel_x = 16 - }, +"aKz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1810,36 +1801,40 @@ name = "floor" }, /area/vox_station) -"aKY" = ( -/obj/item/gun/projectile/automatic/sniper_rifle, -/obj/item/gun/projectile/automatic/sniper_rifle, -/obj/item/gun/projectile/automatic/sniper_rifle, -/obj/item/gun/projectile/automatic/sniper_rifle, -/obj/item/gun/projectile/automatic/sniper_rifle, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - layer = 2.9; - name = "Sniper Rifle"; - req_access = list(114) +"aLg" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -30; + pixel_y = 30 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/area/centcom/jail) -"aLe" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "ERT_armory_lvl3"; - name = "Armory level 3"; - layer = 5 +/area/shuttle/specops) +"aLo" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/conveyor{ + id = "CO2"; + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) +"aLy" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/centcom/evac) +"aLA" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_4) "aLC" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt{ @@ -1862,33 +1857,23 @@ name = "floor" }, /area/vox_station) -"aLI" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"aLD" = ( +/obj/machinery/vending/chinese/free{ + pixel_y = 7 }, -/area/centcom/jail) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "aLV" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, /area/trader_station/sol) -"aLY" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkbluealt" - }, -/area/centcom/zone2) -"aNf" = ( -/obj/structure/chair/sofa/corp/left{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"aMV" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 9 }, -/area/centcom/zone3) +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "aNy" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo16" @@ -1903,17 +1888,28 @@ /obj/machinery/light/small, /turf/simulated/floor/carpet, /area/centcom/zone1) -"aNU" = ( -/obj/structure/chair/comfy/black, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "aNX" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/window/reinforced/tinted, /turf/simulated/floor/carpet/black, /area/trader_station/sol) +"aOd" = ( +/obj/structure/closet/secure_closet/freezer/meat{ + req_access = list(102) + }, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "redfull"; + tag = "icon-redfull (NORTHWEST)" + }, +/area/centcom/zone1) "aOe" = ( /obj/structure/spacepoddoor/invincible{ dir = 4 @@ -1926,6 +1922,18 @@ /mob/living/simple_animal/pig, /turf/simulated/floor/plating, /area/syndicate_mothership/control) +"aOA" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_SRT1"; + pixel_y = -25; + req_access = list(114); + pixel_x = -25; + name = "SRT Team 2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "navybluealtstrip" + }, +/area/centcom/specops) "aOB" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/curtain/black{ @@ -1967,6 +1975,12 @@ name = "floor" }, /area/syndicate_mothership) +"aOO" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "aOR" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/head/kitty, @@ -1974,6 +1988,19 @@ /obj/item/clothing/suit/storage/browntrenchcoat, /turf/simulated/floor/carpet, /area/centcom/zone1) +"aPi" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 5; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "aPx" = ( /obj/structure/sink{ dir = 8; @@ -1986,20 +2013,17 @@ /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) "aPy" = ( -/obj/machinery/vending/nta/ertarmory/green/cc_jail, -/turf/simulated/floor/wood, -/area/centcom/jail) -"aQh" = ( -/obj/vehicle/ridden/motorcycle{ - dir = 8 - }, -/obj/structure/sign/poster/contraband/random{ - pixel_x = 30 +/obj/machinery/iv_drip, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" }, -/turf/simulated/floor/wood{ - icon_state = "fancy-wood-oak" +/area/shuttle/administration) +"aPL" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navybluealt" }, -/area/syndicate_mothership) +/area/centcom/specops) "aQv" = ( /obj/machinery/light/small{ dir = 4 @@ -2021,6 +2045,32 @@ /obj/item/reagent_containers/glass/beaker/bluespace, /turf/simulated/floor/wood, /area/centcom/evac) +"aRd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" + }, +/area/shuttle/administration) +"aRJ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/chair/comfy/lime, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "aRW" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -2052,20 +2102,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"aTh" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/computer/mech_bay_power_console, -/obj/machinery/light/spot{ - dir = 4; - tag = "icon-tube1 (EAST)" - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "aTE" = ( /obj/structure/table, /obj/item/clothing/head/soft/solgov, @@ -2083,6 +2119,21 @@ icon_state = "floor4" }, /area/shuttle/syndicate) +"aTQ" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "aTZ" = ( /turf/simulated/floor/plasteel{ icon_state = "darkbluecorners" @@ -2094,38 +2145,14 @@ icon_state = "darkredcornersalt" }, /area/syndicate_mothership/control) -"aUo" = ( -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_x = -32 - }, -/obj/structure/sink{ - dir = 1 - }, -/turf/simulated/floor/indestructible{ - dir = 10; - icon_state = "darkpurple" - }, -/area/centcom/specops) -"aUs" = ( -/obj/effect/decal/cleanable/blood/old, +"aUX" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, -/area/centcom/jail) -"aUM" = ( -/obj/structure/closet/crate/can, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/obj/item/paper/central_command/archive/station_reports, -/turf/simulated/floor/plating, -/area/centcom/zone2) +/area/centcom/specops) "aUY" = ( /obj/structure/urinal{ pixel_y = 32 @@ -2142,6 +2169,15 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) +"aVs" = ( +/obj/structure/bed, +/obj/item/bedsheet/rd, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/arcade, +/area/centcom/zone1) "aVE" = ( /obj/structure/closet/secure_closet/contractor, /turf/simulated/floor/carpet/black, @@ -2171,12 +2207,41 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/supply) -"aWp" = ( +"aWr" = ( +/obj/machinery/door/airlock/centcom{ + damage_deflection = 999; + name = "Prison"; + opacity = 1; + req_access = list(104) + }, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ dir = 6; - icon_state = "darkyellowaltstrip" + icon_state = "darkredaltstrip" + }, +/area/centcom/jail) +"aWz" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/item/radio/intercom/specops{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444"; + dir = 8 + }, +/obj/machinery/light{ + dir = 4 }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) +"aWA" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "aWO" = ( /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) @@ -2226,14 +2291,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"aXC" = ( -/obj/machinery/atmospherics/unary/cryo_cell/upgraded{ - layer = 3.5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "aXD" = ( /obj/item/pizzabox{ icon_state = "pizzabox_open" @@ -2244,6 +2301,14 @@ name = "floor" }, /area/vox_station) +"aXP" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/toy/desk/fan, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "aYm" = ( /obj/structure/window/plasmareinforced{ color = "#00f700"; @@ -2259,6 +2324,13 @@ icon_state = "floor13" }, /area/shuttle/ninja) +"aYp" = ( +/obj/structure/chair/sofa/corp/left, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "aYy" = ( /obj/structure/flora/tree/pine{ pixel_x = 1 @@ -2266,56 +2338,12 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"aYD" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkyellow" - }, -/area/centcom/specops) -"aZl" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/toy/desk/fan, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"aZs" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_NG"; - name = "Nerve Gas"; - pixel_x = -24; - pixel_y = 24; - req_access = list(114) - }, -/obj/structure/sign/greencross{ - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluecorners" - }, -/area/centcom/specops) "aZv" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" }, /area/centcom/zone1) -"aZw" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/bridge) "aZy" = ( /obj/structure/table/reinforced/brass, /obj/machinery/cell_charger, @@ -2374,19 +2402,44 @@ name = "floor" }, /area/vox_station) -"bbi" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "bbk" = ( /obj/structure/chair/sofa/left{ dir = 4 }, /turf/simulated/floor/carpet/black, /area/centcom/zone3) +"bbq" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "burst_l" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) +"bbv" = ( +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/obj/structure/rack/gunrack, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) +"bbE" = ( +/obj/machinery/computer/operating, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "bbR" = ( /obj/machinery/light{ dir = 1 @@ -2409,17 +2462,29 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"bcs" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 8; - id_tag = "ERT_director_office_shutters2"; - layer = 5; - locked = 1; - name = "CentCom SOO Briefing" +"bcx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "admin_s_inner"; + name = "Ship External Access"; + req_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1331; + master_tag = "admin_s_air_control"; + pixel_x = -1; + pixel_y = -29; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "bdh" = ( /obj/structure/chair, /obj/effect/landmark/voxstart, @@ -2435,97 +2500,82 @@ }, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"bdQ" = ( -/obj/machinery/vending/cola/free, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"bdw" = ( +/obj/structure/coatrack, +/obj/structure/window/reinforced{ + dir = 4 }, -/area/centcom/zone2) -"beu" = ( -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"bdB" = ( +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) +"beg" = ( +/obj/structure/chair/office/dark{ + dir = 8 }, -/obj/structure/chair/comfy/beige{ +/turf/simulated/floor/plasteel{ dir = 8; - layer = 5; - pixel_y = -2 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"beG" = ( -/obj/structure/rack/gunrack, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -3 + icon_state = "darkredalt" }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = 5 +/area/centcom/jail) +"bej" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -11 +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) +"beS" = ( +/obj/structure/lattice, +/turf/simulated/wall/shuttle{ + icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, -/obj/effect/decal/warning_stripes/white, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = -6 +/area/shuttle/specops) +"beU" = ( +/obj/machinery/vending/wallmed{ + name = "Emergency NanoMed"; + pixel_x = 6; + pixel_y = 27 }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = -6 +/obj/structure/extinguisher_cabinet{ + pixel_x = -6; + pixel_y = 27 }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = -6 +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel/grimy, +/area/trader_station/sol) +"beX" = ( +/obj/structure/chair/sofa/left, +/turf/simulated/floor/plasteel{ + icon_state = "darkgrey" }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/advtaser{ - pixel_x = 6 +/area/syndicate_mothership) +"bfa" = ( +/obj/machinery/ai_status_display{ + pixel_y = 32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"beU" = ( -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 6; - pixel_y = 27 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 27 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel/grimy, -/area/trader_station/sol) -"beX" = ( -/obj/structure/chair/sofa/left, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, -/area/syndicate_mothership) "bfg" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"bfo" = ( +/obj/machinery/vending/nta{ + dir = 4; + products = list(/obj/item/grenade/flashbang=4,/obj/item/flash=5,/obj/item/flashlight/seclite=4,/obj/item/restraints/legcuffs/bola/energy=8,/obj/item/ammo_box/shotgun=4,/obj/item/ammo_box/shotgun/buck=4,/obj/item/ammo_box/shotgun/rubbershot=4,/obj/item/ammo_casing/shotgun/stunslug=35,/obj/item/ammo_casing/shotgun/ion=14,/obj/item/ammo_casing/shotgun/laserslug=35,/obj/item/ammo_box/speedloader/shotgun=8,/obj/item/ammo_box/magazine/lr30mag=12,/obj/item/ammo_box/magazine/enforcer=18,/obj/item/ammo_box/magazine/enforcer/lethal=28,/obj/item/ammo_box/magazine/sp8=8,/obj/item/ammo_box/magazine/laser=12,/obj/item/ammo_box/magazine/wt550m9=20,/obj/item/ammo_box/magazine/m556=12,/obj/item/ammo_box/a40mm=4,/obj/item/ammo_box/c46x30mm=8,/obj/item/ammo_box/inc46x30mm=4,/obj/item/ammo_box/tox46x30mm=4,/obj/item/ammo_box/ap46x30mm=4,/obj/item/ammo_box/laserammobox=4); + req_access = list(104,109) + }, +/obj/effect/decal/warning_stripes/white/hollow, +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "bfx" = ( /obj/structure/holohoop{ dir = 1 @@ -2535,11 +2585,30 @@ icon_state = "asteroid" }, /area/centcom/evac) -"bgm" = ( -/obj/item/twohanded/required/kirbyplants, +"bfH" = ( +/obj/structure/table/glass, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"bfQ" = ( +/obj/machinery/door/airlock/centcom{ + name = "CentCom SOO"; + opacity = 1; + req_access = list(114) + }, +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 1; + id_tag = "ERT_director_office_shutters"; + layer = 5; + locked = 1; + name = "CentCom SOO" + }, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredalt" + icon_state = "dark" }, /area/centcom/specops) "bgu" = ( @@ -2562,25 +2631,20 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"bgL" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "CC_ERT2" - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" - }, -/area/centcom/specops) -"bgN" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/green{ - req_access = list(104,109) +"bgJ" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreenfull" +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) +"bhf" = ( +/obj/machinery/light/small{ + dir = 4; + tag = "icon-bulb1 (EAST)" }, -/area/centcom/specops) +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "bhg" = ( /obj/structure/railing{ dir = 1 @@ -2591,9 +2655,16 @@ tag = "icon-stage_stairs" }, /area/ninja/holding) -"bhp" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkgreen" +"bhj" = ( +/obj/structure/sign/poster/official/high_class_martini{ + pixel_x = 32 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" }, /area/centcom/specops) "bht" = ( @@ -2627,15 +2698,6 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"bhM" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4; - pixel_x = -14 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "bhR" = ( /obj/effect/turf_decal{ dir = 1; @@ -2674,40 +2736,41 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"bim" = ( -/obj/machinery/door/window/brigdoor{ - dir = 1 - }, +"biy" = ( +/obj/machinery/vending/clothing, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + icon_state = "dark" }, -/area/centcom/jail) -"biy" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 +/area/centcom/supply) +"biD" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/food/snacks/soup/beetsoup{ + desc = "Со вкусом политических убийств"; + name = "Борщ"; + pixel_y = 16 }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) -"biT" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkredalt" +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/area/centcom/zone2) +/obj/item/stack/spacecash/c1000000{ + name = "1000000 Credit" + }, +/obj/item/stack/telecrystal/twohundred_fifty{ + amount = 115; + desc = null + }, +/obj/item/stack/telecrystal/twohundred_fifty{ + amount = 115; + desc = null + }, +/turf/simulated/floor/carpet/red, +/area/syndicate_mothership/control) "bje" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkredaltstrip" }, /area/centcom/jail) -"bji" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "bjl" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -2746,15 +2809,6 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"bjK" = ( -/obj/structure/bed, -/obj/item/bedsheet/clown, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone1) "bjM" = ( /obj/machinery/light{ dir = 4 @@ -2764,28 +2818,16 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/spacebar) -"bjO" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "Zone3_bathroom2"; - name = "Bathroom"; - opacity = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) -"bkc" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 9 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) -"bki" = ( -/turf/simulated/floor/indestructible{ - dir = 4; - icon_state = "darkgreynavyblue" +"bjP" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 8; + id_tag = "ERT_director_office_shutters2"; + layer = 5; + locked = 1; + name = "CentCom SOO Briefing" }, +/turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) "bkk" = ( /obj/structure/flora/tree/jungle, @@ -2812,26 +2854,6 @@ name = "floor" }, /area/vox_station) -"bkR" = ( -/obj/item/melee/baton{ - color = "#b30086" - }, -/turf/simulated/floor/plating, -/area/centcom/specops) -"bla" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "blf" = ( /obj/effect/turf_decal{ icon_state = "golden_stripes" @@ -2919,32 +2941,14 @@ name = "floor" }, /area/vox_station) -"bmO" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/jail) -"bnd" = ( -/obj/effect/turf_decal/caution/stand_clear{ - dir = 8; - pixel_y = -16 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/specops) -"bnf" = ( -/obj/structure/window/reinforced, -/obj/machinery/light, -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"bni" = ( +/obj/structure/chair/comfy/lime, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2 }, -/area/centcom/evac) +/turf/simulated/floor/wood, +/area/centcom/zone3) "bnO" = ( /obj/machinery/cryopod{ dir = 8 @@ -2965,34 +2969,43 @@ icon_state = "darkredaltstrip" }, /area/centcom/zone3) -"boG" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 +"boQ" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 175; + teleport_y = 62; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellow" + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, /area/centcom/specops) -"bpl" = ( -/obj/structure/window/reinforced{ - layer = 3.1; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) +"bpI" = ( +/obj/structure/table/wood{ + color = "#996633" }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" +/obj/item/pen/multi/fountain{ + pixel_x = 5; + pixel_y = 5 }, -/area/centcom/specops) -"bpE" = ( -/obj/machinery/computer/secure_data, -/obj/structure/window/reinforced{ - dir = 4 +/obj/item/pen/multi/fountain{ + pixel_x = 5; + pixel_y = 5 }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredfull" +/obj/item/pen/multi/fountain{ + pixel_x = 5; + pixel_y = 5 }, -/area/centcom/bridge) +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "bpJ" = ( /turf/simulated/wall/shuttle/nosmooth{ dir = 8; @@ -3000,30 +3013,6 @@ icon_state = "ninja_walls_T_alt" }, /area/shuttle/ninja) -"bpN" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - id_tag = "ERT_armory_lvl1"; - name = "Armory level 1"; - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) -"bpS" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - id_tag = "ERT_armory_lvl1"; - name = "Armory level 1"; - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "bqb" = ( /obj/structure/sign/poster/official/safety_internals{ pixel_x = 32 @@ -3033,51 +3022,6 @@ name = "floor" }, /area/vox_station) -"bqo" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/statue/artchair{ - layer = 10; - pixel_y = 10 - }, -/obj/effect/turf_decal/plaque{ - layer = 3 - }, -/turf/simulated/floor/grass, -/area/centcom/evac) -"bqy" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"bqR" = ( -/obj/machinery/door/airlock/centcom{ - name = "Office"; - opacity = 1; - req_access = list(666) - }, -/turf/space, -/area/centcom/specops) -"bra" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) -"bri" = ( -/obj/structure/bed, -/obj/item/bedsheet/rd, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone1) "brr" = ( /obj/machinery/light/small{ dir = 1 @@ -3105,13 +3049,6 @@ icon_state = "white" }, /area/centcom/jail) -"bsy" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/coatrack, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "bsK" = ( /obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = -8; @@ -3140,11 +3077,26 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/plating, /area/shuttle/escape) +"buk" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 4; + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "white" + }, +/area/shuttle/administration) "bul" = ( -/obj/structure/table/glass, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/chair/comfy/lime{ + dir = 1 }, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood, /area/centcom/zone3) "bur" = ( /obj/structure/chair/comfy/shuttle{ @@ -3197,16 +3149,23 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"buT" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/centcom/jail) "buW" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/carpet/black, /area/centcom/zone2) +"buY" = ( +/obj/structure/piano/unanchored{ + dir = 8; + layer = 2.5 + }, +/obj/structure/flora/ausbushes, +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/window/full/reinforced{ + armor = list("melee"=80,"bullet"=80,"laser"=0,"energy"=0,"bomb"=80,"bio"=100,"rad"=100,"fire"=80,"acid"=100); + layer = 5 + }, +/turf/simulated/floor/grass, +/area/centcom/specops) "bvu" = ( /obj/structure/table/reinforced/brass, /turf/simulated/floor/indestructible/vox{ @@ -3225,17 +3184,38 @@ name = "floor" }, /area/vox_station) -"bvD" = ( -/obj/structure/bookcase, -/obj/effect/decal/cleanable/fungus{ - pixel_x = -32; - pixel_y = 32 +"bvK" = ( +/obj/machinery/door_control/secure{ + id = "CC_Main_Office_1_1"; + req_access = list(114) }, -/obj/item/paper/central_command/archive/memes{ - info = "
"; - name = "Коллективное решение" +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/bridge) +"bwb" = ( +/obj/machinery/computer/camera_advanced, +/obj/structure/railing, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) +"bwd" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/table, +/obj/item/pen/multi/fountain, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/turf/simulated/floor/carpet/black, /area/centcom/zone2) "bwf" = ( /obj/structure/window/reinforced, @@ -3261,6 +3241,22 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"bwK" = ( +/obj/structure/closet/secure_closet/guncabinet{ + layer = 2.9; + name = "advanced energy gun" + }, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/item/gun/energy/gun/nuclear, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "bwU" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -3270,19 +3266,6 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) -"bxi" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredaltstrip" - }, -/area/centcom/zone2) -"byq" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "byz" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -3317,21 +3300,54 @@ /obj/machinery/reagentgrinder, /turf/simulated/floor/wood, /area/centcom/zone1) +"byD" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access = list(150) + }, +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_sit_1"; + name = "Side Hull Door"; + opacity = 0; + req_access = list(150) + }, +/obj/structure/fans/tiny, +/obj/machinery/door_control/secure{ + id = "syndicate_sit_1"; + name = "Blast Doors"; + pixel_y = -23; + req_access = list(150) + }, +/obj/docking_port/mobile{ + dir = 4; + dwidth = 7; + height = 5; + id = "sit"; + name = "SIT shuttle"; + roundstart_move = "sit_away"; + width = 11; + port_direction = 4; + preferred_direction = 2 + }, +/obj/docking_port/stationary{ + dir = 4; + dwidth = 7; + height = 5; + id = "sit_away"; + name = "Syndicate Base"; + turf_type = /turf/simulated/floor/indestructible/plating; + width = 11 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/syndicate_sit) "byG" = ( /obj/structure/flora/grass/both, /obj/item/storage/fancy/cigarettes/cigpack_robustgold, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"byS" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_3) "byZ" = ( /obj/structure/railing{ dir = 8 @@ -3379,15 +3395,18 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"bAW" = ( +"bAT" = ( /obj/structure/table/glass, -/obj/item/paper, -/obj/item/folder/blue{ - pixel_x = 5; - pixel_y = -5 +/obj/item/pizzabox/vegetable, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellow" }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/specops) +"bBe" = ( +/obj/machinery/vending/ntcrates, +/turf/simulated/floor/plating, +/area/centcom/specops) "bBg" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ frequency = 1331; @@ -3418,12 +3437,9 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"bBo" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/evac) +"bBh" = ( +/turf/simulated/floor/plating, +/area/centcom/zone2) "bBD" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/syndicate, @@ -3489,6 +3505,35 @@ icon_state = "darkred" }, /area/syndicate_mothership/elite_squad) +"bCw" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + req_access = list(114) + }, +/obj/item/door_remote/centcomm, +/obj/item/clothing/head/beret/centcom/captain, +/obj/item/clothing/under/rank/centcom/captain, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/obj/item/clothing/gloves/color/white, +/obj/item/storage/box/centcomofficer, +/obj/item/radio/headset/centcom, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/accessory/holster, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ + pixel_y = 8; + pixel_x = -4 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_y = 12; + pixel_x = 10 + }, +/obj/item/megaphone, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "bCI" = ( /obj/effect/turf_decal/box/red, /turf/simulated/floor/indestructible/vox{ @@ -3496,6 +3541,10 @@ name = "floor" }, /area/vox_station) +"bCT" = ( +/obj/effect/turf_decal/siding/yellow, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "bCU" = ( /obj/machinery/computer/shuttle/trade/sol, /turf/simulated/floor/plasteel/grimy, @@ -3507,19 +3556,25 @@ /obj/effect/turf_decal/stripes/black, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) +"bDa" = ( +/turf/simulated/floor/indestructible{ + dir = 8; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) +"bDb" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood{ + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" + }, +/area/centcom/zone2) "bDo" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, /area/syndicate_mothership/jail) -"bDp" = ( -/obj/structure/coatrack, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "bDH" = ( /turf/simulated/floor/plasteel/grimy, /area/trader_station/sol) @@ -3545,24 +3600,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"bEk" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32 - }, -/obj/structure/window/reinforced, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22"; - tag = "icon-plant-22" - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"bEx" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "bEB" = ( /obj/structure/showcase{ desc = "This one has an old damaged suit in it. Not working..."; @@ -3583,34 +3620,29 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"bGq" = ( -/obj/machinery/smartfridge, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood, -/area/centcom/evac) -"bGt" = ( -/obj/structure/table/wood, -/obj/item/storage/lockbox/mindshield, -/obj/item/storage/lockbox/mindshield, -/obj/item/storage/lockbox/mindshield, -/obj/item/door_remote/centcomm, -/obj/item/storage/box/permits, -/obj/item/megaphone{ - pixel_x = -5; - pixel_y = 7 +"bEW" = ( +/obj/structure/railing{ + pixel_y = 32; + density = 0 }, -/obj/item/camera_bug/ert{ - pixel_y = 10 +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, +/area/centcom/specops) +"bFM" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"bGq" = ( +/obj/machinery/smartfridge, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood, +/area/centcom/evac) "bGz" = ( /obj/machinery/door/airlock/syndicate/public{ name = "Скромный зал славы"; @@ -3620,6 +3652,15 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"bGO" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/centcom/zone1) "bGP" = ( /obj/structure/table/abductor{ color = "#99ff99"; @@ -3638,6 +3679,13 @@ icon_state = "floor" }, /area/ninja/holding) +"bGQ" = ( +/obj/vehicle/ridden/secway{ + layer = 3.5 + }, +/obj/item/key/security, +/turf/simulated/floor/plating, +/area/centcom/specops) "bGZ" = ( /obj/machinery/power/smes/magical{ color = "#444455"; @@ -3680,13 +3728,25 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"bIj" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ +"bHU" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/gold{ dir = 5; - icon_state = "darkredalt" + do_not_delete_me = 1 }, -/area/centcom/jail) +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) +"bIE" = ( +/obj/effect/decal/nanotrasen_logo{ + icon_state = "logo4"; + pixel_x = 16 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "bIU" = ( /obj/machinery/smartfridge/secure/chemistry/preloaded/syndicate, /turf/simulated/floor/plasteel{ @@ -3694,35 +3754,6 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"bJk" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"bJo" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/glass, -/area/centcom/zone3) "bJL" = ( /obj/structure/ninjatele{ pixel_y = 25 @@ -3732,15 +3763,29 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"bKu" = ( -/obj/machinery/computer/card/centcom, -/obj/structure/window/reinforced{ - dir = 8 +"bKz" = ( +/obj/machinery/vending/nta/ertarmory/yellow{ + req_access = list(104,109) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "navyblue" }, -/area/centcom/bridge) +/area/centcom/specops) +"bKX" = ( +/obj/structure/rack, +/obj/item/melee/baton/telescopic{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/melee/baton/telescopic{ + pixel_y = 1 + }, +/obj/item/melee/baton/telescopic{ + pixel_x = 3; + pixel_y = -3 + }, +/turf/simulated/floor/carpet/black, +/area/syndicate_mothership/jail) "bLb" = ( /obj/structure/table/abductor{ color = "#99ff99"; @@ -3765,10 +3810,17 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"bLx" = ( -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +"bLr" = ( +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "bLD" = ( /obj/machinery/light, /turf/simulated/floor/wood, @@ -3798,11 +3850,12 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) -"bMS" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkgreen" +"bMP" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" }, +/turf/simulated/floor/plating/airless, /area/centcom/specops) "bNc" = ( /obj/machinery/door/window/brigdoor{ @@ -3815,6 +3868,17 @@ icon_state = "floorgrime" }, /area/ninja/holding) +"bNp" = ( +/obj/machinery/vending/dinnerware, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "bNW" = ( /obj/item/flashlight/lamp, /obj/structure/table/reinforced/brass, @@ -3831,44 +3895,6 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/cargo) -"bOG" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 1; - id_tag = "ERT_director_office_shutters"; - layer = 5; - locked = 1; - name = "CentCom SOO" - }, -/obj/machinery/door_control/secure{ - id = "ERT_director_office_shutters"; - pixel_x = 32; - req_access = list(114) - }, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) -"bOU" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"bOX" = ( -/obj/item/stack/wrapping_paper, -/obj/item/stack/wrapping_paper, -/obj/item/stack/wrapping_paper, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/structure/table, -/obj/item/paper{ - info = "

Особенности отправки оборудования с помощью шаттла отдела снабжения


С целью минимизации рисков провоза опасных грузов и/или контрабанды сотрудники департамента защиты активов NanoTrasen регулярно осуществляют проверки шаттла снабжения. Эти проверки включают в себя снятие внешней упаковки с контейнеров для проверки манифестов, а также уничтожение любых объектов, не находящихся в контейнерах. Контроль груза осуществляется:
  1. Непосредственно после отлета шаттла с АКН Трурль на объект NanoTrasen;
  2. После отлета шаттла с объекта NanoTrasen до прибытия на АКН Трурль;
  3. Непосредственно после стыковки шаттла с АКН Трурль.

Для отправки оборудования на объект NanoTrasen с помощью шаттла снабжения необходимо обернуть контейнер упаковочной бумагой или поместить его еще в один контейнер."; - name = "Особенности отправки оборудования с помощью шаттла отдела снабжения" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "bPp" = ( /obj/machinery/syndiepad/admin/loadpad{ target_id = "syndie_cargo_port2" @@ -3881,59 +3907,19 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"bPw" = ( -/obj/item/gun/energy/laser/instakill/blue, -/obj/item/gun/energy/laser/instakill/blue, -/obj/item/gun/energy/laser/instakill/blue, -/obj/item/gun/energy/laser/instakill/blue, -/obj/item/gun/energy/laser/instakill/blue, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - layer = 2.9; - name = "Secret Fun"; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" +"bPG" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 }, -/area/centcom/jail) +/turf/simulated/floor/carpet, +/area/centcom/evac) "bQi" = ( /obj/machinery/computer, /turf/simulated/floor/plasteel{ icon_state = "darkbluefull" }, /area/centcom/bridge) -"bQo" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) -"bQr" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/salglu, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/nitrogen, -/obj/item/tank/internals/emergency_oxygen/plasma, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluealt" - }, -/area/centcom/specops) "bQu" = ( /obj/machinery/vending/artvend, /turf/simulated/floor/wood, @@ -3945,14 +3931,6 @@ icon_state = "ninja_walls_corners" }, /area/shuttle/ninja) -"bQK" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/funeral) "bQZ" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ @@ -3966,10 +3944,6 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/spacebar) -"bRc" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) "bRi" = ( /obj/machinery/atmospherics/unary/cold_sink/freezer, /turf/simulated/floor/plasteel{ @@ -3990,32 +3964,46 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/funeral) -"bRw" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 +"bRu" = ( +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkredaltstrip" + dir = 8; + icon_state = "navybluealtstrip" }, -/area/centcom/jail) +/area/centcom/supply) "bRx" = ( /turf/simulated/floor/indestructible{ icon_state = "floor" }, /area/ninja/holding) +"bRL" = ( +/obj/structure/bookcase, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_general, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_medical, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_security, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/turf/simulated/floor/carpet, +/area/centcom/jail) "bRM" = ( /turf/simulated/floor/indestructible{ icon_state = "floorgrime" }, /area/ninja/holding) -"bRY" = ( -/obj/structure/table/glass, +"bSd" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellow" + icon_state = "darkfull" }, -/area/centcom/specops) +/area/centcom/jail) "bSe" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/shuttle/objective_check/vox, @@ -4041,12 +4029,12 @@ icon_state = "floor4" }, /area/shuttle/ussp) -"bSA" = ( +"bSx" = ( /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredaltstrip" + dir = 8; + icon_state = "darkyellowcornersalt" }, -/area/centcom/specops) +/area/centcom/zone3) "bSL" = ( /obj/structure/statue/sandstone/assistant{ anchored = 1; @@ -4062,16 +4050,6 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"bTd" = ( -/obj/structure/railing{ - dir = 8; - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/zone1) "bTx" = ( /obj/structure/table/reinforced/brass, /obj/item/storage/toolbox/electrical{ @@ -4167,6 +4145,19 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) +"bUi" = ( +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"bUs" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 + }, +/turf/simulated/floor/glass, +/area/centcom/bridge) "bUu" = ( /obj/machinery/suit_storage_unit/syndicate{ pixel_y = 6 @@ -4187,6 +4178,31 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) +"bVg" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/engineer{ + req_access = list(101,104,109) + }, +/obj/machinery/light, +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"bVq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" + }, +/area/shuttle/administration) +"bVt" = ( +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/specops) "bVx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -4215,25 +4231,16 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) -"bWc" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light{ - dir = 1 +"bVU" = ( +/obj/structure/closet/crate/can, +/obj/effect/turf_decal/siding/brown{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/centcom/zone3) -"bWt" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 6; - id = "pod4_away"; - name = "recovery ship bay 4"; - turf_type = /turf/simulated/floor/plating/airless; - width = 5 +/obj/structure/window/reinforced/tinted{ + dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/space) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "bWH" = ( /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/syndicate) @@ -4246,11 +4253,6 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"bXg" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/wall/shuttle, -/area/shuttle/siberia) "bXp" = ( /obj/effect/turf_decal/delivery/white, /obj/machinery/door/airlock/wood/glass{ @@ -4263,19 +4265,6 @@ icon_state = "dark" }, /area/centcom/zone2) -"bXr" = ( -/obj/structure/closet/cardboard{ - icon_state = "cardboard_librarian"; - icon_closed = "cardboard_librarian"; - icon_opened = "cardboard_librarian_open" - }, -/obj/item/paper/central_command/archive/memes{ - info = "
"; - name = "Супъективное мнение" - }, -/obj/item/book/random/triple, -/turf/simulated/floor/plating, -/area/centcom/zone2) "bXA" = ( /obj/structure/table/reinforced, /obj/item/stamp/syndicate, @@ -4289,6 +4278,16 @@ }, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) +"bXG" = ( +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8; + pixel_y = -16 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/specops) "bXH" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -4318,30 +4317,28 @@ name = "floor" }, /area/vox_station) -"bYI" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "ntsing_alt5" +"bZc" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/admin{ + dir = 1; + name = "NTV Argos shuttle navigation computer" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/turf_decal/stripes/gold{ + dir = 5; + do_not_delete_me = 1 }, -/area/centcom/specops) -"bYY" = ( -/obj/structure/railing{ - layer = 4.3; - density = 0 +/obj/machinery/light/small{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full" +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) +"bZj" = ( +/obj/machinery/status_display{ + pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/bridge) "bZu" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -4350,18 +4347,24 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"bZC" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +"bZw" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_Combat_shotgun"; + name = "Combat Shotguns"; + pixel_x = -8; + pixel_y = -24; + req_access = list(114) + }, +/obj/machinery/door_control/secure{ + id = "CC_Armory_IK60"; + name = "IK-60"; + pixel_x = 8; + pixel_y = -24; + req_access = list(114) }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) -"bZG" = ( -/obj/structure/chair/comfy/shuttle, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkyellow" + dir = 10; + icon_state = "navyblue" }, /area/centcom/specops) "bZP" = ( @@ -4379,20 +4382,6 @@ name = "floor" }, /area/vox_station) -"caN" = ( -/obj/structure/table/wood, -/obj/item/book/manual/security_space_law, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "caQ" = ( /obj/structure/chair/sofa{ dir = 9 @@ -4407,12 +4396,13 @@ /obj/structure/chair/sofa/left, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"cbK" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 +"cby" = ( +/obj/item/clothing/accessory/stripedredscarf, +/obj/item/clothing/head/hopcap, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/specops) "cbQ" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -4436,12 +4426,14 @@ }, /turf/simulated/floor/wood, /area/trader_station/sol) -"ccc" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 +"ccq" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealt" }, -/turf/simulated/floor/glass/reinforced, /area/centcom/specops) "ccA" = ( /obj/machinery/porta_turret/syndicate, @@ -4465,37 +4457,27 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"cdq" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/security_space_law, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"cdD" = ( -/obj/structure/bed, -/obj/item/bedsheet/qm, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 +"ccL" = ( +/obj/structure/table/glass, +/obj/item/storage/box/bodybags, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/paper/Cloning{ + pixel_x = 6 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone1) -"cdP" = ( -/turf/simulated/wall/shuttle/nosmooth/interior{ +/turf/simulated/floor/plasteel{ dir = 10; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners"; - underlay_floor_icon = 'icons/turf/shuttle/floors.dmi'; - underlay_floor_icon_state = "floor4" + icon_state = "whiteblue" }, -/area/shuttle/syndicate) -"cei" = ( -/obj/structure/table/glass, -/obj/item/toy/figure/dsquad, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) +/area/centcom/specops) +"ccX" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "ceD" = ( /obj/machinery/door/airlock/syndicate/command{ name = "Teleporter"; @@ -4520,6 +4502,29 @@ icon_state = "floor" }, /area/ninja/holding) +"ceX" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/obj/docking_port/mobile/pod{ + id = "pod2"; + name = "escape pod 2"; + roundstart_move = "pod2_home"; + dir = 8; + port_direction = 2 + }, +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 6; + id = "pod2_away"; + name = "recovery ship bay 2"; + turf_type = /turf/simulated/floor/plating/airless; + width = 5 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) "cfa" = ( /obj/item/grown/log/tree{ pixel_x = 3; @@ -4532,21 +4537,6 @@ }, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"cfq" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkredcorners" - }, -/area/centcom/specops) -"cfr" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "cfw" = ( /obj/structure/table, /obj/item/storage/box/masks, @@ -4592,30 +4582,14 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"cgu" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/reinforced{ - color = "black" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/funeral) -"cgx" = ( -/obj/docking_port/stationary{ - dheight = 1; - dir = 8; - dwidth = 7; - height = 18; - id = "trade_sol_base"; - name = "docking bay 2 at Jupiter Station"; - width = 15 +"cgv" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "Toxin" }, -/turf/space{ - icon_state = "black" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/space) +/area/centcom/supply) "cgU" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/peppermill, @@ -4634,15 +4608,6 @@ icon_state = "white" }, /area/centcom/jail) -"cgX" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DAE" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "chj" = ( /obj/structure/bookcase, /obj/item/book/manual, @@ -4652,6 +4617,13 @@ icon_state = "floorgrime" }, /area/ninja/holding) +"chv" = ( +/obj/machinery/light/spot, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "chw" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -4661,20 +4633,17 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"chF" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/jail) "chG" = ( /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkyellowaltstrip" }, /area/centcom/supply) +"chS" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkgreen" + }, +/area/centcom/specops) "cig" = ( /obj/structure/railing/corner, /obj/machinery/light/small{ @@ -4693,29 +4662,22 @@ icon_state = "floor" }, /area/ninja/holding) -"ciS" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +"ciK" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" }, -/turf/simulated/floor/wood, -/area/centcom/specops) -"ciU" = ( -/obj/structure/rack/holorack, -/obj/item/nullrod, -/obj/item/nullrod, -/obj/item/nullrod, -/obj/item/melee/baton/telescopic, -/obj/item/melee/baton/telescopic, -/obj/item/melee/baton/telescopic, -/obj/item/melee/baton/telescopic, -/obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 +/obj/machinery/door/airlock/centcom{ + name = "Medical Block"; + opacity = 1; + req_access = list(109) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/centcom/supply) +/area/centcom/specops) "ciV" = ( /turf/simulated/wall/shuttle{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' @@ -4734,6 +4696,31 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) +"cjk" = ( +/obj/structure/stone_tile/surrounding/burnt, +/obj/structure/stone_tile/center/burnt, +/obj/effect/landmark/spawner/bubblegum, +/turf/simulated/floor/lava/lava_land_surface, +/area/ruin/space/bubblegum_arena) +"cjr" = ( +/obj/structure/rack, +/obj/item/gun/energy/ionrifle/carbine{ + pixel_y = 7 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 7; + pixel_y = -2 + }, +/obj/item/grenade/empgrenade, +/obj/item/aicard{ + layer = 2.9; + pixel_x = -5; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "cjy" = ( /obj/structure/chair{ dir = 1 @@ -4752,33 +4739,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"cjN" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/green/hollow, -/obj/item/gun/projectile/automatic/m90{ - name = "\improper DAE 5.56 Compact GL"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/m90{ - name = "\improper DAE 5.56 Compact GL"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/m90{ - name = "\improper DAE 5.56 Compact GL"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/m90{ - name = "\improper DAE 5.56 Compact GL"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/m90{ - name = "\improper DAE 5.56 Compact GL"; - pixel_x = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "cjQ" = ( /obj/machinery/door/window/brigdoor{ color = "#00f700"; @@ -4803,18 +4763,59 @@ icon_state = "dark" }, /area/centcom/evac) -"cka" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "ERT_armory_lvl3"; - name = "Armory level 3"; - layer = 5 +"ckb" = ( +/obj/structure/window/reinforced{ + dir = 4 }, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/bridge) +"ckm" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/centcom/zone2) +"cko" = ( +/obj/structure/table/reinforced, +/obj/machinery/door_control/secure{ + id = "CC_space_jail_sec"; + pixel_y = -6; + pixel_x = -7 + }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + frequency = 2000; + id_tag = "CC-OP4"; + name = "Access Controller OP4"; + pixel_y = 6; + req_access = list(109); + tag_exterior_door = "CC-OP4-Ext"; + tag_interior_door = "CC-OP4-Int"; + pixel_x = -7 + }, +/obj/machinery/door_control/secure{ + id = "CC_space_jail_cell"; + pixel_y = -6; + pixel_x = 7; + color = "#FFA500"; + name = "remote cell shutters control"; + req_access = list(104,114) + }, +/obj/machinery/door_control/secure{ + id = "CC_space_jail_door"; + pixel_y = 6; + pixel_x = 7; + color = "#ffaaaa"; + name = "remote cell door bolts control"; + req_access = list(104,114); + specialfunctions = 4; + normaldoorcontrol = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkredaltstrip" + }, +/area/centcom/jail) "ckp" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/beer/upgraded, @@ -4866,6 +4867,12 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) +"ckU" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ckZ" = ( /obj/effect/turf_decal{ dir = 4; @@ -4884,32 +4891,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"clg" = ( -/obj/docking_port/mobile{ - dwidth = 8; - height = 22; - id = "syndicate"; - name = "syndicate shuttle"; - roundstart_move = "syndicate_away"; - width = 18 - }, -/obj/structure/lattice/catwalk, -/obj/docking_port/stationary/transit{ - dheight = 9; - dwidth = 5; - height = 22; - id = "syndicate_transit"; - name = "syndicate in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 18 - }, -/turf/simulated/floor/shuttle/transparent_floor{ - dir = 4; - icon = 'icons/turf/shuttle/misc.dmi'; - icon_state = "tube" - }, -/area/shuttle/syndicate) "cli" = ( /obj/item/shard, /turf/simulated/floor/indestructible/asteroid, @@ -4921,19 +4902,15 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) -"clv" = ( -/turf/simulated/floor/indestructible{ - dir = 4; - icon_state = "darkpurple" +"clC" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/janitor{ + req_access = list(101,104,109) }, -/area/centcom/specops) -"clw" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/machinery/computer/station_alert, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "cme" = ( /obj/structure/chair/comfy/shuttle{ @@ -4990,13 +4967,6 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/plating, /area/shuttle/spacebar) -"cnr" = ( -/turf/simulated/wall/shuttle/nosmooth{ - dir = 10; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners" - }, -/area/shuttle/ussp) "cnt" = ( /turf/simulated/floor/plasteel, /area/centcom/zone1) @@ -5023,15 +4993,11 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"coB" = ( -/obj/machinery/light{ - dir = 8 - }, +"con" = ( /turf/simulated/floor/plasteel{ - icon_state = "arrival"; - dir = 10 + icon_state = "darkred" }, -/area/centcom/evac) +/area/centcom/specops) "coI" = ( /obj/machinery/door/airlock/survival_pod{ drain_act_protected = 1 @@ -5056,26 +5022,6 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) -"coX" = ( -/obj/effect/turf_decal/arrows, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/supply) -"coZ" = ( -/obj/machinery/light, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"cpd" = ( -/obj/machinery/vending/ntc/medical, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "cpk" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/blood/oil, @@ -5102,21 +5048,34 @@ icon_state = "darkredcornersalt" }, /area/syndicate_mothership/control) -"cpK" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear{ +"cpW" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/black{ + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ dir = 1; do_not_delete_me = 1 }, -/obj/machinery/door/poddoor/shutters/invincible{ +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "white" + }, +/area/shuttle/administration) +"cqf" = ( +/obj/machinery/computer/shuttle/admin{ dir = 1; - id_tag = "CC_Armory_GYGAX" + name = "NTV Argos shuttle console" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" +/obj/effect/turf_decal/stripes/gold{ + dir = 6; + do_not_delete_me = 1; + icon_state = "gs_deadlock" }, -/area/centcom/specops) +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) "cqi" = ( /obj/structure/table/abductor{ color = "#99ff99"; @@ -5134,78 +5093,42 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"cqr" = ( -/obj/machinery/vending/medical, -/turf/simulated/floor/plasteel{ - icon_state = "darkbluealt" +"cqt" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, -/area/centcom/specops) -"cqx" = ( -/obj/effect/turf_decal/siding/white{ +/obj/docking_port/mobile/pod{ + id = "pod4"; + name = "escape pod 4"; + roundstart_move = "pod4_home"; dir = 4; - pixel_x = -14 + port_direction = 2 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 6; + id = "pod4_away"; + name = "recovery ship bay 4"; + turf_type = /turf/simulated/floor/plating/airless; + width = 5 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) +"cqv" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/blue{ + req_access = list(104,109) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) -"cqN" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/under/color/lightpurple, -/obj/item/clothing/under/color/purple, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/head/wizard/red, -/obj/item/clothing/suit/wizrobe/red, -/obj/item/clothing/head/wizard, -/obj/item/clothing/suit/wizrobe, -/obj/item/clothing/shoes/sandal, -/obj/item/clothing/shoes/sandal, -/obj/machinery/light/small{ - brightness_range = 6; - dir = 1; - light_range = 8; - nightshift_light_range = 6; - throw_range = 6 - }, -/turf/simulated/floor/carpet/cyan, -/area/wizard_station) -"cqX" = ( -/obj/structure/noticeboard{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/item/paper{ - info = "Передвинуть бойлер с водой" - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"crc" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl2"; - name = "Armory level 2"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 4; + icon_state = "navybluefull" }, /area/centcom/specops) -"crA" = ( -/obj/machinery/computer/pod/deathsquad, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) +"cqY" = ( +/turf/simulated/floor/wood, +/area/centcom/zone3) "crD" = ( /obj/structure/closet/crate, /obj/item/toy/plushie/blue_fox, @@ -5233,14 +5156,6 @@ icon_state = "white" }, /area/centcom/jail) -"crY" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "csh" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/siding/wideplating{ @@ -5250,12 +5165,27 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"csr" = ( +/obj/machinery/computer/cloning{ + dir = 8 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "csJ" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) +"csN" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "csQ" = ( /obj/machinery/sleeper/syndie, /turf/simulated/floor/shuttle{ @@ -5272,12 +5202,29 @@ /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, /area/centcom/zone1) +"ctk" = ( +/obj/structure/chair/office/light, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"cts" = ( +/obj/structure/bed, +/obj/item/bedsheet/red, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/arcade, +/area/centcom/zone1) "ctv" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/evac) -"ctz" = ( +"ctG" = ( /obj/structure/table, /obj/item/beach_ball, /obj/item/beach_ball/holoball, @@ -5306,6 +5253,17 @@ name = "floor" }, /area/vox_station) +"cuu" = ( +/obj/structure/railing{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "cuy" = ( /obj/item/shard, /obj/item/trash/sosjerky, @@ -5324,17 +5282,6 @@ name = "floor" }, /area/vox_station) -"cuU" = ( -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) -"cvg" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) "cvi" = ( /obj/structure/table/reinforced/brass, /obj/item/clothing/suit/space/vox/carapace, @@ -5364,31 +5311,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"cvq" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"cvQ" = ( -/obj/structure/shuttle/engine/platform{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/administration) -"cvR" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "CC_crate" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/supply) "cwn" = ( /obj/structure/table/reinforced/brass, /obj/item/clothing/suit/space/vox/medic, @@ -5413,6 +5335,19 @@ name = "floor" }, /area/vox_station) +"cwU" = ( +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice, +/turf/simulated/floor/carpet, +/area/centcom/evac) +"cxl" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/door_control/secure{ + id = "senior_o_shutters"; + req_access = list(114) + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "cxA" = ( /obj/machinery/teleport/hub/upgraded{ admin_usage = 1 @@ -5449,13 +5384,36 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"cxL" = ( -/obj/machinery/vending/tool, -/obj/effect/decal/warning_stripes/white/hollow, +"cxI" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/airlock/centcom{ + name = "Gamma Armory"; + opacity = 1; + req_access = list(114) + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 2; + id_tag = "gamma shuttle"; + layer = 5; + locked = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) +"cxK" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/vending/coffee/free, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "cxM" = ( /obj/structure/table/reinforced/brass, /obj/item/clothing/suit/space/vox/stealth, @@ -5582,63 +5540,35 @@ name = "floor" }, /area/syndicate_mothership) -"cAb" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_SRT"; - pixel_y = -25; - req_access = list(114); - pixel_x = 25; - name = "SRT Team 1" - }, +"cAA" = ( +/obj/item/flag/nt, /turf/simulated/floor/plasteel{ - icon_state = "navybluealtstrip" + dir = 9; + icon_state = "navybluealt" }, /area/centcom/specops) -"cAh" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, +"cBk" = ( +/obj/structure/sign/poster/official/ue_no, +/turf/simulated/wall/indestructible/sandstone, +/area/wizard_station) +"cBr" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "navyblue" }, -/area/centcom/zone3) -"cAo" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - dir = 1; - id_tag = "ERT_armory_vkd"; - name = "Armory level 1" +/area/centcom/specops) +"cBt" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DEDI" }, /obj/machinery/door/poddoor/impassable/preopen{ id_tag = "ERT_Quarantine"; name = "ERT Quarantine" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) -"cAw" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/donkpockets, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) -"cBk" = ( -/obj/structure/sign/poster/official/ue_no, -/turf/simulated/wall/indestructible/sandstone, -/area/wizard_station) -"cBr" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navyblue" + icon_state = "navybluealt" }, /area/centcom/specops) "cBu" = ( @@ -5650,17 +5580,6 @@ icon_state = "dark" }, /area/centcom/jail) -"cBR" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) "cBU" = ( /obj/machinery/hydroponics/soil, /turf/simulated/floor/indestructible/snow, @@ -5675,6 +5594,14 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"cCQ" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_1) "cCT" = ( /obj/structure/bookcase, /obj/item/book/manual, @@ -5711,22 +5638,12 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"cDQ" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/portable_atmospherics/canister/air{ - maximum_pressure = 50000 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "Air"; +"cDS" = ( +/obj/effect/turf_decal/siding/yellow{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "cDU" = ( /obj/item/flag/ninja, /turf/simulated/floor/indestructible{ @@ -5793,26 +5710,29 @@ icon_state = "dark" }, /area/centcom/evac) -"cFR" = ( -/obj/structure/chair/comfy/purp{ - dir = 1 - }, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) "cFY" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood, /area/centcom/jail) -"cGx" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda/upgraded, -/obj/machinery/light{ - dir = 4 +"cGy" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/item/book/manual/security_space_law{ + pixel_x = 3 }, -/area/centcom/specops) +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/evac) "cGz" = ( /obj/structure/table/wood, /obj/item/clothing/suit/space/hardsuit/syndi{ @@ -5838,6 +5758,10 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) +"cGL" = ( +/obj/structure/table/wood/fancy/royalblue, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) "cHC" = ( /obj/structure/grille, /obj/structure/window/full/shuttle/gray, @@ -5850,13 +5774,15 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"cHQ" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "applebush" +"cHS" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) +/turf/simulated/floor/carpet, +/area/centcom/zone3) "cHT" = ( /obj/structure/bonfire/dense, /turf/simulated/floor/indestructible/asteroid, @@ -5870,28 +5796,6 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"cIa" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/salglu, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/nitrogen, -/obj/item/tank/internals/emergency_oxygen/plasma, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkbluecornersalt" - }, -/area/centcom/specops) "cIh" = ( /obj/structure/table/glass, /obj/item/circular_saw, @@ -5919,6 +5823,16 @@ name = "floor" }, /area/vox_station) +"cJg" = ( +/obj/machinery/requests_console{ + department = "Central Command"; + departmentType = 1; + name = "CC Requests Console"; + pixel_x = -32; + pixel_y = 32 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "cJq" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -5943,6 +5857,13 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"cJL" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/bridge) "cJM" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -5954,14 +5875,10 @@ name = "floor" }, /area/vox_station) -"cKh" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) +"cKq" = ( +/obj/structure/falsewall/reinforced, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/jail) "cKt" = ( /obj/machinery/door/airlock/syndicate/security{ id_tag = "SyndFB_prison_stroll"; @@ -5989,6 +5906,43 @@ /obj/machinery/chem_dispenser/soda/upgraded, /turf/simulated/floor/carpet/red, /area/centcom/zone1) +"cKF" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredaltstrip" + }, +/area/centcom/zone2) +"cKI" = ( +/obj/structure/table/wood, +/obj/item/book/manual/security_space_law, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"cKK" = ( +/obj/structure/bookcase/random/fiction, +/obj/item/book/manual/security_space_law/black, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/sop_security, +/obj/item/book/manual/faxes, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_medical, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/obj/item/book/manual/sop_engineering, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "cKU" = ( /obj/machinery/conveyor_switch/oneway{ id = "SFBQMLoad2"; @@ -6018,25 +5972,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) -"cLz" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 8; - id_tag = "CC_supply_internal"; - layer = 5; - locked = 1 - }, -/obj/machinery/door_control/secure{ - id = "CC_supply_internal"; - name = "Supply External Shutters"; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "cLC" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 @@ -6061,6 +5996,19 @@ /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"cMh" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/structure/window/reinforced{ + layer = 3.1; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/centcom/specops) "cMm" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -6070,47 +6018,6 @@ name = "floor" }, /area/vox_station) -"cMn" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/accessory/black{ - desc = null; - name = "Black tie" - }, -/obj/item/clothing/accessory/blue{ - desc = null; - name = "Blue tie" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/accessory/blue{ - desc = null; - name = "Blue tie" - }, -/obj/item/clothing/accessory/black{ - desc = null; - name = "Black tie" - }, -/obj/item/clothing/accessory/holster{ - desc = null; - name = "Shoulder holster" - }, -/obj/item/clothing/accessory/holster{ - desc = null; - name = "Shoulder holster" - }, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/storage/belt/fannypack/black, -/obj/item/storage/belt/fannypack/black, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"cMz" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/zone2) "cMD" = ( /obj/machinery/door/airlock/survival_pod{ drain_act_protected = 1 @@ -6124,13 +6031,6 @@ /obj/machinery/vending/autodrobe, /turf/simulated/floor/wood, /area/centcom/zone1) -"cMR" = ( -/turf/simulated/wall/shuttle/nosmooth{ - dir = 6; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners" - }, -/area/shuttle/ussp) "cNc" = ( /obj/structure/chair/comfy/black, /obj/effect/landmark/syndicate_officer, @@ -6151,6 +6051,14 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) +"cNy" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/item/flag/nt, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "cNW" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 8 @@ -6184,18 +6092,6 @@ }, /turf/simulated/floor/carpet/black, /area/trader_station/sol) -"cPv" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - id_tag = "shit_rain_home"; - name = "Shuttle Hatch"; - req_access = list(109) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "cPC" = ( /obj/effect/turf_decal{ dir = 6; @@ -6213,21 +6109,15 @@ icon_state = "dark" }, /area/centcom/zone1) +"cPL" = ( +/obj/structure/curtain/black, +/turf/simulated/floor/plasteel/freezer, +/area/centcom/specops) "cPM" = ( /turf/simulated/floor/plasteel{ icon_state = "arrivalcorner" }, /area/centcom/evac) -"cQf" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_4) "cQm" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ @@ -6268,20 +6158,6 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"cQO" = ( -/obj/structure/chair/comfy/red{ - color = "#FFFFFF"; - dir = 8 - }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) -"cQX" = ( -/obj/machinery/light, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "cRm" = ( /obj/structure/table/abductor{ color = "#99ff99"; @@ -6329,10 +6205,6 @@ name = "floor" }, /area/syndicate_mothership) -"cSa" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, -/area/shuttle/supply) "cSb" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -6355,21 +6227,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"cSM" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "nanotrasen_sign4"; - pixel_x = -16; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" - }, -/area/centcom/specops) "cSN" = ( /obj/structure/closet/crate/freezer{ desc = "A crate."; @@ -6386,12 +6243,43 @@ icon_state = "dark" }, /area/centcom/zone1) +"cTj" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 175; + teleport_y = 63; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" + }, +/area/centcom/specops) "cTV" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/zone1) +"cUs" = ( +/obj/structure/holohoop{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "cUz" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak-broken4" @@ -6401,6 +6289,19 @@ /obj/effect/turf_decal/weather/snow/corner, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) +"cUN" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/turf/simulated/floor/plasteel{ + icon_state = "redfull"; + tag = "icon-redfull (NORTHWEST)" + }, +/area/centcom/zone1) "cVb" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -6408,19 +6309,6 @@ /obj/item/shard, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"cVk" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/computer, -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "cVs" = ( /obj/structure/closet/crate{ icon_state = "crateopen"; @@ -6436,19 +6324,17 @@ name = "floor" }, /area/vox_station) -"cVv" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/machinery/photocopier{ - anchored = 0 +"cVB" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkredaltstrip" }, -/obj/structure/sign/poster/secret/lady{ - pixel_x = 32 +/area/centcom/zone3) +"cVJ" = ( +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/shuttle/gamma) "cVM" = ( /obj/structure/table, /obj/machinery/chem_dispenser/soda/upgraded, @@ -6457,13 +6343,55 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"cWV" = ( -/obj/item/flag/nt, +"cWC" = ( +/obj/machinery/door/airlock/centcom{ + name = "Prison"; + opacity = 1; + req_access = list(104) + }, +/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/jail) +"cWM" = ( +/obj/effect/decal/warning_stripes/blue, +/obj/machinery/door/airlock/centcom{ + name = "Artillery Control"; + opacity = 1; + req_access = list(114) + }, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_BSA" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"cWR" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/medical{ dir = 4; - icon_state = "darkyellowalt" + req_access = list(103,104,109) }, -/area/centcom/zone3) +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"cXc" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "cYf" = ( /obj/structure/closet/crate/freezer{ desc = "A crate."; @@ -6533,46 +6461,31 @@ name = "floor" }, /area/vox_station) -"cZF" = ( -/obj/structure/table/reinforced, -/obj/machinery/door_control/secure{ - id = "CC_space_jail_sec"; - pixel_y = -6; - pixel_x = -7 - }, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 2000; - id_tag = "CC-OP4"; - name = "Access Controller OP4"; - pixel_y = 6; - req_access = list(109); - tag_exterior_door = "CC-OP4-Ext"; - tag_interior_door = "CC-OP4-Int"; - pixel_x = -7 - }, -/obj/machinery/door_control/secure{ - id = "CC_space_jail_cell"; - pixel_y = -6; - pixel_x = 7; - color = "#FFA500"; - name = "remote cell shutters control"; - req_access = list(104,114) - }, -/obj/machinery/door_control/secure{ - id = "CC_space_jail_door"; - pixel_y = 6; - pixel_x = 7; - color = "#ffaaaa"; - name = "remote cell door bolts control"; - req_access = list(104,114); - specialfunctions = 4; - normaldoorcontrol = 1 +"cYV" = ( +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl2"; + name = "Armory level 2"; + layer = 5 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredaltstrip" + icon_state = "darkfull" }, -/area/centcom/jail) +/area/centcom/specops) +"cZc" = ( +/obj/effect/landmark/marauder_exit, +/obj/structure/fans/tiny, +/obj/effect/decal/warning_stripes/north, +/obj/effect/turf_decal/tile/neutral{ + alpha = 220; + color = "black"; + icon_state = "tile_full"; + layer = 9; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "cZK" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" @@ -6601,13 +6514,10 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"daw" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "navybluealt" - }, +"daB" = ( +/obj/machinery/photocopier, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "daD" = ( /obj/item/twohanded/required/kirbyplants{ @@ -6618,39 +6528,15 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) -"daN" = ( -/obj/machinery/computer/security{ - network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome") - }, -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredfull" - }, -/area/centcom/bridge) -"daU" = ( +"daM" = ( +/obj/structure/window/reinforced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 9; - pixel_y = 1; - pixel_x = -1; - density = 0 + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealt" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/zone3) "dbj" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-30"; @@ -6673,20 +6559,15 @@ }, /turf/simulated/floor/plasteel/grimy, /area/trader_station/sol) -"dbW" = ( +"dcc" = ( /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellow" - }, -/area/centcom/specops) -"dcf" = ( -/obj/machinery/computer/camera_advanced, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 + dir = 4; + icon_state = "darkredaltstrip" }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/centcom/zone2) +"dcl" = ( +/turf/simulated/wall/shuttle/onlyselfsmooth, +/area/shuttle/transport) "dcA" = ( /obj/structure/window/reinforced{ color = "red"; @@ -6698,6 +6579,23 @@ /obj/item/paper/monitorkey, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"ddb" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1331; + id_tag = "admin_s_pump" + }, +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" + }, +/area/shuttle/administration) +"ddG" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "ddL" = ( /obj/structure/table/wood{ color = "#996633" @@ -6705,48 +6603,12 @@ /obj/item/kitchen/knife, /turf/simulated/floor/carpet/black, /area/trader_station/sol) -"ddN" = ( -/obj/structure/table/wood, -/obj/item/folder/yellow{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/folder/red{ - pixel_x = 7 - }, -/obj/item/folder/blue{ - pixel_x = 7; - pixel_y = -7 - }, -/obj/item/storage/briefcase, -/obj/item/door_remote/omni, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "ddZ" = ( /obj/structure/chair/sofa/left{ dir = 8 }, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"dec" = ( -/obj/effect/turf_decal/arrows{ - dir = 8 - }, -/obj/machinery/door_control/secure{ - id = "Drop"; - name = "Massdriver Shutters"; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "def" = ( /obj/structure/window/reinforced{ dir = 1; @@ -6757,16 +6619,22 @@ icon_state = "dark" }, /area/centcom/jail) -"del" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 +"deE" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater3x3_side"; + tag = "icon-heater (NORTH)" }, -/turf/simulated/floor/glass, -/area/centcom/bridge) +/obj/structure/window/plasmareinforced{ + color = "#22aab7"; + dir = 8 + }, +/obj/structure/shuttle/engine/platform{ + dir = 4; + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) "deK" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -6776,18 +6644,16 @@ }, /turf/simulated/floor/carpet/black, /area/trader_station/sol) -"deM" = ( -/obj/structure/table/glass, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +"dfd" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/item/pen/fancy{ - pixel_x = 1; - pixel_y = 4 +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 5 }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "dfj" = ( /obj/effect/turf_decal{ dir = 10; @@ -6860,6 +6726,12 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) +"dgp" = ( +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "dgy" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -6878,17 +6750,30 @@ icon_state = "bot" }, /area/shuttle/escape) -"dhv" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 1 +"dhe" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/candle/eternal, +/turf/simulated/floor/wood, +/area/centcom/zone1) +"dhK" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + name = "Labor Shuttle Airlock" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 5; + id = "laborcamp"; + name = "labor camp shuttle"; + rebuildable = 1; + roundstart_move = "laborcamp_home"; + width = 9; + port_direction = 4 }, -/area/centcom/evac) +/obj/structure/fans/tiny, +/turf/simulated/floor/shuttle, +/area/shuttle/siberia) "dhX" = ( /obj/effect/turf_decal{ dir = 8; @@ -6909,13 +6794,6 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"dix" = ( -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, -/obj/structure/filingcabinet/medical, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "diG" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -6930,112 +6808,17 @@ /obj/item/seeds/wheat/rice, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"dji" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/head/beret/atmos{ - name = "beret" - }, -/obj/item/clothing/head/beret/atmos{ - name = "beret" - }, -/obj/item/clothing/head/beret/ce{ - name = "beret" - }, -/obj/item/clothing/head/beret/ce{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/captain{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/captain{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - name = "beret" - }, -/obj/item/clothing/head/beret/durathread{ - name = "beret" - }, -/obj/item/clothing/head/beret/durathread{ - name = "beret" - }, -/obj/item/clothing/head/beret/eng{ - name = "beret" - }, -/obj/item/clothing/head/beret/eng{ - name = "beret" - }, -/obj/item/clothing/head/beret/elo{ - name = "beret" - }, -/obj/item/clothing/head/beret/elo{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/clothing/head/fedora, -/obj/item/clothing/head/fedora, -/obj/item/clothing/head/fedora{ - icon_state = "wfedora" - }, -/obj/item/clothing/head/fedora{ - icon_state = "wfedora" - }, -/obj/item/clothing/head/beret/purple{ - name = "beret" - }, -/obj/item/clothing/head/beret/purple{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "beret_hos_black"; - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "beret_hos_black"; - name = "beret" +"djc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/item/flag/nt, +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"djs" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 6; - id = "pod1_away"; - name = "recovery ship bay 1"; - turf_type = /turf/simulated/floor/plating/airless; - width = 5 +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" }, -/turf/simulated/floor/plating/airless, -/area/space) +/area/shuttle/administration) "djz" = ( /obj/machinery/slot_machine, /obj/machinery/light/small{ @@ -7043,20 +6826,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"djD" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) -"dkb" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/centcom/jail) "dkg" = ( /obj/structure/reagent_dispensers/beerkeg{ desc = "Собственность Шерлока Субботина" @@ -7070,17 +6839,6 @@ /obj/item/razor, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) -"dkS" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/hatch{ - name = "NVT Argos"; - req_access = list(101) - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) "dlk" = ( /obj/effect/turf_decal{ dir = 4; @@ -7108,6 +6866,16 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"dlT" = ( +/obj/structure/table, +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "dmj" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -7122,39 +6890,43 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"dmR" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal, -/area/shuttle/administration) -"dmX" = ( +"dmx" = ( +/obj/machinery/light/spot, +/obj/structure/closet/crate, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) +"dnh" = ( +/obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluecornersalt" + icon_state = "dark" }, /area/centcom/specops) -"dnA" = ( -/obj/machinery/computer/camera_advanced{ - icon_keyboard = "seclaptop_key"; - icon_screen = "seclaptop"; - icon_state = "laptop" - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = 26; - pixel_y = 26 - }, -/obj/machinery/light_construct/small{ - dir = 4 +"dnB" = ( +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/doctor, +/obj/item/storage/firstaid/doctor, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/structure/rack, +/obj/structure/extinguisher_cabinet{ + name = "west extinguisher cabinet"; + pixel_x = -27 }, -/mob/living/simple_animal/frog/scream/mapper{ - pixel_x = -2; - pixel_y = 11 +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkbluealt" }, -/obj/structure/table/holotable/wood, -/turf/simulated/floor/carpet/black, /area/centcom/specops) -"dnJ" = ( -/obj/machinery/computer/message_monitor, -/turf/simulated/floor/bluegrid, -/area/centcom/bridge) +"dnE" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealtstrip" + }, +/area/centcom/supply) "dnL" = ( /obj/machinery/light/small{ dir = 8 @@ -7163,52 +6935,14 @@ icon_state = "floorgrime" }, /area/ninja/holding) -"dnM" = ( -/obj/structure/table/reinforced{ - color = "#444444" - }, -/obj/structure/sign/poster/official/kill_syndicate{ - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"doh" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/gold/glass{ - frequency = 2000; - hackable = 0; - id_tag = "CC-OP4-Ext"; - locked = 1; - name = "Zone 3" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 2000; - master_tag = "CC-OP4"; - name = "CC-OP4-EXT"; - pixel_y = 24; - req_access = list(109); - wires = 0 +"dnT" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 2 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" }, /area/centcom/specops) -"dom" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 6; - id = "pod2_away"; - name = "recovery ship bay 2"; - turf_type = /turf/simulated/floor/plating/airless; - width = 5 - }, -/turf/simulated/floor/plating/airless, -/area/space) "dov" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/weather/snow/corner{ @@ -7219,6 +6953,12 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) +"doA" = ( +/obj/structure/window/reinforced, +/turf/simulated/wall/indestructible/reinforced{ + density = 0 + }, +/area/centcom/zone2) "doL" = ( /obj/item/stack/sheet/mineral/sandbags, /turf/simulated/floor/indestructible/vox{ @@ -7226,28 +6966,6 @@ name = "floor" }, /area/vox_station) -"dpe" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) -"dpf" = ( -/obj/effect/turf_decal/caution/stand_clear, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/zone3) -"dpg" = ( -/turf/simulated/wall/indestructible/abductor, -/area/abductor_ship) -"dpw" = ( -/obj/machinery/vending/snack{ - pixel_y = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "dpF" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2 @@ -7257,55 +6975,25 @@ icon_state = "dark" }, /area/centcom/zone1) -"dpG" = ( -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 100; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"dpI" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) -"dpJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone3) -"dqc" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 4 +"dqf" = ( +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "ERT_armory_lvl3"; + name = "Armory level 3"; + layer = 5 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"dqe" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/turf/simulated/floor/plating/airless, /area/centcom/specops) +"dqo" = ( +/obj/machinery/vending/ntc/medal, +/obj/structure/table, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "dqG" = ( /turf/simulated/floor/plating/asteroid{ dir = 8; @@ -7313,13 +7001,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"dqR" = ( -/obj/structure/table/wood{ - color = "#996633" - }, -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/grass, -/area/centcom/evac) "dqX" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -7358,6 +7039,29 @@ icon_state = "darkredalt" }, /area/centcom/jail) +"drr" = ( +/obj/item/storage/ashtray/glass{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/lighter/zippo/blue{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/structure/table/glass, +/obj/item/paper/monitorkey, +/obj/item/paper/tcommskey, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "drz" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 6 @@ -7372,42 +7076,29 @@ "dsj" = ( /turf/simulated/floor/glass/reinforced, /area/centcom/zone1) -"dsI" = ( -/obj/machinery/power/apc{ - name = "Gamma Armory APC"; - pixel_y = -24 - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/sign/securearea{ - pixel_x = -32 - }, -/obj/structure/closet/secure_closet/guncabinet, -/obj/item/gun/rocketlauncher, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/kitchen/knife/combat, -/obj/item/kitchen/knife/combat, -/obj/item/kitchen/knife/combat, -/obj/item/grenade/chem_grenade/incendiary{ - name = "Incendiary Grenade" +"dsK" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" }, -/obj/item/grenade/clusterbuster, -/obj/machinery/light/spot{ +/obj/docking_port/mobile/pod{ + id = "pod1"; + name = "escape pod 1"; + roundstart_move = "pod1_home"; dir = 8; - tag = "icon-tube1 (WEST)" + port_direction = 2 }, -/obj/item/gun/projectile/automatic/m52, -/obj/item/ammo_box/magazine/m52mag, -/obj/item/ammo_box/magazine/m52mag, -/obj/item/ammo_box/magazine/m52mag, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 6; + id = "pod1_away"; + name = "recovery ship bay 1"; + turf_type = /turf/simulated/floor/plating/airless; + width = 5 }, -/area/shuttle/gamma) +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) "dsX" = ( /obj/structure/railing{ dir = 1 @@ -7418,20 +7109,6 @@ tag = "icon-stage_stairs" }, /area/ninja/holding) -"dtj" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 1 - }, -/obj/structure/shuttle/engine/platform{ - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate) "dtu" = ( /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/indestructible/beach/coastline{ @@ -7458,6 +7135,16 @@ name = "floor" }, /area/ninja/holding) +"dtR" = ( +/obj/structure/chair/comfy/lime{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) "duf" = ( /obj/item/tank/internals/oxygen/ninja{ pixel_x = -3; @@ -7507,12 +7194,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"dvj" = ( -/turf/simulated/floor/indestructible{ - dir = 6; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) "dvt" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 5 @@ -7544,19 +7225,12 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) -"dvI" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 6; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +"dvD" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 }, -/area/shuttle/administration) +/turf/simulated/floor/wood, +/area/centcom/specops) "dvN" = ( /obj/structure/decorative_structures/metal/statue/golden_disk, /obj/effect/turf_decal/siding/wood{ @@ -7585,33 +7259,17 @@ icon_state = "darkred" }, /area/syndicate_mothership/infteam) -"dwn" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "ntsing_alt2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"dwI" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkgreen" - }, -/area/centcom/specops) "dwJ" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/grass, /area/centcom/evac) -"dxs" = ( -/obj/vehicle/ridden/motorcycle{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" +"dxk" = ( +/obj/machinery/vending/boozeomat, +/obj/structure/sign/barsign{ + pixel_y = 32 }, -/area/syndicate_mothership) +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "dxK" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo5" @@ -7634,12 +7292,6 @@ name = "floor" }, /area/vox_station) -"dyh" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredaltstrip" - }, -/area/centcom/zone3) "dyy" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7649,12 +7301,6 @@ icon_state = "seadeep" }, /area/centcom/evac) -"dyH" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkred" - }, -/area/centcom/specops) "dyM" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/turf_decal/stripes/red/line, @@ -7663,6 +7309,26 @@ name = "floor" }, /area/vox_station) +"dyN" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/obj/machinery/computer/station_alert, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"dyQ" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_DEDI"; + pixel_x = 24; + pixel_y = 24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealtstrip" + }, +/area/centcom/specops) "dzo" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/arrows/red{ @@ -7673,51 +7339,6 @@ name = "floor" }, /area/vox_station) -"dzA" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/waterbottle, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"dzF" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/supply) -"dzO" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access = list(150) - }, -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 5; - id = "ruins_transport_shuttle"; - name = "USSP Cargo Shuttle"; - roundstart_move = "ussp_dock"; - width = 8 - }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 5; - id = "ruins_transport_shuttle_transit"; - name = "Transport Shuttle in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 8 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/ussp) "dzW" = ( /obj/effect/turf_decal/stripes/red/line, /turf/simulated/floor/indestructible/vox{ @@ -7739,25 +7360,55 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/cargo) -"dAk" = ( -/obj/structure/toilet{ - dir = 4; - name = "Трон старшего администратора" - }, -/obj/machinery/light/small{ - dir = 1 +"dAl" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DURAND" }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "darkfull" }, -/area/centcom/evac) -"dAz" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -32 +/area/centcom/specops) +"dAP" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" }, -/turf/simulated/floor/plasteel{ - icon_state = "navybluealt" +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" + }, +/obj/item/clothing/shoes/fluff/noble_boot, +/obj/item/clothing/shoes/fluff/noble_boot, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots/jacksandals, +/obj/item/clothing/shoes/jackboots/jacksandals, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/shoes/leather, +/obj/item/clothing/shoes/leather, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white{ + icon_state = "secshoes"; + name = "shoes" + }, +/obj/item/clothing/shoes/white{ + icon_state = "secshoes"; + name = "shoes" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "dAU" = ( /obj/effect/turf_decal/number/number_1{ @@ -7768,6 +7419,15 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) +"dBk" = ( +/obj/structure/sign/custodian{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navybluealt" + }, +/area/centcom/specops) "dBt" = ( /obj/effect/turf_decal/stripes/gold{ dir = 6 @@ -7783,6 +7443,47 @@ name = "floor" }, /area/vox_station) +"dBL" = ( +/obj/item/gun/energy/laser/instakill/blue, +/obj/item/gun/energy/laser/instakill/blue, +/obj/item/gun/energy/laser/instakill/blue, +/obj/item/gun/energy/laser/instakill/blue, +/obj/item/gun/energy/laser/instakill/blue, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + layer = 2.9; + name = "Secret Fun"; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "vault" + }, +/area/centcom/jail) +"dBY" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + name = "Escape Pod Hatch" + }, +/obj/docking_port/mobile/pod{ + id = "pod3"; + name = "escape pod 3"; + roundstart_move = "pod3_home"; + dir = 4; + port_direction = 2 + }, +/obj/docking_port/stationary{ + dir = 4; + dwidth = 2; + height = 6; + id = "pod3_away"; + name = "recovery ship bay 3"; + turf_type = /turf/simulated/floor/plating/airless; + width = 5 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) "dBZ" = ( /obj/structure/sign/poster/contraband/smoke{ pixel_y = -32 @@ -7793,6 +7494,21 @@ name = "floor" }, /area/vox_station) +"dCm" = ( +/obj/item/stack/wrapping_paper, +/obj/item/stack/wrapping_paper, +/obj/item/stack/wrapping_paper, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, +/obj/structure/table, +/obj/item/paper{ + info = "

Особенности отправки оборудования с помощью шаттла отдела снабжения


С целью минимизации рисков провоза опасных грузов и/или контрабанды сотрудники департамента защиты активов NanoTrasen регулярно осуществляют проверки шаттла снабжения. Эти проверки включают в себя снятие внешней упаковки с контейнеров для проверки манифестов, а также уничтожение любых объектов, не находящихся в контейнерах. Контроль груза осуществляется:
  1. Непосредственно после отлета шаттла с АКН Трурль на объект NanoTrasen;
  2. После отлета шаттла с объекта NanoTrasen до прибытия на АКН Трурль;
  3. Непосредственно после стыковки шаттла с АКН Трурль.

Для отправки оборудования на объект NanoTrasen с помощью шаттла снабжения необходимо обернуть контейнер упаковочной бумагой или поместить его еще в один контейнер."; + name = "Особенности отправки оборудования с помощью шаттла отдела снабжения" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "dCs" = ( /obj/item/trash/chips, /obj/effect/turf_decal/bot_red, @@ -7801,6 +7517,12 @@ name = "floor" }, /area/vox_station) +"dCD" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellow" + }, +/area/centcom/specops) "dCG" = ( /obj/structure/rack, /obj/item/crowbar/large, @@ -7826,6 +7548,25 @@ name = "floor" }, /area/vox_station) +"dCK" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) +"dCT" = ( +/obj/structure/sign/greencross{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreencorners" + }, +/area/centcom/specops) "dCY" = ( /obj/item/trash/tapetrash, /obj/structure/closet/crate{ @@ -7871,12 +7612,35 @@ }, /turf/simulated/floor/glass/reinforced, /area/centcom/zone1) -"dDF" = ( -/obj/structure/table, +"dDx" = ( +/obj/structure/table/reinforced, +/obj/item/grenade/clusterbuster/nervegas, +/obj/item/grenade/clusterbuster/nervegas, +/obj/item/grenade/clusterbuster/nervegas, +/obj/item/grenade/clusterbuster/teargas, +/obj/item/grenade/clusterbuster/teargas, +/obj/item/grenade/clusterbuster/teargas, +/obj/item/grenade/clusterbuster/mega_bang, +/obj/item/grenade/clusterbuster/mega_bang, +/obj/item/grenade/clusterbuster/mega_bang, +/obj/effect/decal/warning_stripes/green/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/zone1) +/area/centcom/specops) +"dDW" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-17"; + tag = "icon-plant-17" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "dDZ" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 @@ -7892,10 +7656,34 @@ "dEb" = ( /turf/simulated/floor/carpet, /area/centcom/specops) +"dEc" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 10; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/administration) "dEd" = ( /obj/effect/landmark/start, /turf/simulated/wall/indestructible/splashscreen, /area/start) +"dEr" = ( +/obj/effect/turf_decal/delivery/white, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_SRT" + }, +/obj/machinery/door/airlock/centcom{ + aiControlDisabled = 1; + hackProof = 1; + name = "Special ReactionTeam"; + opacity = 1; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "dEs" = ( /obj/structure/flora/straw_bail, /turf/simulated/floor/indestructible/snow, @@ -7910,31 +7698,24 @@ name = "floor" }, /area/vox_station) -"dEK" = ( -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) -"dEN" = ( -/obj/machinery/chem_dispenser/supgraded, -/turf/simulated/floor/engine, -/area/centcom/specops) -"dEQ" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/engineer{ - req_access = list(101,104,109) +"dEV" = ( +/obj/machinery/door/airlock/external{ + id_tag = "supply_away"; + name = "Central Command Supply"; + req_access = list(31); + hackProof = 1 }, -/obj/machinery/light, -/obj/effect/decal/warning_stripes/white/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door/poddoor{ + id_tag = "CC_supply_space"; + locked = 2; + name = "Supply Blastdoor" }, -/area/centcom/specops) -"dEW" = ( +/obj/structure/fans/tiny, +/obj/effect/decal/warning_stripes/white, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + icon_state = "dark" }, -/area/centcom/bridge) +/area/centcom/supply) "dFh" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7964,27 +7745,54 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"dFI" = ( -/obj/structure/window/reinforced{ - dir = 8 +"dFD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/turf_decal/stripes/black{ + dir = 6; + do_not_delete_me = 1 }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_1) +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "dGr" = ( /obj/item/skeleton/r_arm, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"dGv" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +"dGA" = ( +/obj/machinery/computer/camera_advanced{ + icon_keyboard = "seclaptop_key"; + icon_screen = "seclaptop"; + icon_state = "laptop" }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 26; + pixel_y = 26 + }, +/obj/machinery/light_construct/small{ + dir = 4 + }, +/mob/living/simple_animal/frog/scream/mapper{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/structure/table/holotable/wood, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) +"dGB" = ( +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + id_tag = "ERT_armory_lvl1"; + name = "Armory level 1"; + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "dGC" = ( /obj/machinery/computer/shuttle/sst, /turf/simulated/floor/carpet/black, @@ -7993,6 +7801,13 @@ /mob/living/simple_animal/hostile/carp/koi, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) +"dGL" = ( +/obj/structure/closet/crate/can, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "vault" + }, +/area/centcom/specops) "dGN" = ( /obj/structure/table/reinforced, /obj/item/kitchen/utensil/pspork, @@ -8021,9 +7836,19 @@ /obj/machinery/computer/shuttle/ruins_civil_shuttle, /turf/simulated/floor/shuttle, /area/shuttle/spacebar) -"dIg" = ( -/turf/simulated/floor/shuttle/transparent_floor, -/area/shuttle/administration) +"dIb" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_PDW"; + name = "PDW-9"; + pixel_x = 24; + pixel_y = 24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreencorners"; + dir = 1 + }, +/area/centcom/specops) "dIi" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -8057,17 +7882,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"dIU" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "CC_ERT1" - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealt" - }, -/area/centcom/specops) "dIY" = ( /obj/structure/window/reinforced{ color = "red"; @@ -8077,24 +7891,9 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"dIZ" = ( -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, -/area/centcom/specops) "dJo" = ( /turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/control) -"dJw" = ( -/obj/machinery/chem_master, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/engine, -/area/centcom/specops) "dJG" = ( /obj/effect/mapping_helpers/light{ light_power = 3 @@ -8169,13 +7968,16 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"dMn" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/obj/machinery/light, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +"dMq" = ( +/obj/effect/decal/warning_stripes/white, +/obj/machinery/door/airlock{ + id_tag = "CC_toilet_unit4"; + name = "Toilet" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone1) "dMv" = ( /obj/structure/shuttle/engine/platform{ dir = 1; @@ -8192,19 +7994,13 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"dMT" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_away"; - name = "vox bay 1"; - width = 19 - }, -/turf/space{ - icon_state = "black" +"dMM" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" }, -/area/space) +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "dNa" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/statue/thaumicnik{ @@ -8222,42 +8018,33 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"dNs" = ( -/obj/machinery/door/poddoor{ - id_tag = "ASSAULT0"; - name = "Launch Bay #0" - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "dNO" = ( /obj/machinery/computer/shuttle/syndicate{ name = "Nuclear Operatives Shuttle Console" }, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"dOP" = ( -/obj/machinery/vending/cigarette/free, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +"dOf" = ( +/obj/machinery/chem_dispenser/supgraded, +/turf/simulated/floor/engine, +/area/centcom/specops) +"dOj" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "CC_crate" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowaltstrip" }, -/obj/effect/turf_decal/tile/neutral{ +/area/centcom/supply) +"dPr" = ( +/obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" +/turf/simulated/floor/plasteel{ + icon_state = "darkred" }, -/area/shuttle/administration) +/area/centcom/specops) "dPu" = ( /obj/machinery/door/airlock/syndicate/security{ autoclose = 0; @@ -8290,13 +8077,6 @@ icon_state = "darkredcornersalt" }, /area/syndicate_mothership/jail) -"dQu" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "dQw" = ( /obj/structure/flora/bush, /turf/simulated/floor/indestructible/grass, @@ -8309,9 +8089,38 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) +"dQQ" = ( +/obj/structure/closet/secure_closet/cabinet/bar/random_drinks{ + layer = 3.5 + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) "dRc" = ( /turf/simulated/wall/indestructible/fakeglass, /area/trader_station/sol) +"dRg" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood, +/area/centcom/zone2) +"dRu" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 183; + teleport_y = 60; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" + }, +/area/centcom/specops) "dRA" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -8339,13 +8148,6 @@ }, /turf/simulated/floor/holofloor/space, /area/centcom/specops) -"dSj" = ( -/obj/machinery/door/airlock/shuttle, -/obj/structure/fans/tiny, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "dSn" = ( /obj/structure/rack, /obj/item/reagent_containers/spray/plantbgone, @@ -8359,22 +8161,30 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"dSG" = ( -/obj/machinery/computer/mech_bay_power_console, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "dSN" = ( -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/tile/neutral{ - alpha = 150; - color = "black"; - icon_state = "tile_full"; - layer = 9 +/obj/effect/decal/cleanable/crayon{ + color = "yellow"; + icon_state = "guy"; + layer = 5; + pixel_y = -30 }, -/turf/simulated/floor/plating, -/area/centcom/supply) +/obj/effect/decal/cleanable/crayon{ + color = "yellow"; + icon_state = "face"; + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/decal/cleanable/crayon{ + color = "yellow"; + icon_state = "shitcurity"; + pixel_x = 32; + pixel_y = 32 + }, +/turf/simulated/floor/mineral/bananium, +/area/centcom/specops) +"dTg" = ( +/turf/simulated/floor/plating/airless, +/area/centcom/specops) "dTy" = ( /obj/structure/railing{ dir = 8 @@ -8401,6 +8211,10 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) +"dTR" = ( +/obj/structure/stone_tile/slab/burnt, +/turf/simulated/floor/lava/lava_land_surface, +/area/ruin/space/bubblegum_arena) "dTZ" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ @@ -8412,24 +8226,6 @@ /obj/machinery/smartfridge/disks, /turf/simulated/floor/wood, /area/centcom/evac) -"dUj" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 4; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) -"dUp" = ( -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) "dUq" = ( /obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ @@ -8437,10 +8233,6 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"dUt" = ( -/obj/structure/falsewall/reinforced, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/jail) "dUz" = ( /obj/structure/railing{ dir = 8 @@ -8481,10 +8273,19 @@ icon_state = "dark" }, /area/centcom/specops) -"dVd" = ( -/obj/machinery/clonepod/upgraded, +"dVg" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 5; + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 10; + do_not_delete_me = 1; + icon_state = "bs_deadlock" + }, /turf/simulated/floor/shuttle{ - icon_state = "floor3" + icon = 'icons/turf/floors.dmi'; + icon_state = "white" }, /area/shuttle/administration) "dVl" = ( @@ -8504,23 +8305,6 @@ /obj/machinery/photocopier/syndie, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"dWB" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"dWI" = ( -/obj/structure/chair/comfy/red, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/jail) "dWJ" = ( /obj/structure/table/reinforced{ color = "#444444" @@ -8536,14 +8320,15 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"dXk" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 5; - pixel_y = -2 +"dXl" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_PDW" }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "dXq" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo3" @@ -8553,6 +8338,12 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) +"dXA" = ( +/obj/structure/chair/comfy/black, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "dXR" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -8568,6 +8359,15 @@ icon_state = "dark" }, /area/shuttle/syndicate) +"dXS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" + }, +/area/shuttle/administration) "dXY" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -8588,41 +8388,12 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) -"dYs" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/beach/sand{ - icon = 'icons/turf/floors.dmi'; - icon_state = "asteroid" - }, -/area/centcom/evac) -"dYy" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "dYC" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 }, /turf/simulated/floor/wood/cherry, /area/ninja/outside) -"dYJ" = ( -/obj/structure/shuttle/engine/huge{ - dir = 4 - }, -/turf/simulated/floor/shuttle/transparent_floor, -/area/shuttle/administration) "dYO" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -8632,35 +8403,54 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"dYQ" = ( -/obj/machinery/light/small{ - dir = 8; - tag = "icon-bulb1 (WEST)" +"dYT" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/bridge) "dYY" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) +"dYZ" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet, +/area/centcom/zone2) +"dZe" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = 32; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluecornersalt" + }, +/area/centcom/specops) "dZk" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkyellowalt" }, /area/centcom/supply) -"dZu" = ( -/obj/effect/turf_decal/caution/stand_clear/white, -/obj/machinery/door/poddoor/impassable/unhittable{ - id_tag = "CC_Players_In"; - name = "Blast Door" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) "dZv" = ( /obj/structure/piano{ dir = 4; @@ -8674,35 +8464,6 @@ "dZA" = ( /turf/simulated/floor/grass, /area/centcom/evac) -"dZK" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 16 - }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/pen/fancy{ - pixel_x = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"eag" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) "eao" = ( /obj/structure/window/reinforced, /obj/item/flag/species/kidan, @@ -8726,6 +8487,9 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"eaT" = ( +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "eaU" = ( /obj/effect/turf_decal/weather/snow/corner, /obj/structure/railing{ @@ -8738,6 +8502,13 @@ icon_state = "darkfull" }, /area/trader_station/sol) +"eaX" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/centcom/specops) "ebc" = ( /obj/structure/window/reinforced{ color = "red"; @@ -8772,12 +8543,62 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"ebD" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/bacon, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/centcom/specops) "ebH" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) +"ebI" = ( +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 8; + height = 18; + id = "admin"; + name = "administration shuttle"; + roundstart_move = "admin_away"; + width = 18; + port_direction = 2; + preferred_direction = 8 + }, +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "admin_s_outer"; + name = "Ship External Access"; + req_access = list(101) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "admin_s_air_control"; + pixel_x = -1; + pixel_y = -29; + req_access = list(101) + }, +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 18; + id = "admin_away"; + name = "centcom bay 1"; + timid = 1; + turf_type = /turf/simulated/floor/plating/airless; + width = 18 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "ebO" = ( /obj/machinery/vending/snack, /obj/structure/closet/hydrant{ @@ -8788,6 +8609,65 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"ebR" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" + }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navyblue" + }, +/area/centcom/specops) "ebX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wideplating{ @@ -8809,22 +8689,9 @@ }, /turf/simulated/floor/plasteel/grimy, /area/trader_station/sol) -"ecJ" = ( -/obj/structure/falsewall/reinforced{ - req_access = list(114); - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) "ecV" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/supply) -"edm" = ( -/obj/machinery/vending/ntcrates, -/turf/simulated/floor/plating, -/area/centcom/specops) "edp" = ( /obj/effect/turf_decal{ dir = 1; @@ -8844,6 +8711,13 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"edZ" = ( +/obj/effect/landmark/ert_director, +/obj/structure/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "eeb" = ( /obj/machinery/bottler, /obj/structure/table, @@ -8852,14 +8726,12 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"eec" = ( -/obj/machinery/computer/account_database{ - name = "Admin Accounts Database" - }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 +"eed" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/turf/simulated/floor/wood/fancy/cherry, /area/centcom/bridge) "eeh" = ( /obj/structure/chair/sofa/right, @@ -8880,6 +8752,9 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) +"eeG" = ( +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) "eeN" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -8911,23 +8786,16 @@ /obj/machinery/light/small, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"efn" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -12 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -2 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = 8 +"efE" = ( +/obj/machinery/computer/station_alert, +/obj/structure/railing, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowfull" }, -/area/shuttle/gamma) +/area/centcom/bridge) "efU" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -8944,15 +8812,6 @@ }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/jail) -"egc" = ( -/obj/structure/toilet{ - dir = 8; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) "egd" = ( /obj/effect/turf_decal{ dir = 1; @@ -8972,6 +8831,13 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"egp" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-30"; + tag = "icon-plant-30" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "egu" = ( /obj/structure/chair/sofa, /obj/structure/curtain/open/shower/security{ @@ -9036,21 +8902,31 @@ }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"eiV" = ( -/obj/effect/turf_decal/arrows{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" +"eiF" = ( +/obj/structure/table, +/obj/item/pen/multi/fountain, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 }, -/area/centcom/supply) +/obj/machinery/light, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "eji" = ( /obj/structure/chair/sofa{ dir = 8 }, /turf/simulated/floor/carpet, /area/centcom/zone1) +"ejx" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" + }, +/area/centcom/specops) "ejy" = ( /obj/structure/table/reinforced{ color = "#444444" @@ -9060,20 +8936,19 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"ejA" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/obj/machinery/door/airlock/centcom{ - name = "Medical Block"; - opacity = 1; - req_access = list(109) +"ejF" = ( +/obj/structure/closet/l3closet/security, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/watertank/janitor{ + max_integrity = 1500; + volume = 1500 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/item/grenade/chem_grenade/cleaner, +/turf/simulated/floor/indestructible{ + dir = 5; + icon_state = "darkpurple" }, /area/centcom/specops) "ejG" = ( @@ -9092,25 +8967,6 @@ /mob/living/simple_animal/pet/penguin/baby, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"ejW" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - dir = 8; - req_access = list(104) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "CC_space_jail_sec"; - layer = 50; - level = 3; - locked = 1; - name = "Central Command Jail"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/centcom/jail) "ekh" = ( /obj/structure/flora/tree/dead, /obj/structure/flora/ausbushes/brflowers, @@ -9128,6 +8984,18 @@ icon_state = "navybluecornersalt" }, /area/syndicate_mothership/control) +"elD" = ( +/obj/structure/table/glass, +/obj/item/toy/plushie/tabby_cat{ + desc = "Любимая игрушка-антистресс одной из представительниц вида таяран, когда-то работавшей главой персонала. Она была настолько занята выполнением своих обязанностей, что умерла голодной смертью прямо на своем рабочем месте. Не будьте как эта таяра. Кушайте регулярно."; + name = "Любимая игрушка бюрократов" + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_y = 9; + pixel_x = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "elS" = ( /obj/machinery/door/airlock/external{ aiControlDisabled = 1; @@ -9147,33 +9015,10 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"emH" = ( -/obj/structure/window/reinforced, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone2) "emN" = ( /obj/structure/flora/rock/icy, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"emX" = ( -/obj/structure/rack, -/obj/item/gun/energy/ionrifle/carbine{ - pixel_y = 7 - }, -/obj/item/grenade/empgrenade{ - pixel_x = 7; - pixel_y = -2 - }, -/obj/item/grenade/empgrenade, -/obj/item/aicard{ - layer = 2.9; - pixel_x = -5; - pixel_y = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "ena" = ( /obj/structure/railing, /turf/simulated/floor/plasteel{ @@ -9214,13 +9059,6 @@ icon_state = "bot" }, /area/shuttle/escape) -"eoJ" = ( -/obj/machinery/computer/card/centcom, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "eoT" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-28"; @@ -9249,6 +9087,16 @@ /obj/effect/turf_decal/weather/snow/corner, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) +"epo" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/computer/cryopod{ + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "epx" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 4 @@ -9258,25 +9106,40 @@ }, /turf/simulated/floor/wood/cherry, /area/ninja/outside) -"eqh" = ( -/obj/machinery/door/airlock/command/glass{ - frequency = 2000; - icon_state = "open"; - id_tag = "CC-OP3-Int"; - locked = 1; - name = "Zone 2" - }, -/obj/effect/decal/warning_stripes/blue, +"epD" = ( +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "freezerfloor" }, -/area/centcom/zone2) -"equ" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkbluealt" +/area/centcom/jail) +"eqe" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = -32 }, -/area/centcom/specops) +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) +"eqg" = ( +/obj/machinery/door_control{ + id = "QMLoaddoor2"; + layer = 3; + name = "Loading Doors"; + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/door_control{ + id = "QMLoaddoor"; + layer = 3; + name = "Loading Doors"; + pixel_x = -8; + pixel_y = -24 + }, +/obj/machinery/light/spot, +/turf/simulated/floor/shuttle, +/area/shuttle/supply) "eqJ" = ( /obj/structure/railing{ dir = 8 @@ -9284,34 +9147,15 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"eqL" = ( -/obj/structure/rack/holorack, -/obj/item/organ/internal/cyberimp/brain/anti_drop, -/obj/item/organ/internal/cyberimp/brain/anti_drop, -/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, -/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, -/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, -/obj/item/organ/internal/cyberimp/chest/reviver/hardened, -/obj/item/organ/internal/cyberimp/chest/reviver/hardened, -/obj/item/organ/internal/cyberimp/eyes/hud/medical, -/obj/item/organ/internal/cyberimp/eyes/hud/medical, -/obj/item/organ/internal/cyberimp/eyes/thermals, -/obj/item/organ/internal/cyberimp/eyes/thermals, -/obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/implanter/mindshield, -/obj/item/implanter/mindshield, -/obj/item/organ/internal/cyberimp/arm/combat/centcom, -/obj/item/organ/internal/cyberimp/arm/combat/centcom, -/obj/item/organ/internal/cyberimp/arm/surgery, -/obj/item/organ/internal/cyberimp/arm/toolset, -/obj/item/organ/internal/cyberimp/arm/janitorial, -/obj/item/autoimplanter/old, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +"erc" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkredalt" + }, +/area/centcom/jail) "erk" = ( /obj/effect/decal/nanotrasen_logo{ icon_state = "logo5" @@ -9329,10 +9173,10 @@ icon_state = "barber" }, /area/centcom/jail) -"erq" = ( -/obj/machinery/door/poddoor/impassable, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/specops) +"eru" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/plating, +/area/centcom/zone2) "erx" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 2; @@ -9349,42 +9193,46 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"erC" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, +"erD" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "darkredalt" }, -/area/centcom/zone3) -"erP" = ( -/mob/living/simple_animal/turkey, -/turf/simulated/floor/grass, -/area/centcom/evac) -"erX" = ( -/obj/machinery/door/poddoor{ - id_tag = "ASSAULT1"; - name = "Launch Bay #1" +/area/centcom/jail) +"erI" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full"; - layer = 9 +/area/shuttle/administration) +"erZ" = ( +/obj/effect/step_trigger/teleporter{ + teleport_x = 137; + teleport_y = 65; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"esm" = ( -/obj/structure/railing{ +/turf/simulated/floor/plasteel{ + color = "gray"; dir = 4; - pixel_x = -32 + icon_state = "rampbottom" + }, +/area/centcom/specops) +"esb" = ( +/obj/machinery/vending/ntcrates{ + req_access = list(114) + }, +/obj/machinery/conveyor{ + id = "CC_crate" }, /turf/simulated/floor/plasteel{ - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + icon_state = "dark" }, -/area/centcom/zone2) +/area/centcom/supply) "esq" = ( /obj/machinery/light/small{ dir = 4 @@ -9401,12 +9249,6 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) -"esy" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_medical, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "esC" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -9420,6 +9262,16 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"esL" = ( +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/tile/neutral{ + alpha = 180; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "esN" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/shuttle/objective_check{ @@ -9436,15 +9288,24 @@ icon_state = "white" }, /area/centcom/jail) +"etw" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/centcom/zone3) "etK" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/plasteel{ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"eud" = ( -/turf/simulated/floor/wood, -/area/centcom/zone3) +"etQ" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" + }, +/turf/simulated/wall/indestructible/fakeglass, +/area/shuttle/pod_3) "euh" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo13" @@ -9471,6 +9332,12 @@ "eul" = ( /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/ninja) +"euy" = ( +/obj/structure/chair/sofa/corp/right, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "euF" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -9480,36 +9347,53 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) -"euT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +"euY" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1331; + id_tag = "admin_s_air_control"; + pixel_y = 24; + req_access = list(152); + tag_airpump = "admin_s_pump"; + tag_chamber_sensor = "admin_s_sensor"; + tag_exterior_door = "admin_s_outer"; + tag_interior_door = "admin_s_inner" }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime, /turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" + icon_state = "vfloor" }, /area/shuttle/administration) -"evd" = ( -/obj/structure/chair/comfy/lime, +"evj" = ( +/obj/structure/sign/poster/official/obey{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/jail) +"evp" = ( +/obj/machinery/vending/wallmed{ + pixel_x = -30; + pixel_y = -30 + }, /turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" + icon_state = "floor4" }, -/area/shuttle/administration) +/area/shuttle/specops) "evA" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkyellowalt" }, /area/centcom/zone3) +"evD" = ( +/obj/structure/falsewall/reinforced{ + req_access = list(114); + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "evL" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -9527,25 +9411,6 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"evN" = ( -/obj/machinery/porta_turret/centcom/pulse{ - armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - color = "#666666"; - damtype = "burn"; - health = 1250; - region_max = 12; - scan_range = 12; - shot_delay = 8; - name = "Quarantine Pulse Turret" - }, -/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ - dir = 1; - id_tag = "ERT_Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "ewj" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo12" @@ -9556,38 +9421,41 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"ewR" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = list(102) +"ewA" = ( +/obj/structure/dresser, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"ewE" = ( +/obj/item/flag/nt, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -2 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/decal/warning_stripes/west, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "redfull"; - tag = "icon-redfull (NORTHWEST)" + icon_state = "dark" }, -/area/centcom/zone1) -"ewU" = ( -/obj/structure/closet/l3closet/security, -/obj/item/clothing/mask/gas, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/watertank/janitor{ - max_integrity = 1500; - volume = 1500 +/area/centcom/specops) +"exr" = ( +/obj/structure/table, +/obj/item/storage/box/chemimp{ + pixel_x = 4; + pixel_y = 3 }, -/obj/item/grenade/chem_grenade/cleaner, -/turf/simulated/floor/indestructible{ - dir = 1; - icon_state = "darkpurple" +/obj/item/storage/box/trackimp, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" }, -/area/centcom/specops) +/area/shuttle/administration) "exL" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -9597,16 +9465,19 @@ "eyb" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/zone2) -"eyf" = ( -/obj/structure/chair{ - dir = 1 +"eyj" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 4 }, -/turf/simulated/floor/indestructible{ - dir = 8; - icon_state = "vault"; - name = "Operative position" +/obj/effect/decal/warning_stripes/north, +/obj/effect/turf_decal/tile/neutral{ + alpha = 100; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/area/centcom/specops) +/turf/simulated/floor/plating, +/area/centcom/supply) "eyD" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -9621,19 +9492,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"eyL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 5; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) "eyZ" = ( /obj/item/flag/ninja, /obj/effect/turf_decal/siding/wood{ @@ -9643,31 +9501,37 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"ezh" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "ntsing_alt3" +"ezA" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) +"ezH" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_4) "ezN" = ( /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/plasteel{ icon_state = "bot" }, /area/shuttle/escape) -"ezV" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/chair/office/dark{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "eAy" = ( /obj/item/storage/firstaid/brute{ pixel_x = 4; @@ -9703,14 +9567,16 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"eBK" = ( -/obj/machinery/computer/cryopod{ - pixel_y = 32 +"eBC" = ( +/obj/vehicle/ridden/janicart{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" +/obj/item/key/janitor, +/obj/item/janiupgrade{ + layer = 2.9 + }, +/turf/simulated/floor/indestructible{ + icon_state = "darkpurple" }, /area/centcom/specops) "eCq" = ( @@ -9732,6 +9598,14 @@ /obj/item/clothing/mask/cigarette/pipe, /turf/simulated/floor/wood, /area/centcom/zone1) +"eCT" = ( +/obj/machinery/photocopier, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 5 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "eCX" = ( /obj/effect/turf_decal{ dir = 6; @@ -9756,64 +9630,27 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"eDv" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) -"eDH" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) "eDO" = ( /obj/effect/spawner/lootdrop/trade_sol/largeitem, /turf/simulated/floor/wood{ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) -"eDP" = ( -/obj/machinery/photocopier, -/obj/structure/window/reinforced{ - dir = 4; - layer = 4.2 +"eDV" = ( +/obj/machinery/vending/wallmed{ + pixel_x = 24 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowalt" }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/centcom/zone3) "eEj" = ( /obj/machinery/bookbinder, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/centcom/jail) -"eES" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -12 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = 8 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -2 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "eFc" = ( /obj/machinery/light{ dir = 4 @@ -9822,6 +9659,13 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) +"eFf" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/obj/machinery/light, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "eFk" = ( /obj/structure/rack, /obj/item/oar{ @@ -9841,6 +9685,12 @@ }, /turf/simulated/wall/indestructible/reinforced/rusted, /area/ninja/holding) +"eFF" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkgreen" + }, +/area/centcom/specops) "eFN" = ( /obj/structure/rack/holorack, /obj/item/stamp/captain, @@ -9876,27 +9726,10 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"eGn" = ( -/obj/machinery/door/airlock/centcom{ - damage_deflection = 999; - name = "Prison"; - opacity = 1; - req_access = list(104) - }, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkredaltstrip" - }, -/area/centcom/jail) "eGs" = ( /obj/machinery/light/small, /turf/simulated/floor/wood/fancy/light, /area/ussp_centcom/secretariat) -"eGO" = ( -/obj/structure/stone_tile/slab/burnt, -/turf/simulated/floor/lava/lava_land_surface, -/area/ruin/space/bubblegum_arena) "eHj" = ( /obj/item/storage/firstaid/ancient{ pixel_x = 3; @@ -9915,24 +9748,6 @@ icon_state = "barber" }, /area/centcom/jail) -"eHC" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/structure/table, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"eHW" = ( -/turf/simulated/floor/plating/airless, -/area/centcom/specops) "eIq" = ( /obj/structure/table/wood, /obj/item/tank/jetpack/oxygen/harness{ @@ -9946,19 +9761,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"eIs" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/structure/window/reinforced{ - layer = 3.1; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkred" - }, -/area/centcom/specops) "eIx" = ( /obj/item/flag/ninja, /obj/effect/turf_decal/siding/wood{ @@ -9985,49 +9787,27 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/funeral) -"eJc" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "eJe" = ( /obj/structure/chair/comfy/brown{ color = "#FF3300" }, /turf/simulated/floor/carpet/arcade, /area/trader_station/sol) -"eJz" = ( -/obj/structure/table/wood/fancy/royalblack, -/obj/item/candle/eternal, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = 6; - pixel_y = 9 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) -"eJQ" = ( -/obj/structure/window/full/reinforced{ - layer = 2 - }, -/obj/machinery/door/poddoor/shutters/invincible{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "CC_space_jail_sec"; - layer = 50; - level = 3; - locked = 1; - name = "Central Command Jail"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/centcom/jail) "eKa" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/carpet/green, /area/ninja/outpost) +"eKh" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/paper_bin/nanotrasen{ + amount = 50; + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/gold, +/obj/item/stamp/chameleon, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "eKi" = ( /obj/machinery/light{ dir = 1; @@ -10046,23 +9826,33 @@ /obj/structure/table/wood/poker, /turf/simulated/floor/carpet/arcade, /area/trader_station/sol) +"eKv" = ( +/obj/structure/chair/comfy/beige{ + dir = 8; + layer = 5; + pixel_y = -2 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "eKV" = ( /obj/structure/table/wood/poker, /obj/item/deck/cards, /turf/simulated/floor/carpet/arcade, /area/trader_station/sol) -"eLb" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/zone2) -"eLE" = ( -/obj/effect/turf_decal/siding/blue{ +"eLd" = ( +/obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/glass, -/area/centcom/bridge) +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/shuttle/escape) +"eLA" = ( +/obj/item/radio/intercom{ + pixel_y = 28 + }, +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) "eLT" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -10130,6 +9920,15 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"eMU" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/coffee, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "eNb" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -10192,15 +9991,6 @@ icon_state = "white" }, /area/centcom/zone1) -"eNX" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkred" - }, -/area/centcom/specops) "eOl" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ @@ -10241,23 +10031,32 @@ icon_state = "fancy-wood-oak-broken5" }, /area/syndicate_mothership) -"eOY" = ( -/obj/structure/cable{ - icon_state = "2-6" - }, -/obj/machinery/photocopier{ - icon_state = "fax" +"ePq" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/turf_decal/tile/neutral{ + alpha = 180; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, /turf/simulated/floor/plating, -/area/centcom/specops) -"ePf" = ( -/obj/structure/bookcase/random, -/turf/simulated/floor/carpet, -/area/centcom/jail) -"ePB" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, +/area/centcom/supply) +"ePz" = ( +/obj/structure/table/glass, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen/fancy{ + pixel_x = 1; + pixel_y = 4 + }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"ePB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -10297,12 +10096,19 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/outside) -"ePO" = ( -/obj/machinery/computer/camera_advanced, -/obj/structure/window/reinforced{ - dir = 4 +"ePN" = ( +/obj/structure/window/full/shuttle, +/obj/structure/grille, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/transport) +"ePR" = ( +/obj/structure/sign/nuke{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navyblue" }, -/turf/simulated/floor/carpet, /area/centcom/specops) "ePS" = ( /turf/simulated/floor/plasteel{ @@ -10319,40 +10125,46 @@ icon_state = "Dark" }, /area/shuttle/funeral) -"eQA" = ( -/obj/item/ship_in_a_bottle, -/obj/effect/turf_decal/tile/neutral{ - alpha = 100; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' - }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, -/area/centcom/zone2) -"eQJ" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater2x2"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/reinforced{ - color = "yellow"; - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/trade/sol) -"eQO" = ( -/obj/structure/window/reinforced{ - dir = 4 +"eQj" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/door/poddoor{ + id_tag = "CC_supply_space"; + locked = 2; + name = "Supply Blastdoor" }, -/obj/effect/turf_decal/siding/white{ +/obj/machinery/conveyor{ + id = "CC_crate"; dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/evac) +/area/centcom/supply) +"eQt" = ( +/obj/structure/closet/cardboard, +/obj/item/poster/random_official{ + pixel_y = 5 + }, +/obj/item/poster/random_official{ + pixel_y = -3 + }, +/obj/item/poster/random_official{ + pixel_y = 3 + }, +/obj/item/poster/random_official, +/obj/item/poster/random_official{ + pixel_y = 10 + }, +/obj/item/poster/random_official{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/fungus{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/simulated/floor/plating, +/area/centcom/zone2) "eQT" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -10362,37 +10174,46 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"eQX" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/structure/holohoop{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) +"eRb" = ( +/obj/machinery/chem_heater, +/turf/simulated/floor/engine, +/area/centcom/specops) "eRk" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"eRm" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" - }, -/area/centcom/specops) "eRw" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"eRR" = ( +/obj/machinery/light, +/obj/effect/turf_decal/siding/brown/corner{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"eSd" = ( +/obj/structure/table/wood{ + color = "#996633" + }, +/obj/item/folder, +/obj/item/folder, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "eSg" = ( /obj/structure/railing{ dir = 8 @@ -10465,51 +10286,11 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"eTs" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/white, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/pistol/enforcer{ - icon_state = "enforcer_black"; - pixel_x = 6 - }, +"eTm" = ( +/obj/structure/chair, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, /area/centcom/specops) "eTw" = ( @@ -10525,25 +10306,16 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"eTE" = ( -/obj/structure/table/glass, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkred" - }, -/area/centcom/specops) -"eTK" = ( -/obj/machinery/door/airlock/external{ - id_tag = "ferry_away"; - name = "Ferry Airlock"; - req_access = list(106) +"eTN" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = -32 }, -/obj/structure/fans/tiny, -/obj/effect/turf_decal/delivery/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, -/area/centcom/specops) +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) "eTW" = ( /obj/machinery/light/small{ dir = 4; @@ -10560,6 +10332,21 @@ icon_state = "darkfull" }, /area/syndicate_mothership/control) +"eUo" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/turf_decal/tile/neutral{ + alpha = 200; + color = "black"; + icon_state = "tile_full"; + layer = 9; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) +"eVn" = ( +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/centcom/jail) "eVA" = ( /obj/effect/turf_decal/stripes/asteroid/corner, /turf/simulated/floor/beach/sand{ @@ -10567,6 +10354,14 @@ icon_state = "asteroid" }, /area/centcom/evac) +"eVU" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "eWv" = ( /obj/effect/decal/warning_stripes/white, /turf/simulated/floor/plasteel{ @@ -10574,10 +10369,20 @@ }, /area/centcom/evac) "eWA" = ( -/turf/space{ - icon_state = "black" +/turf/simulated/wall/shuttle/onlyselfsmooth, +/area/shuttle/gamma) +"eWH" = ( +/obj/machinery/door/window/brigdoor{ + dir = 8; + req_access = list(106) }, -/area/space) +/obj/structure/chair/comfy/lime{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "eWL" = ( /obj/machinery/defibrillator_mount/loaded{ pixel_x = -30 @@ -10588,6 +10393,36 @@ }, /turf/simulated/floor/plasteel/freezer, /area/ninja/outpost) +"eWS" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/centcom/specops) +"eXk" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) +"eXq" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "eXB" = ( /obj/machinery/vending/medical, /obj/structure/window/reinforced{ @@ -10611,43 +10446,31 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"eYa" = ( -/obj/machinery/vending/mech/ntc/equipment{ - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"eYh" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 2; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) +"eXN" = ( +/obj/machinery/computer/card/centcom, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"eYl" = ( +/turf/simulated/floor/plating/airless, +/area/shuttle/escape) "eYE" = ( /obj/structure/grille, /obj/structure/window/full/shuttle, /turf/simulated/floor/shuttle/plating, /area/shuttle/trade/sol) -"eZi" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowcornersalt" - }, -/area/centcom/zone3) -"eZp" = ( +"eZg" = ( /obj/structure/chair/comfy/beige{ - dir = 8; - layer = 4; + dir = 4; + layer = 5; pixel_y = -2 }, -/obj/structure/railing, /turf/simulated/floor/carpet/black, /area/centcom/bridge) +"eZi" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowcornersalt" + }, +/area/centcom/zone3) "eZx" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/beaker/waterbottle/large{ @@ -10668,31 +10491,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"eZD" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_away"; - name = "Shuttle Hatch"; - req_access = list(109) - }, -/obj/machinery/shower{ - dir = 1; - tag = "icon-shower (WEST)" - }, -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/indestructible{ - icon_state = "dark" - }, -/area/centcom/specops) -"eZG" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/specops) "eZR" = ( /obj/structure/filingcabinet/employment, /turf/simulated/floor/carpet, @@ -10704,46 +10502,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"fam" = ( -/obj/structure/chair/stool, -/obj/structure/sign/poster/contraband/punch_shit{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/jail) -"faQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"fbk" = ( -/obj/structure/closet/cardboard, -/obj/item/poster/random_official{ - pixel_y = 5 - }, -/obj/item/poster/random_official{ - pixel_y = -3 - }, -/obj/item/poster/random_official{ - pixel_y = 3 - }, -/obj/item/poster/random_official, -/obj/item/poster/random_official{ - pixel_y = 10 - }, -/obj/item/poster/random_official{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/fungus{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) "fbr" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowcornersalt" @@ -10762,28 +10520,6 @@ /obj/item/dice/d20, /turf/simulated/floor/carpet/black, /area/trader_station/sol) -"fcd" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/table/wood/fancy/royalblack, -/obj/item/reagent_containers/food/drinks/bottle/wine{ - pixel_x = -12; - pixel_y = 10 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "fcj" = ( /obj/structure/railing{ dir = 1 @@ -10794,33 +10530,38 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"fcD" = ( -/obj/structure/toilet, -/obj/machinery/light/small{ - dir = 4 +"fcs" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/item/gun/projectile/automatic/pistol{ + layer = 2.9 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/effect/turf_decal/tile/neutral{ + alpha = 85; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' }, -/area/centcom/jail) -"fcM" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/area/centcom/specops) +"fcv" = ( +/obj/structure/railing, +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 4; + pixel_y = -2 }, -/obj/machinery/light{ +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"fcH" = ( +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) -"fcT" = ( -/obj/structure/bed, -/obj/item/bedsheet/mime, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 +/obj/structure/chair/office/dark{ + dir = 1 }, -/turf/simulated/floor/carpet, -/area/centcom/zone1) +/obj/effect/turf_decal/siding/brown, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "fdg" = ( /obj/effect/turf_decal{ dir = 1; @@ -10833,40 +10574,48 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"fdw" = ( -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 16; - icon_state = "bigscenner"; - icon = 'icons/obj/library.dmi' +"fdL" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Bridge"; + opacity = 1; + req_access = list(101) }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 }, -/obj/item/pen/fancy{ - pixel_x = 8 +/obj/effect/turf_decal/stripes/black{ + dir = 4; + do_not_delete_me = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" }, -/obj/structure/table/holotable/wood, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"fdP" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/item/pen, -/obj/item/pen, -/obj/item/pen, -/obj/machinery/door/window/brigdoor{ - dir = 8 +/area/shuttle/administration) +"fdZ" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/projectile/automatic/ar{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/ar{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/ar{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/ar{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/ar{ + pixel_x = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + icon_state = "dark" }, -/area/centcom/jail) +/area/centcom/specops) "feu" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -10888,16 +10637,6 @@ icon_state = "barber" }, /area/centcom/zone1) -"feS" = ( -/obj/machinery/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = 30; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/specops) "feT" = ( /obj/effect/turf_decal/box/white/corners{ dir = 4 @@ -10913,15 +10652,19 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"ffS" = ( -/obj/machinery/light{ - dir = 8 +"ffA" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkblue" +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/tile/neutral{ + alpha = 100; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/area/centcom/zone1) +/turf/simulated/floor/plating, +/area/centcom/supply) "ffV" = ( /obj/machinery/computer/atmos_alert, /obj/structure/window/reinforced{ @@ -10931,42 +10674,19 @@ icon_state = "darkyellowfull" }, /area/centcom/bridge) -"ffZ" = ( -/obj/machinery/newscaster{ - pixel_x = 32 +"fgq" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, +/turf/simulated/floor/wood, +/area/centcom/zone3) +"fgx" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/soymilk, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"fgc" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/centcom/evac) -"fgt" = ( -/obj/effect/spawner/lootdrop/officetoys, -/obj/structure/table/holotable/wood, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"fgu" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/item/storage/ashtray/glass{ - pixel_x = -6; - pixel_y = 7 - }, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) -"fgx" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/milk, -/obj/item/reagent_containers/food/condiment/soymilk, -/turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "white" }, /area/centcom/jail) "fgB" = ( @@ -10977,18 +10697,19 @@ /obj/machinery/light, /turf/simulated/floor/carpet/arcade, /area/trader_station/sol) -"fgM" = ( -/obj/machinery/vending/robotics/nt/gygax, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"fgL" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding{ + color = "#444444" }, -/area/centcom/specops) -"fgQ" = ( -/obj/machinery/vending/coffee/free, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"fgS" = ( +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" }, -/area/centcom/jail) +/area/shuttle/administration) "fhi" = ( /obj/machinery/door/airlock/external{ frequency = 1331; @@ -11013,16 +10734,22 @@ /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plating, /area/shuttle/syndicate) -"fht" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2 - }, +"fhx" = ( /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluealt" + dir = 8; + icon_state = "darkredalt" }, -/area/centcom/zone2) +/area/centcom/specops) +"fhy" = ( +/obj/machinery/light/spot, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = -26 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "fhO" = ( /obj/effect/mapping_helpers/light{ light_power = 3 @@ -11032,6 +10759,18 @@ }, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"fhT" = ( +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/clothing/gloves/botanic_leather, +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/centcom/jail) "fhX" = ( /obj/machinery/chem_heater, /turf/simulated/floor/plasteel{ @@ -11039,20 +10778,27 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) +"fim" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1; + do_not_delete_me = 1 + }, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl4"; + name = "Armory level 4"; + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "fiy" = ( /obj/structure/mineral_door/wood, /turf/simulated/floor/wood, /area/trader_station/sol) -"fiE" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "fiO" = ( /obj/machinery/door/airlock{ name = "Toilet" @@ -11065,18 +10811,13 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) -"fjw" = ( +"fjj" = ( +/obj/machinery/computer/camera_advanced, /obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4 }, -/area/centcom/jail) +/turf/simulated/floor/carpet, +/area/centcom/specops) "fjA" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -11107,29 +10848,6 @@ icon_state = "asteroid" }, /area/centcom/evac) -"fkt" = ( -/obj/structure/rack/holorack, -/obj/item/storage/box/deathimp, -/obj/item/storage/box/deathimp, -/obj/item/storage/box/deathimp, -/obj/item/storage/box/chef_rare_ingredients_kit, -/obj/item/storage/box/bartender_rare_ingredients_kit, -/obj/item/storage/box/fingerprints, -/obj/item/storage/box/fingerprints, -/obj/item/storage/box/swabs, -/obj/item/storage/box/swabs, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "fkF" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -11152,42 +10870,27 @@ icon_state = "darkyellowalt" }, /area/centcom/zone3) -"fli" = ( -/obj/structure/stone_tile/surrounding/burnt, -/obj/structure/stone_tile/center/burnt, -/obj/effect/landmark/spawner/bubblegum, -/turf/simulated/floor/lava/lava_land_surface, -/area/ruin/space/bubblegum_arena) -"fll" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 183; - teleport_y = 60; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" +"fls" = ( +/turf/simulated/floor/indestructible{ + dir = 5; + icon_state = "darkgreynavyblue" }, /area/centcom/specops) -"fmI" = ( -/obj/machinery/computer/shuttle/ert, -/obj/structure/window/reinforced{ - dir = 8 +"flG" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1; + icon_state = "bs_deadlock" }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "white" }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/shuttle/administration) +"flX" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "fmZ" = ( /obj/machinery/door/airlock/centcom{ damage_deflection = 999; @@ -11231,15 +10934,32 @@ /obj/effect/landmark/ninjastart, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"fnF" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_ARG" - }, +"fny" = ( +/obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "dark" }, +/area/centcom/zone1) +"fnC" = ( +/obj/structure/rack, +/obj/item/reagent_containers/applicator/dual, +/obj/item/reagent_containers/applicator/dual, +/obj/item/reagent_containers/applicator/dual, +/obj/item/clothing/accessory/stethoscope, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecornersalt" + }, /area/centcom/specops) +"fnD" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "fnJ" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -30 @@ -11251,6 +10971,44 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"fnT" = ( +/obj/item/flag/nt, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -2 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"fnW" = ( +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes/farwacubes, +/obj/item/storage/box/monkeycubes/farwacubes, +/obj/item/storage/box/monkeycubes/neaeracubes, +/obj/item/storage/box/monkeycubes/neaeracubes, +/obj/item/storage/box/monkeycubes/stokcubes, +/obj/item/storage/box/monkeycubes/stokcubes, +/obj/item/storage/box/monkeycubes/wolpincubes, +/obj/item/storage/box/monkeycubes/wolpincubes, +/obj/structure/sink{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/sign/poster/official/healthy{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluealt" + }, +/area/centcom/specops) "fom" = ( /obj/structure/bed, /obj/effect/turf_decal/siding{ @@ -11270,13 +11028,6 @@ icon_state = "dark" }, /area/centcom/supply) -"foB" = ( -/obj/item/twohanded/required/kirbyplants{ - pixel_y = 8 - }, -/obj/structure/table, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "foC" = ( /obj/machinery/computer/operating, /turf/simulated/floor/plasteel/freezer, @@ -11300,48 +11051,30 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"foL" = ( -/obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave/upgraded{ - pixel_y = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "foN" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" }, /area/centcom/evac) -"fpH" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/centcom/evac) -"fpU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"fpV" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444" +"fpg" = ( +/obj/machinery/door/poddoor{ + id_tag = "ASSAULT0"; + name = "Launch Bay #0" }, -/obj/machinery/light{ - dir = 8 +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, +/turf/simulated/floor/plating, +/area/centcom/supply) +"fpZ" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_general, /turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "fqm" = ( @@ -11381,15 +11114,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"fqC" = ( -/obj/structure/table/reinforced{ - color = "#444444" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) "fqF" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -11401,12 +11125,6 @@ name = "Tatami" }, /area/ninja/outpost) -"fqL" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "fqN" = ( /obj/effect/turf_decal/stripes/gold{ dir = 10 @@ -11416,69 +11134,16 @@ "fqO" = ( /turf/simulated/floor/plasteel/freezer, /area/ninja/outpost) -"fqZ" = ( -/obj/structure/table/wood/fancy/royalblue, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) -"frj" = ( -/obj/structure/table/wood, -/obj/item/taperecorder{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "frx" = ( /obj/machinery/vending/cola/free, /turf/simulated/floor/wood, /area/centcom/zone1) -"frF" = ( -/obj/machinery/door/airlock/public/glass, -/obj/effect/turf_decal/stripes/black{ - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 1; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) -"frJ" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/zipties, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"frL" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 183; - teleport_y = 63; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" +"frA" = ( +/obj/structure/chair/sofa/left{ + dir = 4 }, -/area/centcom/specops) +/turf/simulated/floor/carpet/red, +/area/centcom/zone1) "fsf" = ( /obj/effect/turf_decal/siding/wood{ do_not_delete_me = 1 @@ -11545,6 +11210,13 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"ftj" = ( +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkredalt" + }, +/area/centcom/jail) "fts" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -11556,14 +11228,6 @@ name = "Tatami" }, /area/ninja/outpost) -"ftv" = ( -/obj/structure/window/full/reinforced{ - armor = list("melee"=80,"bullet"=80,"laser"=0,"energy"=0,"bomb"=80,"bio"=100,"rad"=100,"fire"=80,"acid"=100); - layer = 5 - }, -/obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, -/area/centcom/specops) "ftx" = ( /obj/machinery/light/small{ dir = 1 @@ -11584,13 +11248,6 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"ftH" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/vox) "ftK" = ( /obj/machinery/door/airlock/shuttle{ id_tag = "s_docking_airlock"; @@ -11611,62 +11268,87 @@ icon_state = "navyblue" }, /area/centcom/specops) -"fui" = ( -/obj/effect/turf_decal/siding/white{ - dir = 5 +"ftQ" = ( +/obj/structure/bed, +/obj/item/bedsheet/wiz, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone1) +"ftT" = ( +/obj/machinery/porta_turret/centcom/pulse{ + armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + color = "#666666"; + damtype = "burn"; + health = 1250; + region_max = 12; + scan_range = 12; + shot_delay = 8; + name = "Quarantine Pulse Turret" + }, +/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ + dir = 1; + id_tag = "ERT_Quarantine" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/jail) +/area/centcom/specops) "fuF" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkyellowalt" }, /area/centcom/zone3) -"fuY" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl4"; - name = "Armory level 4"; - layer = 5 +"fuR" = ( +/obj/structure/bookcase, +/obj/effect/decal/cleanable/fungus{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/item/paper/central_command/archive/memes{ + info = "
"; + name = "Коллективное решение" + }, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"fvk" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 9; + icon_state = "darkredalt" }, -/area/centcom/specops) +/area/centcom/jail) "fvn" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) -"fvs" = ( -/obj/structure/falsewall/reinforced{ - req_access = list(114); - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"fvp" = ( +/turf/simulated/floor/indestructible{ + dir = 1; + icon_state = "darkgreynavybluecorner" }, -/area/centcom/zone1) +/area/centcom/specops) "fvx" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/centcom/jail) -"fvO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/machinery/light{ - dir = 4 - }, +"fvF" = ( +/obj/mecha/combat/marauder/loaded, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "navybluecorners" }, /area/centcom/specops) "fwf" = ( @@ -11697,12 +11379,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"fwM" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) "fwX" = ( /obj/structure/falsewall/reinforced{ icon = 'icons/turf/walls/wood_wall.dmi'; @@ -11773,15 +11449,13 @@ /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"fyc" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +"fyy" = ( +/obj/machinery/vending/mech/ntc/exousuit{ + req_access = list(114) + }, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) -"fzu" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -11793,6 +11467,9 @@ name = "Tatami" }, /area/ninja/outpost) +"fzV" = ( +/turf/simulated/wall/shuttle, +/area/shuttle/administration) "fAd" = ( /obj/machinery/light, /turf/simulated/floor/plating, @@ -11854,42 +11531,13 @@ icon_state = "dark" }, /area/centcom/jail) -"fBi" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_3) -"fBr" = ( -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/zone3) -"fBu" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_DAE"; - name = "DAE"; - pixel_x = -24; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkgreen" +"fBk" = ( +/obj/structure/table/wood, +/obj/item/storage/bible, +/turf/simulated/floor/carpet{ + icon_state = "carpetsymbol" }, -/area/centcom/specops) +/area/centcom/evac) "fBA" = ( /obj/machinery/vending/cola/free, /turf/simulated/floor/plasteel/grimy, @@ -11903,16 +11551,51 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"fBS" = ( -/obj/machinery/vending/snack/free, -/turf/simulated/floor/plasteel/grimy, -/area/trader_station/sol) -"fCa" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluecornersalt" +"fBJ" = ( +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 }, -/area/centcom/zone2) +/obj/machinery/computer, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) +"fBQ" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/structure/window/plasmareinforced{ + color = "#22aab7"; + dir = 8 + }, +/obj/structure/window/plasmareinforced{ + color = "#22aab7"; + dir = 1 + }, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"fBS" = ( +/obj/machinery/vending/snack/free, +/turf/simulated/floor/plasteel/grimy, +/area/trader_station/sol) +"fBW" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"fCa" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecornersalt" + }, +/area/centcom/zone2) "fCi" = ( /obj/effect/turf_decal/delivery/red, /obj/structure/ore_box, @@ -11940,6 +11623,15 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"fCK" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "fCL" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -11977,6 +11669,57 @@ "fCS" = ( /turf/simulated/floor/carpet/blue, /area/ninja/outpost) +"fCV" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_GYGAX"; + name = "GYGAX"; + pixel_x = 24; + pixel_y = -32; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowcorners"; + dir = 1 + }, +/area/centcom/specops) +"fCZ" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/green/hollow, +/obj/item/gun/projectile/automatic/m90{ + name = "\improper DAE 5.56 Compact GL"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/m90{ + name = "\improper DAE 5.56 Compact GL"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/m90{ + name = "\improper DAE 5.56 Compact GL"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/m90{ + name = "\improper DAE 5.56 Compact GL"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/m90{ + name = "\improper DAE 5.56 Compact GL"; + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"fDh" = ( +/obj/machinery/camera{ + c_tag = "CentComm Special Ops. Shuttle"; + network = list("ERT","CentComm"); + dir = 4 + }, +/obj/machinery/recharge_station/ert, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) "fDl" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/indestructible/snow, @@ -12002,12 +11745,16 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"fDT" = ( +"fDV" = ( +/obj/structure/railing{ + dir = 4; + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkgreen" + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/area/centcom/specops) +/area/centcom/zone1) "fDY" = ( /obj/machinery/vending/coffee/free, /turf/simulated/floor/plasteel{ @@ -12026,14 +11773,15 @@ tag = "icon-stage_stairs" }, /area/ninja/outpost) -"fEN" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 +"fEe" = ( +/obj/effect/turf_decal/caution/stand_clear{ + pixel_x = 16 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "darkyellowaltstrip" }, -/area/centcom/jail) +/area/centcom/specops) "fEQ" = ( /obj/structure/chair/sofa/pew/left, /turf/simulated/floor/plasteel{ @@ -12070,30 +11818,6 @@ icon_state = "dark" }, /area/centcom/jail) -"fFk" = ( -/obj/structure/table/wood, -/obj/item/stamp/magistrate{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/stamp/centcom{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/folder/red{ - pixel_x = 7 - }, -/obj/item/folder/blue{ - pixel_x = 7; - pixel_y = -7 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "fFm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -12118,29 +11842,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"fFt" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/bigbiteburger, -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "nanotrasen_sign2"; - pixel_x = -16; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"fFC" = ( -/obj/structure/window/reinforced, -/obj/machinery/computer, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "fFD" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -12194,6 +11895,19 @@ icon_state = "dark" }, /area/centcom/evac) +"fGy" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/food/snacks/validsalad, +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "nanotrasen_sign3"; + pixel_x = -16; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "fGE" = ( /obj/machinery/vending/boozeomat, /obj/effect/turf_decal/siding/wood{ @@ -12201,6 +11915,17 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"fHe" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navybluealt" + }, +/area/centcom/specops) "fHh" = ( /obj/effect/decal/nanotrasen_logo{ icon_state = "logo6" @@ -12210,25 +11935,6 @@ icon_state = "darkgrey" }, /area/centcom/zone2) -"fHH" = ( -/obj/structure/chair/comfy/lime{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) -"fHI" = ( -/obj/machinery/computer/station_alert, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/radio/intercom/specops{ - pixel_y = 32 - }, -/turf/simulated/floor/carpet, -/area/centcom/specops) "fHL" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ @@ -12241,10 +11947,6 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"fIa" = ( -/obj/structure/table/glass, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "fID" = ( /turf/simulated/floor/plating/airless, /area/space) @@ -12255,30 +11957,46 @@ icon_state = "asteroid" }, /area/centcom/evac) -"fIN" = ( -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) -"fJf" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" +"fJh" = ( +/obj/machinery/light{ + dir = 4 }, -/area/centcom/jail) -"fJu" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"fJn" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/green{ + req_access = list(104,109) }, -/obj/effect/turf_decal/siding/white{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "darkgreenfull" }, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/area/centcom/specops) +"fJz" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DEDI" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "navybluealt" }, -/area/centcom/jail) +/area/centcom/specops) +"fJC" = ( +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/door_control/secure{ + id = "CC_Players_In"; + name = "Civilian Access"; + pixel_x = -24; + pixel_y = 32; + req_access = list(114) + }, +/turf/simulated/floor/wood, +/area/centcom/zone2) "fJE" = ( /obj/structure/fermenting_barrel, /obj/effect/turf_decal/siding/wood{ @@ -12289,6 +12007,27 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"fJQ" = ( +/obj/structure/table/wood, +/obj/item/folder/yellow{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/folder/red{ + pixel_x = 7 + }, +/obj/item/folder/blue{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/storage/briefcase, +/obj/item/door_remote/omni, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "fJR" = ( /obj/structure/chair/comfy/red{ color = "#FFFFFF"; @@ -12305,6 +12044,12 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"fKr" = ( +/obj/structure/shuttle/engine/huge{ + dir = 4 + }, +/turf/simulated/floor/shuttle/transparent_floor, +/area/shuttle/administration) "fKH" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -12328,6 +12073,12 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"fLa" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_medical, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "fLb" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -12371,35 +12122,6 @@ /obj/structure/flora/ausbushes/grassybush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/control) -"fLB" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navyblue" - }, -/area/centcom/specops) -"fLF" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"fLG" = ( -/obj/structure/rack, -/obj/item/ammo_box/shotgun, -/obj/item/ammo_box/shotgun, -/obj/item/ammo_box/shotgun, -/obj/effect/decal/warning_stripes/blue/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"fMn" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredaltstrip" - }, -/area/centcom/zone2) "fMQ" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/bridge) @@ -12424,6 +12146,16 @@ /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"fND" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "fNY" = ( /obj/effect/turf_decal/siding/green{ dir = 4 @@ -12439,17 +12171,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/evac) -"fOg" = ( -/obj/structure/sign/directions/cargo{ - dir = 4; - pixel_x = 32; - pixel_y = -26 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealtstrip" - }, -/area/centcom/specops) "fOq" = ( /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush/b, @@ -12461,13 +12182,15 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/zone3) -"fPj" = ( -/obj/effect/turf_decal/caution/stand_clear, +"fPf" = ( +/obj/effect/decal/nanotrasen_logo{ + icon_state = "logo2"; + pixel_x = 16 + }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkyellowaltstrip" + icon_state = "dark" }, -/area/centcom/zone3) +/area/centcom/specops) "fPk" = ( /obj/machinery/computer/camera_advanced, /turf/simulated/floor/carpet/black, @@ -12521,16 +12244,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"fQm" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_2) "fQx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -12559,6 +12272,13 @@ icon_state = "white" }, /area/centcom/zone1) +"fQO" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/centcom/jail) "fQU" = ( /obj/structure/window/reinforced{ dir = 8; @@ -12608,16 +12328,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone1) -"fSV" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_3) "fSW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -12625,44 +12335,6 @@ /obj/structure/chair/comfy/brown, /turf/simulated/floor/wood, /area/centcom/zone1) -"fTc" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/obj/item/clothing/shoes/fluff/noble_boot, -/obj/item/clothing/shoes/fluff/noble_boot, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots/jacksandals, -/obj/item/clothing/shoes/jackboots/jacksandals, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/shoes/leather, -/obj/item/clothing/shoes/leather, -/obj/item/clothing/shoes/white, -/obj/item/clothing/shoes/white, -/obj/item/clothing/shoes/white{ - icon_state = "secshoes"; - name = "shoes" - }, -/obj/item/clothing/shoes/white{ - icon_state = "secshoes"; - name = "shoes" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "fTt" = ( /obj/structure/window/reinforced, /obj/item/flag/nt, @@ -12673,26 +12345,16 @@ icon_state = "dark" }, /area/centcom/evac) -"fTL" = ( -/obj/item/flag/nt, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"fTS" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 4; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) "fTZ" = ( /turf/simulated/wall/indestructible/fakeglass, /area/ussp_centcom/secretariat) +"fUj" = ( +/obj/machinery/computer/camera_advanced, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "fUp" = ( /obj/structure/flora/grass/both, /obj/structure/flora/grass/green, @@ -12711,6 +12373,22 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"fUK" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 9; + pixel_y = 1; + pixel_x = -1; + density = 0 + }, +/obj/structure/fishingrodcabinet{ + pixel_y = 32; + pixel_x = 3 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkbluealt" + }, +/area/centcom/zone2) "fUX" = ( /obj/machinery/kitchen_machine/oven, /obj/item/reagent_containers/food/snacks/rawcookies/chocochips{ @@ -12721,46 +12399,20 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"fVm" = ( -/obj/effect/turf_decal/arrows{ - dir = 8 - }, +"fVl" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkyellowalt" - }, -/area/centcom/supply) -"fVA" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 + dir = 10; + icon_state = "darkred" }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ - dir = 8 +/area/centcom/specops) +"fVB" = ( +/obj/effect/turf_decal/siding/white{ + dir = 6 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/shuttle/administration) -"fVC" = ( -/obj/machinery/turretid{ - control_area = "Centcom Special Operations Forces"; - name = "Quarantine Turret"; - pixel_x = 3; - pixel_y = -26 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/centcom/evac) "fVE" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -12777,27 +12429,16 @@ icon_state = "sepia" }, /area/ninja/outpost) -"fVS" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 1 - }, -/obj/structure/shuttle/engine/platform{ - layer = 2.9 +"fWh" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer/crew, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate) -"fVV" = ( -/obj/structure/filingcabinet/security, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 1 +/turf/simulated/floor/plasteel{ + icon_state = "darkbluefull" }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) +/area/centcom/bridge) "fWk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -12814,6 +12455,13 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"fWt" = ( +/obj/structure/chair/comfy/red{ + color = "#FFFFFF"; + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "fWE" = ( /obj/machinery/door/airlock/shuttle{ id_tag = "s_docking_airlock" @@ -12834,21 +12482,28 @@ icon_state = "neutral" }, /area/centcom/evac) -"fXt" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 +"fXf" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 8; + pixel_y = 9 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = 1; + pixel_y = 2 }, -/area/shuttle/administration) -"fXA" = ( -/obj/effect/turf_decal{ - dir = 8; - icon_state = "golden_stripes" +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"fXA" = ( +/obj/effect/turf_decal{ + dir = 8; + icon_state = "golden_stripes" }, /obj/machinery/light/spot{ dir = 8; @@ -12859,20 +12514,22 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"fXY" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "fXZ" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcornersalt" }, /area/centcom/jail) -"fYj" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredalt" - }, -/area/centcom/jail) "fYP" = ( /obj/machinery/door/airlock/centcom{ name = "Outpost 2"; @@ -12904,13 +12561,6 @@ }, /turf/simulated/floor/carpet/cyan, /area/ninja/outpost) -"fZj" = ( -/obj/machinery/photocopier, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "fZl" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo19" @@ -12944,14 +12594,25 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"gao" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (NORTH)" +"gap" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_sit) +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/folder/yellow{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/folder/white{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone2) "gay" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -13006,63 +12667,147 @@ /obj/effect/turf_decal/siding/green, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"gcl" = ( -/obj/effect/turf_decal/number/number_1{ - dir = 8 +"gce" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/captain_fly{ + name = "rogue uniform" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredaltstrip" +/obj/item/clothing/under/captainparade{ + name = "parade uniform" }, -/area/centcom/jail) -"gcn" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = -6 +/obj/item/clothing/under/captainparade{ + name = "parade uniform" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = -6 +/obj/item/clothing/under/captain_fly{ + name = "rogue uniform" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = -6 +/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/fluff/elishirt, +/obj/item/clothing/under/fluff/elishirt, +/obj/item/clothing/under/lawyer/black, +/obj/item/clothing/under/lawyer/black, +/obj/item/clothing/under/lawyer/blue, +/obj/item/clothing/under/lawyer/blue, +/obj/item/clothing/under/lawyer/bluesuit, +/obj/item/clothing/under/lawyer/bluesuit, +/obj/item/clothing/under/lawyer/female, +/obj/item/clothing/under/lawyer/female, +/obj/item/clothing/under/lawyer/oldman, +/obj/item/clothing/under/lawyer/oldman, +/obj/item/clothing/under/lawyer/red, +/obj/item/clothing/under/lawyer/red, +/obj/item/clothing/under/mafia{ + name = "black outfit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = -6 +/obj/item/clothing/under/mafia{ + name = "black outfit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = -6 +/obj/item/clothing/under/mafia/white{ + name = "white outfit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = 6 +/obj/item/clothing/under/mafia/white{ + name = "white outfit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = 6 +/obj/item/clothing/under/misc/durathread, +/obj/item/clothing/under/misc/durathread, +/obj/item/clothing/under/retro/engineering, +/obj/item/clothing/under/retro/engineering, +/obj/item/clothing/under/retro/medical, +/obj/item/clothing/under/retro/medical, +/obj/item/clothing/under/retro/science, +/obj/item/clothing/under/retro/science, +/obj/item/clothing/under/retro/security, +/obj/item/clothing/under/retro/security, +/obj/item/clothing/under/color/black{ + icon_state = "hosblueclothes"; + name = "jumpsuit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = 6 +/obj/item/clothing/under/color/black{ + icon_state = "hosblueclothes"; + name = "jumpsuit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = 6 +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" }, -/obj/item/gun/projectile/automatic/sfg{ - pixel_x = 6 +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hostanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hostanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officertanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officertanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardenblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardenblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardendnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardendnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardentanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardentanclothes"; + name = "jumpsuit" + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) -"gcp" = ( -/obj/structure/railing{ - dir = 4; - pixel_x = -32 +/area/centcom/supply) +"gcl" = ( +/obj/effect/turf_decal/number/number_1{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + dir = 8; + icon_state = "darkredaltstrip" }, -/area/centcom/specops) +/area/centcom/jail) "gct" = ( /obj/mecha/combat/marauder/loaded, /turf/simulated/floor/plasteel{ @@ -13070,6 +12815,13 @@ icon_state = "navyblue" }, /area/centcom/specops) +"gcu" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + tag = "icon-propulsion (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) "gcB" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -13095,6 +12847,14 @@ /obj/item/storage/box/disks_plantgene, /turf/simulated/floor/wood, /area/centcom/evac) +"gcZ" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/jail) "gdi" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -13108,16 +12868,6 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"gdn" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/conveyor{ - id = "CO2"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "gdt" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22"; @@ -13134,14 +12884,6 @@ icon_state = "seadeep" }, /area/centcom/evac) -"geh" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "N2O" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "gel" = ( /obj/machinery/door/window/brigdoor{ color = "#d70000"; @@ -13168,6 +12910,24 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) +"geF" = ( +/obj/machinery/door/airlock/external{ + id_tag = "specops_away"; + name = "Shuttle Hatch"; + req_access = list(109) + }, +/obj/machinery/shower{ + pixel_y = 20 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/indestructible{ + icon_state = "dark" + }, +/area/centcom/specops) "geW" = ( /obj/item/clothing/glasses/meson{ pixel_x = -6; @@ -13204,15 +12964,12 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"gfq" = ( -/obj/structure/bed, -/obj/item/bedsheet/qm, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 +"gfm" = ( +/obj/structure/chair/comfy/red{ + dir = 1 }, -/turf/simulated/floor/carpet/arcade, -/area/centcom/zone1) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "gfs" = ( /obj/effect/turf_decal{ dir = 10; @@ -13295,34 +13052,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"ggu" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/mining) -"ggB" = ( -/obj/effect/decal/warning_stripes/blue, -/obj/machinery/door/airlock/centcom{ - name = "Artillery Control"; - opacity = 1; - req_access = list(114) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_BSA" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "ggC" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -13333,31 +13062,12 @@ icon_state = "sepia" }, /area/ninja/outpost) -"ggJ" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 5 - }, -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" +"ggH" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 }, -/area/centcom/specops) -"ggL" = ( -/turf/simulated/floor/carpet, -/area/centcom/zone3) +/turf/simulated/floor/plating/airless, +/area/shuttle/transport) "ggS" = ( /obj/structure/window/reinforced, /obj/item/twohanded/required/kirbyplants, @@ -13376,6 +13086,9 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"ghb" = ( +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) "ghk" = ( /obj/structure/table/wood/fancy/green, /obj/item/reagent_containers/food/snacks/chinese/chowmein{ @@ -13405,36 +13118,17 @@ /obj/machinery/vending/cigarette/free, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"giz" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1; - tag = "icon-heater (NORTH)" - }, -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, -/area/shuttle/ussp) "giC" = ( /turf/simulated/wall/shuttle/onlyselfsmooth{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/ussp) -"giK" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/siberia) -"gjE" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - id_tag = "s_docking_airlock"; - name = "Emergency Droppod"; - req_access = list(109) +"gjn" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "gjP" = ( /obj/effect/decal/warning_stripes/white, /obj/machinery/door/airlock{ @@ -13455,12 +13149,26 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"gkW" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/item/candle/eternal, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/evac) "glc" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) +"glw" = ( +/obj/structure/table/glass, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/centcom/specops) "glB" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -13470,6 +13178,14 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"glE" = ( +/obj/item/beach_ball, +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/beach/sand{ + icon = 'icons/turf/floors.dmi'; + icon_state = "asteroid" + }, +/area/centcom/evac) "glM" = ( /obj/machinery/light{ dir = 8 @@ -13490,17 +13206,6 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"glZ" = ( -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) "gmb" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -13549,52 +13254,28 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"gmY" = ( -/obj/item/storage/ashtray/glass{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/lighter/zippo/blue{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/structure/table/glass, -/obj/item/paper/monitorkey, -/obj/item/paper/tcommskey, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"gnk" = ( -/obj/structure/safe{ - known_by = list("NNC") - }, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/coin/gold, -/obj/item/toy/plushie/corgi, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/stack/spacecash/c1000000{ - name = "1000000 Credit" +"gmU" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access = list(150) }, -/obj/item/stack/spacecash/c1000000{ - name = "1000000 Credit" +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 5; + id = "ruins_transport_shuttle"; + name = "USSP Cargo Shuttle"; + roundstart_move = "ussp_dock"; + alone_shuttle = 1; + width = 8; + port_direction = 4 }, -/obj/item/stack/spacecash/c1000000{ - name = "1000000 Credit" +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/area/shuttle/ussp) "gnl" = ( /obj/effect/turf_decal/stripes/line{ do_not_delete_me = 1 @@ -13617,6 +13298,12 @@ /obj/structure/weightmachine/weightlifter, /turf/simulated/floor/grass, /area/centcom/evac) +"gnR" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" + }, +/area/centcom/zone2) "goa" = ( /obj/machinery/conveyor{ id = "SFBQMLoad" @@ -13635,52 +13322,27 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"gog" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "CC_ERT1" - }, -/obj/machinery/door_control/secure{ - id = "CC_ERT1"; - pixel_y = -25; - req_access = list(114) +"goz" = ( +/obj/effect/baseturf_helper/asteroid/snow{ + baseturf = /turf/simulated/floor/indestructible/snow; + name = "snow baseturf editor" }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/indestructible/asteroid, +/area/ninja/outside) +"goI" = ( /turf/simulated/floor/plasteel{ - icon_state = "navybluealt" + dir = 5; + icon_state = "navyblue" }, /area/centcom/specops) -"gom" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - req_access = list(114) +"gpm" = ( +/obj/machinery/atmospherics/unary/cryo_cell/upgraded{ + layer = 3.5 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/zone3) -"goy" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/glass/reinforced, /area/centcom/specops) -"goz" = ( -/obj/effect/baseturf_helper/asteroid/snow{ - baseturf = /turf/simulated/floor/indestructible/snow; - name = "snow baseturf editor" - }, -/turf/simulated/floor/indestructible/asteroid, -/area/ninja/outside) "gpp" = ( /obj/structure/railing{ dir = 1 @@ -13703,18 +13365,14 @@ /obj/item/reagent_containers/food/snacks/chimichanga, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"gpY" = ( -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/centcom/specops) -"gqn" = ( -/obj/item/radio/intercom/specops{ - pixel_x = 32 +"gqg" = ( +/obj/structure/window/reinforced{ + layer = 2.9 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkfull" }, -/area/centcom/bridge) +/area/centcom/jail) "gqv" = ( /obj/machinery/cryopod{ dir = 8 @@ -13724,22 +13382,6 @@ icon_state = "navyblue" }, /area/centcom/specops) -"gqU" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluealt" - }, -/area/centcom/zone2) -"gri" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "grj" = ( /obj/machinery/light{ dir = 1 @@ -13755,17 +13397,21 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"grH" = ( -/obj/item/radio/intercom/specops{ - pixel_x = 28; - pixel_y = -42 +"grD" = ( +/obj/machinery/vending/wallmed{ + pixel_y = -32 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 9 +/turf/simulated/floor/indestructible{ + dir = 6; + icon_state = "darkgreynavyblue" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) +"grF" = ( +/obj/structure/filingcabinet/chestdrawer{ + pixel_y = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "grJ" = ( /obj/structure/rack/holorack, /obj/item/autoimplanter, @@ -13780,15 +13426,32 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"gsK" = ( -/turf/simulated/floor/indestructible{ - dir = 9; - icon_state = "darkgreynavyblue" +"gsj" = ( +/obj/structure/table/glass, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen/multi/fountain, +/obj/item/stamp/centcom{ + pixel_x = -5; + pixel_y = -7 + }, +/obj/item/radio/intercom/specops{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"gtm" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood/fancy/cherry, +"gsJ" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 + }, +/turf/simulated/floor/glass, /area/centcom/bridge) "gtw" = ( /obj/effect/turf_decal/delivery, @@ -13801,6 +13464,12 @@ "gtx" = ( /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/trade/sol) +"gtH" = ( +/turf/simulated/floor/indestructible{ + dir = 4; + icon_state = "darkpurple" + }, +/area/centcom/specops) "gtO" = ( /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/carpet/black, @@ -13822,28 +13491,6 @@ icon_state = "darkyellowcornersalt" }, /area/centcom/zone3) -"gup" = ( -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/item/grenade/empgrenade, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - damage_deflection = 2000; - layer = 2.9; - name = "EMP grenade"; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "guv" = ( /obj/machinery/vending/dinnerware{ req_access = list(102) @@ -13853,26 +13500,6 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) -"guE" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/centcom/specops) -"guW" = ( -/obj/effect/step_trigger/teleporter{ - teleport_x = 137; - teleport_y = 65; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 4; - icon_state = "rampbottom" - }, -/area/centcom/specops) "gvs" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium_corner" @@ -13893,15 +13520,6 @@ icon_state = "navybluealt" }, /area/centcom/specops) -"gvA" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/chair/office/dark{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "gvL" = ( /obj/structure/railing, /turf/simulated/floor/plasteel{ @@ -13942,20 +13560,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"gwz" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/evac) -"gwG" = ( -/obj/structure/table/reinforced, -/obj/machinery/kitchen_machine/microwave/upgraded{ - pixel_y = 6 - }, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) "gwP" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -13971,33 +13575,12 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"gxB" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/chair/comfy/red{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "gyg" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"gyi" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/jail) -"gyE" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) "gyV" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -14011,10 +13594,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"gyY" = ( -/obj/machinery/vending/boozeomat, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) "gza" = ( /obj/machinery/light/small{ dir = 4; @@ -14064,6 +13643,20 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) +"gzp" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass, +/area/centcom/zone3) "gzB" = ( /obj/structure/window/reinforced{ color = "red"; @@ -14073,16 +13666,12 @@ /obj/structure/table/wood/fancy/black, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"gzJ" = ( -/obj/mecha/combat/durand/loaded{ - color = "#CCCCFF"; - desc = "A heavyweight exosuit, painted in a gray scheme. This model appears to have some modifications for ERT."; - name = "Nanotrasen Special Durand Mk. II"; - operation_req_access = list(109) +"gzR" = ( +/obj/structure/table/glass, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkred" }, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/engine, /area/centcom/specops) "gzT" = ( /obj/effect/turf_decal/siding/green{ @@ -14097,6 +13686,19 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"gAp" = ( +/obj/structure/closet/cardboard{ + icon_state = "cardboard_librarian"; + icon_closed = "cardboard_librarian"; + icon_opened = "cardboard_librarian_open" + }, +/obj/item/paper/central_command/archive/memes{ + info = "
"; + name = "Супъективное мнение" + }, +/obj/item/book/random/triple, +/turf/simulated/floor/plating, +/area/centcom/zone2) "gAB" = ( /obj/structure/flora/junglebush, /obj/effect/turf_decal/siding/green{ @@ -14104,52 +13706,34 @@ }, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"gAL" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table, -/obj/machinery/computer/library/public{ - pixel_y = 4; - pixel_x = 1 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"gAN" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - tag = "icon-propulsion (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) -"gAR" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/box/white/corners{ - dir = 8 - }, -/obj/structure/weightmachine/stacklifter, +"gAV" = ( +/mob/living/carbon/human/lesser/wolpin, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 1; + icon_state = "tatami"; + name = "Tatami" }, -/area/centcom/jail) +/area/ninja/outpost) "gBo" = ( /obj/effect/turf_decal/stripes/gold{ dir = 6 }, /turf/simulated/floor/carpet/arcade, /area/centcom/bridge) -"gBL" = ( +"gBS" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkredalt" + }, +/area/centcom/zone2) +"gCw" = ( +/obj/structure/chair{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "darkred" + icon_state = "vault"; + tag = "icon-vault (WEST)" }, /area/centcom/specops) "gCy" = ( @@ -14179,6 +13763,14 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"gDk" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "gDm" = ( /obj/machinery/light{ dir = 1 @@ -14187,6 +13779,10 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) +"gDR" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone3) "gDV" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = -30 @@ -14198,25 +13794,25 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"gDX" = ( -/obj/structure/railing{ - dir = 1 +"gDY" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/specops) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/mech_bay_recharge_port/upgraded, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "gEb" = ( /obj/machinery/computer, /turf/simulated/floor/plasteel{ icon_state = "Dark" }, /area/shuttle/funeral) -"gEv" = ( -/obj/structure/filingcabinet/security, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkredalt" - }, -/area/centcom/jail) "gEA" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -14225,33 +13821,6 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/carpet/green, /area/ninja/outpost) -"gET" = ( -/obj/machinery/light, -/obj/effect/turf_decal/siding/brown/corner{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) -"gFg" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/vending/coffee/free, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"gFo" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealt" - }, -/area/centcom/specops) "gFq" = ( /obj/effect/turf_decal/siding{ color = "#444444" @@ -14263,34 +13832,30 @@ }, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"gFs" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 9 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) "gFx" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/supply) -"gFQ" = ( -/obj/effect/landmark/marauder_exit, -/obj/structure/fans/tiny, -/obj/effect/turf_decal/tile/neutral{ - alpha = 220; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 +"gFC" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/centcom/supply) +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) +"gFG" = ( +/obj/machinery/vending/security/ert{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealt" + }, +/area/centcom/specops) "gFS" = ( /obj/machinery/door/airlock/centcom{ name = "Outpost 1"; @@ -14308,6 +13873,14 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) +"gFZ" = ( +/obj/effect/turf_decal/arrows{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowcornersalt" + }, +/area/centcom/supply) "gGp" = ( /obj/structure/closet/secure_closet/medical2, /obj/machinery/light, @@ -14315,21 +13888,6 @@ icon_state = "white" }, /area/centcom/zone1) -"gGz" = ( -/obj/structure/table/wood, -/obj/item/gavelhammer{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/gavelblock{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "gGM" = ( /obj/effect/turf_decal{ dir = 10; @@ -14337,65 +13895,9 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) -"gGR" = ( -/obj/structure/chair/sofa/corp/left, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) "gGY" = ( /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"gHi" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/obj/item/clothing/shoes/fluff/noble_boot, -/obj/item/clothing/shoes/fluff/noble_boot, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots/jacksandals, -/obj/item/clothing/shoes/jackboots/jacksandals, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/shoes/leather, -/obj/item/clothing/shoes/leather, -/obj/item/clothing/shoes/white, -/obj/item/clothing/shoes/white, -/obj/item/clothing/shoes/white{ - icon_state = "secshoes"; - name = "shoes" - }, -/obj/item/clothing/shoes/white{ - icon_state = "secshoes"; - name = "shoes" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"gHl" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 8; - id_tag = "CC_supply_internal"; - layer = 5; - locked = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "gHn" = ( /obj/structure/closet/secure_closet/clown{ req_access = null @@ -14430,19 +13932,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"gIc" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/newscaster/security_unit{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) -"gIq" = ( -/obj/machinery/chem_heater, -/turf/simulated/floor/engine, -/area/centcom/specops) "gIz" = ( /obj/effect/decal/cleanable/confetti, /turf/simulated/floor/plasteel{ @@ -14461,6 +13950,20 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"gJa" = ( +/obj/machinery/door/airlock/public/glass, +/obj/effect/turf_decal/stripes/black{ + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 1; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "gJg" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small, @@ -14485,20 +13988,19 @@ }, /turf/simulated/floor/carpet/royalblack, /area/shuttle/trade/sol) -"gKi" = ( -/turf/simulated/floor/carpet/blue, -/area/shuttle/trade/sol) -"gKt" = ( -/obj/machinery/vending/mech/ntc/exousuit{ - req_access = list(114) - }, -/obj/machinery/light{ +"gJq" = ( +/obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/turf_decal/box/white/corners, +/obj/structure/weightmachine/stacklifter, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkfull" }, -/area/centcom/supply) +/area/centcom/jail) +"gKi" = ( +/turf/simulated/floor/carpet/blue, +/area/shuttle/trade/sol) "gKX" = ( /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -14542,9 +14044,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"gLu" = ( -/turf/simulated/floor/plasteel/freezer, -/area/centcom/specops) "gLw" = ( /turf/simulated/wall/shuttle/nosmooth{ dir = 4; @@ -14552,53 +14051,6 @@ icon_state = "ninja_walls_direction" }, /area/shuttle/ninja) -"gLC" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) -"gLD" = ( -/obj/machinery/vending/security, -/turf/simulated/floor/indestructible{ - dir = 1; - icon_state = "darkpurple" - }, -/area/centcom/specops) -"gLF" = ( -/obj/structure/closet/hydrant{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowalt" - }, -/area/centcom/zone3) -"gLN" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 5; - pixel_y = -2 - }, -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) -"gLW" = ( -/obj/machinery/door_control/secure{ - color = "#ffdd99"; - id = "ERT_armory_lvl4"; - name = "ERT Armory Level 4"; - pixel_y = -32; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkyellow" - }, -/area/centcom/specops) "gLX" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 10 @@ -14614,6 +14066,24 @@ icon_state = "darkblue" }, /area/centcom/zone1) +"gMj" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/indestructible{ + dir = 6; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) +"gMv" = ( +/obj/structure/table/glass, +/obj/item/paper, +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = -5 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "gMB" = ( /obj/structure/window/reinforced{ dir = 8 @@ -14621,12 +14091,6 @@ /mob/living/simple_animal/cow, /turf/simulated/floor/grass, /area/centcom/evac) -"gMD" = ( -/obj/structure/chair/comfy/brown{ - color = "#3300FF" - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "gMG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -14634,36 +14098,12 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"gMP" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/carpet, -/area/centcom/jail) -"gMV" = ( -/obj/structure/closet/acloset{ - name = "Undercover officer's closet"; - desc = "It's a basic storage unit." - }, -/obj/item/flashlight, -/obj/item/encryptionkey/centcom, -/obj/item/radio/headset, -/obj/item/organ/internal/cyberimp/arm/combat/centcom, -/obj/item/autoimplanter/old, -/obj/item/clothing/gloves/color/yellow/power, -/obj/item/storage/belt/utility/full/multitool, -/obj/item/clothing/shoes/chameleon/noslip, -/obj/item/clothing/under/color/black, -/obj/item/implanter/dust, -/obj/item/storage/box/engineer{ - name = "Survival kit" - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"gNe" = ( -/obj/structure/chair/comfy/red{ - color = "#FFFFFF"; - dir = 8 +"gMO" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowaltstrip" }, -/turf/simulated/floor/carpet/black, /area/centcom/zone3) "gNB" = ( /obj/effect/mapping_helpers/light{ @@ -14672,49 +14112,43 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"gNC" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ +"gNS" = ( +/obj/structure/rack/holorack, +/obj/item/circuitboard/aiupload, +/obj/item/circuitboard/circuit_imprinter, +/obj/item/circuitboard/communications, +/obj/item/circuitboard/destructive_analyzer, +/obj/item/circuitboard/ore_redemption, +/obj/item/circuitboard/mining_shuttle, +/obj/item/circuitboard/mining_shuttle, +/obj/item/circuitboard/mining_shuttle, +/obj/item/circuitboard/protolathe, +/obj/structure/window/reinforced{ dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) -"gNX" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; layer = 2.9 }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) -"gOb" = ( -/obj/structure/table/glass, -/obj/item/clipboard, -/obj/item/lighter/zippo/blue{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = -4; - pixel_y = 9 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) +/area/centcom/supply) "gOi" = ( /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/centcom/zone1) +"gOl" = ( +/obj/item/radio/intercom/specops{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone3) "gOv" = ( /obj/structure/window/reinforced{ color = "red"; @@ -14734,12 +14168,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/syndicate_mothership/control) -"gOH" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowcornersalt" - }, -/area/centcom/zone3) "gOI" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -14771,15 +14199,6 @@ icon_state = "dark" }, /area/centcom/jail) -"gPi" = ( -/obj/effect/turf_decal/tile/neutral{ - alpha = 180; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "gPk" = ( /obj/structure/rack, /obj/item/plant_analyzer, @@ -14802,6 +14221,22 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"gPP" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"gQl" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet, +/area/centcom/jail) "gQr" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/indestructible/grass, @@ -14825,12 +14260,30 @@ /obj/structure/flora/tree/jungle/small, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"gQT" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellow" +"gRj" = ( +/obj/structure/closet/secure_closet/guncabinet{ + layer = 2.9; + name = "L.W.A.P. Sniper Rifle" }, -/area/centcom/specops) +/obj/item/gun/energy/sniperrifle, +/obj/item/gun/energy/sniperrifle, +/obj/machinery/light/spot{ + dir = 4; + tag = "icon-tube1 (EAST)" + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "gRr" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/spacebar) @@ -14840,23 +14293,6 @@ icon_state = "darkredalt" }, /area/centcom/jail) -"gSb" = ( -/obj/machinery/door/poddoor{ - id_tag = "ASSAULT3"; - name = "Launch Bay #3" - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"gSl" = ( -/obj/structure/bookcase/random, -/turf/simulated/floor/carpet, -/area/centcom/zone1) "gSx" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Syndicate Base" @@ -14866,17 +14302,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"gSz" = ( -/obj/effect/turf_decal/arrows/white{ - dir = 4; - name = "ERT shuttle"; - pixel_x = -6 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealtstrip" - }, -/area/centcom/specops) "gSC" = ( /obj/machinery/door/poddoor/impassable{ density = 0; @@ -14897,23 +14322,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"gTa" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1; - do_not_delete_me = 1 - }, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl2"; - name = "Armory level 2"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "gTs" = ( /obj/machinery/atm{ pixel_y = -32 @@ -14938,24 +14346,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"gTR" = ( -/obj/machinery/door/airlock/centcom{ - name = "Archive"; - opacity = 1; - req_access = list(113) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) -"gUc" = ( -/obj/structure/chair/comfy/lime, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2 - }, -/turf/simulated/floor/wood, -/area/centcom/zone3) "gUj" = ( /obj/structure/railing/corner{ dir = 4 @@ -14982,14 +14372,6 @@ /obj/machinery/vending/chinese/free, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"gUA" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/item/flag/nt, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "gVk" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -15004,6 +14386,13 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"gVO" = ( +/obj/structure/chair/comfy/red{ + color = "#FFFFFF"; + dir = 8 + }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) "gVQ" = ( /obj/item/pizzabox, /obj/item/pizzabox, @@ -15020,6 +14409,16 @@ name = "floor" }, /area/syndicate_mothership) +"gVU" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/gold{ + dir = 6; + do_not_delete_me = 1 + }, +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) "gWk" = ( /obj/structure/rack, /obj/item/card/emag, @@ -15029,20 +14428,6 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"gWl" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) -"gWS" = ( -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "gWZ" = ( /obj/structure/flora/grass/jungle, /turf/simulated/wall/indestructible/rock, @@ -15071,6 +14456,28 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"gXI" = ( +/obj/mecha/combat/marauder/loaded, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navyblue" + }, +/area/centcom/specops) +"gXQ" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "gYq" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 4 @@ -15080,16 +14487,33 @@ icon_state = "asteroid" }, /area/centcom/evac) -"gYD" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkgreencorners" - }, -/area/centcom/specops) +"gYQ" = ( +/obj/item/book/manual/sop_command, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_general, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_medical, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_security, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/obj/item/book/manual/security_space_law/black, +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet, +/area/centcom/jail) "gYZ" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/vending/snack/free, /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"gZv" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "navybluealt" + }, +/area/centcom/specops) "gZE" = ( /obj/item/flag/syndi, /obj/effect/turf_decal/siding/wideplating/corner{ @@ -15107,6 +14531,12 @@ icon_state = "darkgrey" }, /area/syndicate_mothership/elite_squad) +"hat" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkredaltstrip" + }, +/area/centcom/zone2) "haG" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -15147,20 +14577,33 @@ /obj/machinery/vending/cola/free, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"hby" = ( -/obj/structure/bed, -/obj/item/bedsheet/wiz, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone1) "hbV" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/railing, /turf/simulated/floor/carpet/blue, /area/ninja/outpost) +"hcs" = ( +/obj/item/stack/sheet/metal, +/obj/structure/table, +/obj/item/stack/sheet/glass{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/glass{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/stack/sheet/glass{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "hcx" = ( /obj/machinery/chem_master, /turf/simulated/floor/plasteel{ @@ -15168,6 +14611,19 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) +"hcJ" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater2x2_side"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/window/reinforced{ + color = "yellow"; + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) "hdj" = ( /obj/structure/chair, /obj/effect/turf_decal/siding/wideplating{ @@ -15211,19 +14667,6 @@ icon_state = "rampbottom" }, /area/ninja/outpost) -"hdS" = ( -/obj/structure/cable{ - icon_state = "8-9" - }, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-9" - }, -/obj/machinery/atmospherics/pipe/cap, -/turf/simulated/floor/plating, -/area/centcom/specops) "hdT" = ( /obj/structure/table, /obj/item/radio/electropack{ @@ -15244,6 +14687,26 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"hem" = ( +/obj/structure/table/glass, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/reagent_containers/food/snacks/baguette=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/soup/bloodsoup=10,/obj/item/reagent_containers/food/snacks/boiledrice=10,/obj/item/reagent_containers/food/snacks/carrotfries=10,/obj/item/reagent_containers/food/drinks/cans/cola=10,""=70); + name = "Food CC Spawner #1" + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 6; + pixel_y = -1; + pixel_x = 1; + density = 0 + }, +/obj/structure/window/reinforced{ + layer = 3.1; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "heo" = ( /obj/structure/railing{ dir = 4 @@ -15259,22 +14722,18 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) -"hfq" = ( -/obj/structure/closet/secure_closet/cabinet/bar, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/turf/simulated/floor/wood, -/area/centcom/zone1) +"hfa" = ( +/obj/structure/shuttle/engine/large{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) +"hfl" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellow" + }, +/area/centcom/specops) "hfX" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -15290,42 +14749,6 @@ "hgc" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/bridge) -"hgx" = ( -/obj/machinery/door_control{ - color = "#ffcccc"; - id = "Zone3_bathroom2"; - name = "Bathroom lock"; - normaldoorcontrol = 1; - pixel_x = -4; - pixel_y = 33; - req_access = list(114); - specialfunctions = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) -"hgB" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/obj/docking_port/mobile/pod{ - id = "pod3"; - name = "escape pod 3"; - roundstart_move = "pod3_home" - }, -/obj/docking_port/stationary/transit{ - dwidth = 2; - height = 6; - id = "pod3_transit"; - name = "pod 3 in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 5 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) "hgS" = ( /obj/structure/spacepoddoor/invincible, /turf/simulated/floor/plasteel{ @@ -15333,6 +14756,19 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"hhM" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/shuttle/mining) "hhY" = ( /obj/machinery/door/airlock/syndicate/cargo{ name = "Cargo Receive"; @@ -15380,16 +14816,6 @@ }, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"hjf" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/storage/box/ids{ - pixel_y = 10 - }, -/obj/item/melee/baton/ntcane, -/obj/item/storage/briefcase, -/obj/item/lighter/zippo/blue, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "hjp" = ( /obj/structure/ore_box, /obj/machinery/light/small{ @@ -15397,6 +14823,13 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/mining) +"hjL" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "hjQ" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -15419,23 +14852,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"hke" = ( -/obj/machinery/optable, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = -30 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"hkg" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/centcom/zone3) "hku" = ( /obj/effect/decal/cleanable/ash, /obj/effect/decal/cleanable/shreds, @@ -15444,45 +14860,6 @@ icon_state = "neutral" }, /area/centcom/evac) -"hkH" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -8 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24 - }, -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, -/obj/item/holosign_creator/atmos, -/obj/item/holosign_creator/atmos, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"hlh" = ( -/turf/simulated/floor/indestructible{ - dir = 10; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) -"hlk" = ( -/obj/structure/railing, -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 4; - pixel_y = -2 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "hls" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) @@ -15510,10 +14887,6 @@ /obj/item/storage/box/lights/mixed, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"hlM" = ( -/obj/item/flag/nt, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) "hlQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -15524,6 +14897,12 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"hmB" = ( +/obj/structure/chair/sofa/corp/left, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "hmH" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/indestructible/snow, @@ -15539,6 +14918,13 @@ }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) +"hnc" = ( +/obj/machinery/teleport/station, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "hne" = ( /obj/structure/shuttle/engine/large, /turf/space, @@ -15578,25 +14964,26 @@ }, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"hnD" = ( +"hnX" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkredaltstrip" + }, +/area/centcom/zone2) +"hoc" = ( /obj/structure/closet/crate/can, /obj/structure/window/reinforced, /turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"hnF" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 +"hoD" = ( +/obj/structure/sign/poster/official/twelve_gauge{ + pixel_y = -32 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) -"hoq" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 4 +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navyblue" }, -/turf/simulated/floor/wood, /area/centcom/specops) "hoJ" = ( /turf/simulated/wall/shuttle, @@ -15611,29 +14998,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"hpN" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full" - }, -/obj/structure/railing{ - layer = 4.3; - density = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) -"hpY" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/machinery/computer/communications, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "hqm" = ( /obj/effect/turf_decal/tile{ alpha = 128; @@ -15663,37 +15027,25 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"hqq" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = -30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"hqH" = ( -/obj/machinery/computer/station_alert, -/obj/structure/railing, -/obj/structure/window/reinforced{ - dir = 4 +"hqZ" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowfull" +/obj/machinery/light{ + dir = 8 }, -/area/centcom/bridge) -"hrp" = ( -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command"; - icon_state = "bigscanner" +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"hrI" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/structure/table/holotable/wood, +/obj/structure/table, +/obj/machinery/computer/library/public, /turf/simulated/floor/carpet/black, -/area/centcom/specops) -"hsk" = ( -/obj/machinery/photocopier, -/obj/machinery/light, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/area/centcom/zone2) "hsz" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -15707,6 +15059,22 @@ icon_state = "bot" }, /area/shuttle/escape) +"hsG" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 1; + id_tag = "ERT_director_office_shutters"; + layer = 5; + locked = 1; + name = "CentCom SOO" + }, +/obj/machinery/door_control/secure{ + id = "ERT_director_office_shutters"; + pixel_x = 32; + req_access = list(114) + }, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/specops) "hsJ" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -15726,26 +15094,6 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"hsP" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - damage_deflection = 1000; - dir = 2; - req_access = list(114) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "CC_ERT2" - }, -/obj/machinery/door_control/secure{ - id = "CC_ERT2"; - pixel_y = -25; - req_access = list(114) - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" - }, -/area/centcom/specops) "hsS" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -15764,82 +15112,23 @@ icon_state = "navybluecorners" }, /area/centcom/specops) -"htg" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" - }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" - }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navyblue" - }, -/area/centcom/specops) "htk" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowaltstrip" }, /area/centcom/zone3) -"htt" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/holywater, -/obj/item/reagent_containers/food/drinks/bottle/holywater, -/turf/simulated/floor/carpet, -/area/centcom/evac) "htL" = ( /obj/structure/flora/grass/brown, /obj/structure/flora/grass/both, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"htN" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredaltstrip" + }, +/area/centcom/zone2) "htR" = ( /obj/machinery/door/airlock/centcom{ damage_deflection = 999; @@ -15886,21 +15175,6 @@ }, /turf/simulated/floor/plasteel, /area/ninja/outpost) -"hut" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; - id_tag = "admin_s_air_control"; - pixel_y = 24; - req_access = list(152); - tag_airpump = "admin_s_pump"; - tag_chamber_sensor = "admin_s_sensor"; - tag_exterior_door = "admin_s_outer"; - tag_interior_door = "admin_s_inner" - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "huw" = ( /obj/machinery/light/small{ brightness_range = 2; @@ -15913,12 +15187,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"hux" = ( -/turf/simulated/floor/indestructible{ - dir = 4; - icon_state = "darkgreynavybluecorner" - }, -/area/centcom/specops) "huE" = ( /obj/item/flag/ninja, /obj/effect/turf_decal/siding/wood{ @@ -15972,6 +15240,17 @@ name = "Tatami" }, /area/ninja/outpost) +"hvZ" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "hwc" = ( /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -16015,6 +15294,13 @@ icon_state = "dark" }, /area/shuttle/syndicate) +"hxv" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "hxy" = ( /obj/effect/turf_decal{ dir = 5; @@ -16026,23 +15312,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"hxB" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/filingcabinet/employment, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"hxE" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "hxR" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -16055,15 +15324,12 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"hyc" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +"hya" = ( +/turf/simulated/floor/wood{ + icon_state = "wood-broken7"; + tag = "icon-wood-broken7" }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) +/area/centcom/zone2) "hyg" = ( /obj/machinery/light/small{ dir = 1 @@ -16073,14 +15339,12 @@ icon_state = "dark" }, /area/centcom/zone1) -"hyL" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/security_space_law, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +"hza" = ( +/obj/machinery/vending/cigarette/free, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) "hzh" = ( /obj/effect/decal/cleanable/confetti, /obj/effect/decal/cleanable/dirt, @@ -16088,16 +15352,14 @@ icon_state = "dark" }, /area/centcom/jail) -"hzw" = ( -/obj/item/stack/nanopaste, -/obj/item/mmi, -/obj/item/stack/nanopaste, -/obj/structure/table/glass, -/obj/machinery/light, +"hzJ" = ( +/obj/effect/turf_decal/box/white{ + pixel_y = 16 + }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) "hzK" = ( /obj/effect/turf_decal/delivery, /obj/structure/fans/tiny/invisible, @@ -16106,6 +15368,29 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"hAd" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1"; + name = "Nanotrasen Diplomat's closet" + }, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/under/rank/centcom/diplomatic, +/obj/item/lighter/zippo/nt_rep, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/clothing/gloves/color/white, +/obj/item/storage/backpack/satchel, +/obj/item/radio/headset/centcom, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/storage/box/survival{ + name = "Survival kit" + }, +/obj/item/implanter/dust, +/obj/item/implanter/mindshield/ert, +/obj/item/implanter/death_alarm, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "hAn" = ( /obj/machinery/sleeper/upgraded{ dir = 4 @@ -16124,16 +15409,32 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"hBW" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 +"hAX" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "CO2" }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) +"hBl" = ( +/obj/structure/table/wood{ + color = "#996633" + }, +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/grass, +/area/centcom/evac) "hCl" = ( /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"hCr" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + tag = "icon-heater (NORTH)" + }, +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/ussp) "hCL" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -16177,33 +15478,19 @@ icon_state = "sepia" }, /area/ninja/outpost) -"hEl" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 +"hDY" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/turf/simulated/floor/plating/airless, +/area/shuttle/transport) "hEu" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" }, /area/centcom/evac) -"hEG" = ( -/obj/structure/closet/wardrobe/chemistry_white, -/obj/item/storage/bag/chemistry, -/obj/item/storage/bag/chemistry, -/obj/item/clothing/glasses/science{ - pixel_y = 3 - }, -/obj/item/clothing/glasses/science{ - pixel_y = 3 - }, -/turf/simulated/floor/engine, -/area/centcom/specops) "hEO" = ( /obj/effect/turf_decal{ icon_state = "golden_stripes" @@ -16258,6 +15545,17 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"hFX" = ( +/obj/effect/decal/warning_stripes/white, +/obj/machinery/door/airlock{ + id_tag = "CC_toilet_unit1"; + name = "Toilet" + }, +/obj/effect/mine/sound/bwoink, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "hGh" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/genericbush, @@ -16275,6 +15573,12 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"hHa" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "hHh" = ( /obj/machinery/light/small{ dir = 4 @@ -16284,20 +15588,6 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"hHq" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airlock_sensor{ - frequency = 1331; - id_tag = "admin_s_sensor"; - pixel_y = 26; - req_access = list(101) - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "hHt" = ( /obj/effect/decal/warning_stripes/white, /obj/structure/fans/tiny, @@ -16333,25 +15623,21 @@ }, /turf/simulated/floor/carpet/orange, /area/shuttle/trade/sol) -"hHW" = ( -/obj/structure/filingcabinet/employment, -/obj/item/radio/intercom/specops{ - pixel_y = -32 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"hIl" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_SRT1"; - pixel_y = -25; - req_access = list(114); - pixel_x = -25; - name = "SRT Team 2" +"hIf" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (NORTH)" }, +/turf/simulated/floor/plating/airless, +/area/shuttle/funeral) +"hIg" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/box, /turf/simulated/floor/plasteel{ - icon_state = "navybluealtstrip" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) "hIm" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-34"; @@ -16399,78 +15685,6 @@ /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"hIL" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_legal, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"hJg" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" - }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" - }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navyblue" - }, -/area/centcom/specops) -"hJk" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "hJl" = ( /obj/structure/sign/poster/contraband/rebels_unite{ pixel_y = 32 @@ -16484,6 +15698,16 @@ }, /turf/simulated/floor/carpet/red, /area/ninja/outpost) +"hJy" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/turf/simulated/floor/glass, +/area/centcom/bridge) "hJH" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/wood{ @@ -16492,46 +15716,27 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/simulated/floor/carpet/cyan, /area/ninja/outpost) -"hJM" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_away"; - name = "Shuttle Hatch"; - req_access = list(109) - }, -/obj/machinery/shower{ - pixel_y = 20 - }, -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/indestructible{ - icon_state = "dark" - }, -/area/centcom/specops) -"hJN" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkgreencorners"; - dir = 8 - }, -/area/centcom/specops) -"hKG" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = -30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/jail) "hLh" = ( /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"hLw" = ( +"hLq" = ( +/obj/structure/railing{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ - icon_state = "darkyellowcorners" + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/area/centcom/specops) +/area/centcom/zone2) +"hLB" = ( +/obj/effect/turf_decal/plaque, +/obj/structure/chair/comfy/red{ + color = "#222222"; + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "hLD" = ( /obj/effect/turf_decal{ dir = 8; @@ -16542,56 +15747,79 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"hLJ" = ( -/obj/machinery/door/airlock/shuttle, -/obj/structure/fans/tiny, -/obj/docking_port/stationary/transit{ - dir = 4; - dwidth = 4; - height = 6; - id = "gamma_shuttle_transit"; - name = "gamma in transit"; - pixel_x = -32; - turf_type = /turf/space/transit/south; - width = 7 +"hLH" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/accessory/black{ + desc = null; + name = "Black tie" }, -/obj/docking_port/mobile/gamma, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/obj/item/clothing/accessory/blue{ + desc = null; + name = "Blue tie" }, -/area/shuttle/gamma) -"hLV" = ( -/turf/simulated/wall/indestructible/abductor{ - icon_state = "alien20" +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/accessory/blue{ + desc = null; + name = "Blue tie" }, -/area/abductor_ship) -"hMa" = ( -/obj/structure/statue/sandstone/venus{ - layer = 5 +/obj/item/clothing/accessory/black{ + desc = null; + name = "Black tie" }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/grass, -/area/centcom/evac) -"hMi" = ( -/obj/machinery/computer/operating{ - layer = 3.5 +/obj/item/clothing/accessory/holster{ + desc = null; + name = "Shoulder holster" }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/item/clothing/accessory/holster{ + desc = null; + name = "Shoulder holster" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/storage/belt/fannypack/black, +/obj/item/storage/belt/fannypack/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/color/white{ + desc = null }, -/area/centcom/zone1) -"hMu" = ( -/obj/machinery/status_display{ - pixel_y = 32 +/obj/item/clothing/gloves/color/white{ + desc = null + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"hLV" = ( +/turf/simulated/wall/indestructible/abductor{ + icon_state = "alien20" + }, +/area/abductor_ship) +"hLZ" = ( +/obj/structure/chair/comfy/red{ + dir = 1 + }, +/obj/effect/landmark/aroomwarp{ + tag = "" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/bridge) +"hMi" = ( +/obj/machinery/computer/operating{ + layer = 3.5 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/zone1) "hMy" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien21" @@ -16612,6 +15840,11 @@ /obj/effect/turf_decal/stripes/gold, /turf/simulated/floor/carpet/royalblack, /area/syndicate_mothership/control) +"hNa" = ( +/turf/simulated/floor/indestructible{ + icon_state = "darkgrey" + }, +/area/centcom/specops) "hNd" = ( /turf/simulated/wall/indestructible/wood, /area/ussp_centcom/secretariat) @@ -16625,12 +15858,6 @@ /obj/machinery/vending/shoedispenser, /turf/simulated/floor/wood, /area/centcom/zone1) -"hNo" = ( -/obj/structure/window/reinforced, -/turf/simulated/wall/indestructible/reinforced{ - density = 0 - }, -/area/centcom/zone2) "hNH" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/carpet, @@ -16646,6 +15873,29 @@ /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plating, /area/shuttle/syndicate) +"hNK" = ( +/obj/structure/chair/sofa/right, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/arcade, +/area/centcom/zone1) +"hNX" = ( +/obj/structure/railing{ + layer = 4.3; + density = 0 + }, +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "hNZ" = ( /obj/machinery/door/window/brigdoor{ color = "#d70000"; @@ -16669,37 +15919,11 @@ icon_state = "asteroid" }, /area/centcom/evac) -"hOx" = ( -/obj/item/vending_refill/nta, -/obj/structure/rack/holorack, -/obj/item/vending_refill/nta, -/obj/item/vending_refill/nta, -/obj/item/vending_refill/nta, -/obj/item/vending_refill/nta, -/obj/item/vending_refill/nta, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "hOM" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien23" }, /area/abductor_ship) -"hON" = ( -/turf/simulated/floor/indestructible{ - dir = 1; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) -"hPz" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "hPQ" = ( /obj/effect/turf_decal{ dir = 5; @@ -16708,12 +15932,6 @@ /obj/structure/dresser, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"hPR" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkgreen" - }, -/area/centcom/specops) "hQg" = ( /obj/structure/weightmachine/weightlifter, /turf/simulated/floor/indestructible/asteroid, @@ -16729,27 +15947,21 @@ icon_state = "arrivalcorner" }, /area/centcom/evac) -"hQG" = ( +"hQU" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/meatsteak, /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluealt" - }, -/area/centcom/zone2) -"hQS" = ( -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) -"hQX" = ( -/obj/machinery/vending/cigarette/free, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/wood, /area/centcom/specops) +"hQV" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_l"; + tag = "icon-burst_l" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/specops) "hRt" = ( /obj/structure/curtain/open/shower/security, /turf/simulated/wall/indestructible/fakeglass, @@ -16770,64 +15982,15 @@ icon_state = "darkyellowfull" }, /area/centcom/bridge) -"hRH" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 11; - height = 18; - id = "emergency_away"; - name = "emergency centcom"; - width = 29 - }, -/turf/space{ - icon_state = "black" - }, -/area/space) -"hRI" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" - }, -/area/shuttle/administration) -"hRZ" = ( -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) -"hSk" = ( -/obj/machinery/vending/clothing/departament/law, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"hSO" = ( -/obj/structure/falsewall/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"hST" = ( -/obj/effect/turf_decal/tile/neutral{ - alpha = 85; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' - }, -/obj/structure/window/reinforced{ - dir = 4; - layer = 9.1 - }, -/obj/structure/flora/rock/pile, -/obj/structure/window/reinforced/survival_pod{ - dir = 6; - pixel_y = -7; - pixel_x = 1; - density = 0 +"hSv" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/storage/box/ids{ + pixel_y = 10 }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/obj/item/melee/baton/ntcane, +/obj/item/storage/briefcase, +/obj/item/lighter/zippo/blue, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "hSY" = ( /obj/effect/turf_decal/siding{ @@ -16878,15 +16041,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"hTA" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 4; - pixel_y = -2 - }, -/obj/structure/railing, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "hTD" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -16902,35 +16056,75 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"hUu" = ( -/obj/structure/sign/poster/official/obey{ - pixel_y = -32 - }, +"hTU" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkredalt" + dir = 6; + icon_state = "darkredaltstrip" }, -/area/centcom/jail) -"hUV" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 +/area/centcom/zone2) +"hUb" = ( +/obj/item/radio/intercom{ + pixel_y = 28 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) +"hUD" = ( +/obj/item/gun/energy/clown/security{ + desc = "Поговаривают что это оружие сделано концерном Клоун-Варденов, может поэтому оно и спрятано?." }, -/area/centcom/jail) +/obj/item/gun/energy/clown/security, +/obj/item/gun/energy/clown/security{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/energy/clown/security{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/energy/clown/security{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/gun/energy/clown/security, +/obj/item/gun/energy/clown/security, +/obj/item/gun/energy/clown/security{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/gun/energy/clown/security{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/structure/rack/gunrack, +/turf/simulated/floor/mineral/bananium, +/area/centcom/specops) "hVd" = ( /obj/structure/chair{ dir = 4 }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"hXc" = ( -/obj/structure/closet/crate/can, +"hVq" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/specops) +"hWn" = ( /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" + icon_state = "white" }, -/area/centcom/specops) +/area/centcom/zone3) +"hWy" = ( +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/toy/desk/newtoncradle, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "hXg" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo16" @@ -16949,6 +16143,14 @@ }, /turf/simulated/floor/carpet/cyan, /area/ninja/outpost) +"hXs" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "hYm" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 1; @@ -16961,21 +16163,48 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"hYC" = ( -/obj/machinery/computer/card/centcom, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "hYJ" = ( /obj/machinery/vending/coffee/free, /turf/simulated/floor/carpet, /area/centcom/evac) -"hZg" = ( -/obj/item/flag/nt, +"hYY" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + id_tag = "ERT_armory_lvl1"; + name = "Armory level 1"; + dir = 2 + }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredalt" + icon_state = "darkfull" }, -/area/centcom/jail) +/area/centcom/specops) +"hZa" = ( +/obj/structure/rack/holorack, +/obj/item/organ/internal/cyberimp/brain/anti_drop, +/obj/item/organ/internal/cyberimp/brain/anti_drop, +/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, +/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, +/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, +/obj/item/organ/internal/cyberimp/chest/reviver/hardened, +/obj/item/organ/internal/cyberimp/chest/reviver/hardened, +/obj/item/organ/internal/cyberimp/eyes/hud/medical, +/obj/item/organ/internal/cyberimp/eyes/hud/medical, +/obj/item/organ/internal/cyberimp/eyes/thermals, +/obj/item/organ/internal/cyberimp/eyes/thermals, +/obj/item/organ/internal/cyberimp/mouth/breathing_tube, +/obj/item/organ/internal/cyberimp/mouth/breathing_tube, +/obj/item/implanter/mindshield, +/obj/item/implanter/mindshield, +/obj/item/organ/internal/cyberimp/arm/combat/centcom, +/obj/item/organ/internal/cyberimp/arm/combat/centcom, +/obj/item/organ/internal/cyberimp/arm/surgery, +/obj/item/organ/internal/cyberimp/arm/toolset, +/obj/item/organ/internal/cyberimp/arm/janitorial, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "hZr" = ( /obj/structure/flora/grass/brown, /obj/structure/flora/grass/brown, @@ -16990,35 +16219,25 @@ icon_state = "dark" }, /area/syndicate_mothership/jail) -"iae" = ( -/obj/effect/step_trigger/teleporter{ - teleport_x = 205; - teleport_y = 89; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/space, -/area/space) -"iak" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) -"iaK" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +"iac" = ( +/obj/effect/turf_decal/stripes/black{ + do_not_delete_me = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/stripes/black{ + dir = 1; + do_not_delete_me = 1 }, -/obj/machinery/mech_bay_recharge_port/upgraded, /turf/simulated/floor/shuttle{ - icon_state = "floor4" + icon = 'icons/turf/floors.dmi'; + icon_state = "white" }, -/area/shuttle/gamma) +/area/shuttle/administration) +"ibs" = ( +/obj/structure/marker_beacon{ + icon_state = "markerburgundy-on" + }, +/turf/simulated/floor/plating/airless, +/area/space) "ibG" = ( /obj/machinery/light/small{ dir = 1 @@ -17036,6 +16255,15 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"ibQ" = ( +/obj/item/radio/intercom/specops{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkyellow" + }, +/area/centcom/specops) "icm" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien16" @@ -17055,6 +16283,12 @@ icon_state = "sepia" }, /area/ninja/outpost) +"icQ" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkredalt" + }, +/area/centcom/specops) "icT" = ( /obj/effect/turf_decal{ dir = 10; @@ -17079,40 +16313,15 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"idZ" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/obj/docking_port/mobile/pod{ - id = "pod2"; - name = "escape pod 2"; - roundstart_move = "pod2_home" - }, -/obj/docking_port/stationary/transit{ - dwidth = 2; - height = 6; - id = "pod2_transit"; - name = "pod 2 in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 5 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) -"iei" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "admin_s_outer"; - name = "Ship External Access"; - req_access = list(101) +"idQ" = ( +/obj/machinery/conveyor/inverted{ + id = "CC_crate"; + dir = 10 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/administration) +/area/centcom/supply) "iej" = ( /obj/structure/fence/post{ color = "#b0b7c6"; @@ -17120,40 +16329,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"iet" = ( -/obj/structure/table/glass, -/obj/item/folder/blue{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/folder/red{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/folder/white{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"ieD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_2) "ieK" = ( /obj/structure/chair/comfy/red{ dir = 8 @@ -17170,26 +16345,48 @@ icon_state = "darkredcorners" }, /area/syndicate_mothership/elite_squad) -"ifh" = ( -/obj/structure/window/reinforced{ - layer = 2.9 +"ifB" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkyellow" }, -/obj/structure/window/reinforced{ - dir = 4 +/area/centcom/specops) +"ifF" = ( +/obj/vehicle/ridden/motorcycle{ + dir = 8 }, -/obj/effect/turf_decal/siding/white{ - dir = 6 +/obj/structure/sign/poster/contraband/random{ + pixel_x = 30 }, +/turf/simulated/floor/wood{ + icon_state = "fancy-wood-oak" + }, +/area/syndicate_mothership) +"ifS" = ( +/obj/machinery/light/small, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/centcom/jail) +/area/centcom/zone3) "ifZ" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowaltstrip" }, /area/centcom/supply) +"igb" = ( +/obj/structure/cable{ + icon_state = "8-9" + }, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-9" + }, +/obj/machinery/atmospherics/pipe/cap, +/turf/simulated/floor/plating, +/area/centcom/specops) "igh" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien17" @@ -17203,70 +16400,76 @@ /obj/structure/flora/tree/jungle/small, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"igZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/dresser, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) -"ihc" = ( -/obj/structure/chair/comfy/brown{ - color = "#3300FF"; - dir = 1 - }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) -"ihi" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1; - pixel_y = 3 +"igz" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/turf_decal/tile/neutral{ + alpha = 150; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/obj/effect/turf_decal/siding/white{ +/turf/simulated/floor/plating, +/area/centcom/supply) +"igY" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; dir = 8 }, +/obj/item/flag/nt, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"iha" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "vault" }, -/area/centcom/jail) -"ihA" = ( -/obj/machinery/door/airlock/command/glass{ - frequency = 2000; - icon_state = "open"; - id_tag = "CC-OP4-Int"; - locked = 1; - name = "Zone 2" +/area/centcom/specops) +"ihz" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/effect/decal/warning_stripes/blue, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/chair/comfy/red{ + dir = 4 }, -/area/centcom/specops) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ihM" = ( /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) -"iiA" = ( -/obj/effect/decal/cleanable/crayon{ - color = "yellow"; - icon_state = "guy"; - layer = 5; - pixel_y = -30 - }, -/obj/effect/decal/cleanable/crayon{ - color = "yellow"; - icon_state = "face"; - pixel_x = -32; - pixel_y = 32 +"ihP" = ( +/obj/machinery/light_construct/small{ + dir = 4 }, -/obj/effect/decal/cleanable/crayon{ - color = "yellow"; - icon_state = "shitcurity"; - pixel_x = 32; - pixel_y = 32 +/obj/machinery/computer/library/public, +/obj/structure/table/wood, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"iil" = ( +/obj/machinery/door/airlock/shuttle{ + aiControlDisabled = 1; + hackProof = 1; + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch" }, -/turf/simulated/floor/mineral/bananium, -/area/centcom/specops) +/obj/docking_port/mobile/emergency{ + dwidth = 11; + height = 18; + width = 29; + port_direction = 8 + }, +/obj/docking_port/stationary{ + dir = 4; + dwidth = 11; + height = 18; + id = "emergency_away"; + name = "emergency centcom"; + width = 29 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/shuttle/escape) "iiB" = ( /obj/effect/turf_decal/siding/green{ dir = 4 @@ -17275,13 +16478,6 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"iiC" = ( -/obj/structure/table/glass, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" - }, -/area/centcom/specops) "iiO" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -17297,46 +16493,30 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"iiU" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "iiY" = ( /obj/structure/flora/tree/jungle, /obj/structure/flora/rock/jungle, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"ijf" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) -"iji" = ( -/obj/structure/table/glass, -/obj/machinery/newscaster/security_unit{ - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ +"ijs" = ( +/obj/structure/chair/comfy/lime, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; icon_state = "dark" }, -/area/centcom/zone3) -"ikf" = ( -/obj/item/radio/intercom/specops{ - pixel_x = -32 +/area/shuttle/administration) +"ijZ" = ( +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealt" +/obj/structure/window/reinforced{ + dir = 8 }, -/area/centcom/specops) +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_2) "ikw" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" @@ -17349,6 +16529,38 @@ icon_state = "darkgrey" }, /area/centcom/zone2) +"iky" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + req_access = list(114) + }, +/obj/item/clothing/suit/judgerobe{ + name = "Supreme judge's robe" + }, +/obj/item/card/id/centcom{ + icon_state = "deathsquad"; + name = "Supreme Judge ID card"; + pixel_x = -3; + pixel_y = -3; + registered_name = "Supreme Judge" + }, +/obj/item/clothing/head/powdered_wig{ + desc = null; + name = "Supreme judge wig" + }, +/obj/item/clothing/under/suit_jacket/really_black{ + name = "Supreme judge suit" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/obj/item/clothing/gloves/color/white{ + desc = null; + name = "Supreme judge gloves" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "ikC" = ( /obj/machinery/abductor/experiment{ team = 1 @@ -17366,6 +16578,12 @@ icon_state = "dark" }, /area/centcom/jail) +"ikI" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navybluealtstrip" + }, +/area/centcom/specops) "ikP" = ( /obj/machinery/abductor/console{ team = 1 @@ -17404,30 +16622,25 @@ /obj/item/clothing/gloves/boxing/green, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"ilu" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/zipties, +/turf/simulated/floor/wood, +/area/centcom/zone2) +"ilv" = ( +/obj/effect/decal/nanotrasen_logo{ + icon_state = "logo5"; + pixel_x = 16 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "ilI" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien18" }, /area/abductor_ship) -"ilW" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/escape) -"imd" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "imw" = ( /obj/machinery/light{ dir = 1 @@ -17442,6 +16655,23 @@ icon_state = "alien19" }, /area/abductor_ship) +"ina" = ( +/obj/machinery/computer/shuttle/ert{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + req_access = list(109) + }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/obj/item/radio/intercom/specops{ + pixel_x = 30 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealt" + }, +/area/centcom/specops) "ine" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo8" @@ -17456,28 +16686,6 @@ /obj/effect/landmark/syndicate_officer, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"inm" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) -"ino" = ( -/obj/machinery/recharge_station/ert, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"inv" = ( -/obj/structure/bookcase, -/obj/item/book/manual/security_space_law/black, -/obj/item/book/manual/security_space_law, -/obj/item/book/manual/security_space_law, -/obj/item/book/manual/security_space_law, -/turf/simulated/floor/carpet, -/area/centcom/jail) "iny" = ( /obj/effect/turf_decal{ dir = 5; @@ -17488,13 +16696,23 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"inL" = ( -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444"; - dir = 8 +"inC" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/secure_data/laptop, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkredalt" }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) +/area/centcom/jail) +"inI" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkredaltstrip" + }, +/area/centcom/jail) "inR" = ( /obj/machinery/abductor/experiment{ team = 4 @@ -17519,22 +16737,29 @@ /obj/structure/flora/bush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/control) -"ioy" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/janitor{ - req_access = list(101,104,109) - }, -/obj/effect/decal/warning_stripes/white/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "ioP" = ( /obj/machinery/abductor/console{ team = 4 }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) +"ipb" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/spacebar) +"ipi" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/supply) "ipn" = ( /turf/simulated/floor/wood, /area/centcom/jail) @@ -17544,17 +16769,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"ipv" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "ipB" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -17572,28 +16786,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"ipL" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredalt" - }, -/area/centcom/jail) -"ipZ" = ( -/obj/structure/sign/poster/official/obey{ - pixel_x = -32; - pixel_y = -3 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredalt" - }, -/area/centcom/jail) "iqh" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -17622,6 +16814,26 @@ icon_state = "dark" }, /area/centcom/zone1) +"ira" = ( +/obj/structure/chair/comfy/lime, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) +"irS" = ( +/obj/effect/turf_decal/arrows{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/supply) "isc" = ( /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = 32 @@ -17663,6 +16875,47 @@ icon_state = "arrivalcorner" }, /area/centcom/evac) +"itf" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444"; + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"itg" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + req_access = list(114) + }, +/obj/item/clothing/suit/judgerobe{ + name = "Supreme judge's robe" + }, +/obj/item/card/id/centcom{ + icon_state = "deathsquad"; + name = "Supreme Judge ID card"; + pixel_x = -3; + pixel_y = -3; + registered_name = "Supreme Judge" + }, +/obj/item/clothing/head/powdered_wig{ + desc = null; + name = "Supreme judge wig" + }, +/obj/item/clothing/under/suit_jacket/really_black{ + name = "Supreme judge suit" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/obj/item/clothing/gloves/color/white{ + desc = null; + name = "Supreme judge gloves" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "itt" = ( /obj/structure/window/reinforced{ color = "red"; @@ -17685,12 +16938,6 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"itN" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navyblue" - }, -/area/centcom/specops) "itS" = ( /obj/machinery/light/small, /obj/structure/chair/sofa/corp/right{ @@ -17726,6 +16973,17 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) +"iuv" = ( +/obj/structure/table/glass, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/reagent_containers/food/drinks/flask/detflask=10,/obj/item/reagent_containers/food/drinks/cans/tonic=10,/obj/item/reagent_containers/food/drinks/cans/thirteenloko=10,/obj/item/reagent_containers/food/drinks/cans/synthanol=10,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind=10,/obj/item/reagent_containers/food/drinks/cans/lemon_lime=10,""=70); + name = "Food CC Spawner #3" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/centcom/specops) "iuF" = ( /obj/structure/table, /obj/item/robot_parts/robot_component/armour{ @@ -17738,6 +16996,19 @@ icon_state = "floor12" }, /area/shuttle/syndicate) +"ivb" = ( +/obj/machinery/door_control/secure{ + id = "Admin_shuttle_access"; + name = "Argos Shuttle Access"; + pixel_x = -24; + pixel_y = -24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/zone3) "ivl" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/indestructible/grass, @@ -17746,6 +17017,9 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"ivr" = ( +/turf/simulated/floor/carpet, +/area/centcom/jail) "ivw" = ( /obj/effect/turf_decal{ dir = 1; @@ -17780,22 +17054,12 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) -"ivG" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredalt" - }, -/area/centcom/specops) "ivQ" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrivalcorner" }, /area/centcom/evac) -"ivZ" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/nt_droppod) "iwb" = ( /obj/structure/flora/junglebush/c, /turf/simulated/floor/indestructible/grass, @@ -17880,19 +17144,6 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/specops) -"ixR" = ( -/obj/effect/landmark/marauder_exit, -/obj/structure/fans/tiny, -/obj/effect/decal/warning_stripes/north, -/obj/effect/turf_decal/tile/neutral{ - alpha = 220; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "ixW" = ( /obj/effect/turf_decal{ dir = 10; @@ -17906,6 +17157,30 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"iyb" = ( +/obj/structure/table/wood, +/obj/item/stamp/magistrate{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/stamp/centcom{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/folder/red{ + pixel_x = 7 + }, +/obj/item/folder/blue{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "iyi" = ( /obj/structure/closet/syndicate/personal, /obj/machinery/light/small, @@ -17921,6 +17196,19 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"iyG" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "admin_s_outer"; + name = "Ship External Access"; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "iyW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -17941,23 +17229,6 @@ name = "floor" }, /area/syndicate_mothership) -"ize" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"izf" = ( -/obj/machinery/vending/medical, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkbluealt" - }, -/area/centcom/specops) "izp" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -18000,14 +17271,19 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"iAW" = ( -/obj/structure/closet/crate/can, -/obj/effect/turf_decal/siding{ - color = "#444444"; +"iAD" = ( +/obj/machinery/light/small{ + dir = 8; + tag = "icon-bulb1 (WEST)" + }, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) +"iAH" = ( +/obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) "iAZ" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium"; @@ -18029,33 +17305,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iBn" = ( -/obj/machinery/computer/shuttle/admin{ - dir = 1; - name = "NTV Argos shuttle console" - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 6; - do_not_delete_me = 1; - icon_state = "gs_deadlock" - }, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) -"iBs" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater3x3_side"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) "iBt" = ( /turf/simulated/floor/plasteel{ icon_state = "darkredalt" @@ -18100,6 +17349,14 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"iCn" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "iCt" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium"; @@ -18119,16 +17376,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iCK" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 6; - do_not_delete_me = 1 - }, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) "iCL" = ( /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, @@ -18136,15 +17383,6 @@ /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"iDd" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 5; - pixel_y = -2 - }, -/obj/effect/turf_decal/siding/brown, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "iDq" = ( /obj/machinery/light/small{ dir = 4; @@ -18161,35 +17399,103 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"iDy" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"iDT" = ( -/obj/effect/turf_decal{ - dir = 4; - icon_state = "grass_edge_medium_corner" - }, -/turf/simulated/floor/indestructible/asteroid, -/area/syndicate_mothership/outside) -"iDY" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 +"iDA" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Airlock"; + req_access = list(150) }, -/turf/simulated/floor/carpet/red, -/area/centcom/zone1) -"iEi" = ( -/obj/structure/curtain/black{ - pixel_y = -32 +/obj/machinery/door/poddoor{ + density = 0; + icon_state = "open"; + id_tag = "syndicate_elite"; + name = "Side Hull Door"; + opacity = 0; + req_access = list(150) }, -/turf/simulated/floor/wood{ - icon_state = "fancy-wood-oak" +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "sst"; + name = "SST shuttle"; + roundstart_move = "sst_away"; + width = 11; + port_direction = 8; + preferred_direction = 2 }, -/area/syndicate_mothership) -"iEE" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "sst_away"; + name = "Syndicate Base"; + turf_type = /turf/simulated/floor/indestructible/plating; + width = 11 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/syndicate_elite) +"iDG" = ( +/obj/machinery/porta_turret/centcom/pulse{ + armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + color = "#666666"; + damtype = "burn"; + health = 1250; + region_max = 12; + scan_range = 12; + shot_delay = 8; + name = "Quarantine Pulse Turret" + }, +/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ + dir = 2; + id_tag = "ERT_Quarantine" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"iDM" = ( +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluealt" + }, +/area/centcom/zone2) +"iDT" = ( +/obj/effect/turf_decal{ + dir = 4; + icon_state = "grass_edge_medium_corner" + }, +/turf/simulated/floor/indestructible/asteroid, +/area/syndicate_mothership/outside) +"iDY" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, +/turf/simulated/floor/carpet/red, +/area/centcom/zone1) +"iEi" = ( +/obj/structure/curtain/black{ + pixel_y = -32 + }, +/turf/simulated/floor/wood{ + icon_state = "fancy-wood-oak" + }, +/area/syndicate_mothership) +"iED" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DURAND" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) +"iEE" = ( /obj/effect/turf_decal/siding/green, /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/fernybush, @@ -18202,13 +17508,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"iEQ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - tag = "icon-propulsion (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/funeral) "iEU" = ( /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) @@ -18219,12 +17518,9 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iEW" = ( -/obj/machinery/vending/robotics/nt/durand, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) +"iFf" = ( +/turf/simulated/floor/wood, +/area/centcom/evac) "iFr" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-6"; @@ -18235,6 +17531,13 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"iFB" = ( +/obj/structure/chair/sofa/corp/left, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" + }, +/area/centcom/specops) "iFF" = ( /obj/machinery/light, /turf/simulated/floor/carpet/red, @@ -18264,16 +17567,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iGk" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_4) "iGn" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium_corner" @@ -18310,19 +17603,39 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"iGP" = ( -/obj/machinery/suit_storage_unit/standard_unit/ertamber{ - req_access = list(104,109) +"iGT" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkbluealt" }, -/area/centcom/specops) +/area/centcom/zone2) "iGX" = ( /obj/structure/table/wood/fancy, /obj/item/toy/plushie/fluff/fox, /turf/simulated/floor/wood, /area/centcom/zone1) +"iHz" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 183; + teleport_y = 63; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" + }, +/area/centcom/specops) "iHB" = ( /obj/structure/window/reinforced{ dir = 1 @@ -18344,38 +17657,24 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iIs" = ( -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/evac) -"iIu" = ( -/obj/item/gun/projectile/automatic/pistol/m1911, -/obj/item/ammo_box/magazine/m45, -/obj/item/ammo_box/magazine/m45, -/obj/item/ammo_box/magazine/m45, -/obj/item/clothing/head/helmet/space/deathsquad/beret, -/obj/item/clothing/shoes/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/suit/space/deathsquad/officer, -/obj/item/storage/box/handcuffs, -/obj/item/storage/box/flashbangs, -/obj/item/clothing/mask/gas, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/radio/headset/ert{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/storage/box/centcomofficer, -/obj/item/clothing/head/beret/centcom/officer, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +"iIo" = ( +/obj/effect/turf_decal/arrows/white{ + dir = 4; + name = "ERT shuttle"; + pixel_x = -6 }, -/obj/structure/closet/cabinet{ - req_access = list(114) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealtstrip" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) +"iIs" = ( +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/evac) +"iJd" = ( +/obj/machinery/light, +/turf/simulated/floor/carpet/red, +/area/shuttle/administration) "iJi" = ( /obj/structure/closet{ custom_door_overlay = "white"; @@ -18386,41 +17685,11 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"iJk" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1331; - id_tag = "admin_s_pump" - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "iJo" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/centcom/evac) -"iJC" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/door_control/secure{ - id = "CC_Players_In"; - name = "Civilian Access"; - pixel_x = -24; - pixel_y = 32; - req_access = list(114) - }, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"iJG" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/yellow{ - req_access = list(104,109) - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowfull" - }, -/area/centcom/specops) "iKf" = ( /obj/effect/turf_decal{ dir = 1; @@ -18451,6 +17720,9 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) +"iKU" = ( +/turf/simulated/wall/shuttle/onlyselfsmooth, +/area/shuttle/nt_droppod) "iLk" = ( /obj/structure/rack, /obj/machinery/light, @@ -18465,21 +17737,43 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"iLs" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/bridge) "iLu" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) "iLM" = ( -/obj/effect/decal/warning_stripes/northeastsouth, /obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DURAND" + dir = 8; + id_tag = "CC_supply_external"; + layer = 5; + locked = 1 + }, +/obj/machinery/door_control/secure{ + id = "CC_supply_external"; + name = "Supply Internal Shutters"; + pixel_y = 24; + req_access = list(114) }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 1; + icon_state = "darkyellowalt" }, -/area/centcom/specops) +/area/centcom/supply) "iMb" = ( /obj/structure/table/wood/fancy/red, /obj/item/storage/firstaid/ancient{ @@ -18494,14 +17788,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"iMk" = ( -/obj/structure/table, -/obj/item/paper, -/obj/machinery/door/window/brigdoor{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone2) "iMy" = ( /obj/structure/closet/secure_closet/freezer/meat{ req_access = list(102) @@ -18544,18 +17830,6 @@ icon_state = "barber" }, /area/centcom/jail) -"iNb" = ( -/obj/structure/holohoop{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "iNj" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -18563,6 +17837,14 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) +"iNI" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_medical, +/obj/item/book/manual/sop_science, +/obj/item/book/manual/sop_security, +/obj/item/book/manual/sop_service, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "iNW" = ( /obj/effect/turf_decal{ dir = 8; @@ -18603,6 +17885,12 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"iPn" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/specops) "iPw" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/curtain/black{ @@ -18631,14 +17919,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iQy" = ( -/obj/structure/bookcase, -/obj/item/paper{ - name = "Главный строить мужик репорт"; - info = "
" - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) "iQH" = ( /obj/machinery/sleeper/syndie, /obj/structure/curtain/black{ @@ -18653,17 +17933,35 @@ "iRb" = ( /turf/simulated/wall/shuttle, /area/shuttle/pod_2) +"iRc" = ( +/obj/structure/rack, +/obj/item/storage/firstaid/tactical, +/obj/item/storage/firstaid/tactical, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluealt" + }, +/area/centcom/specops) +"iRf" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_NG"; + name = "Nerve Gas"; + pixel_x = -24; + pixel_y = 24; + req_access = list(114) + }, +/obj/structure/sign/greencross{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluecorners" + }, +/area/centcom/specops) "iRq" = ( /obj/item/restraints/handcuffs/pinkcuffs, /turf/simulated/floor/plating, /area/centcom/specops) -"iRw" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_general, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "iRG" = ( /obj/effect/turf_decal/plaque{ layer = 3 @@ -18680,21 +17978,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"iRV" = ( -/obj/structure/table/glass, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" - }, -/obj/effect/landmark/commando_manual, -/obj/machinery/status_display{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "iRW" = ( /obj/effect/turf_decal{ dir = 5; @@ -18706,16 +17989,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"iSh" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_3) "iSs" = ( /obj/effect/turf_decal{ dir = 5; @@ -18729,21 +18002,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iSJ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) -"iSK" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "iSY" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -18797,14 +18055,6 @@ icon_state = "grimy" }, /area/centcom/zone1) -"iTF" = ( -/obj/effect/decal/nanotrasen_logo{ - pixel_x = 16 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "iUr" = ( /obj/effect/turf_decal{ dir = 4; @@ -18835,39 +18085,41 @@ /obj/machinery/door/airlock/external, /turf/simulated/floor/shuttle/plating, /area/shuttle/funeral) -"iUX" = ( -/obj/effect/turf_decal/tile/neutral{ - alpha = 200; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"iVe" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/papershredder, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "iVo" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien15" }, /area/abductor_ship) +"iVu" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/centcom/specops) "iVA" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"iVV" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) "iVW" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/shuttle{ icon_state = "floor13" }, /area/shuttle/ninja) +"iVX" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/escape) "iWh" = ( /obj/effect/turf_decal{ dir = 8; @@ -18892,6 +18144,17 @@ }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/jail) +"iXk" = ( +/obj/structure/table/reinforced, +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "iXm" = ( /obj/effect/turf_decal{ dir = 5; @@ -18903,64 +18166,44 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"iXH" = ( -/obj/structure/falsewall/reinforced{ - req_access = list(114); - layer = 2.9 - }, -/obj/effect/mine/sound/bwoink{ - invisibility = 1; - layer = 2.8 +"iXF" = ( +/obj/structure/sign/poster/official/help_others{ + pixel_y = 32 }, +/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"iXL" = ( -/obj/machinery/computer/med_data, -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 - }, -/obj/structure/window/reinforced{ +"iXI" = ( +/obj/structure/chair/comfy/shuttle{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "darkbluefull" - }, -/area/centcom/bridge) -"iYa" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) +"iZX" = ( +/obj/machinery/atmospherics/unary/tank/air{ dir = 8 }, -/obj/item/toy/desk/newtoncradle, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"iYd" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side"; - tag = "icon-heater (NORTH)" +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 }, -/turf/simulated/floor/plating/airless, -/area/centcom/specops) -"iYp" = ( -/obj/machinery/vending/mech/ntc/weapon{ - req_access = list(114) +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" }, +/area/shuttle/administration) +"jaY" = ( +/obj/machinery/vending/nta/ertarmory/green/cc_jail, +/turf/simulated/floor/wood, +/area/centcom/jail) +"jbd" = ( +/obj/machinery/vending/robotics/nt/durand, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) -"iYs" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkred" - }, /area/centcom/specops) -"iYY" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/pod_3) "jbt" = ( /obj/structure/table, /obj/machinery/door_control/secure{ @@ -19054,6 +18297,24 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) +"jbQ" = ( +/obj/structure/table, +/obj/item/storage/lockbox/mindshield, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) +"jbY" = ( +/obj/structure/rack, +/obj/item/ammo_box/shotgun, +/obj/item/ammo_box/shotgun, +/obj/item/ammo_box/shotgun, +/obj/effect/decal/warning_stripes/blue/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "jcf" = ( /mob/living/simple_animal/hostile/creature{ name = "Experiment 35b" @@ -19086,9 +18347,22 @@ /obj/structure/holosign/wetsign, /turf/simulated/floor/plasteel, /area/centcom/evac) -"jcL" = ( -/turf/simulated/wall/shuttle, -/area/shuttle/gamma) +"jcM" = ( +/obj/structure/chair/comfy/beige{ + dir = 8; + layer = 4; + pixel_y = -2 + }, +/obj/structure/railing, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"jdg" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 9 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "jdj" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -19100,6 +18374,42 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) +"jdl" = ( +/obj/structure/rack, +/obj/effect/decal/warning_stripes/green/hollow, +/obj/item/ammo_box/a40mm, +/obj/item/ammo_box/a40mm, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"jdQ" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/dresser, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"jec" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) "jed" = ( /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; @@ -19197,18 +18507,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jfd" = ( -/obj/machinery/computer/communications, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the Special Ops team."; - name = "Security Station Monitor"; - network = list("SS13","Research Outpost","Mining Outpost"); - pixel_y = -30 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "jfv" = ( /obj/machinery/computer/shuttle/ruins_transport_shuttle, /turf/simulated/floor/shuttle{ @@ -19237,24 +18535,25 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"jfZ" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkredalt" +"jgg" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 16 }, -/area/centcom/specops) -"jgl" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_supply_external2"; - layer = 5; - locked = 1 +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" +/obj/item/pen/fancy{ + pixel_x = 8 }, -/area/centcom/supply) +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "jgE" = ( /obj/effect/turf_decal{ dir = 9; @@ -19262,14 +18561,15 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jhi" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 2 +"jgV" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" +/obj/structure/chair/office/dark{ + dir = 1 }, -/area/centcom/specops) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "jhz" = ( /obj/effect/turf_decal{ dir = 4; @@ -19278,26 +18578,14 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jhQ" = ( -/obj/structure/table/glass, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/reagent_containers/food/snacks/baguette=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/applepie=10,/obj/item/reagent_containers/food/snacks/soup/bloodsoup=10,/obj/item/reagent_containers/food/snacks/boiledrice=10,/obj/item/reagent_containers/food/snacks/carrotfries=10,/obj/item/reagent_containers/food/drinks/cans/cola=10,""=70); - name = "Food CC Spawner #1" - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 6; - pixel_y = -1; - pixel_x = 1; - density = 0 - }, -/obj/structure/window/reinforced{ - layer = 3.1; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) +"jhY" = ( +/obj/machinery/vending/ntc_resources{ + req_access = list(114) }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) "jic" = ( /obj/structure/chair/sofa/left{ dir = 1 @@ -19307,6 +18595,19 @@ icon_state = "darkblue" }, /area/centcom/zone1) +"jid" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "jih" = ( /obj/effect/turf_decal{ dir = 8; @@ -19324,6 +18625,14 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/assault_pod) +"jiz" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "jiH" = ( /obj/effect/turf_decal{ dir = 4; @@ -19336,6 +18645,9 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"jiI" = ( +/turf/simulated/wall/shuttle/nodiagonal, +/area/shuttle/administration) "jiV" = ( /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/grass, @@ -19359,16 +18671,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"jjT" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "jkA" = ( /obj/effect/turf_decal{ dir = 1; @@ -19390,13 +18692,16 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jkH" = ( -/obj/machinery/vending/wallmed{ - pixel_y = -32 +"jkL" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_SRT"; + pixel_y = -25; + req_access = list(114); + pixel_x = 25; + name = "SRT Team 1" }, -/turf/simulated/floor/indestructible{ - dir = 6; - icon_state = "darkgreynavyblue" +/turf/simulated/floor/plasteel{ + icon_state = "navybluealtstrip" }, /area/centcom/specops) "jkR" = ( @@ -19453,6 +18758,15 @@ /obj/item/flashlight/lantern, /turf/simulated/floor/carpet, /area/centcom/evac) +"jlH" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "jlL" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -19497,34 +18811,6 @@ icon_state = "dark" }, /area/centcom/zone1) -"jmf" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch"; - req_access = list(109) - }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops"; - name = "ert shuttle"; - roundstart_move = "specops_away"; - width = 5 - }, -/obj/structure/fans/tiny, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 11; - id = "specops_transit"; - name = "specops in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/east; - width = 5 - }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/specops) "jml" = ( /obj/effect/turf_decal{ dir = 9; @@ -19536,14 +18822,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jmt" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 10; - pixel_x = -1; - pixel_y = -1 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone2) "jmv" = ( /obj/machinery/light/small{ brightness_range = 6; @@ -19600,6 +18878,38 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone3) +"jnM" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -16 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/lightreplacer, +/obj/item/lightreplacer, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealt" + }, +/area/centcom/specops) +"jok" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_1) "joo" = ( /obj/effect/turf_decal{ dir = 10; @@ -19613,44 +18923,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"jop" = ( -/obj/structure/toilet{ - dir = 8; - name = "Трон старшего администратора" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "CC_toilet_unit4"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone1) -"joJ" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 183; - teleport_y = 61; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, -/area/centcom/specops) "joS" = ( /obj/machinery/light/small, /obj/structure/sign/poster/contraband/random{ @@ -19661,12 +18933,6 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"joV" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) "jph" = ( /obj/effect/turf_decal{ dir = 8; @@ -19704,25 +18970,10 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"jpB" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "jpK" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"jpQ" = ( -/obj/structure/coatrack, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "jqa" = ( /obj/effect/turf_decal{ dir = 4; @@ -19750,15 +19001,6 @@ }, /turf/simulated/floor/carpet/orange, /area/shuttle/trade/sol) -"jqo" = ( -/obj/structure/chair/sofa/corp/left{ - dir = 4 - }, -/obj/structure/sign/poster/official/space_cops{ - pixel_y = 32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "jrj" = ( /obj/machinery/light, /turf/simulated/floor/carpet, @@ -19815,33 +19057,12 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"jsJ" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 - }, -/obj/structure/chair/comfy/beige{ - dir = 1 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"jsR" = ( -/obj/structure/chair/comfy/purp, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) "jsZ" = ( /obj/structure/table/abductor, /obj/item/retractor/alien, /obj/item/hemostat/alien, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"jta" = ( -/obj/machinery/computer/cloning{ - dir = 8 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) "jtb" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -19849,47 +19070,54 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"jtt" = ( -/obj/machinery/dna_scannernew/upgraded, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whiteblue" +"jtj" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 1 }, +/turf/simulated/floor/glass, +/area/centcom/bridge) +"jtl" = ( +/obj/machinery/light/spot, +/turf/simulated/wall/indestructible/reinforced, /area/centcom/specops) -"jtQ" = ( -/obj/machinery/vending/clothing, -/turf/simulated/floor/wood, -/area/centcom/zone1) -"juc" = ( -/obj/item/gun/energy/clown/security{ - desc = "Поговаривают что это оружие сделано концерном Клоун-Варденов, может поэтому оно и спрятано?." +"jtm" = ( +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 1; + icon_state = "rightsecure"; + req_access = list(101) }, -/obj/item/gun/energy/clown/security, -/obj/item/gun/energy/clown/security{ - pixel_x = 3; - pixel_y = -3 +/turf/simulated/floor/carpet, +/area/centcom/zone2) +"jtn" = ( +/obj/machinery/optable, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = 30; + pixel_y = 3 }, -/obj/item/gun/energy/clown/security{ - pixel_x = 3; - pixel_y = -3 +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/obj/item/gun/energy/clown/security{ +/area/centcom/specops) +"jtL" = ( +/obj/item/paper_bin/nanotrasen{ pixel_x = 3; - pixel_y = -3 - }, -/obj/item/gun/energy/clown/security, -/obj/item/gun/energy/clown/security, -/obj/item/gun/energy/clown/security{ - pixel_x = -3; - pixel_y = 3 + pixel_y = 12 }, -/obj/item/gun/energy/clown/security{ - pixel_x = -3; - pixel_y = 3 +/obj/item/pen/multi/fountain, +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/obj/structure/rack/gunrack, -/turf/simulated/floor/mineral/bananium, -/area/centcom/specops) +/area/centcom/zone3) +"jtQ" = ( +/obj/machinery/vending/clothing, +/turf/simulated/floor/wood, +/area/centcom/zone1) "jue" = ( /obj/effect/landmark/abductor/scientist, /turf/simulated/floor/indestructible/abductor, @@ -19907,10 +19135,6 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"juM" = ( -/obj/item/book/random, -/turf/simulated/floor/wood, -/area/centcom/zone2) "jvb" = ( /obj/effect/landmark/abductor/agent, /turf/simulated/floor/indestructible/abductor, @@ -19972,14 +19196,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/ussp) -"jvJ" = ( -/obj/machinery/vending/cola/free, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "jvR" = ( /obj/effect/turf_decal{ dir = 4; @@ -19994,20 +19210,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"jvX" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/glass, -/area/centcom/zone3) "jwD" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" @@ -20024,6 +19226,30 @@ name = "floor" }, /area/syndicate_mothership/outside) +"jxo" = ( +/obj/structure/table/glass, +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/folder/white{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 5 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "jxr" = ( /obj/structure/table/wood/fancy/orange, /obj/item/paper_bin{ @@ -20050,15 +19276,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"jxO" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "jyl" = ( /obj/machinery/vending/snack, /obj/machinery/light/small{ @@ -20077,6 +19294,23 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) +"jyR" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/centcom/specops) +"jyS" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/statue/artchair{ + layer = 10; + pixel_y = 10 + }, +/obj/effect/turf_decal/plaque{ + layer = 3 + }, +/turf/simulated/floor/grass, +/area/centcom/evac) "jyW" = ( /obj/effect/turf_decal{ dir = 9; @@ -20088,6 +19322,60 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"jzc" = ( +/obj/structure/closet/secure_closet/guncabinet{ + layer = 2.9; + name = "combat shotgun" + }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/obj/machinery/light/spot{ + dir = 8; + tag = "icon-tube1 (WEST)" + }, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/item/gun/projectile/shotgun/automatic/combat, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) +"jzh" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/centcom/specops) +"jzi" = ( +/obj/machinery/computer/shuttle/ert, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"jzj" = ( +/obj/structure/sign/poster/official/space_cops{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/jail) "jzk" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -20096,25 +19384,12 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"jzp" = ( -/obj/effect/turf_decal/siding/white/corner, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"jzw" = ( -/obj/machinery/door_control/secure{ - id = "CC_supply_space"; - name = "Supply Blastdoor"; - pixel_y = 24; - req_access = list(114) - }, -/obj/machinery/conveyor_switch/oneway{ - id = "CC_crate" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowalt" +"jzx" = ( +/obj/machinery/door/airlock/diamond{ + locked = 1 }, -/area/centcom/supply) +/turf/simulated/floor/plating, +/area/centcom/specops) "jAj" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/simulated/floor/indestructible/grass, @@ -20134,14 +19409,26 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"jAZ" = ( -/obj/effect/turf_decal/box/white{ - pixel_y = 16 +"jAV" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/transport) +"jAW" = ( +/obj/effect/turf_decal/stripes/line{ + icon = 'icons/turf/floors.dmi'; + icon_state = "siding4" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + color = "gray"; + dir = 1; + icon_state = "rampbottom" }, -/area/centcom/jail) +/area/centcom/supply) "jBc" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -20159,81 +19446,25 @@ icon_state = "grimy" }, /area/centcom/zone1) -"jBo" = ( -/obj/machinery/computer/communications{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 6; - do_not_delete_me = 1 - }, -/obj/machinery/light/small, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) -"jBz" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/portable_atmospherics/canister/sleeping_agent{ - maximum_pressure = 50000 - }, -/obj/structure/window/reinforced{ +"jBs" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/conveyor{ - id = "N2O"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"jBQ" = ( -/obj/machinery/porta_turret/centcom/pulse{ - armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - color = "#666666"; - damtype = "burn"; - health = 1250; - region_max = 12; - scan_range = 12; - shot_delay = 8; - name = "Quarantine Pulse Turret" - }, -/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ - dir = 2; - id_tag = "ERT_Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"jBZ" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1; - do_not_delete_me = 1 - }, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_Grenade" - }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "white" }, -/area/centcom/specops) -"jCg" = ( -/obj/structure/bookcase/random/fiction, -/obj/item/book/manual/security_space_law/black, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/faxes, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_service, +/area/centcom/jail) +"jBK" = ( +/obj/structure/bookcase/manuals, /obj/item/book/manual/sop_supply, -/obj/item/book/manual/sop_engineering, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/obj/item/book/manual/nuclear, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"jBV" = ( +/obj/structure/filingcabinet/employment, +/turf/simulated/floor/bluegrid, +/area/centcom/bridge) "jCo" = ( /obj/structure/chair, /obj/effect/decal/cleanable/blood, @@ -20241,21 +19472,64 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"jCz" = ( -/obj/effect/turf_decal/arrows{ - dir = 1 +"jDr" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowcornersalt" +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" }, -/area/centcom/supply) -"jCG" = ( -/obj/machinery/photocopier, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navyblue" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "jDy" = ( /obj/effect/turf_decal{ @@ -20266,13 +19540,6 @@ "jDB" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/zone3) -"jDH" = ( -/obj/mecha/combat/marauder/loaded, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluecorners" - }, -/area/centcom/specops) "jDS" = ( /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; @@ -20314,20 +19581,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"jEF" = ( -/obj/machinery/door_control/secure{ - id = "adminshuttleshutters"; - name = "Shutter control"; - pixel_x = 5; - pixel_y = -23; - req_access = list(101) - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "jEO" = ( /obj/item/storage/fancy/crayons, /obj/structure/table/wood{ @@ -20345,25 +19598,13 @@ icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' }, /area/syndicate_mothership/infteam) -"jEY" = ( -/obj/effect/turf_decal/stripes/black{ - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 1; - do_not_delete_me = 1 - }, -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Workshop"; - opacity = 1; - req_access = list(101) - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +"jFA" = ( +/obj/machinery/light, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 }, -/area/shuttle/administration) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "jFD" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/siding/wideplating{ @@ -20374,6 +19615,20 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"jFG" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/computer/mech_bay_power_console, +/obj/machinery/light/spot{ + dir = 4; + tag = "icon-tube1 (EAST)" + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "jFK" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo3" @@ -20408,23 +19663,24 @@ /obj/structure/closet/secure_closet/syndicate_officer, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"jGg" = ( -/obj/vehicle/ridden/secway{ - layer = 3.5 +"jGt" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_supply_external2"; + layer = 5; + locked = 1 }, -/obj/item/key/security, -/turf/simulated/floor/plating, -/area/centcom/specops) -"jGz" = ( -/obj/machinery/computer/shuttle/nt/drop_pod/recall{ - pixel_x = 32; - possible_destinations = "shit_rain_base" +/obj/machinery/door_control/secure{ + id = "CC_supply_external2"; + name = "Supply Internal Shutters"; + req_access = list(114); + pixel_x = -24 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealt" + dir = 8; + icon_state = "darkyellowalt" }, -/area/centcom/specops) +/area/centcom/supply) "jGH" = ( /obj/structure/closet/syndicate/sst, /obj/item/ammo_box/magazine/mm556x45/bleeding, @@ -20435,6 +19691,41 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) +"jHe" = ( +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock" + }, +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 4; + id = "ruins_civil_shuttle"; + name = "Regular Civilian Shuttle"; + rebuildable = 1; + roundstart_move = "spacebar"; + alone_shuttle = 1; + width = 6; + port_direction = 4 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/spacebar) +"jHf" = ( +/obj/machinery/mass_driver{ + dir = 4; + id_tag = "ASSAULT3"; + name = "gravpult" + }, +/obj/effect/turf_decal/loading_area/white{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "jHk" = ( /obj/effect/turf_decal/siding{ color = "#444444" @@ -20445,112 +19736,15 @@ name = "Tatami" }, /area/ninja/outpost) -"jHw" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_NG" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"jHJ" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/head/beret/atmos{ - name = "beret" - }, -/obj/item/clothing/head/beret/atmos{ - name = "beret" - }, -/obj/item/clothing/head/beret/ce{ - name = "beret" - }, -/obj/item/clothing/head/beret/ce{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/captain{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/captain{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - name = "beret" - }, -/obj/item/clothing/head/beret/durathread{ - name = "beret" - }, -/obj/item/clothing/head/beret/durathread{ - name = "beret" - }, -/obj/item/clothing/head/beret/eng{ - name = "beret" - }, -/obj/item/clothing/head/beret/eng{ - name = "beret" - }, -/obj/item/clothing/head/beret/elo{ - name = "beret" - }, -/obj/item/clothing/head/beret/elo{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/clothing/head/fedora, -/obj/item/clothing/head/fedora, -/obj/item/clothing/head/fedora{ - icon_state = "wfedora" - }, -/obj/item/clothing/head/fedora{ - icon_state = "wfedora" - }, -/obj/item/clothing/head/beret/purple{ - name = "beret" - }, -/obj/item/clothing/head/beret/purple{ - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "beret_hos_black"; - name = "beret" - }, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "beret_hos_black"; - name = "beret" - }, +"jHF" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 + dir = 4 + }, +/obj/machinery/conveyor{ + id = "N2"; + dir = 1 }, -/obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -20579,20 +19773,6 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"jIv" = ( -/obj/docking_port/stationary/transit{ - dwidth = 3; - height = 7; - id = "shit_rain_transit"; - name = "shit_rain in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 7 - }, -/turf/space/transit/north{ - icon_state = "black" - }, -/area/space) "jIK" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -20625,6 +19805,28 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"jJr" = ( +/obj/machinery/door/airlock/centcom{ + name = "Outpost 3"; + opacity = 1; + req_access = list(109) + }, +/obj/effect/decal/warning_stripes/blue, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) +"jJv" = ( +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/specops) +"jJA" = ( +/turf/simulated/floor/carpet/red, +/area/shuttle/administration) "jJS" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -20652,25 +19854,6 @@ /obj/structure/reagent_dispensers/watertank/high, /turf/simulated/floor/grass, /area/centcom/evac) -"jKp" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater3x3_side_inv"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/plasmareinforced{ - color = "#22aab7"; - dir = 8 - }, -/obj/structure/shuttle/engine/platform{ - dir = 4; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/administration) -"jKI" = ( -/turf/simulated/floor/plating/airless, -/area/shuttle/trade/sol) "jKU" = ( /obj/effect/decal/cleanable/blood, /obj/item/twohanded/required/kirbyplants, @@ -20694,6 +19877,100 @@ /obj/item/stack/spacecash/c500, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"jLd" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/head/beret/atmos{ + name = "beret" + }, +/obj/item/clothing/head/beret/atmos{ + name = "beret" + }, +/obj/item/clothing/head/beret/ce{ + name = "beret" + }, +/obj/item/clothing/head/beret/ce{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/captain{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/captain{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + name = "beret" + }, +/obj/item/clothing/head/beret/durathread{ + name = "beret" + }, +/obj/item/clothing/head/beret/durathread{ + name = "beret" + }, +/obj/item/clothing/head/beret/eng{ + name = "beret" + }, +/obj/item/clothing/head/beret/eng{ + name = "beret" + }, +/obj/item/clothing/head/beret/elo{ + name = "beret" + }, +/obj/item/clothing/head/beret/elo{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/clothing/head/fedora, +/obj/item/clothing/head/fedora, +/obj/item/clothing/head/fedora{ + icon_state = "wfedora" + }, +/obj/item/clothing/head/fedora{ + icon_state = "wfedora" + }, +/obj/item/clothing/head/beret/purple{ + name = "beret" + }, +/obj/item/clothing/head/beret/purple{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "beret_hos_black"; + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "beret_hos_black"; + name = "beret" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "jLx" = ( /obj/effect/decal/warning_stripes/white, /obj/structure/mineral_door/wood, @@ -20701,27 +19978,13 @@ icon_state = "dark" }, /area/centcom/zone1) -"jLA" = ( -/obj/effect/turf_decal/tile/neutral{ +"jLN" = ( +/obj/structure/window/reinforced, +/obj/effect/turf_decal/siding/brown{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/vending/coffee/free, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) -"jLG" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "jLP" = ( /obj/effect/landmark/abductor/agent{ team = 4 @@ -20732,6 +19995,12 @@ /obj/structure/lattice, /turf/space, /area/space) +"jMK" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkredcorners" + }, +/area/centcom/specops) "jNh" = ( /obj/effect/turf_decal{ dir = 6; @@ -20740,6 +20009,14 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"jNk" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 8; + name = "CentComm Chemical lab" + }, +/turf/simulated/floor/engine, +/area/centcom/specops) "jNn" = ( /obj/structure/closet/crate, /obj/machinery/light/small{ @@ -20747,15 +20024,6 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/mining) -"jNs" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/machinery/computer/cryopod{ - pixel_y = 32 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "jNM" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -20766,18 +20034,25 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"jNW" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"jNQ" = ( +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining"; + name = "mining shuttle"; + rebuildable = 1; + roundstart_move = "mining_home"; + width = 7; + port_direction = 4 }, -/area/centcom/supply) -"jOj" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkyellow" +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock"; + req_access = list(48) }, -/area/centcom/specops) +/turf/simulated/floor/shuttle, +/area/shuttle/mining) "jOk" = ( /obj/structure/table/abductor{ color = "#99ff99"; @@ -20792,6 +20067,19 @@ }, /turf/simulated/floor/plasteel/freezer, /area/ninja/outpost) +"jOp" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkredalt" + }, +/area/centcom/jail) "jOH" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium"; @@ -20823,6 +20111,13 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/evac) +"jPF" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "jPH" = ( /obj/effect/turf_decal{ dir = 4; @@ -20846,6 +20141,23 @@ icon_state = "hierophant1" }, /area/wizard_station) +"jQb" = ( +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass, +/area/centcom/bridge) +"jQj" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "jQm" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -20856,44 +20168,6 @@ /obj/structure/chair/comfy/purp, /turf/simulated/floor/carpet, /area/wizard_station) -"jRt" = ( -/obj/item/paper{ - info = "Убрать кишку на Дельте"; - pixel_y = -2 - }, -/obj/item/paper{ - info = "Наныть мультизет для трама"; - pixel_y = -4 - }, -/obj/item/paper{ - pixel_x = 9; - info = "Обед через час, работа через вчера" - }, -/obj/item/paper{ - pixel_y = -9; - pixel_x = 7; - info = "Пофиксить в моем кабинете рантайм трубы в трубе... опять" - }, -/obj/item/paper{ - pixel_y = -6; - pixel_x = -5; - info = "Начать делать очередную новую станцию и сгореть на втором часу работы в самокопании" - }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/structure/noticeboard{ - pixel_y = -30 - }, -/turf/simulated/floor/wood, -/area/centcom/zone3) -"jRu" = ( -/obj/structure/chair/sofa/corp/left, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "jRv" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 4 @@ -20909,12 +20183,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"jRY" = ( -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "jSd" = ( /obj/effect/turf_decal{ dir = 4; @@ -20931,18 +20199,6 @@ "jSw" = ( /turf/simulated/wall/indestructible/rock, /area/ninja/holding) -"jSA" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "jSC" = ( /obj/effect/turf_decal/siding/wood{ dir = 10; @@ -20950,17 +20206,6 @@ }, /turf/simulated/floor/carpet/green, /area/shuttle/trade/sol) -"jSE" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkred" - }, -/area/centcom/specops) -"jSF" = ( -/obj/effect/landmark/ert_director, -/obj/structure/chair/office/dark, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "jSH" = ( /obj/effect/turf_decal{ dir = 1; @@ -20984,126 +20229,10 @@ /obj/structure/flora/ausbushes/reedbush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"jTE" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredalt" - }, -/area/centcom/specops) -"jTJ" = ( -/obj/machinery/door_control/secure{ - id = "CC_BSA"; - name = "BSA room"; - pixel_x = -24; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealtstrip" - }, -/area/centcom/specops) -"jTN" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/accessory/black{ - desc = null; - name = "Black tie" - }, -/obj/item/clothing/accessory/blue{ - desc = null; - name = "Blue tie" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/accessory/blue{ - desc = null; - name = "Blue tie" - }, -/obj/item/clothing/accessory/black{ - desc = null; - name = "Black tie" - }, -/obj/item/clothing/accessory/holster{ - desc = null; - name = "Shoulder holster" - }, -/obj/item/clothing/accessory/holster{ - desc = null; - name = "Shoulder holster" - }, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satchel, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/storage/belt/fannypack/black, -/obj/item/storage/belt/fannypack/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/color/white{ - desc = null - }, -/obj/item/clothing/gloves/color/white{ - desc = null - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"jUd" = ( -/obj/machinery/vending/ntc/engineering, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"jUo" = ( -/obj/effect/decal/cleanable/fungus{ - pixel_x = -32; - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"jUq" = ( -/obj/structure/rack, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/item/ammo_box/magazine/sfg9mm, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 - }, -/obj/item/ammo_box/magazine/sfg9mm{ - pixel_x = 8 +"jTW" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/structure/mirror{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -21120,12 +20249,42 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"jVf" = ( -/obj/mecha/combat/gygax/ert/loaded, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/engine, +"jUN" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"jUO" = ( +/obj/machinery/light/spot{ + dir = 1 + }, +/turf/simulated/wall/shuttle, +/area/shuttle/nt_droppod) +"jUQ" = ( +/obj/structure/table/wood{ + color = "#996633" + }, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen/multi/gold, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) +"jVq" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "Air" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "jVI" = ( /obj/item/flashlight, /obj/item/gps{ @@ -21154,31 +20313,12 @@ icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' }, /area/syndicate_mothership/elite_squad) -"jWd" = ( -/obj/structure/railing{ - layer = 4.3; - density = 0 - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" +"jWu" = ( +/obj/item/melee/baton{ + color = "#b30086" }, +/turf/simulated/floor/plating, /area/centcom/specops) -"jWv" = ( -/obj/machinery/mass_driver{ - dir = 4; - id_tag = "ASSAULT3"; - name = "gravpult" - }, -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "jWM" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ @@ -21186,38 +20326,9 @@ icon_state = "navybluealt" }, /area/centcom/specops) -"jWN" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_Grenade"; - name = "Grenades"; - pixel_x = 24; - pixel_y = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredcorners" - }, -/area/centcom/specops) "jWT" = ( /turf/simulated/floor/carpet, /area/centcom/zone1) -"jXa" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/portable_atmospherics/canister/oxygen{ - maximum_pressure = 50000 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "O2"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "jXe" = ( /obj/structure/table/wood, /obj/item/paicard, @@ -21225,16 +20336,6 @@ /obj/item/pen, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) -"jXf" = ( -/obj/structure/table, -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "jXl" = ( /obj/effect/turf_decal{ dir = 9; @@ -21244,6 +20345,14 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) +"jXt" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/trash/candle, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/evac) "jXB" = ( /obj/structure/table/abductor, /obj/item/paper/abductor, @@ -21251,17 +20360,47 @@ /obj/item/cautery/alien, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"jXC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/item/flag/nt, -/obj/machinery/light{ - dir = 4 +"jYq" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/suit/armor/heavy, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/shoes/combat/swat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/combat, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/administration) +/area/centcom/supply) "jYK" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -21280,12 +20419,21 @@ icon_state = "alien11" }, /area/abductor_ship) -"jZY" = ( +"jYV" = ( +/obj/machinery/chem_dispenser/soda/upgraded, +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredcorners" + dir = 1; + icon_state = "vault" }, /area/centcom/specops) +"jZF" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "kag" = ( /obj/structure/table/wood/fancy/green, /obj/item/reagent_containers/food/drinks/tea{ @@ -21295,6 +20443,20 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"kaz" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"kaY" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "kbb" = ( /obj/item/stack/spacecash/c50, /obj/structure/chair/comfy/shuttle{ @@ -21331,30 +20493,6 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"kbJ" = ( -/obj/structure/rack/holorack, -/obj/item/circuitboard/aiupload, -/obj/item/circuitboard/circuit_imprinter, -/obj/item/circuitboard/communications, -/obj/item/circuitboard/destructive_analyzer, -/obj/item/circuitboard/ore_redemption, -/obj/item/circuitboard/mining_shuttle, -/obj/item/circuitboard/mining_shuttle, -/obj/item/circuitboard/mining_shuttle, -/obj/item/circuitboard/protolathe, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"kbL" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal{ - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' - }, -/area/shuttle/vox) "kbP" = ( /obj/machinery/light{ dir = 4 @@ -21365,36 +20503,31 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone1) -"kcl" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_AEG"; - name = "advanced energy gun"; - pixel_x = -24; - pixel_y = 24; - req_access = list(114) +"kbV" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredcorners" +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/area/centcom/specops) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/chair/comfy/lime{ + dir = 8 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "kco" = ( /obj/structure/largecrate, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/jail) -"kcz" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkredaltstrip" - }, -/area/centcom/zone2) -"kcH" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) "kcI" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo18" @@ -21426,12 +20559,6 @@ "keo" = ( /turf/simulated/wall/indestructible/iron, /area/syndicate_mothership) -"ket" = ( -/obj/machinery/light/small, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "keD" = ( /obj/structure/window/reinforced{ dir = 1 @@ -21446,6 +20573,19 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"keE" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/structure/holohoop{ + dir = 1 + }, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "keG" = ( /obj/machinery/hydroponics/constructable{ desc = "These are connected with an irrigation tube. You see a little pipe connecting the trays."; @@ -21479,6 +20619,17 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) +"kfl" = ( +/obj/structure/table/glass, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/carpet, +/area/centcom/specops) "kfv" = ( /obj/machinery/door/airlock/syndicate/security{ name = "Тюрьма"; @@ -21497,6 +20648,20 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) +"kfC" = ( +/obj/mecha/combat/marauder/seraph/loaded{ + armor = list("melee"=80,"bullet"=80,"laser"=80,"energy"=80,"bomb"=80,"bio"=80,"rad"=80,"fire"=100,"acid"=100); + name = "D2"; + operation_req_access = list(109) + }, +/obj/effect/turf_decal/mech, +/obj/machinery/light, +/turf/simulated/floor/indestructible{ + dir = 8; + icon_state = "vault"; + name = "Operative position" + }, +/area/centcom/jail) "kfD" = ( /obj/effect/turf_decal/stripes/gold{ dir = 8 @@ -21506,15 +20671,13 @@ }, /area/syndicate_mothership/infteam) "kfE" = ( +/obj/structure/table, +/obj/item/paper, /obj/machinery/door/window/brigdoor{ - dir = 8; - req_access = list(104) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredaltstrip" + dir = 8 }, -/area/centcom/jail) +/turf/simulated/floor/carpet, +/area/centcom/zone2) "kfM" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -21529,22 +20692,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"kfU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/table, -/obj/item/pen/multi/fountain, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "kgk" = ( /obj/machinery/door/airlock/hatch{ drain_act_protected = 1; @@ -21557,6 +20704,16 @@ icon_state = "floor13" }, /area/shuttle/ninja) +"kgq" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "kgu" = ( /obj/machinery/light/small{ dir = 8 @@ -21566,6 +20723,47 @@ icon_state = "arrival" }, /area/centcom/zone1) +"kgw" = ( +/obj/structure/rack/holorack, +/obj/item/organ/internal/cyberimp/brain/anti_drop, +/obj/item/organ/internal/cyberimp/brain/anti_drop, +/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, +/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, +/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, +/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, +/obj/item/organ/internal/cyberimp/chest/reviver/hardened, +/obj/item/organ/internal/cyberimp/chest/reviver/hardened, +/obj/item/organ/internal/cyberimp/eyes/hud/medical, +/obj/item/organ/internal/cyberimp/eyes/hud/medical, +/obj/item/organ/internal/cyberimp/eyes/thermals, +/obj/item/organ/internal/cyberimp/eyes/thermals, +/obj/item/organ/internal/cyberimp/mouth/breathing_tube, +/obj/item/organ/internal/cyberimp/mouth/breathing_tube, +/obj/item/implanter/mindshield, +/obj/item/implanter/mindshield, +/obj/item/organ/internal/cyberimp/arm/combat/centcom, +/obj/item/organ/internal/cyberimp/arm/combat/centcom, +/obj/item/organ/internal/cyberimp/arm/surgery, +/obj/item/organ/internal/cyberimp/arm/toolset, +/obj/item/organ/internal/cyberimp/arm/janitorial, +/obj/item/autoimplanter/old, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"kgx" = ( +/obj/machinery/door/poddoor{ + id_tag = "ASSAULT2"; + name = "Launch Bay #2" + }, +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "kgz" = ( /obj/structure/curtain/black{ pixel_x = 32; @@ -21587,6 +20785,18 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) +"kgC" = ( +/obj/machinery/vending/coffee/free, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) +"kgD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/centcom/specops) "kgE" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -21597,11 +20807,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/shuttle/trade/sol) -"kgF" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "kgG" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -21621,35 +20826,40 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"kgO" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"khn" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, +"khg" = ( /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/window/reinforced, +/obj/machinery/computer/robotics, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/zone3) +/area/centcom/bridge) "khv" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) +"khE" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 183; + teleport_y = 62; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" + }, +/area/centcom/specops) "khG" = ( /obj/item/hand_labeler, /obj/item/stack/packageWrap, @@ -21658,16 +20868,15 @@ /obj/structure/table/wood/fancy/orange, /turf/simulated/floor/carpet/blue, /area/shuttle/trade/sol) -"khV" = ( -/obj/structure/chair/comfy/shuttle{ +"kic" = ( +/obj/machinery/light{ dir = 8 }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 +/turf/simulated/floor/plasteel{ + icon_state = "arrival"; + dir = 10 }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) +/area/centcom/evac) "kio" = ( /obj/structure/curtain/black{ pixel_y = 32 @@ -21703,36 +20912,27 @@ /obj/structure/flora/ausbushes/genericbush, /turf/simulated/floor/grass, /area/centcom/evac) -"kjt" = ( -/obj/item/book/random, -/turf/simulated/floor/wood{ - icon_state = "wood-broken6"; - tag = "icon-wood-broken6" - }, -/area/centcom/zone2) "kjK" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 1 }, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"kjL" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 2000; - id_tag = "CC-OP3"; - name = "Access Controller OP3"; - pixel_y = 32; - req_access = list(109); - tag_exterior_door = "CC-OP3-Ext"; - tag_interior_door = "CC-OP3-Int" - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +"kjZ" = ( +/turf/simulated/wall/indestructible/abductor, +/area/abductor_ship) +"kkq" = ( +/obj/structure/bookcase, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"kkr" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 }, -/area/centcom/zone3) +/obj/machinery/computer/shuttle/ert, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "kkt" = ( /obj/effect/turf_decal{ dir = 4; @@ -21748,6 +20948,27 @@ icon_state = "arrivalcorner" }, /area/centcom/zone1) +"kkU" = ( +/obj/machinery/door/airlock/command/glass{ + frequency = 2000; + icon_state = "open"; + id_tag = "CC-OP3-Int"; + locked = 1; + name = "Zone 2" + }, +/obj/effect/decal/warning_stripes/blue, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 2000; + master_tag = "CC-OP3"; + name = "CC-OP3-INT"; + pixel_x = 32; + req_access = list(109) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "kln" = ( /obj/structure/railing, /obj/effect/turf_decal/stripes/line{ @@ -21756,14 +20977,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"klp" = ( -/obj/machinery/conveyor{ - id = "CC_crate" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "klz" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo17" @@ -21771,11 +20984,38 @@ /obj/effect/turf_decal/stripes/gold, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) +"klT" = ( +/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ + dir = 1; + id_tag = "ERT_Quarantine" + }, +/obj/machinery/porta_turret/centcom/pulse{ + armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + color = "#666666"; + damtype = "burn"; + health = 1250; + region_max = 12; + scan_range = 12; + shot_delay = 8; + name = "Quarantine Pulse Turret" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "kms" = ( /obj/structure/table/wood/fancy/black, /obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet, /area/wizard_station) +"kmt" = ( +/obj/structure/closet/secure_closet/reagents, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/engine, +/area/centcom/specops) "kmD" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -21794,14 +21034,10 @@ icon_state = "dark" }, /area/centcom/zone1) -"knk" = ( -/obj/effect/turf_decal/plaque, -/obj/structure/chair/comfy/red{ - color = "#222222"; - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) +"kmM" = ( +/obj/effect/decal/warning_stripes/south, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/specops) "knt" = ( /obj/effect/turf_decal/siding/wood{ dir = 8; @@ -21831,26 +21067,39 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) -"knR" = ( -/obj/machinery/door/airlock/centcom{ - name = "Outpost 3"; - opacity = 1; - req_access = list(109) +"knX" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_SFG5"; + name = "SFG-5"; + pixel_x = 24; + pixel_y = -24; + req_access = list(114) }, -/obj/effect/decal/warning_stripes/blue, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 6; + icon_state = "darkyellow" }, -/area/centcom/zone2) +/area/centcom/specops) "kob" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien6" }, /area/abductor_ship) -"koc" = ( -/obj/structure/stone_tile/slab/cracked, -/turf/simulated/floor/lava/lava_land_surface, -/area/ruin/space/bubblegum_arena) +"kom" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "CC_ERT1" + }, +/obj/machinery/door_control/secure{ + id = "CC_ERT1"; + pixel_y = -25; + req_access = list(114) + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + icon_state = "navybluealt" + }, +/area/centcom/specops) "koH" = ( /obj/machinery/door/airlock/command/glass{ frequency = 2000; @@ -21879,6 +21128,28 @@ icon_state = "cmo" }, /area/shuttle/escape) +"kpi" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 5 + }, +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 5 + }, +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "kpr" = ( /obj/machinery/door/airlock/syndicate/security{ autoclose = 0; @@ -21919,19 +21190,6 @@ /obj/item/clothing/gloves/boxing/blue, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"kpO" = ( -/obj/structure/chair/sofa/corp/left, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredalt" - }, -/area/centcom/specops) -"kpQ" = ( -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "kpV" = ( /obj/machinery/cryopod/syndie{ dir = 2 @@ -21955,23 +21213,21 @@ /obj/structure/chair/comfy/brown, /turf/simulated/floor/carpet, /area/centcom/zone1) -"kqc" = ( -/obj/vehicle/ridden/janicart{ - dir = 4 - }, -/obj/item/key/janitor, -/obj/item/janiupgrade{ - layer = 2.9 - }, -/turf/simulated/floor/indestructible{ - icon_state = "darkpurple" - }, -/area/centcom/specops) "kqe" = ( /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/centcom/zone1) +"kqu" = ( +/obj/structure/window/reinforced, +/obj/machinery/light, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "kqy" = ( /obj/effect/turf_decal{ dir = 1; @@ -22001,12 +21257,17 @@ }, /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/syndicate) -"kro" = ( -/obj/machinery/computer/communications, -/obj/machinery/newscaster/security_unit{ - pixel_x = 32 +"krh" = ( +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl4"; + name = "Armory level 4"; + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "kru" = ( /obj/machinery/abductor/gland_dispenser, @@ -22025,16 +21286,15 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"krW" = ( +"kse" = ( /obj/structure/window/reinforced{ - dir = 8 + layer = 3.1; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) }, -/obj/structure/window/reinforced, -/obj/machinery/computer/robotics, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" }, -/area/centcom/bridge) +/area/centcom/specops) "ksB" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -22042,14 +21302,15 @@ }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"ksI" = ( -/obj/structure/chair/comfy/red{ - dir = 8 +"ksN" = ( +/obj/effect/decal/nanotrasen_logo{ + icon_state = "logo6"; + pixel_x = 16 }, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + icon_state = "dark" }, -/area/centcom/jail) +/area/centcom/specops) "ktf" = ( /obj/structure/table/abductor, /obj/item/bonegel/alien, @@ -22072,19 +21333,35 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"ktw" = ( -/obj/effect/decal/cleanable/crayon{ - icon_state = "bodys"; - pixel_x = 14; - pixel_y = 32 +"ktZ" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"kub" = ( +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "navybluealt" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/wood, /area/centcom/specops) "kuh" = ( /turf/simulated/floor/carpet/black, /area/ninja/outpost) +"kuA" = ( +/obj/structure/window/reinforced, +/obj/machinery/computer, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "kuJ" = ( /obj/structure/bed/abductor, /turf/simulated/floor/indestructible/abductor, @@ -22096,12 +21373,13 @@ /obj/structure/fans/tiny, /turf/simulated/floor/wood, /area/shuttle/trade/sol) -"kvb" = ( -/obj/structure/sign/poster/official/work_for_a_future{ - pixel_y = -30 +"kvh" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "navybluealt" + dir = 10; + icon_state = "darkyellow" }, /area/centcom/specops) "kvz" = ( @@ -22139,13 +21417,12 @@ icon_state = "alien8" }, /area/abductor_ship) -"kvU" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 5; - do_not_delete_me = 1 +"kwn" = ( +/obj/structure/falsewall/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/shuttle, -/area/shuttle/administration) +/area/centcom/specops) "kwr" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien9" @@ -22157,15 +21434,6 @@ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) -"kwU" = ( -/obj/machinery/conveyor/inverted{ - id = "CC_crate"; - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "kwV" = ( /obj/structure/window/reinforced, /turf/simulated/floor/beach/water{ @@ -22183,15 +21451,12 @@ }, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"kxv" = ( -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/storage/toolbox/surgery, -/obj/structure/table/glass, -/obj/item/scalpel/laser/manager, -/turf/simulated/floor/plasteel{ - icon_state = "white" +"kxb" = ( +/obj/structure/chair/comfy/purp{ + dir = 1 }, -/area/centcom/specops) +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "kxL" = ( /obj/machinery/light/small, /turf/simulated/floor/carpet/black, @@ -22207,14 +21472,21 @@ icon_state = "dark" }, /area/centcom/evac) -"kyK" = ( -/obj/machinery/vending/chinese/free, +"kyB" = ( +/obj/effect/turf_decal/caution/stand_clear, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" + dir = 5; + icon_state = "darkyellowaltstrip" }, -/area/centcom/specops) +/area/centcom/zone3) +"kyM" = ( +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "kyO" = ( /obj/effect/turf_decal/siding/wideplating{ color = "#55391A"; @@ -22234,12 +21506,66 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"kyQ" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 183; + teleport_y = 61; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" + }, +/area/centcom/specops) "kzy" = ( /obj/effect/landmark/syndieprisonwarp, /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"kzB" = ( +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/zone3) +"kzR" = ( +/obj/machinery/computer/cloning, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whiteblue" + }, +/area/centcom/specops) +"kzT" = ( +/obj/machinery/suit_storage_unit/standard_unit/ertamber{ + req_access = list(104,109) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"kAd" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/centcom/specops) "kAj" = ( /obj/structure/table/abductor, /obj/item/surgicaldrill/alien, @@ -22258,6 +21584,11 @@ /obj/item/stack/spacecash, /turf/simulated/floor/carpet/black, /area/wizard_station) +"kAt" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredaltstrip" + }, +/area/centcom/jail) "kAE" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -22303,6 +21634,15 @@ /obj/structure/grille, /turf/simulated/floor/shuttle/plating, /area/shuttle/funeral) +"kAW" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/machinery/light, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "kBa" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/indestructible/plating; @@ -22368,40 +21708,21 @@ icon_state = "cafeteria" }, /area/centcom/jail) -"kCJ" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/plasmareinforced{ - color = "#22aab7"; - dir = 8 - }, -/obj/structure/shuttle/engine/platform{ - dir = 4; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/administration) -"kCX" = ( -/obj/machinery/vending/security, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "kCY" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) -"kDd" = ( -/obj/item/paper_bin/nanotrasen, -/obj/structure/table/wood, -/turf/simulated/floor/plating, -/area/centcom/zone2) +"kDe" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "kDg" = ( /obj/effect/decal/warning_stripes/blue, /obj/machinery/door/airlock/centcom{ @@ -22413,23 +21734,6 @@ icon_state = "dark" }, /area/centcom/specops) -"kDB" = ( -/obj/structure/railing{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) -"kDD" = ( -/obj/machinery/light, -/obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/zone2) "kDL" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/snacks/candy/cotton/blue, @@ -22440,95 +21744,20 @@ /obj/item/reagent_containers/food/drinks/mugwort, /turf/simulated/floor/carpet, /area/wizard_station) -"kEs" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" - }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" - }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navyblue" - }, -/area/centcom/specops) +"kEk" = ( +/turf/simulated/floor/lava/lava_land_surface, +/area/ruin/space/bubblegum_arena) "kEv" = ( -/obj/structure/sign/securearea{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"kEK" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, +/obj/effect/turf_decal/caution/stand_clear/red, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "darkbluealtstrip" }, -/area/centcom/jail) +/area/centcom/zone2) "kEU" = ( /obj/structure/flora/rock, /turf/simulated/floor/grass, /area/centcom/evac) -"kEW" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/zone3) "kEZ" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium_corner" @@ -22539,123 +21768,63 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"kFL" = ( -/obj/item/flag/nt, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "kFV" = ( /obj/structure/flora/junglebush/b, /obj/structure/flora/grass/jungle, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"kFY" = ( -/obj/machinery/door_control/secure{ - color = "#99ff99"; - id = "ERT_armory_lvl1"; - name = "ERT Armory Level 1"; - pixel_y = 32; - req_access = list(114) - }, +"kGp" = ( +/obj/structure/table/glass, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkgreen" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/zone3) "kGJ" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) +"kGN" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealt" + }, +/area/centcom/specops) "kGX" = ( /obj/structure/chair/sofa/left, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) -"kHg" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - dir = 1; - id_tag = "ERT_armory_vkd"; - name = "Armory level 1" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "kHn" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) -"kHx" = ( -/obj/structure/rack, -/obj/item/clothing/accessory/holster{ - pixel_y = 10 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 10 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 10 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 10 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 5 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 5 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 5 - }, -/obj/item/clothing/accessory/holster{ - pixel_y = 5 +"kHQ" = ( +/obj/effect/turf_decal/arrows{ + dir = 1 }, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster, -/obj/item/clothing/accessory/holster, -/obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"kHA" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/obj/structure/window/reinforced{ - dir = 8 + dir = 4; + icon_state = "darkyellowalt" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_2) +/area/centcom/supply) +"kHS" = ( +/obj/structure/bookcase, +/obj/item/book/random/triple, +/turf/simulated/floor/plating, +/area/centcom/zone2) "kHT" = ( /obj/item/flag/nt, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"kHW" = ( -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - req_access = list(101) - }, -/turf/simulated/floor/carpet, -/area/centcom/zone2) "kIl" = ( /obj/structure/table/wood/fancy/black, /turf/simulated/floor/carpet, @@ -22685,25 +21854,57 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/outside) -"kIU" = ( -/obj/item/gun/energy/sniperrifle, -/obj/item/gun/energy/sniperrifle, -/obj/item/gun/energy/sniperrifle, -/obj/item/gun/energy/sniperrifle, -/obj/item/gun/energy/sniperrifle, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +"kIT" = ( +/obj/structure/chair/comfy/brown{ + color = "#3300FF"; + dir = 1 }, -/obj/structure/window/reinforced{ - dir = 4; - layer = 2.9 +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"kJd" = ( +/obj/structure/closet/cabinet{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100) }, -/obj/structure/rack/gunrack, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/item/storage/box/centcomofficer, +/obj/item/radio/headset/centcom{ + desc = null; + name = "Supreme commander bowman headset" }, -/area/centcom/supply) +/obj/item/card/id{ + access = list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,69,70,71,73,74,75,76,77,99,101,102,103,104,105,106,107,108,109,110,111,112,113,114); + icon_state = "commander"; + name = "Supreme Commander ID card"; + rank = "Nanotrasen Navy Captain"; + registered_name = null + }, +/obj/item/door_remote/centcomm, +/obj/item/clothing/accessory/medal/gold{ + desc = null; + name = "Supreme commander's gold medal" + }, +/obj/item/gun/projectile/revolver/mateba, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/gloves/color/white{ + desc = null; + name = "Supreme judge gloves" + }, +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "kJh" = ( /obj/structure/curtain/black{ pixel_y = -32 @@ -22713,6 +21914,18 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) +"kJF" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_supply_external2"; + layer = 5; + locked = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "kJG" = ( /obj/structure/bookcase, /obj/item/book/manual, @@ -22734,46 +21947,37 @@ /obj/item/flag/ninja, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"kKp" = ( +/obj/structure/chair/comfy/red{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) "kKs" = ( /obj/machinery/light/spot, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"kKG" = ( -/obj/machinery/mass_driver{ - dir = 4; - id_tag = "ASSAULT0"; - name = "gravpult" - }, -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "kKP" = ( /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/syndicate_mothership/elite_squad) +"kKV" = ( +/obj/structure/window/reinforced, +/obj/structure/table, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/computer/library/public, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "kLh" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien2" }, /area/abductor_ship) -"kLi" = ( -/obj/machinery/door_control/secure{ - id = "ERT_Drop"; - pixel_x = 26; - pixel_y = -8; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) "kLj" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -22798,13 +22002,6 @@ /obj/item/flashlight/lamp/green, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"kLu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" - }, -/area/shuttle/administration) "kLx" = ( /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/b, @@ -22818,6 +22015,21 @@ icon_state = "grimy" }, /area/syndicate_mothership/elite_squad) +"kLX" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "kMm" = ( /obj/machinery/fishtank/wall{ opacity = 1 @@ -22858,57 +22070,41 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"kNc" = ( -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) -"kNd" = ( -/obj/structure/flora/rock/jungle, -/mob/living/simple_animal/hostile/carp/koi{ - faction = list("") - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 85; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' +"kMT" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; + id_tag = "adminshuttleshutters"; + name = "Blast Shutters" }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, -/area/centcom/specops) +/turf/simulated/floor/plating, +/area/shuttle/administration) "kNj" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkbluealt" }, /area/centcom/zone2) -"kNq" = ( -/obj/structure/table, -/obj/machinery/computer/library/public, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"kNE" = ( -/obj/machinery/vending/snack/free, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) -"kNH" = ( -/obj/machinery/ai_status_display{ - pixel_y = -32 +"kNk" = ( +/obj/effect/landmark/marauder_exit, +/obj/structure/fans/tiny, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/tile/neutral{ + alpha = 220; + color = "black"; + icon_state = "tile_full"; + layer = 9; + opacity = 1 }, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/turf/simulated/floor/plating, +/area/centcom/supply) +"kNG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "kNN" = ( /turf/simulated/wall/indestructible/abductor{ icon_state = "alien4" @@ -22919,6 +22115,56 @@ icon_state = "alien5" }, /area/abductor_ship) +"kOx" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkbluealt" + }, +/area/centcom/zone2) +"kOD" = ( +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowcornersalt" + }, +/area/centcom/supply) +"kPa" = ( +/obj/mecha/combat/marauder/seraph{ + armor = list("melee"=80,"bullet"=80,"laser"=80,"energy"=80,"bomb"=80,"bio"=80,"rad"=80,"fire"=100,"acid"=100); + color = "#006666"; + name = "Rocinante" + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual{ + fire_sound = 'sound/weapons/gunshots/gunshot_strong.ogg'; + name = "Automatic 20mm cannone"; + projectile_delay = 0.5; + projectiles_per_shot = 10 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/heavy{ + name = "Heavy 83mm HE RL" + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot{ + name = "Destroyer of the present"; + projectiles = 70; + projectiles_per_shot = 7 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray/triple, +/obj/item/mecha_parts/mecha_equipment/teleporter/precise, +/obj/item/mecha_parts/mecha_equipment/repair_droid, +/obj/effect/turf_decal/mech, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "kPd" = ( /obj/machinery/vending/boozeomat, /obj/effect/turf_decal/tile/neutral{ @@ -22932,6 +22178,20 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"kPg" = ( +/obj/structure/table/glass, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen/fancy{ + pixel_x = 8 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "kPi" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -23027,6 +22287,18 @@ icon_state = "darkgrey" }, /area/centcom/zone2) +"kQO" = ( +/obj/machinery/computer/communications, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching the Special Ops team."; + name = "Security Station Monitor"; + network = list("SS13","Research Outpost","Mining Outpost"); + pixel_x = 30 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) "kQT" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -23056,12 +22328,72 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"kRn" = ( +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 8; + layer = 4.2 + }, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "kRq" = ( /obj/structure/chair/comfy/purp{ dir = 1 }, /turf/simulated/floor/carpet, /area/wizard_station) +"kRw" = ( +/obj/docking_port/mobile{ + dheight = 1; + dir = 8; + dwidth = 7; + height = 18; + id = "trade_sol"; + name = "sol trade shuttle"; + roundstart_move = "trade_sol_base"; + width = 15; + port_direction = 2; + preferred_direction = 8 + }, +/obj/machinery/door/airlock/shuttle/glass{ + id_tag = "s_docking_airlock" + }, +/obj/structure/fans/tiny, +/obj/docking_port/stationary{ + dheight = 1; + dir = 8; + dwidth = 7; + height = 18; + id = "trade_sol_base"; + name = "docking bay 2 at Jupiter Station"; + width = 15 + }, +/turf/simulated/floor/wood, +/area/shuttle/trade/sol) +"kRE" = ( +/obj/effect/turf_decal/arrows{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowalt" + }, +/area/centcom/supply) +"kRJ" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "kRM" = ( /obj/structure/bookcase, /obj/item/book/manual, @@ -23100,13 +22432,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"kSD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "kSF" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small, @@ -23128,11 +22453,27 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"kTa" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "kTc" = ( /obj/structure/table/glass, /obj/item/reagent_containers/food/snacks/cheesyfries, /turf/simulated/floor/carpet, /area/centcom/evac) +"kTd" = ( +/obj/structure/railing{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/zone2) "kTy" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -23142,21 +22483,23 @@ icon_state = "white" }, /area/centcom/jail) -"kTL" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-34"; - tag = "icon-plant-34" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "kTP" = ( /obj/machinery/photocopier, /turf/simulated/floor/carpet, /area/centcom/zone2) +"kTQ" = ( +/obj/machinery/vending/chinese/free, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) +"kTW" = ( +/turf/simulated/floor/wood{ + icon_state = "wood-broken5" + }, +/area/centcom/zone2) "kUf" = ( /obj/item/radio/intercom/syndicate{ pixel_x = -3; @@ -23190,14 +22533,6 @@ icon_state = "barber" }, /area/centcom/jail) -"kUK" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "kVb" = ( /obj/effect/turf_decal/siding/wood{ dir = 6; @@ -23217,31 +22552,6 @@ icon_state = "warnwhite" }, /area/centcom/zone1) -"kVP" = ( -/obj/machinery/embedded_controller/radio/airlock/access_controller{ - frequency = 2000; - id_tag = "CC-OP2"; - name = "Access Controller OP2"; - pixel_y = 32; - req_access = list(109); - tag_exterior_door = "CC-OP2-Ext"; - tag_interior_door = "CC-OP2-Int" - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"kVQ" = ( -/obj/machinery/cryopod/robot, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navyblue" - }, -/area/centcom/specops) "kVS" = ( /obj/structure/curtain/black{ pixel_x = 32; @@ -23297,15 +22607,25 @@ "kWm" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/zone3) -"kWq" = ( -/obj/item/radio/intercom/specops{ - pixel_y = -32 +"kWB" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkyellow" +/obj/effect/turf_decal/tile/neutral{ + alpha = 100; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/area/centcom/specops) +/turf/simulated/floor/plating, +/area/centcom/supply) +"kWH" = ( +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) "kWN" = ( /obj/structure/fence/door{ color = "#b0b7c6"; @@ -23313,6 +22633,11 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"kXg" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredcornersalt" + }, +/area/centcom/specops) "kXj" = ( /obj/effect/turf_decal/stripes/gold{ dir = 10 @@ -23321,64 +22646,33 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"kXm" = ( -/obj/machinery/computer/card, -/obj/structure/railing, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "kXn" = ( /obj/effect/turf_decal/stripes/gold, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"kXq" = ( -/turf/space/transit/west, -/area/space) -"kXu" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"kXJ" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/food/snacks/soup/beetsoup{ - desc = "Со вкусом политических убийств"; - name = "Борщ"; - pixel_y = 16 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/item/stack/spacecash/c1000000{ - name = "1000000 Credit" - }, -/obj/item/stack/telecrystal/twohundred_fifty{ - amount = 115; - desc = null - }, -/obj/item/stack/telecrystal/twohundred_fifty{ - amount = 115; - desc = null +"kXz" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/carpet/red, -/area/syndicate_mothership/control) -"kXQ" = ( -/obj/effect/decal/nanotrasen_logo{ - icon_state = "logo2"; - pixel_x = 16 +/turf/simulated/floor/plating, +/area/centcom/zone2) +"kXF" = ( +/obj/machinery/door_control{ + color = "#ffcccc"; + id = "Zone3_bathroom2"; + name = "Bathroom lock"; + normaldoorcontrol = 1; + pixel_x = -4; + pixel_y = 33; + req_access = list(114); + specialfunctions = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/centcom/specops) +/area/centcom/zone3) "kXT" = ( /obj/effect/turf_decal/stripes/gold, /obj/structure/sign/poster/contraband/random{ @@ -23389,11 +22683,24 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"kYt" = ( -/obj/structure/table/wood{ - color = "#996633" +"kYb" = ( +/obj/structure/table/glass, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen/multi/gold, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"kYe" = ( +/obj/structure/table/glass, +/obj/structure/sign/poster/official/safety_report{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "kYu" = ( /obj/machinery/light/small{ @@ -23414,31 +22721,35 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"kYF" = ( +"kYG" = ( +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkredalt" + }, +/area/centcom/jail) +"kZy" = ( /obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza, -/turf/simulated/floor/wood, -/area/centcom/specops) -"kYP" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +/obj/machinery/chem_dispenser/soda/upgraded, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 1; + pixel_y = 5 }, -/obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"kZm" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"kZA" = ( +/obj/machinery/mass_driver{ + dir = 4; + id_tag = "ASSAULT2"; + name = "gravpult" + }, +/obj/effect/turf_decal/loading_area/white{ dir = 4 }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) -"kZD" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkredaltstrip" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) "kZH" = ( /obj/effect/turf_decal/siding/wideplating/corner{ color = "#55391A" @@ -23485,16 +22796,20 @@ }, /area/syndicate_mothership/infteam) "laj" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/turf_decal/tile/neutral{ - alpha = 200; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 +/obj/effect/turf_decal/stripes/black{ + dir = 10; + do_not_delete_me = 1 }, -/turf/simulated/floor/plating, -/area/centcom/supply) +/obj/effect/turf_decal/stripes/black{ + dir = 5; + do_not_delete_me = 1; + icon_state = "bs_deadlock" + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "white" + }, +/area/shuttle/administration) "lay" = ( /obj/structure/table/wood, /obj/item/storage/firstaid/tactical/sst{ @@ -23550,6 +22865,25 @@ icon_state = "dark" }, /area/centcom/zone1) +"lbH" = ( +/obj/effect/turf_decal/stripes/black{ + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 1; + do_not_delete_me = 1 + }, +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Workshop"; + opacity = 1; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "lbU" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -23591,6 +22925,15 @@ /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"lcU" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_SFG5" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "ldr" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23609,25 +22952,31 @@ icon_state = "white" }, /area/centcom/zone1) -"lej" = ( -/obj/machinery/door/airlock/command/glass{ - frequency = 2000; - icon_state = "open"; - id_tag = "CC-OP4-Int"; - locked = 1; - name = "Zone 2" - }, -/obj/effect/decal/warning_stripes/blue, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 2000; - master_tag = "CC-OP4"; - name = "CC-OP4-INT"; - pixel_y = 24; - req_access = list(109) +"ldS" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "ERT_armory_lvl3"; + name = "Armory level 3"; + layer = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkfull" + }, +/area/centcom/specops) +"leh" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) +"leC" = ( +/turf/simulated/floor/indestructible{ + dir = 4; + icon_state = "darkgreynavybluecorner" }, /area/centcom/specops) "leD" = ( @@ -23647,18 +22996,6 @@ /obj/item/dart_cartridge, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"leF" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 - }, -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "leN" = ( /obj/machinery/light/small{ brightness_range = 6; @@ -23686,14 +23023,23 @@ }, /area/syndicate_mothership/outside) "lfD" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +/obj/structure/table/glass, +/obj/item/book/manual/faxes, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"lfP" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/toy/prize/seraph{ + pixel_y = 12 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "lga" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -23727,50 +23073,10 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone1) -"lgz" = ( -/obj/machinery/door/airlock/centcom{ - name = "Supreme Court"; - opacity = 1; - req_access = list(106,109,110) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"lgD" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/toy/prize/seraph{ - pixel_y = 12 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"lgN" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_Combat_shotgun"; - name = "Combat Shotguns"; - pixel_x = -8; - pixel_y = -24; - req_access = list(114) - }, -/obj/machinery/door_control/secure{ - id = "CC_Armory_IK60"; - name = "IK-60"; - pixel_x = 8; - pixel_y = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navyblue" - }, -/area/centcom/specops) -"lgR" = ( -/obj/structure/extinguisher_cabinet{ - name = "south extinguisher cabinet"; - pixel_y = -30 +"lgR" = ( +/obj/structure/extinguisher_cabinet{ + name = "south extinguisher cabinet"; + pixel_y = -30 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -23783,42 +23089,14 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/zone3) -"lhk" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/clothing/mask/balaclava, -/obj/item/clothing/accessory/holster, -/obj/item/storage/box/survival_security{ - name = "Security survival kit" - }, -/turf/simulated/floor/wood, -/area/centcom/jail) -"lhn" = ( -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/item/gun/energy/pulse/destroyer/annihilator, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - layer = 2.9; - name = "Pulse ANNIHILATOR"; - req_access = list(114) - }, +"lgV" = ( +/obj/structure/chair/comfy/shuttle, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/centcom/jail) -"lhs" = ( -/turf/simulated/floor/lubed, -/area/centcom/evac) -"lhy" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 + dir = 9; + icon_state = "darkyellow" }, +/area/centcom/specops) +"lhl" = ( /obj/effect/turf_decal/siding{ color = "#444444"; dir = 1 @@ -23828,31 +23106,42 @@ }, /turf/simulated/floor/glass, /area/centcom/zone3) +"lhs" = ( +/turf/simulated/floor/lubed, +/area/centcom/evac) +"lhv" = ( +/obj/effect/turf_decal/stripes/gold, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"lhS" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkgreencorners"; + dir = 8 + }, +/area/centcom/specops) "lhU" = ( /obj/machinery/abductor/experiment{ team = 2 }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"lig" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"lim" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredaltstrip" - }, -/area/centcom/specops) -"liC" = ( -/obj/structure/table/reinforced, -/obj/item/stack/nanopaste, -/obj/item/mmi, -/obj/item/stack/nanopaste, -/obj/structure/sink{ - dir = 1 - }, +"liD" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/iv_bag/salglu, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/nitrogen, +/obj/item/tank/internals/emergency_oxygen/plasma, /turf/simulated/floor/shuttle{ icon_state = "floor3" }, @@ -23866,11 +23155,26 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"ljf" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DAE" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "ljg" = ( /obj/structure/flora/tree/palm, /obj/item/beach_ball, /turf/simulated/floor/beach/sand, /area/centcom/evac) +"ljo" = ( +/obj/machinery/vending/clothing/departament/law, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "ljs" = ( /obj/structure/chair/stool/bar, /obj/machinery/light{ @@ -23900,15 +23204,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"ljT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "lke" = ( /obj/machinery/light/spot{ dir = 1 @@ -23928,12 +23223,6 @@ icon_state = "warnwhite" }, /area/centcom/zone1) -"lkr" = ( -/obj/machinery/vending/cigarette/free, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/jail) "lks" = ( /obj/machinery/iv_drip, /turf/simulated/floor/shuttle{ @@ -23946,36 +23235,20 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"lkI" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 - }, -/obj/structure/showcase{ - layer = 4.1; - pixel_x = -5; - pixel_y = 5 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "lkT" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/simulated/floor/carpet/cyan, /area/ninja/outpost) -"lla" = ( -/obj/effect/decal/warning_stripes/red, -/obj/machinery/door/airlock/centcom{ - damage_deflection = 999; - name = "Prison Customs"; - opacity = 1; - req_access = list(104) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"lle" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 5 }, -/area/centcom/jail) +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "llm" = ( /obj/structure/table/wood/fancy/black, /obj/item/folder/blue{ @@ -23998,14 +23271,6 @@ icon_state = "dark" }, /area/centcom/bridge) -"lln" = ( -/obj/machinery/vending/coffee, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "llv" = ( /obj/structure/fans/tiny/invisible, /obj/machinery/light{ @@ -24042,6 +23307,15 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"llT" = ( +/obj/machinery/light/spot{ + dir = 1 + }, +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "lmc" = ( /obj/item/flag/species/skrell, /turf/simulated/floor/plasteel{ @@ -24059,19 +23333,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"lms" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 18; - id = "admin_away"; - name = "centcom bay 1"; - timid = 1; - turf_type = /turf/simulated/floor/plating/airless; - width = 18 - }, -/turf/simulated/floor/plating/airless, -/area/space) "lmx" = ( /obj/machinery/light/small{ dir = 8 @@ -24081,25 +23342,6 @@ icon_state = "darkredcornersalt" }, /area/syndicate_mothership/jail) -"lmE" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 5; - height = 7; - id = "supply_away"; - name = "supply centcom"; - turf_type = /turf/simulated/floor/plating/airless; - width = 12 - }, -/turf/simulated/floor/plating/airless, -/area/space) -"lmJ" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 6; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/administration) "lmY" = ( /obj/machinery/door/poddoor/multi_tile/four_tile_hor{ icon_state = "open"; @@ -24140,16 +23382,6 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"lnR" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "lnZ" = ( /obj/structure/table, /obj/item/storage/firstaid, @@ -24166,28 +23398,30 @@ /obj/effect/turf_decal/weather/snow/corner, /turf/simulated/floor/indestructible/beach/water/deep/dense, /area/ninja/outside) -"lpz" = ( -/obj/machinery/vending/wallmed{ - pixel_x = 24 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" - }, -/area/centcom/zone3) "lpB" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkredalt" }, /area/centcom/jail) -"lpU" = ( -/obj/effect/landmark/ert_director, -/obj/structure/chair/office/dark{ - dir = 8 +"lpI" = ( +/obj/machinery/turretid{ + control_area = "Centcom Special Operations Forces"; + name = "Quarantine Turret"; + pixel_x = 3; + pixel_y = -26 }, -/turf/simulated/floor/carpet/black, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 5 + }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) +"lpP" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowaltstrip" + }, +/area/centcom/zone3) "lqs" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -24197,22 +23431,13 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"lqy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" - }, -/area/shuttle/administration) -"lqG" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +"lqC" = ( +/obj/item/radio/intercom/specops{ + pixel_x = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 9; + icon_state = "navybluealt" }, /area/centcom/specops) "lrJ" = ( @@ -24266,9 +23491,49 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"lsv" = ( -/obj/effect/decal/warning_stripes/green/hollow, -/obj/effect/landmark/response_team, +"lsj" = ( +/obj/structure/rack, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/item/ammo_box/magazine/sfg9mm, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, +/obj/item/ammo_box/magazine/sfg9mm{ + pixel_x = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24294,16 +23559,23 @@ /obj/item/reagent_containers/food/drinks/cans/beer, /turf/simulated/floor/carpet, /area/centcom/evac) -"ltb" = ( -/obj/structure/railing{ - dir = 8; - pixel_x = 32 +"lto" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 }, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 16 + }, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) +"ltP" = ( /turf/simulated/floor/plasteel{ - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + icon_state = "darkfull" }, -/area/centcom/zone2) +/area/centcom/jail) "ltY" = ( /obj/structure/rack/holorack, /obj/item/scythe/tele, @@ -24351,12 +23623,58 @@ }, /turf/simulated/floor/carpet/red, /area/ussp_centcom/secretariat) +"lun" = ( +/obj/structure/rack, +/obj/item/clothing/accessory/holster{ + pixel_y = 10 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 10 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 10 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 10 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/item/clothing/accessory/holster, +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "luo" = ( /obj/machinery/abductor/experiment{ team = 3 }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) +"lur" = ( +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/tile/neutral{ + alpha = 200; + color = "black"; + icon_state = "tile_full"; + layer = 9; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "lus" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 1 @@ -24372,40 +23690,29 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/control) -"luA" = ( -/obj/structure/bookcase, -/obj/item/book/random/triple, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"lvd" = ( -/obj/structure/sink{ - dir = 1 - }, -/obj/structure/mirror{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/specops) -"lvp" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +"luw" = ( +/turf/simulated/floor/wood{ + icon_state = "wood-broken6" }, -/area/shuttle/administration) +/area/centcom/zone2) "lvG" = ( /obj/structure/flora/grass/jungle/b, /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"lvI" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/machinery/photocopier{ + anchored = 0 + }, +/obj/structure/sign/poster/secret/lady{ + pixel_x = 32 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "lvT" = ( /obj/structure/weightmachine/stacklifter, /turf/simulated/floor/grass, @@ -24431,6 +23738,11 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"lwk" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkbluealtstrip" + }, +/area/centcom/zone2) "lwI" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -24450,18 +23762,23 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership) +"lwX" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_GYGAX" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "lxn" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"lxv" = ( -/obj/machinery/vending/chinese/free{ - pixel_y = 7 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "lxP" = ( /obj/machinery/door/window/brigdoor{ color = "#00f700"; @@ -24484,15 +23801,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) -"lxV" = ( -/obj/machinery/newscaster/security_unit{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealt" - }, -/area/centcom/specops) "lym" = ( /obj/machinery/vending/syndisnack, /turf/simulated/floor/carpet/black, @@ -24531,25 +23839,6 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"lza" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 175; - teleport_y = 60; - teleport_z = 1; - icon_state = "x2"; - icon = 'icons/mob/screen_gen.dmi' - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, -/area/centcom/specops) "lzD" = ( /obj/machinery/light/spot, /turf/simulated/floor/wood{ @@ -24562,6 +23851,12 @@ icon_state = "dark" }, /area/centcom/supply) +"lzU" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) "lzZ" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -24582,6 +23877,30 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) +"lAd" = ( +/obj/structure/table/glass, +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = -5 + }, +/obj/item/folder/red{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/folder/white{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/folder/yellow{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "lAn" = ( /obj/machinery/abductor/console{ team = 3 @@ -24594,14 +23913,6 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"lAD" = ( -/obj/effect/turf_decal/siding/white{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "lAH" = ( /obj/structure/table, /obj/machinery/kitchen_machine/microwave{ @@ -24660,6 +23971,13 @@ icon_state = "floor4" }, /area/shuttle/siberia) +"lBp" = ( +/obj/machinery/door/airlock/shuttle, +/obj/structure/fans/tiny, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "lBF" = ( /obj/machinery/light{ dir = 1 @@ -24682,26 +24000,15 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"lCr" = ( -/obj/structure/falsewall/reinforced{ - req_access = list(114); - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "lCI" = ( /turf/simulated/floor/wood, /area/wizard_station) -"lCX" = ( -/obj/structure/window/reinforced{ - dir = 8 +"lCT" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navybluealtstrip" }, -/obj/structure/window/reinforced, -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/supply) "lDb" = ( /obj/machinery/porta_turret/syndicate{ pixel_y = 2 @@ -24727,19 +24034,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"lDf" = ( -/obj/machinery/door_control/secure{ - color = "#ff9999"; - id = "ERT_armory_lvl3"; - name = "ERT Armory Level 3"; - pixel_y = 32; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkred" - }, -/area/centcom/specops) "lDp" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Syndicate Base" @@ -24791,13 +24085,6 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"lFb" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "lFm" = ( /obj/machinery/light/small{ brightness_range = 6; @@ -24808,6 +24095,50 @@ }, /turf/simulated/floor/wood, /area/wizard_station) +"lFt" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" + }, +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" + }, +/obj/item/clothing/shoes/fluff/noble_boot, +/obj/item/clothing/shoes/fluff/noble_boot, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots/jacksandals, +/obj/item/clothing/shoes/jackboots/jacksandals, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/shoes/leather, +/obj/item/clothing/shoes/leather, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white, +/obj/item/clothing/shoes/white{ + icon_state = "secshoes"; + name = "shoes" + }, +/obj/item/clothing/shoes/white{ + icon_state = "secshoes"; + name = "shoes" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/obj/item/clothing/shoes/centcom{ + desc = null; + name = "Dress shoes" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"lFv" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/evac) "lFw" = ( /obj/structure/reagent_dispensers/beerkeg/nuke{ desc = "Однажды незадачливый отряд внедрения синдиката вместо настоящей бомбы, украл у НТ эту стилизованную кегу с пивом. Эти ребята более не ходят по миру, но кега всё ещё украшает один из местных баров. На ней виднеется зачёркнутое слово 'Нанотрейзен' и приписанное рядом, кровью, слово 'Синдикат'"; @@ -24833,6 +24164,13 @@ }, /turf/simulated/floor/carpet/black, /area/wizard_station) +"lFU" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) "lGu" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium" @@ -24864,6 +24202,16 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"lGL" = ( +/turf/simulated/floor/shuttle, +/area/shuttle/transport) +"lGS" = ( +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = -32 + }, +/obj/machinery/power/smes/vintage, +/turf/simulated/floor/plating, +/area/centcom/zone3) "lGT" = ( /obj/effect/turf_decal/tile/neutral{ alpha = 100; @@ -24880,8 +24228,18 @@ /obj/machinery/computer/shuttle/sst, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"lHe" = ( -/turf/simulated/floor/engine, +"lHs" = ( +/obj/structure/table/reinforced{ + color = "#444444" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealt" + }, +/area/centcom/specops) +"lHw" = ( +/obj/structure/chair/comfy/red, +/turf/simulated/floor/carpet/black, /area/centcom/specops) "lHT" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -24914,6 +24272,23 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"lIy" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"lJk" = ( +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/centcom/specops) +"lJl" = ( +/obj/machinery/computer/pod/deathsquad, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navybluealtstrip" + }, +/area/centcom/supply) "lJm" = ( /obj/machinery/biogenerator, /obj/structure/window/reinforced, @@ -24937,6 +24312,18 @@ /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"lJP" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellowalt" + }, +/area/centcom/zone3) +"lJU" = ( +/turf/simulated/wall/shuttle, +/area/shuttle/gamma) "lKw" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium" @@ -24962,44 +24349,26 @@ /obj/structure/flora/tree/jungle, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"lKE" = ( -/obj/structure/rack, -/obj/item/melee/baton/telescopic{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/melee/baton/telescopic{ - pixel_y = 1 - }, -/obj/item/melee/baton/telescopic{ - pixel_x = 3; - pixel_y = -3 - }, -/turf/simulated/floor/carpet/black, -/area/syndicate_mothership/jail) "lKQ" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo10" }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) +"lKS" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "lKW" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"lKX" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1; - icon_state = "bs_deadlock" - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" - }, -/area/shuttle/administration) "lKY" = ( /obj/effect/turf_decal/siding/wood, /turf/simulated/floor/wood/fancy/light, @@ -25010,29 +24379,14 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) -"lLd" = ( -/obj/vehicle/ridden/janicart{ - dir = 4 - }, -/obj/item/key/janitor, -/obj/item/janiupgrade{ - layer = 2.9 - }, -/turf/simulated/floor/indestructible{ - dir = 6; - icon_state = "darkpurple" - }, -/area/centcom/specops) -"lLn" = ( -/obj/item/flag/nt, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" +"lLm" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + dir = 1; + id = "QMLoad" }, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/plating, +/area/shuttle/supply) "lLo" = ( /obj/effect/turf_decal/tile{ alpha = 128; @@ -25049,6 +24403,19 @@ icon_state = "freezerfloor" }, /area/centcom/jail) +"lLE" = ( +/obj/machinery/vending/mech/ntc/tools, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) +"lLG" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + tag = "icon-propulsion (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) "lMh" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -25079,18 +24446,6 @@ /obj/machinery/vending/suitdispenser, /turf/simulated/floor/wood, /area/centcom/zone1) -"lMZ" = ( -/obj/structure/table, -/obj/item/storage/box/chemimp{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/storage/box/trackimp, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "lNn" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -25102,6 +24457,15 @@ /obj/item/candle, /turf/simulated/floor/carpet, /area/syndicate_mothership/infteam) +"lNv" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "lNA" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-32"; @@ -25112,6 +24476,19 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"lNL" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/computer, +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "lOv" = ( /obj/structure/flora/junglebush/b, /obj/structure/flora/junglebush/c, @@ -25131,6 +24508,9 @@ "lOM" = ( /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"lPb" = ( +/turf/simulated/floor/plasteel/freezer, +/area/centcom/specops) "lPe" = ( /obj/structure/flora/grass/jungle, /obj/effect/mapping_helpers/light, @@ -25152,6 +24532,13 @@ name = "floor" }, /area/syndicate_mothership/outside) +"lPn" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/centcom/jail) "lPp" = ( /obj/structure/table/wood, /obj/item/clothing/suit/wizrobe/marisa, @@ -25175,16 +24562,6 @@ /obj/item/weed_extract, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"lPG" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) "lPZ" = ( /obj/structure/flora/junglebush/c, /obj/effect/turf_decal/siding/green{ @@ -25192,6 +24569,13 @@ }, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) +"lQg" = ( +/obj/machinery/computer/camera_advanced/shuttle_docker/ert, +/obj/machinery/light/spot, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) "lQY" = ( /obj/structure/table/abductor{ name = "table" @@ -25202,45 +24586,24 @@ }, /turf/simulated/floor/fakespace, /area/centcom/zone1) -"lRc" = ( -/obj/item/book/random, -/turf/simulated/floor/plating, -/area/centcom/zone2) +"lRs" = ( +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/machinery/computer/communications, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "lRD" = ( /obj/effect/decal/warning_stripes/yellow, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/centcom/specops) -"lRQ" = ( -/obj/structure/table/glass, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) -"lRR" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellowalt" - }, -/area/centcom/zone3) "lSb" = ( /obj/structure/table/wood, /obj/item/tank/internals/nitrogen, /obj/item/clothing/mask/breath/vox, /turf/simulated/floor/carpet/cyan, /area/wizard_station) -"lSn" = ( -/obj/structure/table, -/obj/item/storage/box/handcuffs, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "lSp" = ( /obj/effect/turf_decal{ dir = 6; @@ -25262,26 +24625,6 @@ name = "floor" }, /area/syndicate_mothership/outside) -"lSK" = ( -/obj/structure/falsewall/reinforced, -/obj/effect/decal/warning_stripes/blue{ - desc = "Куда же ведет эта лестница?"; - icon = 'icons/obj/structures.dmi'; - icon_state = "ladder11"; - name = "Ladder" - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 135; - teleport_y = 16; - teleport_z = 1; - mobs_only = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "lSR" = ( /obj/item/flag/wiz, /obj/machinery/light/small{ @@ -25293,6 +24636,32 @@ }, /turf/simulated/floor/carpet/cyan, /area/wizard_station) +"lSV" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellow" + }, +/area/centcom/specops) +"lSW" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/oxygen{ + maximum_pressure = 50000; + anchored = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluefull" + }, +/area/centcom/specops) "lTg" = ( /obj/effect/turf_decal{ dir = 10; @@ -25310,6 +24679,34 @@ }, /turf/simulated/floor/indestructible/abductor, /area/abductor_ship) +"lTX" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"lUp" = ( +/obj/machinery/door/airlock/external{ + frequency = 1331; + id_tag = "admin_s_inner"; + name = "Ship External Access"; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) +"lUK" = ( +/obj/effect/decal/warning_stripes/green/hollow, +/obj/effect/landmark/response_team, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "lVo" = ( /obj/structure/flora/rock/jungle, /obj/effect/turf_decal/siding/green{ @@ -25317,6 +24714,13 @@ }, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) +"lVD" = ( +/obj/structure/chair/sofa/corp/right, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" + }, +/area/centcom/specops) "lVM" = ( /obj/machinery/light{ dir = 1 @@ -25326,6 +24730,13 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership) +"lVT" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "lWc" = ( /obj/structure/chair/stool, /obj/effect/landmark/syndicate_spawn, @@ -25353,6 +24764,18 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/outside) +"lWt" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl2"; + name = "Armory level 2"; + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "lWx" = ( /obj/machinery/door/airlock/syndicate/medical{ name = "Медзона"; @@ -25383,21 +24806,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"lXe" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -8 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/wood, -/area/centcom/jail) "lXp" = ( /obj/effect/landmark/abductor/scientist{ team = 3 @@ -25428,18 +24836,6 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"lYx" = ( -/obj/structure/noticeboard{ - pixel_x = -32 - }, -/obj/item/paper{ - info = "Переговорить с ОЦК по поводу пиццы с ананасами" - }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "lYz" = ( /obj/machinery/light{ dir = 1 @@ -25450,13 +24846,15 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership) -"lYK" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 +"lYC" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "lYV" = ( /obj/effect/landmark/abductor/agent{ team = 3 @@ -25474,18 +24872,28 @@ /obj/structure/mineral_door, /turf/simulated/floor/carpet/black, /area/wizard_station) -"lZF" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredcorners" - }, -/area/centcom/specops) "lZM" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbluealtstrip" }, /area/centcom/zone2) +"lZV" = ( +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 5; + pixel_y = -2 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) +"mag" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/security_space_law, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "maj" = ( /obj/machinery/flasher_button{ id = "gulagshuttleflasher"; @@ -25522,14 +24930,54 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"maH" = ( -/obj/machinery/computer/security/telescreen/entertainment{ +"maJ" = ( +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 5; + pixel_y = -2 + }, +/obj/structure/railing{ + layer = 4.3; pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"mbb" = ( +/obj/machinery/power/apc{ + name = "Gamma Armory APC"; + pixel_y = -24 }, -/area/centcom/specops) +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/sign/securearea{ + pixel_x = -32 + }, +/obj/structure/closet/secure_closet/guncabinet, +/obj/item/gun/rocketlauncher, +/obj/item/ammo_casing/rocket, +/obj/item/ammo_casing/rocket, +/obj/item/ammo_casing/rocket, +/obj/item/kitchen/knife/combat, +/obj/item/kitchen/knife/combat, +/obj/item/kitchen/knife/combat, +/obj/item/grenade/chem_grenade/incendiary{ + name = "Incendiary Grenade" + }, +/obj/item/grenade/clusterbuster, +/obj/machinery/light/spot{ + dir = 8; + tag = "icon-tube1 (WEST)" + }, +/obj/item/gun/projectile/automatic/m52, +/obj/item/ammo_box/magazine/m52mag, +/obj/item/ammo_box/magazine/m52mag, +/obj/item/ammo_box/magazine/m52mag, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "mbd" = ( /turf/simulated/floor/plasteel{ icon_state = "warnwhite" @@ -25558,14 +25006,12 @@ icon_state = "dark" }, /area/centcom/evac) -"mbS" = ( -/obj/structure/table/glass, -/obj/item/book/manual/faxes, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 +"mbA" = ( +/obj/structure/chair/office/light{ + dir = 4 }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/turf/simulated/floor/engine, +/area/centcom/specops) "mbZ" = ( /obj/structure/table/wood, /obj/item/clothing/under/plasmaman/wizard, @@ -25612,27 +25058,12 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"mcF" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealt" - }, -/area/centcom/specops) "mcJ" = ( /turf/simulated/floor/wood{ icon_state = "wood-broken5"; tag = "icon-wood-broken5" }, /area/wizard_station) -"mcK" = ( -/obj/item/radio/intercom/specops{ - pixel_x = 30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "mcM" = ( /obj/machinery/door_control{ id = "soltradeship_south"; @@ -25645,6 +25076,12 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) +"mcX" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/centcom/evac) "mda" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -25688,17 +25125,6 @@ /obj/item/reagent_containers/iv_bag/blood/vox, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"mdx" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "mdF" = ( /obj/structure/table/wood, /obj/item/clothing/suit/wizrobe/magusblue, @@ -25713,6 +25139,30 @@ /obj/machinery/status_display, /turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal, /area/shuttle/escape) +"mdV" = ( +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + damage_deflection = 2000; + layer = 2.9; + name = "Frag grenade"; + req_access = list(114) + }, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/obj/item/grenade/frag, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "mdY" = ( /obj/machinery/door/airlock/command/glass{ name = "Escape Shuttle Cockpit"; @@ -25722,10 +25172,6 @@ icon_state = "dark" }, /area/shuttle/escape) -"mdZ" = ( -/obj/machinery/computer/shuttle/nt/drop_pod, -/turf/simulated/wall/shuttle, -/area/shuttle/nt_droppod) "meq" = ( /obj/structure/flora/junglebush, /turf/simulated/floor/indestructible/grass, @@ -25737,15 +25183,6 @@ /obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/wood, /area/centcom/evac) -"meF" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredalt" - }, -/area/centcom/jail) "meN" = ( /obj/structure/flora/grass/both, /obj/structure/flora/grass/both, @@ -25776,11 +25213,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"mfd" = ( -/obj/machinery/photocopier, -/obj/structure/table/wood, -/turf/simulated/floor/plating, -/area/centcom/zone2) "mfn" = ( /obj/structure/marker_beacon{ icon_state = "markerjade-on" @@ -25798,33 +25230,13 @@ /obj/structure/flora/junglebush/c, /turf/simulated/floor/indestructible/grass, /area/ninja/outside) -"mfB" = ( -/obj/effect/turf_decal/stripes/line{ - icon = 'icons/turf/floors.dmi'; - icon_state = "siding4" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 1; - icon_state = "rampbottom" - }, -/area/centcom/supply) +"mfP" = ( +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "mgd" = ( /obj/structure/chair/stool, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) -"mgz" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry_away"; - name = "centcom bay 2"; - turf_type = /turf/simulated/floor/plating/airless; - width = 5 - }, -/turf/simulated/floor/plating/airless, -/area/space) "mgC" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/pointybush, @@ -25862,6 +25274,43 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"mhA" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/sfg{ + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "mhN" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -25892,6 +25341,16 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) +"miN" = ( +/obj/structure/railing, +/obj/machinery/computer/communications, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "miW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -25929,14 +25388,20 @@ icon_state = "darkbluecorners" }, /area/centcom/zone1) -"mjU" = ( -/obj/machinery/light_construct/small{ - dir = 4 +"mjE" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 }, -/obj/machinery/computer/library/public, -/obj/structure/table/wood, -/turf/simulated/floor/plating, -/area/centcom/zone2) +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"mjR" = ( +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "mkb" = ( /obj/item/target, /obj/machinery/light/small{ @@ -25951,26 +25416,6 @@ tag = "icon-wood-broken5" }, /area/wizard_station) -"mkN" = ( -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/doctor, -/obj/item/storage/firstaid/doctor, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/toxin, -/obj/structure/rack, -/obj/structure/extinguisher_cabinet{ - name = "west extinguisher cabinet"; - pixel_x = -27 - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkbluealt" - }, -/area/centcom/specops) "mle" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/plasteel{ @@ -26028,25 +25473,6 @@ tag = "icon-wood-broken6" }, /area/wizard_station) -"mmo" = ( -/obj/effect/decal/warning_stripes/blue{ - desc = "Лестница в кабинет СОО"; - icon = 'icons/obj/structures.dmi'; - icon_state = "ladder10"; - name = "Ladder" - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 203; - teleport_y = 41; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredaltstrip" - }, -/area/centcom/jail) "mmD" = ( /obj/item/target, /obj/machinery/light/small{ @@ -26067,14 +25493,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"mnt" = ( -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "mnI" = ( /obj/structure/chair/comfy/brown{ color = "#FF3300"; @@ -26082,10 +25500,47 @@ }, /turf/simulated/floor/carpet/red, /area/ussp_centcom/secretariat) +"mnL" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DEDI" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "mnX" = ( /obj/machinery/door/window/brigdoor, /turf/simulated/floor/carpet/black, /area/centcom/specops) +"mog" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 1 + }, +/obj/structure/shuttle/engine/platform{ + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) +"moN" = ( +/obj/effect/turf_decal/caution/stand_clear/white, +/obj/machinery/door/poddoor/impassable/unhittable{ + id_tag = "CC_Players_In"; + name = "Blast Door" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone1) "moS" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -26115,13 +25570,58 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) -"mpv" = ( -/obj/effect/turf_decal/caution/stand_clear{ - pixel_x = 16 +"mpj" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2 }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellowaltstrip" + dir = 1; + icon_state = "darkbluealt" + }, +/area/centcom/zone2) +"mpo" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/obj/structure/table/reinforced, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, +/obj/item/holosign_creator/atmos, +/obj/item/holosign_creator/atmos, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealt" + }, +/area/centcom/specops) +"mpt" = ( +/obj/structure/falsewall/reinforced, +/obj/effect/decal/warning_stripes/blue{ + desc = "Куда же ведет эта лестница?"; + icon = 'icons/obj/structures.dmi'; + icon_state = "ladder11"; + name = "Ladder" + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 135; + teleport_y = 16; + teleport_z = 1; + mobs_only = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, /area/centcom/specops) "mpN" = ( @@ -26142,6 +25642,30 @@ /obj/structure/flora/junglebush/c, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"mpW" = ( +/obj/structure/bed, +/obj/item/bedsheet/rd, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone1) +"mqd" = ( +/obj/effect/turf_decal/siding/white/corner, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) +"mqo" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "mqp" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/curtain/black{ @@ -26204,14 +25728,30 @@ icon_state = "dark" }, /area/centcom/jail) -"mqN" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/gamma) +"mqL" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 8; + id_tag = "CC_supply_external"; + layer = 5; + locked = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "mqU" = ( /obj/machinery/computer/library/checkout, /obj/structure/table/wood, /turf/simulated/floor/carpet/black, /area/wizard_station) +"mrg" = ( +/obj/machinery/door/window/brigdoor{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) "mrm" = ( /obj/machinery/vending/magivend, /obj/machinery/light/small{ @@ -26222,25 +25762,6 @@ }, /turf/simulated/floor/carpet/black, /area/wizard_station) -"mro" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ - dir = 4 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "mrA" = ( /obj/structure/table/wood, /obj/item/grenade/smokebomb{ @@ -26256,10 +25777,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"mrP" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, -/area/shuttle/siberia) "mrX" = ( /obj/machinery/computer/cryopod{ pixel_x = 32; @@ -26318,14 +25835,14 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"msS" = ( -/mob/living/carbon/human/lesser/wolpin, +"msO" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = -30 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "tatami"; - name = "Tatami" + icon_state = "dark" }, -/area/ninja/outpost) +/area/centcom/zone3) "msY" = ( /obj/machinery/vending/snack/free, /turf/simulated/floor/carpet/black, @@ -26367,20 +25884,20 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/infteam) -"mtY" = ( -/obj/structure/table/glass, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) -"mue" = ( -/obj/structure/window/reinforced{ +"mud" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/item/pen, +/obj/machinery/door/window/brigdoor{ dir = 8 }, -/obj/structure/filingcabinet, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) "muh" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -26420,24 +25937,6 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"muR" = ( -/obj/machinery/door/poddoor{ - id_tag = "CC_supply_space"; - locked = 2; - name = "Supply Blastdoor" - }, -/obj/structure/fans/tiny, -/obj/effect/decal/warning_stripes/white, -/obj/machinery/door/airlock/external{ - id_tag = "supply_away"; - name = "Central Command Supply"; - req_access = list(31); - hackProof = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "muU" = ( /obj/structure/table/wood, /obj/effect/landmark/teleport_scroll, @@ -26452,15 +25951,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/infteam) -"mve" = ( -/obj/machinery/bodyscanner{ - dir = 4; - layer = 3.5 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) "mvo" = ( /obj/structure/bed, /obj/item/bedsheet/wiz, @@ -26477,11 +25967,20 @@ }, /turf/simulated/floor/carpet/cyan, /area/wizard_station) -"mvz" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 +"mvM" = ( +/obj/structure/urinal{ + pixel_y = 32 + }, +/obj/machinery/door_control/secure{ + id = "CC_toilet_unit2"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_x = 25 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/carpet, /area/centcom/evac) "mvQ" = ( /obj/structure/window/reinforced{ @@ -26492,33 +25991,37 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone2) -"mvV" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 10; - pixel_x = -1; - pixel_y = -1 - }, -/obj/structure/window/reinforced{ - layer = 3.1; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) +"mwf" = ( +/turf/simulated/floor/carpet/red, +/area/ussp_centcom/secretariat) +"mwq" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellow" + icon_state = "dark" }, /area/centcom/specops) -"mwf" = ( -/turf/simulated/floor/carpet/red, -/area/ussp_centcom/secretariat) "mxj" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkredaltstrip" }, /area/centcom/jail) +"mxz" = ( +/obj/machinery/door/poddoor{ + id_tag = "ASSAULT1"; + name = "Launch Bay #1" + }, +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "mxA" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -26532,21 +26035,13 @@ icon_state = "dark" }, /area/centcom/jail) -"mxT" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater2x2_side"; - tag = "icon-heater (NORTH)" +"mxY" = ( +/obj/machinery/computer/shuttle/ferry, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkyellowalt" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) +/area/centcom/zone3) "myg" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -26595,6 +26090,12 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) +"myL" = ( +/obj/structure/closet/secure_closet/clown{ + req_access = list() + }, +/turf/simulated/floor/mineral/bananium, +/area/centcom/specops) "myX" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo18" @@ -26602,6 +26103,15 @@ /obj/effect/turf_decal/stripes/black, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) +"mze" = ( +/obj/machinery/computer/account_database, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "mzk" = ( /obj/machinery/computer/shuttle/syndicate/recall, /turf/simulated/floor/plasteel{ @@ -26631,6 +26141,23 @@ icon_state = "navybluealtstrip" }, /area/centcom/specops) +"mzH" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + frequency = 2000; + id_tag = "CC-OP3"; + name = "Access Controller OP3"; + pixel_y = 32; + req_access = list(109); + tag_exterior_door = "CC-OP3-Ext"; + tag_interior_door = "CC-OP3-Int" + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone3) "mzI" = ( /obj/machinery/door/poddoor/multi_tile/two_tile_hor{ icon_state = "open"; @@ -26649,35 +26176,6 @@ /obj/item/deck/cards/black, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"mzT" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 4; - id = "ruins_civil_shuttle"; - name = "Regular Civilian Shuttle"; - rebuildable = 1; - roundstart_move = "spacebar"; - width = 6 - }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 5; - id = "ruins_civil_shuttle_transit"; - name = "Regular Civilian Shuttle in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 8 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/spacebar) "mzU" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -26687,15 +26185,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"mAt" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/siding/brown/corner{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "mAw" = ( /obj/structure/chair/sofa{ dir = 8 @@ -26717,6 +26206,21 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/elite_squad) +"mBi" = ( +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater2x2_side"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "mBj" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -26726,26 +26230,12 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"mBl" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/machinery/vending/clothing/departament/security, -/turf/simulated/floor/wood, -/area/centcom/jail) "mBE" = ( /obj/item/flag/species/human, /turf/simulated/floor/wood{ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"mBF" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" - }, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) "mBV" = ( /obj/item/gun/projectile/automatic/sniper_rifle{ desc = "Оружие с потёртой надписью 'Коатс' и нечитаемыми каракулями возле неё."; @@ -26755,6 +26245,19 @@ icon_state = "darkfull" }, /area/syndicate_mothership/infteam) +"mCa" = ( +/obj/machinery/door_control/secure{ + color = "#ff9999"; + id = "ERT_armory_lvl3"; + name = "ERT Armory Level 3"; + pixel_y = 32; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/centcom/specops) "mCb" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -26778,20 +26281,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/elite_squad) -"mCD" = ( -/obj/docking_port/stationary{ - area_type = /area/ninja/outside; - dheight = 2; - dir = 2; - dwidth = 4; - height = 10; - id = "ombra_home"; - name = "Spider Clan Facility"; - turf_type = /turf/simulated/floor/indestructible/snow; - width = 21 - }, -/turf/simulated/floor/indestructible/snow, -/area/ninja/outside) "mCG" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/grass/jungle, @@ -26817,12 +26306,6 @@ icon_state = "white" }, /area/centcom/specops) -"mCX" = ( -/obj/structure/shuttle/engine/large{ - dir = 4 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/trade/sol) "mDk" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -26831,6 +26314,18 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/elite_squad) +"mDq" = ( +/obj/structure/toilet{ + dir = 4; + name = "Трон старшего администратора" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/evac) "mDs" = ( /obj/structure/window/reinforced{ dir = 8 @@ -26846,6 +26341,36 @@ icon_state = "barber" }, /area/centcom/zone1) +"mDL" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 2; + id_tag = "CC_supply_internal2"; + layer = 5; + locked = 1 + }, +/obj/machinery/door_control/secure{ + id = "CC_supply_internal2"; + name = "Supply External Shutters"; + req_access = list(114); + pixel_x = -24 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) +"mDU" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "mDW" = ( /obj/structure/chair/sofa/left{ dir = 1 @@ -26869,13 +26394,10 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"mEe" = ( -/obj/machinery/computer/secure_data, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) +"mEh" = ( +/obj/structure/chair/comfy/purp, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "mEm" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; @@ -26904,13 +26426,6 @@ icon_state = "grimy" }, /area/syndicate_mothership/elite_squad) -"mER" = ( -/obj/machinery/computer/communications, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "mES" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -26987,11 +26502,25 @@ /obj/structure/table/reinforced, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) +"mFD" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navyblue" + }, +/area/centcom/specops) "mFG" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/vermouth, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) +"mFU" = ( +/obj/machinery/light, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "mGd" = ( /obj/machinery/light/small{ dir = 4 @@ -27004,6 +26533,15 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) +"mGx" = ( +/obj/machinery/newscaster{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealt" + }, +/area/centcom/specops) "mGy" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -27029,20 +26567,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"mGC" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 4; - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" - }, -/area/shuttle/administration) "mGD" = ( /obj/machinery/door/poddoor{ density = 0; @@ -27113,12 +26637,6 @@ /obj/item/clothing/suit/straight_jacket, /turf/simulated/floor/plating, /area/centcom/specops) -"mIN" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkgreen" - }, -/area/centcom/specops) "mIR" = ( /obj/structure/chair/sofa/left{ dir = 8 @@ -27162,6 +26680,15 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"mKh" = ( +/obj/machinery/status_display{ + pixel_y = -32 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "mKw" = ( /obj/machinery/light/spot, /obj/structure/rack/holorack, @@ -27186,28 +26713,6 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) -"mKI" = ( -/obj/structure/flora/ausbushes/stalkybush, -/obj/item/gun/projectile/automatic/pistol{ - layer = 2.9 - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 85; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' - }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, -/area/centcom/specops) -"mLo" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "mLJ" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -27243,6 +26748,16 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"mMf" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/beach/sand{ + icon = 'icons/turf/floors.dmi'; + icon_state = "asteroid" + }, +/area/centcom/evac) "mMj" = ( /obj/structure/sign/poster/contraband/smoke{ pixel_x = -32 @@ -27264,73 +26779,30 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"mMp" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 2; - id_tag = "CC_supply_internal2"; - layer = 5; - locked = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) -"mNh" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/storage/toolbox/surgery, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) +"mMn" = ( +/obj/structure/window/full/shuttle, +/obj/structure/grille, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/siberia) "mNj" = ( /turf/simulated/wall/indestructible/rock, /area/space) -"mNl" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/coffee, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"mNz" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1; - do_not_delete_me = 1 - }, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - dir = 1; - id_tag = "ERT_armory_vkd"; - name = "Armory level 1" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "mNB" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/infteam) -"mNH" = ( -/obj/machinery/sleeper/upgraded{ - dir = 4 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" +"mNK" = ( +/obj/structure/rack, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/item/ammo_box/shotgun/buck, +/obj/effect/decal/warning_stripes/blue/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/administration) +/area/centcom/specops) "mNY" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -27344,6 +26816,14 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/infteam) +"mOu" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "mOA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -27352,17 +26832,26 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"mOM" = ( -/obj/structure/chair/comfy/lime, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2 +"mOD" = ( +/obj/structure/table/glass, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 }, -/obj/structure/window/reinforced{ - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/wood, /area/centcom/zone3) +"mOZ" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 2; + id_tag = "ERT_director_office_shutters2"; + layer = 5; + locked = 1; + name = "CentCom SOO Briefing" + }, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/specops) "mPc" = ( /obj/effect/turf_decal{ dir = 10; @@ -27370,6 +26859,12 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"mPi" = ( +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "mPk" = ( /obj/structure/fence{ color = "#b0b7c6"; @@ -27377,16 +26872,28 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"mPs" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/obj/structure/window/reinforced{ - dir = 8 +"mPp" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/iv_bag/salglu, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/nitrogen, +/obj/item/tank/internals/emergency_oxygen/plasma, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluealt" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_4) +/area/centcom/specops) "mPI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -27403,6 +26910,12 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"mQg" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/zone2) "mQp" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -27431,6 +26944,13 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"mQQ" = ( +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/light_construct/small{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) "mRs" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ppflowers, @@ -27446,23 +26966,29 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"mRL" = ( -/obj/item/twohanded/required/kirbyplants, +"mRR" = ( +/obj/item/radio/intercom/specops{ + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkred" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/bridge) "mRT" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"mSi" = ( +"mRX" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"mSp" = ( +/obj/item/flag/nt, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navyblue" + dir = 10; + icon_state = "navybluealt" }, /area/centcom/specops) "mSv" = ( @@ -27483,44 +27009,21 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/carpet/red, /area/ussp_centcom/secretariat) -"mSy" = ( -/obj/structure/chair/comfy/beige{ - dir = 8; - layer = 5; - pixel_y = -2 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "mSB" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/elite_squad) -"mSD" = ( -/obj/structure/railing, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/specops) -"mSE" = ( -/obj/structure/chair/sofa/right, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/arcade, -/area/centcom/zone1) "mSF" = ( /turf/simulated/floor/plasteel{ icon_state = "darkredcornersalt" }, /area/syndicate_mothership/jail) -"mSP" = ( -/obj/machinery/vending/security/ert{ - pixel_y = 32 - }, +"mSG" = ( /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealt" + dir = 10; + icon_state = "navyblue" }, /area/centcom/specops) "mST" = ( @@ -27567,27 +27070,28 @@ icon_state = "navybluealtstrip" }, /area/centcom/specops) +"mTD" = ( +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkbluealtstrip" + }, +/area/centcom/zone2) "mUc" = ( /obj/effect/decal/warning_stripes/white, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/bridge) -"mUg" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 10; - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 5; - do_not_delete_me = 1; - icon_state = "bs_deadlock" +"mUi" = ( +/obj/machinery/vending/wallmed{ + pixel_y = -32; + pixel_x = -32 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowalt" }, -/area/shuttle/administration) +/area/centcom/zone3) "mUu" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/grass/jungle/b, @@ -27610,13 +27114,6 @@ tag = "icon-stage_stairs" }, /area/centcom/specops) -"mUU" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "mUV" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized{ @@ -27639,17 +27136,39 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"mVk" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full" +"mVe" = ( +/obj/item/gun/projectile/automatic/l6_saw{ + desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; + name = "M249 SAW" + }, +/obj/item/gun/projectile/automatic/l6_saw{ + desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; + name = "M249 SAW" + }, +/obj/item/gun/projectile/automatic/l6_saw{ + desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; + name = "M249 SAW" + }, +/obj/item/gun/projectile/automatic/l6_saw{ + desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; + name = "M249 SAW" + }, +/obj/item/gun/projectile/automatic/l6_saw{ + desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; + name = "M249 SAW" + }, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + layer = 2.9; + name = "LMG M249 SAW"; + req_access = list(114) }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" + dir = 4; + icon_state = "vault" }, -/area/centcom/specops) +/area/centcom/jail) "mVo" = ( /obj/structure/rack/holorack, /obj/item/storage/belt/chameleon{ @@ -27696,17 +27215,6 @@ icon_state = "neutral" }, /area/centcom/evac) -"mVN" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "mVX" = ( /turf/space, /area/space) @@ -27728,53 +27236,120 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"mWW" = ( -/obj/machinery/light{ - dir = 1 +"mWR" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/head/beret/atmos{ + name = "beret" }, -/obj/effect/turf_decal/stripes/black{ - do_not_delete_me = 1 +/obj/item/clothing/head/beret/atmos{ + name = "beret" }, -/obj/effect/turf_decal/stripes/black{ - dir = 1; - do_not_delete_me = 1 +/obj/item/clothing/head/beret/ce{ + name = "beret" }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" +/obj/item/clothing/head/beret/ce{ + name = "beret" }, -/area/shuttle/administration) -"mXc" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Medbay"; - opacity = 1; - req_access = list(101) +/obj/item/clothing/head/beret/centcom/captain{ + name = "beret" }, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 +/obj/item/clothing/head/beret/centcom/captain{ + name = "beret" }, -/obj/effect/turf_decal/stripes/black{ +/obj/item/clothing/head/beret/centcom/officer{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + name = "beret" + }, +/obj/item/clothing/head/beret/durathread{ + name = "beret" + }, +/obj/item/clothing/head/beret/durathread{ + name = "beret" + }, +/obj/item/clothing/head/beret/eng{ + name = "beret" + }, +/obj/item/clothing/head/beret/eng{ + name = "beret" + }, +/obj/item/clothing/head/beret/elo{ + name = "beret" + }, +/obj/item/clothing/head/beret/elo{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sparkyninja_beret{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/clothing/head/fedora, +/obj/item/clothing/head/fedora, +/obj/item/clothing/head/fedora{ + icon_state = "wfedora" + }, +/obj/item/clothing/head/fedora{ + icon_state = "wfedora" + }, +/obj/item/clothing/head/beret/purple{ + name = "beret" + }, +/obj/item/clothing/head/beret/purple{ + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "beret_hos_black"; + name = "beret" + }, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "beret_hos_black"; + name = "beret" + }, +/obj/structure/window/reinforced{ dir = 4; - do_not_delete_me = 1 + layer = 2.9 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/administration) +/area/centcom/supply) "mXf" = ( /obj/machinery/bsa/full/admin/east, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plating, /area/centcom/specops) -"mXF" = ( -/obj/structure/closet/secure_closet/clown{ - req_access = list() +"mXv" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 }, -/turf/simulated/floor/mineral/bananium, -/area/centcom/specops) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "mXR" = ( /obj/item/kitchen/utensil/fork{ pixel_x = 7 @@ -27822,10 +27397,13 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"mYC" = ( +"mYz" = ( +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/storage/toolbox/surgery, +/obj/structure/table/glass, +/obj/item/scalpel/laser/manager, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkbluealt" + icon_state = "white" }, /area/centcom/specops) "mYE" = ( @@ -27836,94 +27414,46 @@ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) +"mYF" = ( +/obj/machinery/tcomms/relay/cc, +/turf/simulated/floor/bluegrid, +/area/centcom/bridge) "mYH" = ( /obj/structure/chair/sofa{ dir = 4 }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"mYP" = ( -/obj/structure/falsewall/reinforced{ - req_access = list(114); - layer = 5 - }, -/turf/simulated/floor/fakespace, -/area/centcom/specops) -"mYX" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"mZi" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "CO2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"mZl" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +"mYM" = ( +/obj/structure/bookcase, +/obj/item/book/manual/security_space_law/black, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/obj/item/book/manual/security_space_law, +/turf/simulated/floor/carpet, +/area/centcom/jail) +"mZk" = ( +/obj/item/paper_bin/nanotrasen, +/obj/structure/table/wood, +/turf/simulated/floor/plating, +/area/centcom/zone2) "mZo" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plating, /area/centcom/specops) +"mZp" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkredaltstrip" + }, +/area/centcom/specops) "mZB" = ( /turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/elite_squad) -"mZS" = ( -/turf/simulated/floor/lava/lava_land_surface, -/area/ruin/space/bubblegum_arena) "nae" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, /area/centcom/zone1) -"nai" = ( -/obj/machinery/door/airlock/hatch{ - aiControlDisabled = 1; - frequency = 1331; - hackProof = 1; - id_tag = "vox_northeast_lock"; - locked = 1; - req_access = list(152) - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; - pixel_x = 28; - req_access = list(152); - wires = 1 - }, -/obj/docking_port/mobile{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack"; - name = "Vox Skipjack"; - roundstart_move = "skipjack_away"; - width = 19 - }, -/obj/docking_port/stationary/transit{ - dir = 2; - dwidth = 2; - height = 18; - id = "skipjack_transit"; - name = "skipjack in transit"; - pixel_y = 32; - turf_type = /turf/space/transit/north; - width = 19 - }, -/obj/structure/fans/tiny, -/turf/simulated/floor/shuttle/plating/vox, -/area/shuttle/vox) "nak" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 @@ -27942,23 +27472,35 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"naX" = ( -/obj/machinery/computer/shuttle/ert{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - req_access = list(109) +"naI" = ( +/obj/structure/reagent_dispensers/spacecleanertank{ + pixel_x = -32 }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +/turf/simulated/floor/indestructible{ + dir = 8; + icon_state = "darkpurple" }, -/obj/item/radio/intercom/specops{ - pixel_x = 30 +/area/centcom/specops) +"naM" = ( +/obj/effect/decal/remains, +/obj/effect/turf_decal/tile/neutral{ + alpha = 100; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' }, -/turf/simulated/floor/plasteel{ +/obj/item/fish/goldfish{ + pixel_y = 10; + pixel_x = 16 + }, +/obj/structure/window/reinforced/survival_pod{ dir = 5; - icon_state = "navybluealt" + pixel_x = -32; + pixel_y = -32; + density = 0 }, -/area/centcom/specops) +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/area/centcom/zone2) "nbp" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/syndicate, @@ -27971,11 +27513,6 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"nbA" = ( -/turf/space/transit/west{ - icon_state = "black" - }, -/area/space) "nbC" = ( /obj/structure/table/reinforced, /obj/machinery/photocopier/faxmachine/longrange/syndie{ @@ -27990,6 +27527,20 @@ /obj/item/storage/box/emps, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"nbP" = ( +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching the Special Ops."; + name = "Special Ops. Monitor"; + network = list("ERT"); + pixel_x = -32 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nbV" = ( /obj/machinery/door/window/brigdoor{ color = "red"; @@ -28013,11 +27564,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"ncc" = ( -/turf/simulated/floor/indestructible{ - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) "ncp" = ( /obj/machinery/vending/snack, /obj/structure/closet/hydrant{ @@ -28033,6 +27579,28 @@ icon_state = "fancy-wood-cherry" }, /area/ninja/outpost) +"ncv" = ( +/turf/simulated/floor/indestructible{ + icon_state = "darkgreynavybluecorner" + }, +/area/centcom/specops) +"ncA" = ( +/obj/machinery/door/airlock/centcom{ + aiControlDisabled = 1; + hackProof = 1; + name = "Special ReactionTeam"; + opacity = 1; + req_access = list(114) + }, +/obj/effect/turf_decal/delivery/white, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_SRT1" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "ncB" = ( /obj/effect/decal/cleanable/blood, /obj/machinery/flasher{ @@ -28100,36 +27668,16 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"ndg" = ( -/obj/machinery/dna_scannernew/upgraded, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"nef" = ( -/obj/mecha/combat/durand/loaded{ - operation_req_access = list(1) - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/mech, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) -"neo" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 1 +"ndF" = ( +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_Grenade" }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet, -/area/centcom/zone2) +/area/centcom/specops) "neu" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/structure/sign/bobross{ @@ -28146,10 +27694,20 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nev" = ( -/obj/item/flag/nt, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) +"neK" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/holohoop, +/obj/effect/decal/warning_stripes/green/hollow, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "neS" = ( /obj/structure/table/wood/fancy/black, /turf/simulated/floor/carpet/black, @@ -28167,19 +27725,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nfo" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/conveyor{ - id = "CO2"; - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide{ - maximum_pressure = 50000 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "nfE" = ( /obj/machinery/vending/dinnerware, /turf/simulated/floor/plating{ @@ -28218,6 +27763,20 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) +"nfR" = ( +/obj/structure/bed/dogbed/ian{ + name = "Lounger"; + pixel_x = -2 + }, +/mob/living/simple_animal/pet/dog/fox/alisa{ + pixel_x = -2 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nge" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/curtain/black{ @@ -28231,6 +27790,13 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) +"ngi" = ( +/obj/structure/table/glass, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellow" + }, +/area/centcom/specops) "ngk" = ( /obj/structure/table, /obj/item/storage/fancy/crayons, @@ -28252,23 +27818,17 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"ngB" = ( -/obj/structure/sign/poster/contraband/hacking_guide{ - pixel_x = -32 +"ngL" = ( +/obj/machinery/computer/station_alert, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellow" +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"ngT" = ( -/obj/machinery/status_display/supply_display{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "ngX" = ( /obj/machinery/light/small{ dir = 1 @@ -28307,6 +27867,13 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"nig" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/coatrack, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) "niV" = ( /obj/item/grenade/spawnergrenade/manhacks, /turf/simulated/floor/plasteel{ @@ -28338,6 +27905,23 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"njh" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 9; + pixel_y = 1; + pixel_x = -1; + density = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navybluealt" + }, +/area/centcom/specops) "njt" = ( /obj/effect/turf_decal/tile{ alpha = 128; @@ -28388,10 +27972,24 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership/infteam) -"njL" = ( -/obj/effect/turf_decal/stripes/gold, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +"njO" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1; + pixel_y = 3 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"njW" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navyblue" + }, +/area/centcom/specops) "njZ" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -28421,20 +28019,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership/infteam) -"nli" = ( -/obj/docking_port/stationary/transit{ - dheight = 10; - dir = 8; - height = 30; - id = "freegolem_transit"; - name = "free golem in transit"; - pixel_x = 32; - width = 20 - }, -/turf/space/transit/west{ - icon_state = "black" - }, -/area/space) "nlx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -28477,13 +28061,15 @@ icon_state = "white" }, /area/centcom/jail) -"nmw" = ( -/turf/simulated/floor/plating, -/area/syndicate_mothership/infteam) -"nmT" = ( -/obj/structure/closet/coffin, -/turf/simulated/floor/plating, -/area/centcom/zone2) +"nmE" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkyellow" + }, +/area/centcom/specops) "nnb" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -28491,17 +28077,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership/infteam) -"nnf" = ( -/obj/structure/closet/wardrobe/red, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/storage/box/holobadge, -/turf/simulated/floor/wood, -/area/centcom/jail) "nnl" = ( /obj/effect/turf_decal/tile{ alpha = 128; @@ -28548,41 +28123,59 @@ "nnz" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/supply) -"nov" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister/sleeping_agent{ - maximum_pressure = 50000 +"nnM" = ( +/obj/machinery/recharge_station/ert, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/window/reinforced{ - color = "red" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, +/area/centcom/specops) +"nnN" = ( +/obj/effect/turf_decal/siding/white/corner, /turf/simulated/floor/plasteel{ - dir = 1; icon_state = "dark" }, -/area/syndicate_mothership/cargo) -"noJ" = ( -/obj/item/stack/sheet/metal, -/obj/structure/table, -/obj/item/stack/sheet/glass{ - pixel_x = 4; - pixel_y = 4 +/area/centcom/jail) +"nnW" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/item/gun/energy/gun/nuclear{ + pixel_x = -6 }, -/obj/item/stack/sheet/metal, -/obj/item/stack/sheet/metal, -/obj/item/stack/sheet/glass{ - pixel_x = 4; - pixel_y = 4 +/obj/item/gun/energy/gun/nuclear{ + pixel_x = -6 }, -/obj/item/stack/sheet/glass{ - pixel_x = 4; - pixel_y = 4 +/obj/item/gun/energy/gun/nuclear{ + pixel_x = -6 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; +/obj/item/gun/energy/gun/nuclear{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/nuclear{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/nuclear{ + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/shuttle/administration) +/area/centcom/specops) +"nov" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/sleeping_agent{ + maximum_pressure = 50000 + }, +/obj/structure/window/reinforced{ + color = "red" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "dark" + }, +/area/syndicate_mothership/cargo) "noN" = ( /obj/effect/turf_decal{ dir = 9; @@ -28594,15 +28187,33 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"noS" = ( -/obj/structure/window/reinforced, -/obj/structure/sign/poster/official/random{ - pixel_y = -30 +"noY" = ( +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealtstrip" + }, +/area/centcom/specops) +"npl" = ( +/obj/structure/railing{ + dir = 8; + pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/area/centcom/evac) +/area/centcom/specops) +"npn" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" + }, +/area/shuttle/administration) "npt" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo15" @@ -28613,16 +28224,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"npL" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id_tag = "adminshuttleshutters"; - name = "Blast Shutters" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "npO" = ( /obj/effect/turf_decal/delivery, /obj/machinery/portable_atmospherics/canister/air{ @@ -28636,44 +28237,12 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"nqj" = ( -/obj/effect/decal/warning_stripes/white, -/obj/machinery/door/airlock{ - id_tag = "CC_toilet_unit1"; - name = "Toilet" - }, -/obj/effect/mine/sound/bwoink, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "nql" = ( /obj/structure/chair/sofa/corp{ dir = 1 }, /turf/simulated/floor/wood, /area/centcom/zone1) -"nqn" = ( -/obj/machinery/chem_dispenser/soda/upgraded, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" - }, -/area/centcom/specops) -"nqF" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_DURAND"; - name = "DURAND"; - pixel_x = 24; - pixel_y = 32; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredcorners" - }, -/area/centcom/specops) "nqS" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -28687,15 +28256,6 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"nqT" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/indestructible{ - dir = 6; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) "nqX" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -28703,9 +28263,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership/elite_squad) -"nqY" = ( -/turf/simulated/floor/plating, -/area/syndicate_mothership/elite_squad) "nra" = ( /obj/machinery/light/small{ dir = 1 @@ -28718,14 +28275,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"nre" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - id = "QMLoad2"; - dir = 8 - }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/supply) "nrg" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -28746,14 +28295,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nrO" = ( -/obj/structure/closet/secure_closet/reagents, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/engine, -/area/centcom/specops) "nrP" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -28769,6 +28310,30 @@ icon_state = "light-fancy-wood" }, /area/syndicate_mothership/control) +"nrV" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/hatch{ + name = "NVT Argos"; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) +"nsd" = ( +/obj/machinery/door/airlock/command/glass{ + frequency = 2000; + icon_state = "open"; + id_tag = "CC-OP3-Int"; + locked = 1; + name = "Zone 2" + }, +/obj/effect/decal/warning_stripes/blue, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "nsg" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/plating{ @@ -28798,6 +28363,11 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) +"nsM" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkgreencorners" + }, +/area/centcom/specops) "nsV" = ( /obj/machinery/conveyor_switch/oneway{ id = "SFBQMLoad2"; @@ -28807,25 +28377,6 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) -"ntc" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/beakers/bluespace, -/obj/item/reagent_scanner/adv, -/obj/structure/sink{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/centcom/specops) -"ntq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "ntx" = ( /obj/machinery/button/windowtint{ id = "SSTprivateroom"; @@ -28854,8 +28405,18 @@ }, /area/centcom/evac) "ntN" = ( -/turf/simulated/floor/indestructible{ - icon_state = "darkgreynavybluecorner" +/obj/effect/decal/warning_stripes/northwestsouth, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + dir = 1; + id_tag = "ERT_armory_vkd"; + name = "Armory level 1" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, /area/centcom/specops) "ntS" = ( @@ -28873,10 +28434,10 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"nuh" = ( +"nug" = ( +/obj/machinery/recharge_station/ert, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealtstrip" + icon_state = "dark" }, /area/centcom/specops) "nus" = ( @@ -28915,42 +28476,11 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/mining) -"nuF" = ( -/obj/structure/railing{ - dir = 8; - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) "nuI" = ( /obj/effect/mapping_helpers/light, /obj/structure/flora/grass/jungle/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"nuQ" = ( -/obj/structure/falsewall/reinforced, -/obj/effect/decal/warning_stripes/blue{ - desc = "Куда же ведет эта лестница?"; - icon = 'icons/obj/structures.dmi'; - icon_state = "ladder11"; - name = "Ladder" - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 135; - teleport_y = 16; - teleport_z = 1; - mobs_only = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "nuU" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized{ @@ -28978,12 +28508,35 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"nve" = ( +/obj/structure/sign/nosmoking_2{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "nvh" = ( /obj/structure/table/wood{ color = "#996633" }, /turf/simulated/floor/carpet/black, /area/trader_station/sol) +"nvm" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "nvA" = ( /obj/structure/sink/kitchen{ dir = 4; @@ -28995,16 +28548,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nvB" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/shuttle/transport) -"nvQ" = ( -/obj/structure/table/wood, -/obj/item/storage/pill_bottle/dice, -/turf/simulated/floor/carpet, -/area/centcom/evac) "nvU" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -29025,11 +28568,11 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nwb" = ( -/obj/structure/table/reinforced, -/obj/item/deck/cards, +"nwq" = ( +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "navyblue" + dir = 9; + icon_state = "darkredalt" }, /area/centcom/specops) "nwZ" = ( @@ -29040,16 +28583,6 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nxa" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_1) "nxD" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/window/full/basic, @@ -29068,12 +28601,6 @@ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) -"nyg" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkredaltstrip" - }, -/area/centcom/zone2) "nyl" = ( /obj/effect/mapping_helpers/light, /turf/simulated/floor/plating/asteroid{ @@ -29091,6 +28618,15 @@ icon_state = "white" }, /area/centcom/jail) +"nyy" = ( +/obj/machinery/vending/snack, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "nyA" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -29140,16 +28676,16 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"nzI" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_1) +"nzq" = ( +/obj/structure/coatrack, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"nzx" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_legal, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nzK" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -29198,6 +28734,18 @@ /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"nBb" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 + }, +/obj/structure/showcase{ + layer = 4.2; + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nBf" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -29225,6 +28773,14 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"nBl" = ( +/obj/machinery/computer/camera_advanced, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nBq" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/curtain/black{ @@ -29232,6 +28788,12 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"nBB" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealtstrip" + }, +/area/centcom/supply) "nBC" = ( /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; @@ -29246,6 +28808,23 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/specops) +"nCb" = ( +/obj/structure/table/glass, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen/multi/fountain, +/obj/item/lighter/zippo/blue{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/turf/simulated/floor/carpet, +/area/centcom/specops) "nCm" = ( /obj/machinery/smartfridge/dish{ opacity = 1 @@ -29263,6 +28842,10 @@ icon_state = "white" }, /area/centcom/zone1) +"nCx" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "nCA" = ( /obj/machinery/door/airlock/centcom{ damage_deflection = 999; @@ -29326,32 +28909,6 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"nDt" = ( -/obj/machinery/vending/medical, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) -"nDw" = ( -/obj/structure/closet/secure_closet/cabinet/bar{ - req_access = list() - }, -/obj/item/storage/box/beakers/bluespace, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/storage/box/drinkingglasses, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "nDx" = ( /obj/structure/table/wood, /obj/structure/sign/nosmoking_2{ @@ -29367,13 +28924,20 @@ /obj/item/lighter/zippo/gonzofist, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"nDI" = ( -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/beach/sand{ - icon = 'icons/turf/floors.dmi'; - icon_state = "asteroid" +"nDz" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, +/obj/item/reagent_containers/food/snacks/grown/citrus/lime, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"nDM" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 }, -/area/centcom/evac) +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "nEp" = ( /obj/structure/table/wood/poker, /obj/item/deck/cards/syndicate{ @@ -29389,6 +28953,13 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) +"nEJ" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/machinery/vending/clothing/departament/security, +/turf/simulated/floor/wood, +/area/centcom/jail) "nEN" = ( /obj/effect/baseturf_helper/asteroid/snow{ baseturf = /turf/simulated/floor/indestructible/snow; @@ -29396,13 +28967,12 @@ }, /turf/simulated/wall/indestructible/reinforced/rusted, /area/ninja/holding) -"nFb" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" +"nEQ" = ( +/obj/machinery/computer/crew, +/obj/effect/turf_decal/siding{ + color = "#444444" }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "nFg" = ( /obj/effect/turf_decal/siding/wood{ @@ -29416,27 +28986,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"nFn" = ( -/obj/machinery/light/spot{ - dir = 8; - tag = "icon-tube1 (WEST)" - }, -/obj/machinery/door_control{ - id = "QMLoaddoor"; - layer = 3; - name = "Loading Doors"; - pixel_x = -24; - pixel_y = -8 - }, -/obj/machinery/door_control{ - id = "QMLoaddoor2"; - layer = 3; - name = "Loading Doors"; - pixel_x = -24; - pixel_y = 8 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/supply) "nFv" = ( /obj/structure/chair/comfy/shuttle/dark, /obj/machinery/light/spot{ @@ -29447,13 +28996,20 @@ icon_state = "Dark" }, /area/shuttle/funeral) -"nFw" = ( -/obj/structure/window/reinforced{ +"nFx" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; dir = 4 }, -/obj/structure/table, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "nFC" = ( /obj/machinery/cryopod/syndie{ dir = 1 @@ -29468,6 +29024,20 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/syndicate) +"nGk" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass, +/area/centcom/zone3) "nHd" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -29496,12 +29066,62 @@ icon_state = "darkyellowalt" }, /area/centcom/zone3) +"nHw" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredaltstrip" + }, +/area/centcom/specops) +"nIe" = ( +/obj/machinery/door/airlock/centcom{ + aiControlDisabled = 1; + name = "Assault Pod"; + opacity = 1; + req_access = list(150) + }, +/obj/docking_port/mobile/assault_pod{ + port_direction = 2 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/assault_pod) "nIj" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/evac) +"nIn" = ( +/obj/effect/turf_decal/delivery/white, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_SRT1" + }, +/obj/machinery/door/airlock/centcom{ + aiControlDisabled = 1; + hackProof = 1; + name = "Special ReactionTeam"; + opacity = 1; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"nIr" = ( +/obj/effect/step_trigger/teleporter{ + teleport_x = 216; + teleport_y = 26; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 4; + icon_state = "rampbottom" + }, +/area/centcom/specops) "nIG" = ( /turf/simulated/floor/carpet/green, /area/ninja/outpost) @@ -29513,6 +29133,13 @@ icon_state = "fancy-wood-oak-broken4" }, /area/syndicate_mothership) +"nIL" = ( +/obj/machinery/vending/tool, +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "nIR" = ( /obj/machinery/cryopod{ dir = 4 @@ -29525,6 +29152,14 @@ icon_state = "navyblue" }, /area/centcom/specops) +"nJe" = ( +/obj/structure/table/glass, +/obj/machinery/light, +/obj/item/storage/ashtray/glass, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "nJg" = ( /obj/structure/fence{ color = "#b0b7c6"; @@ -29533,22 +29168,12 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"nJu" = ( +"nJH" = ( /obj/structure/table/wood, -/obj/item/book/manual/security_space_law, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen, -/obj/structure/window/reinforced, +/obj/item/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/simulated/floor/carpet, -/area/centcom/zone3) -"nJB" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/area/centcom/evac) "nKg" = ( /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) @@ -29607,6 +29232,15 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"nLd" = ( +/obj/machinery/newscaster/security_unit{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "navybluealt" + }, +/area/centcom/specops) "nLn" = ( /obj/machinery/light/spot{ dir = 4; @@ -29614,6 +29248,31 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/supply) +"nLN" = ( +/obj/mecha/combat/durand/loaded{ + color = "#CCCCFF"; + desc = "A heavyweight exosuit, painted in a gray scheme. This model appears to have some modifications for ERT."; + name = "Nanotrasen Special Durand Mk. II"; + operation_req_access = list(109) + }, +/obj/item/mecha_parts/mecha_equipment/repair_droid, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/engine, +/area/centcom/specops) +"nMb" = ( +/obj/structure/closet/crate/can, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/obj/item/paper/central_command/archive/station_reports, +/turf/simulated/floor/plating, +/area/centcom/zone2) "nMc" = ( /obj/effect/turf_decal{ dir = 1; @@ -29710,13 +29369,20 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"nOi" = ( -/obj/structure/table/wood/fancy/royalblack, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" +"nNn" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood{ + icon_state = "wood-broken6" }, -/area/shuttle/administration) +/area/centcom/zone2) +"nOe" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "nOy" = ( /obj/structure/chair/comfy/red{ dir = 1 @@ -29733,6 +29399,16 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) +"nPt" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom, +/obj/item/megaphone, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "nPA" = ( /obj/effect/turf_decal/stripes/gold{ dir = 9 @@ -29756,6 +29432,14 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"nQl" = ( +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "nQm" = ( /obj/structure/flora/tree/dead, /obj/structure/flora/grass/both, @@ -29770,25 +29454,21 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"nQT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" - }, -/area/shuttle/administration) -"nRi" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/invincible{ +"nQM" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/plasteel{ dir = 1; - id_tag = "CC_Armory_Grenade" + icon_state = "darkred" + }, +/area/centcom/specops) +"nQW" = ( +/obj/machinery/vending/mech/ntc/equipment{ + req_access = list(114) }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) "nRs" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -29811,6 +29491,16 @@ }, /turf/simulated/floor/wood, /area/centcom/zone2) +"nRK" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_2) "nRW" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -29818,20 +29508,13 @@ }, /area/syndicate_mothership/control) "nRZ" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" +/obj/machinery/sleeper/upgraded{ + dir = 4 }, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" +/turf/simulated/floor/shuttle{ + icon_state = "floor3" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) +/area/shuttle/administration) "nSj" = ( /obj/structure/bed, /obj/item/bedsheet/blue, @@ -29855,7 +29538,7 @@ /area/syndicate_mothership/cargo) "nSu" = ( /turf/simulated/wall/shuttle, -/area/space) +/area/shuttle/transport) "nSG" = ( /obj/structure/fence/post{ invulnerable = 1 @@ -29869,15 +29552,6 @@ "nTJ" = ( /turf/simulated/wall/shuttle, /area/shuttle/pod_4) -"nTO" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "nTP" = ( /obj/structure/flora/tree/jungle, /obj/structure/flora/junglebush/c, @@ -29891,25 +29565,40 @@ }, /turf/simulated/floor/wood, /area/centcom/evac) -"nUc" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "nanotrasen_sign5"; - pixel_x = -16; - pixel_y = 32 +"nTY" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" +/obj/effect/step_trigger/teleporter{ + teleport_x = 175; + teleport_y = 60; + teleport_z = 1; + icon_state = "x2"; + icon = 'icons/mob/screen_gen.dmi' + }, +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, /area/centcom/specops) -"nUe" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor{ - id = "QMLoad"; - dir = 4 +"nUf" = ( +/obj/machinery/vending/cigarette, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/supply) +/area/centcom/specops) +"nUi" = ( +/obj/structure/bookcase, +/obj/effect/decal/cleanable/cobweb{ + layer = 4 + }, +/turf/simulated/floor/plating, +/area/centcom/zone2) "nVd" = ( /obj/structure/table/wood/fancy/black, /obj/item/flashlight/lamp/green{ @@ -29927,6 +29616,13 @@ icon_state = "dark" }, /area/centcom/bridge) +"nVg" = ( +/obj/machinery/computer/secure_data, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "nVl" = ( /obj/structure/rack, /obj/item/storage/box/hug, @@ -29964,15 +29660,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"nVB" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "ntsing_alt" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "nVI" = ( /obj/effect/mapping_helpers/light{ light_power = 3 @@ -30002,11 +29689,44 @@ "nWf" = ( /turf/simulated/wall/indestructible/reinforced/rusted, /area/ninja/holding) +"nWx" = ( +/obj/structure/table/glass, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "nWB" = ( /turf/simulated/floor/plasteel{ icon_state = "barber" }, /area/centcom/zone1) +"nWU" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/obj/machinery/door/airlock/centcom{ + name = "Emergency Response Team"; + opacity = 1; + req_access = list(109) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"nXE" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_1) "nXK" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/ai_status_display{ @@ -30062,40 +29782,112 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"nYE" = ( -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater2x2"; - tag = "icon-heater (NORTH)" +"nYA" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet, +/area/centcom/zone1) "nYK" = ( /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, /area/syndicate_mothership) +"nYX" = ( +/obj/structure/closet/cabinet{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100) + }, +/obj/item/storage/box/centcomofficer, +/obj/item/radio/headset/centcom{ + desc = null; + name = "Supreme commander bowman headset" + }, +/obj/item/card/id{ + access = list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,69,70,71,73,74,75,76,77,99,101,102,103,104,105,106,107,108,109,110,111,112,113,114); + icon_state = "commander"; + name = "Supreme Commander ID card"; + rank = "Nanotrasen Navy Captain"; + registered_name = null + }, +/obj/item/door_remote/centcomm, +/obj/item/clothing/accessory/medal/gold{ + desc = null; + name = "Supreme commander's gold medal" + }, +/obj/item/gun/projectile/revolver/mateba, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/ammo_box/a357, +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/head/beret/centcom/officer/sigholt{ + icon_state = "officerberet"; + name = "beret" + }, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/gloves/color/white{ + desc = null; + name = "Supreme judge gloves" + }, +/obj/item/clothing/shoes/cowboy/white{ + name = "white boots" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "nZe" = ( /obj/structure/railing/corner{ dir = 1 }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"oaw" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/sliceable/pizza/bacon, -/obj/structure/window/reinforced{ - dir = 4 +"nZr" = ( +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/indestructible{ + icon_state = "darkpurple" + }, +/area/centcom/specops) +"nZM" = ( +/obj/machinery/door/airlock/centcom{ + name = "ERT Service Room"; + opacity = 1; + req_access = list(109) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"oaa" = ( +/obj/machinery/vending/engivend{ + req_access = list() + }, +/obj/effect/decal/warning_stripes/white/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/wood, /area/centcom/specops) +"oaK" = ( +/obj/structure/window/full/reinforced{ + layer = 2 + }, +/obj/machinery/door/poddoor/shutters/invincible{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "CC_space_jail_sec"; + layer = 50; + level = 3; + locked = 1; + name = "Central Command Jail"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/centcom/jail) "oaS" = ( /obj/machinery/door_control/secure{ id = "Aspid_main_storage"; @@ -30117,22 +29909,22 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"obi" = ( -/obj/structure/shuttle/engine/heater{ +"obc" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear{ dir = 1; - tag = "icon-heater (NORTH)" + do_not_delete_me = 1 }, -/obj/structure/window/reinforced{ - color = "red" +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl2"; + name = "Armory level 2"; + layer = 5 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) -"obp" = ( -/obj/machinery/computer/camera_advanced, -/obj/effect/turf_decal/siding{ - color = "#444444" +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "obw" = ( /obj/structure/flora/ausbushes/stalkybush, @@ -30156,13 +29948,6 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"obI" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) "obJ" = ( /turf/simulated/wall/indestructible/fakeglass{ base_icon_state = "fake_plastitanium_glass"; @@ -30190,8 +29975,26 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) -"ocs" = ( -/obj/structure/chair/sofa/right{ +"obT" = ( +/obj/structure/statue/sandstone/venus{ + layer = 5 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/grass, +/area/centcom/evac) +"ocf" = ( +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/tile/neutral{ + alpha = 150; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) +"ocs" = ( +/obj/structure/chair/sofa/right{ dir = 1 }, /turf/simulated/floor/plating{ @@ -30200,12 +30003,31 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"ocx" = ( +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" + }, +/area/centcom/specops) "ocG" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/centcom/zone1) +"ocO" = ( +/obj/structure/table/wood, +/obj/item/pizzabox/vegetable, +/obj/item/pizzabox/vegetable, +/obj/item/pizzabox/vegetable, +/obj/item/pizzabox/vegetable, +/obj/item/kitchen/knife, +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "ocY" = ( /obj/structure/table/reinforced, /obj/item/airlock_electronics/syndicate, @@ -30231,27 +30053,6 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"odn" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "Drop" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"odr" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 2; - id_tag = "ERT_director_office_shutters2"; - layer = 5; - locked = 1; - name = "CentCom SOO Briefing" - }, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) "odT" = ( /obj/structure/chair/sofa/left{ dir = 1 @@ -30280,30 +30081,40 @@ }, /area/shuttle/ninja) "odZ" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/wood/fancy/light, /area/centcom/evac) -"oeq" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "oeH" = ( /obj/structure/closet/crate/can, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/syndicate_mothership/elite_squad) -"oeV" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = 32 +"oeJ" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/airlock/gold/glass{ + frequency = 2000; + hackable = 0; + id_tag = "CC-OP3-Ext"; + locked = 1; + name = "Zone 3" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 2000; + master_tag = "CC-OP3"; + name = "CC-OP3-EXT"; + pixel_x = -32; + req_access = list(109); + wires = 0 }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredalt" + icon_state = "dark" }, -/area/centcom/jail) +/area/centcom/zone3) +"oeU" = ( +/obj/item/flag/nt, +/turf/simulated/floor/carpet, +/area/centcom/specops) "oeY" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -30320,33 +30131,12 @@ tag = "icon-stage_stairs" }, /area/centcom/evac) -"ofm" = ( -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "darkgrey" - }, -/area/shuttle/administration) "ofy" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcornersalt" }, /area/centcom/supply) -"ofB" = ( -/obj/effect/turf_decal/caution/stand_clear, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/zone3) -"ofN" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table, -/obj/machinery/computer/library/public, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "ofX" = ( /obj/item/flag/syndi, /obj/machinery/light/small, @@ -30387,21 +30177,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"ogL" = ( -/obj/structure/urinal{ - pixel_y = 32 - }, -/obj/machinery/door_control/secure{ - id = "CC_toilet_unit1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4; - pixel_x = 25 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/evac) "ogO" = ( /obj/structure/table, /obj/item/folder/red, @@ -30423,12 +30198,6 @@ icon_state = "fancy-wood-oak" }, /area/ninja/outpost) -"ohc" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluealt" - }, -/area/centcom/specops) "ohh" = ( /obj/structure/flora/rock/jungle, /obj/structure/flora/grass/jungle, @@ -30440,11 +30209,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/zone3) -"ohw" = ( -/obj/structure/window/full/shuttle, -/obj/structure/grille, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/transport) "ohG" = ( /obj/machinery/door/airlock/centcom{ name = "Medical Block"; @@ -30461,37 +30225,12 @@ /obj/machinery/photocopier, /turf/simulated/floor/wood, /area/centcom/zone2) -"ohL" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/transport) "ohN" = ( /obj/machinery/hydroponics/constructable{ layer = 3.2 }, /turf/simulated/floor/grass, /area/centcom/evac) -"oih" = ( -/obj/effect/decal/remains, -/obj/effect/turf_decal/tile/neutral{ - alpha = 100; - icon_state = "seadeep"; - layer = 9; - icon = 'icons/misc/beach.dmi' - }, -/obj/item/fish/goldfish{ - pixel_y = 10; - pixel_x = 16 - }, -/obj/structure/window/reinforced/survival_pod{ - dir = 5; - pixel_x = -32; - pixel_y = -32; - density = 0 - }, -/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, -/area/centcom/zone2) "oiv" = ( /obj/machinery/mineral/labor_claim_console{ pixel_x = 30; @@ -30558,83 +30297,18 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"oiL" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/shuttle/supply) -"oiM" = ( -/obj/effect/turf_decal/stripes/line{ - icon = 'icons/turf/floors.dmi'; - icon_state = "siding8" - }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom" - }, -/area/centcom/supply) -"oiP" = ( -/obj/item/flag/nt, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) -"oja" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/turf_decal/tile/neutral{ - alpha = 180; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"oji" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "okh" = ( /obj/structure/flora/tree/jungle, /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"oku" = ( -/obj/structure/sign/poster/official/space_cops{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/jail) -"okw" = ( -/obj/item/radio/intercom/specops{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +"oks" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 }, -/area/centcom/zone3) +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "okx" = ( /obj/machinery/door/airlock/shuttle{ id_tag = "s_docking_airlock"; @@ -30656,17 +30330,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"okK" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "okO" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Syndicate Base" @@ -30686,14 +30349,6 @@ "okZ" = ( /turf/simulated/floor/carpet/red, /area/ninja/outpost) -"ole" = ( -/obj/structure/table/reinforced, -/obj/machinery/computer/secure_data/laptop, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkredalt" - }, -/area/centcom/jail) "olg" = ( /obj/machinery/kitchen_machine/oven/upgraded, /turf/simulated/floor/plating{ @@ -30713,29 +30368,18 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"olu" = ( -/obj/structure/curtain/open/shower/centcom, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/zone2) "olI" = ( /obj/machinery/computer/operating, /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"olU" = ( -/obj/item/flag/nt, -/turf/simulated/floor/wood, -/area/centcom/zone3) -"omf" = ( -/obj/structure/table/wood{ - color = "#996633" - }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +"omd" = ( +/turf/simulated/floor/plasteel{ + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "omh" = ( /obj/structure/table, @@ -30748,6 +30392,11 @@ icon_state = "barber" }, /area/centcom/jail) +"omz" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "omB" = ( /obj/machinery/kitchen_machine/grill/upgraded, /obj/effect/turf_decal/tile/neutral{ @@ -30761,27 +30410,10 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"omF" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) -"omG" = ( -/obj/machinery/light/spot, -/turf/simulated/floor/shuttle, -/area/shuttle/supply) "omJ" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/carpet, /area/centcom/evac) -"omP" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/transport) "ona" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -30791,16 +30423,17 @@ "onc" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/zone1) -"ono" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/space, -/area/space) "ont" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel{ icon_state = "barber" }, /area/centcom/jail) +"onE" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellow" + }, +/area/centcom/specops) "onS" = ( /obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ @@ -30808,6 +30441,12 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) +"ook" = ( +/obj/structure/closet/walllocker{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel/freezer, +/area/centcom/specops) "oor" = ( /obj/machinery/door_control/secure{ id = "Aspid_deck"; @@ -30820,6 +30459,15 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) +"ooy" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/message_monitor/laptop, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "ooz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -30829,6 +30477,35 @@ }, /turf/simulated/floor/carpet/green, /area/ninja/outpost) +"ooD" = ( +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/specops) +"ooE" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) +"ooF" = ( +/obj/machinery/door/window/brigdoor{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/zone3) "ooP" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -30861,6 +30538,24 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership) +"opi" = ( +/obj/structure/closet/cardboard{ + icon_state = "cardboard_cargo"; + icon_closed = "cardboard_cargo"; + icon_opened = "cardboard_cargo_open" + }, +/mob/living/simple_animal/hostile/mimic{ + faction = list("neutral"); + name = "Archivist" + }, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"opw" = ( +/obj/machinery/vending/coffee, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "opx" = ( /obj/machinery/gibber, /turf/simulated/floor/plating{ @@ -30884,34 +30579,6 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"oqa" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law/black{ - pixel_x = -4 - }, -/obj/item/book/manual/security_space_law/black{ - pixel_x = -4 - }, -/obj/item/book/manual/security_space_law/black{ - pixel_x = -4 - }, -/obj/item/book/manual/security_space_law/black{ - pixel_x = -4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "oqC" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -30923,9 +30590,6 @@ icon_state = "white" }, /area/centcom/zone1) -"oqI" = ( -/turf/simulated/floor/carpet/red, -/area/shuttle/administration) "orb" = ( /obj/machinery/kitchen_machine/candy_maker/upgraded, /obj/effect/turf_decal/tile/neutral{ @@ -30947,23 +30611,11 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) -"orL" = ( -/obj/effect/turf_decal/stripes/black{ - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 1; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" - }, +"orF" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/beer/upgraded, +/turf/simulated/floor/carpet/black, /area/shuttle/administration) -"orN" = ( -/obj/structure/curtain/black, -/turf/simulated/floor/plasteel/freezer, -/area/centcom/specops) "osm" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/tile/neutral{ @@ -30977,6 +30629,16 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"oso" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "osp" = ( /obj/effect/decal/nanotrasen_logo{ icon_state = "logo4" @@ -30994,10 +30656,6 @@ icon_state = "grimy" }, /area/centcom/zone1) -"osD" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/plating/airless, -/area/shuttle/escape) "osE" = ( /obj/structure/table/reinforced, /obj/item/kitchen/knife, @@ -31027,6 +30685,16 @@ name = "floor" }, /area/syndicate_mothership/elite_squad) +"osM" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "otg" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -31050,45 +30718,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"otn" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - req_access = list(114) - }, -/obj/item/clothing/suit/judgerobe{ - name = "Supreme judge's robe" - }, -/obj/item/card/id/centcom{ - icon_state = "deathsquad"; - name = "Supreme Judge ID card"; - pixel_x = -3; - pixel_y = -3; - registered_name = "Supreme Judge" - }, -/obj/item/clothing/head/powdered_wig{ - desc = null; - name = "Supreme judge wig" - }, -/obj/item/clothing/under/suit_jacket/really_black{ - name = "Supreme judge suit" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/obj/item/clothing/gloves/color/white{ - desc = null; - name = "Supreme judge gloves" - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"otz" = ( -/obj/structure/decorative_structures/metal/statue/metal_angel, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/centcom/evac) "otA" = ( /obj/machinery/light{ dir = 8 @@ -31108,19 +30737,6 @@ }, /turf/simulated/floor/carpet/royalblack, /area/shuttle/trade/sol) -"otJ" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"otM" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater{ - dir = 8 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/transport) "ouC" = ( /obj/structure/closet/secure_closet/engineering_electrical{ req_access = list(159) @@ -31139,15 +30755,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/vox) -"ouP" = ( -/obj/machinery/light/spot{ - dir = 1 - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) "ova" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -31163,6 +30770,35 @@ icon_state = "white" }, /area/centcom/jail) +"ovk" = ( +/obj/structure/table/glass, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 16 + }, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/pen/fancy{ + pixel_x = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"ovu" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-34"; + tag = "icon-plant-34" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "ovv" = ( /obj/effect/turf_decal/stripes/gold{ dir = 8 @@ -31185,13 +30821,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"ovB" = ( -/obj/machinery/light/spot{ - dir = 1 - }, -/obj/structure/closet/crate, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) "ovE" = ( /obj/machinery/mineral/stacking_machine/laborstacker{ input_dir = 2; @@ -31202,6 +30831,26 @@ icon_state = "dark" }, /area/shuttle/siberia) +"ovI" = ( +/obj/structure/closet/acloset{ + name = "Undercover officer's closet"; + desc = "It's a basic storage unit." + }, +/obj/item/flashlight, +/obj/item/encryptionkey/centcom, +/obj/item/radio/headset, +/obj/item/organ/internal/cyberimp/arm/combat/centcom, +/obj/item/autoimplanter/old, +/obj/item/clothing/gloves/color/yellow/power, +/obj/item/storage/belt/utility/full/multitool, +/obj/item/clothing/shoes/chameleon/noslip, +/obj/item/clothing/under/color/black, +/obj/item/implanter/dust, +/obj/item/storage/box/engineer{ + name = "Survival kit" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "ovM" = ( /obj/structure/closet/crate/syndicate{ pixel_x = 4; @@ -31213,23 +30862,10 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"ovZ" = ( -/obj/structure/table/wood, -/obj/item/book/manual/security_space_law/black{ - pixel_x = -4 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +"ovR" = ( +/obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/carpet, -/area/centcom/zone3) +/area/centcom/specops) "owc" = ( /obj/item/flag/syndi, /turf/simulated/floor/plasteel{ @@ -31237,30 +30873,6 @@ icon_state = "darkred" }, /area/syndicate_mothership/infteam) -"owf" = ( -/obj/machinery/door_control/secure{ - id = "ShitRainSupply"; - pixel_x = -24; - pixel_y = -24 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"owg" = ( -/obj/machinery/mass_driver{ - dir = 4; - id_tag = "ASSAULT1"; - name = "gravpult" - }, -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "owl" = ( /obj/structure/window/reinforced{ dir = 1 @@ -31296,13 +30908,6 @@ icon_state = "darkred" }, /area/syndicate_mothership/infteam) -"owz" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "owD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, @@ -31311,13 +30916,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) -"owS" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) "owX" = ( /obj/effect/turf_decal{ dir = 4; @@ -31332,24 +30930,14 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"oxE" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - id_tag = "s_docking_airlock"; - name = "Emergency Droppod"; - req_access = list(109) - }, -/obj/docking_port/mobile/assault_pod/nt, -/obj/docking_port/stationary{ - dwidth = 3; - height = 7; - name = "Emerjency droppod dock"; - id = "shit_rain_base"; - width = 7; - pixel_y = -32 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) +"oxw" = ( +/obj/structure/table/wood, +/obj/item/book/manual/security_space_law, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen, +/obj/structure/window/reinforced, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "oxJ" = ( /turf/simulated/floor/plasteel{ icon_state = "darkfull" @@ -31370,15 +30958,6 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"oyd" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/arcade, -/area/centcom/zone1) "oyw" = ( /obj/effect/turf_decal{ dir = 9; @@ -31389,46 +30968,19 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"ozw" = ( -/obj/structure/sign/securearea{ - pixel_y = -32 - }, +"ozy" = ( +/obj/machinery/vending/cigarette/free, /turf/simulated/floor/plasteel{ - icon_state = "darkredalt" - }, -/area/centcom/specops) -"ozP" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/blue/hollow, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = 6 + icon_state = "dark" }, -/obj/item/gun/projectile/automatic/lasercarbine{ - pixel_x = 6 +/area/centcom/zone2) +"ozS" = ( +/obj/structure/sign/poster/contraband/hacking_guide{ + pixel_x = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "darkyellow" }, /area/centcom/specops) "ozZ" = ( @@ -31437,12 +30989,13 @@ icon_state = "darkyellowcornersalt" }, /area/centcom/zone3) -"oAE" = ( -/obj/machinery/computer/shuttle/ferry/request{ - req_access = list(101) +"oAH" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) +/area/centcom/specops) "oBC" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -31475,42 +31028,53 @@ icon_state = "dark" }, /area/centcom/jail) -"oBX" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +"oBW" = ( +/obj/effect/turf_decal/arrows/red{ + name = "Armory" }, +/turf/simulated/floor/indestructible{ + icon_state = "darkgrey" + }, +/area/centcom/specops) +"oCh" = ( /obj/structure/window/reinforced{ - dir = 4 + dir = 8 + }, +/obj/structure/table, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"oCp" = ( +/obj/machinery/vending/chinese/free, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/zone3) -"oCe" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 9; - pixel_y = 1; - pixel_x = -1; - density = 0 - }, -/obj/structure/fishingrodcabinet{ - pixel_y = 32; - pixel_x = 3 +/area/centcom/zone2) +"oCD" = ( +/obj/effect/turf_decal/stripes/line{ + icon = 'icons/turf/floors.dmi'; + icon_state = "siding8" }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkbluealt" + color = "gray"; + dir = 1; + icon_state = "rampbottom" }, -/area/centcom/zone2) -"oCf" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/light_construct/small{ +/area/centcom/supply) +"oCT" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/wood, -/area/centcom/zone3) +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "oDi" = ( /obj/effect/turf_decal/caution/stand_clear{ pixel_y = 8 @@ -31541,19 +31105,21 @@ icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' }, /area/syndicate_mothership/control) -"oDK" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "oDL" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) +"oDS" = ( +/obj/machinery/conveyor/inverted{ + id = "CC_crate"; + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "oEs" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -31573,56 +31139,32 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership) -"oEt" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/green/hollow, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = 6 - }, -/obj/item/gun/energy/gun/pdw9{ - pixel_x = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"oEu" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater2x2"; + tag = "icon-heater (NORTH)" }, -/area/centcom/specops) -"oEM" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" +/obj/structure/window/reinforced{ + color = "yellow"; + dir = 8; + layer = 2.9 }, -/area/centcom/jail) +/turf/simulated/floor/plating/airless, +/area/shuttle/trade/sol) "oEQ" = ( /obj/structure/chair/sofa/right, /turf/simulated/floor/carpet, /area/centcom/zone1) -"oET" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +"oFz" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/newscaster/security_unit{ + pixel_y = -32 }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) -"oFo" = ( -/obj/machinery/light/small{ - dir = 4; - tag = "icon-bulb1 (EAST)" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) +/area/centcom/bridge) "oFF" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo5" @@ -31633,41 +31175,67 @@ /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) "oFJ" = ( -/turf/space/transit/west{ - icon_state = "speedspace_ew_1" +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -12 }, -/area/space) -"oFN" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -2 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = 8 }, -/area/centcom/specops) +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) +"oFM" = ( +/obj/structure/chair/sofa/right, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone1) "oFO" = ( /obj/effect/turf_decal/stripes/gold{ dir = 10 }, /turf/simulated/floor/carpet/black, /area/centcom/bridge) -"oFR" = ( +"oGK" = ( /obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 + dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/evac) +"oGQ" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/green/hollow, +/obj/item/gun/energy/gun/pdw9{ + pixel_x = -6 }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"oGC" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 8; - name = "CentComm Chemical lab" +/obj/item/gun/energy/gun/pdw9{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/pdw9{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/pdw9{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/pdw9{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/pdw9{ + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/engine, /area/centcom/specops) "oGU" = ( /obj/structure/filingcabinet/filingcabinet, @@ -31681,6 +31249,18 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/siberia) +"oHO" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkbluealt" + }, +/area/centcom/specops) +"oHS" = ( +/obj/structure/closet/crate/can, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "oHZ" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Syndicate Base" @@ -31715,20 +31295,13 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"oIN" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DEDI" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealt" +"oIM" = ( +/obj/structure/decorative_structures/metal/statue/metal_angel, +/obj/machinery/light{ + dir = 4 }, -/area/centcom/specops) +/turf/simulated/floor/carpet, +/area/centcom/evac) "oIW" = ( /obj/structure/window/reinforced{ dir = 8 @@ -31738,27 +31311,45 @@ icon_state = "dark" }, /area/centcom/zone1) -"oJg" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 5; - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 10; - do_not_delete_me = 1; - icon_state = "bs_deadlock" - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "white" +"oJc" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/area/shuttle/administration) +/obj/structure/table, +/obj/machinery/computer/library/public, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "oJi" = ( /obj/machinery/hydroponics/constructable, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/centcom/jail) +"oJm" = ( +/obj/item/gun/projectile/automatic/sniper_rifle, +/obj/item/gun/projectile/automatic/sniper_rifle, +/obj/item/gun/projectile/automatic/sniper_rifle, +/obj/item/gun/projectile/automatic/sniper_rifle, +/obj/item/gun/projectile/automatic/sniper_rifle, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + layer = 2.9; + name = "Sniper Rifle"; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/centcom/jail) +"oJt" = ( +/obj/item/book/random, +/turf/simulated/floor/wood{ + icon_state = "wood-broken6"; + tag = "icon-wood-broken6" + }, +/area/centcom/zone2) "oJH" = ( /obj/structure/rack, /obj/item/pneumatic_cannon, @@ -31782,6 +31373,17 @@ "oJI" = ( /turf/simulated/wall/shuttle, /area/shuttle/siberia) +"oJP" = ( +/obj/structure/stone_tile/slab/cracked, +/turf/simulated/floor/lava/lava_land_surface, +/area/ruin/space/bubblegum_arena) +"oKa" = ( +/obj/machinery/recharge_station/ert, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navybluealt" + }, +/area/centcom/specops) "oKt" = ( /obj/machinery/light/small{ dir = 4 @@ -31790,36 +31392,19 @@ icon_state = "darkredcorners" }, /area/syndicate_mothership/infteam) -"oKy" = ( -/obj/machinery/vending/coffee, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"oKz" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/machinery/photocopier, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) -"oKE" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/message_monitor/laptop, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "oKG" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, /area/centcom/zone1) +"oKH" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "oKN" = ( /obj/item/flag/syndi, /obj/structure/curtain/black{ @@ -31827,6 +31412,33 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"oKP" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/seeds/gatfruit, +/obj/item/seeds/cherry/bomb, +/obj/item/seeds/ambrosia/gaia, +/obj/item/seeds/ambrosia/gaia, +/obj/item/seeds/ambrosia/gaia, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/beach/sand{ + icon = 'icons/turf/floors.dmi'; + icon_state = "asteroid" + }, +/area/centcom/evac) "oKU" = ( /obj/effect/turf_decal/stripes/gold{ dir = 10 @@ -31835,21 +31447,36 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"oLJ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_x = -28 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) "oLR" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/tree/jungle, /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"oLW" = ( +/obj/machinery/door_control/secure{ + id = "gamma shuttle"; + name = "Gamma Armory Shutters"; + req_access = list(114); + pixel_x = 24; + pixel_y = 26 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/supply) +"oMa" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -5 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "oMf" = ( /obj/structure/grille, /obj/structure/window/full/shuttle, @@ -31867,6 +31494,20 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) +"oMB" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table, +/obj/machinery/computer/library/public{ + pixel_y = 4; + pixel_x = 1 + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "oMM" = ( /obj/structure/chair/comfy/red, /turf/simulated/floor/carpet/black, @@ -31882,17 +31523,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"oNm" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "oNF" = ( /obj/effect/decal/warning_stripes/white, /obj/machinery/door/airlock/shuttle{ @@ -31906,6 +31536,15 @@ icon_state = "dark" }, /area/centcom/zone1) +"oNH" = ( +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 5; + pixel_y = -2 + }, +/obj/effect/turf_decal/siding/brown, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "oNI" = ( /obj/effect/turf_decal/stripes/gold, /turf/simulated/floor/wood{ @@ -31955,6 +31594,11 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"oOk" = ( +/turf/simulated/floor/indestructible{ + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "oOt" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowalt" @@ -31989,9 +31633,38 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"oOS" = ( -/obj/structure/table/wood, -/obj/structure/window/reinforced{ +"oOK" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 6; + pixel_y = -1; + pixel_x = 1; + density = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluealt" + }, +/area/centcom/zone2) +"oON" = ( +/obj/machinery/computer/secure_data, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkredfull" + }, +/area/centcom/bridge) +"oOQ" = ( +/obj/machinery/photocopier, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"oOS" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ dir = 8 }, /obj/item/camera_film, @@ -32039,29 +31712,15 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"oPN" = ( -/obj/structure/table/wood, +"oPU" = ( +/obj/machinery/computer/station_alert, /obj/structure/window/reinforced{ - dir = 8 + dir = 4 }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -5 +/obj/item/radio/intercom/specops{ + pixel_y = 32 }, -/obj/item/reagent_containers/glass/beaker/waterbottle, /turf/simulated/floor/carpet, -/area/centcom/zone3) -"oQb" = ( -/obj/structure/dresser, -/obj/structure/mirror/magic{ - desc = null; - name = "mirror"; - pixel_x = -32 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "oQl" = ( /obj/effect/turf_decal/siding/wood{ @@ -32077,10 +31736,12 @@ icon_state = "darkred" }, /area/shuttle/escape) -"oQS" = ( -/obj/structure/chair/stool/bar, -/turf/simulated/floor/carpet/red, -/area/shuttle/administration) +"oQO" = ( +/obj/machinery/vending/snack{ + pixel_y = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "oQV" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/mining) @@ -32095,6 +31756,13 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership/cargo) +"oRk" = ( +/obj/item/twohanded/required/kirbyplants{ + pixel_y = 8 + }, +/obj/structure/table, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "oRn" = ( /obj/effect/turf_decal{ icon_state = "golden_stripes" @@ -32132,48 +31800,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"oRw" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access = list(150) - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_sit_1"; - name = "Side Hull Door"; - opacity = 0; - req_access = list(150) - }, -/obj/structure/fans/tiny, -/obj/machinery/door_control/secure{ - id = "syndicate_sit_1"; - name = "Blast Doors"; - pixel_y = -23; - req_access = list(150) - }, -/obj/docking_port/mobile{ - dir = 4; - dwidth = 7; - height = 5; - id = "sit"; - name = "SIT shuttle"; - roundstart_move = "sit_away"; - width = 11 - }, -/obj/docking_port/stationary/transit{ - dir = 4; - dwidth = 7; - height = 5; - id = "sit_transit"; - name = "sit in transit"; - pixel_x = -32; - turf_type = /turf/space/transit/south; - width = 11 - }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/syndicate_sit) "oRB" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -32192,23 +31818,17 @@ "oRV" = ( /turf/simulated/floor/beach/sand, /area/centcom/evac) +"oSm" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/jail) "oSq" = ( /obj/structure/flora/tree/jungle, /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"oSr" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_security, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"oSA" = ( -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) "oSZ" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -32223,6 +31843,11 @@ /obj/structure/flora/grass/jungle/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"oTf" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/transport) "oTy" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -32230,6 +31855,67 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"oTI" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "ERT_armory_lvl3"; + name = "Armory level 3"; + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) +"oTM" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = 32 + }, +/obj/structure/window/reinforced, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22"; + tag = "icon-plant-22" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"oTY" = ( +/obj/machinery/computer/security{ + network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentComm","Thunderdome") + }, +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkredfull" + }, +/area/centcom/bridge) +"oUi" = ( +/obj/structure/table/reinforced, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/meat, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/margherita, +/obj/item/pizzabox/hawaiian, +/obj/item/pizzabox/hawaiian, +/obj/item/pizzabox/hawaiian, +/obj/item/pizzabox/vegetable, +/obj/item/pizzabox/vegetable, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "oUj" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -32238,16 +31924,6 @@ /obj/structure/flora/tree/jungle/small, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"oUl" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/box/white/corners, -/obj/structure/weightmachine/stacklifter, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/jail) "oUm" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/item/reagent_containers/food/condiment/flour, @@ -32261,6 +31937,14 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"oUw" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "N2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "oUA" = ( /obj/structure/table, /obj/item/paper_bin/nanotrasen{ @@ -32271,24 +31955,22 @@ /turf/simulated/floor/wood, /area/centcom/zone2) "oUC" = ( -/obj/structure/sign/poster/official/space_cops{ - pixel_x = -32 +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -12 }, -/turf/simulated/floor/indestructible{ - dir = 9; - icon_state = "darkgreynavyblue" +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = 8 }, -/area/centcom/specops) -"oUG" = ( -/obj/machinery/light/spot, -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -2 }, -/obj/item/radio/intercom{ - pixel_y = -26 +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) +/area/shuttle/gamma) "oUX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -32305,73 +31987,21 @@ icon_state = "white" }, /area/centcom/jail) -"oVq" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) -"oVu" = ( -/obj/machinery/door/airlock/external{ - id_tag = "supply_away"; - name = "Central Command Supply"; - req_access = list(31); - hackProof = 1 - }, -/obj/machinery/door/poddoor{ - id_tag = "CC_supply_space"; - locked = 2; - name = "Supply Blastdoor" - }, -/obj/structure/fans/tiny, -/obj/effect/decal/warning_stripes/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"oVm" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_NG" }, -/area/centcom/supply) -"oVx" = ( -/obj/machinery/vending/clothing, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) -"oVy" = ( -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/tile/neutral{ - alpha = 100; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) +/area/centcom/specops) "oVF" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"oVN" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = 32; - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluecornersalt" - }, -/area/centcom/specops) "oVV" = ( /obj/effect/turf_decal{ dir = 6; @@ -32395,24 +32025,13 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) -"oWj" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 175; - teleport_y = 63; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" +"oWf" = ( +/obj/structure/closet/crate/can, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 }, +/turf/simulated/floor/carpet/black, /area/centcom/specops) "oWo" = ( /obj/machinery/kitchen_machine/candy_maker, @@ -32433,19 +32052,6 @@ icon_state = "navybluecornersalt" }, /area/centcom/specops) -"oWv" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DEDI" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "oWS" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -32464,16 +32070,6 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"oXC" = ( -/obj/structure/railing, -/obj/machinery/computer/communications, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "oXD" = ( /obj/machinery/vending/tool, /obj/machinery/light/small{ @@ -32484,6 +32080,15 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) +"oXE" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "ntsing_alt5" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "oXI" = ( /obj/structure/window/reinforced{ dir = 1 @@ -32495,37 +32100,6 @@ icon_state = "seadeep" }, /area/centcom/evac) -"oXT" = ( -/obj/structure/closet/crate/can, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/zone2) -"oXZ" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Bridge"; - opacity = 1; - req_access = list(101) - }, -/turf/simulated/floor/wood, -/area/centcom/zone2) -"oYw" = ( -/obj/machinery/computer/supplycomp{ - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) -"oYW" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/centcom/jail) "oZd" = ( /obj/machinery/vending/wallmed/syndicate{ pixel_y = 32 @@ -32547,42 +32121,22 @@ icon_state = "dark" }, /area/syndicate_mothership/jail) -"oZI" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" +"oZM" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluecornersalt" }, -/turf/simulated/floor/glass, -/area/centcom/zone3) +/area/centcom/specops) "oZR" = ( /obj/structure/chair/wood{ dir = 1 }, /turf/simulated/floor/carpet, /area/centcom/evac) -"pan" = ( -/obj/machinery/light/spot, -/obj/structure/closet/crate, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) -"paN" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone3) "pbe" = ( /obj/structure/closet/crate/can, /turf/simulated/floor/wood, /area/centcom/zone2) -"pbs" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/cryopod, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "pbE" = ( /obj/structure/bookcase/manuals, /obj/item/book/manual/sop_service, @@ -32591,19 +32145,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone2) -"pbI" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/evac) -"pbK" = ( -/obj/machinery/iv_drip, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) "pbN" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -32632,15 +32173,15 @@ icon_state = "white" }, /area/centcom/zone1) -"pci" = ( -/obj/machinery/computer/bsa_control/admin{ - integrity_failure = 20; - req_access = list(114) +"pcr" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_Grenade" }, -/obj/machinery/light/small{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/turf/simulated/floor/carpet/black, /area/centcom/specops) "pcw" = ( /obj/structure/window/reinforced{ @@ -32658,14 +32199,6 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) -"pdi" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "pdl" = ( /obj/machinery/vending/toyliberationstation{ contraband = null; @@ -32686,6 +32219,13 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) +"pdE" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) "pdO" = ( /obj/machinery/vending/suitdispenser, /turf/simulated/floor/plasteel{ @@ -32741,45 +32281,23 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/siberia) -"peS" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/pod_4) -"peW" = ( -/obj/structure/closet/secure_closet/guncabinet{ - layer = 2.9; - name = "combat shotgun" - }, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/machinery/light/spot{ - dir = 8; - tag = "icon-tube1 (WEST)" - }, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/item/gun/projectile/shotgun/automatic/combat, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +"peY" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 5; + height = 7; + id = "supply_away"; + name = "supply centcom"; + turf_type = /turf/simulated/floor/plating/airless; + width = 12 }, -/area/shuttle/gamma) -"peZ" = ( -/obj/structure/chair/sofa/corp/right, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredalt" +/obj/docking_port/mobile/supply{ + dir = 2; + preferred_direction = 8; + port_direction = 4 }, -/area/centcom/specops) +/turf/simulated/wall/shuttle, +/area/shuttle/supply) "pff" = ( /obj/machinery/pdapainter, /obj/structure/curtain/black{ @@ -32793,28 +32311,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) -"pfP" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/flashlight/lamp/green, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone2) -"pga" = ( -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/tile/neutral{ - alpha = 200; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "pgl" = ( /obj/item/flag/species/human, /turf/simulated/floor/plasteel{ @@ -32828,6 +32324,13 @@ icon_state = "darkyellow" }, /area/centcom/specops) +"pgu" = ( +/obj/machinery/cryopod/robot, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navyblue" + }, +/area/centcom/specops) "phK" = ( /obj/effect/decal/syndie_logo, /obj/effect/turf_decal/stripes/black{ @@ -32839,15 +32342,18 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/evac) -"phW" = ( -/obj/machinery/light{ - dir = 4; - switchcount = 50 +"pir" = ( +/obj/item/storage/briefcase, +/obj/structure/table/wood/fancy/black, +/obj/item/paper/safe_code{ + owner = "NNC" }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/obj/item/folder/yellow, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = 32 }, -/area/centcom/zone2) +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "piE" = ( /turf/simulated/wall/shuttle, /area/shuttle/mining) @@ -32860,17 +32366,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"pji" = ( -/obj/machinery/vending/ntcrates{ - req_access = list(114) - }, -/obj/machinery/conveyor{ - id = "CC_crate" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "pjK" = ( /obj/structure/sign/poster/official/religious{ pixel_y = -32 @@ -32880,16 +32375,6 @@ }, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"pjS" = ( -/obj/structure/chair/comfy/lime{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/centcom/zone3) "pko" = ( /obj/effect/turf_decal{ icon_state = "golden_stripes" @@ -32908,43 +32393,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"pkz" = ( -/obj/item/beach_ball, -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/beach/sand{ - icon = 'icons/turf/floors.dmi'; - icon_state = "asteroid" - }, -/area/centcom/evac) -"pkP" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - req_access = list(114) - }, -/obj/item/door_remote/centcomm, -/obj/item/clothing/head/beret/centcom/captain, -/obj/item/clothing/under/rank/centcom/captain, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" - }, -/obj/item/clothing/gloves/color/white, -/obj/item/storage/box/centcomofficer, -/obj/item/radio/headset/centcom, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/accessory/holster, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ - pixel_y = 8; - pixel_x = -4 - }, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_y = 12; - pixel_x = 10 - }, -/obj/item/megaphone, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "pkS" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -32993,22 +32441,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"pmr" = ( -/obj/item/flag/nt, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -2 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/decal/warning_stripes/west, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "pmF" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo3" @@ -33036,43 +32468,29 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"pnv" = ( -/obj/effect/turf_decal/caution/stand_clear, -/obj/effect/turf_decal/box, +"pnL" = ( +/obj/structure/railing, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"pnz" = ( -/obj/structure/table/wood/fancy/royalblue, -/obj/structure/window/plasmareinforced{ - color = "#22aab7"; - dir = 8 - }, -/obj/structure/window/plasmareinforced{ - color = "#22aab7"; - dir = 1 - }, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) -"pnE" = ( -/obj/item/storage/fancy/cigarettes/dromedaryco{ - pixel_y = 6 - }, -/obj/item/lighter/zippo{ - pixel_x = 5; - pixel_y = 4 + dir = 4; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/obj/structure/table/wood/fancy/royalblue, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) +/area/centcom/specops) "pnQ" = ( /obj/effect/turf_decal/stripes/gold{ dir = 5 }, /turf/simulated/floor/carpet/arcade, /area/centcom/bridge) +"pnZ" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "poo" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo19" @@ -33088,6 +32506,14 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"poN" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "pph" = ( /obj/structure/statue/sandstone/assistant{ anchored = 1; @@ -33107,6 +32533,15 @@ icon_state = "darkredcorners" }, /area/syndicate_mothership/infteam) +"ppl" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/computer, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "ppx" = ( /obj/machinery/light{ dir = 8 @@ -33133,15 +32568,15 @@ icon_state = "white" }, /area/centcom/zone1) +"ppZ" = ( +/obj/machinery/vending/cola/free, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "pqb" = ( /turf/simulated/wall/indestructible/reinforced, /area/centcom/jail) -"pql" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkred" - }, -/area/centcom/specops) "pqn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -33155,29 +32590,22 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/ninja/outside) -"pqC" = ( -/obj/effect/turf_decal/delivery/white, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_SRT1" - }, -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - hackProof = 1; - name = "Special ReactionTeam"; - opacity = 1; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "pqR" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo6" }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) +"pre" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1331; + id_tag = "admin_s_pump" + }, +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" + }, +/area/shuttle/administration) "prf" = ( /obj/machinery/door/airlock/shuttle{ id_tag = "s_docking_airlock"; @@ -33186,12 +32614,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/shuttle, /area/shuttle/siberia) -"prs" = ( -/obj/structure/closet/crate/can, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) "prI" = ( /obj/structure/table/wood{ color = "#996633" @@ -33206,45 +32628,79 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"prX" = ( +/obj/machinery/status_display{ + layer = 4; + pixel_y = -32 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"prZ" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/shuttle/engine/heater{ + icon_state = "heater2x2_side"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/shuttle/engine/platform{ + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) "psd" = ( /obj/machinery/computer/camera_advanced/shuttle_docker/ninja, /turf/simulated/floor/shuttle{ icon_state = "floor13" }, /area/shuttle/ninja) -"pse" = ( -/obj/machinery/door_control/secure{ - id = "gamma shuttle"; - name = "Gamma Armory Shutters"; - req_access = list(114); - pixel_x = 24; - pixel_y = 26 +"psn" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/portable_atmospherics/canister/oxygen{ + maximum_pressure = 50000 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "O2"; + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowaltstrip" + icon_state = "dark" }, /area/centcom/supply) -"psf" = ( -/turf/space/transit/east{ - icon_state = "speedspace_ew_1" - }, -/area/space) -"psn" = ( -/obj/structure/chair/office/dark{ - dir = 1 +"psv" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredalt" + dir = 8; + icon_state = "darkyellowalt" }, -/area/centcom/jail) +/area/centcom/zone3) "psE" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"psK" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "O2"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "pte" = ( /obj/structure/table/wood{ color = "#996633" @@ -33254,14 +32710,6 @@ }, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"ptx" = ( -/obj/structure/chair/sofa/right, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone1) "ptI" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -33315,6 +32763,24 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) +"ptV" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) +"pub" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "pun" = ( /mob/living/silicon/decoy/syndicate{ desc = "Мышь в естественной среде обитания"; @@ -33323,12 +32789,13 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/control) -"puz" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 1 +"pup" = ( +/obj/structure/chair/office/dark, +/obj/effect/turf_decal/siding/brown{ + dir = 8 }, /turf/simulated/floor/carpet/black, -/area/centcom/zone3) +/area/centcom/zone2) "puD" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/turf_decal/stripes/line{ @@ -33349,6 +32816,10 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) +"puM" = ( +/obj/structure/falsewall/reinforced, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/specops) "puO" = ( /obj/machinery/light/small{ dir = 4 @@ -33365,14 +32836,6 @@ /obj/effect/turf_decal/plaque, /turf/simulated/floor/carpet/black, /area/centcom/evac) -"pvl" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "pvn" = ( /obj/structure/chair/comfy/shuttle/dark, /turf/simulated/floor/shuttle{ @@ -33411,15 +32874,34 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"pvN" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) -"pwa" = ( -/turf/space/transit/north{ - icon_state = "speedspace_ns_1" +"pvS" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" }, -/area/space) +/area/centcom/specops) +"pvX" = ( +/obj/machinery/optable, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -30 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) +"pwb" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_AEG" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "pwr" = ( /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, @@ -33429,6 +32911,27 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"pwF" = ( +/obj/machinery/photocopier, +/obj/machinery/light, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"pxs" = ( +/obj/structure/chair/stool, +/obj/structure/sign/poster/contraband/punch_shit{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) +"pxy" = ( +/obj/structure/filingcabinet/employment, +/obj/item/radio/intercom/specops{ + pixel_y = -32 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "pxJ" = ( /obj/structure/table, /obj/item/grenade/plastic/c4{ @@ -33460,34 +32963,29 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"pyd" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444"; - dir = 4 +"pxK" = ( +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command"; + icon_state = "bigscanner" }, -/obj/machinery/light, -/turf/simulated/floor/wood/fancy/light, +/obj/structure/table/holotable/wood, +/turf/simulated/floor/carpet/black, /area/centcom/specops) -"pys" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom SOO"; - opacity = 1; - req_access = list(114) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); +"pyh" = ( +/obj/structure/shuttle/engine/platform{ dir = 1; - id_tag = "ERT_director_office_shutters"; - layer = 5; - locked = 1; - name = "CentCom SOO" + layer = 2.9 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/window/plasmareinforced{ + color = "#00f700" }, -/area/centcom/specops) +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "pyu" = ( /turf/simulated/floor/plasteel, /area/centcom/evac) @@ -33503,6 +33001,15 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"pzN" = ( +/obj/effect/turf_decal/arrows{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/supply) "pzQ" = ( /obj/item/pizzabox/meat{ desc = "Любимая пицца Шерлока Субботина" @@ -33511,25 +33018,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"pzZ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/chair/comfy/lime{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "pAe" = ( /obj/effect/turf_decal/arrows{ dir = 4 @@ -33538,16 +33026,6 @@ icon_state = "darkyellowalt" }, /area/centcom/supply) -"pAg" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/machinery/computer/rdservercontrol{ - badmin = 1; - name = "Master R&D Server Controller" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "pAp" = ( /obj/structure/chair/comfy/red{ color = "#FFFFFF"; @@ -33558,23 +33036,6 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"pAt" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1; - do_not_delete_me = 1 - }, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl4"; - name = "Armory level 4"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "pAI" = ( /obj/item/flag/ussp, /turf/simulated/floor/wood/fancy/light, @@ -33600,17 +33061,31 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"pBj" = ( -/obj/machinery/light/small, -/obj/structure/bookcase/random, -/turf/simulated/floor/carpet, -/area/centcom/zone1) +"pBp" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_ARG"; + name = "ARG"; + pixel_x = -24; + pixel_y = -24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowcorners" + }, +/area/centcom/specops) "pBt" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) +"pBA" = ( +/obj/machinery/computer/communications, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "pBH" = ( /obj/structure/table/wood, /obj/machinery/photocopier/faxmachine/longrange/syndie{ @@ -33658,25 +33133,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"pCj" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellow" - }, -/area/centcom/specops) -"pCq" = ( -/obj/machinery/door_control/secure{ - id = "Admin_shuttle_access"; - name = "Argos Shuttle Access"; - pixel_x = -24; - pixel_y = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/zone3) "pDd" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo6" @@ -33691,30 +33147,30 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"pDr" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = -6 - }, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = -6 +"pDz" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = 6 +/obj/effect/turf_decal/siding/brown/corner{ + dir = 1 }, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = 6 +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"pDE" = ( +/obj/machinery/computer/account_database{ + name = "Admin Accounts Database" }, -/obj/item/gun/energy/gun/nuclear{ - pixel_x = 6 +/obj/item/radio/intercom/specops{ + pixel_x = 32 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"pDH" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 }, +/turf/simulated/floor/glass/reinforced, /area/centcom/specops) "pDO" = ( /obj/effect/decal/syndie_logo{ @@ -33725,40 +33181,13 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) -"pDR" = ( -/obj/structure/filingcabinet/employment, -/obj/item/radio/intercom/specops{ - pixel_y = 32 +"pEc" = ( +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"pEa" = ( -/obj/structure/bookcase, -/turf/simulated/floor/wood, +/obj/structure/filingcabinet, +/turf/simulated/floor/carpet/black, /area/centcom/zone2) -"pEd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "admin_s_inner"; - name = "Ship External Access"; - req_access = list(101) - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1331; - master_tag = "admin_s_air_control"; - pixel_x = -1; - pixel_y = -29; - req_access = list(101) - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) "pEv" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo7" @@ -33766,25 +33195,32 @@ /obj/structure/chair/stool, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"pEA" = ( -/obj/structure/window/reinforced, -/obj/machinery/computer/crew, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkbluefull" - }, -/area/centcom/bridge) "pEE" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_SFG5" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door/airlock/shuttle{ + id_tag = "s_docking_airlock" }, -/area/centcom/specops) +/obj/structure/fans/tiny, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 12; + id = "ferry"; + name = "ferry shuttle"; + roundstart_move = "ferry_away"; + width = 5; + preferred_direction = 4 + }, +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 12; + id = "ferry_away"; + name = "centcom bay 2"; + turf_type = /turf/simulated/floor/plating/airless; + width = 5 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "pEI" = ( /obj/structure/sign/double/map/left{ pixel_y = 32 @@ -33801,23 +33237,11 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"pFm" = ( -/obj/machinery/light, -/turf/simulated/floor/carpet/red, -/area/shuttle/administration) -"pFn" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full" - }, -/obj/structure/railing{ - pixel_y = 32; - density = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" +"pFy" = ( +/obj/machinery/vending/security, +/turf/simulated/floor/indestructible{ + dir = 1; + icon_state = "darkpurple" }, /area/centcom/specops) "pFA" = ( @@ -33828,13 +33252,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"pFM" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/spacebar) "pFP" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, @@ -33845,24 +33262,19 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"pFW" = ( +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/centcom/specops) "pGk" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkredalt" }, /area/syndicate_mothership/control) -"pGs" = ( -/obj/structure/table/glass, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/reagent_containers/food/snacks/lasagna=10,/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza=10,/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg=10,/obj/item/reagent_containers/food/snacks/bigbiteburger=10,/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon=10,""=70); - lootcount = 20; - name = "Food CC Spawner #2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellow" - }, -/area/centcom/specops) "pGD" = ( /obj/machinery/light/small{ dir = 4 @@ -33879,54 +33291,29 @@ icon_state = "darkredcorners" }, /area/syndicate_mothership/infteam) -"pGF" = ( -/turf/simulated/floor/indestructible{ - dir = 1; - icon_state = "darkgreynavybluecorner" - }, -/area/centcom/specops) "pGJ" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, /area/centcom/evac) -"pHk" = ( -/obj/structure/sign/nuke{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navyblue" +"pHc" = ( +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/beach/sand{ + icon = 'icons/turf/floors.dmi'; + icon_state = "asteroid" }, -/area/centcom/specops) -"pHw" = ( -/obj/machinery/door/window/brigdoor{ - color = "#22aab7"; - dir = 8; - icon_state = "rightsecure"; - req_access = list(101) +/area/centcom/evac) +"pHO" = ( +/obj/structure/sink{ + dir = 1 }, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) -"pHB" = ( -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) -"pHG" = ( -/obj/effect/decal/nanotrasen_logo{ - icon_state = "logo3"; - pixel_x = 16 +/obj/structure/mirror{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"pHZ" = ( -/obj/machinery/vending/boozeomat, -/obj/structure/sign/barsign{ - pixel_y = 32 + icon_state = "white" }, -/turf/simulated/floor/carpet/black, /area/centcom/specops) "pIg" = ( /obj/structure/table/wood, @@ -33942,72 +33329,18 @@ /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"pIz" = ( -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) -"pIR" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" +"pIW" = ( +/obj/structure/window/reinforced{ + layer = 2.9 }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" +/obj/effect/turf_decal/box/white/corners{ + dir = 4 }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, +/obj/structure/weightmachine/stacklifter, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navyblue" + icon_state = "darkfull" }, -/area/centcom/specops) +/area/centcom/jail) "pJe" = ( /obj/structure/table, /obj/item/storage/toolbox/surgery{ @@ -34026,14 +33359,13 @@ icon_state = "darkgrey" }, /area/syndicate_mothership/infteam) -"pJo" = ( -/obj/structure/window/reinforced{ - dir = 4 +"pJr" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" }, -/obj/structure/table/wood, -/obj/item/candle/eternal, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) +/turf/simulated/floor/bluegrid, +/area/centcom/bridge) "pJv" = ( /obj/structure/chair{ dir = 4 @@ -34047,10 +33379,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"pJG" = ( -/obj/machinery/papershredder, -/turf/simulated/floor/plating, -/area/centcom/zone2) "pJV" = ( /obj/effect/turf_decal/siding/green{ dir = 1 @@ -34064,34 +33392,7 @@ /obj/structure/weightmachine/stacklifter, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"pKB" = ( -/obj/machinery/vending/cigarette/free, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) -"pKM" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_supply_external2"; - layer = 5; - locked = 1 - }, -/obj/machinery/door_control/secure{ - id = "CC_supply_external2"; - name = "Supply Internal Shutters"; - req_access = list(114); - pixel_x = -24 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) -"pLm" = ( -/obj/machinery/light{ - dir = 4 - }, +"pKU" = ( /turf/simulated/floor/carpet/black, /area/shuttle/administration) "pLC" = ( @@ -34105,14 +33406,28 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"pMe" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 +"pLN" = ( +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"pMq" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 175; + teleport_y = 61; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, -/area/centcom/zone2) +/area/centcom/specops) "pMv" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -34154,6 +33469,15 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"pNy" = ( +/obj/mecha/combat/gygax/ert{ + color = "#66ff99"; + name = "Assault Jaeger" + }, +/turf/simulated/floor/plasteel{ + icon_state = "navyblue" + }, +/area/centcom/specops) "pNM" = ( /turf/space/transit/north, /area/space) @@ -34177,10 +33501,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"pOp" = ( -/obj/structure/shuttle/engine/propulsion/burst, -/turf/simulated/floor/plating/airless, -/area/shuttle/mining) "pOr" = ( /obj/effect/turf_decal/siding{ color = "#444444"; @@ -34222,48 +33542,39 @@ icon_state = "rampbottom" }, /area/syndicate_mothership) -"pOT" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - damage_deflection = 2000; - layer = 2.9; - name = "Frag grenade"; - req_access = list(114) +"pOM" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/food/snacks/bigbiteburger, +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "nanotrasen_sign2"; + pixel_x = -16; + pixel_y = 32 }, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, -/obj/item/grenade/frag, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"pPC" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" +"pOQ" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/machinery/status_display/supply_display{ + pixel_x = -32 }, -/area/centcom/specops) -"pPK" = ( -/obj/effect/turf_decal/stripes/line{ - icon = 'icons/turf/floors.dmi'; - icon_state = "siding8" +/obj/structure/window/reinforced/tinted{ + dir = 1; + pixel_y = 6 }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"pOU" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen/multi/fountain, /turf/simulated/floor/plasteel{ - color = "gray"; - dir = 1; - icon_state = "rampbottom" + dir = 8; + icon_state = "darkredalt" }, -/area/centcom/supply) +/area/centcom/jail) "pPN" = ( /obj/effect/landmark/syndicate_commando{ tag = "Commando" @@ -34362,6 +33673,15 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"pSw" = ( +/obj/effect/turf_decal/tile/neutral{ + alpha = 150; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "pSK" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ frequency = 1331; @@ -34418,19 +33738,6 @@ icon_state = "dark" }, /area/syndicate_mothership/elite_squad) -"pTc" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/turf/simulated/floor/plasteel{ - icon_state = "redfull"; - tag = "icon-redfull (NORTHWEST)" - }, -/area/centcom/zone1) "pTf" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -34449,9 +33756,27 @@ tag = "icon-stage_stairs" }, /area/centcom/zone1) -"pTY" = ( -/turf/simulated/wall/shuttle/nodiagonal, -/area/shuttle/administration) +"pTK" = ( +/obj/machinery/door/airlock/command/glass{ + frequency = 2000; + icon_state = "open"; + id_tag = "CC-OP4-Int"; + locked = 1; + name = "Zone 2" + }, +/obj/effect/decal/warning_stripes/blue, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 2000; + master_tag = "CC-OP4"; + name = "CC-OP4-INT"; + pixel_y = 24; + req_access = list(109) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "pUa" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -34497,6 +33822,22 @@ icon_state = "dark" }, /area/centcom/evac) +"pUz" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "CC_ERT2" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" + }, +/area/centcom/specops) +"pUC" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluealt" + }, +/area/centcom/specops) "pUJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -34535,16 +33876,29 @@ icon_state = "freezerfloor" }, /area/centcom/jail) +"pUX" = ( +/obj/structure/rack, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/item/ammo_box/magazine/m556, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "pVc" = ( /obj/structure/ore_box, /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership) -"pVg" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "pVs" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating{ @@ -34582,13 +33936,16 @@ /obj/structure/flora/grass/jungle/b, /turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) -"pVW" = ( -/obj/structure/chair/comfy/brown{ - color = "#FF3300"; - dir = 1 +"pVX" = ( +/obj/structure/chair/comfy/red, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) "pWj" = ( /obj/structure/table/wood, /obj/item/paper_bin/syndicate, @@ -34601,22 +33958,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"pWo" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/obj/machinery/door/airlock/centcom{ - name = "Emergency Response Team"; - opacity = 1; - req_access = list(109) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "pWv" = ( /obj/effect/turf_decal/siding/wideplating{ color = "#55391A"; @@ -34626,34 +33967,18 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"pWF" = ( -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining"; - name = "mining shuttle"; - rebuildable = 1; - roundstart_move = "mining_home"; - width = 7 - }, -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - req_access = list(48) +"pWS" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 3; - height = 5; - id = "mining_transit"; - name = "mining in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 7 +/obj/structure/showcase{ + layer = 4.1; + pixel_x = -5; + pixel_y = 5 }, -/turf/simulated/floor/shuttle, -/area/shuttle/mining) +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "pWX" = ( /obj/structure/window/reinforced{ dir = 8 @@ -34662,29 +33987,14 @@ /obj/item/deck/cards, /turf/simulated/floor/wood, /area/centcom/zone1) -"pXH" = ( -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - damage_deflection = 2000; - layer = 2.9; - name = "Nuclear Fission Grenade"; - req_access = list(114) - }, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/item/grenade/confetti, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = -32 +"pXf" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/red{ + dir = 4; + req_access = list(104,109) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkredfull" }, /area/centcom/specops) "pXQ" = ( @@ -34694,16 +34004,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"pYa" = ( -/obj/structure/sign/poster/official/twelve_gauge{ - pixel_y = -32 - }, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navyblue" - }, -/area/centcom/specops) "pYo" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo9" @@ -34716,23 +34016,31 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"pYF" = ( -/obj/structure/window/reinforced{ - layer = 2.9 +"pYv" = ( +/obj/structure/closet/secure_closet/cabinet/bar{ + req_access = list() }, -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/waterbottle, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/obj/item/storage/box/beakers/bluespace, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "pYK" = ( /obj/structure/grille, /obj/structure/window/full/shuttle/ninja, /turf/simulated/floor/shuttle/plating, /area/shuttle/ninja) -"pYU" = ( -/obj/structure/table/wood/fancy/black, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) "pYZ" = ( /obj/structure/curtain/open/shower/security{ pixel_x = 32 @@ -34754,33 +34062,39 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"pZj" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" +"pZG" = ( +/obj/machinery/door/airlock/external{ + id_tag = "s_docking_airlock"; + name = "Shuttle Hatch"; + req_access = list(109) }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/docking_port/mobile{ + dir = 2; + dwidth = 2; + height = 11; + id = "specops"; + name = "ert shuttle"; + roundstart_move = "specops_away"; + width = 5 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_4) -"pZH" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkredalt" - }, -/area/centcom/jail) -"pZL" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "CC_ERT1" +/obj/structure/fans/tiny, +/obj/docking_port/stationary{ + dir = 2; + dwidth = 2; + height = 11; + id = "specops_away"; + name = "centcom bay 3"; + top_left_corner = 8; + top_right_corner = 1; + width = 5; + turf_type = /turf/simulated/floor/plating/airless }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/specops) +"pZY" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "darkgreen" }, /area/centcom/specops) "qaa" = ( @@ -34797,6 +34111,13 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"qap" = ( +/obj/structure/railing, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navybluealt" + }, +/area/centcom/specops) "qar" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo11" @@ -34822,11 +34143,14 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) -"qbr" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/beer/upgraded, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) +"qbO" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "qck" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/indestructible/asteroid; @@ -34865,6 +34189,16 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/jail) +"qcB" = ( +/obj/machinery/door/window/brigdoor{ + dir = 8; + req_access = list(104) + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredaltstrip" + }, +/area/centcom/jail) "qcF" = ( /obj/machinery/bodyscanner{ layer = 3.5 @@ -34876,25 +34210,6 @@ icon_state = "white" }, /area/centcom/zone1) -"qcL" = ( -/obj/structure/railing, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"qcS" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 7; - height = 5; - id = "sit_away"; - name = "Syndicate Base"; - turf_type = /turf/simulated/floor/indestructible/plating; - width = 11 - }, -/turf/simulated/floor/plating, -/area/syndicate_mothership/infteam) "qcY" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 @@ -34904,6 +34219,10 @@ }, /turf/simulated/floor/carpet/red, /area/centcom/zone1) +"qdd" = ( +/obj/machinery/papershredder, +/turf/simulated/floor/plating, +/area/centcom/zone2) "qdI" = ( /obj/structure/closet/crate/can, /obj/machinery/light/small{ @@ -34913,37 +34232,13 @@ icon_state = "dark" }, /area/centcom/zone1) -"qfa" = ( -/obj/structure/falsewall/reinforced, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/specops) -"qff" = ( +"qfj" = ( /obj/effect/turf_decal/siding{ color = "#444444"; - dir = 1 + dir = 5 }, -/obj/machinery/computer/shuttle/ert, -/turf/simulated/floor/wood/fancy/light, +/turf/simulated/floor/glass/reinforced, /area/centcom/specops) -"qfn" = ( -/obj/structure/chair/office/dark, -/obj/effect/turf_decal/siding/brown{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"qfv" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 3; - height = 5; - id = "sst_away"; - name = "Syndicate Base"; - turf_type = /turf/simulated/floor/indestructible/plating; - width = 11 - }, -/turf/simulated/floor/plating, -/area/syndicate_mothership/elite_squad) "qfz" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -34965,15 +34260,17 @@ icon_state = "darkgrey" }, /area/syndicate_mothership/elite_squad) -"qfG" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +"qfJ" = ( +/obj/machinery/door/airlock/centcom{ + name = "Prison"; + opacity = 1; + req_access = list(104) }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" +/obj/effect/decal/warning_stripes/red, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) "qfN" = ( /obj/effect/turf_decal/loading_area/white{ dir = 8 @@ -34982,15 +34279,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/elite_squad) -"qfX" = ( -/obj/structure/table/reinforced, -/obj/machinery/chem_dispenser/soda/upgraded, -/obj/item/storage/box/drinkingglasses{ - pixel_x = 1; - pixel_y = 5 - }, -/turf/simulated/floor/carpet/black, -/area/shuttle/administration) "qfY" = ( /obj/structure/fence{ color = "#b0b7c6"; @@ -35012,6 +34300,14 @@ icon_state = "darkfull" }, /area/syndicate_mothership/elite_squad) +"qgA" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/shuttle/engine/heater, +/turf/simulated/floor/plating/airless, +/area/shuttle/siberia) "qgP" = ( /obj/structure/holohoop{ dir = 8 @@ -35062,38 +34358,12 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) -"qif" = ( -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - hackProof = 1; - name = "Special ReactionTeam"; - opacity = 1; - req_access = list(114) - }, -/obj/effect/turf_decal/delivery/white, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_SRT1" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "qim" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/simulated/floor/carpet/black, /area/ninja/outpost) -"qix" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "qiB" = ( /obj/structure/closet/crate/syndicate{ pixel_x = -4; @@ -35104,9 +34374,38 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) +"qiO" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowaltstrip" + }, +/area/centcom/zone3) "qiR" = ( /turf/simulated/floor/plating, /area/syndicate_mothership) +"qja" = ( +/obj/structure/filingcabinet/chestdrawer{ + anchored = 0 + }, +/obj/structure/sign/poster/ripped{ + pixel_y = -32 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"qjA" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "N2O"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "qjR" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -35138,13 +34437,6 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"qjY" = ( -/obj/item/clothing/accessory/stripedredscarf, -/obj/item/clothing/head/hopcap, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "qkl" = ( /obj/machinery/slot_machine, /obj/structure/window/reinforced{ @@ -35163,18 +34455,45 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"qkE" = ( -/obj/effect/turf_decal/siding/white/corner, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"qkx" = ( +/obj/structure/bed, +/obj/item/bedsheet/qm, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 }, -/area/centcom/jail) +/turf/simulated/floor/carpet/arcade, +/area/centcom/zone1) "qkT" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo6" }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership) +"qkU" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + id_tag = "ERT_armory_lvl1"; + name = "Armory level 1"; + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) +"qlu" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "qlw" = ( /obj/structure/table/wood, /obj/item/folder/red{ @@ -35192,6 +34511,12 @@ icon_state = "warnwhite" }, /area/centcom/zone1) +"qlP" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone3) "qlQ" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -35201,6 +34526,9 @@ icon_state = "vault" }, /area/shuttle/escape) +"qlX" = ( +/turf/simulated/floor/carpet, +/area/centcom/zone3) "qmc" = ( /obj/machinery/computer/syndie_supplycomp, /turf/simulated/floor/shuttle{ @@ -35208,18 +34536,22 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"qml" = ( -/obj/structure/sign/poster/official/high_class_martini{ - pixel_x = 32 +"qms" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +/obj/structure/window/plasmareinforced{ + color = "#22aab7"; + dir = 8 }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" +/obj/structure/shuttle/engine/platform{ + dir = 4; + layer = 2.9 }, -/area/centcom/specops) +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) "qmw" = ( /obj/structure/table/reinforced, /obj/item/tank/jetpack/oxygen/harness{ @@ -35234,30 +34566,31 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"qmE" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/supply) -"qmN" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "qnc" = ( /obj/structure/shuttle/engine/huge, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/cargo) -"qnr" = ( -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +"qnE" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/beakers/bluespace, +/obj/item/storage/box/beakers/bluespace, +/obj/item/storage/box/beakers/bluespace, +/obj/item/reagent_scanner/adv, +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/centcom/specops) +"qnP" = ( +/obj/structure/railing{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "qnT" = ( /obj/structure/chair/sofa/pew/right, /turf/simulated/floor/plasteel{ @@ -35274,6 +34607,16 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"qog" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/door/window/brigdoor{ + base_state = "rightsecure"; + dir = 8; + icon_state = "rightsecure"; + name = "CentComm Chemical lab" + }, +/turf/simulated/floor/engine, +/area/centcom/specops) "qok" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium_corner" @@ -35292,49 +34635,36 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"qon" = ( -/obj/machinery/computer/communications, -/obj/structure/window/reinforced{ +"qoC" = ( +/obj/machinery/computer/bsa_control/admin{ + integrity_failure = 20; + req_access = list(114) + }, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/centcom/specops) -"qop" = ( -/obj/structure/table/glass, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen/multi/fountain, -/obj/item/lighter/zippo/blue{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/clothing/mask/cigarette/cigar/cohiba{ - pixel_x = -4; - pixel_y = 9 +"qoH" = ( +/obj/machinery/door/airlock/centcom{ + name = "Archive"; + opacity = 1; + req_access = list(113) }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/carpet, -/area/centcom/specops) -"qow" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/administration) +/area/centcom/zone2) "qoS" = ( -/obj/structure/sign/greencross{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/stripes/black{ dir = 8; - icon_state = "darkredalt" + do_not_delete_me = 1 }, -/area/centcom/jail) -"qpb" = ( -/obj/structure/table/glass, -/obj/item/pizzabox/vegetable, -/turf/simulated/floor/plasteel{ - icon_state = "darkred" +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" }, -/area/centcom/specops) +/area/shuttle/administration) "qpI" = ( /obj/effect/turf_decal{ dir = 9; @@ -35348,22 +34678,28 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"qpM" = ( +/obj/structure/table/wood/fancy/royalblue, +/obj/item/storage/ashtray/glass{ + pixel_x = -6; + pixel_y = 7 + }, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"qpP" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/sign/poster/official/ian{ + pixel_y = 31 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "qpQ" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"qpR" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1; - pixel_y = 3 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "qpS" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo13" @@ -35403,12 +34739,16 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"qqt" = ( -/obj/structure/bookcase, -/turf/simulated/floor/wood{ - icon_state = "wood-broken6" +"qqE" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + tag = "icon-heater (NORTH)" }, -/area/centcom/zone2) +/obj/structure/window/reinforced{ + color = "black" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/funeral) "qqG" = ( /obj/structure/bed/roller, /obj/item/radio/intercom{ @@ -35430,22 +34770,30 @@ icon_state = "white" }, /area/centcom/zone3) +"qqU" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 8; + id_tag = "CC_supply_internal"; + layer = 5; + locked = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "qqV" = ( /obj/machinery/vending/cola/free, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/evac) -"qrm" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/flag/nt, +"qrg" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "darkred" }, -/area/centcom/bridge) +/area/centcom/specops) "qrL" = ( /obj/item/flag/syndi, /turf/simulated/floor/plasteel{ @@ -35453,6 +34801,32 @@ icon_state = "darkred" }, /area/syndicate_mothership/infteam) +"qrR" = ( +/obj/structure/chair/sofa{ + dir = 5 + }, +/turf/simulated/floor/carpet/red, +/area/centcom/zone1) +"qsa" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_ARG" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"qse" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "nanotrasen_sign5"; + pixel_x = -16; + pixel_y = 32 + }, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" + }, +/area/centcom/specops) "qso" = ( /obj/structure/chair/stool, /turf/simulated/floor/mineral/plastitanium, @@ -35491,6 +34865,17 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"qsJ" = ( +/obj/item/radio/intercom/specops{ + pixel_x = 28; + pixel_y = -42 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 9 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "qsK" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -35532,18 +34917,11 @@ }, /area/centcom/zone2) "qsV" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_LWAP"; - name = "L.W.A.P. Sniper Rifle"; - pixel_x = 24; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkred" +/obj/machinery/computer/shuttle/ferry/request{ + req_access = list(101) }, -/area/centcom/specops) +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "qti" = ( /obj/machinery/light/small{ dir = 8 @@ -35553,6 +34931,11 @@ }, /area/shuttle/trade/sol) "qtk" = ( +/obj/machinery/door/airlock/shuttle, +/obj/structure/fans/tiny, +/obj/docking_port/mobile/gamma{ + port_direction = 8 + }, /obj/docking_port/stationary{ dir = 4; dwidth = 4; @@ -35561,25 +34944,26 @@ name = "gamma centcom"; width = 7 }, -/turf/space{ - icon_state = "black" +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/area/space) +/area/shuttle/gamma) "qto" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "navybluealtstrip" }, /area/centcom/specops) -"qty" = ( -/obj/effect/baseturf_helper{ - baseturf = /turf/simulated/floor/indestructible/plating; - name = "plating baseturf editor" +"qtP" = ( +/obj/effect/turf_decal/caution/stand_clear/white, +/obj/machinery/door/poddoor/impassable/unhittable{ + id_tag = "CC_Players_In"; + name = "Blast Door" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/bridge) +/area/centcom/zone2) "qtS" = ( /obj/structure/railing{ dir = 8 @@ -35589,26 +34973,37 @@ icon_state = "dark" }, /area/syndicate_mothership/jail) -"quz" = ( -/obj/structure/sign/poster/official/help_others{ - pixel_y = 32 +"quv" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3"; + tag = "icon-heater (NORTH)" }, -/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/plating/airless, +/area/centcom/jail) +"quA" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/conveyor{ + id = "CO2"; + dir = 1 }, -/area/centcom/specops) -"qvu" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 8; - id_tag = "CC_supply_external"; - layer = 5; - locked = 1 +/obj/machinery/portable_atmospherics/canister/carbon_dioxide{ + maximum_pressure = 50000 }, /turf/simulated/floor/plasteel{ - icon_state = "darkyellowalt" + icon_state = "dark" }, /area/centcom/supply) +"quG" = ( +/obj/structure/chair/comfy/brown, +/turf/simulated/floor/wood, +/area/centcom/specops) +"quT" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "qvD" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -35622,21 +35017,6 @@ /obj/structure/chair/stool, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"qvY" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "qwd" = ( /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = 32 @@ -35647,23 +35027,25 @@ icon_state = "darkyellow" }, /area/shuttle/escape) -"qwi" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater2x2_side"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/reinforced{ - color = "yellow"; - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/trade/sol) "qwp" = ( /obj/effect/turf_decal/plaque, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"qww" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/glass, +/area/centcom/zone3) "qwy" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 1 @@ -35683,18 +35065,23 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"qxs" = ( -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "admin_s_inner"; - name = "Ship External Access"; - req_access = list(101) +"qxb" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/food/snacks/validsalad, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" +/area/centcom/specops) +"qxd" = ( +/obj/effect/decal/cleanable/crayon{ + icon_state = "bodys"; + pixel_x = 14; + pixel_y = 32 }, -/area/shuttle/administration) +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/wood, +/area/centcom/specops) "qxt" = ( /obj/structure/table/wood/fancy/black, /turf/simulated/floor/plasteel{ @@ -35729,6 +35116,18 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"qyk" = ( +/obj/machinery/vending/coffee/free, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) +"qyq" = ( +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "darkgrey" + }, +/area/shuttle/administration) "qyL" = ( /obj/effect/turf_decal/stripes/line{ dir = 4; @@ -35738,20 +35137,6 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"qza" = ( -/obj/mecha/combat/marauder/seraph/loaded{ - armor = list("melee"=80,"bullet"=80,"laser"=80,"energy"=80,"bomb"=80,"bio"=80,"rad"=80,"fire"=100,"acid"=100); - name = "D2"; - operation_req_access = list(109) - }, -/obj/effect/turf_decal/mech, -/obj/machinery/light, -/turf/simulated/floor/indestructible{ - dir = 8; - icon_state = "vault"; - name = "Operative position" - }, -/area/centcom/jail) "qzC" = ( /obj/structure/window/reinforced{ color = "red"; @@ -35776,51 +35161,160 @@ tag = "icon-redfull (NORTHWEST)" }, /area/centcom/zone1) -"qzX" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 +"qzU" = ( +/obj/machinery/light/small{ + dir = 1 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) +"qAL" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/captain_fly{ + name = "rogue uniform" }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 +/obj/item/clothing/under/captainparade{ + name = "parade uniform" }, -/turf/simulated/floor/glass, -/area/centcom/zone3) -"qAe" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" +/obj/item/clothing/under/captainparade{ + name = "parade uniform" }, -/area/centcom/bridge) -"qAj" = ( -/obj/structure/sign/poster/official/soft_cap_pop_art{ - pixel_x = -32 +/obj/item/clothing/under/captain_fly{ + name = "rogue uniform" }, -/obj/machinery/power/smes/vintage, -/turf/simulated/floor/plating, -/area/centcom/zone3) -"qAy" = ( -/obj/structure/shuttle/engine/heater, -/turf/simulated/floor/plating/airless, -/area/centcom/jail) -"qAF" = ( -/obj/effect/turf_decal/siding/brown, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/item/clothing/under/assistantformal, +/obj/item/clothing/under/fluff/benjaminfallout, +/obj/item/clothing/under/fluff/benjaminfallout, +/obj/item/clothing/under/fluff/elishirt, +/obj/item/clothing/under/fluff/elishirt, +/obj/item/clothing/under/fluff/jay_turtleneck, +/obj/item/clothing/under/fluff/jay_turtleneck, +/obj/item/clothing/under/lawyer/black, +/obj/item/clothing/under/lawyer/black, +/obj/item/clothing/under/lawyer/blue, +/obj/item/clothing/under/lawyer/blue, +/obj/item/clothing/under/lawyer/bluesuit, +/obj/item/clothing/under/lawyer/bluesuit, +/obj/item/clothing/under/lawyer/female, +/obj/item/clothing/under/lawyer/female, +/obj/item/clothing/under/lawyer/oldman, +/obj/item/clothing/under/lawyer/oldman, +/obj/item/clothing/under/lawyer/red, +/obj/item/clothing/under/lawyer/red, +/obj/item/clothing/under/mafia{ + name = "black outfit" }, -/area/centcom/zone3) +/obj/item/clothing/under/mafia{ + name = "black outfit" + }, +/obj/item/clothing/under/mafia/white{ + name = "white outfit" + }, +/obj/item/clothing/under/mafia/white{ + name = "white outfit" + }, +/obj/item/clothing/under/misc/durathread, +/obj/item/clothing/under/misc/durathread, +/obj/item/clothing/under/retro/engineering, +/obj/item/clothing/under/retro/engineering, +/obj/item/clothing/under/retro/medical, +/obj/item/clothing/under/retro/medical, +/obj/item/clothing/under/retro/science, +/obj/item/clothing/under/retro/science, +/obj/item/clothing/under/retro/security, +/obj/item/clothing/under/retro/security, +/obj/item/clothing/under/color/black{ + icon_state = "hosblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hosblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hosdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hostanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "hostanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officerdnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officertanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "officertanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardenblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardenblueclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardendnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardendnavyclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardentanclothes"; + name = "jumpsuit" + }, +/obj/item/clothing/under/color/black{ + icon_state = "wardentanclothes"; + name = "jumpsuit" + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "qAN" = ( /obj/machinery/vending/wallmed/syndicate{ pixel_y = -32 }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"qBf" = ( +/obj/machinery/autolathe/security{ + hacked = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "qBj" = ( /obj/effect/turf_decal/box{ do_not_delete_me = 1 @@ -35836,12 +35330,15 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"qBD" = ( +"qBn" = ( +/obj/structure/sign/securearea{ + pixel_y = -32 + }, /turf/simulated/floor/plasteel{ dir = 10; - icon_state = "navybluealtstrip" + icon_state = "navybluealt" }, -/area/centcom/supply) +/area/centcom/specops) "qBE" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/beach/water{ @@ -35881,19 +35378,14 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"qCq" = ( -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 - }, -/obj/machinery/computer, -/obj/structure/window/reinforced{ +"qCu" = ( +/obj/effect/turf_decal/siding/white{ dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/bridge) +/area/centcom/evac) "qCy" = ( /obj/structure/closet/secure_closet/freezer/meat{ broken = 1; @@ -35917,6 +35409,12 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) +"qCI" = ( +/turf/simulated/floor/indestructible{ + dir = 6; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "qDA" = ( /turf/simulated/floor/shuttle, /area/shuttle/mining) @@ -35929,6 +35427,26 @@ }, /turf/simulated/wall/indestructible/reinforced/rusted, /area/ninja/holding) +"qDR" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 10; + pixel_x = -1; + pixel_y = -1 + }, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone2) +"qDT" = ( +/obj/machinery/door/airlock/external{ + id_tag = "ferry_away"; + name = "Ferry Airlock"; + req_access = list(106) + }, +/obj/structure/fans/tiny, +/obj/effect/turf_decal/delivery/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "qEc" = ( /obj/effect/turf_decal/siding/red{ color = "#aa2222" @@ -35965,15 +35483,6 @@ icon_state = "darkblue" }, /area/shuttle/escape) -"qEZ" = ( -/obj/machinery/computer/account_database, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "qFa" = ( /obj/structure/window/reinforced{ dir = 1 @@ -35985,6 +35494,12 @@ icon_state = "dark" }, /area/centcom/evac) +"qFk" = ( +/turf/simulated/floor/indestructible{ + dir = 9; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "qFm" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -36023,10 +35538,6 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"qFJ" = ( -/obj/structure/filingcabinet/employment, -/turf/simulated/floor/bluegrid, -/area/centcom/bridge) "qFV" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -36054,6 +35565,14 @@ /obj/effect/turf_decal/stripes/black, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) +"qGH" = ( +/obj/vehicle/ridden/motorcycle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/syndicate_mothership) "qGW" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -36064,10 +35583,6 @@ /obj/machinery/light, /turf/simulated/floor/carpet/black, /area/centcom/bridge) -"qHw" = ( -/obj/machinery/light/small, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) "qHC" = ( /obj/item/deck/cards/syndicate{ pixel_x = -6; @@ -36087,6 +35602,12 @@ /obj/structure/chair/sofa/right, /turf/simulated/floor/carpet/red, /area/centcom/zone1) +"qIo" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone2) "qIt" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -36111,18 +35632,17 @@ icon_state = "neutralcorner" }, /area/centcom/evac) -"qJi" = ( -/obj/item/storage/briefcase, -/obj/structure/table/wood/fancy/black, -/obj/item/paper/safe_code{ - owner = "NNC" +"qJo" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 8; + id_tag = "ERT_Drop" }, -/obj/item/folder/yellow, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = 32 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/area/centcom/specops) "qJu" = ( /obj/structure/window/reinforced, /turf/simulated/floor/grass, @@ -36134,17 +35654,55 @@ icon_state = "darkred" }, /area/shuttle/escape) -"qJV" = ( -/obj/machinery/door/airlock/centcom{ - name = "Prison"; - opacity = 1; - req_access = list(104) +"qJz" = ( +/obj/structure/rack/gunrack, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -3 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = 5 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -11 + }, +/obj/effect/decal/warning_stripes/white, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = -6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6 + }, +/obj/item/gun/energy/gun/advtaser{ + pixel_x = 6 }, -/obj/effect/decal/warning_stripes/red, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/jail) +/area/centcom/specops) "qJW" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo19" @@ -36154,11 +35712,34 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) -"qKq" = ( -/obj/machinery/vending/cola, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"qKp" = ( +/obj/item/gun/projectile/automatic/pistol/m1911, +/obj/item/ammo_box/magazine/m45, +/obj/item/ammo_box/magazine/m45, +/obj/item/ammo_box/magazine/m45, +/obj/item/clothing/head/helmet/space/deathsquad/beret, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/suit/space/deathsquad/officer, +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/radio/headset/ert{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/storage/box/centcomofficer, +/obj/item/clothing/head/beret/centcom/officer, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/obj/structure/closet/cabinet{ + req_access = list(114) }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "qKF" = ( /obj/effect/turf_decal/stripes/line{ @@ -36185,6 +35766,13 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/shuttle/plating, /area/shuttle/pod_1) +"qLe" = ( +/obj/machinery/light/spot{ + dir = 8; + tag = "icon-tube1 (WEST)" + }, +/turf/simulated/floor/shuttle, +/area/shuttle/supply) "qLl" = ( /obj/machinery/vending/sovietsoda, /obj/effect/turf_decal/stripes/gold{ @@ -36222,6 +35810,12 @@ icon_state = "darkgrey" }, /area/syndicate_mothership/elite_squad) +"qMf" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkredalt" + }, +/area/centcom/specops) "qMv" = ( /obj/structure/statue/sandstone/assistant{ anchored = 1; @@ -36257,21 +35851,6 @@ icon_state = "white" }, /area/centcom/specops) -"qMC" = ( -/turf/simulated/wall/shuttle, -/area/shuttle/nt_droppod) -"qMO" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_ARG"; - name = "ARG"; - pixel_x = -24; - pixel_y = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowcorners" - }, -/area/centcom/specops) "qNc" = ( /obj/structure/chair/wood, /turf/simulated/floor/wood, @@ -36309,6 +35888,23 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"qNE" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/effect/turf_decal/siding/yellow, +/turf/simulated/floor/carpet, +/area/centcom/evac) "qOg" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -36320,13 +35916,15 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"qOr" = ( -/obj/effect/decal/warning_stripes/north, +"qOk" = ( +/obj/effect/landmark/marauder_exit, +/obj/structure/fans/tiny, /obj/effect/turf_decal/tile/neutral{ - alpha = 150; + alpha = 220; color = "black"; icon_state = "tile_full"; - layer = 9 + layer = 9; + opacity = 1 }, /turf/simulated/floor/plating, /area/centcom/supply) @@ -36340,36 +35938,12 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"qOR" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 175; - teleport_y = 61; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, +"qOP" = ( +/obj/mecha/combat/gygax/ert/loaded, +/obj/item/mecha_parts/mecha_equipment/repair_droid, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/engine, /area/centcom/specops) -"qOT" = ( -/obj/machinery/computer/card{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 5; - do_not_delete_me = 1; - icon_state = "gs_deadlock" - }, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) "qPh" = ( /obj/structure/table/reinforced, /obj/item/kitchen/sushimat, @@ -36398,27 +35972,6 @@ }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"qPL" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 5; - do_not_delete_me = 1 - }, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) -"qPR" = ( -/obj/structure/railing{ - pixel_y = 32; - density = 0 - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, -/area/centcom/specops) "qQa" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22"; @@ -36470,50 +36023,11 @@ icon_state = "dark" }, /area/centcom/zone2) -"qRx" = ( -/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ - dir = 1; - id_tag = "ERT_Quarantine" - }, -/obj/machinery/porta_turret/centcom/pulse{ - armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - color = "#666666"; - damtype = "burn"; - health = 1250; - region_max = 12; - scan_range = 12; - shot_delay = 8; - name = "Quarantine Pulse Turret" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"qRz" = ( -/obj/machinery/door/airlock/centcom{ - id_tag = "adminshuttle"; - name = "Bridge"; - opacity = 1; - req_access = list(101) - }, -/obj/effect/turf_decal/stripes/black{ - dir = 8; - do_not_delete_me = 1 - }, -/obj/effect/turf_decal/stripes/black{ - dir = 4; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) -"qRJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1331; - id_tag = "synd_pump_bottom" +"qRJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1331; + id_tag = "synd_pump_bottom" }, /obj/effect/turf_decal/stripes/line{ dir = 5; @@ -36529,52 +36043,30 @@ /obj/item/storage/box/matches, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"qSh" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; - id_tag = "admin_s_pump" - }, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) "qSv" = ( /turf/simulated/floor/plasteel{ icon_state = "darkbluealt" }, /area/syndicate_mothership/elite_squad) -"qSC" = ( -/obj/structure/window/full/reinforced{ - layer = 2 - }, -/obj/machinery/door/poddoor/shutters/invincible{ - density = 0; - dir = 8; - icon_state = "open"; - id_tag = "CC_space_jail_sec"; - layer = 50; - level = 3; +"qTo" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/airlock/gold/glass{ + frequency = 2000; + hackable = 0; + id_tag = "CC-OP4-Ext"; locked = 1; - name = "Central Command Jail"; - opacity = 0 + name = "Zone 3" }, -/turf/simulated/floor/plating, -/area/centcom/jail) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "qTw" = ( /obj/machinery/computer/operating, /turf/simulated/floor/shuttle{ icon_state = "floor3" }, /area/shuttle/syndicate) -"qTA" = ( -/obj/effect/turf_decal/siding/white{ - dir = 1; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "qTB" = ( /obj/machinery/cryopod{ dir = 4 @@ -36584,34 +36076,21 @@ icon_state = "navyblue" }, /area/centcom/specops) -"qTI" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Labor Shuttle Airlock" +"qTJ" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp"; - name = "labor camp shuttle"; - rebuildable = 1; - roundstart_move = "laborcamp_home"; - width = 9 +/obj/effect/turf_decal/siding/white{ + dir = 4 }, -/obj/structure/fans/tiny, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_transit"; - name = "labor in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 9 +/obj/effect/turf_decal/siding/white{ + dir = 1 }, -/turf/simulated/floor/shuttle, -/area/shuttle/siberia) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "qUb" = ( /obj/machinery/door/airlock/command/glass{ frequency = 2000; @@ -36634,50 +36113,28 @@ }, /area/centcom/zone2) "qUi" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkyellow" +/turf/simulated/floor/shuttle{ + icon_state = "floor4" }, -/area/centcom/specops) +/area/shuttle/gamma) "qUq" = ( /obj/effect/turf_decal/stripes/gold{ dir = 5 }, /turf/simulated/floor/carpet/black, /area/centcom/bridge) -"qVQ" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/reinforced{ - color = "red" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_sit) -"qVW" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_y = -2 +"qVd" = ( +/obj/structure/cable{ + icon_state = "2-6" }, -/obj/machinery/light, -/obj/item/soap/nanotrasen{ - pixel_y = 8 +/obj/machinery/photocopier{ + icon_state = "fax" }, -/turf/simulated/floor/plasteel/freezer, +/turf/simulated/floor/plating, /area/centcom/specops) -"qVX" = ( -/obj/machinery/vending/wallmed{ - pixel_x = -30; - pixel_y = 30 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "qVY" = ( /obj/structure/sink{ dir = 1 @@ -36686,17 +36143,9 @@ icon_state = "white" }, /area/centcom/zone1) -"qWE" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/gold/glass{ - frequency = 2000; - hackable = 0; - id_tag = "CC-OP4-Ext"; - locked = 1; - name = "Zone 3" - }, +"qWa" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkyellowcorners" }, /area/centcom/specops) "qXa" = ( @@ -36710,13 +36159,12 @@ icon_state = "darkbluecornersalt" }, /area/syndicate_mothership/elite_squad) -"qXJ" = ( -/obj/machinery/door/window/brigdoor{ - dir = 8; - req_access = list(106) +"qXF" = ( +/obj/machinery/clonepod/upgraded, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" }, -/turf/simulated/floor/wood, -/area/centcom/zone3) +/area/shuttle/administration) "qXK" = ( /obj/machinery/door_control/secure{ id = "SST_armory_mech_maintenance"; @@ -36819,6 +36267,21 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"qYE" = ( +/obj/structure/table/wood, +/obj/item/gavelhammer{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/gavelblock{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "qYO" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon{ @@ -36830,19 +36293,6 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) -"qYU" = ( -/obj/machinery/door_control/secure{ - color = "#99ff99"; - id = "ERT_armory_vkd"; - name = "ERT Armory Level 1"; - pixel_x = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkgreen" - }, -/area/centcom/specops) "qYX" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -36855,6 +36305,16 @@ icon_state = "darkbluealt" }, /area/syndicate_mothership/elite_squad) +"qZa" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_4) "qZj" = ( /obj/effect/turf_decal/siding/wood{ dir = 10; @@ -36874,15 +36334,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"qZr" = ( -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "adminshuttleshutters"; - name = "Blast Shutters" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "qZt" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -36892,19 +36343,43 @@ "qZO" = ( /turf/simulated/wall/indestructible/reinforced, /area/vox_station) +"raf" = ( +/obj/structure/table/glass, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Central Command" + }, +/obj/effect/landmark/commando_manual, +/obj/machinery/status_display{ + pixel_x = -32 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "rag" = ( /obj/machinery/light/small, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) -"ram" = ( -/obj/machinery/conveyor/inverted{ - id = "CC_crate"; - dir = 9 +"raj" = ( +/obj/machinery/computer/card{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/turf_decal/stripes/gold{ + dir = 5; + do_not_delete_me = 1; + icon_state = "gs_deadlock" }, -/area/centcom/supply) +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) +"rbb" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + tag = "icon-propulsion (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/funeral) "rbh" = ( /obj/machinery/computer/cryopod{ pixel_y = -32; @@ -36912,12 +36387,43 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/elite_squad) -"rbm" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +"rbv" = ( +/obj/machinery/door/airlock/hatch{ + aiControlDisabled = 1; + frequency = 1331; + hackProof = 1; + id_tag = "vox_northeast_lock"; + locked = 1; + req_access = list(152) + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1331; + master_tag = "vox_east_control"; + pixel_x = 28; + req_access = list(152); + wires = 1 + }, +/obj/docking_port/mobile{ + dir = 2; + dwidth = 2; + height = 18; + id = "skipjack"; + name = "Vox Skipjack"; + roundstart_move = "skipjack_away"; + width = 19 + }, +/obj/structure/fans/tiny, +/obj/docking_port/stationary{ + dir = 2; + dwidth = 2; + height = 18; + id = "skipjack_away"; + name = "vox bay 1"; + width = 19 + }, +/turf/simulated/floor/shuttle/plating/vox, +/area/shuttle/vox) "rby" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo2" @@ -36927,6 +36433,15 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) +"rbD" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/zone3) "rbO" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -36937,40 +36452,19 @@ icon_state = "dark" }, /area/syndicate_mothership/outside) -"rbV" = ( -/obj/mecha/combat/marauder/seraph{ - armor = list("melee"=80,"bullet"=80,"laser"=80,"energy"=80,"bomb"=80,"bio"=80,"rad"=80,"fire"=100,"acid"=100); - color = "#006666"; - name = "Rocinante" - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang/clusterbang, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg/dual{ - fire_sound = 'sound/weapons/gunshots/gunshot_strong.ogg'; - name = "Automatic 20mm cannone"; - projectile_delay = 0.5; - projectiles_per_shot = 10 - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/heavy{ - name = "Heavy 83mm HE RL" - }, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot{ - name = "Destroyer of the present"; - projectiles = 70; - projectiles_per_shot = 7 +"rbZ" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/light{ + dir = 4 }, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray/triple, -/obj/item/mecha_parts/mecha_equipment/teleporter/precise, -/obj/item/mecha_parts/mecha_equipment/repair_droid, -/obj/effect/turf_decal/mech, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" }, -/area/centcom/specops) +/area/shuttle/administration) "rca" = ( /obj/effect/turf_decal{ dir = 5; @@ -36991,15 +36485,17 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"rcp" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" +"rck" = ( +/obj/machinery/door_control/secure{ + color = "#ffdd99"; + id = "ERT_armory_lvl4"; + name = "ERT Armory Level 4"; + pixel_y = -32; + req_access = list(114) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 9; + icon_state = "darkyellow" }, /area/centcom/specops) "rcs" = ( @@ -37033,6 +36529,28 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"rcB" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + frequency = 1331; + id_tag = "admin_s_sensor"; + pixel_y = 26; + req_access = list(101) + }, +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" + }, +/area/shuttle/administration) +"rcD" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/latex/nitrile, +/obj/item/storage/toolbox/surgery, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "rcE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1; @@ -37042,6 +36560,17 @@ icon_state = "floor12" }, /area/shuttle/syndicate) +"rcK" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) "rcN" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -37058,26 +36587,6 @@ /obj/structure/AIcore, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"rdF" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/machinery/light/spot{ - dir = 1; - tag = "icon-tube1 (NORTH)" - }, -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom/specops{ - pixel_x = 35; - pixel_y = 10 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "rdZ" = ( /obj/machinery/light/small{ dir = 8 @@ -37099,13 +36608,14 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"rep" = ( -/obj/structure/chair/comfy/lime{ - dir = 1 +"reu" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/wood, -/area/centcom/zone3) +/area/centcom/specops) "rew" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "nukeop_storage"; @@ -37115,16 +36625,27 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"reE" = ( -/obj/machinery/computer/station_alert, -/obj/structure/window/reinforced{ - dir = 4 +"rey" = ( +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/item/grenade/empgrenade, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + damage_deflection = 2000; + layer = 2.9; + name = "EMP grenade"; + req_access = list(114) }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "reF" = ( /obj/structure/closet/secure_closet/mime{ @@ -37179,6 +36700,19 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"rgg" = ( +/obj/structure/table/glass, +/obj/item/clipboard, +/obj/item/lighter/zippo/blue{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/cigar/cohiba{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) "rgB" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -37201,6 +36735,21 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/supply) +"rhn" = ( +/obj/effect/turf_decal/stripes/line{ + icon = 'icons/turf/floors.dmi'; + icon_state = "siding4" + }, +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "rampbottom" + }, +/area/centcom/supply) "rhx" = ( /obj/structure/table/wood/fancy, /obj/effect/spawner/lootdrop{ @@ -37218,27 +36767,19 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"rhK" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (NORTH)" +"rhO" = ( +/obj/machinery/door/poddoor{ + id_tag = "ASSAULT3"; + name = "Launch Bay #3" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) -"rhT" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/reagent_containers/food/snacks/grown/citrus/lime, -/obj/item/reagent_containers/food/snacks/grown/citrus/orange, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"ric" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealt" +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full"; + layer = 9 }, -/area/centcom/specops) +/turf/simulated/floor/plating, +/area/centcom/supply) "rim" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -37252,6 +36793,26 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/infteam) +"riy" = ( +/obj/effect/turf_decal/tile/neutral{ + alpha = 85; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' + }, +/obj/structure/window/reinforced{ + dir = 4; + layer = 9.1 + }, +/obj/structure/flora/rock/pile, +/obj/structure/window/reinforced/survival_pod{ + dir = 6; + pixel_y = -7; + pixel_x = 1; + density = 0 + }, +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/area/centcom/specops) "riz" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-cherry" @@ -37264,6 +36825,14 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/elite_squad) +"riL" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "N2O" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "rjt" = ( /obj/structure/chair/sofa/left{ dir = 4 @@ -37286,27 +36855,37 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"rjy" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) +"rjw" = ( +/obj/item/gun/energy/sniperrifle{ + pixel_x = -6 + }, +/obj/item/gun/energy/sniperrifle{ + pixel_x = 6 }, +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/red/hollow, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealt" + icon_state = "dark" }, /area/centcom/specops) "rjE" = ( /obj/structure/table/glass, /turf/simulated/floor/carpet/black, /area/centcom/specops) -"rjY" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3_side"; - tag = "icon-heater (NORTH)" +"rjF" = ( +/obj/effect/turf_decal/siding/white/corner, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"rjH" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, /area/centcom/jail) "rkx" = ( /obj/structure/fans/tiny/invisible, @@ -37315,6 +36894,15 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership/elite_squad) +"rky" = ( +/obj/mecha/combat/gygax/ert{ + color = "#66ff99"; + name = "Assault Jaeger" + }, +/turf/simulated/floor/plasteel{ + icon_state = "navybluecorners" + }, +/area/centcom/specops) "rkN" = ( /obj/structure/chair/comfy/purp{ dir = 8 @@ -37342,6 +36930,25 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership/elite_squad) +"rlz" = ( +/obj/structure/sign/poster/official/obey{ + pixel_x = -32; + pixel_y = -3 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredalt" + }, +/area/centcom/jail) +"rlF" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4; + pixel_x = -14 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "rlQ" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -37402,29 +37009,26 @@ /obj/structure/flora/tree/dead, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) +"rnv" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "rny" = ( /turf/simulated/floor/beach/water{ icon_state = "seadeep" }, /area/centcom/zone1) -"rnJ" = ( -/obj/structure/table/wood{ - color = "#996633" - }, -/obj/item/pen/multi/fountain{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/pen/multi/fountain{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/pen/multi/fountain{ - pixel_x = 5; - pixel_y = 5 +"rnH" = ( +/obj/effect/turf_decal/arrows, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellowaltstrip" }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/area/centcom/supply) "rnN" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -37440,15 +37044,6 @@ }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"roe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden, -/turf/simulated/floor/shuttle{ - icon_state = "vfloor" - }, -/area/shuttle/administration) -"rof" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/pod_2) "roj" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ @@ -37530,37 +37125,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"rps" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/gold/glass{ - frequency = 2000; - hackable = 0; - id_tag = "CC-OP3-Ext"; - locked = 1; - name = "Zone 3" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 2000; - master_tag = "CC-OP3"; - name = "CC-OP3-EXT"; - pixel_x = -32; - req_access = list(109); - wires = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"rpx" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/sign/restroom{ - pixel_x = 32 - }, -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" - }, -/area/centcom/specops) "rpG" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "SST_armory_main"; @@ -37570,32 +37134,6 @@ icon_state = "darkbluealtstrip" }, /area/syndicate_mothership/elite_squad) -"rpJ" = ( -/obj/structure/table/glass, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen/multi/fountain, -/obj/item/stamp/centcom{ - pixel_x = -5; - pixel_y = -7 - }, -/obj/item/radio/intercom/specops{ - pixel_x = -32 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"rpP" = ( -/obj/structure/sign/poster/official/kill_syndicate{ - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealt" - }, -/area/centcom/specops) "rpQ" = ( /obj/machinery/vending/security, /obj/machinery/light/spot{ @@ -37626,6 +37164,18 @@ }, /turf/simulated/floor/carpet/arcade, /area/centcom/bridge) +"rqr" = ( +/obj/structure/table/wood/fancy/royalblack, +/obj/item/candle/eternal, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "rqs" = ( /obj/effect/turf_decal/siding/wideplating/corner{ color = "#55391A"; @@ -37677,19 +37227,6 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) -"rrh" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "N2O"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "rro" = ( /obj/machinery/door/airlock/syndicate/public{ name = "Toilet" @@ -37698,16 +37235,6 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/elite_squad) -"rrD" = ( -/obj/machinery/computer/camera_advanced, -/obj/structure/railing, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "rrK" = ( /obj/machinery/light{ dir = 1 @@ -37720,6 +37247,13 @@ /obj/structure/flora/junglebush/c, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"rrU" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 6; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/administration) "rsy" = ( /obj/effect/turf_decal/stripes/gold{ dir = 6 @@ -37729,15 +37263,6 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/infteam) -"rsB" = ( -/obj/mecha/combat/gygax/ert{ - color = "#66ff99"; - name = "Assault Jaeger" - }, -/turf/simulated/floor/plasteel{ - icon_state = "navybluecorners" - }, -/area/centcom/specops) "rsS" = ( /obj/item/flag/med, /obj/machinery/light/spot{ @@ -37755,11 +37280,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"rtr" = ( -/obj/structure/table, -/obj/item/gift, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "rtM" = ( /obj/machinery/light/small{ dir = 4 @@ -37769,6 +37289,16 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) +"rtO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/evac) "rug" = ( /turf/simulated/wall/shuttle/nosmooth{ dir = 5; @@ -37776,6 +37306,14 @@ icon_state = "ninja_walls_corners" }, /area/shuttle/ninja) +"ruh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) "ruj" = ( /obj/structure/table/reinforced, /obj/item/pizzabox/hawaiian, @@ -37797,6 +37335,12 @@ icon_state = "white" }, /area/centcom/zone1) +"ruu" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkbluealt" + }, +/area/centcom/specops) "ruB" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -37827,13 +37371,6 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"rvj" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) "rvw" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/syndicate{ @@ -37845,6 +37382,14 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) +"rvV" = ( +/obj/machinery/vending/mech/ntc/weapon{ + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "rwi" = ( /obj/structure/holosign/wetsign, /turf/simulated/floor/plasteel{ @@ -37852,6 +37397,23 @@ icon_state = "neutral" }, /area/centcom/evac) +"rwu" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_l"; + tag = "icon-propulsion_l (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) +"rwv" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" + }, +/area/centcom/specops) "rwB" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -37885,16 +37447,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"rxs" = ( -/turf/simulated/floor/wood{ - icon_state = "wood-broken6" - }, -/area/centcom/zone2) -"rxw" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkredcornersalt" - }, -/area/centcom/specops) "rxy" = ( /obj/machinery/door/poddoor/impassable{ id_tag = "SST_armory_mech_maintenance"; @@ -37902,15 +37454,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rxC" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredalt" - }, -/area/centcom/jail) "rxE" = ( /turf/simulated/floor/plasteel{ icon_state = "redfull"; @@ -37934,18 +37477,6 @@ icon_state = "Dark" }, /area/shuttle/funeral) -"rxO" = ( -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/reagent_containers/spray/pestspray, -/obj/item/clothing/gloves/botanic_leather, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" - }, -/area/centcom/jail) "rxS" = ( /turf/simulated/floor/shuttle{ icon_state = "floor3" @@ -37969,55 +37500,24 @@ icon_state = "grimy" }, /area/centcom/zone1) -"ryj" = ( -/obj/structure/table/wood, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/reagent_containers/glass/beaker/waterbottle, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -5 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) "ryw" = ( /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) -"ryN" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/transport) -"ryO" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/oxygen{ - maximum_pressure = 50000; - anchored = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluefull" - }, -/area/centcom/specops) "ryR" = ( /turf/simulated/floor/light/colour_cycle/dancefloor_b, /area/centcom/zone1) -"rzg" = ( -/obj/machinery/light/spot{ - dir = 8; - tag = "icon-tube1 (WEST)" +"rzx" = ( +/obj/machinery/conveyor{ + id = "CC_crate" }, -/obj/machinery/computer/camera_advanced/shuttle_docker/ert, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/specops) +/area/centcom/supply) +"rzE" = ( +/obj/item/book/random, +/turf/simulated/floor/wood, +/area/centcom/zone2) "rzJ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -38029,17 +37529,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rzO" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - id_tag = "ERT_armory_lvl1"; - name = "Armory level 1"; - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "rAb" = ( /obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{ dir = 8 @@ -38054,21 +37543,6 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rAp" = ( -/obj/structure/closet/l3closet/security, -/obj/item/clothing/mask/gas, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/watertank/janitor{ - max_integrity = 1500; - volume = 1500 - }, -/obj/item/grenade/chem_grenade/cleaner, -/turf/simulated/floor/indestructible{ - dir = 9; - icon_state = "darkpurple" - }, -/area/centcom/specops) "rAu" = ( /turf/simulated/wall/shuttle/nosmooth{ dir = 8; @@ -38076,37 +37550,16 @@ icon_state = "ninja_walls_direction" }, /area/shuttle/ninja) -"rAB" = ( -/obj/structure/table/glass, -/obj/item/folder/blue{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/paper/rnd_logs_key{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/paper/monitorkey{ - pixel_y = 4; - pixel_x = 3 - }, -/obj/item/paper/safe_code{ - owner = "captain"; - pixel_y = 1 - }, -/obj/item/paper/safe_code{ - owner = "hos"; - pixel_y = -2; - pixel_x = -3 - }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) "rAG" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership) +"rAR" = ( +/obj/structure/chair/comfy/shuttle, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "rAW" = ( /obj/structure/table/wood/fancy/black, /obj/item/storage/fancy/cigarettes/cigpack_random, @@ -38140,18 +37593,18 @@ "rBp" = ( /turf/simulated/floor/carpet/cyan, /area/centcom/zone1) -"rBA" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/item/flag/nt, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"rBJ" = ( -/obj/effect/turf_decal/siding/brown{ +"rBs" = ( +/obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/centcom/specops) +"rCg" = ( +/obj/item/book/random, +/turf/simulated/floor/plating, /area/centcom/zone2) "rCi" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -38171,6 +37624,21 @@ icon_state = "dark" }, /area/shuttle/syndicate) +"rCS" = ( +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater2x2"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "rDb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -38182,16 +37650,26 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rDf" = ( -/obj/structure/table/glass, -/obj/structure/sign/poster/official/safety_report{ - pixel_y = 32 +"rDd" = ( +/obj/effect/turf_decal/arrows{ + dir = 8 + }, +/obj/machinery/door_control/secure{ + id = "Drop"; + name = "Massdriver Shutters"; + pixel_y = 24; + req_access = list(114) }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "darkredalt" + icon_state = "darkyellowalt" }, -/area/centcom/specops) +/area/centcom/supply) +"rDf" = ( +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" + }, +/area/shuttle/administration) "rDm" = ( /obj/structure/table/wood/fancy/orange, /obj/item/paper_bin{ @@ -38221,19 +37699,13 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rDB" = ( -/obj/machinery/vending/mech/ntc/tools, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"rDM" = ( -/obj/structure/dresser, -/obj/structure/window/reinforced{ +"rDy" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; dir = 4 }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/zone1) +/turf/simulated/floor/glass, +/area/centcom/bridge) "rDS" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -38248,84 +37720,40 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"rEn" = ( -/obj/structure/table/reinforced, -/obj/machinery/door_control/secure{ - id = "ERT_director_office_shutters2"; - name = "Briefing"; - pixel_x = 6; - pixel_y = -2; - req_access = list(114) - }, -/obj/machinery/door_control/secure{ - color = "#ff9999"; - id = "ERT_armory_lvl3"; - name = "ERT Armory Level 3"; - req_access = list(114); - pixel_x = -6; - pixel_y = 8 - }, -/obj/machinery/door_control/secure{ - color = "#99ff99"; - id = "ERT_armory_lvl1"; - name = "ERT Armory Level 1"; - req_access = list(114); - pixel_x = -6; - pixel_y = -8 - }, -/obj/machinery/door_control/secure{ - color = "#9999ff"; - id = "ERT_armory_lvl2"; - name = "ERT Armory Level 2"; - req_access = list(114); - pixel_x = -6 - }, -/obj/machinery/door_control{ - id = "ERT_Quarantine"; - name = "ERT Quarantine"; - req_access = list(114); - pixel_y = 6; - pixel_x = 6 - }, -/obj/machinery/door_control/secure{ - color = "#ffdd99"; - id = "ERT_armory_lvl4"; - name = "ERT Armory Level 4"; - req_access = list(114); - pixel_x = 6; - pixel_y = -14 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"rEu" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/turf/simulated/floor/glass, -/area/centcom/zone3) "rFb" = ( /turf/simulated/floor/shuttle, /area/shuttle/pod_2) -"rFx" = ( +"rFp" = ( +/obj/item/flag/nt, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"rFC" = ( +/obj/item/vending_refill/nta, +/obj/structure/rack/holorack, +/obj/item/vending_refill/nta, +/obj/item/vending_refill/nta, +/obj/item/vending_refill/nta, +/obj/item/vending_refill/nta, +/obj/item/vending_refill/nta, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredalt" + icon_state = "dark" }, -/area/centcom/zone2) +/area/centcom/supply) "rFP" = ( /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/syndicate_mothership/elite_squad) +"rFY" = ( +/obj/effect/step_trigger/teleporter{ + teleport_x = 205; + teleport_y = 89; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/space, +/area/space) "rGl" = ( /obj/machinery/libraryscanner, /turf/simulated/floor/plasteel{ @@ -38344,6 +37772,18 @@ }, /turf/simulated/floor/wood/fancy/light, /area/ninja/outpost) +"rGF" = ( +/obj/structure/table/reinforced, +/obj/item/stack/nanopaste, +/obj/item/mmi, +/obj/item/stack/nanopaste, +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "rGH" = ( /obj/effect/turf_decal{ dir = 6; @@ -38373,15 +37813,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/cargo) -"rGZ" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/centcom/specops) "rHb" = ( /obj/structure/table/wood/fancy/black, /obj/item/deck/cards/syndicate/black{ @@ -38402,15 +37833,6 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"rHl" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "rHo" = ( /obj/structure/mopbucket, /obj/item/mop, @@ -38427,17 +37849,79 @@ icon_state = "fancy-wood-oak-broken" }, /area/syndicate_mothership/infteam) +"rHK" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_y = -2 + }, +/obj/machinery/light, +/obj/item/soap/nanotrasen{ + pixel_y = 8 + }, +/turf/simulated/floor/plasteel/freezer, +/area/centcom/specops) "rHU" = ( /turf/simulated/floor/indestructible/beach/coastline{ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) +"rHV" = ( +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) +"rHW" = ( +/obj/structure/table/reinforced, +/obj/machinery/reagentgrinder{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/machinery/light, +/turf/simulated/floor/engine, +/area/centcom/specops) "rIb" = ( /obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) +"rId" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/blue/hollow, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/lasercarbine{ + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "rIf" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/indestructible/asteroid; @@ -38445,21 +37929,12 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/control) -"rIi" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/centcom/zone3) -"rIw" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/poster/official/ian{ - pixel_y = 31 +"rIE" = ( +/obj/effect/decal/cleanable/fungus{ + pixel_x = -32; + pixel_y = 32 }, -/obj/machinery/photocopier, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/plating, /area/centcom/zone2) "rIL" = ( /obj/machinery/vending/cigarette/syndicate/free, @@ -38467,25 +37942,14 @@ icon_state = "fancy-wood-oak-broken6" }, /area/syndicate_mothership/infteam) -"rIS" = ( -/obj/structure/table, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/folder/red{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/folder/yellow{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/folder/white{ - pixel_x = -5; - pixel_y = 5 +"rIY" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 }, -/turf/simulated/floor/carpet, -/area/centcom/zone2) +/obj/machinery/computer/communications, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "rJa" = ( /obj/structure/curtain/open/shower/security, /obj/machinery/shower{ @@ -38495,20 +37959,13 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/infteam) -"rJz" = ( -/obj/item/flag/nt, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -2 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"rJF" = ( +/obj/structure/window/full/reinforced{ + armor = list("melee"=80,"bullet"=80,"laser"=0,"energy"=0,"bomb"=80,"bio"=100,"rad"=100,"fire"=80,"acid"=100); + layer = 5 }, +/obj/structure/flora/ausbushes/genericbush, +/turf/simulated/floor/grass, /area/centcom/specops) "rKb" = ( /obj/effect/turf_decal/siding/wideplating{ @@ -38523,6 +37980,23 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"rKd" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 2; + height = 7; + id = "funeral"; + name = "Funeral shuttle"; + roundstart_move = "graveyard_dock"; + alone_shuttle = 1; + width = 10; + port_direction = 8; + preferred_direction = 2 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/funeral) "rKo" = ( /obj/structure/mirror{ pixel_y = 30 @@ -38531,6 +38005,19 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/infteam) +"rKq" = ( +/obj/structure/noticeboard{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/item/paper{ + info = "Передвинуть бойлер с водой" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/centcom/zone2) "rKE" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-32"; @@ -38546,13 +38033,6 @@ /obj/structure/safe, /turf/simulated/floor/wood, /area/centcom/zone2) -"rKR" = ( -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkbluealtstrip" - }, -/area/centcom/zone2) "rKY" = ( /obj/machinery/light/small{ dir = 1 @@ -38567,12 +38047,25 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/infteam) +"rLc" = ( +/obj/structure/table/wood/fancy/black, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "rLk" = ( /obj/machinery/computer/borgupload, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/bridge) +"rLo" = ( +/obj/structure/sign/greencross{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredalt" + }, +/area/centcom/jail) "rLr" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 10 @@ -38582,41 +38075,25 @@ icon_state = "asteroid" }, /area/centcom/evac) -"rLO" = ( -/obj/structure/bush, -/turf/simulated/floor/grass, -/area/centcom/evac) -"rLT" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 2; - id_tag = "CC_supply_internal2"; - layer = 5; - locked = 1 +"rLA" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full" }, -/obj/machinery/door_control/secure{ - id = "CC_supply_internal2"; - name = "Supply External Shutters"; - req_access = list(114); - pixel_x = -24 +/obj/structure/railing{ + layer = 4.3; + density = 0 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) -"rLX" = ( -/obj/effect/decal/warning_stripes/northwestsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl2"; - name = "Armory level 2"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, /area/centcom/specops) +"rLO" = ( +/obj/structure/bush, +/turf/simulated/floor/grass, +/area/centcom/evac) "rMa" = ( /obj/machinery/door/poddoor/shutters/invincible{ dir = 8; @@ -38627,6 +38104,12 @@ }, /turf/simulated/wall/indestructible/fakeglass, /area/centcom/jail) +"rMh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" + }, +/area/shuttle/administration) "rMn" = ( /obj/structure/toilet, /turf/simulated/floor/plasteel{ @@ -38642,6 +38125,32 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"rNd" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/simulated/floor/indestructible{ + dir = 8; + icon_state = "vault"; + name = "Operative position" + }, +/area/centcom/specops) +"rNf" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "N2"; + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen{ + maximum_pressure = 50000 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "rNs" = ( /obj/machinery/sleeper{ dir = 4 @@ -38650,39 +38159,38 @@ icon_state = "barber" }, /area/centcom/jail) +"rNB" = ( +/obj/structure/rack/holorack, +/obj/item/nullrod, +/obj/item/nullrod, +/obj/item/nullrod, +/obj/item/melee/baton/telescopic, +/obj/item/melee/baton/telescopic, +/obj/item/melee/baton/telescopic, +/obj/item/melee/baton/telescopic, +/obj/structure/window/reinforced{ + dir = 4; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "rNF" = ( /obj/structure/fence/corner{ invulnerable = 1 }, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"rNJ" = ( -/obj/item/flag/nt, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"rOc" = ( -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/item/ammo_box/magazine/laser, -/obj/structure/table/reinforced, -/obj/effect/decal/warning_stripes/blue/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"rOb" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -32 }, -/area/centcom/specops) +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "rOi" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -38693,15 +38201,6 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) -"rOj" = ( -/obj/machinery/vending/ntc/janitor, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "rOl" = ( /obj/effect/decal/syndie_logo, /obj/effect/turf_decal/stripes/black{ @@ -38739,16 +38238,11 @@ icon_state = "darkred" }, /area/shuttle/escape) -"rQc" = ( -/obj/structure/table/wood{ - color = "#996633" - }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +"rPH" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/item/pen/multi/gold, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "rQr" = ( /obj/machinery/door/poddoor/impassable{ @@ -38758,17 +38252,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership/elite_squad) -"rQt" = ( -/obj/machinery/door/airlock/centcom{ - name = "Prison"; - opacity = 1; - req_access = list(104) - }, -/obj/effect/decal/warning_stripes/red, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/jail) "rQy" = ( /obj/structure/window/reinforced{ dir = 4 @@ -38792,6 +38275,13 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) +"rQZ" = ( +/obj/structure/table/reinforced, +/obj/item/deck/cards, +/turf/simulated/floor/plasteel{ + icon_state = "navyblue" + }, +/area/centcom/specops) "rRm" = ( /obj/machinery/door/airlock/security/glass{ name = "Escape Shuttle Cell"; @@ -38806,6 +38296,15 @@ /obj/effect/decal/syndie_logo, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) +"rRG" = ( +/obj/structure/chair/comfy/lime{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "rRI" = ( /obj/machinery/porta_turret/syndicate{ pixel_y = 2 @@ -38814,19 +38313,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/syndicate) -"rRQ" = ( -/obj/effect/landmark/marauder_exit, -/obj/structure/fans/tiny, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/tile/neutral{ - alpha = 220; - color = "black"; - icon_state = "tile_full"; - layer = 9; - opacity = 1 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "rRS" = ( /turf/simulated/wall/indestructible/rock, /area/syndicate_mothership/outside) @@ -38872,20 +38358,76 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) -"rSw" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"rSA" = ( -/obj/structure/chair/sofa/left{ - dir = 4 - }, -/turf/simulated/floor/carpet/red, -/area/centcom/zone1) +"rSk" = ( +/obj/structure/closet/l3closet/security, +/obj/item/clothing/mask/gas, +/obj/item/tank/internals/emergency_oxygen/double, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/watertank/janitor{ + max_integrity = 1500; + volume = 1500 + }, +/obj/item/grenade/chem_grenade/cleaner, +/turf/simulated/floor/indestructible{ + dir = 1; + icon_state = "darkpurple" + }, +/area/centcom/specops) +"rSU" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/white, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = -6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = 6 + }, +/obj/item/gun/projectile/automatic/pistol/enforcer{ + icon_state = "enforcer_black"; + pixel_x = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"rTs" = ( +/obj/machinery/chem_master, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/engine, +/area/centcom/specops) "rTw" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo3" @@ -38906,29 +38448,6 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) -"rTH" = ( -/obj/effect/turf_decal/delivery/white, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_SRT" - }, -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - hackProof = 1; - name = "Special ReactionTeam"; - opacity = 1; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) -"rTJ" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navyblue" - }, -/area/centcom/specops) "rTL" = ( /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -38940,13 +38459,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/zone1) -"rTV" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "rUb" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -38972,6 +38484,15 @@ icon_state = "asteroid" }, /area/centcom/evac) +"rUL" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) "rUV" = ( /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -39033,13 +38554,11 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rVI" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 9; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/administration) +"rVH" = ( +/obj/structure/table, +/obj/item/gift, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "rVN" = ( /obj/machinery/door/airlock/syndicate/engineering{ name = "Оборудование"; @@ -39077,31 +38596,12 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"rWx" = ( -/obj/effect/turf_decal/arrows{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowaltstrip" - }, -/area/centcom/supply) "rWE" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"rWG" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - id_tag = "ERT_director_office_shutters2"; - layer = 5; - locked = 1; - name = "CentCom SOO Briefing" - }, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) "rWR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -39129,14 +38629,6 @@ icon_state = "whiteblue" }, /area/shuttle/escape) -"rXE" = ( -/obj/structure/table/glass, -/obj/item/pizzabox/vegetable, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkyellow" - }, -/area/centcom/specops) "rXF" = ( /obj/machinery/light{ dir = 4 @@ -39165,12 +38657,6 @@ icon_state = "dark" }, /area/centcom/evac) -"rYi" = ( -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "rYn" = ( /obj/machinery/sleeper, /turf/simulated/floor/plasteel{ @@ -39205,6 +38691,10 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) +"rYU" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/simulated/floor/plating/airless, +/area/shuttle/mining) "rYX" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/curtain/black{ @@ -39212,23 +38702,20 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) +"rZk" = ( +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/jail) "rZo" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "navybluecorners" }, /area/centcom/specops) -"rZs" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/item/radio/intercom/specops{ - pixel_y = -32 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "rZw" = ( /obj/structure/grille, /obj/machinery/door/poddoor/shutters/preopen{ @@ -39239,12 +38726,6 @@ /obj/structure/window/full/shuttle/gray, /turf/simulated/floor/plating/airless, /area/shuttle/syndicate) -"rZE" = ( -/turf/simulated/floor/indestructible{ - dir = 8; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) "sas" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -39255,6 +38736,47 @@ /obj/structure/chair/stool/bar, /turf/simulated/floor/carpet, /area/centcom/zone1) +"saH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 4; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) +"sbc" = ( +/obj/structure/closet/secure_closet/guncabinet{ + layer = 2.9; + name = "Enforcer" + }, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/ammo_box/magazine/enforcer/lethal, +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ + icon_state = "enforcer_red" + }, +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ + icon_state = "enforcer_red" + }, +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ + icon_state = "enforcer_red" + }, +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ + icon_state = "enforcer_red" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "sbs" = ( /obj/machinery/vending/shoedispenser{ req_access = list(150) @@ -39264,11 +38786,19 @@ "sbw" = ( /turf/simulated/wall/shuttle, /area/shuttle/supply) -"sbQ" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/candle/eternal, -/turf/simulated/floor/wood, -/area/centcom/zone1) +"sbW" = ( +/obj/vehicle/ridden/janicart{ + dir = 4 + }, +/obj/item/key/janitor, +/obj/item/janiupgrade{ + layer = 2.9 + }, +/turf/simulated/floor/indestructible{ + dir = 6; + icon_state = "darkpurple" + }, +/area/centcom/specops) "scm" = ( /obj/machinery/photocopier/faxmachine/longrange/syndie{ name = "Фокс машина" @@ -39277,38 +38807,11 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"scs" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/centcom/evac) "scA" = ( /obj/machinery/vending/hatdispenser, /obj/machinery/light/small, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"scI" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/obj/docking_port/stationary/transit{ - dwidth = 2; - height = 6; - id = "pod1_transit"; - name = "pod 1 in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 5 - }, -/obj/docking_port/mobile/pod{ - id = "pod1"; - name = "escape pod 1"; - roundstart_move = "pod1_home" - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) "scN" = ( /turf/simulated/floor/plasteel{ dir = 9; @@ -39325,37 +38828,12 @@ icon_state = "dark" }, /area/centcom/jail) -"sdy" = ( -/obj/structure/closet/crate/can, -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "sdz" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, /area/centcom/zone1) -"sdG" = ( -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 10; - height = 35; - id = "whiteship_transit"; - name = "whiteship in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/east; - width = 21 - }, -/turf/space/transit/east{ - icon_state = "black" - }, -/area/space) "ser" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -39378,15 +38856,21 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"seQ" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_PDW" +"seE" = ( +/obj/machinery/door/airlock/public/glass, +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/effect/turf_decal/stripes/black{ + dir = 4; + do_not_delete_me = 1 }, -/area/centcom/specops) +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) "sfb" = ( /obj/machinery/door/airlock/syndicate/public{ name = "Toilet" @@ -39414,29 +38898,103 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/infteam) +"sfw" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"sfK" = ( +/obj/machinery/vending/cigarette/free, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) +"sfO" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"sfT" = ( +/obj/structure/window/reinforced{ + dir = 8; + layer = 9.1 + }, +/obj/structure/flora/rock, +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/tile/neutral{ + alpha = 85; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' + }, +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/area/centcom/specops) "sfW" = ( /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) +"sgi" = ( +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = -32 + }, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444" + }, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "sgk" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/syndicate_mothership/infteam) -"sgp" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "sgv" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/centcom/evac) +"sgG" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/airless, +/area/shuttle/siberia) +"sgW" = ( +/obj/machinery/portable_atmospherics/canister/toxins{ + maximum_pressure = 50000 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/conveyor{ + id = "Toxin"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "sgZ" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo14" @@ -39451,12 +39009,29 @@ "shl" = ( /turf/simulated/wall/indestructible/fakeglass, /area/centcom/specops) -"shI" = ( -/obj/effect/turf_decal/box/white, +"shp" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" }, -/area/centcom/evac) +/area/centcom/specops) +"shB" = ( +/obj/structure/flora/rock/jungle, +/mob/living/simple_animal/hostile/carp/koi{ + faction = list("") + }, +/obj/effect/turf_decal/tile/neutral{ + alpha = 85; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' + }, +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, +/area/centcom/specops) "shZ" = ( /obj/structure/grille, /obj/structure/window/full/shuttle/gray, @@ -39482,15 +39057,6 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"siq" = ( -/obj/effect/turf_decal/siding/yellow, -/turf/simulated/floor/carpet, -/area/centcom/evac) -"siz" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkred" - }, -/area/centcom/specops) "siN" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -39511,29 +39077,31 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) -"sjb" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/siding/brown{ - dir = 4 +"sjx" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/library, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"sjr" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkyellowcorners"; - dir = 1 + icon_state = "grimy" }, -/area/centcom/specops) +/area/centcom/jail) "sjQ" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo6" }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) +"sjU" = ( +/obj/machinery/computer/shuttle/nt/drop_pod, +/turf/simulated/wall/shuttle, +/area/shuttle/nt_droppod) "skw" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, @@ -39557,19 +39125,6 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/infteam) -"sla" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_GYGAX"; - name = "GYGAX"; - pixel_x = 24; - pixel_y = -32; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowcorners"; - dir = 1 - }, -/area/centcom/specops) "sle" = ( /turf/simulated/floor/shuttle/objective_check{ dir = 6; @@ -39598,14 +39153,6 @@ /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plating, /area/shuttle/syndicate) -"smf" = ( -/obj/machinery/vending/security/ert{ - density = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "smk" = ( /obj/machinery/sleeper/syndie, /turf/simulated/floor/shuttle{ @@ -39618,6 +39165,13 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) +"smB" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "smH" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo7" @@ -39636,13 +39190,6 @@ icon_state = "warnwhite" }, /area/centcom/zone1) -"snf" = ( -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkbluealtstrip" - }, -/area/centcom/zone2) "snn" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo8" @@ -39699,14 +39246,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"soJ" = ( -/obj/structure/sign/nosmoking_2{ - pixel_y = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "soN" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/o2{ @@ -39722,12 +39261,29 @@ icon_state = "cmo" }, /area/shuttle/escape) +"spd" = ( +/obj/structure/table/glass, +/obj/item/pizzabox/vegetable, +/turf/simulated/floor/plasteel{ + icon_state = "darkred" + }, +/area/centcom/specops) "spf" = ( /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" }, /area/shuttle/escape) +"sph" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/turf/simulated/floor/glass, +/area/centcom/bridge) "spi" = ( /obj/structure/grille, /obj/structure/window/full/shuttle/gray, @@ -39754,12 +39310,6 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) -"sql" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone2) "sqw" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo9" @@ -39772,25 +39322,17 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) -"sqD" = ( -/obj/machinery/vending/ntc/ert{ +"sqP" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_DAE"; + name = "DAE"; + pixel_x = -24; + pixel_y = 24; req_access = list(114) }, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"sqO" = ( -/obj/item/gun/energy/sniperrifle{ - pixel_x = -6 - }, -/obj/item/gun/energy/sniperrifle{ - pixel_x = 6 - }, -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 9; + icon_state = "darkgreen" }, /area/centcom/specops) "sqV" = ( @@ -39819,28 +39361,18 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"sqZ" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkgreen" + }, +/area/centcom/specops) "sra" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ icon_state = "cmo" }, /area/shuttle/escape) -"sru" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/clusterbuster/nervegas, -/obj/item/grenade/clusterbuster/nervegas, -/obj/item/grenade/clusterbuster/nervegas, -/obj/item/grenade/clusterbuster/teargas, -/obj/item/grenade/clusterbuster/teargas, -/obj/item/grenade/clusterbuster/teargas, -/obj/item/grenade/clusterbuster/mega_bang, -/obj/item/grenade/clusterbuster/mega_bang, -/obj/item/grenade/clusterbuster/mega_bang, -/obj/effect/decal/warning_stripes/green/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "srv" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo10" @@ -39899,12 +39431,61 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"ssR" = ( -/obj/effect/decal/syndie_logo{ - icon_state = "logo11" - }, -/turf/simulated/floor/mineral/plastitanium/red, -/area/syndicate_mothership/control) +"ssB" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp/green, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/jail) +"ssE" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 1 + }, +/obj/structure/shuttle/engine/platform{ + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) +"ssL" = ( +/obj/structure/closet/secure_closet/security, +/obj/item/clothing/mask/balaclava, +/obj/item/clothing/accessory/holster, +/obj/item/storage/box/survival_security{ + name = "Security survival kit" + }, +/turf/simulated/floor/wood, +/area/centcom/jail) +"ssR" = ( +/obj/effect/decal/syndie_logo{ + icon_state = "logo11" + }, +/turf/simulated/floor/mineral/plastitanium/red, +/area/syndicate_mothership/control) +"sta" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "nanotrasen_sign1"; + pixel_x = -16; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellow" + }, +/area/centcom/specops) "stM" = ( /obj/structure/window/reinforced{ color = "red" @@ -39913,10 +39494,12 @@ icon_state = "floor4" }, /area/shuttle/syndicate_sit) -"stV" = ( -/obj/effect/turf_decal/siding/yellow, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) +"sub" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkred" + }, +/area/centcom/specops) "suc" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo12" @@ -39975,28 +39558,13 @@ /obj/item/pen, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) -"svw" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/red/hollow, -/obj/item/gun/projectile/automatic/ar{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/ar{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/ar{ - pixel_x = -6 - }, -/obj/item/gun/projectile/automatic/ar{ - pixel_x = 6 - }, -/obj/item/gun/projectile/automatic/ar{ - pixel_x = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"svr" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/area/centcom/specops) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/evac) "svC" = ( /obj/machinery/door/airlock/external{ name = "Labor Shuttle Airlock"; @@ -40007,40 +39575,20 @@ icon_state = "dark" }, /area/shuttle/siberia) -"swk" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellow" - }, -/area/centcom/specops) "swP" = ( /turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/infteam) -"swV" = ( -/obj/structure/piano/unanchored{ - dir = 8; - layer = 2.5 - }, -/obj/structure/flora/ausbushes, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/window/full/reinforced{ - armor = list("melee"=80,"bullet"=80,"laser"=0,"energy"=0,"bomb"=80,"bio"=100,"rad"=100,"fire"=80,"acid"=100); - layer = 5 - }, -/turf/simulated/floor/grass, -/area/centcom/specops) "sxa" = ( /obj/machinery/computer/shuttle/sit, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"sxr" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 +"sxu" = ( +/obj/machinery/dna_scannernew/upgraded, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whiteblue" }, -/obj/machinery/computer/communications, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/area/centcom/specops) "sxB" = ( /obj/machinery/light/spot{ dir = 4; @@ -40066,14 +39614,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"sxS" = ( -/obj/effect/turf_decal/arrows/red{ - name = "Armory" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "syj" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -40092,20 +39632,6 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) -"szi" = ( -/obj/machinery/computer/camera_advanced/shuttle_docker/admin{ - dir = 1; - name = "NTV Argos shuttle navigation computer" - }, -/obj/effect/turf_decal/stripes/gold{ - dir = 5; - do_not_delete_me = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/carpet/royalblack, -/area/shuttle/administration) "szE" = ( /obj/structure/chair/sofa/corner{ dir = 1 @@ -40116,6 +39642,11 @@ /obj/structure/chair/sofa/left, /turf/simulated/floor/carpet, /area/syndicate_mothership/infteam) +"sAd" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/centcom/specops) "sAg" = ( /obj/structure/chair/stool/bar, /turf/simulated/floor/wood{ @@ -40168,15 +39699,6 @@ }, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"sAA" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) "sAC" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/shaker{ @@ -40218,25 +39740,6 @@ icon_state = "white" }, /area/centcom/zone1) -"sAS" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/item/book/manual/security_space_law{ - pixel_x = 3 - }, -/obj/effect/turf_decal/siding/yellow/corner{ - dir = 8 - }, -/turf/simulated/floor/carpet, -/area/centcom/evac) "sAT" = ( /obj/machinery/light/small{ dir = 4 @@ -40250,6 +39753,23 @@ icon_state = "cafeteria" }, /area/centcom/jail) +"sBh" = ( +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluealtstrip" + }, +/area/centcom/zone2) +"sBk" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_DURAND" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "sBs" = ( /turf/simulated/floor/plating{ icon = 'icons/turf/floors.dmi'; @@ -40266,11 +39786,26 @@ }, /area/centcom/zone1) "sBC" = ( -/obj/machinery/light_construct/small{ - dir = 1 +/obj/structure/table, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" }, -/turf/simulated/floor/plating, -/area/centcom/zone2) +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/obj/item/clothing/gloves/boxing/hologlove, +/obj/item/clothing/gloves/boxing/hologlove, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone1) "sBD" = ( /obj/effect/turf_decal{ dir = 8; @@ -40297,16 +39832,6 @@ name = "floor" }, /area/syndicate_mothership/infteam) -"sBS" = ( -/obj/machinery/requests_console{ - department = "Central Command"; - departmentType = 1; - name = "CC Requests Console"; - pixel_x = -32; - pixel_y = 32 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "sCg" = ( /obj/structure/table/wood, /obj/machinery/kitchen_machine/microwave/upgraded{ @@ -40350,13 +39875,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/escape) -"sCX" = ( -/obj/machinery/door_control/secure{ - id = "CC_Main_Office_1_1"; - req_access = list(114) - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/bridge) "sDa" = ( /obj/machinery/door/airlock/medical/glass{ name = "Escape Shuttle Infirmary" @@ -40383,41 +39901,51 @@ icon_state = "floor12" }, /area/shuttle/syndicate) -"sDM" = ( -/obj/effect/turf_decal/siding/yellow/corner, -/turf/simulated/floor/carpet, -/area/centcom/evac) -"sDN" = ( -/obj/structure/noticeboard{ - pixel_y = 30 +"sEb" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 }, -/obj/item/paper{ - info = "Уволить клоуна." +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) +"sEs" = ( +/obj/machinery/door/poddoor{ + id_tag = "CC_supply_space"; + locked = 2; + name = "Supply Blastdoor" }, -/obj/item/paper{ - info = "Переговорить с командованием о трёхзначных числах" +/obj/structure/fans/tiny, +/obj/effect/decal/warning_stripes/white, +/obj/machinery/door/airlock/external{ + id_tag = "supply_away"; + name = "Central Command Supply"; + req_access = list(31); + hackProof = 1 }, -/obj/structure/chair/sofa/corp/right, -/obj/item/toy/plushie/red_fox, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"sEx" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/glass/beaker/waterbottle, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -5 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/structure/window/reinforced{ - dir = 8 +/area/centcom/supply) +"sEU" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) -"sEW" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) +"sFp" = ( +/obj/structure/table/glass, +/obj/item/toy/figure/dsquad, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"sFz" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/cobweb{ + layer = 4 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/transport) +/turf/simulated/floor/plating, +/area/centcom/zone2) "sFI" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -40430,36 +39958,19 @@ icon_state = "grimy" }, /area/centcom/zone2) -"sFQ" = ( -/obj/effect/turf_decal/caution/stand_clear/white, -/obj/machinery/door/poddoor/impassable/unhittable{ - id_tag = "CC_Players_In"; - name = "Blast Door" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone1) -"sGe" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "sGg" = ( /obj/structure/table, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, /area/shuttle/syndicate_sit) -"sGH" = ( -/obj/machinery/computer/shuttle/ferry, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkyellowalt" +"sGl" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 }, -/area/centcom/zone3) +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "sGK" = ( /obj/structure/chair/sofa/right{ dir = 8 @@ -40474,24 +39985,12 @@ /obj/mecha/combat/durand/rover/loaded, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sHb" = ( -/obj/machinery/door/airlock/centcom{ - name = "CentCom SOO"; - opacity = 1; - req_access = list(114) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 2; - id_tag = "ERT_director_office_shutters2"; - layer = 5; - locked = 1; - name = "CentCom SOO Briefing" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluecorners" +"sHn" = ( +/obj/machinery/computer/camera_advanced, +/obj/machinery/light/small{ + dir = 1 }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "sHv" = ( /obj/structure/chair/comfy/shuttle/dark{ @@ -40511,21 +40010,15 @@ icon_state = "Dark" }, /area/shuttle/funeral) -"sHL" = ( -/obj/structure/table/wood, -/obj/item/storage/bible, -/turf/simulated/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/centcom/evac) -"sHR" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (NORTH)" +"sHV" = ( +/obj/structure/bed, +/obj/item/bedsheet/clown, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/funeral) +/turf/simulated/floor/carpet/black, +/area/centcom/zone1) "sHW" = ( /obj/docking_port/stationary{ area_type = /area/syndicate_mothership; @@ -40553,6 +40046,21 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) +"sIh" = ( +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "sIC" = ( /obj/structure/table/wood, /turf/simulated/floor/carpet, @@ -40563,70 +40071,25 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) -"sJr" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"sJx" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1"; - name = "Nanotrasen Diplomat's closet" - }, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/under/rank/centcom/diplomatic, -/obj/item/lighter/zippo/nt_rep, -/obj/item/storage/fancy/cigarettes/dromedaryco, -/obj/item/clothing/gloves/color/white, -/obj/item/storage/backpack/satchel, -/obj/item/radio/headset/centcom, -/obj/item/storage/backpack/satcheldeluxe, -/obj/item/storage/box/survival{ - name = "Survival kit" +"sJw" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_Grenade"; + name = "Grenades"; + pixel_x = 24; + pixel_y = -24; + req_access = list(114) }, -/obj/item/implanter/dust, -/obj/item/implanter/mindshield/ert, -/obj/item/implanter/death_alarm, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"sJH" = ( -/obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/zone3) -"sJJ" = ( -/obj/machinery/door/airlock/shuttle{ - aiControlDisabled = 1; - hackProof = 1; - id_tag = "s_docking_airlock"; - name = "Shuttle Hatch" - }, -/obj/docking_port/mobile/emergency{ - dwidth = 11; - height = 18; - width = 29 - }, -/obj/docking_port/stationary/transit{ - dir = 4; - dwidth = 11; - height = 13; - id = "emergency_transit"; - name = "emergency in transit"; - pixel_x = -32; - turf_type = /turf/space/transit/north; - width = 24 + dir = 8; + icon_state = "darkredcorners" }, +/area/centcom/specops) +"sJY" = ( +/obj/machinery/computer/mech_bay_power_console, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "dark" }, -/area/shuttle/escape) +/area/centcom/jail) "sKd" = ( /obj/machinery/light{ dir = 8 @@ -40640,9 +40103,6 @@ "sKg" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/siberia) -"sKm" = ( -/turf/simulated/wall/shuttle, -/area/shuttle/administration) "sKt" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo14" @@ -40684,20 +40144,20 @@ }, /turf/simulated/floor/grass, /area/centcom/evac) -"sKX" = ( -/obj/structure/railing, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) -"sLB" = ( -/obj/machinery/vending/coffee/free, +"sLt" = ( +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/drone, +/obj/item/crowbar/red, +/obj/item/borg/upgrade/vtec, +/obj/item/borg/upgrade/vtec, +/obj/item/stock_parts/cell/bluespace, +/obj/item/stock_parts/cell/bluespace, +/obj/item/borg/upgrade/selfrepair, +/obj/item/borg/upgrade/selfrepair, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/zone2) +/area/centcom/specops) "sLG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40712,15 +40172,6 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sLJ" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/machinery/light, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "sLT" = ( /obj/structure/fence{ invulnerable = 1 @@ -40739,14 +40190,6 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"sMp" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 5; - pixel_y = -2 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "sMr" = ( /obj/structure/sign/security{ pixel_y = 32 @@ -40756,11 +40199,6 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"sMC" = ( -/turf/simulated/floor/indestructible{ - icon_state = "darkgrey" - }, -/area/centcom/specops) "sMD" = ( /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, @@ -40770,27 +40208,6 @@ /obj/machinery/computer/shuttle/sit, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"sNt" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"sNw" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/preopen/invincible{ - dir = 1; - id_tag = "ERT_armory_vkd"; - name = "Armory level 1" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "sNX" = ( /obj/machinery/light/spot, /turf/simulated/floor/plasteel{ @@ -40816,13 +40233,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"sOq" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) "sOr" = ( /obj/structure/window/reinforced, /obj/item/flag/species/unathi, @@ -40863,33 +40273,6 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sPu" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/cultivator, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/shovel/spade, -/obj/item/hatchet, -/obj/item/hatchet, -/obj/item/hatchet, -/obj/item/hatchet, -/obj/item/seeds/gatfruit, -/obj/item/seeds/cherry/bomb, -/obj/item/seeds/ambrosia/gaia, -/obj/item/seeds/ambrosia/gaia, -/obj/item/seeds/ambrosia/gaia, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/beach/sand{ - icon = 'icons/turf/floors.dmi'; - icon_state = "asteroid" - }, -/area/centcom/evac) "sQh" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -40905,14 +40288,33 @@ /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"sRh" = ( -/obj/machinery/door_control/secure{ - id = "SyndFB_prison_stroll_blast"; - name = "Prison Stroll Blastdoors"; - pixel_x = 8; - pixel_y = -29; - req_access = list(153) - }, +"sQD" = ( +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/item/gun/energy/pulse/destroyer/annihilator, +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + layer = 2.9; + name = "Pulse ANNIHILATOR"; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/centcom/jail) +"sRh" = ( +/obj/machinery/door_control/secure{ + id = "SyndFB_prison_stroll_blast"; + name = "Prison Stroll Blastdoors"; + pixel_x = 8; + pixel_y = -29; + req_access = list(153) + }, /obj/machinery/door_control/secure{ id = "SyndFB_prison_stroll"; name = "Prison Stroll Zone"; @@ -40931,6 +40333,10 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"sRk" = ( +/obj/structure/table/glass, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "sRl" = ( /obj/machinery/vending/wallmed{ name = "Custom Emergency NanoMed"; @@ -40990,12 +40396,33 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sSh" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellowaltstrip" +"sSa" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Medbay"; + opacity = 1; + req_access = list(101) }, -/area/centcom/specops) +/obj/effect/turf_decal/stripes/black{ + dir = 8; + do_not_delete_me = 1 + }, +/obj/effect/turf_decal/stripes/black{ + dir = 4; + do_not_delete_me = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "podfloor_dark" + }, +/area/shuttle/administration) +"sSm" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "sSp" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -41018,12 +40445,6 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"sSG" = ( -/obj/effect/turf_decal/siding/white/corner, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "sSK" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -41040,11 +40461,25 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"sTj" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkbluealtstrip" +"sSU" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + dir = 8; + req_access = list(104) }, -/area/centcom/zone2) +/obj/machinery/door/poddoor/shutters/invincible{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "CC_space_jail_sec"; + layer = 50; + level = 3; + locked = 1; + name = "Central Command Jail"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/centcom/jail) "sTm" = ( /obj/machinery/door/airlock/syndicate/public{ name = "Shower" @@ -41092,6 +40527,10 @@ }, /turf/simulated/floor/wood, /area/centcom/zone2) +"sUB" = ( +/obj/effect/turf_decal/siding/brown, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "sUD" = ( /obj/effect/spawner/random_spawners/syndicate/loot, /turf/simulated/floor/plasteel{ @@ -41102,6 +40541,19 @@ /obj/machinery/vending/boozeomat, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"sVi" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/shuttle/engine/heater{ + icon_state = "heater2x2"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/shuttle/engine/platform{ + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/vox) "sVj" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -41119,6 +40571,25 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/carpet, /area/centcom/zone1) +"sVy" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake, +/turf/simulated/floor/wood, +/area/centcom/specops) +"sVH" = ( +/obj/machinery/vending/robotics/nt/gygax, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"sVL" = ( +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "sVV" = ( /obj/structure/window/reinforced{ dir = 4 @@ -41173,13 +40644,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"sWH" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/transport) "sWJ" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22"; @@ -41195,14 +40659,6 @@ icon_state = "barber" }, /area/centcom/zone1) -"sWY" = ( -/obj/structure/sink{ - dir = 1 - }, -/turf/simulated/floor/indestructible{ - icon_state = "darkpurple" - }, -/area/centcom/specops) "sXd" = ( /obj/effect/turf_decal{ dir = 8; @@ -41212,37 +40668,10 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"sXg" = ( -/obj/effect/step_trigger/teleporter{ - teleport_x = 216; - teleport_y = 26; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 4; - icon_state = "rampbottom" - }, -/area/centcom/specops) "sXk" = ( /obj/effect/turf_decal/box/corners, /turf/simulated/floor/mineral/abductor, /area/centcom/zone1) -"sXo" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "O2"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "sXC" = ( /obj/structure/closet/crate/syndicate{ pixel_y = 8 @@ -41255,11 +40684,6 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"sXI" = ( -/turf/space/transit/north{ - icon_state = "black" - }, -/area/space) "sXM" = ( /obj/structure/grille, /obj/structure/window/full/shuttle, @@ -41284,6 +40708,14 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/jail) +"sYM" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "sYR" = ( /obj/structure/fans/tiny/invisible, /turf/simulated/floor/plasteel{ @@ -41291,21 +40723,88 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership) -"sYW" = ( +"sYS" = ( +/obj/structure/table/reinforced, +/obj/item/radio{ + pixel_x = -4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + pixel_y = 5; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = -4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + icon_state = "walkietalkie_sec" + }, +/obj/item/radio{ + pixel_x = 4; + icon_state = "walkietalkie_sec" + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluecornersalt" + icon_state = "navyblue" }, /area/centcom/specops) -"sZc" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DURAND" - }, +"sYW" = ( /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 8; + icon_state = "navybluecornersalt" }, /area/centcom/specops) "sZn" = ( @@ -41322,6 +40821,15 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership/infteam) +"sZu" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"sZy" = ( +/turf/simulated/floor/carpet/blue, +/area/centcom/specops) "sZA" = ( /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; @@ -41331,6 +40839,10 @@ /obj/structure/fans/tiny, /turf/simulated/floor/shuttle/plating, /area/shuttle/specops) +"sZB" = ( +/obj/item/flag/nt, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "sZH" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -41358,6 +40870,10 @@ }, /turf/simulated/floor/carpet, /area/syndicate_mothership/infteam) +"tad" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/space, +/area/space) "taf" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/wine{ @@ -41380,6 +40896,22 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"taC" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkredalt" + }, +/area/centcom/jail) +"taZ" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) "tbh" = ( /obj/structure/window/reinforced{ dir = 8 @@ -41413,6 +40945,32 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"tbo" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/item/flag/nt, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"tbt" = ( +/obj/structure/toilet{ + dir = 8; + name = "Трон старшего администратора" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/door_control{ + id = "CC_toilet_unit11"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/specops) "tbv" = ( /turf/simulated/floor/shuttle, /area/shuttle/siberia) @@ -41434,12 +40992,14 @@ icon_state = "fancy-wood-oak-broken7" }, /area/syndicate_mothership/infteam) -"tcz" = ( +"tcH" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkred" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/evac) "tcM" = ( /obj/effect/turf_decal/stripes/line{ color = "darkgray"; @@ -41467,12 +41027,6 @@ /obj/structure/flora/grass/both, /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"tdw" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/centcom/specops) "tdy" = ( /obj/machinery/portable_atmospherics/canister/oxygen{ name = "Canister: \[O2] (CRYO)" @@ -41529,16 +41083,6 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"teo" = ( -/obj/structure/table, -/obj/item/pen/multi/fountain, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/machinery/light, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "teO" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/soda/upgraded, @@ -41578,6 +41122,16 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) +"tfW" = ( +/obj/structure/filingcabinet/security, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) +"tfX" = ( +/turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal, +/area/shuttle/administration) "tgl" = ( /obj/effect/turf_decal/arrows{ dir = 1 @@ -41615,29 +41169,63 @@ icon_state = "dark" }, /area/centcom/evac) -"ths" = ( -/obj/structure/sink{ +"tha" = ( +/obj/structure/toilet{ + dir = 8; + name = "Трон старшего администратора" + }, +/obj/machinery/light/small{ dir = 1 }, +/obj/machinery/door_control{ + id = "CC_toilet_unit4"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/centcom/specops) -"thQ" = ( -/obj/structure/window/reinforced{ - dir = 8 +/area/centcom/zone1) +"thl" = ( +/obj/structure/table/glass, +/obj/effect/spawner/lootdrop{ + loot = list(/obj/item/reagent_containers/food/snacks/lasagna=10,/obj/item/reagent_containers/food/snacks/sliceable/pizza/hawaiianpizza=10,/obj/item/reagent_containers/food/snacks/sushi_TobikoEgg=10,/obj/item/reagent_containers/food/snacks/bigbiteburger=10,/obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon=10,""=70); + lootcount = 20; + name = "Food CC Spawner #2" }, -/obj/structure/window/reinforced{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellow" }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/area/centcom/specops) "tid" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo17" }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) +"tig" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1; + do_not_delete_me = 1 + }, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + dir = 1; + id_tag = "ERT_armory_vkd"; + name = "Armory level 1" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) "tik" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo18" @@ -41650,16 +41238,12 @@ icon_state = "whiteblue" }, /area/shuttle/escape) -"tjc" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white, +"tiF" = ( /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkblue" + dir = 4; + icon_state = "darkredaltstrip" }, -/area/centcom/zone1) +/area/centcom/zone3) "tjm" = ( /turf/simulated/wall/shuttle/onlyselfsmooth{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' @@ -41704,6 +41288,12 @@ icon_state = "darkgrey" }, /area/centcom/evac) +"tjY" = ( +/obj/machinery/vending/medical, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "tkm" = ( /obj/effect/turf_decal/siding/wideplating{ color = "#55391A"; @@ -41713,23 +41303,54 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"tky" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "Air" +"tkP" = ( +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 }, -/obj/machinery/light{ - dir = 8 +/obj/effect/mapping_helpers/light, +/turf/simulated/floor/beach/sand{ + icon = 'icons/turf/floors.dmi'; + icon_state = "asteroid" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/area/centcom/evac) +"tkR" = ( +/obj/structure/closet/wardrobe/chemistry_white, +/obj/item/storage/bag/chemistry, +/obj/item/storage/bag/chemistry, +/obj/item/clothing/glasses/science{ + pixel_y = 3 }, -/area/centcom/supply) +/obj/item/clothing/glasses/science{ + pixel_y = 3 + }, +/turf/simulated/floor/engine, +/area/centcom/specops) "tle" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 }, /turf/simulated/floor/wood, /area/centcom/zone1) +"tll" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"tlp" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/portable_atmospherics/canister/sleeping_agent{ + maximum_pressure = 50000 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "N2O"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "tls" = ( /obj/machinery/flasher_button{ id = "syndie_FB_cells"; @@ -41782,20 +41403,6 @@ icon_state = "darkblue" }, /area/centcom/zone1) -"tlH" = ( -/obj/structure/bed/dogbed/ian{ - name = "Lounger"; - pixel_x = -2 - }, -/mob/living/simple_animal/pet/dog/fox/alisa{ - pixel_x = -2 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "tlK" = ( /obj/machinery/light/spot{ dir = 8; @@ -41806,6 +41413,19 @@ icon_state = "floor4" }, /area/shuttle/syndicate_elite) +"tlT" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_DURAND"; + name = "DURAND"; + pixel_x = 24; + pixel_y = 32; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/centcom/specops) "tlW" = ( /obj/structure/shuttle/engine/huge{ dir = 1; @@ -41820,22 +41440,13 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"tmn" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 1; - pixel_y = 2 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 9 +"tmG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 9; + icon_state = "darkyellow" }, /area/centcom/specops) "tmL" = ( @@ -41846,6 +41457,16 @@ icon_state = "freezerfloor" }, /area/centcom/jail) +"tmQ" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + id_tag = "ERT_director_office_shutters2"; + layer = 5; + locked = 1; + name = "CentCom SOO Briefing" + }, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/specops) "tmU" = ( /obj/item/robot_parts/robot_component{ desc = "Некая блюспейс сущность, обещала когда нибудь его доделать..."; @@ -41855,14 +41476,10 @@ icon_state = "darkfull" }, /area/syndicate_mothership/infteam) -"tnb" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_l"; - tag = "icon-propulsion_l (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_sit) +"tnc" = ( +/obj/structure/curtain/open/shower/centcom, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/zone2) "tnt" = ( /obj/item/radio/intercom/syndicate{ pixel_y = -25 @@ -41878,6 +41495,21 @@ }, /turf/simulated/floor/mineral/plastitanium/red, /area/syndicate_mothership/elite_squad) +"tnH" = ( +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowalt" + }, +/area/centcom/zone3) +"tnL" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_2) "tnQ" = ( /obj/structure/table/wood/fancy/black, /obj/item/clothing/accessory/medal/gold{ @@ -41891,40 +41523,49 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) -"toU" = ( +"tnU" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/iv_bag/salglu, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/nitrogen, +/obj/item/tank/internals/emergency_oxygen/plasma, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "darkbluecornersalt" }, /area/centcom/specops) -"toV" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/validsalad, -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "nanotrasen_sign3"; - pixel_x = -16; - pixel_y = 32 +"toh" = ( +/obj/structure/chair/comfy/brown{ + color = "#3300FF" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"toL" = ( +/obj/structure/table/wood{ + color = "#996633" }, -/area/centcom/specops) -"toW" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"tpf" = ( -/obj/structure/window/reinforced, -/obj/structure/table, -/obj/machinery/light/small{ - dir = 4 +"toU" = ( +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/obj/machinery/computer/library/public, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/specops) "tph" = ( /obj/effect/decal/cleanable/vomit, /obj/effect/decal/cleanable/dirt, @@ -41952,12 +41593,44 @@ /obj/machinery/light/small, /turf/simulated/floor/wood, /area/centcom/zone1) +"tpU" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_y = -32 + }, +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) +"tqr" = ( +/obj/machinery/computer/shuttle/nt/drop_pod/recall{ + pixel_x = 32; + possible_destinations = "shit_rain_base" + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealt" + }, +/area/centcom/specops) "tqy" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/centcom/evac) +"tqG" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "tqI" = ( /obj/structure/window/reinforced{ dir = 8 @@ -41993,20 +41666,21 @@ icon_state = "dark" }, /area/centcom/jail) -"tqY" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_AEG" +"trm" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/turf/simulated/floor/glass, +/area/centcom/bridge) +"trp" = ( +/obj/item/radio/intercom/specops{ + pixel_y = 25 }, -/area/centcom/specops) -"trn" = ( -/obj/effect/turf_decal/siding{ - color = "#444444" +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkgreen" }, -/turf/simulated/floor/glass/reinforced, /area/centcom/specops) "trB" = ( /turf/simulated/floor/plasteel{ @@ -42024,13 +41698,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"tsa" = ( -/obj/machinery/computer/message_monitor, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "tsj" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -42040,10 +41707,14 @@ icon_state = "bot" }, /area/shuttle/escape) -"tsO" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/sliceable/birthdaycake, -/turf/simulated/floor/wood, +"tso" = ( +/obj/machinery/vending/security/ert{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navybluealt" + }, /area/centcom/specops) "tsX" = ( /obj/structure/rack, @@ -42062,10 +41733,46 @@ /obj/effect/turf_decal/bot_white, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) +"tte" = ( +/obj/machinery/door/airlock/shuttle{ + aiControlDisabled = 1; + id_tag = "s_docking_airlock"; + name = "Emergency Droppod"; + req_access = list(109) + }, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) +"tto" = ( +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "ttr" = ( /obj/item/flag/syndi, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/control) +"ttE" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (NORTH)" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) +"ttN" = ( +/obj/structure/table/reinforced{ + color = "#444444" + }, +/obj/item/radio/intercom/specops{ + pixel_x = 30 + }, +/obj/item/assault_pod/nt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealt" + }, +/area/centcom/specops) "ttO" = ( /obj/machinery/hydroponics/constructable{ layer = 3.2 @@ -42079,6 +41786,10 @@ }, /turf/simulated/floor/carpet/royalblack, /area/syndicate_mothership/control) +"tuh" = ( +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "tun" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -42095,15 +41806,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"tuL" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "ntsing_alt4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "tuX" = ( /obj/effect/turf_decal{ dir = 4; @@ -42125,43 +41827,11 @@ icon_state = "arrival" }, /area/centcom/zone1) -"tvU" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/item/radio/intercom/specops{ - pixel_x = 32 - }, -/obj/effect/turf_decal/siding/blue/corner{ - color = "#444444"; - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"twa" = ( -/obj/structure/reagent_dispensers/spacecleanertank{ - pixel_x = -32 - }, -/turf/simulated/floor/indestructible{ - dir = 8; - icon_state = "darkpurple" - }, -/area/centcom/specops) "twh" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/fernybush, /turf/simulated/floor/grass, /area/centcom/evac) -"twi" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkred" - }, -/area/centcom/specops) "twp" = ( /obj/effect/spawner/random_spawners/syndicate/layout/spacepod, /obj/effect/turf_decal/delivery, @@ -42170,18 +41840,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"twC" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "txk" = ( /obj/effect/turf_decal/stripes/gold{ dir = 9 @@ -42198,31 +41856,25 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) -"txs" = ( -/obj/structure/chair/comfy/red{ - dir = 1 - }, -/obj/effect/landmark/aroomwarp{ - tag = "" - }, +"txJ" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/bridge) -"txP" = ( -/obj/structure/shuttle/engine/heater{ - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/window/plasmareinforced{ - color = "#FF0000"; - dir = 1 +/area/centcom/supply) +"txL" = ( +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 }, -/obj/structure/shuttle/engine/platform{ - layer = 2.9 +/obj/structure/chair/comfy/beige{ + dir = 8; + layer = 5; + pixel_y = -2 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate) +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "txY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -42231,6 +41883,11 @@ icon_state = "dark" }, /area/centcom/jail) +"txZ" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/sliceable/pizza/macpizza, +/turf/simulated/floor/wood, +/area/centcom/specops) "tyd" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 30 @@ -42265,6 +41922,37 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) +"tyB" = ( +/obj/item/paper{ + info = "Убрать кишку на Дельте"; + pixel_y = -2 + }, +/obj/item/paper{ + info = "Наныть мультизет для трама"; + pixel_y = -4 + }, +/obj/item/paper{ + pixel_x = 9; + info = "Обед через час, работа через вчера" + }, +/obj/item/paper{ + pixel_y = -9; + pixel_x = 7; + info = "Пофиксить в моем кабинете рантайм трубы в трубе... опять" + }, +/obj/item/paper{ + pixel_y = -6; + pixel_x = -5; + info = "Начать делать очередную новую станцию и сгореть на втором часу работы в самокопании" + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/obj/structure/noticeboard{ + pixel_y = -30 + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) "tyD" = ( /obj/effect/turf_decal/stripes/gold{ dir = 9; @@ -42292,6 +41980,10 @@ /obj/machinery/light/spot, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"tzC" = ( +/obj/effect/decal/warning_stripes/west, +/turf/simulated/wall/indestructible/fakeglass, +/area/centcom/zone3) "tzJ" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -42301,22 +41993,41 @@ icon_state = "bot" }, /area/shuttle/escape) -"tzK" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4; - icon_state = "heater3x3_side"; - tag = "icon-heater (NORTH)" +"tzO" = ( +/obj/machinery/vending/medical, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/window/plasmareinforced{ - color = "#22aab7"; - dir = 8 +/turf/simulated/floor/plasteel{ + icon_state = "darkbluealt" }, -/obj/structure/shuttle/engine/platform{ - dir = 4; - layer = 2.9 +/area/centcom/specops) +"tzY" = ( +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/plating/airless, -/area/shuttle/administration) +/obj/machinery/cryopod, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"tAi" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkbluealt" + }, +/area/centcom/specops) +"tAj" = ( +/obj/machinery/door_control/secure{ + color = "#99ff99"; + id = "ERT_armory_vkd"; + name = "ERT Armory Level 1"; + pixel_x = -24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkgreen" + }, +/area/centcom/specops) "tAz" = ( /obj/structure/rack/holorack, /obj/item/storage/box/syndie_kit/chameleon{ @@ -42366,18 +42077,15 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) -"tAC" = ( -/obj/structure/holohoop{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 +"tAB" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = 32; + pixel_y = 32 }, -/obj/effect/decal/warning_stripes/green/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/evac) +/area/centcom/specops) "tBf" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak-broken3" @@ -42396,15 +42104,15 @@ name = "floor" }, /area/syndicate_mothership/infteam) -"tBr" = ( -/obj/structure/chair/comfy/shuttle{ +"tBG" = ( +/obj/machinery/conveyor{ + id = "CC_crate"; dir = 4 }, -/obj/item/radio/intercom{ - pixel_x = -28 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_3) +/area/centcom/supply) "tBM" = ( /obj/effect/turf_decal{ dir = 5; @@ -42413,6 +42121,14 @@ }, /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"tBT" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_legal, +/obj/item/book/manual/sop_engineering, +/obj/item/book/manual/sop_command, +/obj/item/book/manual/security_space_law, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "tCA" = ( /obj/effect/turf_decal{ dir = 1; @@ -42464,10 +42180,25 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"tDu" = ( -/obj/machinery/tcomms/relay/cc, -/turf/simulated/floor/bluegrid, -/area/centcom/bridge) +"tDo" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + dir = 1; + req_access = list(104) + }, +/obj/machinery/door/poddoor/shutters/invincible{ + density = 0; + dir = 1; + icon_state = "open"; + id_tag = "CC_space_jail_sec"; + layer = 50; + level = 3; + locked = 1; + name = "Central Command Jail"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/centcom/jail) "tDJ" = ( /obj/machinery/light/spot{ dir = 4; @@ -42504,28 +42235,25 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership) -"tDY" = ( -/obj/structure/sign/greencross{ - pixel_x = 32 +"tEi" = ( +/obj/effect/decal/warning_stripes/blue{ + desc = "Лестница в кабинет СОО"; + icon = 'icons/obj/structures.dmi'; + icon_state = "ladder10"; + name = "Ladder" }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreencorners" +/obj/effect/step_trigger/teleporter{ + teleport_x = 203; + teleport_y = 41; + teleport_z = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" }, -/area/centcom/specops) -"tEr" = ( -/obj/docking_port/mobile/supply, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 5; - height = 7; - id = "supply_transit"; - name = "supply in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 12 +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkredaltstrip" }, -/turf/simulated/wall/shuttle, -/area/shuttle/supply) +/area/centcom/jail) "tEB" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowaltstrip" @@ -42539,9 +42267,13 @@ icon_state = "cmo" }, /area/shuttle/escape) -"tEQ" = ( -/turf/simulated/wall/shuttle/overspace, -/area/shuttle/escape) +"tEV" = ( +/obj/item/flag/nt, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navybluealt" + }, +/area/centcom/specops) "tFk" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/spot{ @@ -42567,19 +42299,6 @@ /obj/item/deck/cards, /turf/simulated/floor/carpet, /area/centcom/zone1) -"tFD" = ( -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/obj/effect/turf_decal/tile/neutral{ - alpha = 100; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "tFQ" = ( /obj/structure/rack, /obj/effect/turf_decal/bot_white, @@ -42616,13 +42335,23 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership/elite_squad) -"tGc" = ( +"tGe" = ( +/obj/item/flag/nt, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"tGh" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4; + pixel_x = -14 + }, /obj/effect/turf_decal/siding{ color = "#444444"; - dir = 9 + dir = 1 }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "tGm" = ( /obj/machinery/door/airlock/syndicate/cargo{ name = "Cargo Load"; @@ -42646,6 +42375,15 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"tHm" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "vault" + }, +/area/centcom/specops) "tHp" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, @@ -42653,138 +42391,42 @@ icon_state = "bot" }, /area/shuttle/escape) -"tHC" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/under/assistantformal, -/obj/item/clothing/under/captain_fly{ - name = "rogue uniform" - }, -/obj/item/clothing/under/captainparade{ - name = "parade uniform" - }, -/obj/item/clothing/under/captainparade{ - name = "parade uniform" - }, -/obj/item/clothing/under/captain_fly{ - name = "rogue uniform" - }, -/obj/item/clothing/under/assistantformal, -/obj/item/clothing/under/fluff/elishirt, -/obj/item/clothing/under/fluff/elishirt, -/obj/item/clothing/under/lawyer/black, -/obj/item/clothing/under/lawyer/black, -/obj/item/clothing/under/lawyer/blue, -/obj/item/clothing/under/lawyer/blue, -/obj/item/clothing/under/lawyer/bluesuit, -/obj/item/clothing/under/lawyer/bluesuit, -/obj/item/clothing/under/lawyer/female, -/obj/item/clothing/under/lawyer/female, -/obj/item/clothing/under/lawyer/oldman, -/obj/item/clothing/under/lawyer/oldman, -/obj/item/clothing/under/lawyer/red, -/obj/item/clothing/under/lawyer/red, -/obj/item/clothing/under/mafia{ - name = "black outfit" - }, -/obj/item/clothing/under/mafia{ - name = "black outfit" - }, -/obj/item/clothing/under/mafia/white{ - name = "white outfit" - }, -/obj/item/clothing/under/mafia/white{ - name = "white outfit" - }, -/obj/item/clothing/under/misc/durathread, -/obj/item/clothing/under/misc/durathread, -/obj/item/clothing/under/retro/engineering, -/obj/item/clothing/under/retro/engineering, -/obj/item/clothing/under/retro/medical, -/obj/item/clothing/under/retro/medical, -/obj/item/clothing/under/retro/science, -/obj/item/clothing/under/retro/science, -/obj/item/clothing/under/retro/security, -/obj/item/clothing/under/retro/security, -/obj/item/clothing/under/color/black{ - icon_state = "hosblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hostanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "hostanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officerdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officertanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "officertanclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardenblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardenblueclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/under/color/black{ - icon_state = "wardendnavyclothes"; - name = "jumpsuit" +"tHx" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (NORTH)" }, -/obj/item/clothing/under/color/black{ - icon_state = "wardendnavyclothes"; - name = "jumpsuit" +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) +"tHy" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_GYGAX" }, -/obj/item/clothing/under/color/black{ - icon_state = "wardentanclothes"; - name = "jumpsuit" +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, -/obj/item/clothing/under/color/black{ - icon_state = "wardentanclothes"; - name = "jumpsuit" +/area/centcom/specops) +"tHM" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 1 }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 +/turf/simulated/floor/glass, +/area/centcom/bridge) +"tHQ" = ( +/obj/effect/decal/warning_stripes/red, +/obj/machinery/door/airlock/centcom{ + damage_deflection = 999; + name = "Prison Customs"; + opacity = 1; + req_access = list(104) }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) +/area/centcom/jail) "tIe" = ( /obj/structure/shuttle/engine/platform{ layer = 2.9 @@ -42801,6 +42443,14 @@ icon_state = "fancy-wood-oak-broken3" }, /area/syndicate_mothership) +"tIw" = ( +/obj/structure/table, +/obj/item/storage/box/handcuffs, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "tIC" = ( /obj/machinery/light/small{ dir = 1 @@ -42855,6 +42505,23 @@ /obj/structure/closet/crate/can, /turf/simulated/floor/wood, /area/centcom/zone1) +"tJJ" = ( +/obj/structure/railing{ + layer = 4.3 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/specops) +"tJV" = ( +/obj/machinery/computer/med_data, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "tKi" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -42909,6 +42576,31 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"tKZ" = ( +/obj/structure/table/reinforced, +/obj/machinery/kitchen_machine/microwave/upgraded{ + pixel_y = 6 + }, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"tLa" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/centcom/specops) +"tLb" = ( +/obj/structure/table/reinforced{ + color = "#444444" + }, +/obj/structure/sign/poster/official/kill_syndicate{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealt" + }, +/area/centcom/specops) "tLj" = ( /obj/item/storage/toolbox/syndicate, /turf/simulated/floor/shuttle/objective_check/vox, @@ -42960,59 +42652,58 @@ }, /turf/simulated/floor/carpet/arcade, /area/syndicate_mothership/infteam) -"tMs" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/structure/mirror{ - pixel_y = -32 +"tMy" = ( +/obj/machinery/door_control/secure{ + id = "adminshuttleshutters"; + name = "Shutter control"; + pixel_x = 5; + pixel_y = -23; + req_access = list(101) }, -/turf/simulated/floor/plasteel{ +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; icon_state = "dark" }, -/area/centcom/specops) -"tME" = ( -/obj/structure/closet/secure_closet/guncabinet{ - layer = 2.9; - name = "Enforcer" - }, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/ammo_box/magazine/enforcer/lethal, -/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - icon_state = "enforcer_red" - }, -/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - icon_state = "enforcer_red" - }, -/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - icon_state = "enforcer_red" - }, -/obj/item/gun/projectile/automatic/pistol/enforcer/lethal{ - icon_state = "enforcer_red" +/area/shuttle/administration) +"tMC" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + tag = "icon-heater (NORTH)" }, /obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" + color = "red" }, -/area/shuttle/gamma) -"tMM" = ( -/obj/structure/window/reinforced, -/obj/machinery/light, -/obj/effect/turf_decal/siding/white{ - dir = 10 +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_sit) +"tMK" = ( +/obj/structure/window/reinforced{ + layer = 2.9 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"tNp" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1; + icon_state = "propulsion_r"; + tag = "icon-propulsion_r (NORTH)" }, -/area/centcom/evac) +/turf/simulated/floor/plating/airless, +/area/shuttle/funeral) "tNv" = ( /obj/structure/table/wood, /obj/item/candle/eternal, /obj/structure/window/reinforced, /turf/simulated/floor/carpet/black, /area/centcom/evac) +"tNz" = ( +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkgreen" + }, +/area/centcom/specops) "tNZ" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/peppermill{ @@ -43055,6 +42746,13 @@ }, /turf/simulated/floor/mech_bay_recharge_floor, /area/shuttle/escape) +"tOR" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "tPj" = ( /obj/machinery/light/small, /turf/simulated/floor/wood{ @@ -43069,6 +42767,22 @@ }, /turf/simulated/floor/carpet/arcade, /area/centcom/zone1) +"tPu" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + tag = "icon-heater (NORTH)" + }, +/obj/structure/window/reinforced{ + color = "red" + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate_elite) +"tPx" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone3) "tPy" = ( /obj/item/flag/syndi, /turf/simulated/floor/shuttle{ @@ -43076,43 +42790,33 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"tPD" = ( -/obj/structure/chair/comfy/beige{ - dir = 8; - layer = 5; - pixel_y = -2 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "tPL" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak-broken4" }, /area/syndicate_mothership/infteam) -"tQg" = ( -/obj/structure/chair/comfy/beige{ - dir = 4; - layer = 5; - pixel_y = -2 +"tPY" = ( +/obj/structure/table/wood, +/obj/item/taperecorder{ + pixel_x = -5; + pixel_y = 5 }, -/obj/structure/railing{ - layer = 4.3; - pixel_y = 32 +/obj/item/paper_bin/nanotrasen, +/obj/item/pen{ + pixel_x = 7; + pixel_y = 9 }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "tQh" = ( /obj/item/storage/bible, /obj/structure/table/wood, /turf/simulated/floor/carpet/black, /area/centcom/evac) -"tQy" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/glass/reinforced, -/area/centcom/specops) "tQA" = ( /obj/structure/curtain/black{ pixel_y = -32 @@ -43149,13 +42853,30 @@ }, /turf/simulated/floor/plasteel, /area/centcom/evac) -"tRQ" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, +"tRj" = ( +/obj/structure/closet/coffin, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"tRk" = ( /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "darkred" + icon_state = "navybluealtstrip" + }, +/area/centcom/supply) +"tRF" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/zone2) +"tRX" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "CC_ERT1" + }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "navybluealt" }, /area/centcom/specops) "tRY" = ( @@ -43173,6 +42894,15 @@ }, /turf/simulated/floor/carpet, /area/centcom/evac) +"tSk" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_IK60" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "tSu" = ( /obj/structure/window/reinforced{ dir = 4 @@ -43188,6 +42918,12 @@ icon_state = "dark" }, /area/centcom/jail) +"tSE" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellow" + }, +/area/centcom/specops) "tSR" = ( /obj/item/clothing/under/maid, /turf/simulated/floor/plasteel{ @@ -43211,6 +42947,12 @@ name = "floor" }, /area/syndicate_mothership/infteam) +"tSV" = ( +/obj/machinery/vending/ntc/medical, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "tTj" = ( /obj/structure/curtain/black{ pixel_y = -32 @@ -43221,6 +42963,17 @@ name = "floor" }, /area/syndicate_mothership/infteam) +"tTE" = ( +/obj/vehicle/ridden/motorcycle{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood{ + icon_state = "fancy-wood-oak" + }, +/area/syndicate_mothership) "tTF" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -43270,34 +43023,6 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/shuttle/plating, /area/shuttle/trade/sol) -"tUi" = ( -/obj/docking_port/stationary{ - area_type = /area/syndicate_mothership; - dwidth = 8; - height = 22; - id = "syndicate_away"; - name = "syndicate base"; - turf_type = /turf/simulated/floor/indestructible/plating; - width = 18 - }, -/turf/simulated/floor/plating, -/area/syndicate_mothership) -"tUB" = ( -/obj/structure/chair/sofa{ - dir = 5 - }, -/turf/simulated/floor/carpet/red, -/area/centcom/zone1) -"tUJ" = ( -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/tile/neutral{ - alpha = 180; - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/turf/simulated/floor/plating, -/area/centcom/supply) "tVF" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" @@ -43309,12 +43034,6 @@ icon_state = "dark" }, /area/centcom/bridge) -"tVR" = ( -/obj/machinery/computer/operating, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" - }, -/area/shuttle/administration) "tVZ" = ( /obj/effect/turf_decal{ dir = 1; @@ -43334,21 +43053,17 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"tWr" = ( -/obj/effect/turf_decal/stripes/line{ - icon = 'icons/turf/floors.dmi'; - icon_state = "siding4" +"tWj" = ( +/obj/structure/closet/wardrobe/red, +/obj/structure/window/reinforced{ + layer = 2.9 }, -/obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full" +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "rampbottom" - }, -/area/centcom/supply) +/obj/item/storage/box/holobadge, +/turf/simulated/floor/wood, +/area/centcom/jail) "tWu" = ( /obj/structure/chair/stool/bar, /obj/structure/curtain/open/shower/security{ @@ -43356,10 +43071,6 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"tWD" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/carpet, -/area/centcom/specops) "tWF" = ( /obj/machinery/recharge_station/ert, /obj/effect/decal/cleanable/dirt, @@ -43382,6 +43093,15 @@ icon_state = "brownoldfull" }, /area/syndicate_mothership/jail) +"tXE" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navybluealt" + }, +/area/centcom/specops) "tYd" = ( /turf/simulated/wall/indestructible/reinforced/rusted, /area/vox_station) @@ -43418,45 +43138,9 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"tYO" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2; - armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"tYP" = ( -/obj/structure/rack, -/obj/effect/decal/warning_stripes/green/hollow, -/obj/item/ammo_box/a40mm, -/obj/item/ammo_box/a40mm, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "tZe" = ( /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"tZi" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) "tZj" = ( /obj/machinery/vending/cigarette, /obj/structure/closet/fireaxecabinet{ @@ -43483,15 +43167,25 @@ /obj/structure/falsewall/reinforced, /turf/simulated/floor/plating, /area/centcom/supply) -"uak" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 +"uah" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 8; + id_tag = "CC_supply_internal"; + layer = 5; + locked = 1 }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/door_control/secure{ + id = "CC_supply_internal"; + name = "Supply External Shutters"; + pixel_y = 24; + req_access = list(114) }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "uam" = ( /obj/effect/landmark/prisonwarp, /obj/effect/landmark/prisonwarp, @@ -43510,19 +43204,14 @@ icon_state = "floor4" }, /area/shuttle/assault_pod) -"uby" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/door_control/secure{ - id = "senior_o_shutters"; - req_access = list(114) +"ubx" = ( +/obj/machinery/photocopier, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"ubE" = ( -/turf/space/transit/south{ - icon_state = "speedspace_ns_1" - }, -/area/space) "ubF" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -43613,15 +43302,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"udF" = ( -/obj/structure/sign/custodian{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealt" - }, -/area/centcom/specops) "udI" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/wood, @@ -43672,20 +43352,6 @@ icon_state = "grimy" }, /area/centcom/zone2) -"ueB" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DEDI" - }, -/obj/machinery/door/poddoor/impassable/preopen{ - id_tag = "ERT_Quarantine"; - name = "ERT Quarantine" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluealt" - }, -/area/centcom/specops) "ueC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fans/tiny/invisible, @@ -43694,34 +43360,15 @@ icon_state = "warndarkgreycornerred" }, /area/syndicate_mothership) -"ueG" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"ueL" = ( -/turf/simulated/floor/plating, -/area/centcom/zone2) "ueN" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowalt" }, /area/centcom/zone3) -"ueR" = ( -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/simulated/floor/plasteel{ - icon_state = "darkbluealtstrip" - }, +"ueU" = ( +/obj/structure/table, +/obj/machinery/computer/library/public, +/turf/simulated/floor/carpet/black, /area/centcom/zone2) "ufa" = ( /obj/machinery/vending/boozeomat, @@ -43751,49 +43398,6 @@ icon_state = "darkyellowalt" }, /area/centcom/zone3) -"ufB" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/structure/table, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"ufK" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 10 - }, -/obj/structure/showcase{ - layer = 4.2; - pixel_x = 5; - pixel_y = 5 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"ufN" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - dir = 1; - req_access = list(104) - }, -/obj/machinery/door/poddoor/shutters/invincible{ - density = 0; - dir = 1; - icon_state = "open"; - id_tag = "CC_space_jail_sec"; - layer = 50; - level = 3; - locked = 1; - name = "Central Command Jail"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/centcom/jail) "ufP" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/trophy/gold_cup, @@ -43805,6 +43409,17 @@ }, /turf/simulated/floor/carpet/red, /area/syndicate_mothership/control) +"ufR" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "ugm" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -43838,6 +43453,32 @@ "ugH" = ( /turf/simulated/floor/light/colour_cycle/dancefloor_a, /area/centcom/zone1) +"ugK" = ( +/obj/machinery/light, +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone2) +"ugM" = ( +/obj/structure/table/reinforced, +/obj/machinery/chem_dispenser/soda/upgraded, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"ugQ" = ( +/obj/structure/sign/poster/official/kill_syndicate{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navybluealt" + }, +/area/centcom/specops) "ugS" = ( /obj/effect/decal/warning_stripes/white, /obj/machinery/door/airlock/centcom{ @@ -43861,22 +43502,11 @@ icon_state = "cmo" }, /area/shuttle/escape) -"uhi" = ( -/obj/structure/table/wood{ - color = "#996633" +"uho" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navybluealt" }, -/obj/item/folder, -/obj/item/folder, -/obj/item/folder/blue, -/obj/item/folder/blue, -/obj/item/folder/red, -/obj/item/folder/red, -/obj/item/folder/white, -/obj/item/folder/white, -/obj/item/folder/yellow, -/obj/item/folder/yellow, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "uhy" = ( /obj/effect/turf_decal/stripes/line{ @@ -43948,14 +43578,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"ujw" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/evac) "ukh" = ( /obj/effect/turf_decal/siding/wideplating{ color = "#55391A"; @@ -43971,28 +43593,17 @@ icon_state = "darkyellowaltstrip" }, /area/centcom/zone3) -"ulL" = ( -/obj/mecha/combat/gygax/ert{ - color = "#66ff99"; - name = "Assault Jaeger" +"ulG" = ( +/obj/structure/railing{ + layer = 4.3; + density = 0 }, /turf/simulated/floor/plasteel{ - icon_state = "navyblue" + color = "gray"; + dir = 8; + icon_state = "rampbottom" }, /area/centcom/specops) -"umb" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/gold/glass{ - frequency = 2000; - hackable = 0; - id_tag = "CC-OP3-Ext"; - locked = 1; - name = "Zone 3" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) "umd" = ( /obj/effect/turf_decal/tile/neutral{ color = "black"; @@ -44068,34 +43679,44 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"unp" = ( -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +"unl" = ( +/obj/structure/rack/holorack, +/obj/item/storage/box/deathimp, +/obj/item/storage/box/deathimp, +/obj/item/storage/box/deathimp, +/obj/item/storage/box/chef_rare_ingredients_kit, +/obj/item/storage/box/bartender_rare_ingredients_kit, +/obj/item/storage/box/fingerprints, +/obj/item/storage/box/fingerprints, +/obj/item/storage/box/swabs, +/obj/item/storage/box/swabs, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 }, -/area/centcom/zone3) -"unB" = ( /obj/structure/window/reinforced{ - dir = 8 + dir = 1; + layer = 2.9 }, -/obj/machinery/computer, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/bridge) -"unM" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 +/area/centcom/supply) +"unC" = ( +/obj/machinery/door_control/secure{ + id = "CC_supply_space"; + name = "Supply Blastdoor"; + pixel_y = 24; + req_access = list(114) }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/obj/machinery/conveyor_switch/oneway{ + id = "CC_crate" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "unO" = ( /obj/item/flag/nt, /obj/machinery/light/small{ @@ -44123,11 +43744,6 @@ /obj/structure/rack/gunrack, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"uoq" = ( -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/escape) "uor" = ( /obj/machinery/syndiepad/admin/loadpad{ target_id = "syndie_cargo_port1" @@ -44140,12 +43756,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"uox" = ( -/obj/structure/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/centcom/specops) "uoE" = ( /obj/structure/railing{ dir = 4 @@ -44172,12 +43782,88 @@ /obj/structure/rack/gunrack, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/elite_squad) -"uoM" = ( +"uoR" = ( +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/item/ammo_box/magazine/laser, +/obj/structure/table/reinforced, +/obj/effect/decal/warning_stripes/blue/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"uoZ" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" + }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, /turf/simulated/floor/plasteel{ dir = 9; - icon_state = "darkredaltstrip" + icon_state = "navyblue" }, -/area/centcom/zone2) +/area/centcom/specops) "upv" = ( /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/grass, @@ -44191,12 +43877,6 @@ icon_state = "floor4" }, /area/shuttle/syndicate_sit) -"uqc" = ( -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "uqg" = ( /obj/machinery/computer, /turf/simulated/floor/plasteel{ @@ -44242,15 +43922,6 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"uqG" = ( -/obj/machinery/vending/wallmed{ - pixel_y = -32; - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellowalt" - }, -/area/centcom/zone3) "uqH" = ( /obj/structure/chair{ dir = 4 @@ -44258,24 +43929,33 @@ /obj/item/clothing/mask/breath, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"uqQ" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 16 +"uqY" = ( +/obj/structure/table/wood{ + color = "#996633" }, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +/obj/item/flashlight/lamp/green, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"uqZ" = ( +/obj/structure/window/reinforced, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone2) +"urj" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" }, -/obj/item/pen/fancy{ - pixel_x = 8 +/obj/structure/window/plasmareinforced{ + color = "#22aab7"; + dir = 8 }, -/obj/effect/turf_decal/siding{ - color = "#444444" +/obj/structure/shuttle/engine/platform{ + dir = 4; + layer = 2.9 }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) "url" = ( /obj/machinery/porta_turret/syndicate/interior, /obj/structure/window/plasmareinforced{ @@ -44286,32 +43966,6 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"urM" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock" - }, -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry"; - name = "ferry shuttle"; - roundstart_move = "ferry_away"; - width = 5 - }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 12; - id = "ferry_transit"; - name = "ferry in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/east; - width = 5 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) "urU" = ( /obj/item/gun/projectile/automatic/sniper_rifle/syndicate{ pixel_x = -3; @@ -44430,12 +44084,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"usb" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) "usi" = ( /obj/effect/turf_decal{ icon_state = "golden_stripes" @@ -44459,13 +44107,6 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"usq" = ( -/obj/structure/table/wood{ - color = "#996633" - }, -/obj/item/flashlight/lamp/green, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "usR" = ( /turf/simulated/wall/shuttle{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' @@ -44487,23 +44128,11 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"uue" = ( -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) "uuq" = ( /obj/structure/flora/junglebush/c, /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"uuD" = ( -/obj/structure/table, -/obj/item/paper_bin/nanotrasen{ - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/fountain, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "uuU" = ( /obj/effect/turf_decal{ dir = 1; @@ -44519,14 +44148,15 @@ icon_state = "floor4" }, /area/shuttle/syndicate_elite) -"uvg" = ( -/obj/machinery/light/spot{ - dir = 1 +"uvw" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "ntsing_alt3" }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/shuttle/escape) +/area/centcom/specops) "uvE" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -44537,6 +44167,12 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"uvO" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/centcom/evac) "uwo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -44605,21 +44241,6 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/shuttle/plating, /area/shuttle/trade/sol) -"uyw" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"uyV" = ( -/obj/effect/landmark/ert_director, -/obj/structure/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "uyZ" = ( /obj/effect/turf_decal/stripes/line{ color = "darkgray"; @@ -44643,15 +44264,6 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership) -"uzh" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "uzi" = ( /obj/effect/turf_decal/stripes/gold{ dir = 1 @@ -44669,6 +44281,19 @@ icon_state = "floor4" }, /area/shuttle/syndicate_sit) +"uzs" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" + }, +/area/centcom/specops) +"uzx" = ( +/obj/structure/chair/comfy/brown{ + color = "#FF3300"; + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "uzP" = ( /turf/simulated/floor/carpet/red, /area/centcom/specops) @@ -44713,27 +44338,15 @@ icon_state = "floor4" }, /area/shuttle/syndicate_elite) -"uAE" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/iv_bag/salglu, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/tank/internals/emergency_oxygen/nitrogen, -/obj/item/tank/internals/emergency_oxygen/plasma, -/turf/simulated/floor/shuttle{ - icon_state = "floor3" +"uAJ" = ( +/obj/machinery/light{ + dir = 4; + switchcount = 50 }, -/area/shuttle/administration) +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone2) "uBe" = ( /obj/effect/turf_decal/box/red, /obj/machinery/door/window/brigdoor{ @@ -44750,6 +44363,30 @@ icon_state = "dark" }, /area/syndicate_mothership/control) +"uBh" = ( +/obj/structure/closet/secure_closet/cabinet/bar, +/obj/item/storage/box/beakers/bluespace, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis, +/turf/simulated/floor/wood, +/area/centcom/zone1) +"uBl" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "uBr" = ( /obj/machinery/light/small{ dir = 8 @@ -44763,6 +44400,14 @@ icon_state = "grimy" }, /area/centcom/jail) +"uCb" = ( +/obj/machinery/vending/coffee, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "uCi" = ( /obj/machinery/light{ dir = 8 @@ -44771,11 +44416,13 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"uCx" = ( -/turf/simulated/floor/wood{ - icon_state = "wood-broken5" +"uCT" = ( +/obj/machinery/computer/communications, +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 }, -/area/centcom/zone2) +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "uDd" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -44796,6 +44443,24 @@ icon_state = "bot" }, /area/shuttle/escape) +"uDo" = ( +/obj/machinery/embedded_controller/radio/airlock/access_controller{ + frequency = 2000; + id_tag = "CC-OP2"; + name = "Access Controller OP2"; + pixel_y = 32; + req_access = list(109); + tag_exterior_door = "CC-OP2-Ext"; + tag_interior_door = "CC-OP2-Int" + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/wood, +/area/centcom/zone2) "uDD" = ( /obj/structure/table/glass, /obj/item/storage/firstaid/regular, @@ -44812,35 +44477,48 @@ icon_state = "barber" }, /area/centcom/jail) -"uEg" = ( -/obj/effect/decal/nanotrasen_logo{ - icon_state = "logo5"; - pixel_x = 16 +"uEf" = ( +/obj/machinery/door/airlock/command/glass{ + frequency = 2000; + icon_state = "open"; + id_tag = "CC-OP4-Int"; + locked = 1; + name = "Zone 2" }, +/obj/effect/decal/warning_stripes/blue, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"uEk" = ( -/obj/structure/table, -/obj/item/storage/box/cups, +"uEE" = ( +/obj/item/flag/nt, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/bridge) "uEG" = ( /obj/structure/chair/office/dark{ dir = 8 }, /turf/simulated/floor/wood, /area/centcom/zone2) -"uEI" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/meatsteak, -/obj/structure/window/reinforced{ - dir = 4 +"uEQ" = ( +/obj/effect/turf_decal/tile/neutral{ + color = "black"; + icon_state = "tile_full" + }, +/obj/structure/railing{ + pixel_y = 32; + density = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "rampbottom"; + tag = "icon-stage_stairs" }, -/turf/simulated/floor/wood, /area/centcom/specops) "uEU" = ( /obj/machinery/door/airlock/external{ @@ -44857,7 +44535,7 @@ req_access = list(150) }, /obj/structure/fans/tiny, -/turf/simulated/floor/plating, +/turf/simulated/floor/plating/airless, /area/shuttle/syndicate_elite) "uEW" = ( /obj/machinery/door/airlock/shuttle{ @@ -44892,6 +44570,13 @@ icon_state = "floor13" }, /area/shuttle/ninja) +"uFt" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_3) "uFB" = ( /obj/machinery/door/airlock/hatch{ drain_act_protected = 1; @@ -44942,75 +44627,6 @@ icon_state = "floor4" }, /area/shuttle/syndicate_sit) -"uGD" = ( -/turf/simulated/floor/wood{ - icon_state = "light-fancy-wood" - }, -/area/centcom/specops) -"uGG" = ( -/obj/structure/closet/cabinet{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100) - }, -/obj/item/storage/box/centcomofficer, -/obj/item/radio/headset/centcom{ - desc = null; - name = "Supreme commander bowman headset" - }, -/obj/item/card/id{ - access = list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,69,70,71,73,74,75,76,77,99,101,102,103,104,105,106,107,108,109,110,111,112,113,114); - icon_state = "commander"; - name = "Supreme Commander ID card"; - rank = "Nanotrasen Navy Captain"; - registered_name = null - }, -/obj/item/door_remote/centcomm, -/obj/item/clothing/accessory/medal/gold{ - desc = null; - name = "Supreme commander's gold medal" - }, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/gloves/color/white{ - desc = null; - name = "Supreme judge gloves" - }, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"uGV" = ( -/obj/docking_port/mobile/emergency/backup{ - dir = 8; - dwidth = 4; - height = 9; - width = 9 - }, -/obj/machinery/door/airlock/shuttle, -/obj/docking_port/stationary{ - dir = 8; - dwidth = 4; - height = 9; - id = "backup_transit"; - name = "backup in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 9 - }, -/turf/simulated/floor/plating, -/area/shuttle/escape) "uHa" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -45025,6 +44641,12 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) +"uHe" = ( +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "uHf" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -45069,54 +44691,41 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"uIF" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 +"uJn" = ( +/obj/structure/sign/directions/cargo{ + dir = 4; + pixel_x = 32; + pixel_y = -26 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "navybluealtstrip" }, -/area/centcom/jail) -"uJi" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_DURAND" +/area/centcom/specops) +"uJy" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "navybluealt" }, /area/centcom/specops) -"uJp" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) -"uJA" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +"uJU" = ( +/obj/item/radio/intercom/specops{ + pixel_x = 30 }, -/obj/structure/weightmachine/stacklifter, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + icon_state = "dark" + }, +/area/centcom/specops) +"uJV" = ( +/obj/effect/turf_decal/arrows/red{ + name = "Armory" }, -/area/centcom/jail) -"uJF" = ( -/obj/machinery/vending/ntc/medal, -/obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) +/area/centcom/specops) "uKc" = ( /obj/machinery/vending/wallmed{ name = "Custom Emergency NanoMed"; @@ -45127,14 +44736,21 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"uKN" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "N2" +"uKU" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + dir = 1; + id_tag = "ERT_armory_vkd"; + name = "Armory level 1" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "darkfull" }, -/area/centcom/supply) +/area/centcom/specops) "uKX" = ( /obj/machinery/door_control/secure{ id = "SST_ready"; @@ -45159,6 +44775,21 @@ icon_state = "warnwhite" }, /area/centcom/zone1) +"uLd" = ( +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater3x3_side"; + tag = "icon-heater (NORTH)" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "uLg" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -45186,6 +44817,18 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"uLj" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "uLm" = ( /obj/machinery/light{ dir = 8 @@ -45195,34 +44838,54 @@ icon_state = "darkred" }, /area/syndicate_mothership/elite_squad) +"uLr" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/door/poddoor/shutters/preopen/invincible{ + dir = 1; + id_tag = "ERT_armory_vkd"; + name = "Armory level 1" + }, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/specops) +"uLw" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/glass, +/area/centcom/bridge) "uLx" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/centcom/evac) -"uLB" = ( -/obj/machinery/door/poddoor{ - id_tag = "ASSAULT2"; - name = "Launch Bay #2" - }, +"uMf" = ( /obj/effect/turf_decal/tile/neutral{ - alpha = 75; - color = "black"; - icon_state = "tile_full"; - layer = 9 + dir = 4 }, -/turf/simulated/floor/plating, -/area/centcom/supply) -"uLN" = ( -/obj/effect/turf_decal/arrows{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowaltstrip" +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/area/centcom/supply) +/obj/effect/turf_decal/tile/neutral, +/obj/structure/chair/comfy/lime{ + dir = 1 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "uMl" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line{ @@ -45241,14 +44904,6 @@ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) -"uMp" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - icon_state = "propulsion_r"; - tag = "icon-propulsion_r (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_elite) "uMr" = ( /obj/machinery/computer/cryopod{ pixel_y = 32 @@ -45257,12 +44912,11 @@ icon_state = "dark" }, /area/centcom/jail) -"uMB" = ( -/obj/structure/closet/secure_closet/cabinet/bar/random_drinks{ - layer = 3.5 - }, -/turf/simulated/floor/wood, -/area/centcom/zone3) +"uMu" = ( +/obj/machinery/light/small, +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet, +/area/centcom/zone1) "uMD" = ( /obj/machinery/conveyor{ id = "SFBQMLoad"; @@ -45293,6 +44947,20 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"uMZ" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/window/plasmareinforced{ + color = "#FF0000"; + dir = 1 + }, +/obj/structure/shuttle/engine/platform{ + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/syndicate) "uNb" = ( /obj/structure/flora/rock/jungle, /obj/structure/flora/junglebush, @@ -45313,6 +44981,17 @@ icon_state = "ninja_walls_direction" }, /area/shuttle/ninja) +"uNq" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/glass, +/area/centcom/zone3) "uNx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -45344,9 +45023,21 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"uOd" = ( -/obj/structure/filingcabinet/employment, -/turf/simulated/floor/carpet, +"uNI" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"uOa" = ( +/obj/item/ship_in_a_bottle, +/obj/effect/turf_decal/tile/neutral{ + alpha = 100; + icon_state = "seadeep"; + layer = 9; + icon = 'icons/misc/beach.dmi' + }, +/turf/simulated/floor/indestructible/beach/water/deep/sand_floor, /area/centcom/zone2) "uOf" = ( /obj/structure/chair/comfy/purp{ @@ -45361,16 +45052,15 @@ icon_state = "dark" }, /area/centcom/specops) -"uOl" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/wood, +"uOw" = ( +/obj/item/flag/nt, /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "uOA" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -45400,6 +45090,15 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"uPb" = ( +/obj/structure/closet/secure_closet/brig, +/obj/effect/decal/warning_stripes/red/hollow, +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkredalt" + }, +/area/centcom/jail) "uPe" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -45421,31 +45120,28 @@ icon_state = "Dark" }, /area/shuttle/funeral) -"uPQ" = ( -/obj/structure/bed, -/obj/item/bedsheet/rd, -/obj/effect/mine/sound/bwoink{ - layer = 2.9; - alpha = 0 - }, -/turf/simulated/floor/carpet/arcade, -/area/centcom/zone1) -"uPV" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"uPZ" = ( -/obj/machinery/light/spot, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/escape) "uQe" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/pointybush, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/control) +"uQg" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_security, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"uQD" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "uQK" = ( /obj/effect/mapping_helpers/light{ light_power = 3 @@ -45457,42 +45153,55 @@ /obj/structure/window/full/shuttle/gray, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) -"uRq" = ( -/obj/structure/closet/l3closet/security, -/obj/item/clothing/mask/gas, -/obj/item/tank/internals/emergency_oxygen/double, -/obj/item/reagent_containers/spray/cleaner, -/obj/item/watertank/janitor{ - max_integrity = 1500; - volume = 1500 +"uRC" = ( +/obj/structure/falsewall/reinforced{ + req_access = list(114); + layer = 5 }, -/obj/item/grenade/chem_grenade/cleaner, -/turf/simulated/floor/indestructible{ - dir = 5; - icon_state = "darkpurple" +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/area/centcom/specops) -"uSa" = ( -/obj/docking_port/stationary/transit{ - dwidth = 3; - height = 7; - id = "steel_rain_transit"; - name = "steel_rain in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 7 +/area/centcom/zone1) +"uRM" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 }, -/turf/space/transit/north{ - icon_state = "black" +/obj/item/book/manual/security_space_law/black{ + pixel_x = -4 }, -/area/space) -"uSe" = ( -/obj/machinery/computer/cloning, +/obj/item/book/manual/security_space_law/black{ + pixel_x = -4 + }, +/obj/item/book/manual/security_space_law/black{ + pixel_x = -4 + }, +/obj/item/book/manual/security_space_law/black{ + pixel_x = -4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) +"uSc" = ( +/obj/structure/holohoop{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/green/hollow, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whiteblue" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/evac) "uSq" = ( /obj/machinery/porta_turret/centcom{ active_power_usage = 0; @@ -45580,19 +45289,43 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"uUe" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/window/reinforced{ +"uTp" = ( +/obj/structure/window/full/reinforced{ + layer = 2 + }, +/turf/simulated/floor/plating, +/area/centcom/zone3) +"uTt" = ( +/obj/machinery/clonepod/upgraded, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whiteblue"; + tag = "icon-whiteblue (NORTHEAST)" + }, +/area/centcom/specops) +"uTw" = ( +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/conveyor{ - id = "N2"; +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/simulated/floor/plasteel{ +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/vending/coffee/free, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; icon_state = "dark" }, -/area/centcom/supply) +/area/shuttle/administration) +"uTC" = ( +/turf/simulated/floor/indestructible{ + dir = 10; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) "uUr" = ( /obj/effect/turf_decal/stripes/gold{ dir = 6 @@ -45605,34 +45338,23 @@ /obj/item/camera_bug, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"uUY" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 - }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 183; - teleport_y = 62; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" - }, -/turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" - }, -/area/centcom/specops) -"uVb" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 4 +"uVc" = ( +/obj/structure/table, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/light{ +/obj/item/flashlight/lamp/green, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/carpet/black, +/turf/simulated/floor/carpet, /area/centcom/zone2) +"uVd" = ( +/obj/structure/bookcase/manuals, +/obj/item/book/manual/sop_service, +/obj/item/book/manual/sop_supply, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "uVg" = ( /obj/machinery/light/small{ dir = 4; @@ -45642,6 +45364,25 @@ icon_state = "floor4" }, /area/shuttle/assault_pod) +"uVl" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/chair/comfy/lime{ + dir = 4 + }, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "uVo" = ( /obj/structure/rack, /obj/item/crowbar, @@ -45655,79 +45396,26 @@ icon_state = "warning" }, /area/shuttle/escape) -"uVr" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_l" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/specops) "uVO" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkredalt" }, /area/centcom/jail) -"uVX" = ( -/obj/structure/closet/cabinet{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100) - }, -/obj/item/storage/box/centcomofficer, -/obj/item/radio/headset/centcom{ - desc = null; - name = "Supreme commander bowman headset" - }, -/obj/item/card/id{ - access = list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,69,70,71,73,74,75,76,77,99,101,102,103,104,105,106,107,108,109,110,111,112,113,114); - icon_state = "commander"; - name = "Supreme Commander ID card"; - rank = "Nanotrasen Navy Captain"; - registered_name = null - }, -/obj/item/door_remote/centcomm, -/obj/item/clothing/accessory/medal/gold{ - desc = null; - name = "Supreme commander's gold medal" - }, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/clothing/under/color/black{ - icon_state = "hosdnavyclothes"; - name = "jumpsuit" - }, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/head/beret/centcom/officer/sigholt{ - icon_state = "officerberet"; - name = "beret" - }, -/obj/item/storage/backpack/satchel, -/obj/item/clothing/gloves/color/white{ - desc = null; - name = "Supreme judge gloves" - }, -/obj/item/clothing/shoes/cowboy/white{ - name = "white boots" - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"uVZ" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkred" - }, -/area/centcom/specops) "uWf" = ( /obj/effect/turf_decal/stripes/gold{ dir = 9 }, /turf/simulated/floor/carpet/black, /area/centcom/bridge) -"uWv" = ( -/obj/effect/decal/warning_stripes/white, -/obj/machinery/door/airlock{ +"uWl" = ( +/obj/effect/spawner/lootdrop/officetoys, +/obj/structure/table/holotable/wood, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) +"uWv" = ( +/obj/effect/decal/warning_stripes/white, +/obj/machinery/door/airlock{ id_tag = "CC_toilet_unit3"; name = "Toilet" }, @@ -45735,6 +45423,15 @@ icon_state = "dark" }, /area/centcom/zone1) +"uWy" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor{ + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "uWE" = ( /obj/structure/chair/wood{ dir = 8 @@ -45770,6 +45467,10 @@ /obj/machinery/light/spot, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"uYa" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/carpet, +/area/centcom/jail) "uYs" = ( /obj/effect/turf_decal/number/number_3{ dir = 8 @@ -45779,43 +45480,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"uYJ" = ( -/obj/effect/turf_decal/siding/white, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"uYX" = ( -/obj/structure/table/glass, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/pen/multi/gold, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) -"uZl" = ( -/obj/machinery/door/airlock/hatch{ - drain_act_protected = 1; - frequency = 1331; - id_tag = "ninja_outer"; - name = "Ship External Access" - }, -/obj/docking_port/mobile{ - dheight = 2; - dir = 2; - dwidth = 4; - height = 10; - id = "ombra"; - name = "Spider Clan Ombra"; - roundstart_move = "ombra_home"; - width = 21 - }, -/obj/structure/fans/tiny/invisible, -/turf/simulated/floor/shuttle{ - icon_state = "floor13" - }, -/area/shuttle/ninja) "uZp" = ( /obj/machinery/light/small{ dir = 4 @@ -45824,21 +45488,19 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) +"uZt" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "uZB" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkred" }, /area/centcom/specops) -"uZI" = ( -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder{ - pixel_x = -1; - pixel_y = 9 - }, -/obj/machinery/light, -/turf/simulated/floor/engine, -/area/centcom/specops) "uZO" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -45880,39 +45542,37 @@ icon_state = "freezerfloor" }, /area/centcom/jail) -"vbk" = ( -/obj/structure/rack, -/obj/item/storage/firstaid/tactical, -/obj/item/storage/firstaid/tactical, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluealt" +"vbB" = ( +/obj/machinery/door/window/brigdoor{ + color = "#22aab7"; + dir = 8; + icon_state = "rightsecure"; + req_access = list(101) }, -/area/centcom/specops) -"vcp" = ( -/obj/item/radio/intercom/specops{ - pixel_y = 25 +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) +"vbO" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + id_tag = "shit_rain_home"; + name = "Shuttle Hatch"; + req_access = list(109) }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkgreen" + icon_state = "dark" }, /area/centcom/specops) -"vct" = ( +"vcj" = ( +/obj/machinery/door/airlock/centcom{ + name = "Supreme Court"; + opacity = 1; + req_access = list(106,109,110) + }, /turf/simulated/floor/plasteel{ - icon_state = "darkyellowaltstrip" + icon_state = "dark" }, /area/centcom/zone3) -"vcv" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/autoimplanter/old, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "vcC" = ( /obj/structure/table/reinforced, /obj/item/flash, @@ -45922,17 +45582,20 @@ icon_state = "dark" }, /area/shuttle/escape) -"vcM" = ( -/obj/structure/window/reinforced{ - dir = 1 +"vcO" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 }, -/obj/effect/turf_decal/siding/white{ - dir = 9 +/obj/structure/window/reinforced, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22"; + tag = "icon-plant-22" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/light/small{ + dir = 8 }, -/area/centcom/evac) +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "vdf" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ @@ -45959,16 +45622,21 @@ icon_state = "bot" }, /area/shuttle/escape) -"vdV" = ( -/obj/structure/rack, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/item/ammo_box/shotgun/buck, -/obj/effect/decal/warning_stripes/blue/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"vdO" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = 8 }, -/area/centcom/specops) +/obj/machinery/recharger/wallcharger{ + pixel_x = -24; + pixel_y = -8 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = -24 + }, +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood, +/area/centcom/jail) "vdW" = ( /obj/structure/ore_box, /obj/effect/turf_decal/delivery/red, @@ -45983,6 +45651,16 @@ /obj/machinery/light/small, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"vem" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "Drop" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "vep" = ( /obj/machinery/light{ dir = 8 @@ -46028,6 +45706,12 @@ icon_state = "fancy-wood-cherry" }, /area/syndicate_mothership/control) +"vfD" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "vfR" = ( /obj/machinery/recharge_station/upgraded, /turf/simulated/floor/shuttle{ @@ -46054,21 +45738,13 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"vgD" = ( -/obj/structure/urinal{ - pixel_y = 32 - }, -/obj/machinery/door_control/secure{ - id = "CC_toilet_unit2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4; - pixel_x = 25 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/evac) +"vgt" = ( +/turf/simulated/floor/engine, +/area/centcom/specops) +"vgz" = ( +/obj/machinery/light/small, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "vgN" = ( /obj/structure/flora/rock, /obj/structure/flora/ausbushes/sparsegrass, @@ -46089,16 +45765,6 @@ icon_state = "dark" }, /area/centcom/zone1) -"vhh" = ( -/obj/effect/decal/warning_stripes/white, -/obj/machinery/door/airlock{ - id_tag = "CC_toilet_unit4"; - name = "Toilet" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone1) "vhp" = ( /obj/machinery/light{ dir = 1 @@ -46120,16 +45786,17 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"vhG" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_l"; - tag = "icon-burst_l" +"vhP" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" }, -/obj/structure/window/reinforced{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_2) +/area/centcom/specops) "vhU" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-6"; @@ -46155,10 +45822,19 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"vit" = ( -/obj/effect/turf_decal/siding/brown, -/turf/simulated/floor/carpet, -/area/centcom/zone3) +"vik" = ( +/obj/machinery/door_control/secure{ + color = "#9999ff"; + id = "ERT_armory_lvl2"; + name = "ERT Armory Level 2"; + pixel_y = -32; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "navyblue" + }, +/area/centcom/specops) "viw" = ( /obj/effect/turf_decal/number/number_7, /turf/simulated/floor/plasteel{ @@ -46223,9 +45899,26 @@ icon_state = "darkyellowfull" }, /area/centcom/bridge) -"vjG" = ( -/turf/simulated/floor/carpet/blue, -/area/centcom/specops) +"vjK" = ( +/obj/machinery/door/airlock/shuttle{ + aiControlDisabled = 1; + id_tag = "s_docking_airlock"; + name = "Emergency Droppod"; + req_access = list(109) + }, +/obj/docking_port/mobile/assault_pod/nt{ + port_direction = 2 + }, +/obj/docking_port/stationary{ + dwidth = 3; + height = 7; + name = "Emerjency droppod dock"; + id = "shit_rain_base"; + width = 7; + pixel_y = -32 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/nt_droppod) "vkh" = ( /obj/structure/table, /obj/structure/bedsheetbin{ @@ -46236,60 +45929,12 @@ icon_state = "barber" }, /area/centcom/jail) -"vkG" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = -24 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -16 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = -24; - pixel_y = -8 - }, -/obj/structure/table/reinforced, -/obj/item/storage/box/lights/mixed, -/obj/item/storage/box/lights/mixed, -/obj/item/lightreplacer, -/obj/item/lightreplacer, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealt" - }, -/area/centcom/specops) -"vkL" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/pen/multi/gold, -/obj/item/stamp/centcom{ - pixel_x = -5; - pixel_y = 5 - }, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) -"vlu" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "vlv" = ( /obj/item/flag/syndi, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, /area/syndicate_mothership) -"vlF" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) "vlG" = ( /obj/structure/table/reinforced, /obj/item/paper_bin/syndicate{ @@ -46313,14 +45958,21 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"vmx" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 8 - }, +"vlQ" = ( /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "darkredaltstrip" }, -/area/centcom/evac) +/area/centcom/zone2) +"vlW" = ( +/obj/machinery/ai_status_display{ + pixel_y = -32 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "vmC" = ( /obj/structure/railing{ dir = 4 @@ -46334,19 +45986,12 @@ icon_state = "dark" }, /area/syndicate_mothership/jail) -"vmF" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; +"vng" = ( +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowcorners"; dir = 1 }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"vmX" = ( -/obj/structure/window/full/reinforced{ - layer = 2 - }, -/turf/simulated/floor/plating, -/area/centcom/zone3) +/area/centcom/specops) "vnv" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -46364,18 +46009,6 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"vnx" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the Special Ops team."; - name = "Spec Ops Monitor"; - network = list("ERT"); - pixel_y = 30 - }, -/obj/machinery/computer/shuttle/ert, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "vny" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -46437,12 +46070,15 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"vpe" = ( -/obj/machinery/door/airlock/diamond{ - locked = 1 +"voT" = ( +/obj/structure/bed, +/obj/item/bedsheet/mime, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 }, -/turf/simulated/floor/plating, -/area/centcom/specops) +/turf/simulated/floor/carpet, +/area/centcom/zone1) "vpg" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" @@ -46476,30 +46112,6 @@ icon_state = "warning" }, /area/shuttle/escape) -"vpJ" = ( -/obj/machinery/camera{ - c_tag = "CentComm Special Ops. Shuttle"; - network = list("ERT","CentComm") - }, -/obj/machinery/recharge_station/ert, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) -"vpL" = ( -/obj/machinery/mech_bay_recharge_port{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) -"vpP" = ( -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/glass, -/area/centcom/bridge) "vpY" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -46515,6 +46127,23 @@ icon_state = "light-fancy-wood" }, /area/syndicate_mothership/control) +"vqd" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 9 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) +"vqC" = ( +/obj/structure/chair/office/dark{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "vqK" = ( /obj/structure/reagent_dispensers/fueltank/chem{ pixel_x = 32 @@ -46525,29 +46154,6 @@ icon_state = "neutralfull" }, /area/shuttle/escape) -"vqP" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone3) -"vqW" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "vqX" = ( /obj/structure/chair/sofa/left{ dir = 8 @@ -46555,16 +46161,6 @@ /obj/machinery/light/small, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"vrd" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -5 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone3) "vrm" = ( /obj/effect/turf_decal{ dir = 1; @@ -46581,25 +46177,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"vrA" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"vrB" = ( -/obj/structure/table/glass, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/reagent_containers/food/drinks/flask/detflask=10,/obj/item/reagent_containers/food/drinks/cans/tonic=10,/obj/item/reagent_containers/food/drinks/cans/thirteenloko=10,/obj/item/reagent_containers/food/drinks/cans/synthanol=10,/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind=10,/obj/item/reagent_containers/food/drinks/cans/lemon_lime=10,""=70); - name = "Food CC Spawner #3" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkred" - }, -/area/centcom/specops) "vrH" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -46615,50 +46192,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) -"vrM" = ( -/obj/machinery/door/airlock/external{ - id_tag = "s_docking_airlock"; - name = "Shuttle Airlock"; - req_access = list(150) - }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "syndicate_elite"; - name = "Side Hull Door"; - opacity = 0; - req_access = list(150) - }, -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 3; - height = 5; - id = "sst"; - name = "SST shuttle"; - roundstart_move = "sst_away"; - width = 11 - }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 3; - height = 5; - id = "sst_transit"; - name = "sst in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/south; - width = 11 - }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/syndicate_elite) -"vsc" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/wood, -/obj/item/trash/candle, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/evac) "vsf" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -46666,19 +46199,6 @@ icon_state = "darkjail" }, /area/syndicate_mothership/jail) -"vsi" = ( -/obj/machinery/vending/ntc_resources{ - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"vsm" = ( -/turf/simulated/floor/plasteel{ - icon_state = "darkredaltstrip" - }, -/area/centcom/jail) "vst" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -46701,6 +46221,15 @@ icon_state = "white" }, /area/centcom/jail) +"vsV" = ( +/obj/machinery/computer/supplycomp{ + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) "vtg" = ( /obj/machinery/computer/shuttle/sit, /turf/simulated/floor/shuttle{ @@ -46712,6 +46241,17 @@ /obj/structure/window/full/basic, /turf/simulated/floor/grass, /area/centcom/zone3) +"vtw" = ( +/obj/structure/chair, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) +"vtH" = ( +/turf/simulated/wall/shuttle/onlyselfsmooth, +/area/shuttle/administration) "vtI" = ( /obj/effect/turf_decal/plaque{ layer = 3 @@ -46722,24 +46262,6 @@ }, /turf/simulated/floor/redgrid, /area/syndicate_mothership) -"vtL" = ( -/obj/machinery/door/window/brigdoor{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/zone3) -"vtR" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "vtX" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/external{ @@ -46761,15 +46283,20 @@ icon_state = "rampbottom" }, /area/syndicate_mothership) -"vum" = ( -/obj/structure/chair/comfy/shuttle{ +"vuc" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"vui" = ( +/obj/machinery/computer/card, +/obj/structure/railing, +/obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkyellow" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/bridge) "vuA" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 6 @@ -46779,12 +46306,16 @@ icon_state = "asteroid" }, /area/centcom/evac) -"vvs" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal, -/area/shuttle/trade/sol) -"vvx" = ( -/turf/simulated/wall/shuttle, -/area/shuttle/transport) +"vvt" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/autoimplanter/old, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "vvD" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -46798,18 +46329,52 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"vwk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/vehicle/ridden/motorcycle{ +"vwe" = ( +/obj/machinery/door/window/brigdoor{ + dir = 8; + req_access = list(106) + }, +/turf/simulated/floor/wood, +/area/centcom/zone3) +"vwh" = ( +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "navybluealtstrip" + }, +/area/centcom/supply) +"vwu" = ( +/obj/structure/chair/comfy/shuttle{ dir = 1 }, +/obj/structure/window/reinforced/survival_pod{ + dir = 10; + pixel_x = -1; + pixel_y = -1 + }, +/obj/structure/window/reinforced{ + layer = 3.1; + armor = list("melee"=100,"bullet"=100,"laser"=0,"energy"=0,"bomb"=25,"bio"=100,"rad"=100,"fire"=80,"acid"=100) + }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 4; + icon_state = "darkyellow" }, -/area/syndicate_mothership) +/area/centcom/specops) "vwL" = ( /turf/simulated/floor/indestructible/beach/sand, /area/syndicate_mothership/outside) +"vwM" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/pod_3) "vwP" = ( /obj/machinery/gameboard, /turf/simulated/floor/carpet/black, @@ -46822,6 +46387,65 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"vxF" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" + }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navyblue" + }, +/area/centcom/specops) "vxN" = ( /obj/item/clothing/head/bearpelt, /obj/item/xenos_claw, @@ -46858,15 +46482,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"vyx" = ( -/obj/effect/decal/nanotrasen_logo{ - icon_state = "logo4"; - pixel_x = 16 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "vyy" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line{ @@ -46892,6 +46507,32 @@ icon_state = "darkred" }, /area/syndicate_mothership/elite_squad) +"vyL" = ( +/obj/structure/toilet{ + dir = 4; + name = "Трон старшего администратора" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/door_control{ + id = "CC_toilet_unit3"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/zone1) +"vza" = ( +/obj/machinery/status_display/supply_display{ + pixel_y = 32 + }, +/obj/structure/filingcabinet/medical, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "vzm" = ( /turf/simulated/wall/shuttle{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' @@ -46905,16 +46546,10 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) -"vzz" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_Grenade" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) +"vAb" = ( +/obj/effect/turf_decal/siding/yellow, +/turf/simulated/floor/carpet, +/area/centcom/evac) "vAg" = ( /obj/structure/table/wood/fancy/black, /obj/item/candle/eternal, @@ -46943,20 +46578,13 @@ icon_state = "dark" }, /area/centcom/zone2) -"vAq" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/drone, -/obj/item/crowbar/red, -/obj/item/borg/upgrade/vtec, -/obj/item/borg/upgrade/vtec, -/obj/item/stock_parts/cell/bluespace, -/obj/item/stock_parts/cell/bluespace, -/obj/item/borg/upgrade/selfrepair, -/obj/item/borg/upgrade/selfrepair, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"vAs" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 }, -/area/centcom/specops) +/obj/machinery/light, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) "vAv" = ( /obj/effect/turf_decal/stripes/line{ color = "darkgray"; @@ -46984,54 +46612,35 @@ "vAA" = ( /turf/simulated/wall/shuttle, /area/shuttle/escape) -"vAC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"vCn" = ( +/obj/effect/gibspawner/xeno, +/turf/simulated/floor/plating, +/area/syndicate_mothership/control) +"vCo" = ( +/obj/structure/rack/gunrack, +/obj/effect/decal/warning_stripes/blue/hollow, +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = -6 }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone3) -"vAU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30; - pixel_y = 30 +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = -6 }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = -6 }, -/area/shuttle/specops) -"vBs" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_DEDI"; - pixel_x = 24; - pixel_y = 24; - req_access = list(114) +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = 6 }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealtstrip" +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = 6 }, -/area/centcom/specops) -"vBV" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "Toxin" +/obj/item/gun/projectile/shotgun/automatic/combat{ + pixel_x = 6 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/supply) -"vCn" = ( -/obj/effect/gibspawner/xeno, -/turf/simulated/floor/plating, -/area/syndicate_mothership/control) -"vCI" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/table, -/obj/machinery/computer/library/public, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/specops) "vCV" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -47088,6 +46697,16 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"vDP" = ( +/obj/structure/fans/tiny, +/obj/effect/turf_decal/stripes/full, +/obj/machinery/door/poddoor/impassable{ + id_tag = "Admin_shuttle_access" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "vDS" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/ore_box, @@ -47107,12 +46726,6 @@ icon_state = "darkred" }, /area/centcom/specops) -"vEG" = ( -/obj/machinery/recharge_station/ert, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "vES" = ( /turf/simulated/floor/carpet/black, /area/centcom/zone2) @@ -47128,6 +46741,12 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"vFy" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navyblue" + }, +/area/centcom/specops) "vFD" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -47147,28 +46766,41 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"vGJ" = ( -/obj/structure/marker_beacon{ - icon_state = "markerburgundy-on" +"vGX" = ( +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 16; + icon_state = "bigscenner"; + icon = 'icons/obj/library.dmi' }, -/turf/simulated/floor/plating/airless, -/area/space) -"vGS" = ( -/obj/machinery/vending/dinnerware, -/obj/machinery/light{ - dir = 8 +/obj/item/paper_bin/nanotrasen{ + pixel_x = -2; + pixel_y = 8 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" +/obj/item/pen/fancy{ + pixel_x = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 }, +/obj/structure/table/holotable/wood, +/turf/simulated/floor/carpet/black, /area/centcom/specops) +"vHf" = ( +/obj/structure/filingcabinet/employment, +/turf/simulated/floor/carpet, +/area/centcom/zone2) "vHj" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-birch" }, /area/shuttle/trade/sol) +"vHu" = ( +/obj/effect/turf_decal/stripes/gold{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "vHB" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/ore_box, @@ -47178,11 +46810,11 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"vHQ" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "darkgreen" +"vHF" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "ShitRainSupply" }, +/turf/simulated/floor/plating, /area/centcom/specops) "vHT" = ( /obj/effect/turf_decal/delivery, @@ -47197,15 +46829,6 @@ icon_state = "dark" }, /area/centcom/evac) -"vIe" = ( -/obj/machinery/vending/engivend{ - req_access = list() - }, -/obj/effect/decal/warning_stripes/white/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "vIj" = ( /obj/machinery/computer/message_monitor, /turf/simulated/floor/plasteel{ @@ -47218,6 +46841,19 @@ /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) +"vIU" = ( +/obj/structure/falsewall/reinforced{ + req_access = list(114); + layer = 2.9 + }, +/obj/effect/mine/sound/bwoink{ + invisibility = 1; + layer = 2.8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "vIV" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -47235,6 +46871,15 @@ tag = "icon-stage_stairs" }, /area/syndicate_mothership/elite_squad) +"vIY" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/pen/multi/gold, +/obj/item/stamp/centcom{ + pixel_x = -5; + pixel_y = 5 + }, +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "vJp" = ( /obj/machinery/vending/wallmed{ name = "Custom Emergency NanoMed"; @@ -47246,6 +46891,15 @@ icon_state = "neutralfull" }, /area/shuttle/escape) +"vJu" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "vJx" = ( /obj/structure/chair/sofa{ dir = 1 @@ -47253,11 +46907,35 @@ /obj/machinery/light, /turf/simulated/floor/carpet, /area/centcom/evac) -"vKv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +"vKg" = ( +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/effect/turf_decal/delivery/white, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_4) +"vKl" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) +"vKv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/delivery/white, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -47287,17 +46965,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/plasteel, /area/shuttle/escape) -"vLc" = ( -/obj/vehicle/ridden/motorcycle{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood{ - icon_state = "fancy-wood-oak" - }, -/area/syndicate_mothership) "vLq" = ( /obj/machinery/door/airlock/centcom{ aiControlDisabled = 1; @@ -47323,12 +46990,6 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) -"vLy" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone2) "vLL" = ( /turf/simulated/wall/shuttle{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' @@ -47344,20 +47005,6 @@ icon_state = "plastitanium_red" }, /area/shuttle/syndicate) -"vLU" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the Special Ops."; - name = "Special Ops. Monitor"; - network = list("ERT"); - pixel_x = -32 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 4 - }, -/obj/machinery/papershredder, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "vLY" = ( /obj/item/storage/box/zipties, /turf/simulated/floor/shuttle/objective_check/vox, @@ -47377,14 +47024,6 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) -"vMl" = ( -/obj/structure/chair/office/light, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "vMq" = ( /obj/structure/shuttle/engine/heater{ icon_state = "heater3x3"; @@ -47399,13 +47038,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/cargo) -"vMv" = ( -/obj/structure/bookcase, -/obj/effect/decal/cleanable/cobweb{ - layer = 4 - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) "vMC" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -47449,6 +47081,14 @@ icon_state = "warning" }, /area/shuttle/escape) +"vNv" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "vNw" = ( /obj/machinery/door/airlock/external{ aiControlDisabled = 1; @@ -47463,16 +47103,6 @@ icon_state = "dark" }, /area/centcom/evac) -"vNA" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/computer/cryopod{ - pixel_y = -30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "vNF" = ( /turf/simulated/wall/shuttle/nosmooth{ dir = 4; @@ -47493,6 +47123,21 @@ icon_state = "dark" }, /area/centcom/evac) +"vOq" = ( +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone3) +"vOC" = ( +/obj/machinery/computer/account_database{ + name = "Admin Accounts Database" + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "vOQ" = ( /obj/machinery/door/airlock/syndicate/security/glass{ name = "Security Airlock"; @@ -47502,9 +47147,32 @@ icon_state = "floor4" }, /area/shuttle/syndicate) +"vOS" = ( +/obj/structure/table, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"vOU" = ( +/obj/effect/turf_decal/tile/neutral{ + alpha = 200; + color = "black"; + icon_state = "tile_full"; + layer = 9; + opacity = 1 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) "vPe" = ( /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"vPm" = ( +/obj/structure/bookcase/random, +/turf/simulated/floor/carpet, +/area/centcom/zone1) "vPq" = ( /obj/structure/railing{ dir = 8 @@ -47514,35 +47182,51 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"vPE" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +"vPx" = ( +/obj/structure/closet/secure_closet/guncabinet{ + anchored = 1; + damage_deflection = 2000; + layer = 2.9; + name = "Nuclear Fission Grenade"; + req_access = list(114) }, -/obj/structure/sign/poster/official/nanotrasen_logo{ - icon = 'icons/obj/decals.dmi'; - icon_state = "nanotrasen_sign1"; - pixel_x = -16; - pixel_y = 32 +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/item/grenade/confetti, +/obj/structure/sign/poster/contraband/clown{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellow" + icon_state = "dark" }, /area/centcom/specops) -"vPL" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +"vPy" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + damage_deflection = 1000; + dir = 2; + req_access = list(114) }, -/obj/structure/holohoop, -/obj/effect/decal/warning_stripes/green/hollow, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "CC_ERT2" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door_control/secure{ + id = "CC_ERT2"; + pixel_y = -25; + req_access = list(114) }, -/area/centcom/jail) +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" + }, +/area/centcom/specops) "vPS" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo9" @@ -47562,6 +47246,11 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) +"vPW" = ( +/obj/machinery/photocopier, +/obj/structure/table/wood, +/turf/simulated/floor/plating, +/area/centcom/zone2) "vQc" = ( /obj/structure/window/full/shuttle/gray, /obj/structure/grille, @@ -47576,57 +47265,6 @@ icon_state = "grimy" }, /area/centcom/zone1) -"vQJ" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "ERT_armory_lvl4"; - name = "Armory level 4"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) -"vQS" = ( -/obj/docking_port/mobile{ - dheight = 1; - dir = 8; - dwidth = 7; - height = 18; - id = "trade_sol"; - name = "sol trade shuttle"; - roundstart_move = "trade_sol_base"; - width = 15 - }, -/obj/machinery/door/airlock/shuttle/glass{ - id_tag = "s_docking_airlock" - }, -/obj/structure/fans/tiny, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 11; - id = "trade_sol_transit"; - name = "trade_sol in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/west; - width = 5 - }, -/turf/simulated/floor/wood, -/area/shuttle/trade/sol) -"vRe" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 6; - pixel_y = -1; - pixel_x = 1; - density = 0 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluealt" - }, -/area/centcom/zone2) "vRi" = ( /obj/machinery/computer/mech_bay_power_console, /obj/effect/decal/cleanable/dirt, @@ -47636,22 +47274,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/escape) -"vRJ" = ( -/obj/structure/table/glass, -/obj/item/book/manual/evaguide, -/obj/machinery/newscaster/security_unit{ - pixel_y = -32 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"vRQ" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "vRS" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -47660,24 +47282,21 @@ icon_state = "dark" }, /area/centcom/zone1) -"vRW" = ( -/obj/item/radio/intercom/specops{ - pixel_y = -32 +"vRV" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 2; + id_tag = "CC_Armory_LWAP" }, /turf/simulated/floor/plasteel{ - icon_state = "navybluealt" + icon_state = "dark" }, /area/centcom/specops) -"vSp" = ( -/obj/machinery/vending/nta{ - dir = 4; - products = list(/obj/item/grenade/flashbang=4,/obj/item/flash=5,/obj/item/flashlight/seclite=4,/obj/item/restraints/legcuffs/bola/energy=8,/obj/item/ammo_box/shotgun=4,/obj/item/ammo_box/shotgun/buck=4,/obj/item/ammo_box/shotgun/rubbershot=4,/obj/item/ammo_casing/shotgun/stunslug=35,/obj/item/ammo_casing/shotgun/ion=14,/obj/item/ammo_casing/shotgun/laserslug=35,/obj/item/ammo_box/speedloader/shotgun=8,/obj/item/ammo_box/magazine/lr30mag=12,/obj/item/ammo_box/magazine/enforcer=18,/obj/item/ammo_box/magazine/enforcer/lethal=28,/obj/item/ammo_box/magazine/sp8=8,/obj/item/ammo_box/magazine/laser=12,/obj/item/ammo_box/magazine/wt550m9=20,/obj/item/ammo_box/magazine/m556=12,/obj/item/ammo_box/a40mm=4,/obj/item/ammo_box/c46x30mm=8,/obj/item/ammo_box/inc46x30mm=4,/obj/item/ammo_box/tox46x30mm=4,/obj/item/ammo_box/ap46x30mm=4,/obj/item/ammo_box/laserammobox=4); - req_access = list(104,109) +"vRW" = ( +/obj/item/radio/intercom/specops{ + pixel_y = -32 }, -/obj/effect/decal/warning_stripes/white/hollow, -/obj/effect/decal/warning_stripes/white/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "navybluealt" }, /area/centcom/specops) "vSs" = ( @@ -47697,6 +47316,11 @@ icon_state = "darkyellowaltstrip" }, /area/syndicate_mothership/control) +"vSC" = ( +/obj/effect/landmark/ert_director, +/obj/structure/chair/office/dark, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "vSD" = ( /obj/structure/table, /obj/item/clipboard, @@ -47709,6 +47333,9 @@ icon_state = "bot" }, /area/shuttle/escape) +"vSE" = ( +/turf/simulated/floor/carpet/red, +/area/centcom/bridge) "vSK" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -47728,12 +47355,14 @@ "vTg" = ( /turf/simulated/floor/carpet/black, /area/centcom/evac) -"vTk" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 +"vTi" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 1 }, -/turf/simulated/floor/shuttle, -/area/shuttle/transport) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "vTr" = ( /obj/effect/turf_decal{ dir = 6; @@ -47764,46 +47393,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/assault_pod) -"vTF" = ( -/obj/structure/fans/tiny, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 8; - height = 18; - id = "admin"; - name = "administration shuttle"; - roundstart_move = "admin_away"; - width = 18 - }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 8; - height = 18; - id = "admin_transit"; - name = "admin in transit"; - pixel_x = 32; - turf_type = /turf/space/transit/west; - width = 18 - }, -/obj/machinery/door/airlock/external{ - frequency = 1331; - id_tag = "admin_s_outer"; - name = "Ship External Access"; - req_access = list(101) - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1331; - master_tag = "admin_s_air_control"; - pixel_x = -1; - pixel_y = -29; - req_access = list(101) - }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "podfloor_dark" - }, -/area/shuttle/administration) "vTH" = ( /obj/machinery/flasher{ id = "syndie_FB_cells"; @@ -47828,20 +47417,19 @@ icon_state = "grimy" }, /area/centcom/jail) -"vUA" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 2; - height = 11; - id = "specops_away"; - name = "centcom bay 3"; - top_left_corner = 8; - top_right_corner = 1; - width = 5; - turf_type = /turf/simulated/floor/plating/airless +"vUy" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/airlock/gold/glass{ + frequency = 2000; + hackable = 0; + id_tag = "CC-OP3-Ext"; + locked = 1; + name = "Zone 3" }, -/turf/simulated/floor/plating/airless, -/area/centcom/specops) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone3) "vUY" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, @@ -47865,9 +47453,16 @@ icon_state = "asteroid" }, /area/centcom/evac) -"vVT" = ( -/obj/structure/chair/comfy/brown, -/turf/simulated/floor/wood, +"vVB" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding/blue/corner{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "vWm" = ( /obj/structure/grille, @@ -47885,35 +47480,12 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"vWv" = ( -/obj/machinery/teleport/station, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "vWC" = ( /obj/effect/turf_decal/loading_area, /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"vWH" = ( -/obj/structure/closet/secure_closet/guncabinet{ - layer = 2.9; - name = "advanced energy gun" - }, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/item/gun/energy/gun/nuclear, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/gamma) "vWN" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line, @@ -47932,30 +47504,18 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"vXd" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 8 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_1) "vXo" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/centcom/evac) -"vXv" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkyellowalt" +"vXs" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 }, -/area/centcom/zone3) +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "vXD" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 1 @@ -47965,33 +47525,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"vXQ" = ( -/obj/structure/closet/cardboard{ - icon_state = "cardboard_cargo"; - icon_closed = "cardboard_cargo"; - icon_opened = "cardboard_cargo_open" - }, -/mob/living/simple_animal/hostile/mimic{ - faction = list("neutral"); - name = "Archivist" - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"vYd" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/effect/turf_decal/box/white/corners{ - dir = 1 - }, -/obj/structure/weightmachine/stacklifter, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/jail) "vYj" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -48009,6 +47542,35 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"vYC" = ( +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/machinery/computer/rdservercontrol{ + badmin = 1; + name = "Master R&D Server Controller" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"vYK" = ( +/obj/machinery/door/airlock/external{ + id_tag = "specops_away"; + name = "Shuttle Hatch"; + req_access = list(109) + }, +/obj/machinery/shower{ + dir = 1; + tag = "icon-shower (WEST)" + }, +/obj/structure/fans/tiny, +/obj/machinery/door/poddoor/impassable/preopen{ + id_tag = "ERT_Quarantine"; + name = "ERT Quarantine" + }, +/turf/simulated/floor/indestructible{ + icon_state = "dark" + }, +/area/centcom/specops) "vYT" = ( /obj/machinery/door_control/secure{ id = "SIT_outside"; @@ -48018,6 +47580,17 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) +"vYW" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -5 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) "vZd" = ( /obj/machinery/bluespace_beacon/syndicate, /obj/effect/turf_decal/box/red, @@ -48045,6 +47618,13 @@ icon_state = "darkfull" }, /area/syndicate_mothership) +"vZg" = ( +/obj/machinery/vending/security, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "vZr" = ( /obj/machinery/light, /obj/structure/chair/comfy/shuttle{ @@ -48054,35 +47634,17 @@ icon_state = "bot" }, /area/shuttle/escape) -"vZW" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 16 - }, -/turf/simulated/floor/carpet/red, -/area/centcom/bridge) -"wax" = ( -/obj/machinery/door/window/brigdoor{ - dir = 8; - req_access = list(106) - }, -/obj/structure/chair/comfy/lime{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"waz" = ( +/obj/structure/window/reinforced{ + layer = 2.9 }, -/area/centcom/zone3) -"way" = ( -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkredaltstrip" +/obj/structure/table, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, /area/centcom/zone2) "waD" = ( /obj/structure/lattice/catwalk, @@ -48095,6 +47657,13 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) +"waE" = ( +/obj/structure/plasticflaps/mining, +/obj/machinery/conveyor{ + id = "QMLoad2" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/supply) "waI" = ( /obj/structure/ore_box, /obj/effect/turf_decal/stripes/line{ @@ -48122,13 +47691,32 @@ icon_state = "darkgrey" }, /area/centcom/zone2) -"wbd" = ( -/obj/mecha/combat/marauder/loaded, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navyblue" +"waZ" = ( +/obj/structure/railing{ + dir = 1 }, +/turf/simulated/wall/indestructible/reinforced, /area/centcom/specops) +"wbe" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/glass/beaker/waterbottle, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -5 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) +"wbt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/vehicle/ridden/motorcycle{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/syndicate_mothership) "wbw" = ( /obj/machinery/conveyor_switch/oneway{ id = "SFBQMLoad" @@ -48138,9 +47726,20 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) -"wbG" = ( -/obj/structure/railing{ - dir = 1 +"wbF" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/window/reinforced/tinted{ + dir = 8 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"wbG" = ( +/obj/structure/railing{ + dir = 1 }, /obj/item/twohanded/required/kirbyplants, /obj/structure/railing, @@ -48148,25 +47747,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership/jail) -"wbJ" = ( -/obj/structure/toilet{ - dir = 4; - name = "Трон старшего администратора" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/door_control{ - id = "CC_toilet_unit3"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone1) "wbU" = ( /obj/effect/turf_decal/loading_area/white{ dir = 4 @@ -48175,42 +47755,56 @@ icon_state = "darkfull" }, /area/syndicate_mothership/infteam) +"wch" = ( +/obj/structure/falsewall/reinforced, +/obj/effect/decal/warning_stripes/blue{ + desc = "Куда же ведет эта лестница?"; + icon = 'icons/obj/structures.dmi'; + icon_state = "ladder11"; + name = "Ladder" + }, +/obj/effect/step_trigger/teleporter{ + teleport_x = 135; + teleport_y = 16; + teleport_z = 1; + mobs_only = 1; + icon = 'icons/mob/screen_gen.dmi'; + icon_state = "x2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "wcz" = ( /obj/structure/dresser, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/centcom/jail) -"wcC" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_y = -32 - }, -/obj/item/twohanded/required/kirbyplants, -/obj/structure/window/reinforced{ +"wcM" = ( +/obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 10; + icon_state = "darkyellowalt" }, -/area/centcom/bridge) +/area/centcom/zone3) "wde" = ( /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkbluealt" }, /area/centcom/zone2) -"wds" = ( -/obj/machinery/door/airlock/centcom{ - aiControlDisabled = 1; - name = "Assault Pod"; - opacity = 1; - req_access = list(150) +"wdH" = ( +/obj/machinery/cryopod{ + dir = 4 }, -/obj/docking_port/mobile/assault_pod, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" +/obj/structure/window/reinforced{ + dir = 1 }, -/area/shuttle/assault_pod) +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) "weC" = ( /obj/machinery/door/poddoor/shutters/invincible{ id_tag = "senior_o_shutters" @@ -48231,27 +47825,24 @@ icon_state = "warnwhite" }, /area/centcom/zone1) -"weS" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 8; - layer = 4.2 +"wfo" = ( +/obj/machinery/cryopod{ + dir = 4 }, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" +/obj/machinery/computer/cryopod{ + pixel_y = 32 }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 6 +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) +"wfA" = ( +/obj/structure/chair/sofa/corp/left{ + dir = 4 }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"wfE" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/sign/poster/official/space_cops{ + pixel_y = 32 }, -/area/centcom/specops) +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "wfM" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -48277,15 +47868,20 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/jail) -"wgo" = ( +"wgx" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navyblue" + icon_state = "dark" }, -/area/centcom/specops) -"wgN" = ( -/turf/simulated/floor/glass, -/area/centcom/bridge) +/area/centcom/jail) "whd" = ( /obj/structure/chair/sofa/corner{ dir = 4 @@ -48299,14 +47895,6 @@ icon_state = "ninja_walls_corners" }, /area/shuttle/ninja) -"whw" = ( -/obj/structure/chair, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) "whO" = ( /obj/effect/turf_decal/number/number_6{ dir = 4; @@ -48329,20 +47917,6 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"wil" = ( -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32 - }, -/obj/structure/window/reinforced, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22"; - tag = "icon-plant-22" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "wix" = ( /obj/machinery/door/airlock/hatch{ aiControlDisabled = 1; @@ -48386,6 +47960,9 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"wiU" = ( +/turf/simulated/wall/shuttle, +/area/shuttle/nt_droppod) "wje" = ( /obj/effect/turf_decal/stripes/line{ icon = 'icons/turf/floors.dmi'; @@ -48400,6 +47977,18 @@ icon_state = "warndarkgreyred" }, /area/syndicate_mothership) +"wjG" = ( +/obj/mecha/combat/durand/loaded{ + operation_req_access = list(1) + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/mech, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/gamma) "wkk" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -48407,19 +47996,6 @@ icon_state = "darkgrey" }, /area/syndicate_mothership) -"wkl" = ( -/obj/machinery/mass_driver{ - dir = 4; - id_tag = "ASSAULT2"; - name = "gravpult" - }, -/obj/effect/turf_decal/loading_area/white{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) "wkr" = ( /obj/effect/turf_decal/stripes/line{ color = "darkgray"; @@ -48440,18 +48016,24 @@ icon_state = "rampbottom" }, /area/syndicate_mothership/outside) -"wkE" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "trader_privacy"; - name = "Privacy Shutters" - }, -/obj/structure/grille, -/obj/structure/window/full/shuttle, -/turf/simulated/wall/shuttle, -/area/shuttle/trade/sol) "wkN" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/escape) +"wlb" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1; + pixel_y = 3 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) +"wlj" = ( +/obj/machinery/dna_scannernew/upgraded, +/turf/simulated/floor/shuttle{ + icon_state = "floor3" + }, +/area/shuttle/administration) "wlm" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/genericbush, @@ -48473,68 +48055,46 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"wlz" = ( -/obj/item/flag/nt, -/turf/simulated/floor/carpet, -/area/centcom/specops) "wlI" = ( /turf/simulated/floor/plasteel{ icon_state = "darkfull" }, /area/syndicate_mothership) +"wlW" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 6 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/specops) "wlY" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"wmd" = ( -/obj/structure/rack/holorack, -/obj/item/organ/internal/cyberimp/brain/anti_drop, -/obj/item/organ/internal/cyberimp/brain/anti_drop, -/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, -/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened, -/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, -/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus, -/obj/item/organ/internal/cyberimp/chest/reviver/hardened, -/obj/item/organ/internal/cyberimp/chest/reviver/hardened, -/obj/item/organ/internal/cyberimp/eyes/hud/medical, -/obj/item/organ/internal/cyberimp/eyes/hud/medical, -/obj/item/organ/internal/cyberimp/eyes/thermals, -/obj/item/organ/internal/cyberimp/eyes/thermals, -/obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/organ/internal/cyberimp/mouth/breathing_tube, -/obj/item/implanter/mindshield, -/obj/item/implanter/mindshield, -/obj/item/organ/internal/cyberimp/arm/combat/centcom, -/obj/item/organ/internal/cyberimp/arm/combat/centcom, -/obj/item/organ/internal/cyberimp/arm/surgery, -/obj/item/organ/internal/cyberimp/arm/toolset, -/obj/item/organ/internal/cyberimp/arm/janitorial, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "wmt" = ( /turf/simulated/wall/shuttle, /area/shuttle/trade/sol) -"wmD" = ( -/obj/machinery/autolathe/security{ - hacked = 1 - }, -/obj/machinery/light{ - dir = 8 +"wmC" = ( +/obj/effect/decal/nanotrasen_logo{ + pixel_x = 16 }, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; +/turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/shuttle/administration) -"wmR" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "navybluealt" +/area/centcom/specops) +"wmI" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) +"wmP" = ( +/obj/structure/table/wood{ + color = "#996633" }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "wna" = ( /turf/simulated/floor/plasteel{ @@ -48542,15 +48102,6 @@ icon_state = "dark" }, /area/syndicate_mothership/outside) -"wnu" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealtstrip" - }, -/area/centcom/supply) "wnA" = ( /obj/machinery/door/poddoor/shutters/preopen{ closingLayer = 5; @@ -48562,19 +48113,6 @@ /obj/structure/window/full/shuttle, /turf/simulated/floor/shuttle/plating, /area/shuttle/trade/sol) -"wnC" = ( -/obj/item/flag/nt, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "neutral" - }, -/area/centcom/evac) -"wnO" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/specops) "wod" = ( /obj/machinery/bodyscanner, /obj/machinery/light/spot, @@ -48615,33 +48153,11 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"woU" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -8; - pixel_y = 30 - }, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 6; - pixel_y = 30 - }, -/turf/simulated/floor/wood, -/area/centcom/zone2) "woV" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" }, /area/shuttle/specops) -"wpg" = ( -/obj/structure/railing{ - layer = 4.3 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/specops) "wpJ" = ( /obj/structure/flora/grass/jungle, /turf/simulated/floor/indestructible/grass, @@ -48657,6 +48173,17 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) +"wqj" = ( +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 5; + pixel_y = -2 + }, +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone3) "wqk" = ( /obj/effect/turf_decal{ dir = 6; @@ -48664,9 +48191,13 @@ }, /turf/simulated/floor/carpet/black, /area/syndicate_mothership/control) -"wqx" = ( -/turf/simulated/floor/carpet, -/area/centcom/jail) +"wqy" = ( +/obj/machinery/computer/card/centcom, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "wqz" = ( /obj/effect/mapping_helpers/light, /obj/effect/turf_decal{ @@ -48681,6 +48212,12 @@ /obj/structure/window/reinforced, /turf/simulated/floor/beach/sand, /area/centcom/evac) +"wqP" = ( +/obj/effect/turf_decal/box/white, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "wqQ" = ( /obj/structure/flora/junglebush, /obj/structure/flora/junglebush/c, @@ -48714,6 +48251,14 @@ icon_state = "dark" }, /area/centcom/specops) +"wrq" = ( +/obj/structure/chair/comfy/shuttle, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_2) "wrs" = ( /obj/structure/window/reinforced{ dir = 1 @@ -48767,9 +48312,6 @@ icon_state = "dark" }, /area/centcom/zone1) -"wso" = ( -/turf/simulated/wall/shuttle/onlyselfsmooth, -/area/shuttle/pod_1) "wsI" = ( /obj/structure/curtain/black{ pixel_y = -32 @@ -48789,6 +48331,30 @@ icon_state = "dark" }, /area/centcom/evac) +"wsY" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "ntsing_alt4" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"wta" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/table, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 3; + pixel_y = 12 + }, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "wtL" = ( /obj/structure/rack/holorack, /obj/item/gun/rocketlauncher, @@ -48837,6 +48403,12 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"wvg" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone2) "wvH" = ( /obj/effect/turf_decal{ dir = 8; @@ -48871,18 +48443,51 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) +"wvZ" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "ntsing_alt" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "wwr" = ( /obj/structure/table/wood{ color = "#996633" }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) +"wwE" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/structure/weightmachine/stacklifter, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" + }, +/area/centcom/jail) "wwK" = ( /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkyellow" }, /area/centcom/specops) +"wxh" = ( +/obj/structure/closet/crate/can, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/centcom/zone2) +"wxt" = ( +/turf/simulated/floor/glass, +/area/centcom/bridge) "wxC" = ( /obj/structure/window/reinforced, /obj/item/flag/species/taj, @@ -48890,14 +48495,6 @@ icon_state = "dark" }, /area/centcom/evac) -"wxE" = ( -/obj/effect/turf_decal/siding/white{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "wxH" = ( /obj/machinery/airlock_sensor{ frequency = 1331; @@ -48914,21 +48511,6 @@ /obj/machinery/computer/shuttle/vox, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"wxL" = ( -/obj/docking_port/stationary/transit{ - dheight = 1; - dir = 2; - dwidth = 4; - height = 20; - id = "ombra_transit"; - name = "Ombra in transit"; - turf_type = /turf/space/transit/south; - width = 9 - }, -/turf/space/transit/south{ - icon_state = "speedspace_ns_1" - }, -/area/space) "wxO" = ( /obj/machinery/computer/library, /obj/structure/table/wood{ @@ -48947,99 +48529,10 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/syndicate_mothership/cargo) -"wym" = ( -/obj/structure/table/reinforced, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - pixel_y = 5; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = -4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - icon_state = "walkietalkie_sec" - }, -/obj/item/radio{ - pixel_x = 4; - icon_state = "walkietalkie_sec" - }, -/turf/simulated/floor/plasteel{ - icon_state = "navyblue" - }, -/area/centcom/specops) -"wyr" = ( -/obj/machinery/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_y = 32 - }, -/obj/structure/rack, -/obj/item/roller/holo, -/obj/item/roller/holo, -/obj/item/roller/holo, -/obj/item/roller/holo, -/obj/item/roller/holo, +"wyk" = ( +/obj/machinery/vending/cigarette/free, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkbluealt" + icon_state = "dark" }, /area/centcom/specops) "wyt" = ( @@ -49048,6 +48541,18 @@ icon_state = "floor4" }, /area/shuttle/assault_pod) +"wyB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/donkpockets, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "wyU" = ( /obj/item/flag/nt, /turf/simulated/floor/wood, @@ -49077,12 +48582,6 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) -"wze" = ( -/obj/structure/closet/secure_closet, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/centcom/zone3) "wzh" = ( /obj/effect/turf_decal{ dir = 1; @@ -49101,52 +48600,6 @@ /obj/structure/table/wood/fancy, /turf/simulated/floor/wood, /area/centcom/zone1) -"wzC" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -32 - }, -/obj/effect/turf_decal/siding/white{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"wzD" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor{ - id = "N2"; - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen{ - maximum_pressure = 50000 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"wzK" = ( -/obj/machinery/door/airlock/command/glass{ - frequency = 2000; - icon_state = "open"; - id_tag = "CC-OP3-Int"; - locked = 1; - name = "Zone 2" - }, -/obj/effect/decal/warning_stripes/blue, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 2000; - master_tag = "CC-OP3"; - name = "CC-OP3-INT"; - pixel_x = 32; - req_access = list(109) - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/zone2) "wzP" = ( /obj/item/decorations/sticky_decorations/flammable/snowman{ pixel_x = -7; @@ -49167,26 +48620,89 @@ icon_state = "darkredalt" }, /area/syndicate_mothership/cargo) -"wAm" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - id_tag = "ShitRainSupply" +"wAs" = ( +/obj/structure/table/reinforced, +/obj/machinery/door_control/secure{ + id = "ERT_director_office_shutters2"; + name = "Briefing"; + pixel_x = 6; + pixel_y = -2; + req_access = list(114) }, -/turf/simulated/floor/plating, +/obj/machinery/door_control/secure{ + color = "#ff9999"; + id = "ERT_armory_lvl3"; + name = "ERT Armory Level 3"; + req_access = list(114); + pixel_x = -6; + pixel_y = 8 + }, +/obj/machinery/door_control/secure{ + color = "#99ff99"; + id = "ERT_armory_lvl1"; + name = "ERT Armory Level 1"; + req_access = list(114); + pixel_x = -6; + pixel_y = -8 + }, +/obj/machinery/door_control/secure{ + color = "#9999ff"; + id = "ERT_armory_lvl2"; + name = "ERT Armory Level 2"; + req_access = list(114); + pixel_x = -6 + }, +/obj/machinery/door_control{ + id = "ERT_Quarantine"; + name = "ERT Quarantine"; + req_access = list(114); + pixel_y = 6; + pixel_x = 6 + }, +/obj/machinery/door_control/secure{ + color = "#ffdd99"; + id = "ERT_armory_lvl4"; + name = "ERT Armory Level 4"; + req_access = list(114); + pixel_x = 6; + pixel_y = -14 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) -"wAS" = ( +"wAz" = ( /obj/structure/table/glass, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -2; - pixel_y = 8 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkred" }, -/obj/item/pen/fancy{ - pixel_x = 8 +/area/centcom/specops) +"wAE" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light{ + dir = 1 }, +/turf/simulated/floor/wood, +/area/centcom/zone3) +"wAL" = ( /obj/structure/window/reinforced{ - dir = 8 + dir = 8; + layer = 2.9 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" }, /turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/specops) +"wAV" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/centcom/jail) "wBe" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -49204,6 +48720,12 @@ /obj/effect/mapping_helpers/light, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"wBr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/indestructible/reinforced, +/area/centcom/zone3) "wBy" = ( /obj/machinery/atmospherics/unary/tank/nitrogen{ dir = 8 @@ -49218,21 +48740,6 @@ }, /turf/simulated/floor/redgrid, /area/syndicate_mothership) -"wBV" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/cobweb{ - layer = 4 - }, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"wCq" = ( -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 8 - }, -/obj/item/flag/nt, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "wCw" = ( /obj/structure/table/wood/fancy/red, /obj/item/folder/red{ @@ -49253,10 +48760,13 @@ icon_state = "dark" }, /area/syndicate_mothership/control) -"wDu" = ( -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +"wDk" = ( +/obj/machinery/light/spot{ + dir = 1 + }, +/obj/structure/closet/crate, +/turf/simulated/floor/shuttle, +/area/shuttle/transport) "wDB" = ( /obj/machinery/door/airlock/syndicate/security/glass{ name = "Security Airlock"; @@ -49287,30 +48797,6 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"wDU" = ( -/obj/structure/filingcabinet/chestdrawer{ - anchored = 0 - }, -/obj/structure/sign/poster/ripped{ - pixel_y = -32 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) -"wDZ" = ( -/obj/structure/shuttle/engine/heater{ - dir = 1; - icon_state = "heater3x3"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/shuttle/engine/platform{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/plasmareinforced{ - color = "#00f700" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/ninja) "wEb" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -49361,14 +48847,6 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"wFf" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkredalt" - }, -/area/centcom/jail) "wFC" = ( /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -49401,66 +48879,30 @@ icon_state = "darkred" }, /area/syndicate_mothership/elite_squad) -"wGg" = ( -/obj/vehicle/ridden/motorcycle{ - dir = 8 - }, -/turf/simulated/floor/wood{ - icon_state = "fancy-wood-oak" +"wGf" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/area/syndicate_mothership) +/area/centcom/jail) "wGu" = ( /turf/simulated/wall/indestructible/fakeglass{ base_icon_state = "fake_plastitanium_glass"; icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' }, /area/syndicate_mothership) -"wGE" = ( -/obj/structure/window/reinforced{ - layer = 2.9 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-17"; - tag = "icon-plant-17" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "wGM" = ( /obj/structure/window/full/reinforced{ layer = 2 }, /turf/simulated/floor/plating, /area/centcom/evac) -"wHu" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "burst_r" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/specops) -"wIa" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "burst_r"; - tag = "icon-burst_r" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/pod_1) -"wIv" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "darkred" +"wIg" = ( +/obj/machinery/light_construct/small{ + dir = 1 }, -/area/centcom/specops) -"wIw" = ( -/turf/simulated/floor/shuttle, -/area/shuttle/transport) +/turf/simulated/floor/plating, +/area/centcom/zone2) "wIz" = ( /obj/machinery/door/airlock/syndicate/public{ name = "Shower" @@ -49473,29 +48915,32 @@ /obj/structure/lattice, /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/syndicate) -"wIX" = ( -/obj/structure/table/glass, -/obj/item/toy/plushie/tabby_cat{ - desc = "Любимая игрушка-антистресс одной из представительниц вида таяран, когда-то работавшей главой персонала. Она была настолько занята выполнением своих обязанностей, что умерла голодной смертью прямо на своем рабочем месте. Не будьте как эта таяра. Кушайте регулярно."; - name = "Любимая игрушка бюрократов" - }, -/obj/item/reagent_containers/food/drinks/coffee{ - pixel_y = 9; - pixel_x = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "wJl" = ( /turf/simulated/floor/shuttle/objective_check{ icon = 'icons/turf/floors.dmi'; icon_state = "darkred" }, /area/shuttle/escape) -"wJr" = ( -/obj/machinery/photocopier, -/obj/structure/window/reinforced, -/turf/simulated/floor/wood/fancy/light, +"wJo" = ( +/obj/machinery/door_control/secure{ + id = "ERT_Drop"; + pixel_x = 26; + pixel_y = -8; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "navybluealt" + }, /area/centcom/specops) +"wJI" = ( +/obj/structure/table/glass, +/obj/item/book/manual/evaguide, +/obj/machinery/newscaster/security_unit{ + pixel_y = -32 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "wJV" = ( /turf/simulated/wall/shuttle/onlyselfsmooth, /area/shuttle/trade/sol) @@ -49507,6 +48952,14 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) +"wKn" = ( +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "wKR" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ frequency = 1331; @@ -49520,11 +48973,30 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) +"wKZ" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) "wLl" = ( /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/shuttle/escape) +"wLp" = ( +/obj/structure/closet/secure_closet, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/zone3) +"wLt" = ( +/obj/machinery/vending/ntc/engineering, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "wLD" = ( /obj/structure/flora/junglebush, /obj/structure/flora/junglebush, @@ -49558,22 +49030,14 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"wLV" = ( -/obj/structure/table/glass, -/turf/simulated/floor/plasteel{ - icon_state = "darkyellow" +"wMU" = ( +/obj/machinery/door/airlock/centcom{ + name = "Office"; + opacity = 1; + req_access = list(666) }, +/turf/space, /area/centcom/specops) -"wMB" = ( -/obj/structure/railing{ - dir = 4; - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - icon_state = "rampbottom"; - tag = "icon-stage_stairs" - }, -/area/centcom/zone1) "wNd" = ( /obj/structure/statue/sandstone/assistant{ anchored = 1; @@ -49590,16 +49054,6 @@ icon_state = "dark" }, /area/syndicate_mothership/jail) -"wNe" = ( -/obj/effect/decal/warning_stripes/northeastsouth, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_GYGAX" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "wNi" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -49645,23 +49099,40 @@ /obj/structure/grille, /turf/simulated/floor/carpet, /area/syndicate_mothership/control) -"wPe" = ( -/obj/effect/turf_decal/tile/neutral{ - color = "black"; - icon_state = "tile_full"; - layer = 9 +"wNL" = ( +/obj/machinery/vending/ntc/ert{ + req_access = list(114) }, -/obj/effect/step_trigger/teleporter{ - teleport_x = 175; - teleport_y = 62; - teleport_z = 1; - icon = 'icons/mob/screen_gen.dmi'; - icon_state = "x2" +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) +"wOy" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + dir = 2; + id_tag = "CC_supply_internal2"; + layer = 5; + locked = 1 }, /turf/simulated/floor/plasteel{ - color = "gray"; - dir = 8; - icon_state = "rampbottom" + dir = 4; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) +"wOD" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1; + do_not_delete_me = 1 + }, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_GYGAX" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkfull" }, /area/centcom/specops) "wPq" = ( @@ -49681,35 +49152,12 @@ icon_state = "darkyellowalt" }, /area/syndicate_mothership/cargo) -"wPT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/shuttle/engine/heater{ - dir = 8 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/specops) "wQz" = ( /obj/structure/chair/comfy/red{ dir = 8 }, /turf/simulated/floor/carpet/black, /area/centcom/zone1) -"wQA" = ( -/obj/effect/decal/warning_stripes/north, -/obj/effect/decal/warning_stripes/south, -/obj/effect/turf_decal/caution/stand_clear, -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "ERT_armory_lvl3"; - name = "Armory level 3"; - layer = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkfull" - }, -/area/centcom/specops) "wQE" = ( /obj/structure/table, /obj/item/decorations/bouquets/random, @@ -49735,29 +49183,86 @@ icon_state = "navybluealtstrip" }, /area/centcom/specops) -"wSQ" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 2; - id_tag = "CC_Armory_LWAP" +"wRR" = ( +/obj/item/radio/intercom/specops{ + pixel_x = 32 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 4; + icon_state = "darkredalt" }, -/area/centcom/specops) -"wSS" = ( -/obj/item/book/manual/sop_command, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_general, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/obj/item/book/manual/security_space_law/black, -/obj/structure/bookcase/random, -/turf/simulated/floor/carpet, /area/centcom/jail) +"wRW" = ( +/obj/structure/reagent_dispensers/spacecleanertank{ + pixel_x = -32 + }, +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/indestructible{ + dir = 10; + icon_state = "darkpurple" + }, +/area/centcom/specops) +"wSE" = ( +/obj/structure/closet{ + icon_closed = "syndicate1"; + icon_opened = "syndicate1open"; + icon_state = "syndicate1" + }, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/ammo_box/magazine/smgm9mm, +/obj/item/gun/projectile/automatic/proto, +/obj/item/gun/energy/gun/blueshield, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/reagent_containers/food/snacks/candy/mre, +/obj/item/reagent_containers/hypospray/combat, +/obj/item/radio/headset/ert/alt{ + desc = null; + name = "SRT bowman headset" + }, +/obj/item/clothing/head/beret/centcom/officer/navy{ + desc = null; + name = "SRT beret" + }, +/obj/item/clothing/shoes/combat/swat{ + name = "SRT special shoes" + }, +/obj/item/clothing/gloves/combat{ + name = "Combat gloves" + }, +/obj/item/storage/belt/security/webbing/srt/full, +/obj/item/storage/backpack/satchel_blueshield/srt, +/obj/item/clothing/suit/storage/blueshield/srt, +/obj/item/clothing/suit/armor/bulletproof{ + name = "SRT bulletproof vest" + }, +/obj/item/shield/riot/tele, +/obj/item/suppressor, +/obj/item/CQC_manual, +/obj/item/implanter/mindshield/ert, +/obj/item/card/id/centcom{ + name = "Special Reaction Team Member card"; + rank = "Special Reaction Team Member"; + registered_name = "Special Reaction Team Member" + }, +/obj/item/storage/box/responseteam, +/obj/item/clothing/under/fluff/jay_turtleneck{ + desc = null; + name = "SRT uniform" + }, +/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, +/obj/item/ammo_box/magazine/sp8, +/obj/item/ammo_box/magazine/sp8, +/obj/item/implanter/dust, +/obj/item/clothing/accessory/holster, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navyblue" + }, +/area/centcom/specops) "wSW" = ( /obj/effect/turf_decal{ dir = 9; @@ -49775,6 +49280,42 @@ }, /turf/simulated/floor/indestructible/asteroid, /area/syndicate_mothership/outside) +"wTk" = ( +/obj/structure/rack/holorack, +/obj/item/clothing/accessory/black{ + desc = null; + name = "Black tie" + }, +/obj/item/clothing/accessory/blue{ + desc = null; + name = "Blue tie" + }, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/glasses/hud/security/sunglasses/aviators, +/obj/item/clothing/accessory/blue{ + desc = null; + name = "Blue tie" + }, +/obj/item/clothing/accessory/black{ + desc = null; + name = "Black tie" + }, +/obj/item/clothing/accessory/holster{ + desc = null; + name = "Shoulder holster" + }, +/obj/item/clothing/accessory/holster{ + desc = null; + name = "Shoulder holster" + }, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/storage/backpack/satcheldeluxe, +/obj/item/storage/belt/fannypack/black, +/obj/item/storage/belt/fannypack/black, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "wTK" = ( /turf/simulated/floor/shuttle/objective_check{ dir = 5; @@ -49782,25 +49323,6 @@ icon_state = "darkred" }, /area/shuttle/escape) -"wUp" = ( -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/effect/turf_decal/siding{ - color = "#444444" - }, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) -"wUt" = ( -/obj/item/radio/intercom/specops{ - pixel_x = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredalt" - }, -/area/centcom/jail) "wUF" = ( /turf/simulated/floor/wood, /area/centcom/zone1) @@ -49878,19 +49400,6 @@ icon_state = "rampbottom" }, /area/syndicate_mothership) -"wVY" = ( -/obj/structure/bookcase, -/obj/item/book/manual/sop_command, -/obj/item/book/manual/sop_engineering, -/obj/item/book/manual/sop_general, -/obj/item/book/manual/sop_legal, -/obj/item/book/manual/sop_medical, -/obj/item/book/manual/sop_science, -/obj/item/book/manual/sop_security, -/obj/item/book/manual/sop_service, -/obj/item/book/manual/sop_supply, -/turf/simulated/floor/carpet, -/area/centcom/jail) "wWa" = ( /obj/machinery/door/airlock/external{ id_tag = "s_docking_airlock"; @@ -49920,37 +49429,14 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/assault_pod) -"wWk" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - req_access = list(114) - }, -/obj/item/clothing/suit/judgerobe{ - name = "Supreme judge's robe" - }, -/obj/item/card/id/centcom{ - icon_state = "deathsquad"; - name = "Supreme Judge ID card"; - pixel_x = -3; - pixel_y = -3; - registered_name = "Supreme Judge" - }, -/obj/item/clothing/head/powdered_wig{ - desc = null; - name = "Supreme judge wig" - }, -/obj/item/clothing/under/suit_jacket/really_black{ - name = "Supreme judge suit" - }, -/obj/item/clothing/shoes/centcom{ - desc = null; - name = "Dress shoes" +"wWh" = ( +/obj/effect/decal/warning_stripes/white/hollow, +/obj/machinery/vending/nta/ertarmory/yellow{ + req_access = list(104,109) }, -/obj/item/clothing/gloves/color/white{ - desc = null; - name = "Supreme judge gloves" +/turf/simulated/floor/plasteel{ + icon_state = "darkyellowfull" }, -/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "wWp" = ( /obj/structure/chair/office/light, @@ -49963,56 +49449,15 @@ icon_state = "darkyellowcornersalt" }, /area/syndicate_mothership/cargo) -"wWA" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkbluealt" - }, -/area/centcom/zone2) -"wWT" = ( -/obj/structure/rack/holorack, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/suit/armor/heavy, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/shoes/combat/swat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"wWF" = ( +/obj/structure/chair/comfy/beige{ + dir = 4; + layer = 4; + pixel_y = -2 }, -/area/centcom/supply) +/obj/structure/railing, +/turf/simulated/floor/carpet/black, +/area/centcom/bridge) "wWV" = ( /obj/item/toy/nuke, /obj/structure/table/wood/poker, @@ -50031,6 +49476,13 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) +"wXd" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_4) "wXg" = ( /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/wood{ @@ -50061,20 +49513,20 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"wXu" = ( -/turf/simulated/floor/indestructible{ - dir = 5; - icon_state = "darkgreynavyblue" +"wXo" = ( +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4 }, -/area/centcom/specops) -"wXK" = ( /obj/effect/turf_decal/siding/white{ - dir = 8 + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/evac) +/area/centcom/jail) "wXY" = ( /obj/structure/window/reinforced{ dir = 1 @@ -50086,31 +49538,29 @@ icon_state = "grimy" }, /area/syndicate_mothership) -"wYk" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/medical{ - dir = 4; - req_access = list(103,104,109) - }, -/obj/effect/decal/warning_stripes/white/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "wYx" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "vault" }, /area/centcom/specops) -"wZB" = ( -/obj/effect/decal/warning_stripes/west, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/zone3) -"wZK" = ( +"wZz" = ( +/obj/structure/window/reinforced, +/obj/machinery/light, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "navybluealt" + icon_state = "dark" + }, +/area/centcom/evac) +"wZH" = ( +/obj/item/twohanded/required/kirbyplants, +/obj/structure/sign/restroom{ + pixel_x = 32 + }, +/turf/simulated/floor/wood{ + icon_state = "light-fancy-wood" }, /area/centcom/specops) "wZL" = ( @@ -50147,6 +49597,16 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) +"xac" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/centcom/zone1) "xak" = ( /obj/machinery/light{ dir = 1 @@ -50155,6 +49615,10 @@ icon_state = "floor4" }, /area/shuttle/syndicate) +"xap" = ( +/obj/item/flag/nt, +/turf/simulated/floor/wood, +/area/centcom/zone3) "xaq" = ( /obj/structure/mirror{ pixel_x = 30 @@ -50203,23 +49667,41 @@ /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"xaL" = ( -/obj/structure/rack, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/item/ammo_box/magazine/m556, -/obj/effect/decal/warning_stripes/red/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +"xaJ" = ( +/obj/machinery/door/airlock/hatch{ + drain_act_protected = 1; + frequency = 1331; + id_tag = "ninja_outer"; + name = "Ship External Access" }, -/area/centcom/specops) +/obj/docking_port/mobile{ + dheight = 2; + dir = 2; + dwidth = 4; + height = 10; + id = "ombra"; + name = "Spider Clan Ombra"; + roundstart_move = "ombra_home"; + width = 21; + port_direction = 2; + preferred_direction = 2 + }, +/obj/structure/fans/tiny/invisible, +/obj/docking_port/stationary{ + area_type = /area/ninja/outside; + dheight = 2; + dir = 2; + dwidth = 4; + height = 10; + id = "ombra_home"; + name = "Spider Clan Facility"; + turf_type = /turf/simulated/floor/indestructible/snow; + width = 21 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor13" + }, +/area/shuttle/ninja) "xaN" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -50254,18 +49736,6 @@ icon_state = "grimy" }, /area/centcom/jail) -"xbu" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = -32 - }, -/turf/simulated/floor/shuttle{ - icon_state = "floor4" - }, -/area/shuttle/specops) "xbw" = ( /obj/machinery/vending/syndisnack, /turf/simulated/floor/wood{ @@ -50299,43 +49769,32 @@ icon_state = "dark" }, /area/centcom/evac) -"xbJ" = ( -/obj/structure/table/wood, -/obj/item/pizzabox/vegetable, -/obj/item/pizzabox/vegetable, -/obj/item/pizzabox/vegetable, -/obj/item/pizzabox/vegetable, -/obj/item/kitchen/knife, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" - }, -/area/centcom/specops) -"xbP" = ( -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes, -/obj/item/storage/box/monkeycubes/farwacubes, -/obj/item/storage/box/monkeycubes/farwacubes, -/obj/item/storage/box/monkeycubes/neaeracubes, -/obj/item/storage/box/monkeycubes/neaeracubes, -/obj/item/storage/box/monkeycubes/stokcubes, -/obj/item/storage/box/monkeycubes/stokcubes, -/obj/item/storage/box/monkeycubes/wolpincubes, -/obj/item/storage/box/monkeycubes/wolpincubes, -/obj/structure/sink{ - dir = 1 +"xbV" = ( +/obj/docking_port/mobile{ + dwidth = 8; + height = 22; + id = "syndicate"; + name = "syndicate shuttle"; + roundstart_move = "syndicate_away"; + width = 18; + port_direction = 2 }, -/obj/structure/table/reinforced, -/obj/structure/sign/poster/official/healthy{ - pixel_y = -32 +/obj/structure/lattice/catwalk, +/obj/docking_port/stationary{ + area_type = /area/syndicate_mothership; + dwidth = 8; + height = 22; + id = "syndicate_away"; + name = "syndicate base"; + turf_type = /turf/simulated/floor/indestructible/plating; + width = 18 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkbluealt" +/turf/simulated/floor/shuttle/transparent_floor{ + dir = 4; + icon = 'icons/turf/shuttle/misc.dmi'; + icon_state = "tube" }, -/area/centcom/specops) +/area/shuttle/syndicate) "xca" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -50380,6 +49839,28 @@ icon_state = "plastitanium_red" }, /area/shuttle/syndicate) +"xcV" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/airlock/gold/glass{ + frequency = 2000; + hackable = 0; + id_tag = "CC-OP4-Ext"; + locked = 1; + name = "Zone 3" + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 2000; + master_tag = "CC-OP4"; + name = "CC-OP4-EXT"; + pixel_y = 24; + req_access = list(109); + wires = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "xdH" = ( /obj/machinery/vending/syndicigs, /obj/machinery/light/small{ @@ -50409,32 +49890,21 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"xec" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom, -/obj/item/megaphone, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +"xea" = ( +/obj/effect/turf_decal/stripes/line{ + icon = 'icons/turf/floors.dmi'; + icon_state = "siding8" }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) -"xed" = ( -/obj/structure/chair/comfy/red{ - color = "#FFFFFF"; - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + alpha = 75; + color = "black"; + icon_state = "tile_full" }, -/turf/simulated/floor/carpet/cyan, -/area/centcom/zone2) -"xeK" = ( -/obj/machinery/vending/snack, -/obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault"; - tag = "icon-vault (WEST)" + dir = 1; + icon_state = "rampbottom" }, -/area/centcom/specops) +/area/centcom/supply) "xeR" = ( /obj/machinery/door/airlock/centcom{ name = "Emergency Response Team"; @@ -50455,6 +49925,17 @@ underlay_floor_icon_state = "floor13" }, /area/shuttle/ninja) +"xfD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "xfI" = ( /obj/effect/decal/nanotrasen_logo, /turf/simulated/floor/plasteel{ @@ -50474,31 +49955,22 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"xfP" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) -"xfU" = ( -/obj/effect/decal/warning_stripes/west, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - dir = 8; - icon_state = "rightsecure"; - name = "CentComm Chemical lab" +"xgh" = ( +/obj/machinery/mass_driver{ + dir = 4; + id_tag = "ASSAULT1"; + name = "gravpult" }, -/turf/simulated/floor/engine, -/area/centcom/specops) -"xga" = ( -/obj/machinery/computer/account_database{ - name = "Admin Accounts Database" +/obj/effect/turf_decal/loading_area/white{ + dir = 4 }, -/obj/item/radio/intercom/specops{ - pixel_x = 32 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, +/area/centcom/supply) +"xgt" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/window/reinforced, /turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "xgF" = ( @@ -50512,13 +49984,27 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"xhc" = ( -/obj/structure/table, -/obj/structure/bedsheetbin, -/turf/simulated/floor/wood{ - icon_state = "fancy-wood-oak" +"xgK" = ( +/obj/structure/noticeboard{ + pixel_y = 30 }, -/area/syndicate_mothership) +/obj/item/paper{ + info = "Уволить клоуна." + }, +/obj/item/paper{ + info = "Переговорить с командованием о трёхзначных числах" + }, +/obj/structure/chair/sofa/corp/right, +/obj/item/toy/plushie/red_fox, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"xhc" = ( +/obj/structure/table, +/obj/structure/bedsheetbin, +/turf/simulated/floor/wood{ + icon_state = "fancy-wood-oak" + }, +/area/syndicate_mothership) "xhf" = ( /obj/machinery/door/airlock/hatch{ aiControlDisabled = 1; @@ -50544,6 +50030,13 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) +"xhn" = ( +/obj/structure/filingcabinet/employment, +/obj/item/radio/intercom/specops{ + pixel_y = 32 + }, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) "xho" = ( /turf/simulated/wall/indestructible/iron, /area/syndicate_mothership/jail) @@ -50564,14 +50057,6 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"xhK" = ( -/obj/structure/table, -/obj/item/storage/lockbox/mindshield, -/turf/simulated/floor/shuttle{ - icon = 'icons/turf/floors.dmi'; - icon_state = "dark" - }, -/area/shuttle/administration) "xhN" = ( /turf/simulated/floor/plasteel{ icon_state = "darkyellowalt" @@ -50582,10 +50067,33 @@ icon_state = "floor13" }, /area/shuttle/ninja) -"xhX" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/wall/indestructible/fakeglass, -/area/centcom/specops) +"xhT" = ( +/obj/machinery/computer/med_data, +/obj/structure/railing{ + layer = 4.3; + pixel_y = 32 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluefull" + }, +/area/centcom/bridge) +"xie" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/item/radio/intercom/specops{ + pixel_x = 32 + }, +/turf/simulated/floor/shuttle{ + icon_state = "floor4" + }, +/area/shuttle/specops) +"xig" = ( +/turf/simulated/floor/shuttle/transparent_floor, +/area/shuttle/administration) "xil" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 4 @@ -50599,6 +50107,12 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xin" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkgreen" + }, +/area/centcom/specops) "xir" = ( /obj/effect/turf_decal/number/number_3{ dir = 8; @@ -50614,19 +50128,6 @@ icon_state = "darkyellowfull" }, /area/syndicate_mothership/cargo) -"xix" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_PDW"; - name = "PDW-9"; - pixel_x = 24; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreencorners"; - dir = 1 - }, -/area/centcom/specops) "xiW" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -50638,18 +50139,6 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xiX" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 2; - height = 6; - id = "pod3_away"; - name = "recovery ship bay 3"; - turf_type = /turf/simulated/floor/plating/airless; - width = 5 - }, -/turf/simulated/floor/plating/airless, -/area/space) "xjg" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -50671,31 +50160,6 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"xjB" = ( -/obj/structure/rack/gunrack, -/obj/effect/decal/warning_stripes/blue/hollow, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = -6 - }, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = -6 - }, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = -6 - }, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = 6 - }, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = 6 - }, -/obj/item/gun/projectile/shotgun/automatic/combat{ - pixel_x = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/specops) "xjK" = ( /obj/structure/table/wood, /obj/item/grenade/smokebomb{ @@ -50713,6 +50177,22 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership/infteam) +"xjM" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/portable_atmospherics/canister/air{ + maximum_pressure = 50000 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor{ + id = "Air"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "xjR" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; @@ -50742,22 +50222,31 @@ }, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) -"xkj" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 1; - id_tag = "CC_Armory_IK60" +"xjZ" = ( +/obj/machinery/door/poddoor/shutters/invincible/fake_r_wall{ + dir = 2; + id_tag = "ERT_Quarantine" + }, +/obj/machinery/porta_turret/centcom/pulse{ + armor = list("melee"=90,"bullet"=90,"laser"=95,"energy"=95,"bomb"=80,"bio"=100,"rad"=100,"fire"=100,"acid"=100); + color = "#666666"; + damtype = "burn"; + health = 1250; + region_max = 12; + scan_range = 12; + shot_delay = 8; + name = "Quarantine Pulse Turret" }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/specops) -"xkp" = ( -/obj/machinery/photocopier, -/obj/machinery/light{ - dir = 1 +"xkB" = ( +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkgreen" }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) +/area/centcom/specops) "xkM" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -50824,24 +50313,6 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"xmf" = ( -/obj/machinery/door/poddoor/shutters/invincible{ - dir = 8; - id_tag = "CC_supply_external"; - layer = 5; - locked = 1 - }, -/obj/machinery/door_control/secure{ - id = "CC_supply_external"; - name = "Supply Internal Shutters"; - pixel_y = 24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "darkyellowalt" - }, -/area/centcom/supply) "xmo" = ( /obj/machinery/light{ dir = 4 @@ -50864,6 +50335,19 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xmI" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/bridge) +"xnh" = ( +/obj/structure/sign/securearea{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "navybluealt" + }, +/area/centcom/specops) "xnF" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -50882,55 +50366,13 @@ }, /area/syndicate_mothership/cargo) "xol" = ( -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 9 - }, -/obj/effect/mapping_helpers/light, -/turf/simulated/floor/beach/sand{ - icon = 'icons/turf/floors.dmi'; - icon_state = "asteroid" - }, -/area/centcom/evac) -"xom" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/centcom{ - name = "Gamma Armory"; - opacity = 1; - req_access = list(114) - }, -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor/shutters/invincible{ - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - dir = 2; - id_tag = "gamma shuttle"; - layer = 5; - locked = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) -"xov" = ( -/obj/machinery/door/airlock/shuttle{ - id_tag = "s_docking_airlock"; - name = "Escape Pod Hatch" - }, -/obj/docking_port/mobile/pod{ - id = "pod4"; - name = "escape pod 4"; - roundstart_move = "pod4_home" +/obj/vehicle/ridden/motorcycle{ + dir = 8 }, -/obj/docking_port/stationary/transit{ - dwidth = 2; - height = 6; - id = "pod4_transit"; - name = "pod 4 in transit"; - pixel_y = -32; - turf_type = /turf/space/transit/north; - width = 5 +/turf/simulated/floor/wood{ + icon_state = "fancy-wood-oak" }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_4) +/area/syndicate_mothership) "xoy" = ( /obj/machinery/computer/mech_bay_power_console, /turf/simulated/floor/plasteel{ @@ -50943,13 +50385,16 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"xoR" = ( -/obj/machinery/light/small{ - dir = 8 +"xoJ" = ( +/obj/machinery/door/poddoor/shutters/invincible{ + id_tag = "CC_ERT1" }, -/obj/structure/bookcase/random, -/turf/simulated/floor/carpet, -/area/centcom/zone1) +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "xoT" = ( /obj/machinery/vending/chinese/free, /obj/structure/curtain/black{ @@ -50959,15 +50404,35 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"xpi" = ( -/obj/machinery/recharge_station/ert, -/obj/machinery/light{ - dir = 8 +"xpj" = ( +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) +"xpw" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/under/color/lightpurple, +/obj/item/clothing/under/color/purple, +/obj/item/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, +/obj/item/clothing/head/wizard/red, +/obj/item/clothing/suit/wizrobe/red, +/obj/item/clothing/head/wizard, +/obj/item/clothing/suit/wizrobe, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/shoes/sandal, +/obj/machinery/light/small{ + brightness_range = 6; + dir = 1; + light_range = 8; + nightshift_light_range = 6; + throw_range = 6 + }, +/turf/simulated/floor/carpet/cyan, +/area/wizard_station) "xpx" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -50990,14 +50455,42 @@ icon_state = "floor4" }, /area/shuttle/syndicate) -"xpS" = ( -/obj/structure/window/reinforced{ +"xpQ" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; dir = 4 }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/glass, +/area/centcom/zone3) +"xqh" = ( +/obj/effect/turf_decal/tile/neutral{ + alpha = 180; + color = "black"; + icon_state = "tile_full"; + layer = 9 + }, +/turf/simulated/floor/plating, +/area/centcom/supply) +"xqp" = ( +/obj/machinery/door_control/secure{ + color = "#99ff99"; + id = "ERT_armory_lvl1"; + name = "ERT Armory Level 1"; + pixel_y = 32; + req_access = list(114) + }, /turf/simulated/floor/plasteel{ - icon_state = "darkfull" + dir = 6; + icon_state = "darkgreen" }, -/area/centcom/jail) +/area/centcom/specops) "xqq" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo9" @@ -51014,6 +50507,17 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/cargo) +"xqF" = ( +/obj/machinery/door_control/secure{ + id = "ShitRainSupply"; + pixel_x = -24; + pixel_y = -24 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "navybluealt" + }, +/area/centcom/specops) "xqM" = ( /obj/structure/lattice/catwalk, /obj/structure/marker_beacon{ @@ -51025,17 +50529,23 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) -"xqO" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkredalt" - }, -/area/centcom/specops) "xqR" = ( /turf/simulated/wall/shuttle/onlyselfsmooth{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/syndicate) +"xqU" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_1) "xqZ" = ( /obj/machinery/computer/drone_control, /turf/simulated/floor/plasteel{ @@ -51050,14 +50560,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/wood, /area/centcom/zone1) -"xry" = ( -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/jail) "xrD" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 4 @@ -51074,35 +50576,6 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xrP" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/pod_2) -"xsd" = ( -/obj/structure/table/reinforced, -/obj/item/flashlight/lamp/green, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/centcom/jail) -"xsn" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/bridge) "xss" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/wood{ @@ -51130,6 +50603,12 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) +"xsU" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/centcom/specops) "xsY" = ( /obj/item/flag/nt, /obj/structure/window/reinforced, @@ -51145,15 +50624,6 @@ /mob/living/simple_animal/pig, /turf/simulated/floor/grass, /area/centcom/evac) -"xtU" = ( -/obj/machinery/vending/security/ert{ - pixel_y = 32 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navybluealt" - }, -/area/centcom/specops) "xuc" = ( /obj/structure/window/reinforced, /obj/item/flag/species/vox, @@ -51178,6 +50648,13 @@ icon_state = "neutral" }, /area/centcom/evac) +"xuv" = ( +/obj/structure/table/wood/fancy/royalblack, +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" + }, +/area/shuttle/administration) "xuC" = ( /obj/structure/table, /obj/item/reagent_containers/syringe/charcoal, @@ -51207,12 +50684,13 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xuN" = ( -/obj/structure/chair/comfy/red{ - dir = 1 +"xuT" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "xvr" = ( /obj/effect/decal/syndie_logo, /obj/effect/turf_decal/stripes/gold{ @@ -51228,10 +50706,6 @@ icon_state = "fancy-wood-cherry" }, /area/shuttle/trade/sol) -"xvv" = ( -/obj/structure/chair/comfy/red, -/turf/simulated/floor/carpet/black, -/area/centcom/specops) "xvJ" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -51243,12 +50717,32 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xvY" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 4; + icon_state = "burst_l" + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/pod_2) "xwb" = ( /obj/structure/closet/syndicate/nuclear, /turf/simulated/floor/shuttle{ icon_state = "floor4" }, /area/shuttle/syndicate) +"xwc" = ( +/obj/item/stack/nanopaste, +/obj/item/mmi, +/obj/item/stack/nanopaste, +/obj/structure/table/glass, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/centcom/specops) "xwm" = ( /turf/simulated/floor/shuttle{ icon_state = "floor4" @@ -51265,6 +50759,26 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xws" = ( +/obj/machinery/door/airlock/centcom{ + id_tag = "adminshuttle"; + name = "Bridge"; + opacity = 1; + req_access = list(101) + }, +/turf/simulated/floor/wood, +/area/centcom/zone2) +"xwz" = ( +/obj/item/storage/fancy/cigarettes/dromedaryco{ + pixel_y = 6 + }, +/obj/item/lighter/zippo{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/structure/table/wood/fancy/royalblue, +/turf/simulated/floor/carpet/black, +/area/shuttle/administration) "xwH" = ( /obj/effect/turf_decal{ icon_state = "grass_edge_medium"; @@ -51287,6 +50801,12 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xxa" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle, +/area/shuttle/pod_1) "xxs" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 8 @@ -51327,82 +50847,39 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"xxO" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/food/snacks/validsalad, +"xyc" = ( +/obj/machinery/vending/ntc/janitor, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) "xzd" = ( /obj/machinery/vending/cola/free, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/centcom/zone1) -"xzh" = ( -/obj/machinery/syndiepad/loadpad, -/turf/simulated/floor/carpet, -/area/syndicate_mothership/control) -"xzN" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" +"xzg" = ( +/obj/machinery/mass_driver{ + dir = 4; + id_tag = "ASSAULT0"; + name = "gravpult" }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" +/obj/effect/turf_decal/loading_area/white{ + dir = 4 }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, +/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navyblue" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/supply) +"xzh" = ( +/obj/machinery/syndiepad/loadpad, +/turf/simulated/floor/carpet, +/area/syndicate_mothership/control) "xAd" = ( /obj/machinery/light/spot{ dir = 4 @@ -51443,25 +50920,68 @@ icon_state = "freezerfloor" }, /area/syndicate_mothership) -"xAZ" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "darkredalt" +"xAt" = ( +/obj/structure/noticeboard{ + pixel_x = -32 + }, +/obj/item/paper{ + info = "Переговорить с ОЦК по поводу пиццы с ананасами" + }, +/obj/structure/window/reinforced{ + layer = 2.9 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone2) +"xAy" = ( +/obj/effect/decal/warning_stripes/northeastsouth, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "ERT_armory_lvl4"; + name = "Armory level 4"; + layer = 5 }, -/area/centcom/jail) -"xBl" = ( -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "freezerfloor" + icon_state = "darkfull" }, -/area/syndicate_mothership) -"xBq" = ( +/area/centcom/specops) +"xAD" = ( /obj/structure/table/glass, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" +/obj/item/flashlight/lamp/green, +/obj/item/stamp/centcom{ + pixel_x = -5; + pixel_y = -7 }, /turf/simulated/floor/carpet/cyan, /area/centcom/zone2) +"xAZ" = ( +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "darkredalt" + }, +/area/centcom/jail) +"xBe" = ( +/obj/structure/table/wood, +/obj/item/book/manual/security_space_law/black{ + pixel_x = -4 + }, +/obj/item/book/manual/security_space_law{ + pixel_x = 3 + }, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/centcom/zone3) +"xBl" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, +/area/syndicate_mothership) "xBA" = ( /obj/structure/lattice, /turf/simulated/floor/shuttle/transparent_floor{ @@ -51493,20 +51013,6 @@ /obj/effect/landmark/syndicate_spawn, /turf/simulated/floor/carpet/black, /area/syndicate_mothership) -"xCc" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/centcom/zone3) -"xCh" = ( -/obj/effect/turf_decal/arrows/red{ - name = "Armory" - }, -/turf/simulated/floor/indestructible{ - icon_state = "darkgrey" - }, -/area/centcom/specops) "xCi" = ( /obj/machinery/porta_turret/syndicate, /obj/structure/lattice/catwalk, @@ -51519,6 +51025,33 @@ icon_state = "router_dir" }, /area/shuttle/syndicate) +"xCr" = ( +/obj/structure/bookcase, +/obj/item/paper{ + name = "Главный строить мужик репорт"; + info = "
" + }, +/turf/simulated/floor/plating, +/area/centcom/zone2) +"xCu" = ( +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "ntsing_alt2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) +"xCK" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/pod_3) "xCM" = ( /turf/simulated/floor/carpet/black, /area/syndicate_mothership) @@ -51528,6 +51061,14 @@ icon_state = "white" }, /area/centcom/jail) +"xCR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/specops) "xCU" = ( /obj/structure/chair/comfy/shuttle/dark{ dir = 4 @@ -51541,13 +51082,17 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xCZ" = ( -/obj/machinery/status_display{ - pixel_y = -32 +"xCW" = ( +/obj/machinery/photocopier, +/obj/structure/window/reinforced{ + dir = 4; + layer = 4.2 }, -/turf/simulated/floor/plasteel{ - icon_state = "navybluealt" +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 10 }, +/turf/simulated/floor/wood/fancy/light, /area/centcom/specops) "xDA" = ( /turf/simulated/wall/shuttle/nosmooth{ @@ -51572,11 +51117,9 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"xDT" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkyellow" - }, +"xEr" = ( +/obj/machinery/door/poddoor/impassable, +/turf/simulated/wall/indestructible/reinforced, /area/centcom/specops) "xEv" = ( /obj/effect/turf_decal/siding/wood{ @@ -51593,6 +51136,18 @@ icon_state = "dark" }, /area/centcom/evac) +"xEV" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1; + pixel_y = 3 + }, +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/jail) "xEX" = ( /obj/effect/turf_decal/number/number_1{ dir = 8; @@ -51603,12 +51158,6 @@ icon_state = "plastitanium_red" }, /area/shuttle/syndicate) -"xEY" = ( -/obj/structure/chair/comfy/beige{ - dir = 1 - }, -/turf/simulated/floor/wood/fancy/cherry, -/area/centcom/bridge) "xFI" = ( /obj/machinery/door/airlock/hatch{ aiControlDisabled = 1; @@ -51617,16 +51166,32 @@ }, /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) -"xFX" = ( -/obj/effect/turf_decal/box/white/corners{ - dir = 4 +"xFY" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/warning_stripes/south, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1; + do_not_delete_me = 1 + }, +/obj/machinery/door/poddoor/shutters/invincible{ + dir = 1; + id_tag = "CC_Armory_Grenade" }, -/obj/effect/turf_decal/siding/white, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "darkblue" + icon_state = "darkfull" }, -/area/centcom/zone1) +/area/centcom/specops) +"xFZ" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 8 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/centcom/specops) "xGb" = ( /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" @@ -51650,6 +51215,12 @@ name = "floor" }, /area/syndicate_mothership/outside) +"xGr" = ( +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredaltstrip" + }, +/area/centcom/specops) "xGH" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -51694,39 +51265,6 @@ icon_state = "dark" }, /area/shuttle/syndicate) -"xHb" = ( -/obj/item/gun/projectile/automatic/l6_saw{ - desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; - name = "M249 SAW" - }, -/obj/item/gun/projectile/automatic/l6_saw{ - desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; - name = "M249 SAW" - }, -/obj/item/gun/projectile/automatic/l6_saw{ - desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; - name = "M249 SAW" - }, -/obj/item/gun/projectile/automatic/l6_saw{ - desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; - name = "M249 SAW" - }, -/obj/item/gun/projectile/automatic/l6_saw{ - desc = "A heavily modified 5.56 light machine gun, designated 'M249 SAW'."; - name = "M249 SAW" - }, -/obj/structure/closet/secure_closet/guncabinet{ - anchored = 1; - armor = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100,"fire"=100,"acid"=100); - layer = 2.9; - name = "LMG M249 SAW"; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "vault" - }, -/area/centcom/jail) "xHc" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_random, @@ -51740,6 +51278,14 @@ /obj/item/storage/box/matches, /turf/simulated/floor/wood, /area/centcom/zone1) +"xHl" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/filingcabinet/employment, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "xHG" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -51751,6 +51297,21 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) +"xIi" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1; + icon_state = "heater3x3_side_inv"; + tag = "icon-heater (NORTH)" + }, +/obj/structure/shuttle/engine/platform{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/plasmareinforced{ + color = "#00f700" + }, +/turf/simulated/floor/shuttle/plating, +/area/shuttle/ninja) "xIm" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -51767,13 +51328,6 @@ icon_state = "darkredaltstrip" }, /area/syndicate_mothership/jail) -"xIB" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 1; - tag = "icon-propulsion (NORTH)" - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/syndicate_sit) "xIM" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -51781,19 +51335,6 @@ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"xIN" = ( -/obj/machinery/door_control/secure{ - id = "CC_Armory_SFG5"; - name = "SFG-5"; - pixel_x = 24; - pixel_y = -24; - req_access = list(114) - }, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "darkyellow" - }, -/area/centcom/specops) "xJf" = ( /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; @@ -51819,6 +51360,16 @@ }, /turf/simulated/floor/carpet/royalblack, /area/syndicate_mothership/control) +"xJZ" = ( +/obj/structure/railing{ + dir = 8; + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "rampbottom"; + tag = "icon-stage_stairs" + }, +/area/centcom/zone1) "xKz" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/effect/turf_decal/plaque{ @@ -51837,13 +51388,23 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xKK" = ( -/obj/structure/chair, +"xKI" = ( +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/jail) +"xKM" = ( +/obj/effect/baseturf_helper{ + baseturf = /turf/simulated/floor/indestructible/plating; + name = "plating baseturf editor" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/bridge) "xKO" = ( /obj/effect/turf_decal{ do_not_delete_me = 1; @@ -51869,6 +51430,19 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) +"xLE" = ( +/obj/structure/dresser, +/obj/structure/mirror/magic{ + desc = null; + name = "mirror"; + pixel_x = -32 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "xLN" = ( /obj/machinery/door/window/brigdoor/westleft{ base_state = "rightsecure"; @@ -51890,13 +51464,6 @@ icon_state = "plastitanium" }, /area/shuttle/syndicate) -"xLO" = ( -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "navybluealtstrip" - }, -/area/centcom/specops) "xMz" = ( /obj/structure/window/reinforced{ dir = 4 @@ -51906,6 +51473,13 @@ icon_state = "grimy" }, /area/centcom/zone1) +"xMC" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "applebush" + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/wood/fancy/cherry, +/area/centcom/zone1) "xMH" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22"; @@ -51925,17 +51499,6 @@ /obj/structure/flora/junglebush/b, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) -"xNi" = ( -/obj/structure/table/wood/fancy/black, -/obj/item/paper_bin/nanotrasen{ - amount = 50; - pixel_x = 3; - pixel_y = 12 - }, -/obj/item/pen/multi/gold, -/obj/item/stamp/chameleon, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) "xNs" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood{ @@ -51958,6 +51521,15 @@ icon_state = "fancy-wood-oak-broken3" }, /area/syndicate_mothership) +"xNZ" = ( +/obj/structure/bed, +/obj/item/bedsheet/qm, +/obj/effect/mine/sound/bwoink{ + layer = 2.9; + alpha = 0 + }, +/turf/simulated/floor/carpet/black, +/area/centcom/zone1) "xOe" = ( /turf/simulated/floor/carpet/arcade, /area/centcom/specops) @@ -51967,13 +51539,6 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"xOk" = ( -/obj/structure/table/wood/fancy/black, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "Central Command" - }, -/turf/simulated/floor/bluegrid, -/area/centcom/bridge) "xOo" = ( /obj/item/syndicatedetonator{ desc = "Радиус взрыва: 255x255x255"; @@ -51984,22 +51549,20 @@ icon_state = "darkfull" }, /area/syndicate_mothership/infteam) +"xOy" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "O2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/supply) "xPb" = ( /obj/effect/decal/cleanable/blood, /turf/simulated/floor/wood{ icon_state = "fancy-wood-oak" }, /area/syndicate_mothership) -"xPc" = ( -/obj/effect/decal/warning_stripes/white/hollow, -/obj/machinery/vending/nta/ertarmory/blue{ - req_access = list(104,109) - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "navybluefull" - }, -/area/centcom/specops) "xPf" = ( /obj/machinery/door/window/brigdoor{ dir = 8 @@ -52044,16 +51607,16 @@ icon_state = "darkfull" }, /area/syndicate_mothership/cargo) -"xQc" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = -32 +"xQp" = ( +/obj/effect/turf_decal/box/white/corners{ + dir = 4 }, -/obj/effect/turf_decal/siding/white{ - dir = 1 +/obj/effect/turf_decal/siding/white, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) +/area/centcom/zone1) "xQr" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" @@ -52062,14 +51625,20 @@ icon_state = "dark" }, /area/centcom/evac) -"xQA" = ( -/obj/effect/turf_decal/siding/white{ - dir = 9 +"xQz" = ( +/obj/structure/chair/comfy/red{ + color = "#FFFFFF"; + dir = 4 }, +/turf/simulated/floor/carpet/cyan, +/area/centcom/zone2) +"xRh" = ( +/obj/item/flag/nt, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "navybluealt" }, -/area/centcom/jail) +/area/centcom/specops) "xRi" = ( /obj/machinery/bodyscanner, /turf/simulated/floor/plasteel{ @@ -52077,44 +51646,66 @@ icon_state = "navybluealt" }, /area/syndicate_mothership/control) -"xRq" = ( -/obj/machinery/light{ - dir = 8 +"xRv" = ( +/obj/machinery/computer/communications{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkredaltstrip" +/obj/effect/turf_decal/stripes/gold{ + dir = 6; + do_not_delete_me = 1 }, -/area/centcom/zone2) +/obj/machinery/light/small, +/turf/simulated/floor/carpet/royalblack, +/area/shuttle/administration) "xRz" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/cans/beer, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"xSt" = ( +"xRD" = ( +/obj/structure/grille, +/obj/structure/window/full/shuttle, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "adminshuttleshutters"; + name = "Blast Shutters" + }, +/turf/simulated/floor/plating, +/area/shuttle/administration) +"xRM" = ( /obj/item/flag/nt, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "navybluealt" + dir = 10; + icon_state = "neutral" }, -/area/centcom/specops) +/area/centcom/evac) +"xSg" = ( +/obj/structure/falsewall/reinforced{ + req_access = list(114); + layer = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/zone2) "xSv" = ( /obj/structure/curtain/open/shower/security, /turf/simulated/floor/wood, /area/centcom/zone1) -"xSW" = ( +"xTc" = ( +/obj/structure/urinal{ + pixel_y = 32 + }, /obj/machinery/door_control/secure{ - color = "#9999ff"; - id = "ERT_armory_lvl2"; - name = "ERT Armory Level 2"; - pixel_y = -32; - req_access = list(114) + id = "CC_toilet_unit1"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4; + pixel_x = 25 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "navyblue" + icon_state = "white" }, -/area/centcom/specops) +/area/centcom/evac) "xTf" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small{ @@ -52130,12 +51721,29 @@ }, /turf/simulated/floor/wood, /area/centcom/zone1) -"xTu" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkredaltstrip" +"xTM" = ( +/obj/structure/table/wood, +/obj/item/storage/lockbox/mindshield, +/obj/item/storage/lockbox/mindshield, +/obj/item/storage/lockbox/mindshield, +/obj/item/door_remote/centcomm, +/obj/item/storage/box/permits, +/obj/item/megaphone{ + pixel_x = -5; + pixel_y = 7 }, -/area/centcom/zone3) +/obj/item/camera_bug/ert{ + pixel_y = 10 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) "xTN" = ( /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; @@ -52146,35 +51754,26 @@ /obj/structure/window/full/shuttle/gray, /turf/simulated/floor/shuttle/plating/vox, /area/shuttle/vox) -"xTT" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/machinery/defibrillator_mount/loaded{ - pixel_x = -30 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whiteblue" - }, -/area/centcom/specops) -"xUg" = ( -/turf/simulated/wall/shuttle/nosmooth/interior{ - dir = 6; - icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi'; - icon_state = "gray_walls_corners"; - underlay_floor_icon = 'icons/turf/shuttle/floors.dmi'; - underlay_floor_icon_state = "floor4" +"xTS" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 4 }, -/area/shuttle/syndicate) +/turf/simulated/floor/glass/reinforced, +/area/centcom/evac) "xUq" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/grass/jungle, /turf/simulated/floor/indestructible/grass, /area/syndicate_mothership/outside) +"xUz" = ( +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault"; + tag = "icon-vault (WEST)" + }, +/area/centcom/specops) "xUV" = ( /obj/effect/turf_decal/number/number_9{ dir = 4 @@ -52184,128 +51783,32 @@ icon_state = "darkredaltstrip" }, /area/centcom/jail) -"xVj" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted{ - dir = 1; - pixel_y = 6 +"xVi" = ( +/obj/structure/chair/comfy/beige{ + dir = 8; + layer = 5; + pixel_y = -2 }, /turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"xVk" = ( -/obj/structure/plasticflaps/mining, -/obj/machinery/door/poddoor{ - id_tag = "CC_supply_space"; - locked = 2; - name = "Supply Blastdoor" - }, -/obj/machinery/conveyor{ - id = "CC_crate"; - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/centcom/supply) +/area/centcom/zone3) "xVm" = ( /turf/simulated/floor/shuttle/objective_check/vox, /area/shuttle/vox) "xVn" = ( /turf/simulated/wall/indestructible, /area/start) -"xVo" = ( -/obj/structure/window/reinforced{ - dir = 1 +"xVY" = ( +/obj/machinery/light/small, +/turf/simulated/floor/shuttle{ + icon_state = "vfloor" }, -/obj/structure/shuttle/engine/heater{ - icon_state = "heater2x2"; - tag = "icon-heater (NORTH)" +/area/shuttle/administration) +"xWp" = ( +/obj/effect/turf_decal/siding/wideplating{ + color = "#55391A" }, -/obj/structure/shuttle/engine/platform{ - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/vox) -"xVI" = ( -/obj/structure/bookcase/manuals, -/obj/item/book/manual/sop_supply, -/obj/item/book/manual/nuclear, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) -"xVM" = ( -/obj/effect/turf_decal/stripes/black{ - dir = 10; - do_not_delete_me = 1 - }, -/turf/simulated/floor/shuttle, -/area/shuttle/administration) -"xWg" = ( -/obj/structure/closet{ - icon_closed = "syndicate1"; - icon_opened = "syndicate1open"; - icon_state = "syndicate1" - }, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/ammo_box/magazine/smgm9mm, -/obj/item/gun/projectile/automatic/proto, -/obj/item/gun/energy/gun/blueshield, -/obj/item/clothing/glasses/hud/security/sunglasses/aviators, -/obj/item/reagent_containers/food/snacks/candy/mre, -/obj/item/reagent_containers/hypospray/combat, -/obj/item/radio/headset/ert/alt{ - desc = null; - name = "SRT bowman headset" - }, -/obj/item/clothing/head/beret/centcom/officer/navy{ - desc = null; - name = "SRT beret" - }, -/obj/item/clothing/shoes/combat/swat{ - name = "SRT special shoes" - }, -/obj/item/clothing/gloves/combat{ - name = "Combat gloves" - }, -/obj/item/storage/belt/security/webbing/srt/full, -/obj/item/storage/backpack/satchel_blueshield/srt, -/obj/item/clothing/suit/storage/blueshield/srt, -/obj/item/clothing/suit/armor/bulletproof{ - name = "SRT bulletproof vest" - }, -/obj/item/shield/riot/tele, -/obj/item/suppressor, -/obj/item/CQC_manual, -/obj/item/implanter/mindshield/ert, -/obj/item/card/id/centcom{ - name = "Special Reaction Team Member card"; - rank = "Special Reaction Team Member"; - registered_name = "Special Reaction Team Member" - }, -/obj/item/storage/box/responseteam, -/obj/item/clothing/under/fluff/jay_turtleneck{ - desc = null; - name = "SRT uniform" - }, -/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar, -/obj/item/ammo_box/magazine/sp8, -/obj/item/ammo_box/magazine/sp8, -/obj/item/implanter/dust, -/obj/item/clothing/accessory/holster, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navyblue" - }, -/area/centcom/specops) -"xWp" = ( -/obj/effect/turf_decal/siding/wideplating{ - color = "#55391A" - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 }, /obj/effect/turf_decal/siding/wideplating/corner{ color = "#55391A" @@ -52314,35 +51817,38 @@ icon_state = "grimy" }, /area/syndicate_mothership) +"xXn" = ( +/obj/structure/chair/stool/bar, +/turf/simulated/floor/carpet/red, +/area/shuttle/administration) +"xXq" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_LWAP"; + name = "L.W.A.P. Sniper Rifle"; + pixel_x = 24; + pixel_y = 24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/centcom/specops) "xXv" = ( /turf/simulated/wall/shuttle{ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/vox) -"xYk" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/external, -/obj/docking_port/mobile{ - dir = 8; - dwidth = 2; - height = 7; - id = "funeral"; - name = "Funeral shuttle"; - roundstart_move = "graveyard_dock"; - width = 10 +"xYl" = ( +/obj/machinery/vending/snack/free, +/obj/machinery/light{ + dir = 1 }, -/obj/docking_port/stationary/transit{ - dir = 8; - dwidth = 2; - height = 7; - id = "funeral_transit"; - name = "Funeral In transit"; - pixel_x = 32; - turf_type = /turf/space/transit/north; - width = 10 +/turf/simulated/floor/shuttle{ + icon = 'icons/turf/floors.dmi'; + icon_state = "dark" }, -/turf/simulated/floor/shuttle/plating, -/area/shuttle/funeral) +/area/shuttle/administration) "xYo" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -52374,15 +51880,10 @@ "xZc" = ( /turf/simulated/floor/shuttle/transparent_floor, /area/shuttle/vox) -"xZz" = ( -/obj/structure/rack, -/obj/item/reagent_containers/applicator/dual, -/obj/item/reagent_containers/applicator/dual, -/obj/item/reagent_containers/applicator/dual, -/obj/item/clothing/accessory/stethoscope, +"xZt" = ( /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "darkbluecornersalt" + dir = 6; + icon_state = "darkyellowaltstrip" }, /area/centcom/specops) "yaa" = ( @@ -52447,6 +51948,15 @@ icon_state = "dark" }, /area/centcom/zone3) +"yaB" = ( +/obj/effect/turf_decal/siding{ + color = "#444444"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "yaI" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -52549,24 +52059,60 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"yds" = ( -/turf/space/transit/east, -/area/space) -"yeq" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-30"; - tag = "icon-plant-30" +"ydm" = ( +/obj/effect/turf_decal/stripes/black{ + dir = 9; + do_not_delete_me = 1 }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) -"yfP" = ( -/obj/structure/bookcase, -/turf/simulated/floor/plating, -/area/centcom/zone2) -"yfS" = ( -/obj/structure/chair/comfy/shuttle, /turf/simulated/floor/shuttle, -/area/shuttle/nt_droppod) +/area/shuttle/administration) +"ydH" = ( +/turf/simulated/floor/indestructible{ + dir = 4; + icon_state = "darkgreynavyblue" + }, +/area/centcom/specops) +"yef" = ( +/obj/machinery/computer/message_monitor, +/obj/effect/turf_decal/siding{ + color = "#444444" + }, +/turf/simulated/floor/wood/fancy/light, +/area/centcom/specops) +"yeh" = ( +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkyellowalt" + }, +/area/centcom/supply) +"yep" = ( +/obj/machinery/door_control/secure{ + id = "CC_Armory_AEG"; + name = "advanced energy gun"; + pixel_x = -24; + pixel_y = 24; + req_access = list(114) + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkredcorners" + }, +/area/centcom/specops) +"yeO" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/structure/sign/poster/official/nanotrasen_logo{ + icon = 'icons/obj/decals.dmi'; + icon_state = "nanotrasen_sign4"; + pixel_x = -16; + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkred" + }, +/area/centcom/specops) "yfV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -52588,13 +52134,14 @@ icon_state = "darkfull" }, /area/syndicate_mothership) -"yhf" = ( -/obj/machinery/computer/camera_advanced, -/obj/machinery/light/small{ +"ygT" = ( +/obj/effect/turf_decal/siding/white/corner{ dir = 1 }, -/turf/simulated/floor/wood/fancy/light, -/area/centcom/specops) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/centcom/evac) "yhH" = ( /obj/machinery/light/small, /turf/simulated/floor/carpet, @@ -52608,15 +52155,6 @@ icon_state = "darkred" }, /area/syndicate_mothership/elite_squad) -"yim" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/turf/simulated/floor/indestructible{ - dir = 8; - icon_state = "darkgreynavyblue" - }, -/area/centcom/specops) "yin" = ( /obj/structure/window/reinforced{ dir = 1 @@ -52631,19 +52169,6 @@ icon = 'icons/turf/walls/shuttle/gray_shuttle_wall.dmi' }, /area/shuttle/syndicate) -"yiX" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/shuttle/engine/heater{ - icon_state = "heater2x2_side"; - tag = "icon-heater (NORTH)" - }, -/obj/structure/shuttle/engine/platform{ - layer = 2.9 - }, -/turf/simulated/floor/plating/airless, -/area/shuttle/vox) "yjh" = ( /obj/effect/baseturf_helper{ baseturf = /turf/simulated/floor/indestructible/asteroid; @@ -52682,17 +52207,6 @@ }, /turf/simulated/floor/carpet/red, /area/ussp_centcom/secretariat) -"yjI" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/machinery/status_display/supply_display{ - pixel_x = -32 - }, -/obj/structure/window/reinforced/tinted{ - dir = 1; - pixel_y = 6 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/zone2) "yjN" = ( /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; @@ -52705,6 +52219,10 @@ icon_state = "darkreddarkfull" }, /area/shuttle/escape) +"ykf" = ( +/obj/machinery/computer/message_monitor, +/turf/simulated/floor/bluegrid, +/area/centcom/bridge) "ykg" = ( /obj/structure/table/wood/fancy/black, /obj/item/stack/sheet/mineral/gold{ @@ -52734,12 +52252,6 @@ icon_state = "dark" }, /area/syndicate_mothership/outside) -"ykz" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/simulated/wall/indestructible/reinforced, -/area/centcom/zone3) "ykF" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/wall/indestructible/fakeglass{ @@ -52747,33 +52259,16 @@ icon = 'icons/turf/walls/fake_plastitanium_glass.dmi' }, /area/syndicate_mothership) +"ykH" = ( +/obj/structure/shuttle/engine/platform{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plating/airless, +/area/shuttle/administration) "ykS" = ( /turf/simulated/floor/indestructible/snow, /area/ninja/outside) -"ylh" = ( -/obj/structure/table/glass, -/obj/item/folder/blue{ - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/folder/red{ - pixel_x = -5; - pixel_y = -5 - }, -/obj/item/folder/white{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/folder/yellow{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/effect/turf_decal/siding{ - color = "#444444"; - dir = 5 - }, -/turf/simulated/floor/carpet/black, -/area/centcom/bridge) "yls" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, @@ -52800,15 +52295,14 @@ icon_state = "dark" }, /area/syndicate_mothership/cargo) -"ylA" = ( -/obj/structure/railing{ +"ylC" = ( +/obj/structure/chair/sofa/corp/left{ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "navybluealt" + icon_state = "dark" }, -/area/centcom/specops) +/area/centcom/zone3) "ylE" = ( /obj/item/gun/rocketlauncher, /obj/item/gun/rocketlauncher, @@ -52850,146 +52344,143 @@ water_overlay_icon_state = null }, /area/syndicate_mothership/outside) -"ymc" = ( -/turf/space/transit/south, -/area/space) (1,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -53112,165 +52603,165 @@ rRS rRS "} (2,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -jcL -jcL -jcL -mqN -hLJ -mqN -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS +mVX +mVX +icm +iOx +jnr +jVO +kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +icm +iOx +jnr +jVO +kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +icm +iOx +jnr +jVO +kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +icm +iOx +jnr +jVO +kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS rRS rRS rRS @@ -53369,141 +52860,141 @@ rRS rRS "} (3,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -jcL -peW -efn -hJk -gWS -dsI -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -sbw -nnz -nre -nBC -nnz -nBC -nUe -nnz -sbw -sbw -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +hLV +igh +iPF +jsZ +jXB +kps +kjZ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hLV +igh +lKy +jsZ +jXB +kps +kjZ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hLV +igh +lKZ +jsZ +jXB +kps +kjZ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hLV +igh +jbL +jsZ +jXB +kps +kjZ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -53626,141 +53117,141 @@ rRS rRS "} (4,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -jcL -tME -gWS -gWS -gWS -iaK -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -rOB -rOB -rOB -rOB -nFn -rOB -rOB -rOB -rOB -sbw -qmE -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +hMy +ikC +iPL +jue +iPL +kru +kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMy +lhU +iPL +lTj +iPL +kru +kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMy +luo +iPL +lXp +iPL +kru +kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMy +inR +iPL +jKg +iPL +kru +kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -53883,187 +53374,187 @@ rRS rRS "} (5,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -jcL -vWH -gWS -gWS -gWS -nef -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -rOB -rOB -rOB -rOB -rOB -rOB -rOB -rOB -rOB -oiL -cSa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -rRS -wpJ -wpJ -vPe -vPe -vPe -vPe -akg -vPe -vPe -vPe -vPe -vPe -vPe -vPe -izZ -vPe -wpJ -vPe -vPe -vPe -ivl -vPe -wpJ -svg -izZ -vPe -ivl -vPe -vPe -iwf -izZ -weE -vPe -wpJ -izZ -vPe +mVX +hMD +ikP +iPL +juD +iPL +ktf +kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMD +ljz +iPL +juD +iPL +ktf +kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMD +lAn +iPL +juD +iPL +ktf +kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hMD +ioP +iPL +juD +iPL +kAj +kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +rRS +wpJ +wpJ +vPe +vPe +vPe +vPe +akg +vPe +vPe +vPe +vPe +vPe +vPe +vPe +izZ +vPe +wpJ +vPe +vPe +vPe +ivl +vPe +wpJ +svg +izZ +vPe +ivl +vPe +vPe +iwf +izZ +weE +vPe +wpJ +izZ +vPe wpJ vPe vPe @@ -54140,141 +53631,141 @@ rRS rRS "} (6,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -vMQ -vMQ -wso -vMQ -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -piE -oQV -dDb -ftK -dDb -oQV -piE -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -vLL -vLL -vLL -vLL -vLL -vLL -tjm -oRw -tjm -vLL -vLL -ubE -ubE -ubE -ymc -jcL -agG -eES -gWS -gWS -aTh -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -ncN -rOB -rOB -rOB -rOB -rOB -rOB -rOB -omG -oiL -cSa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -qYO -wIQ -rTA -wIQ -qYO -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +hOM +ild +iPL +jvb +iPL +kuJ +kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hOM +lkD +iPL +lWT +iPL +kuJ +kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hOM +lAo +iPL +lYV +iPL +kuJ +kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hOM +ipu +iPL +jLP +iPL +kuJ +kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -54397,255 +53888,255 @@ rRS rRS "} (7,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -vMQ -wso -fcM -oLJ -nzI -nxa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -oQV -nuC -qDA -qDA -lPy -jNn -piE -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -gao -qVQ -tVF -uzl -tVF -uGv -uGv -tVF -vfg -vtg -vLL -ubE -ubE -ubE -ymc -jcL -jcL -mqN -dSj -mqN -jcL -jcL -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -tbW -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -rOB -rOB -rOB -rOB -rOB -rOB -rOB -rOB -rOB -oiL -cSa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -wIQ -rTA -wIQ -xqR -xqR -xqR -xqR -xqR -xqR -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -rRS -rRS -rRS -rRS -rRS -rRS -rRS -vPe -iwf -izZ -vPe -jEk -vPe -izZ -wpJ -vPe -jET -jET -jET -swP -swP -oKN -pff -pBH -pWj -qlw -qCd -oKN -swP -swP -jET -jET -jET -vPe -vPe -izZ -vPe -iwb -wpJ -vPe -wpJ -wpJ -vPe -vPe -vPe -wpJ -vPe -akg -vPe -vPe -vPe -ciV -shZ -shZ -shZ -ciV -ciV -ciV -ciV -tjx -mzr -vWC -sAE -ciV -oID -mMl -qkp -ktr -vHT -ciV -cGz -bif -vHT -auc -vPT -axR -ciV -rGT -xqw -waT -waT -vPe -wpJ -vPe -vPe -wpJ -vPe -vPe -rMQ -izZ -rMQ -vPe -vPe -vPe -ivl -vPe -vPe -vPe -vPe -vPe -vPe -wpJ -wpJ -akg -vPe -vPe -wpJ -vPe -ybz -vPe -izZ -rqf -jAj -jAj +mVX +hQj +ilI +iTp +jxF +iTp +kvR +kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hQj +ilI +iTp +jxF +iTp +kvR +kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hQj +ilI +iTp +jxF +iTp +kvR +kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +hQj +ilI +iTp +jxF +iTp +kvR +kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +rRS +rRS +rRS +rRS +rRS +rRS +rRS +vPe +iwf +izZ +vPe +jEk +vPe +izZ +wpJ +vPe +jET +jET +jET +swP +swP +oKN +pff +pBH +pWj +qlw +qCd +oKN +swP +swP +jET +jET +jET +vPe +vPe +izZ +vPe +iwb +wpJ +vPe +wpJ +wpJ +vPe +vPe +vPe +wpJ +vPe +akg +vPe +vPe +vPe +ciV +shZ +shZ +shZ +ciV +ciV +ciV +ciV +tjx +mzr +vWC +sAE +ciV +oID +mMl +qkp +ktr +vHT +ciV +cGz +bif +vHT +auc +vPT +axR +ciV +rGT +xqw +waT +waT +vPe +wpJ +vPe +vPe +wpJ +vPe +vPe +rMQ +izZ +rMQ +vPe +vPe +vPe +ivl +vPe +vPe +vPe +vPe +vPe +vPe +wpJ +wpJ +akg +vPe +vPe +wpJ +vPe +ybz +vPe +izZ +rqf +jAj +jAj ivl rRS rRS @@ -54654,141 +54145,141 @@ rRS rRS "} (8,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -qKL -jLG -rmm -rmm -rmm -scI -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -dDb -eeO -lPy -wDF -lPy -ggu -pOp -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -xIB -qVQ -tVF -stM -tVF -tVF -tVF -tVF -tVF -tVF -wWa -ubE -ubE -ubE -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -gLw -xfs -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -rOB -rOB -rOB -rOB -nLn -rOB -rOB -rOB -rOB -sbw -dzF -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -rRI -rZw -rZw -yiJ -xqR -xqR -xqR -yiJ -xqR -vDz -aHh -uca -qTw -fVS -dMv -bWH -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +imX +iVo +jAl +jYQ +kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +imX +iVo +jAl +jYQ +kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +imX +iVo +jAl +jYQ +kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +imX +iVo +jAl +jYQ +kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -54911,59 +54402,6 @@ rRS rRS "} (9,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -vMQ -wso -eDH -vXd -dFI -wIa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -oQV -ejG -qDA -qDA -lPy -hjp -piE -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -tnb -qVQ -tVF -sxB -sGg -sSp -sSp -tDJ -upD -uws -vLL -ubE -ubE -ubE -ymc mVX mVX mVX @@ -54973,79 +54411,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -kgk -xhP -xfs -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -sbw -sbw -sbw -sbw -sbw -sbw -tEr -sbw -sbw -sbw -sbw -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -xqM -xBA -xqR -bUu -aJb -xmH -kgM -xAf -xGP -xuC -nKo -rxS -rxS -rxS -cIh -txP -dMv -kre -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -55168,59 +54659,6 @@ rRS rRS "} (10,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -vMQ -vMQ -wso -vMQ -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -piE -oQV -dDb -pWF -dDb -oQV -piE -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -vLL -vLL -vLL -vLL -vLL -vLL -vLL -vLL -vLL -vLL -vLL -ubE -ubE -ubE -ymc mVX mVX mVX @@ -55230,79 +54668,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -uHf -kMS -dUN -xfs -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -yiJ -xqR -xqR -yiJ -bUu -aTJ -bEU -bEU -bEU -bEU -bEU -bEU -bEU -aJb -lks -qxu -dtj -dMv -bWH -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -55425,141 +54916,141 @@ rRS rRS "} (11,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -whe -vNF -hNg -uFB -wQF -vNF -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pwa -pwa -pwa -pwa -pwa -rRI -yiJ -xil -xrD -xCU -yiJ -bUu -xKT -xKT -xpA -xKT -xKT -xKT -xKT -xKT -gnl -csQ -xqR -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -55682,141 +55173,141 @@ rRS rRS "} (12,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -eul -mCK -dpI -nzK -aYm -fAv -tbW -xDA -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -pNM -pwa -pwa -pwa -pwa -pwa -xqR -xaF -xir -xun -xEX -yiJ -yiJ -vOQ -vOQ -yiJ -yiJ -xKT -xKT -kAK -dik -nYg -yiJ -yiJ -yiJ -yiJ -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -55939,141 +55430,141 @@ rRS rRS "} (13,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -tlW -mCK -wDZ -lrJ -iVW -iVW -odX -gfP -xDA -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -wNl -xaN -xiW -xuG -xHG -muh -xqR -xak -xKT -yiJ -xqR -cdP -xKT -xYT -xqR -yiJ -yiJ -dXR -bBg -qFu -xqR -lDb -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -56196,141 +55687,141 @@ rRS rRS "} (14,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -eul -mCK -iBs -ubF -xhP -xhP -xhP -xfs -mll -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -wNl -xbx -xjg -xvJ -xJf -qyg -wDB -xKT -xKT -xwb -xAk -qBj -xKT -hYm -slR -hwZ -jpA -nqS -abs -wid -fhi -clg -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -56435,77 +55926,150 @@ lGu dfs xAp rXH -ylX -rXH -rXH -rXH -rXH -rXH -lnx -uuU -alF -vPe -akg -vPe -rRS -rRS -rRS -rRS -"} -(15,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc +ylX +rXH +rXH +rXH +rXH +rXH +lnx +uuU +alF +vPe +akg +vPe +rRS +rRS +rRS +rRS +"} +(15,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -56515,79 +56079,6 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -eul -tIe -nYE -uFn -xhP -xhP -pvn -cHW -pYK -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -wNl -xca -xkM -xwn -xKB -wXm -wEb -xKT -xKT -xwb -xAk -xLN -xKT -hYm -hNI -miW -puD -vnw -aEF -xGZ -auf -kpB -pwa -pwa -pwa -pwa -pwa -pwa -pNM rRS rRS rRS @@ -56710,59 +56201,6 @@ rRS rRS "} (16,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc mVX mVX mVX @@ -56772,79 +56210,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -eul -mCK -mxT -bLb -xhP -xhP -pvn -psd -pYK -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -bRt -bRt -bRt -vQc -vQc -vQc -eIX -iUN -bRt -bRt -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -wNl -vFb -xla -xwS -xKO -wua -xqR -xgF -xKT -yiJ -xqR -xUg -xKT -azC -xqR -nGh -yiJ -qRJ -sik -rCi -xqR -ccA -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -56967,141 +56458,141 @@ rRS rRS "} (17,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -eul -mCK -gNX -ubF -xhP -xhP -xhP -bYi -htX -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -sHR -cgu -nFv -ted -ted -ted -rxG -bnT -wQE -bRt -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -xqR -mjd -vLM -xcS -whO -yiJ -yiJ -vOQ -vOQ -yiJ -yiJ -xKT -xKT -aTJ -vhq -ncQ -yiJ -yiJ -yiJ -yiJ -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -57224,141 +56715,141 @@ rRS rRS "} (18,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -tlW -mCK -nRZ -lrJ -iVW -iVW -acK -rgH -bQF -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -iEQ -cgu -ted -ted -ted -ted -bnT -ted -gEb -kAR -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -rRI -yiJ -vMC -xxs -ipB -yiJ -bUu -xKT -xKT -azO -xKT -xKT -xKT -xKT -xKT -gnl -sDD -xqR -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -57481,141 +56972,141 @@ rRS rRS "} (19,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -eul -eul -mCK -iBs -wos -ssx -lxP -tbW -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -iEQ -cgu -nhX -bnT -bnT -bnT -bnT -ted -hwm -kAR -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -yiJ -xqR -xqR -yiJ -bUu -kAK -qyL -qyL -qyL -qyL -qyL -qyL -qyL -rhC -odm -iuF -fVS -dMv -bWH -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -57738,141 +57229,141 @@ rRS rRS "} (20,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -iRb -iRb -rof -iRb -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -rug -bpJ -hNg -uFB -wQF -bpJ -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -iEQ -cgu -ted -ted -ted -ted -bnT -ted -gEb -kAR -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -waD -xBA -yiJ -bUu -rhC -vfR -vfR -plq -yac -llz -rcE -odm -odm -odm -msN -txP -dMv -kre -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -57995,59 +57486,6 @@ rRS rRS "} (21,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -iRb -rof -xrP -bra -fQm -vhG -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -aiy -jvI -jvI -jvI -jvI -jvI -giC -cnr -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -vzm -vzm -vzm -vzm -vzm -vzm -vzm -vzm -vzm -vzm -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -58057,79 +57495,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -uNo -oyc -pUJ -bYi -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -bQK -cgu -sHH -ted -ted -ted -uPJ -bnT -ePZ -bRt -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -rRI -wEF -wEF -yiJ -xqR -xqR -xqR -yiJ -xqR -bgz -pxJ -nCK -lAH -dtj -dMv -bWH -bWH -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -58252,59 +57743,6 @@ rRS rRS "} (22,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bkn -bRc -rFb -rFb -rFb -idZ -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -cHC -jfv -egK -cSb -cSb -btN -bSw -giz -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -uMp -obi -uiP -uAz -sHv -sHv -tlK -ugF -vnF -vzm -vzm -ubE -ubE -ubE -ymc mVX mVX mVX @@ -58314,79 +57752,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -wxL -uZl -xhP -bYi -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -bRt -bRt -bRt -vQc -vQc -vQc -eIX -xYk -bRt -bRt -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -wIQ -xCi -wIQ -xqR -xqR -xqR -xqR -xqR -xqR -yiJ -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -58509,59 +58000,6 @@ rRS rRS "} (23,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -iRb -rof -uak -khV -ieD -kHA -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -cHC -dvT -blt -jwD -jwD -jwD -bSw -giz -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -gAN -obi -vpg -vpg -vpg -vpg -vpg -vpg -vpg -lyB -uEU -ubE -ubE -ubE -ymc mVX mVX mVX @@ -58571,79 +58009,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -rAu -bYi -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -yiJ -xsR -wIQ -xCi -wIQ -xsR -yiJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -58766,59 +58257,6 @@ rRS rRS "} (24,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -iRb -iRb -iRb -iRb -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -cHC -aTE -jwD -bjs -bjs -jwD -bSw -giz -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -rhK -obi -smk -syj -syj -syj -syj -vpg -uuY -vzm -vzm -ubE -ubE -ubE -ymc mVX mVX mVX @@ -58828,79 +58266,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -tbW -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -59023,59 +58514,6 @@ rRS rRS "} (25,1,1) = {" -pNM -pwa -pwa -pwa -pwa -mVX -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -akv -giC -aWY -giC -giC -dzO -giC -cMR -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -vzm -vzm -vzm -vzm -vzm -vzm -trC -vrM -trC -vzm -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -59085,79 +58523,132 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -bQF -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -59280,141 +58771,141 @@ rRS rRS "} (26,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -59537,59 +59028,6 @@ rRS rRS "} (27,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -59599,28 +59037,6 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -59637,41 +59053,116 @@ mVX mVX mVX mVX -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -59794,59 +59285,6 @@ rRS rRS "} (28,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -59856,28 +59294,6 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -59888,47 +59304,122 @@ mVX mVX mVX mVX -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -60051,59 +59542,6 @@ rRS rRS "} (29,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -60113,28 +59551,6 @@ mVX mVX mVX mVX -ymc -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ubE -ymc mVX mVX mVX @@ -60145,47 +59561,122 @@ mVX mVX mVX mVX -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -60308,59 +59799,6 @@ rRS rRS "} (30,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc mVX mVX mVX @@ -60370,28 +59808,6 @@ mVX mVX mVX mVX -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc -ymc mVX mVX mVX @@ -60402,47 +59818,122 @@ mVX mVX mVX mVX -pNM -pwa -tEQ -vAA -vAA -vAA -vAA -vAA -vAA -vAA -tEQ -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -60565,40 +60056,6 @@ rRS rRS "} (31,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM mVX mVX mVX @@ -60607,26 +60064,6 @@ mVX mVX mVX mVX -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq mVX mVX mVX @@ -60636,70 +60073,124 @@ mVX mVX mVX mVX -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -60822,40 +60313,6 @@ rRS rRS "} (32,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -60864,26 +60321,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -60893,70 +60330,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -viX -xXv -xXv -xXv -ouJ -mEm -mEm -mEm -ouJ -xXv -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -61079,40 +60570,6 @@ rRS rRS "} (33,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -61121,26 +60578,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -61150,70 +60587,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -wvW -wFV -xhf -xVm -xxJ -xVm -xVm -xVm -xVm -uqw -xVo -ftH -eTw -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -61336,40 +60827,6 @@ rRS rRS "} (34,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -wtY -wtY -iYY -wtY -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -61378,26 +60835,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -wmt -wmt -uyn -uyn -uyn -uyn -wmt -wmt -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -61407,70 +60844,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -vAA -uvg -uoq -uoq -uoq -uoq -uoq -uPZ -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -wix -wxH -wKR -xXv -xVm -xVm -xVm -aCe -xVm -xVm -gdD -yiX -ftH -xZc -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -61488,17 +60979,17 @@ lfz lPg msl mNY -nmw -nmw -nmw -nmw -nmw -nmw -nmw -qcS -nmw -nmw -nmw +vLL +vLL +vLL +vLL +vLL +vLL +tjm +byD +tjm +vLL +vLL rgB keo gDm @@ -61593,40 +61084,6 @@ rRS rRS "} (35,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -wtY -iYY -alO -tBr -iSh -fSV -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -hoJ -gRr -fWE -gRr -hoJ -hoJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -61635,26 +61092,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -wmt -uyn -wmt -wmt -lgc -otE -rft -gJj -wmt -wmt -wkE -wmt -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -61664,70 +61101,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -xXv -xXv -xXv -xXv -xXv -xVm -lPB -xVm -xVm -tzz -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -61745,17 +61236,17 @@ vPe vPe mtI mNY -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw +ttE +tMC +tVF +uzl +tVF +uGv +uGv +tVF +vfg +vtg +vLL rgB keo nYK @@ -61850,40 +61341,6 @@ rRS rRS "} (36,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -vWm -pvN -jkW -jkW -jkW -hgB -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -cnn -dHE -gal -bMr -gTu -pFM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -61892,26 +61349,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -xjR -gKi -gKi -hHU -riz -kgE -kPS -riz -hHU -gKi -gKi -tTX -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -61921,70 +61358,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -xXv -xVm -yai -xVm -xVm -nns -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -62002,17 +61493,17 @@ vPe lSp mvd mNY -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw +lLG +tMC +tVF +stM +tVF +tVF +tVF +tVF +tVF +tVF +wWa rgB keo nYK @@ -62107,40 +61598,6 @@ rRS rRS "} (37,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -wtY -iYY -sAA -aCb -byS -fBi -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -cnn -bjM -gal -bQZ -cme -pFM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -62149,26 +61606,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -xjR -adM -kUi -vvs -iSZ -mtw -kVb -lzD -wmt -kUi -adM -tTX -nSu -oFJ -oFJ -kXq mVX mVX mVX @@ -62178,70 +61615,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -nbA -nbA -nbA -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pwa -vAA -uoq -uoq -uoq -uoq -uoq -uoq -uoq -vAA -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -xXv -mEm -mEm -ouJ -xVm -yin -tLj -vIN -iGc -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -62259,17 +61750,17 @@ vPe lSq msl mNY -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw +ruh +tMC +tVF +sxB +sGg +sSp +sSp +tDJ +upD +uws +vLL rgB keo nYK @@ -62364,40 +61855,6 @@ rRS rRS "} (38,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -wtY -wtY -iYY -wtY -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -hoJ -gRr -mzT -gRr -hoJ -hoJ -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -62406,26 +61863,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wmt -wJV -wmt -wJV -wmt -jqj -wJV -wJV -jqj -wmt -wJV -wmt -wJV -wmt -oFJ -oFJ -kXq mVX mVX mVX @@ -62435,70 +61872,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pwa -tEQ -vAA -vAA -vAA -uGV -vAA -vAA -vAA -tEQ -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -xXv -xXv -ugs -ugs -ouJ -xFI -ouJ -xXv -xXv -xXv -xXv -xXv -ouJ -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -62516,17 +62007,17 @@ vPe lTg mvd mNY -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw -nmw +vLL +vLL +vLL +vLL +vLL +vLL +vLL +vLL +vLL +vLL +vLL rgB keo gDm @@ -62621,40 +62112,6 @@ rRS rRS "} (39,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -62663,26 +62120,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wmt -eDO -qti -hHU -riz -riz -alM -bjJ -riz -riz -hHU -qti -kws -wmt -oFJ -oFJ -kXq mVX mVX mVX @@ -62692,70 +62129,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -xXv -ugs -xVm -xVm -xXv -xVm -vzo -xVm -pBK -leE -gWk -nbL -uQU -arg -uqH -xXv -xXv -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -62878,40 +62369,6 @@ rRS rRS "} (40,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -62920,26 +62377,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wmt -jcs -vHj -wJV -qjX -mHL -mpN -mpN -qZj -vja -wJV -vHj -eDO -wmt -oFJ -oFJ -kXq mVX mVX mVX @@ -62949,70 +62386,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pwa -pwa -pwa -pwa -xTN -ctL -xVm -xVm -kKs -kbL -kKs -ouJ -xVm -xVm -xVm -xVm -xVm -uQU -bSe -xVm -rdn -xXv -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -63058,9 +62549,9 @@ sos keo vtI jjR -wGg -vLc -aQh +xol +tTE +ifF pXQ xGb xGb @@ -63135,40 +62626,6 @@ rRS rRS "} (41,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -63177,26 +62634,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wJV -eYE -jqj -wJV -iJi -lcs -khG -khG -fsf -nfO -wJV -jqj -njE -wJV -oFJ -oFJ -kXq mVX mVX mVX @@ -63206,70 +62643,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pwa -pwa -pwa -pwa -xTN -wxI -kID -xVm -xVm -vzo -xVm -vzo -xVm -xVm -xVm -xVm -xVm -vzo -xVm -xVm -pwr -xXv -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -63392,40 +62883,6 @@ rRS rRS "} (42,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM mVX mVX mVX @@ -63434,26 +62891,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wJV -vHj -vHj -hHU -itv -ssr -hlv -hlv -snA -mcM -hHU -vHj -vHj -wJV -oFJ -oFJ -kXq mVX mVX mVX @@ -63463,70 +62900,124 @@ mVX mVX mVX mVX -kXq -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xTN -jbt -xVm -xVm -xVm -kbL -kKs -ouJ -xVm -xVm -xVm -xVm -xVm -uQU -xVm -jLc -vLY -xXv -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -63649,40 +63140,6 @@ rRS rRS "} (43,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM mVX mVX mVX @@ -63691,26 +63148,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -xjR -cKw -vHj -wJV -mBE -bur -riz -riz -lzZ -mBE -wJV -vHj -cKw -tTX -oFJ -oFJ -kXq mVX mVX mVX @@ -63720,70 +63157,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -xXv -wNi -xVm -xVm -xXv -xVm -vzo -xVm -dTK -oJH -fxt -tKn -uQU -vxN -kbb -xXv -xXv -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -63906,40 +63397,6 @@ rRS rRS "} (44,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -63948,26 +63405,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -xjR -rDm -gTs -wmt -wmt -vgd -wnA -wnA -xcN -wmt -wmt -mYE -jxr -tTX -oFJ -oFJ -kXq mVX mVX mVX @@ -63977,70 +63414,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -xXv -xXv -wNi -wNi -ouJ -xFI -ouJ -xXv -xXv -xXv -xXv -xXv -ouJ -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -64068,13 +63559,13 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +xqR +qYO +wIQ +rTA +wIQ +qYO +xqR qiR qiR qiR @@ -64163,40 +63654,6 @@ rRS rRS "} (45,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -64205,26 +63662,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -xjR -uMn -vHj -wJV -mBE -xvt -xss -xss -xvt -mBE -wJV -vHj -uMn -tTX -oFJ -oFJ -kXq mVX mVX mVX @@ -64234,70 +63671,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -xXv -xhz -xhz -ouJ -xVm -iqq -xVm -xVm -feW -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -64321,18 +63812,18 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +yiJ +wIQ +rTA +wIQ +yiJ +xqR +yiJ +xqR +yiJ +xqR +yiJ +yiJ qiR qiR uff @@ -64420,40 +63911,7 @@ rRS rRS "} (46,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa mVX -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -64462,26 +63920,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wJV -tFk -vHj -hIt -riz -iTh -knt -knt -jSC -riz -mGD -vHj -nxK -wJV -oFJ -oFJ -kXq mVX mVX mVX @@ -64491,70 +63929,123 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -xXv -xVm -iHB -xVm -xVm -xVm -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -64575,23 +64066,23 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +rRI +rZw +rZw +yiJ +yiJ +xqR +yiJ +yiJ +xqR +vDz +aHh +uca +qTw +uMZ +dMv +bWH +bWH uff uxM vgP @@ -64677,40 +64168,6 @@ rRS rRS "} (47,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -64719,26 +64176,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wJV -eQJ -qwi -wJV -iuu -iWu -xEv -xEv -lBU -mqy -wJV -eQJ -qwi -wJV -oFJ -oFJ -kXq mVX mVX mVX @@ -64748,70 +64185,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -uSa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -xXv -xXv -xXv -xXv -xXv -xVm -mET -dGr -xVm -wod -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -64830,25 +64321,25 @@ lXY qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +xqM +xBA +yiJ +bUu +aJb +xmH +kgM +xAf +xGP +xuC +nKo +rxS +rxS +rxS +cIh +mog +dMv +kre +bWH uff uyg vhZ @@ -64925,49 +64416,133 @@ vPe iAZ duS vPe -vPe -vPe -ivq -vPe -rRS -rRS -rRS -"} -(48,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -nTJ -nTJ -peS -nTJ -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -oJI -sKg -lDH -sKg -sKg -sXM -prf -oJI -oJI -pwa -pwa -pwa -pwa -pNM +vPe +vPe +ivq +vPe +rRS +rRS +rRS +"} +(48,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -64976,26 +64551,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -wmt -jKI -mCX -wmt -ixL -jzk -riz -riz -lBX -mto -wmt -jKI -mCX -wmt -oFJ -oFJ -kXq mVX mVX mVX @@ -65005,70 +64560,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -nai -oMz -wXb -xXv -xVm -xVm -xVm -lAO -xVm -xVm -mdw -xVo -ftH -eTw -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM rRS vPe vPe @@ -65085,27 +64576,27 @@ kAO lmY lXY qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +yiJ +yiJ +xqR +yiJ +yiJ +bUu +aTJ +bEU +bEU +bEU +bEU +bEU +bEU +bEU +aJb +lks +qxu +ssE +dMv +bWH +bWH uff uxM viK @@ -65191,40 +64682,6 @@ rRS rRS "} (49,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -nTJ -peS -oET -alp -iGk -pZj -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -sXM -lBl -lOB -svC -tbv -tbX -tbv -giK -mrP -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -65233,26 +64690,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -gtx -gtx -wJV -wmt -wmt -kuU -vQS -wmt -wmt -wJV -gtx -gtx -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -65262,70 +64699,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -wBe -wFV -xjY -xVm -xAd -xVm -xVm -xVm -xVm -uqw -yiX -ftH -xZc -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -65341,26 +64832,26 @@ jOH kAO aOe lXY -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +rRI +yiJ +xil +xrD +xCU +yiJ +bUu +xKT +xKT +xpA +xKT +xKT +xKT +xKT +xKT +gnl +csQ +xqR +yiJ +yiJ qiR qiR uff @@ -65448,40 +64939,6 @@ rRS rRS "} (50,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -oMf -gyE -puY -puY -puY -xov -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -sXM -nVS -maj -sKg -tbv -kAJ -tbv -giK -mrP -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -65490,26 +64947,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -65519,70 +64956,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -xXv -wBy -xXv -xXv -xXv -ouJ -xhz -xhz -xhz -ouJ -xXv -xXv -xXv -xXv -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -65598,28 +65089,28 @@ jOH kAO aOe lXY -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +xqR +xaF +xir +xun +xEX +yiJ +yiJ +vOQ +vOQ +yiJ +yiJ +xKT +xKT +kAK +dik +nYg +yiJ +yiJ +yiJ +yiJ +yiJ +yiJ ugm uHa vny @@ -65705,40 +65196,6 @@ rRS rRS "} (51,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -nTJ -peS -gWl -eag -cQf -mPs -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -bXg -ogO -oiv -ovE -oHK -peG -tbv -giK -mrP -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -65747,26 +65204,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -65776,70 +65213,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -65855,28 +65346,28 @@ jSd kAO aOe lXz -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +wNl +xaN +xiW +xuG +xHG +muh +xqR +xak +xKT +yiJ +xqR +yiJ +xKT +xYT +xqR +yiJ +yiJ +dXR +bBg +qFu +xqR +lDb keo wGu wGu @@ -65962,40 +65453,6 @@ rRS rRS "} (52,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -nTJ -nTJ -peS -nTJ -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -oJI -sKg -okx -sKg -oJI -sKg -qTI -oJI -oJI -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -66004,26 +65461,6 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -66033,70 +65470,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -66112,28 +65603,28 @@ jOH kAO lsf lXz -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -tUi +wNl +xbx +xjg +xvJ +xJf +qyg +wDB +xKT +xKT +xwb +xAk +qBj +xKT +hYm +slR +hwZ +jpA +nqS +abs +wid +fhi +xbV ygg wlI wlI @@ -66219,40 +65710,6 @@ rRS rRS "} (53,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -66261,26 +65718,6 @@ mVX mVX mVX mVX -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq mVX mVX mVX @@ -66290,70 +65727,124 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -66369,28 +65860,28 @@ jOH kAO aOe lXY -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +wNl +xca +xkM +xwn +xKB +wXm +wEb +xKT +xKT +xwb +xAk +xLN +xKT +hYm +hNI +miW +puD +vnw +aEF +xGZ +auf +kpB ygg wlI wlI @@ -66476,141 +65967,141 @@ rRS rRS "} (54,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -mVX -mVX -mVX -mVX -mVX -mVX -mVX -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -66626,28 +66117,28 @@ jSd kAO lmY lXY -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +wNl +vFb +xla +xwS +xKO +wua +xqR +xgF +xKT +yiJ +xqR +yiJ +xKT +azC +xqR +nGh +yiJ +qRJ +sik +rCi +xqR +ccA keo wGu wGu @@ -66733,40 +66224,6 @@ rRS rRS "} (55,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -66774,100 +66231,134 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -mVX -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -66883,28 +66374,28 @@ jOH kAO aOe lXz -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +xqR +mjd +vLM +xcS +whO +yiJ +yiJ +vOQ +vOQ +yiJ +yiJ +xKT +xKT +aTJ +vhq +ncQ +yiJ +yiJ +yiJ +yiJ +yiJ +yiJ uhy uLg vrH @@ -66990,40 +66481,6 @@ rRS rRS "} (56,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM mVX mVX mVX @@ -67031,100 +66488,134 @@ mVX mVX mVX mVX -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -67140,26 +66631,26 @@ jPH kAO aOe lXz -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +rRI +yiJ +vMC +xxs +ipB +yiJ +bUu +xKT +xKT +azO +xKT +xKT +xKT +xKT +xKT +gnl +sDD +xqR +yiJ +yiJ qiR qiR uhK @@ -67247,141 +66738,141 @@ rRS rRS "} (57,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS vPe vPe @@ -67398,27 +66889,27 @@ kAO aOe lXY qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +yiJ +yiJ +xqR +yiJ +yiJ +bUu +kAK +qyL +qyL +qyL +qyL +qyL +qyL +qyL +rhC +odm +iuF +uMZ +dMv +bWH +bWH uff uMl vvX @@ -67504,141 +66995,141 @@ rRS rRS "} (58,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -67657,25 +67148,25 @@ lXz qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +waD +xBA +yiJ +bUu +rhC +vfR +vfR +plq +yac +llz +rcE +odm +odm +odm +msN +mog +dMv +kre +bWH uff uMQ yas @@ -67761,141 +67252,141 @@ rRS rRS "} (59,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -67916,23 +67407,23 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +rRI +wEF +wEF +yiJ +yiJ +xqR +yiJ +yiJ +xqR +bgz +pxJ +nCK +lAH +ssE +dMv +bWH +bWH uff uNx vxf @@ -67972,7 +67463,7 @@ dJo ebc hCl hCl -kXJ +biD rHb hCl hCl @@ -68007,152 +67498,152 @@ keo vPe ivl iAZ -duS -vPe -vPe -izZ -iwf -rRS -rRS -rRS -rRS -"} -(60,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -qZr -qZr -qZr -sKm -oFJ -oFJ -oFJ -oFJ -sKm -sKm -sKm -sKm -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -jIv -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +duS +vPe +vPe +izZ +iwf +rRS +rRS +rRS +rRS +"} +(60,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -68176,18 +67667,18 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +yiJ +wIQ +xCi +wIQ +yiJ +xqR +yiJ +xqR +yiJ +xqR +yiJ +yiJ qiR qiR uff @@ -68275,141 +67766,141 @@ rRS rRS "} (61,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -sKm -euT -eJz -pzZ -sKm -qow -qZr -qZr -qow -sKm -tVR -hke -mNh -sKm -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -psf -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -68437,13 +67928,13 @@ qiR qiR qiR qiR -qiR -qiR -qiR -qiR -qiR -qiR -qiR +xqR +xsR +wIQ +xCi +wIQ +xsR +xqR qiR qiR qiR @@ -68532,141 +68023,141 @@ rRS rRS "} (62,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -vAA -vAA -vAA -vAA -yjN -vAA -sJJ -vAA -bud -bud -bud -wkN -uEW -vAA -uEW -vAA -vAA -wkN -bud -bud -wkN -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -sKm -dOP -evd -fcd -fHH -sKm -szi -qOT -iBn -jBo -sKm -liC -lKX -mve -mNH -sKm -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -sXI -sXI -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -68789,141 +68280,141 @@ rRS rRS "} (63,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -wkN -rpQ -rOi -ayR -sms -wkN -sMr -sWd -izX -izX -izX -izX -dNe -sWd -dNe -uOA -wkN -uVo -vpD -aaa -vNc -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -jLA -oqI -oqI -oqI -pFm -sKm -rTV -qPL -iCK -jEF -sKm -uAE -oJg -mGC -mUg -dVd -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nbA -nbA -nbA -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -sXI -sXI -sXI -sXI -sXI -pwa -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -69046,141 +68537,141 @@ rRS rRS "} (64,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -bud -esN -rPC -oQJ -qJx -syr -dNe -izX -izX -izX -izX -izX -dNe -izX -dNe -izX -bud -tHp -qom -qom -vUY -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -qow -kNE -oqI -oqI -oqI -oqI -pTY -pTY -hQS -hQS -pTY -sKm -sKm -sKm -pTY -orL -jta -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -nbA -nbA -nli -nbA -nbA -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -69303,141 +68794,141 @@ rRS rRS "} (65,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -vAA -vAA -esN -qGu -sfc -sle -syr -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -izX -bud -tHp -qom -qom -bBU -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -eYh -mro -oqI -oqI -pnz -pHw -qbr -qow -qRz -qRz -qow -rTV -wmD -noJ -sKm -orL -ndg -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -69560,141 +69051,141 @@ rRS rRS "} (66,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -vAA -wkN -bud -wkN -vAA -vAA -esN -qGu -wJl -bwU -bud -dNe -izX -izX -izX -izX -izX -izX -izX -dNe -izX -wkN -vdg -qom -qom -epb -vAA -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -eYh -nOi -oqI -oQS -pnE -pHB -qfX -sKm -ofm -ofm -sKm -rVI -xVM -xhK -sKm -mWW -nDt -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -69817,141 +69308,141 @@ rRS rRS "} (67,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -wkN -xnF -pSS -dDZ -qzL -vAA -esN -qGu -wJl -bwU -bud -dNe -eoF -izX -jYK -izX -izX -izX -eoF -dNe -dNe -uSG -qom -qom -qom -tOK -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -eYh -fVA -oqI -oQS -fgu -pHB -gwG -sKm -hRI -ofm -jEY -kvU -lmJ -lMZ -sKm -orL -nDt -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -psf -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -69969,17 +69460,17 @@ vPe max mzI mTh -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY +vzm +vzm +vzm +vzm +vzm +vzm +vzm +vzm +vzm +vzm +qiR rkx mZB hag @@ -70074,141 +69565,141 @@ rRS rRS "} (68,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -vcC -qfz -qfz -qFm -vAA -jlQ -wTK -sle -sns -wkN -sNX -wkN -bud -wkN -bud -wkN -bud -wkN -uIy -dNe -uSG -qom -qom -qom -vRi -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -qow -rTV -oqI -oQS -fqZ -pLm -gyY -sKm -ofm -ofm -sKm -kCX -lnR -lSn -sKm -orL -pbK -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -psf -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -70226,17 +69717,17 @@ sBD vPe mBe mTh -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY +tHx +tPu +uiP +uAz +sHv +sHv +tlK +ugF +vnF +vzm +vzm rkx mZB pQe @@ -70331,77 +69822,6 @@ rRS rRS "} (69,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -koI -rxF -vFD -rxF -mdM -wkN -rRm -rRm -wkN -vAA -sOe -sWw -tsj -tTF -tsj -uAh -tsj -sWw -dNe -uPe -wkN -vdH -vqK -vJp -vSD -vAA -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -dmR -dUj -dmR -sKm -sKm -sKm -dmR -qRz -qRz -dmR -sKm -sKm -sKm -dmR -mXc -dmR -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -70425,47 +69845,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -psf -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -70483,17 +69974,17 @@ vPe lSp mCv mTh -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY +gcu +tPu +vpg +vpg +vpg +vpg +vpg +vpg +vpg +lyB +uEU rkx mZB pQe @@ -70506,7 +69997,7 @@ wyt wWe viy xwm -wds +nIe qvD wvS wlI @@ -70588,77 +70079,6 @@ rRS rRS "} (70,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -pAM -rxF -vFD -vFD -mdY -rqz -wDS -wDS -wDS -sCS -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -izX -vAA -vAA -vAA -vAA -vAA -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -qow -dvI -ofm -eyL -qow -fTS -fTS -dvI -ofm -ofm -eyL -fTS -fTS -qow -dvI -ofm -eyL -qow -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -70682,47 +70102,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -psf -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -70740,17 +70231,17 @@ vPe lSq mzI mTh -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY -nqY +rwu +tPu +smk +syj +syj +syj +syj +vpg +uuY +vzm +vzm rkx mZB pQe @@ -70775,7 +70266,7 @@ xlE wlI wlI yas -vwk +wbt keo vPe vPe @@ -70836,86 +70327,127 @@ iDT iEV iOg vPe -vPe -jAj -vPe -rRS -rRS -rRS -rRS -"} -(71,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -lOH -rxF -vFD -vFD -mdY -dgT -wDS -wDS -wDS -sCS -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -izX -vAA -vAA -vAA -vAA -vAA -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -dkS -ofm -ofm -ofm -frF -ofm -ofm -ofm -ofm -ofm -ofm -ofm -ofm -frF -ofm -ofm -ofm -npL -oFJ -oFJ -oFJ -oFJ -oFJ -kXq +vPe +jAj +vPe +rRS +rRS +rRS +rRS +"} +(71,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -70939,47 +70471,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -psf -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -yds rRS rRS rRS @@ -70997,17 +70488,17 @@ vPe lTg mCv mTh -nqY -nqY -nqY -nqY -nqY -nqY -nqY -qfv -nqY -nqY -nqY +vzm +vzm +vzm +vzm +vzm +vzm +trC +iDA +trC +vzm +qiR rkx mZB hag @@ -71032,7 +70523,7 @@ wlI yas wlI wlI -vwk +wbt wGu vPe vPe @@ -71102,77 +70593,6 @@ rRS rRS "} (72,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -qEN -rxF -vFD -rxF -mdM -wkN -kph -kph -wkN -vAA -sOe -hsz -tzJ -oPx -tzJ -uDh -tzJ -hsz -dNe -uPe -wkN -veO -vst -vst -lnZ -vAA -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -dkS -ofm -ofm -ofm -frF -ofm -ofm -ofm -ofm -ofm -ofm -ofm -ofm -frF -ofm -ofm -ofm -npL -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -71196,47 +70616,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -vvx -omP -sEW -sWH -vvx -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -71289,7 +70780,7 @@ wlI wlI yas xlE -dxs +qGH wGu vPe vPe @@ -71359,77 +70850,6 @@ rRS rRS "} (73,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -bud -nCH -qhG -qhG -qIt -vAA -tEN -rUk -xaA -ybu -wkN -sNX -wkN -bud -wkN -bud -wkN -bud -wkN -uIy -dNe -uSZ -dNe -dNe -dNe -lgR -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -qow -oji -dYy -oji -qow -ofm -ofm -lLn -ofm -nQT -jXC -kLu -lqy -qow -oji -dYy -oji -qow -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -71453,47 +70873,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ryN -otM -otM -otM -ryN -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -71616,77 +71107,6 @@ rRS rRS "} (74,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -wkN -pvA -qlQ -qwd -umm -vAA -qqG -til -wLl -soN -bud -dNe -sXP -izX -tZV -izX -izX -izX -sXP -dNe -dNe -uSZ -dNe -dNe -dNe -vSK -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -jKp -kCJ -tzK -sKm -fXt -pTY -qow -qxs -pEd -qow -pTY -lvp -sKm -jKp -kCJ -tzK -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -71710,47 +71130,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -vvx -vTk -oAE -oSA -vvx -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -71873,77 +71364,6 @@ rRS rRS "} (75,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -vAA -wkN -bud -wkN -vAA -vAA -ugU -til -wLl -vDy -bud -dNe -izX -izX -izX -izX -izX -izX -izX -dNe -izX -wkN -vhp -dNe -dNe -vZr -vAA -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -cvQ -cvQ -cvQ -sKm -sKm -sKm -hut -qSh -roe -hRZ -sKm -sKm -sKm -cvQ -cvQ -cvQ -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -71967,47 +71387,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ryN -vTk -wIw -vTk -ryN -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -72130,77 +71621,6 @@ rRS rRS "} (76,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -vAA -vAA -oDr -til -wrD -xaA -sDa -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -dNe -izX -bud -ezN -dNe -dNe -pTf -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -sKm -dIg -dYJ -dIg -sKm -oFJ -sKm -hHq -hRZ -iJk -ket -sKm -oFJ -sKm -dIg -dYJ -dIg -sKm -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -72224,47 +71644,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ohw -vTk -wIw -vTk -ohw -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -72387,77 +71878,6 @@ rRS rRS "} (77,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -bud -rqT -rXx -slQ -spf -sDa -dNe -izX -izX -izX -izX -izX -izX -izX -dNe -izX -bud -ezN -dNe -dNe -pTf -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -dIg -dIg -dIg -oFJ -oFJ -sKm -qow -iei -vTF -qow -sKm -oFJ -oFJ -dIg -dIg -dIg -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -72481,47 +71901,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ryN -vTk -wIw -vTk -ryN -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -72644,77 +72135,6 @@ rRS rRS "} (78,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -wkN -rsS -rYn -rYn -sra -wkN -sRl -sZH -izX -izX -izX -izX -izX -sZH -uKc -uOA -wkN -ezN -dNe -dNe -pTf -vAA -ilW -osD -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -72738,47 +72158,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -vvx -ouP -wIw -oUG -vvx -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -72901,77 +72392,6 @@ rRS rRS "} (79,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -vAA -wkN -bud -bud -wkN -vAA -vAA -wkN -bud -bud -bud -wkN -vAA -vAA -vAA -vAA -vAA -bud -vtX -vKS -bud -vAA -vAA -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -72995,47 +72415,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ryN -vTk -wIw -vTk -ryN -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -73158,77 +72649,6 @@ rRS rRS "} (80,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -73252,47 +72672,118 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ohL -vTk -wIw -vTk -ohL -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -73412,80 +72903,121 @@ vPe vPe rRS rRS -rRS -"} -(81,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq +rRS +"} +(81,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -73509,47 +73041,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -ryN -vTk -wIw -vTk -ryN -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds rRS rRS rRS @@ -73672,77 +73163,6 @@ rRS rRS "} (82,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -oFJ -kXq mVX mVX mVX @@ -73766,304 +73186,375 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -vvx -ovB -wIw -pan -vvx -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds -rRS -rRS -rRS -ivl -vPe -iAZ -duS -vPe -ivl -vPe -vPe -vPe -iwf -lvG -vPe -mCM -vPe -izZ -vPe -obJ -daD -wFZ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -oxJ -vIV -iEU -iEU -iEU -iEU -iEU -nAO -duS -vPe -xho -ftx -dfm -dfm -pQD -azv -lKE -nKg -kxL -xho -akg -vPe -jDy -qfY -iEU -iEU -iEU -qfY -duS -qqf -wpJ -mPk -vPe -vPe -akg -vPe -vPe -wpJ -ivl -vPe -iwb -cyF -vPe -akg -vPe -wpJ -vPe -vPe -iAZ -iEV -wFL -wSW -vPe -iAZ -iGf -cJJ -uXk -iWh -iGn -iEV -iWh -iGn -iEV -iWh -iGn -duS -vPe -vPe -ivl -vPe -wpJ -vPe -vPe -vPe -vPe -vPe -nAj -wpJ -vPe -rRS -rRS -rRS -"} -(83,1,1) = {" -pNM -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pNM -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -kXq -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -yds -psf -psf -psf -psf -vvx -nvB -urM -nvB -vvx -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +rRS +rRS +rRS +ivl +vPe +iAZ +duS +vPe +ivl +vPe +vPe +vPe +iwf +lvG +vPe +mCM +vPe +izZ +vPe +obJ +daD +wFZ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +oxJ +vIV +iEU +iEU +iEU +iEU +iEU +nAO +duS +vPe +xho +ftx +dfm +dfm +pQD +azv +bKX +nKg +kxL +xho +akg +vPe +jDy +qfY +iEU +iEU +iEU +qfY +duS +qqf +wpJ +mPk +vPe +vPe +akg +vPe +vPe +wpJ +ivl +vPe +iwb +cyF +vPe +akg +vPe +wpJ +vPe +vPe +iAZ +iEV +wFL +wSW +vPe +iAZ +iGf +cJJ +uXk +iWh +iGn +iEV +iWh +iGn +iEV +iWh +iGn +duS +vPe +vPe +ivl +vPe +wpJ +vPe +vPe +vPe +vPe +vPe +nAj +wpJ +vPe +rRS +rRS +rRS +"} +(83,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -74186,47 +73677,6 @@ rRS rRS "} (84,1,1) = {" -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM -pNM mVX mVX mVX @@ -74280,47 +73730,88 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -74537,47 +74028,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -74794,47 +74285,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -75051,47 +74542,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -75308,47 +74799,47 @@ mVX mVX mVX mVX -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS rRS @@ -75565,47 +75056,47 @@ mVX mVX mVX mVX -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -75822,47 +75313,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -afa -afa -afa -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -76079,47 +75570,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -afa -afa -afa -sdG -afa -afa -afa -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -76336,47 +75827,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -76593,47 +76084,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -76850,47 +76341,47 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -usR -uVr -wnO -wHu -usR -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX rRS rRS vPe @@ -77013,6 +76504,47 @@ rRS rRS "} (95,1,1) = {" +hoJ +gRr +fWE +gRr +hoJ +hoJ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -77107,47 +76639,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -tKr -wPT -wPT -wPT -tKr -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds rRS rRS vPe @@ -77270,6 +76761,47 @@ rRS rRS "} (96,1,1) = {" +cnn +dHE +gal +bMr +gTu +ipb +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -77364,47 +76896,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -usR -vnx -rzg -jfd -usR -psf -psf -psf -psf -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds rRS rRS vPe @@ -77527,6 +77018,47 @@ rRS rRS "} (97,1,1) = {" +cnn +bjM +gal +bQZ +cme +ipb +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -77621,47 +77153,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -usR -vpr -vtR -rZs -usR -psf -psf -psf -psf -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds rRS rRS vPe @@ -77784,6 +77275,22 @@ rRS rRS "} (98,1,1) = {" +hoJ +gRr +jHe +gRr +hoJ +hoJ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -77878,21 +77385,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -tKr -vpJ -woV -vtR -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -77918,7 +77410,6 @@ mVX mVX mVX mVX -pNM rRS rRS vPe @@ -78041,6 +77532,22 @@ rRS rRS "} (99,1,1) = {" +jvI +jvI +jvI +jvI +jvI +jvI +giC +jvI +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -78135,21 +77642,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -sZA -qVX -woV -vtR -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -78175,7 +77667,6 @@ mVX mVX mVX mVX -pNM rRS rRS ivq @@ -78298,6 +77789,22 @@ rRS rRS "} (100,1,1) = {" +cHC +jfv +egK +cSb +cSb +btN +bSw +hCr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -78392,21 +77899,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -sZA -vAU -woV -vtR -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -78432,7 +77924,6 @@ mVX mVX mVX mVX -pNM rRS rRS vPe @@ -78555,7 +78046,23 @@ rRS rRS "} (101,1,1) = {" +cHC +dvT +blt +jwD +jwD +jwD +bSw +hCr +mVX mVX +piE +oQV +dDb +ftK +dDb +oQV +piE mVX mVX mVX @@ -78649,21 +78156,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -tKr -vtR -woV -xbu -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -78689,7 +78181,6 @@ mVX mVX mVX mVX -pNM rRS rRS iwb @@ -78812,8 +78303,24 @@ rRS rRS "} (102,1,1) = {" +cHC +aTE +jwD +bjs +bjs +jwD +bSw +hCr mVX mVX +oQV +nuC +qDA +qDA +lPy +jNn +piE +mVX mVX mVX mVX @@ -78906,21 +78413,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -usR -rdF -woV -xbu -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -78946,7 +78438,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -79069,8 +78560,24 @@ rRS rRS "} (103,1,1) = {" +jvI +giC +aWY +giC +giC +gmU +jvI +jvI mVX mVX +dDb +eeO +lPy +wDF +lPy +hhM +rYU +mVX mVX mVX mVX @@ -79163,21 +78670,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -usR -usR -woV -usR -usR -psf -psf -psf -psf -yds mVX mVX mVX @@ -79203,7 +78695,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -79326,6 +78817,23 @@ rRS rRS "} (104,1,1) = {" +bRt +bRt +bRt +vQc +vQc +vQc +eIX +iUN +bRt +bRt +oQV +ejG +qDA +qDA +lPy +hjp +piE mVX mVX mVX @@ -79420,22 +78928,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -usR -jmf -usR -psf -psf -psf -psf -psf -yds -mVX mVX mVX mVX @@ -79460,7 +78952,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -79583,6 +79074,23 @@ rRS rRS "} (105,1,1) = {" +tNp +qqE +nFv +ted +ted +ted +rxG +bnT +wQE +bRt +piE +oQV +dDb +jNQ +dDb +oQV +piE mVX mVX mVX @@ -79677,22 +79185,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -mVX mVX mVX mVX @@ -79717,7 +79209,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -79840,6 +79331,25 @@ rRS rRS "} (106,1,1) = {" +rbb +qqE +ted +ted +ted +ted +bnT +ted +gEb +kAR +oJI +sKg +lDH +sKg +sKg +sXM +prf +oJI +oJI mVX mVX mVX @@ -79934,24 +79444,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -mVX -mVX -mVX mVX mVX mVX @@ -79974,7 +79466,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -80097,6 +79588,25 @@ rRS rRS "} (107,1,1) = {" +rbb +qqE +nhX +bnT +bnT +bnT +bnT +ted +hwm +kAR +sKg +lBl +lOB +svC +tbv +tbX +tbv +qgA +sgG mVX mVX mVX @@ -80191,24 +79701,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -mVX -mVX -mVX mVX mVX mVX @@ -80231,7 +79723,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -80354,6 +79845,25 @@ rRS rRS "} (108,1,1) = {" +rbb +qqE +ted +ted +ted +ted +bnT +ted +gEb +kAR +mMn +nVS +maj +sKg +tbv +kAJ +tbv +qgA +sgG mVX mVX mVX @@ -80448,24 +79958,6 @@ mVX mVX mVX mVX -yds -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -psf -yds -mVX -mVX -mVX mVX mVX mVX @@ -80488,7 +79980,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -80611,6 +80102,25 @@ rRS rRS "} (109,1,1) = {" +hIf +qqE +sHH +ted +ted +ted +uPJ +bnT +ePZ +bRt +sKg +ogO +oiv +ovE +oHK +peG +tbv +qgA +sgG mVX mVX mVX @@ -80705,24 +80215,6 @@ mVX mVX mVX mVX -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -yds -mVX -mVX -mVX mVX mVX mVX @@ -80745,7 +80237,6 @@ mVX mVX mVX mVX -pNM rRS rRS rRS @@ -80868,6 +80359,25 @@ rRS rRS "} (110,1,1) = {" +bRt +bRt +bRt +vQc +vQc +vQc +eIX +rKd +bRt +bRt +oJI +sKg +okx +sKg +oJI +sKg +dhK +oJI +oJI mVX mVX mVX @@ -80984,25 +80494,6 @@ mVX mVX mVX mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -pNM rRS rRS rRS @@ -85546,7 +85037,7 @@ kQk ykS ykS ykS -ykS +xDA ykS ykS ykS @@ -85803,8 +85294,8 @@ tdj kQk ykS ykS -ykS -ykS +tbW +xDA ykS ykS mFm @@ -86060,9 +85551,9 @@ gLX tdj ykS ykS -ykS -ykS -ykS +gLw +xfs +xDA nVI ykS ykS @@ -86317,10 +85808,10 @@ tcW ova ova mBj -ykS -ykS -ykS -ykS +kgk +xhP +xfs +xDA ykS ykS ykS @@ -86574,11 +86065,11 @@ hxT tcW myy ykS -ykS -ykS -ykS -ykS -ykS +uHf +kMS +dUN +xfs +xDA ykS ykS mFm @@ -86830,13 +86321,13 @@ drh tcW mfc ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +whe +vNF +hNg +uFB +wQF +vNF +xDA nVI ykS ykS @@ -87086,15 +86577,15 @@ ykS hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +eul +mCK +xIi +nzK +aYm +fAv +tbW +xDA ykS ykS ykS @@ -87343,16 +86834,16 @@ ykS hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +tlW +mCK +aTQ +lrJ +iVW +iVW +odX +gfP +xDA ykS rns ykS @@ -87532,10 +87023,10 @@ pqb pqb pqb pqb -mmo +tEi kVf hsJ -dSG +sJY pqb pqb mVX @@ -87600,16 +87091,16 @@ plK hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +eul +mCK +uLd +ubF +xhP +xhP +xhP +xfs +mll ykS ykS ykS @@ -87713,15 +87204,15 @@ mVX mVX jMD mVX -fID -fID -fID +iRb +bkn +iRb mVX jMD mVX -fID -fID -fID +vMQ +qKL +vMQ mVX jMD mVX @@ -87743,31 +87234,31 @@ nAN nAN nAN jMD -fID -fID -fID -fID -fID +nSu +hDY +ggH +aBV +nSu jMD nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +mVX +mVX +fzV +xRD +xRD +xRD +fzV +mVX +mVX +mVX +mVX +fzV +fzV +fzV +fzV +fzV +mVX +mVX pqb pqb pqb @@ -87788,11 +87279,11 @@ oVf vDj oVf pqb -aNU +dXA mxj myp -vsm -qza +kAt +kfC pqb pqb mVX @@ -87858,15 +87349,15 @@ tcW cUD ykS ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +tIe +rCS +uFn +xhP +xhP +pvn +cHW +pYK tdj ykS tdj @@ -87969,17 +87460,17 @@ mVX mVX mVX jMD -fID -fID -fID -fID -fID +iRb +iRb +lzU +iRb +iRb onc -fID -fID -fID -fID -fID +vMQ +vMQ +xxa +vMQ +vMQ jMD mVX onc @@ -87994,37 +87485,37 @@ nAN nAN nAN nAN -edm -mSD -sXg -sXg -gDX +bBe +aoW +nIr +nIr +waZ nAN -fID -fID -fID -fID -fID +dcl +jAV +jAV +jAV +dcl nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +mVX +fzV +fzV +aRJ +rqr +uMf +fzV +vtH +xRD +xRD +vtH +fzV +bbE +pvX +rcD +fzV +fzV +mVX pqb pqb pqb @@ -88049,7 +87540,7 @@ myp xmb hpD bje -vpL +gDk pqb pqb mVX @@ -88115,15 +87606,15 @@ tcW cUD ykS ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +mCK +mBi +bLb +xhP +xhP +pvn +psd +pYK ykS ykS ykS @@ -88226,62 +87717,62 @@ mVX mVX mVX onc -fID -fID -fID -fID -fID +iRb +bgJ +rFb +vAs +iRb onc -fID -fID -fID -fID -fID +vMQ +bej +rmm +leh +vMQ onc onc onc onc onc onc -fID -qMC -ivZ -gjE -ivZ -qMC -fID -nAN -wAm -mSD -ggJ -ggJ -gDX +eYl +jUO +iKU +tte +iKU +wiU +fID +jtl +vHF +aoW +kpi +kpi +waZ nAN -fID -fID -fID -fID -fID +nSu +kTa +qsV +chv +nSu nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +fzV +fzV +sfK +ijs +alw +rRG +fzV +bZc +raj +cqf +xRv +fzV +rGF +flG +axP +nRZ +fzV +fzV pqb tSR pqb @@ -88302,13 +87793,13 @@ kTy myg uam pqb -lhn -bPw -xHb -aKY +sQD +dBL +mVe +oJm pqb -qAy -ono +eVn +tad mVX mVX pNM @@ -88371,16 +87862,16 @@ plK hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +eul +mCK +sIh +ubF +xhP +xhP +xhP +bYi +htX ykS ykS ykS @@ -88483,62 +87974,62 @@ mVX mVX onc onc -fID -fID -fID -fID -fID +iRb +wrq +rFb +jec +iRb onc -fID -fID -fID -fID -fID +vMQ +sEb +rmm +rUL +vMQ onc onc onc onc onc onc -qMC -qMC -fyc -cuU -fyc -qMC -qMC -xhX -owf -qcL -ggJ -ggJ -ylA -nAN -fID -fID -fID -fID -fID -nAN -nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +wiU +wiU +iXI +mfP +iXI +wiU +wiU +kmM +xqF +qap +kpi +kpi +tXE +nAN +dcl +kTa +lGL +kTa +dcl +nAN +nAN +fzV +uTw +jJA +jJA +jJA +iJd +fzV +erI +bHU +gVU +tMy +fzV +liD +dVg +buk +laj +qXF +fzV pqb pqb pqb @@ -88628,16 +88119,16 @@ ykS hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +tlW +mCK +pyh +lrJ +iVW +iVW +acK +rgH +bQF ykS nQm ykS @@ -88740,62 +88231,62 @@ onc onc onc onc -fID -fID -fID -fID -fID +iRb +nRK +rFb +ijZ +iRb onc -fID -fID -fID -fID -fID +vMQ +nXE +rmm +xqU +vMQ onc cte bQu cMG cte onc -ivZ -yfS -cuU -oFo -cuU -uJp -ivZ -xhX +iKU +rAR +mfP +bhf +mfP +vfD +iKU +kmM hTD fAg fAg fAg kZY nAN -fID -fID -fID -fID -fID -nAN -nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +ePN +kTa +lGL +kTa +ePN +nAN +nAN +vtH +xYl +jJA +jJA +jJA +jJA +jiI +jiI +fgS +fgS +jiI +fzV +fzV +fzV +jiI +iac +csr +fzV pqb pqb pqb @@ -88820,7 +88311,7 @@ uam wcz oVf pqb -qAy +eVn fID hne mVX @@ -88885,15 +88376,15 @@ ykS hxT cUD ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +eul +eul +mCK +uLd +wos +ssx +lxP +tbW +bQF ykS ykS ykS @@ -88998,15 +88489,15 @@ onc onc onc onc -fID -dom -fID +tnL +ceX +xvY onc onc onc -fID -djs -fID +cCQ +dsK +jok onc onc cte @@ -89014,45 +88505,45 @@ tZe tZe cte onc -gjE -cuU -qHw -mdZ -omF -cuU -oxE -cPv +tte +mfP +vgz +sjU +qzU +mfP +vjK +vbO mTv fAg fAg fAg kZY nAN -fID -fID -fID -fID -fID -nAN -nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +dcl +kTa +lGL +kTa +dcl +nAN +nAN +kMT +uVl +jJA +jJA +fBQ +vbB +orF +vtH +fdL +fdL +vtH +erI +qBf +hcs +fzV +iac +wlj +fzV pqb pqb pqb @@ -89077,7 +88568,7 @@ myg myg ovc pqb -qAy +eVn fID mVX mVX @@ -89143,13 +88634,13 @@ pqv tcW mfn ykS -ykS -ykS -ykS -ykS -ykS -ykS -ykS +rug +bpJ +hNg +uFB +wQF +bpJ +bQF nVI ykS ykS @@ -89271,45 +88762,45 @@ tZe tZe jtQ onc -ivZ -yfS -cuU -dYQ -cuU -uJp -ivZ -xhX +iKU +rAR +mfP +iAD +mfP +vfD +iKU +kmM hTD fAg fAg fAg kZY nAN -fID -fID -fID -fID -fID +nSu +llT +lGL +fhy +nSu nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +kMT +xuv +jJA +xXn +xwz +pKU +kZy +fzV +qyq +qyq +fzV +ydm +dEc +jbQ +fzV +cpW +tjY +fzV pqb sdw sdw @@ -89317,16 +88808,16 @@ sdw eNf myp trB -qvY -fpU -mVN -fpU -fEN -ihi -fpU -kEK -fpU -bla +ezA +mDU +pub +mDU +ktZ +xEV +mDU +jQj +mDU +wgx eNf trB efW @@ -89401,11 +88892,11 @@ pqv tcW myE ykS -ykS -ykS -ykS -ykS -ykS +uNo +oyc +pUJ +bYi +bQF ykS ykS mFm @@ -89528,45 +89019,45 @@ tZe tZe hNh onc -qMC -qMC -biy -cuU -biy -qMC -qMC -xhX -jGz -dnM -aqp -fqC -wZK -nAN -fID -fID -fID -fID -fID -nAN -nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +wiU +wiU +kNG +mfP +kNG +wiU +wiU +kmM +tqr +tLb +ttN +lHs +uho +nAN +dcl +kTa +lGL +kTa +dcl +nAN +nAN +kMT +kbV +jJA +xXn +qpM +pKU +tKZ +fzV +npn +qyq +lbH +auF +rrU +exr +fzV +iac +tjY +fzV pqb sdw sdw @@ -89574,16 +89065,16 @@ sdw eNf myp trB -fjw +uLj myp -aLI -wxE +mXv +kyM myp -qTA -xQA -sJr +wlb +aWA +poN myp -uzh +vJu eNf xAZ pqb @@ -89591,7 +89082,7 @@ pqb pqb pqb pqb -qAy +eVn fID hne mVX @@ -89658,10 +89149,10 @@ ykS pqv kQT mBj -mCD -ykS -ykS -ykS +xaJ +xhP +bYi +bQF ykS ykS ykS @@ -89786,11 +89277,11 @@ tZe sVV onc fID -qMC -ivZ -gjE -ivZ -qMC +wiU +iKU +tte +iKU +wiU fID nAN nAN @@ -89799,31 +89290,31 @@ nAN nAN nAN nAN -fID -fID -fID -fID -fID +oTf +kTa +lGL +kTa +oTf nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +vtH +erI +jJA +xXn +cGL +fJh +tll +fzV +qyq +qyq +fzV +vZg +osM +tIw +fzV +iac +aPy +fzV pqb cBu sdw @@ -89831,16 +89322,16 @@ myp mxj myp trB -fJu -wxE +gXQ +kyM myp -uYJ +bUi myp -qTA -ize +wlb +xKI myp -xQA -twC +aWA +aux eNf trB efW @@ -89848,7 +89339,7 @@ uam wcz oVf pqb -qAy +eVn fID mVX mVX @@ -89915,9 +89406,9 @@ ykS ykS ykS ykS -ykS -ykS -ykS +rAu +bYi +bQF nVI ykS ykS @@ -90050,37 +89541,37 @@ nAN nAN nAN nAN -fLF -iQy -ueL -luA -nmT +kXz +xCr +bBh +kHS +tRj nAN -fID -fID -fID -fID -fID +dcl +kTa +lGL +kTa +dcl nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +fzV +tfX +seE +tfX +fzV +fzV +fzV +tfX +fdL +fdL +tfX +fzV +fzV +fzV +tfX +sSa +tfX +fzV pqb sdw sdw @@ -90088,16 +89579,16 @@ myp mxj fBc trB -vPL -uYJ +neK +bUi myp -uYJ +bUi tqT -jAZ -ize +hzJ +xKI myp -ize -eQX +xKI +keE eNf awK kvN @@ -90172,8 +89663,8 @@ ykS ykS ykS ykS -ykS -ykS +tbW +bQF ykS ykS mFm @@ -90297,47 +89788,47 @@ tZe tZe tZe tZe -wMB -sFQ +fDV +moN vAm -uoM -biT +hat +gBS iwS -wBV -vMv -fbk -bvD -jUo -yfP -kjt -pEa -aeD +sFz +nUi +eQt +fuR +rIE +kkq +oJt +ckm +hya nAN -fID -fID -fID -fID -fID +nSu +wDk +lGL +dmx +nSu nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +vtH +dFD +qyq +aPi +vtH +saH +saH +dFD +qyq +qyq +aPi +saH +saH +vtH +dFD +qyq +aPi +vtH pqb sdw sdw @@ -90345,16 +89836,16 @@ myp mxj myp trB -vqW -crY +qTJ +eVU myp -uYJ +bUi myp -qTA -ize +wlb +xKI myp -fui -kgO +nQl +gPP eNf trB efW @@ -90362,7 +89853,7 @@ nyo rkU oVf pqb -qAy +eVn fID hne mVX @@ -90405,7 +89896,7 @@ fzw fnh fzw fnh -msS +gAV fnh fzw fnh @@ -90429,7 +89920,7 @@ ykS ykS tdj ykS -ykS +bQF ykS ykS ykS @@ -90508,11 +89999,11 @@ jlG hNH spu tbh -aoA -aoA -aoA -aoA -aoA +odZ +odZ +odZ +odZ +odZ tqy pyu sgv @@ -90555,46 +90046,46 @@ wUF sAT tZe pTI -sFQ +moN qRs -fMn -eLb +htN +mQg iwS -uCx -qqt -juM -pEa -rxs -vXQ -uCx -ueL -lRc +kTW +nNn +rzE +ckm +luw +opi +kTW +bBh +rCg nAN -fID -fID -mgz -fID -fID +nSu +ePN +pEE +ePN +nSu nAN nAN -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +nrV +qyq +qyq +qyq +gJa +qyq +qyq +qyq +qyq +qyq +qyq +qyq +qyq +gJa +qyq +qyq +qyq +agl pqb sdw sdw @@ -90602,16 +90093,16 @@ myp mxj mqK trB -fjw +uLj myp -qkE -crY +nnN +eVU myp -qTA -fui -xry +wlb +nQl +xpj myp -uzh +vJu eNf xAZ pqb @@ -90619,7 +90110,7 @@ pqb pqb pqb pqb -qAy +eVn fID mVX mVX @@ -90760,24 +90251,24 @@ mVX mVX mVX wLM -htt +nJH cHU cHU cHU cIn -aoA -aoA -aoA -aoA -aoA +odZ +odZ +odZ +odZ +odZ tqy pyu rpk kxR hnv -dhv -tAC -rHl +qlu +uSc +fnD hnv dgy onc @@ -90814,44 +90305,44 @@ iwS iwS eyb iwS -rFx -cMz +gnR +tRF iwS -sBC -rxs -uCx -ueL -juM -rxs -aeD +wIg +luw +kTW +bBh +rzE +luw +hya lYZ -aUM +nMb kWm kWm shl -eTK +qDT shl kWm kWm kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +nrV +qyq +qyq +qyq +gJa +qyq +qyq +qyq +qyq +qyq +qyq +qyq +qyq +gJa +qyq +qyq +qyq +agl pqb cBu sdw @@ -90859,16 +90350,16 @@ myp mxj myp trB -bJk +kLX txY -ipv +rjH txY -hUV -qpR -uIF -mdx -uIF -ifh +jUN +njO +hvZ +ufR +hvZ +wXo eNf trB efW @@ -91021,8 +90512,8 @@ hNH cHU cHU kvz -owS -aoA +oGK +odZ oZR oZR oZR @@ -91030,13 +90521,13 @@ fTt kcO pyu rpk -oNm -cKh -kNc -bji -lAD -sSG -bnf +uQD +hXs +wKn +lKS +fVB +mqd +kqu onc onc fsr @@ -91058,57 +90549,57 @@ wUF tZe wUF onc -rvj +pdE dkR -oyd +cts kbo onc -pbs -dEK -rDM +tzY +pLN +ewA onc -kVP +uDo lIh rnN tOu -nyg -way +vlQ +hTU iwS -aeD -pEa -ueL -pEa -uPV -yfP +hya +ckm +bBh +ckm +eru +kkq lYZ -aok +bDb kWm kWm -sGH +mxY evA uku fkW kWm kWm kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +vtH +qoS +rbZ +qoS +vtH +qyq +qyq +anE +qyq +dXS +djc +bVq +aRd +vtH +qoS +rbZ +qoS +vtH pqb sdw sdw @@ -91122,10 +90613,10 @@ nVl mxS myp myp -oUl -aUs -oEM -uJA +gJq +oSm +ltP +pIW eNf viw kvN @@ -91275,11 +90766,11 @@ mVX mVX wLM dvz -sDM -mvz -fgc -pJo -aoA +aAF +mcX +aLy +gkW +odZ oZR oZR oZR @@ -91288,12 +90779,12 @@ tqy jcE rpk art -kNc -bji -bji -bji -lAD -noS +wKn +lKS +lKS +lKS +fVB +aya onc onc bRi @@ -91315,7 +90806,7 @@ ngX tZe wUF mPM -dEK +pLN ihM ihM tPt @@ -91324,48 +90815,48 @@ sDc jWT nzW onc -frJ +ilu ueh -kDD +ugK iwS wLL qUb iwS -bXr -yfP +gAp +kkq lYZ -yfP +kkq iwS -pJG -ueL -ueL +qdd +bBh +bBh kWm -sMp -sMp +lZV +lZV tLO oBC -uqG -sMp -sMp +mUi +lZV +lZV kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +fzV +urj +qms +deE +fzV +ooE +jiI +vtH +lUp +bcx +vtH +jiI +iZX +fzV +urj +qms +deE +fzV pqb sdw sdw @@ -91379,10 +90870,10 @@ lBg lBg myp myp -oEM -oEM -oEM -chF +ltP +ltP +ltP +gqg eNf trB efW @@ -91532,26 +91023,26 @@ mVX mVX wLM dvz -siq +vAb vTg vTg tNv -gFs -dGv -gLC +vqd +xuT +sSm oZR xuc tqy lhs rpk -jxO +yaB ctv ctv ctv ctv ctv ctv -aqo +sBC onc wEK qPt @@ -91566,63 +91057,63 @@ onc sVm vlH sDc -hxE +wdH onc wUF tZe wUF onc -jpQ +nzq eNL kgA svl onc vlH jWT -hby +ftQ onc -iJC +fJC ueh -oXT +wxh eyb -rKR -snf +mTD +kEv iwS iwS iwS -gTR +qoH iwS iwS -mfd -mjU -kDd +vPW +ihP +mZk kWm -mtY -fIa +nWx +sRk tLO -lhy +gzp ueN -fIa -lRQ +sRk +ase kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +fzV +ykH +ykH +ykH +fzV +fzV +fzV +euY +ddb +rMh +rDf +fzV +fzV +fzV +ykH +ykH +ykH +fzV pqb pqb pqb @@ -91636,10 +91127,10 @@ oBR hzh myp myp -oEM -oEM -aUs -chF +ltP +ltP +oSm +gqg eNf xAZ pqb @@ -91788,27 +91279,27 @@ mVX mVX mVX wLM -otz -siq +oIM +vAb vTg puZ tQh -iak -sHL +aOO +fBk puZ vTg sOr rwi lhs rpk -cqx -bhM -bhM -shI -bhM -bhM -bhM -ctz +tGh +rlF +rlF +wqP +rlF +rlF +rlF +ctG onc iqP feR @@ -91823,7 +91314,7 @@ onc kpZ jWT jWT -dEK +pLN mPM wUF tZe @@ -91845,7 +91336,7 @@ fYP lZM xIm sZP -wWA +iDM sZP pMT wde @@ -91854,32 +91345,32 @@ kWm kWm kWm kWm -mSy -mSy +xVi +xVi tLO -oZI +lhl ueN -mSy -mSy +xVi +xVi kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID -fID +fzV +xig +fKr +xig +fzV +mVX +fzV +rcB +rDf +pre +xVY +fzV +mVX +fzV +xig +fKr +xig +fzV pqb pqb pqb @@ -91893,10 +91384,10 @@ tSu aIy myp myp -gAR -xpS -xpS -vYd +aag +bSd +bSd +wwE eNf trB efW @@ -92046,26 +91537,26 @@ mVX mVX iIs iIs -anL +qNE vTg vTg tNv -lPG -inm -pbI +dfd +xTS +sGl oZR rXP tqy lhs rpk -jxO +yaB ctv ctv ctv ctv ctv ctv -dDF +fny onc oIW nWB @@ -92078,16 +91569,16 @@ onc onc onc kqD -fcT +voT nzW -bsy +nig onc wUF tZe wUF onc -jNs -cHQ +wfo +xMC aOR nzW onc @@ -92095,8 +91586,8 @@ onc onc onc onc -otJ -phW +dRg +uAJ ueh iwS aRW @@ -92105,38 +91596,38 @@ pUa pUa pUa pUa -sTj -knR +lwk +jJr iUy -okw -kEW +gOl +vOq kWm vtr vtr tLO -jvX +xpQ ueN vtr vtr kWm -fID -fID -fID -fID -fID -fID -fID -fID -fID -lms -fID -fID -fID -fID -fID -fID -fID -fID +mVX +xig +xig +xig +mVX +mVX +fzV +vtH +iyG +ebI +vtH +fzV +mVX +mVX +xig +xig +xig +mVX pqb reY hiF @@ -92303,11 +91794,11 @@ mVX mVX mVX wLM -sAS -bBo -gwz -vsc -aoA +cGy +aqV +bPG +jXt +odZ oZR oZR oZR @@ -92316,11 +91807,11 @@ tqy jcE rpk art -kUK -wXK -wXK -wXK -ujw +uBl +qCu +qCu +qCu +rHV cjY onc onc @@ -92343,30 +91834,30 @@ ngX tZe wUF mPM -dEK -dEK +pLN +pLN jWT yhH onc -jqo -uVb -wIX +wfA +ash +elD iwS iwS iwS iwS iwS -aLY -vRe -hQG +kOx +oOK +aGx fCa pUa pUa oNa iwS -sJH -kjL -unp +qlP +mzH +jtL kWm bbk jny @@ -92380,16 +91871,16 @@ kWm kWm kWm kWm -wZB -wZB +tzC +tzC kWm kWm -amO -amO +vDP +vDP kWm kWm -wZB -wZB +tzC +tzC kWm kWm kWm @@ -92417,7 +91908,7 @@ efW nyo rkU oVf -dUt +cKq pqb mVX mVX @@ -92563,8 +92054,8 @@ wLM hNH cHU kvz -obI -aoA +svr +odZ oZR oZR oZR @@ -92572,20 +92063,20 @@ mli kcO pyu rpk -vcM -eDv -kUK -wXK -ujw -vmx -tMM +eXk +ygT +uBl +qCu +rHV +tcH +wZz onc voi nWB nWB nWB avP -xFX +xQp rBp rBp rBp @@ -92594,63 +92085,63 @@ onc mES pVt rfO -hxE +wdH onc wUF tZe cte onc -bDp -igZ +bdw +jdQ jWT jFM onc vES vES vES -yjI -wGE -lYx -wDu +pOQ +dDW +xAt +vuc iwS iwS -hNo -oih -fht +doA +naM +mpj pUa pUa oNa iwS jDB -gom +uWy jDB kWm evA nHr gul oBC -gOH +bSx nHr nHr uSA nHr nHr -gLF -vXv +psv +lJP nHr nHr nHr nHr uku -pCq +ivb nHr nHr nHr nHr -lRR -adj -bul -vqP +wcM +euy +kGp +vTi pqb ont tGz @@ -92817,23 +92308,23 @@ mVX mVX mVX wLM -nvQ +cwU cHU cHU cIn -aoA -aoA -aoA -aoA -aoA +odZ +odZ +odZ +odZ +odZ tqy pyu rpk qFa aXl -eQO -iNb -iSJ +dCK +cUs +gFC aXl pcw onc @@ -92842,7 +92333,7 @@ nWB nWB nWB bBI -tjc +xac rBp rBp rBp @@ -92851,38 +92342,38 @@ onc lBF tZe tZe -dEK +pLN mPM wUF tZe itS onc -ptx +oFM pTF tZe rfO onc -dWB -dpw -lxv -xVj +csN +oQO +aLD +ahD vES vES vES siN -teo -emH -eQA -fht +eiF +uqZ +uOa +mpj uFT pUa -ueR -eqh +sBh +nsd ohk vnv jBc -rps -dpf +oeJ +gMO oBC oBC yau @@ -92905,9 +92396,9 @@ htk htk ozZ ueN -gGR -bul -aNf +hmB +kGp +ylC pqb ont tGz @@ -93077,12 +92568,12 @@ wLM sIC hNH ggS -uOl -aoA -aoA -aoA -aoA -aoA +rtO +odZ +odZ +odZ +odZ +odZ tqy pyu rUb @@ -93106,9 +92597,9 @@ kvI onc onc yce -bjK +sHV qpQ -bsy +nig onc wUF tZe @@ -93119,27 +92610,27 @@ pTF tZe tZe onc -mUU -sdy -sjb -ofN -ueG -dqc -bbi -ofN -nFw -jmt -sql -oCe +wKZ +bVU +wbF +oJc +wta +fCK +bFM +oJc +sfO +qDR +wvg +fUK fCa pUa -ueR -wzK -dyh -xTu +sBh +kkU +cVB +tiF boc -umb -fPj +vUy +kyB ufi ozZ oBC @@ -93151,20 +92642,20 @@ ufi ufi ufi ozZ -vct -qzX -rEu -rEu -rEu -rEu -rEu -rEu -bJo +lpP +qww +uNq +uNq +uNq +uNq +uNq +uNq +nGk fOM ueN oBC oBC -hqq +msO pqb reY kUC @@ -93394,21 +92885,21 @@ oNa iwS kWm kWm -vmX +uTp kWm -vmX -lgz -mOM -qXJ -pjS -lgz -vmX +uTp +vcj +ira +vwe +dtR +vcj +uTp kWm -vmX +uTp kWm kWm tLO -gOH +bSx uku uku uku @@ -93419,9 +92910,9 @@ uku uku gul ueN -adj -bul -vqP +euy +kGp +vTi pqb pqb pqb @@ -93629,11 +93120,11 @@ tZe cte onc aIb -cdD -bri +xNZ +mpW mES onc -cqX +rKq lYZ lYZ lYZ @@ -93644,48 +93135,48 @@ lYZ lYZ bAw waY -esm +kTd lZM pUa udJ iwS kWm -olU -gLN -sMp -sMp +xap +wqj +lZV +lZV oBC -gUc -eud -rep +bni +cqY +bul oBC -sMp -sMp -iDd -olU +lZV +lZV +oNH +xap kWm fuF htk ufi -cWV +tnH ufi -ofB -ofB +qiO +qiO ufi -cWV -lpz +tnH +eDV ufi lgU -gGR -iji -aNf +hmB +mOD +ylC pqb tRY tRY tRY eNf myp -hUu +evj pqb pqb pqb @@ -93701,7 +93192,7 @@ pqb pqb fAN pqb -dkb +lPn fID mVX mVX @@ -93846,9 +93337,9 @@ mVX mVX mVX wLM -odZ -odZ -fpH +iFf +iFf +lFv bGq jKi ohN @@ -93890,49 +93381,49 @@ onc onc onc onc -rBJ +uNI mvQ -imd -qfn -mNl +cXc +pup +eMU lYZ -kfU -ezV +bwd +fcH lYZ eyb njy xpx aRW pUa -sTj -bdQ +lwk +ppZ kWm aSp -gLN -sMp -sMp +wqj +lZV +lZV oBC -khn -wax -cAh +vKl +eWH +daM oBC -sMp -sMp -iDd +lZV +lZV +oNH aSp kWm kWm -bjO +akk kWm kWm nAN -doh -qWE +xcV +qTo nAN nAN pqb -qSC -ejW +oaK +sSU pqb pqb pqb @@ -93956,9 +93447,9 @@ lYr keG hiL cQD -buT +epD pqb -oYW +quv fID aDl mVX @@ -94104,8 +93595,8 @@ mVX mVX wLM dUh -odZ -odZ +iFf +iFf aQX fkh fkh @@ -94147,51 +93638,51 @@ oMM vwP vTz onc -rtr -kNq -ufB -uuD -tpf +rVH +ueU +waz +vOS +kKV lYZ -vCI -pYF +hrI +tMK ohJ eyb nMv bwf aRW pUa -sTj -axM +lwk +oCp kWm -bWc -uyw -sMp -sMp +wAE +rnv +lZV +lZV oBC -oBX -erC -vlF +jid +kDe +kgq oBC -sMp -sMp -qAF -hkg +lZV +lZV +ayG +etw kWm jle -kcH +hWn nRs kWm -ivG -lim -lim -jTE -xqO -eJQ -ole -meF -rxC -gEv +nwq +xGr +xGr +fhx +icQ +aie +inC +beg +pOU +axr pqb pqb izs @@ -94215,7 +93706,7 @@ kCu kCu nXK pqb -rjY +fQO fID mVX mVX @@ -94361,8 +93852,8 @@ mVX mVX wLM gcU -odZ -odZ +iFf +iFf xPF fkh ohN @@ -94404,48 +93895,48 @@ tZe tZe rnV onc -gAL -eHC -jSA -dzA -lCX +oMB +ago +oCh +nOe +mOu lYZ -gFg -gxB -aZl +cxK +ihz +aXP eyb osp bwf aRW pUa -sTj -sLB +lwk +kgC kWm aSp -uyw +rnv oBC oBC oBC oBC -cvg +kaY oBC oBC oBC oBC -qAF +ayG aSp kWm -hgx -kcH -fwM +kXF +hWn +ifS kWm -peZ +lVD fAg fAg fAg -kZD -ufN -psn +nHw +tDo +aig myp myp trB @@ -94465,14 +93956,14 @@ tGz tGz uDD pqb -rxO +fhT kCu -fJf -fJf +wAV +wAV kCu oJi pqb -dkb +lPn fID mVX mVX @@ -94619,8 +94110,8 @@ mVX iIs iIs dGP -odZ -odZ +iFf +iFf fkh ohN ohN @@ -94645,10 +94136,10 @@ wUF wUF aNP onc -xoR -gSl -gSl -xoR +nYA +vPm +vPm +nYA onc onc vod @@ -94662,52 +94153,52 @@ vwP vTz onc juL -dqc -ofN -gvA -byq +fCK +oJc +jgV +jLN lYZ -kTL +ovu vES -xuN +gfm eyb erk fKH aRW pUa -sTj -prs +lwk +oHS kWm -olU -xCc -oPN -hyc -fBr -ovZ -gGz -frj -vtL -caN -ryj -vit -olU +xap +kaz +oMa +kRJ +kzB +xBe +qYE +tPY +ooF +cKI +vYW +sUB +xap kWm -egc +rbD qqS -wze +wLp kWm -kpO +iFB fAg fAg -rxw -jfZ -eJQ -cZF -wUt +kXg +qMf +aie +cko +wRR hpD gRK pqb -hZg +ftj jIK pqb lpB @@ -94724,12 +94215,12 @@ pqb pqb pqb iwv -buT -buT +epD +epD kCu oJi pqb -oYW +quv fID aDl mVX @@ -94876,7 +94367,7 @@ mVX mVX wLM abb -odZ +iFf lJm fkh fkh @@ -94901,12 +94392,12 @@ rye wUF wUF wxO -gSl +vPm jWT jWT jWT jWT -gSl +vPm onc cTV wUF @@ -94918,66 +94409,66 @@ tZe tZe tZe onc -woU +aCs lYZ lYZ lYZ lYZ lYZ -cbK +sZu vES vES bAw fHh -ltb +hLq lZM pUa udJ iwS kWm kWm -mAt -gMD -nJu -stV -xec -knk -fFk -puz -lfD -pVW -gET -dpJ -paN -paN -paN -paN -ykz -rDf +pDz +toh +oxw +bCT +nPt +hLB +iyb +cDS +cHS +uzx +eRR +aiz +gDR +gDR +gDR +gDR +tPx +kYe fAg fAg -ozw +jJv pqb pqb pqb pqb -eGn +aWr pqb pqb eNf -vsm +kAt nCA mxj myp myp ser uVO -qoS +rLo aji kVf kVf aji -qoS +rLo hsJ sAZ kCu @@ -94986,7 +94477,7 @@ kCu kCu oJi pqb -rjY +fQO fID mVX mVX @@ -95163,7 +94654,7 @@ jWT jWT jWT jWT -pBj +uMu onc xzd wUF @@ -95175,15 +94666,15 @@ tZe tZe tZe onc -mue -rBJ -iYa -wAS +pEc +uNI +hWy +kPg lYZ ohJ -pfP -iMk -rIS +uVc +kfE +gap eyb msA kQr @@ -95191,32 +94682,32 @@ aRW pUa xIm wde -pKB +ozy kWm kWm -sEx -vrd -stV -ggL -ggL -ggL -puz -vrd -sEx +wbe +aGD +bCT +qlX +qlX +qlX +cDS +aGD +wbe kWm -vAC -eOY -qAj -oCf -uMB -vAC -peZ +wBr +qVd +lGS +mQQ +dQQ +wBr +lVD fAg fAg -kZD +nHw fmZ ntW -ipZ +rlz uVO kVf uVO @@ -95243,7 +94734,7 @@ gmq vbb naw pqb -dkb +lPn fID mVX mVX @@ -95275,24 +94766,24 @@ cVs doL dxR tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +viX +xXv +xXv +xXv +ouJ +mEm +mEm +mEm +ouJ +xXv +xXv +xXv +xXv +mVX +mVX +mVX +mVX tYd pNM pNM @@ -95390,13 +94881,13 @@ mVX mVX iIs iIs -erP +aab qJu fkh jPx gMB mDs -scs +uvO iIs tqy pyu @@ -95432,13 +94923,13 @@ tJC tle pNt onc -vrA +iCn vES buW -bAW +gMv lYZ pbe -neo +dYZ acQ kTP iwS @@ -95448,29 +94939,29 @@ aRW pUa pUa oNa -pMe +qbO iwS kWm -gNe -gNe -stV -ggL -ggL -ggL -puz -gNe -gNe +fWt +fWt +bCT +qlX +qlX +qlX +cDS +fWt +fWt kWm -fdw -oDK -hdS -rIi -jRt -vAC -kpO +vGX +vqC +igb +fgq +tyB +wBr +iFB fAg fAg -kZD +nHw fmZ xmb hpD @@ -95481,7 +94972,7 @@ sSK fXZ trB pqb -bIj +kYG sSK hpD hpD @@ -95500,7 +94991,7 @@ pqb pqb pqb pqb -oYW +quv fID aDl mVX @@ -95532,24 +95023,24 @@ azG aAL dyM tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +wvW +wFV +xhf +xVm +xxJ +xVm +xVm +xVm +xVm +uqw +sVi +kWH +eTw +mVX +mVX +mVX +mVX tYd mVX mVX @@ -95664,7 +95155,7 @@ pGJ pGJ pGJ pGJ -wnC +xRM iIs vQi sAi @@ -95690,51 +95181,51 @@ onc onc onc kHT -uqc -iVe +grF +jZF kLt lYZ lYZ -kHW -vLy -uOd +jtm +qIo +vHf iwS pUa iwS -gqU +iGT pUa pUa oNa -arK +nJe iwS kWm -nev -pVg -fZj -hnF -oqa -mEe -fVV -pVg -nev +aCM +nCx +amK +tJV +uRM +nVg +tfW +nCx +aCM kWm -hrp -dnA -fgt -ciS +pxK +dGA +uWl +dvD aSp -vAC -bgm -bSA -bSA -jfZ +wBr +acx +mZp +mZp +qMf pqb -ipL -kfE -akQ -ipL -kfE -akQ +fvk +qcB +jOp +fvk +qcB +jOp eNf trB pqb @@ -95757,7 +95248,7 @@ fLn xaU uBr pqb -rjY +fQO fID mVX mVX @@ -95789,41 +95280,41 @@ aXg aAL dzo dEE -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wix +wxH +wKR +xXv +xVm +xVm +xVm +aCe +xVm +xVm +gdD +prZ +kWH +xZc +mVX +mVX +mVX +mVX tYd mVX mVX mVX -icm -iOx -jnr -jVO -kob mVX mVX mVX -icm -iOx -jnr -jVO -kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -95941,8 +95432,8 @@ wUF tZe wUF onc -jNs -cHQ +wfo +xMC aOR nzW onc @@ -95950,19 +95441,19 @@ iwS iwS iwS iwS -oXZ +xws iwS iwS iwS iwS iwS -ecJ -ecJ +xSg +xSg xGH wUU wUU kNj -pMe +qbO iwS kWm kWm @@ -95978,20 +95469,20 @@ kWm nAN nAN nAN -ktw -hoq -eZG +qxd +reu +iPn nAN -lej -ihA +pTK +uEf nAN pqb -wFf +taC myp -gyi -wFf +gcZ +taC myp -gyi +gcZ eNf trB pqb @@ -96004,17 +95495,17 @@ pUR myp pUR cmf -wqx +ivr ipn ipn xaU bXH xaU bXH -dWI +pVX roU pqb -dkb +lPn fID mVX mVX @@ -96046,42 +95537,42 @@ azG aAL dzo dFv -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +xXv +xXv +xXv +xXv +xXv +xVm +lPB +xVm +xVm +tzz +xXv +xXv +xXv +mVX +mVX +mVX +mVX tYd mVX mVX -hLV -igh -iPF -jsZ -jXB -kps -dpg mVX -hLV -igh -lKy -jsZ -jXB -kps -dpg +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -96162,7 +95653,7 @@ mVX mVX iIs iIs -sPu +oKP fkh app xtI @@ -96198,19 +95689,19 @@ wUF tZe wUF mPM -dEK -dEK +pLN +pLN jWT yhH onc -pkP +bCw vES vES vES vES vES vES -yeq +egp fMQ fMQ fMQ @@ -96223,32 +95714,32 @@ fMQ fMQ fMQ fMQ -wmR -lxV -gFo -mcF +cAA +nLd +ccq +mSp nAN -hQX +wyk wrh -xpi +nnM fDY idI vxR nAN -bqR -mYP +wMU +apl nAN -ric -xLO -xLO +aPL +noY +noY csZ pqb -fYj +erD sSK -pZH -fYj +uPb +erD sSK -pZH +uPb xmb bje pqb @@ -96261,8 +95752,8 @@ dGN myp dGN yag -wqx -wqx +ivr +ivr ipn ipn ipn @@ -96271,7 +95762,7 @@ ipn ipn ipn pqb -oYW +quv fID aDl mVX @@ -96303,42 +95794,42 @@ azG aAL dzW qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +xXv +xVm +yai +xVm +xVm +nns +xXv +mVX +mVX +mVX +mVX +mVX +mVX tYd mVX mVX -hMy -ikC -iPL -jue -iPL -kru -kLh mVX -hMy -lhU -iPL -lTj -iPL -kru -kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -96455,30 +95946,30 @@ wUF tZe wUF onc -bDp -igZ +bdw +jdQ jWT jFM onc -rIw -jzp -sNt -sNt -sNt -sNt -sNt -cQX +qpP +rjF +ckU +ckU +ckU +ckU +ckU +jFA fMQ -dXk -dXk +eZg +eZg rgF rgF -awU -mnt +aFM +sVL rgF rgF -dXk -dXk +eZg +eZg fMQ hTD fAg @@ -96506,8 +95997,8 @@ pqb pqb pqb pqb -lla -lla +tHQ +tHQ pqb fJR fJR @@ -96518,9 +96009,9 @@ fJR myp fJR pAp -gMP -wqx -wqx +uYa +ivr +ivr ipn ipn ipn @@ -96528,7 +96019,7 @@ ipn ipn ipn pqb -rjY +fQO fID mVX mVX @@ -96560,42 +96051,42 @@ cMm cMm dBJ qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +xXv +mEm +mEm +ouJ +xVm +yin +tLj +vIN +iGc +xXv +mVX +mVX +mVX +mVX +mVX +mVX tYd mVX mVX -hMD -ikP -iPL -juD -iPL -ktf -kMQ mVX -hMD -ljz -iPL -juD -iPL -ktf -kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -96712,28 +96203,28 @@ oiy tZe sTV onc -mSE +hNK xPS ihM eNL onc -jCg -bLx -xed -xed -xed -aov -uue -xQc +cKK +tuh +xQz +xQz +xQz +xAD +eeG +prX fMQ vjq smL -dXk -hlk -dEW -dEW -tQg -dXk +eZg +fcv +cJL +cJL +maJ +eZg uqg uqg fMQ @@ -96757,12 +96248,12 @@ fAg fAg abk pqb -lhk -lhk -lhk -nnf -aPy -lXe +ssL +ssL +ssL +tWj +jaY +vdO ntW hsJ pqb @@ -96775,15 +96266,15 @@ myp myp myp eOl -wVY -wqx -wqx -wqx -wqx -wqx -axQ -fdP -xsd +bRL +ivr +ivr +ivr +ivr +ivr +sjx +mud +ssB pqb nAN nAN @@ -96817,42 +96308,42 @@ aJQ aJQ qZO qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +xXv +xXv +ugs +ugs +ouJ +xFI +ouJ +xXv +xXv +xXv +xXv +xXv +ouJ +xXv +xXv +xXv +mVX tYd mVX mVX -hOM -ild -iPL -jvb -iPL -kuJ -kNN mVX -hOM -lkD -iPL -lWT -iPL -kuJ -kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -96934,7 +96425,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD mVX @@ -96974,25 +96465,25 @@ xPS ihM ihM onc -rhT -bLx -cei -deM -gOb -rAB -ihc -wzC +nDz +tuh +sFp +ePz +rgg +adC +kIT +rOb fMQ -mLo -sGe +ccX +lVT ffV -hqH -dEW -dEW -daN -bpE -thQ -kSD +efE +cJL +cJL +oTY +oON +lTX +tOR fMQ wRu mzs @@ -97032,19 +96523,19 @@ jlp tqI qco cgU -wSS -wqx -wqx -wSS -wSS -wqx -bim -ksI +gYQ +ivr +ivr +gYQ +gYQ +ivr +mrg +kKp hwc pqb nAN nAN -dqe +eWS fID mVX mVX @@ -97074,42 +96565,42 @@ cYr aAL azG qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +xXv +ugs +xVm +xVm +xXv +xVm +vzo +xVm +pBK +leE +gWk +nbL +uQU +arg +uqH +xXv +xXv tYd mVX mVX -hQj -ilI -iTp -jxF -iTp -kvR -kOn mVX -hQj -ilI -iTp -jxF -iTp -kvR -kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -97231,47 +96722,47 @@ ihM ihM rag onc -sDN -bLx -cQO -cQO -cQO -xBq -uYX -kNH +xgK +tuh +gVO +gVO +gVO +bfH +kYb +vlW fMQ -dXk -dXk +eZg +eZg rgF rgF -awU -mnt +aFM +sVL rgF rgF -dXk -dXk +eZg +eZg fMQ -pFn -mVk -mVk -bYY +uEQ +rcK +rcK +hNX nAN -vVT -kYF -uox -ftv -vVT -tsO -uox +quG +txZ +jyR +rJF +quG +sVy +jyR nAN nAN nAN -kDB -ijf -ijf -wpg +qnP +hjL +hjL +tJJ pqb -fam +pxs vdf vdf hwc @@ -97290,18 +96781,18 @@ lLt lLt rqJ pqb -inv -ePf +mYM +gQl pqb pqb pqb pqb eEj -bmO -qfa -qfa +wGf +puM +puM nAN -toW +bMP fID aDl mVX @@ -97331,41 +96822,41 @@ aAL aAL aBj tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xTN +ctL +xVm +xVm +kKs +xXv +kKs +ouJ +xVm +xVm +xVm +xVm +xVm +uQU +bSe +xVm +rdn +xXv tYd mVX mVX mVX -imX -iVo -jAl -jYQ -kwr mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -97484,58 +96975,58 @@ onc onc onc jXe -gfq -uPQ +qkx +aVs kgA onc -jRu -sgp -iSK -iSK -iSK -iSK -iSK -coZ +aYp +ajM +hHa +hHa +hHa +hHa +hHa +mFU fMQ xqZ hRy -dXk -hTA -dEW -dEW -tQg -dXk +eZg +wWF +cJL +cJL +maJ +eZg bQi bQi fMQ -qPR -dIZ -dIZ -jWd -nAN -vVT -uEI -uox -swV -vVT -oaw -uox -lCr -qjY +bEW +omd +omd +ulG +nAN +quG +hQU +jyR +buY +quG +ebD +jyR +evD +cby eSL fDP fDP fDP fDP pqb -lhk -lhk -lhk -mBl +ssL +ssL +ssL +nEJ cFY eNf myp -oku +jzj pqb fJR fJR @@ -97550,15 +97041,15 @@ nAN nAN nAN nAN -vAq -emX +sLt +cjr nAN nAN nAN nAN -qfa +puM nAN -iYd +eaX fID mVX mVX @@ -97588,24 +97079,24 @@ aXg aAL dBZ qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xTN +wxI +kID +xVm +xVm +vzo +xVm +vzo +xVm +xVm +xVm +xVm +xVm +vzo +xVm +xVm +pwr +xXv tYd mVX mVX @@ -97711,7 +97202,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD mVX @@ -97754,21 +97245,21 @@ vES vES kHT fMQ -nTO -qmN +lYC +oCT haZ -rrD -dEW -dEW -iXL -pEA -kFL -wcC +bwb +cJL +cJL +xhT +fWh +uOw +eXq fMQ -frL -uUY -joJ -fll +iHz +khE +kyQ +dRu fMQ fMQ fMQ @@ -97780,19 +97271,19 @@ fMQ fMQ nAN nAN -kDB -ijf -ijf -wpg +qnP +hjL +hjL +tJJ pqb pqb pqb pqb pqb -oeV +erc rWg myp -hKG +rZk pqb grj myp @@ -97804,18 +97295,18 @@ nlT lLt oUm nAN -iEW -uJi -pql -gQT -gBL -ngB -cpK -fgM +jbd +dAl +jzh +hfl +xsU +ozS +wOD +sVH nAN -bkR +jWu nAN -dqe +eWS fID mVX mVX @@ -97845,41 +97336,41 @@ aAL aAL dCs tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xTN +jbt +xVm +xVm +xVm +xXv +kKs +ouJ +xVm +xVm +xVm +xVm +xVm +uQU +xVm +jLc +vLY +xXv tYd mVX mVX mVX -icm -iOx -jnr -jVO -kob mVX mVX mVX -icm -iOx -jnr -jVO -kob +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -98004,14 +97495,14 @@ mVX mVX iwS iwS -olu -olu -olu -olu -olu +tnc +tnc +tnc +tnc +tnc iwS fMQ -ngT +jiz aBX aBX aBX @@ -98020,7 +97511,7 @@ aBX aBX aBX aBX -gIc +oFz fMQ fMQ fMQ @@ -98029,27 +97520,27 @@ fMQ fMQ fMQ fMQ -rBA -hYC -gnk -gtm +tbo +eXN +adL +flX fMQ fMQ fMQ nAN sVW -iTF +wmC fAg kZY pqb brM -rQt +cWC vep -qJV +qfJ xmb hpD hpD -bRw +inI pqb pUR pUR @@ -98061,18 +97552,18 @@ uAi lLt fgx nAN -gzJ -sZc +nLN +sBk uZB -bkc -ccc -jOj -aHN -jVf +jdg +hxv +onE +lwX +qOP nAN mIC nAN -toW +bMP fID aDl mVX @@ -98102,42 +97593,42 @@ cYr aAL dCG tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +xXv +wNi +xVm +xVm +xXv +xVm +vzo +xVm +dTK +oJH +fxt +tKn +uQU +vxN +kbb +xXv +xXv tYd mVX mVX -hLV -igh -jbL -jsZ -jXB -kps -dpg mVX -hLV -igh -lKZ -jsZ -jXB -kps -dpg +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -98229,7 +97720,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD wLM ctv @@ -98268,10 +97759,10 @@ mVX mVX mVX hgc -cfr -iiU -dQu -djD +hJy +gsJ +uLw +bUs aBX aBX nVd @@ -98279,25 +97770,25 @@ qxt aBX kPi fMQ -otn -uVX -sJx -gMV +iky +kJd +hAd +ovI fMQ fMQ -lgD -qnr +lfP +eaT qQG oIb uOH -wDU -nuQ +qja +wch fMQ nNb mTv -kXQ +fPf fAg -daw +gZv pqb pqb pqb @@ -98306,7 +97797,7 @@ pqb fvx pIg hwc -lkr +hza pqb dGN dGN @@ -98318,18 +97809,18 @@ lLt lLt rxE nAN -gzJ -sZc -dbW -hBW -lYK -siz -aHN -jVf +nLN +sBk +tSE +qfj +pDH +con +lwX +qOP nAN qLC nAN -iYd +eaX fID mVX mVX @@ -98359,42 +97850,42 @@ aJQ aJQ tYd qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +xXv +xXv +wNi +wNi +ouJ +xFI +ouJ +xXv +xXv +xXv +xXv +xXv +ouJ +xXv +xXv +xXv +mVX tYd mVX mVX -hMy -inR -iPL -jKg -iPL -kru -kLh mVX -hMy -luo -iPL -lXp -iPL -kru -kLh +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -98428,10 +97919,10 @@ mVX mVX xPO bmm -mZS -mZS -mZS -mZS +kEk +kEk +kEk +kEk bmm bmm bmm @@ -98453,10 +97944,10 @@ bmm bmm bmm bmm -mZS -mZS -mZS -mZS +kEk +kEk +kEk +kEk bmm xPO mVX @@ -98502,14 +97993,14 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD jMD mVX mVX mVX -vGJ +ibs jMD jMD jMD @@ -98525,45 +98016,45 @@ mVX mVX jMD hgc -tDu -eLE -wgN -vpP +mYF +tHM +wxt +jQb aBX fsS qxt -txs +hLZ aBX -xOk +pJr fMQ -qnr +eaT uWf oFO -qnr +eaT fMQ -eec -qnr +vOC +eaT aBX pnQ rqg gBo aBX -cdq +mag fMQ -lqG +mwq mTv -pHG +arZ hOe -wZK +uho pqb -fcD -rQt +jBs +cWC ayr pqb vTR aeY hwc -fgQ +qyk pqb fJR fJR @@ -98575,14 +98066,14 @@ xCN fKl xas nAN -gzJ -iLM -tcz -nqF -sla -aYD -wNe -jVf +nLN +iED +qrg +tlT +fCV +ajU +tHy +qOP nAN iRq nAN @@ -98616,42 +98107,42 @@ cNW cNW dCI tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +xXv +xhz +xhz +ouJ +xVm +iqq +xVm +xVm +feW +xXv +mVX +mVX +mVX +mVX +mVX +mVX tYd mVX mVX -hMD -ioP -iPL -juD -iPL -kAj -kMQ mVX -hMD -lAn -iPL -juD -iPL -ktf -kMQ +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -98685,7 +98176,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -98713,7 +98204,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -98752,7 +98243,7 @@ ctv wLM mVX mVX -vGJ +ibs jMD jMD jMD @@ -98773,7 +98264,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD jMD @@ -98782,34 +98273,34 @@ jMD jMD jMD hgc -dnJ -eLE -wgN -vpP +ykf +tHM +wxt +jQb aBX sOT llm -gqn +mRR aBX -qFJ +jBV fMQ -eqL -aeH -njL -qnr +kgw +vHu +lhv +eaT uFO -qnr -qnr +eaT +eaT aBX -vZW -vkL -mBF +lto +vIY +quT aBX -dMn +eFf fMQ -maH +sYM mTv -vyx +bIE kZY nAN nAN @@ -98835,8 +98326,8 @@ nAN nAN nAN nAN -dbW -siz +tSE +con nAN nAN nAN @@ -98873,42 +98364,42 @@ azG aAL dzW qZO -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +xXv +xVm +iHB +xVm +xVm +xVm +xXv +mVX +mVX +mVX +mVX +mVX +mVX tYd mVX mVX -hOM -ipu -iPL -jLP -iPL -kuJ -kNN mVX -hOM -lAo -iPL -lYV -iPL -kuJ -kNN +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -98942,7 +98433,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -98970,7 +98461,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -99000,7 +98491,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD wLM ctv @@ -99039,68 +98530,68 @@ mVX mVX mVX hgc -fiE -del -bQo -vlu -qty +sph +jtj +rDy +trm +xKM aBX qxt qxt aBX aBX uFO -qnr +eaT qUq uUr -qnr +eaT fMQ -sxr -qnr +lRs +eaT aBX -jsR -pYU -cFR +mEh +rLc +kxb aBX -xEY +lIy fMQ -pvl +bfa mTv -uEg +ilv kZY nAN qTB nIR qTB nAN -kVQ +pgu qTB nIR qTB -kVQ -nAN -vRQ -kyK -vGS -foL -cAw -xbJ -nqn -oUC -rZE -yim -hlh +pgu +nAN +xUz +kTQ +bNp +iXk +wyB +ocO +jYV +abn +bDa +asJ +uTC fDP -xDT -tcz -aYD -pql -nRi -gup +ifB +qrg +ajU +jzh +ndF +rey nAN -mXF +myL nAN -dqe +eWS fID mVX mVX @@ -99130,42 +98621,42 @@ azG aAL dzo dFv -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +xXv +xXv +xXv +xXv +xXv +xVm +mET +dGr +xVm +wod +xXv +xXv +xXv +mVX +mVX +mVX +mVX tYd mVX mVX -hQj -ilI -iTp -jxF -iTp -kvR -kOn mVX -hQj -ilI -iTp -jxF -iTp -kvR -kOn +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -99199,7 +98690,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -99227,7 +98718,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -99296,7 +98787,7 @@ onc onc onc fMQ -hMu +bZj aBX aBX aBX @@ -99305,30 +98796,30 @@ aBX aBX aBX aBX -oKz +mKh fMQ -avR -jTN -dji -fTc +qAL +hLH +jLd +lFt fMQ fMQ -qJi +pir aBX -fIN -hlM -fIN +vSE +sZB +vSE aBX -jsJ +fBW fMQ nNb mTv -aKm -hIl -qif +ksN +aOA +ncA rIb rIb -tMs +jTW nAN iUt iUt @@ -99336,28 +98827,28 @@ iUt iUt iUt dVa -gsK -rZE -rZE -rZE -rZE -rZE -rZE -pGF -sMC -xCh -ncc +qFk +bDa +bDa +bDa +bDa +bDa +bDa +fvp +hNa +oBW +oOk fDP -lZF -xDT -pql -hLw -jBZ -pXH -hSO -iiA -nAN -toW +jMK +ifB +jzh +qWa +xFY +vPx +kwn +dSN +nAN +bMP fID aDl mVX @@ -99387,41 +98878,41 @@ aXg aAL dzo dEE -dMT -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +rbv +oMz +wXb +xXv +xVm +xVm +xVm +lAO +xVm +xVm +mdw +sVi +kWH +eTw +mVX +mVX +mVX +mVX tYd mVX mVX mVX -imX -iVo -jAl -jYQ -kwr mVX mVX mVX -imX -iVo -jAl -jYQ -kwr +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -99510,7 +99001,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD mVX @@ -99553,16 +99044,16 @@ onc onc onc fMQ -xsn -qrm -qEZ -kXm -qAe -qAe -qCq -fFC -oiP -leF +ckb +oso +mze +vui +eed +eed +fBJ +kuA +uEE +tpU fMQ fMQ fMQ @@ -99570,19 +99061,19 @@ fMQ fMQ fMQ fMQ -dix +vza aBX aBX aBX aBX aBX -bEx +mRX fMQ fMQ sVW fAg moU -pqC +nIn fAg fAg fAg @@ -99593,28 +99084,28 @@ iUt eeU eeU dVa -wXu -hux -sMC -vjG -vjG -vjG -sMC -sMC -ntN -bki -nqT +fls +leC +hNa +sZy +sZy +sZy +hNa +hNa +ncv +ydH +gMj fDP -sjr -dyH +vng +uzs pgs -jWN -vzz -pOT +sJw +pcr +mdV nAN -juc +hUD nAN -iYd +eaX fID mVX mVX @@ -99644,24 +99135,24 @@ azG aAL dzW tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +wBe +wFV +xjY +xVm +xAd +xVm +xVm +xVm +xVm +uqw +prZ +kWH +xZc +mVX +mVX +mVX +mVX tYd mVX mVX @@ -99807,42 +99298,42 @@ qlC qlC jkY guv -fvs -fvs +uRC +uRC fMQ tVL vIj -tPD -eZp -qAe -qAe -beu -tPD +eKv +jcM +eed +eed +txL +eKv veQ veQ fMQ -oWj -wPe -qOR -lza +cTj +boQ +pMq +nTY fMQ -eJc -tGc -mYX +xmI +aMV +mjE aBX -aGt +dYT aBX -tGc -mYX -eJc +aMV +mjE +xmI fMQ -kDB -ijf -wpg +qnP +hjL +tJJ nAN -hJg -xzN -xWg +uoZ +ebR +aHU nAN gqv gqv @@ -99851,27 +99342,27 @@ gqv gqv nAN wYx -hON -sMC -vjG -vjG -vjG -sMC -ntN -jkH +aoS +hNa +sZy +sZy +sZy +hNa +ncv +grD nAN nAN nAN -dyH +uzs wwK -jSE +fVl pgs nAN nAN nAN nAN nAN -dqe +eWS fID mVX mVX @@ -99901,24 +99392,24 @@ cYN aAL dCY tYd -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xXv +wBy +xXv +xXv +xXv +ouJ +xhz +xhz +xhz +ouJ +xXv +xXv +xXv +xXv +mVX +mVX +mVX +mVX tYd mVX mVX @@ -100065,37 +99556,37 @@ mKB mbd mFe onc -fvs +uRC fMQ -tPD -tPD +eKv +eKv rgF rgF -awU -mnt +aFM +sVL rgF rgF -tPD -tPD +eKv +eKv fMQ -qPR -dIZ -dIZ -jWd +bEW +omd +omd +ulG fMQ -pDR -vmF -uqQ +xhn +oks +ovk aBX -aZw +iLs aBX -dZK -jRY -hHW +jgg +dgp +pxy fMQ fDP fDP -vNA +epo nAN nAN nAN @@ -100107,28 +99598,28 @@ nAN nAN nAN nAN -eBK -hON -ntN -bki -bki -bki -hux -ncc -hXc -nAN -sqO -wSQ +shp +aoS +ncv +ydH +ydH +ydH +leC +oOk +dGL +nAN +rjw +vRV wwK -bkc -ccc -jSE -pEE -gcn +jdg +hxv +fVl +lcU +mhA nAN nAN nAN -toW +bMP fID aDl mVX @@ -100275,7 +99766,7 @@ mVX mVX mVX mVX -vGJ +ibs jMD jMD mVX @@ -100320,43 +99811,43 @@ kqe tNZ osE mbd -ewR +aOd onc -fvs +uRC fMQ -hEl -owz -bKu -oXC -qAe -qAe -cVk -krW +mqo +ptV +atQ +miN +eed +eed +lNL +khg rgF qHm fMQ -pFn -mVk -mVk -hpN +uEQ +rcK +rcK +rLA fMQ -xkp -vMl -aix +oOQ +ctk +fgL aBX rVg aBX -xfP -cvq -hsk +ddG +pnZ +pwF fMQ -kDB -ijf -wpg +qnP +hjL +tJJ nAN -htg -pIR -kEs +jDr +vxF +wSE nAN qTB qTB @@ -100364,28 +99855,28 @@ nIR qTB qTB nAN -eRm -hON -ncc -xKK -wym -rGZ -hON -ncc -pdi -nAN -sqO -wSQ -qsV -hBW -lYK -xIN -pEE -jUq +iha +aoS +oOk +eTm +sYS +tHm +aoS +oOk +nUf +nAN +rjw +vRV +xXq +qfj +pDH +knX +lcU +lsj nAN nAN nAN -iYd +eaX mVX mVX mVX @@ -100579,64 +100070,64 @@ jdj mbd uda onc -fvs +uRC fMQ oDu rLk -tPD -eZp -qAe -qAe -beu -tPD -unB -unB +eKv +jcM +eed +eed +txL +eKv +ppl +ppl fMQ qFV qto qto -nuh +ikI fMQ -mbS -nJB -iet +lfD +lle +lAd aBX -aGt +dYT aBX -ylh -unM -vRJ +jxo +adZ +wJI fMQ hTD fAg moU -rTH +dEr fAg fAg fAg nAN -lsv +lUK ism ism ism ism xeR -gsK -pGF -ncc -whw -fLB -gNC -hON -ncc -xeK +qFk +fvp +oOk +vtw +mFD +gCw +aoS +oOk +nyy nAN nAN nAN -xDT -tcz -aYD -pql +ifB +qrg +ajU +jzh nAN nAN nAN @@ -100658,20 +100149,20 @@ mVX "} (187,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +wmt +wmt +uyn +uyn +uyn +uyn +wmt +wmt +mVX +mVX +mVX fCq eaV eaV @@ -100834,70 +100325,70 @@ smT ayw ayw vvD -pTc -fvs -fvs +cUN +uRC +uRC fMQ -tPD -tPD +eKv +eKv rgF rgF -awU -mnt +aFM +sVL rgF rgF -tPD -tPD +eKv +eKv fMQ hTD fAg fAg -dAz +uJy fMQ fMQ -rNJ -qnr +tGe +eaT aBX -aZw +iLs aBX -qnr -rNJ +eaT +tGe fMQ fMQ hTD fAg -cAb -rTH +jkL +dEr rIb rIb -tMs +jTW nAN -lsv +lUK ism ism ism ism xeR -wXu -hux -ncc -whw -nwb -gNC -hON -ncc -lln -nAN -pDr -tqY -kcl -xDT -pql -qMO -fnF -svw -nAN -dqe +fls +leC +oOk +vtw +rQZ +gCw +aoS +oOk +uCb +nAN +nnW +pwb +yep +ifB +jzh +pBp +qsa +fdZ +nAN +eWS fID mVX mVX @@ -100915,20 +100406,20 @@ mVX "} (188,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +wmt +uyn +wmt +wmt +lgc +otE +rft +gJj +wmt +wmt +uyn +wmt +mVX fCq eaV eaV @@ -101092,7 +100583,7 @@ oWo kfj nCt onc -fvs +uRC onc fMQ fMQ @@ -101115,7 +100606,7 @@ fMQ fMQ fMQ ugS -sCX +bvK ugS fMQ fMQ @@ -101135,26 +100626,26 @@ ftP gqv pSN nAN -pPC -wXu -dvj -whw -fLB -gNC -wXu -dvj -jvJ -nAN -pDr -tqY -sjr -dyH +pFW +fls +qCI +vtw +mFD +gCw +fls +qCI +azd +nAN +nnW +pwb +vng +uzs pgs -jZY -fnF -xaL +tLa +qsa +pUX nAN -toW +bMP fID aDl mVX @@ -101172,20 +100663,20 @@ mVX "} (189,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +xjR +gKi +gKi +hHU +riz +kgE +kPS +riz +hHU +gKi +gKi +tTX +mVX fCq eaV eaV @@ -101269,7 +100760,7 @@ bmm bmm bmm bmm -eGO +dTR bmm bmm bmm @@ -101353,7 +100844,7 @@ onc onc onc onc -ric +aPL qgi qto qto @@ -101393,25 +100884,25 @@ nAN nAN nAN nAN -glZ -sKX +bLr +pnL shl shl shl -glZ -sKX +bLr +pnL nAN nAN nAN nAN -eNX -pql -xDT -kWq +rwv +jzh +ifB +ibQ nAN nAN nAN -iYd +eaX fID mVX mVX @@ -101429,20 +100920,20 @@ mVX "} (190,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +xjR +adM +kUi +wmt +iSZ +mtw +kVb +lzD +wmt +kUi +adM +tTX +mVX fCq eaV eaV @@ -101525,9 +101016,9 @@ bmm bmm bmm bmm -eGO -eGO -eGO +dTR +dTR +dTR bmm bmm bmm @@ -101600,16 +101091,16 @@ gdt avP feT aZv -ffS -wMB -dZu +bGO +fDV +qtP alG -uoM -xRq -kcz +hat +cKF +hnX qsO myG -esm +kTd mTv fAg fAg @@ -101641,15 +101132,15 @@ sYW qgi csZ hmX -fpV -iRV -rpJ -vLU -oQb -pyd -nAN -uEk -ikf +hqZ +raf +gsj +nbP +xLE +itf +nAN +aiQ +lqC qto qto qgi @@ -101657,18 +101148,18 @@ qgi qgi qto qto -mcF -nAN -aFX -aLe -pql -bkc -ccc -xDT -fuY -iJG -nAN -dqe +mSp +nAN +pXf +dqf +jzh +jdg +hxv +ifB +krh +wWh +nAN +eWS fID mVX mVX @@ -101686,20 +101177,20 @@ mVX "} (191,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wmt +wJV +wmt +wJV +wmt +jqj +wJV +wJV +jqj +wmt +wJV +wmt +wJV +wmt fCq eaV eaV @@ -101781,11 +101272,11 @@ bmm bmm bmm bmm -koc -koc -eGO -eGO -eGO +oJP +oJP +dTR +dTR +dTR bmm bmm bmm @@ -101817,27 +101308,27 @@ iIs iIs lvT fkh -nDI +pHc gnD skw rLO fIJ fkh fkh -pkz +glE fkh fkh bfx rLO iIs -dAk +mDq pOv iIs tqy rpk sfl onc -hfq +uBh sAi tWd jEu @@ -101858,15 +101349,15 @@ bBI eNm ePS ePS -bTd -dZu +xJZ +qtP bXp -nyg -bxi -way +vlQ +dcc +hTU koH myG -ltb +hLq mTv fAg fAg @@ -101898,14 +101389,14 @@ fAg fAg kZY hmX -tsa +yef oIc oIc oIc oIc -iIu +qKp nAN -wfE +rPH hTD fAg fAg @@ -101916,16 +101407,16 @@ fAg fAg abk nAN -aFX -wQA +pXf +ldS uZB -tQy -trn -jOj -pAt -iJG +sEU +mPi +onE +fim +wWh nAN -toW +bMP fID aDl mVX @@ -101943,20 +101434,20 @@ mVX "} (192,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wmt +eDO +qti +hHU +riz +riz +alM +bjJ +riz +riz +hHU +qti +kws +wmt fCq eaV eaV @@ -102037,13 +101528,13 @@ bmm bmm bmm bmm -koc -koc -koc -fli -eGO -eGO -eGO +oJP +oJP +oJP +cjk +dTR +dTR +dTR bmm bmm bmm @@ -102087,9 +101578,9 @@ fkh fkh rLO iIs -ogL +xTc nVN -nqj +hFX tqy rpk sfl @@ -102126,7 +101617,7 @@ iwS iwS wRu mzs -fOg +uJn hHu gvy hHu @@ -102155,12 +101646,12 @@ jJS fAg kZY hmX -lFb -uyV +nEQ +alR oIc oIc oIc -ddN +fJQ nAN efU cFn @@ -102173,16 +101664,16 @@ jJS fAg vRW nAN -aFX -cka -tcz -hBW -lYK -aYD -vQJ -iJG +pXf +oTI +qrg +qfj +pDH +ajU +xAy +wWh nAN -iYd +eaX fID mVX mVX @@ -102200,20 +101691,20 @@ mVX "} (193,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wmt +jcs +vHj +wJV +qjX +mHL +mpN +mpN +qZj +vja +wJV +vHj +eDO +wmt fCq eaV eaV @@ -102295,11 +101786,11 @@ bmm bmm bmm bmm -koc -koc -koc -koc -eGO +oJP +oJP +oJP +oJP +dTR bmm bmm bmm @@ -102382,8 +101873,8 @@ lYZ lYZ gFS fAg -bnd -sSh +bXG +anK nAN nAN nAN @@ -102398,48 +101889,48 @@ nAN nAN nAN nAN -oFR +fXY fQU fQU jed xPf fQU fQU -wUp -sLJ +wAL +kAW nAN fDP fDP fDP hmX -okK -reE -eDP +vVB +ngL +xCW oIc oIc -bGt +xTM nAN -bcs -bcs +bjP +bjP wYx fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv fAg -xCZ +aAP nAN nAN nAN -lDf -tcz -aYD -gLW +mCa +qrg +ajU +rck nAN nAN nAN -dqe +eWS fID mVX mVX @@ -102457,20 +101948,20 @@ mVX "} (194,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wJV +eYE +jqj +wJV +iJi +lcs +khG +khG +fsf +nfO +wJV +jqj +njE +wJV fCq eaV eaV @@ -102553,9 +102044,9 @@ bmm bmm bmm bmm -eGO -eGO -koc +dTR +dTR +oJP bmm bmm bmm @@ -102601,7 +102092,7 @@ rLO rLO rLO iIs -dAk +mDq pOv iIs tqy @@ -102627,7 +102118,7 @@ onc eol kAE tak -sbQ +dhe nxD rny iwS @@ -102639,21 +102130,21 @@ ueh udI afP afP -cLz -gHl +uah +qqU afP -fTL -iRw -hIL -xNi -uby -mZl -wil -wmd -vcv -cMn -nAN -hyL +rFp +fpZ +nzx +eKh +cxl +dMM +vcO +hZa +vvt +wTk +nAN +tBT oIc oIc oIc @@ -102662,41 +102153,41 @@ oIc uOf uOf oIc -inL -iDy -lig +mjR +vXs +xgt hTD fAg kZY nAN -gUA -tlH -lkI +cNy +nfR +pWS oIc oIc -apZ -iRV -hpY -bcs -odr +eCT +raf +rIY +bjP +mOZ fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv -nVB +wvZ kZY nAN -beG -kHx -cfq -jSE +qJz +lun +sAd +fVl wwK -hLw -xDT -vIe +qWa +ifB +oaa nAN -toW +bMP fID aDl mVX @@ -102714,20 +102205,20 @@ mVX "} (195,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wJV +vHj +vHj +hHU +itv +ssr +hlv +hlv +snA +mcM +hHU +vHj +vHj +wJV fCq eaV eaV @@ -102811,7 +102302,7 @@ bmm bmm bmm bmm -eGO +dTR bmm bmm bmm @@ -102858,7 +102349,7 @@ dZA phM skw iIs -vgD +mvM nVN wsP tqy @@ -102896,37 +102387,37 @@ gHS pbe afP lzS -uLN +irS pAe afP -eoJ +wqy xOe xOe xOe xsw xOe -hxB +xHl oIc oIc hIB nAN -rbm +uVd oIc oIc -usq +uqY uOf uOf -rnJ -kYt +bpI +wmP uOf oIc -rYi -hnD +uHe +hoc hTD fAg kZY hmX -sBS +cJg oIc oIc oIc @@ -102934,26 +102425,26 @@ oIc oIc oIc oIc -qff -odr +kkr +mOZ fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv -dwn +xCu sYW -gcp -tcz -iYs -iYs -dyH +cuu +qrg +sub +sub +uzs pgs -pCj -aYD -ioy +dCD +ajU +clC nAN -iYd +eaX fID mVX mVX @@ -102971,20 +102462,20 @@ mVX "} (196,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xjR +cKw +vHj +wJV +mBE +bur +riz +riz +lzZ +mBE +wJV +vHj +cKw +tTX fCq eaV eaV @@ -103106,7 +102597,7 @@ qwy fkh skw nfF -dqR +hBl nfF jfM fkh @@ -103156,7 +102647,7 @@ lzS gbo xhN afP -pAg +vYC skz xOe xOe @@ -103169,20 +102660,20 @@ oIc kDg oIc oIc -xvv -kYt -kYt -kYt -usq -omf -kYt +lHw +wmP +wmP +wmP +uqY +toL +wmP nBX -alU -iXH +sgi +vIU hTD fAg moU -pys +bfQ oIc oIc oIc @@ -103190,27 +102681,27 @@ oIc oIc oIc oIc -jSF -dcf -odr +vSC +nBl +mOZ fAg fAg fAg fAg mTv -ezh -sxS -sOq -goy -cBR -cBR -cBR -cBR -cBR -oVq -dEQ -nAN -dqe +uvw +uJV +oAH +nvm +xFZ +xFZ +xFZ +xFZ +xFZ +nFx +bVg +nAN +eWS fID mVX mVX @@ -103228,20 +102719,20 @@ mVX "} (197,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xjR +rDm +gTs +wmt +wmt +vgd +wnA +wnA +xcN +wmt +wmt +mYE +jxr +tTX fCq eaV eaV @@ -103357,7 +102848,7 @@ mVX wLM kiX gdL -hMa +obT gdL qwy fkh @@ -103410,36 +102901,36 @@ uab afP afP afP -xmf -qvu +iLM +mqL afP -yhf +sHn xOe xOe xOe xOe xOe -jCG +ubx oIc oIc hIB nAN -oSr +uQg oIc oIc -rQc +jUQ rkN rkN -rnJ -kYt +bpI +wmP rkN oIc -rYi -uhi +uHe +eSd hTD fAg kZY -bOG +hsG oIc oIc oIc @@ -103448,26 +102939,26 @@ oIc oIc oIc oIc -clw -odr +dyN +mOZ fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv -tuL +wsY hOe -nuF -vHQ -bMS -bMS -mIN -itN +npl +tNz +pZY +pZY +eFF +njW mcg -wgo -wYk +mSG +cWR nAN -toW +bMP fID aDl mVX @@ -103485,20 +102976,20 @@ mVX "} (198,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +xjR +uMn +vHj +wJV +mBE +xvt +xss +xss +xvt +mBE +wJV +vHj +uMn +tTX fCq fCq jrL @@ -103660,28 +103151,28 @@ iOH mYH vdY afP -crA -wnu -tZi -qBD -pPK -oiM -odn -uLN +lJl +bRu +dnE +vwh +oCD +xea +vem +irS pAe afP -fTL -hPz -xVI -kro -xga -hjf -bEk -uGG -wWk -gHi -nAN -esy +rFp +iNI +jBK +uCT +pDE +hSv +oTM +nYX +itg +dAP +nAN +fLa oIc oIc oIc @@ -103690,41 +103181,41 @@ oIc rkN rkN oIc -kpQ -gri -wJr +tto +wlW +daB hTD fAg kZY nAN -wCq -kYP -ufK +igY +vNv +nBb oIc oIc -grH -rEn -oKE -rWG -odr +qsJ +wAs +ooy +tmQ +mOZ fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv -bYI +oXE kZY nAN -eTs -vSp -hJN -hPR -rTJ +rSU +bfo +lhS +xin +goI rZo -mSi -cxL +vFy +nIL nAN -iYd +eaX fID mVX mVX @@ -103742,20 +103233,20 @@ mVX "} (199,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wJV +tFk +vHj +hIt +riz +iTh +knt +knt +jSC +riz +mGD +vHj +nxK +wJV dRc ecn jrL @@ -103917,13 +103408,13 @@ wUF wzu lGB afP -dpe -joV -joV -usb -mfB -tWr -odn +tRk +nBB +nBB +lCT +jAW +rhn +vem gbo xhN afP @@ -103940,44 +103431,44 @@ afP afP afP nAN -aFB +avx wEo wEo mnX ixP wEo wEo -ljT -bqy +lNv +aAr nAN fDP fDP fDP hmX -jjT -fmI -weS +fND +jzi +kRn oIc oIc -fVC +lpI nAN -rWG -rWG -eRm +tmQ +tmQ +iha fAg -eyf -eyf -eyf +rNd +rNd +rNd mTv fAg -xCZ +aAP nAN nAN nAN -kFY -vHQ -wgo -xSW +xqp +tNz +mSG +vik nAN nAN nAN @@ -103999,20 +103490,20 @@ mVX "} (200,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wJV +oEu +hcJ +wJV +iuu +iWu +xEv +xEv +lBU +mqy +wJV +oEu +hcJ +wJV dRc eeh jrL @@ -104174,22 +103665,22 @@ wUF iGX rhx afP -fzu -oeq -oeq -jNW +oKH +txJ +txJ +smB afP afP afP -dec +rDd pAe -uJF -cpd -jUd -rOj -sqD +dqo +tSV +wLt +xyc +wNL eFN -hOx +rFC lzS lzS afP @@ -104197,7 +103688,7 @@ lzS lzS afP nNb -ric +aPL qgi qgi qto @@ -104211,15 +103702,15 @@ oWu fAg kZY hmX -obp -lpU +fUj +edZ oIc oIc oIc oIc -sHb +apH mUH -ric +aPL qto qto qto @@ -104227,16 +103718,16 @@ qto qto oWu fAg -kvb +kub nAN -bgN -rzO -vHQ -bkc -ccc -wgo -rLX -xPc +fJn +dGB +tNz +jdg +hxv +mSG +cYV +cqv nAN nAN nAN @@ -104256,20 +103747,20 @@ mVX "} (201,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +wmt +ghb +hfa +wmt +ixL +jzk +riz +riz +lBX +mto +wmt +ghb +hfa +wmt dRc egu jrL @@ -104421,7 +103912,7 @@ eji lgv lnp onc -wbJ +vyL yly onc kAE @@ -104431,12 +103922,12 @@ poA cNn vqX afP -kKG -owg -wkl -jWv +xzg +xgh +kZA +jHf afP -vsi +jhY scN pej ona @@ -104448,12 +103939,12 @@ rgL rgL rgL rgL -coX -pKM +rnH +jGt rgL -coX -rLT -mpv +rnH +mDL +fEe mTv fAg fAg @@ -104468,13 +103959,13 @@ fAg fAg kZY hmX -mER +pBA oIc oIc oIc oIc oIc -sHb +apH mUH hTD fAg @@ -104486,14 +103977,14 @@ fAg fAg abk nAN -bgN -bpN -fDT -tQy -trn +fJn +qkU +sqZ +sEU +mPi blT -gTa -xPc +obc +cqv nAN nAN nAN @@ -104513,20 +104004,20 @@ mVX "} (202,1,1) = {" fCq -eWA -eWA -eWA -eWA -eWA -eWA -eWA -cgx -eWA -eWA -eWA -eWA -eWA -eWA +mVX +gtx +gtx +wJV +wmt +wmt +kuU +kRw +wmt +wmt +wJV +gtx +gtx +mVX dRc egF jrL @@ -104558,7 +104049,7 @@ kRq jlR iuf cjS -cqN +xpw mal mal muA @@ -104688,12 +104179,12 @@ onc onc onc afP -dNs -erX -uLB -gSb +fpg +mxz +kgx +rhO afP -smf +aDh gbo fon srE @@ -104705,12 +104196,12 @@ ifZ ifZ ofy fon -jCz -jgl -fqL -eiV -mMp -aWp +gFZ +kJF +yeh +kHQ +wOy +xZt wRu gvy hHu @@ -104725,32 +104216,32 @@ jJS fAg kZY hmX -tvU -cVv -gmY -rJz -rbV -pmr -nAN -vEG -rpP +aWz +lvI +drr +fnT +kPa +ewE +nAN +nug +ugQ hHu mzs -gSz +iIo mzs hHu hHu -ffZ -bOU +mGx +tEV nAN -bgN -bpS -dwI -hBW -lYK -mSi -crc -xPc +fJn +hYY +xkB +qfj +pDH +vFy +lWt +cqv nAN nAN nAN @@ -104853,7 +104344,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -104881,7 +104372,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -104945,21 +104436,21 @@ iOH mYH vdY afP -tFD -dpG -dpG -oVy +eyj +kWB +kWB +ffA afP -gKt +fyy gbo fon jHX -bOX -kIU +dCm +bbv wtL -ciU -jHJ -oVx +rNB +mWR +biy gbo srE tgA @@ -104978,12 +104469,12 @@ nAN nAN nAN nAN -dIU -pZL -gog +tRX +xoJ +kom nAN nAN -lSK +mpt nAN nAN nAN @@ -104992,9 +104483,9 @@ nAN nAN nAN nAN -rcp -rcp -rcp +vhP +vhP +vhP nAN nAN nAN @@ -105002,10 +104493,10 @@ nAN nAN nAN nAN -vcp -dwI -mSi -pYa +trp +xkB +vFy +hoD nAN nAN nAN @@ -105110,7 +104601,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -105138,7 +104629,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -105163,8 +104654,8 @@ kiX mgC gdL gdL -bqo -dYs +jyS +mMf gpF gdL qBE @@ -105202,72 +104693,72 @@ wUF rhx lGB afP -qOr -adO -adO -dSN +igz +pSw +pSw +ocf afP -eYa +nQW gbo kBa jHX gOI -fkt -kbJ -tHC -wWT -hSk +unl +gNS +gce +jYq +ljo gbo jHX -pnv +hIg cxA nAN -abg +kfl ycb eZR -tWD -wlz +ovR +oeU nAN hTD kZY nAN -rAp -twa -aUo +agb +naI +wRW nAN hTD fAg moU -kXu -adl +nDM +gjn nAN -rsB +rky cBr -pHk +ePR cBr -jDH +fvF nAN -mSP +tso qgi qto qto qto fAg -qYU -kHg -iGP +tAj +ntN +kzT nAN -oEt -seQ +oGQ +dXl hsZ -mIN -itN -gYD +eFF +njW +nsM hvs -fLG +jbY nAN nAN -vpe +jzx nAN nAN mVX @@ -105367,7 +104858,7 @@ mVX mVX xPO bmm -mZS +kEk bmm bmm bmm @@ -105395,7 +104886,7 @@ bmm bmm bmm bmm -mZS +kEk bmm xPO mVX @@ -105451,7 +104942,7 @@ wzu onc aUY sAI -vhh +dMq kAE tak xSv @@ -105459,12 +104950,12 @@ wUF wzu wzu afP -oja -gPi -gPi -tUJ +ePq +xqh +xqh +esL afP -iYp +rvV gbo fon ona @@ -105477,10 +104968,10 @@ rgL pej ona chG -vWv +hnc nAN -qop -guE +nCb +kgD dEb dEb fAg @@ -105488,40 +104979,40 @@ nAN hTD kZY nAN -ewU +rSk fAg -sWY +nZr nAN hTD fAg moU -kXu -adl +nDM +gjn nAN -ulL -ric +pNy +aPL qgi csZ gct nAN -xSt +xRh fAg fAg fAg fAg fAg -bhp -mNz -iGP -nAN -oEt -seQ -xix -mSi -dwI +chS +tig +kzT +nAN +oGQ +dXl +dIb +vFy +xkB rZo hvs -xjB +vCo nAN nAN uxZ @@ -105624,10 +105115,10 @@ mVX mVX xPO bmm -mZS -mZS -mZS -mZS +kEk +kEk +kEk +kEk bmm bmm bmm @@ -105649,10 +105140,10 @@ bmm bmm bmm bmm -mZS -mZS -mZS -mZS +kEk +kEk +kEk +kEk bmm xPO mVX @@ -105695,7 +105186,7 @@ aZX isw hQx aZX -coB +kic xbI onc frx @@ -105706,7 +105197,7 @@ poA cNn vqX onc -jop +tha oqC onc kAE @@ -105716,44 +105207,44 @@ poA mAw vqX afP -laj -iUX -iUX -pga +eUo +vOU +vOU +lur afP -rDB +lLE aWc -cvR +dOj ifZ ofy srE -fqL -qix -fqL -fqL -fqL -pse +yeh +jlH +yeh +yeh +yeh +oLW tgA tyO nAN -fHI -ePO -qon +oPU +fjj +apC fAg fAg -ggB -jTJ +cWM +aCC abk nAN -gLD +pFy fAg moU -aat +nZM mTv fAg moU -kXu -kgF +nDM +omz nAN jej hTD @@ -105761,24 +105252,24 @@ fAg kZY gct nAN -xtU +gFG jJS -bkc -bZC -ccc +jdg +uZt +hxv fAg -bhp -cAo -iGP +chS +uLr +kzT nAN nAN nAN -mSi -vHQ -wgo -dwI +vFy +tNz +mSG +xkB hvs -vdV +mNK nAN nAN dRV @@ -105973,23 +105464,23 @@ onc onc onc afP -ixR -gFQ -gFQ -rRQ +cZc +qOk +qOk +kNk afP afP -pji -klp -ram -rWx -fVm +esb +rzx +oDS +pzN +kRE afP afP afP afP afP -xom +cxI afP afP nAN @@ -105998,42 +105489,42 @@ fAg fAg fAg fAg -ggB +cWM mTv kZY nAN -ewU +rSk fAg -kqc +eBC nAN -udF +dBk fAg moU -kXu -foB +nDM +oRk nAN -acu +bKz hTD fAg kZY -wbd +gXI nAN -jBQ +iDG hTD -tQy -dUp -trn +sEU +bdB +mPi fAg -evN +ftT nAN nAN nAN -tYP -cgX -fBu -bkc -ccc -lgN +jdl +ljf +sqP +jdg +hxv +bZw nAN nAN nAN @@ -106182,7 +105673,7 @@ mVX wLM rUx hOr -nDI +pHc fkh fkh fkh @@ -106238,17 +105729,17 @@ afP afP afP afP -anJ +tBG gbo xhN afP -eWA -eWA -eWA +lJU +lJU +lJU eWA qtk eWA -eWA +lJU nAN fAg fAg @@ -106259,44 +105750,44 @@ nAN hTD kZY nAN -uRq -clv -lLd +ejF +gtH +sbW nAN hTD fAg moU -kXu -adl +nDM +gjn nAN -acu +bKz hTD fAg sYW qgi -oIN +cBt qFV oWu -tQy -dUp -trn +sEU +bdB +mPi fAg -bhp -cAo -iGP +chS +uLr +kzT nAN -cjN -cgX -rTJ -hBW -lYK -hPR -xkj -rOc +fCZ +ljf +goI +qfj +pDH +xin +tSk +uoR nAN nAN nAN -gpY +lJk fID hne mVX @@ -106447,7 +105938,7 @@ rLr mlk gdL xKz -xol +tkP lus gpF xKz @@ -106487,34 +105978,34 @@ ePS njZ onc afP -fID -fID -fID -fID -fID -fID -fID -afP -anJ -rWx -fVm +sbw +sbw +sbw +sbw +sbw +sbw +sbw ecV -eWA -eWA -eWA -eWA -eWA -eWA -eWA +tBG +pzN +kRE +ecV +lJU +jzc +oFJ +qUi +cVJ +mbb +lJU nAN -pci +qoC xxx nNb vad -pci +qoC nAN -bgL -hsP +pUz +vPy nAN nAN nAN @@ -106523,37 +106014,37 @@ nAN sVW fAg moU -kXu -adl +nDM +gjn nAN -acu +bKz hTD fAg fAg fAg -oWv +mnL mTv fAg -tQy -dUp -trn +sEU +bdB +mPi fAg -bhp -mNz -iGP +chS +tig +kzT nAN nAN nAN -mIN -rTJ -hPR -itN -xkj -ozP +eFF +goI +xin +njW +tSk +rId nAN nAN nAN -gpY +lJk fID mVX mVX @@ -106744,25 +106235,25 @@ oKG ekH onc afP -fID -fID -fID -fID -fID -fID -fID -ecV -anJ +sbw +rOB +rOB +qLe +rOB +rOB +sbw +afP +tBG gbo xhN ecV -eWA -eWA -eWA -eWA -eWA -eWA -eWA +lJU +sbc +cVJ +cVJ +cVJ +gDY +lJU nAN shl shl @@ -106772,14 +106263,14 @@ shl nAN uzP uzP -swk +lSV tgn -xxO -oFN +qxb +sfw nAN fDP fDP -rSw +aUX nAN nAN nAN @@ -106788,25 +106279,25 @@ cFn hHu hHu hHu -ueB -vBs +fJz +dyQ jJS -tQy -dUp -trn +sEU +bdB +mPi hOe -hPR -sNw -iGP +xin +uKU +kzT nAN -sru -jHw -aZs -mIN -itN -tDY -xkj -rOc +dDx +oVm +iRf +eFF +njW +dCT +tSk +uoR nAN nAN nAN @@ -106987,8 +106478,8 @@ cKy kcU siO kcU -rSA -tUB +frA +qrR onc kAE oKG @@ -107001,25 +106492,25 @@ oKG tak onc afP -fID -fID -fID -fID -fID -fID -fID -ecV -anJ -rWx -fVm +sbw +rOB +rOB +rOB +rOB +rOB +nnz +afP +tBG +pzN +kRE ecV -eWA -eWA -eWA -eWA -eWA -eWA -eWA +lJU +bwK +cVJ +cVJ +cVJ +wjG +lJU nAN mZo mZo @@ -107029,30 +106520,30 @@ mZo nAN uzP uzP -wIv -rXE -iiC -mvV -axF -daU +kAd +bAT +wAz +vwu +sfT +njh fAg kZY nAN -oKy -qKq +opw +dnh nAN nAN nAN nAN nAN nAN -jBQ +iDG mTv -tQy -dUp -trn +sEU +bdB +mPi moU -qRx +klT nAN nAN nAN @@ -107067,7 +106558,7 @@ nAN nAN nAN nAN -gpY +lJk fID hne mVX @@ -107258,25 +106749,25 @@ oKG sdz onc afP -fID -fID -fID -fID -fID -fID -fID -afP -anJ +sbw +rOB +rOB +rOB +rOB +rOB +waE +eQj +idQ gbo xhN ecV -eWA -eWA -eWA -eWA -eWA -eWA -eWA +lJU +gRj +oUC +cVJ +cVJ +jFG +lJU nAN mZo mZo @@ -107288,10 +106779,10 @@ uzP uzP uzP uzP -uGD -bpl -kNd -tYO +ocx +kse +shB +fHe fAg sYW qgi @@ -107300,31 +106791,31 @@ qto qgi ppx qgi -aqe +qBn nAN -wmR +cAA qto oWu -tQy -dUp -trn +sEU +bdB +mPi sYW qto -vkG -hkH -ino +jnM +mpo +oKa nAN -vbk -mkN +iRc +dnB rTL rTL -mYC -xZz +oHO +fnC hAn dqX mIW nAN -gpY +lJk fID mVX mVX @@ -107515,25 +107006,25 @@ oNF ajO onc afP -fID -fID -fID -fID -fID -fID -fID -xVk -kwU -rWx -fVm +sbw +rOB +rOB +rOB +rOB +rOB +nBC +sEs +scN +kOD +kRE afP +lJU +lJU eWA +lBp eWA -eWA -eWA -eWA -eWA -eWA +lJU +lJU nAN mZo mZo @@ -107545,10 +107036,10 @@ uzP uzP uzP uzP -qUi -eIs -mKI -tYO +tmG +cMh +fcs +fHe fAg fAg fAg @@ -107558,28 +107049,28 @@ fAg fAg fAg moU -pWo +nWU mTv fAg fAg -tQy -dUp -trn +sEU +bdB +mPi fAg fAg fAg fAg moU -ejA +ciK rTL rTL rTL rTL rTL -ohc +tAi toU toU -lvd +pHO nAN nAN nAN @@ -107772,17 +107263,17 @@ lbo ajO onc afP -fID -fID -fID -fID -fID -fID -fID -muR -scN -pej -soJ +sbw +ncN +rOB +rOB +rOB +eqg +nnz +afP +unC +fon +nve afP afP afP @@ -107798,15 +107289,15 @@ shl mZo mZo nAN -vPE -twi +sta +iVu uzP uzP -eTE -jhQ -hST -rjy -oVN +gzR +hem +riy +kGN +dZe fAg fAg fAg @@ -107815,30 +107306,30 @@ fAg fAg fAg moU -pWo +nWU mTv fAg fAg -tQy -dUp -trn +sEU +bdB +mPi fAg fAg fAg fAg moU -ejA +ciK rTL rTL rTL rTL rTL -ohc +tAi toU toU -hzw +xwc nAN -gpY +lJk fID hne mVX @@ -108029,25 +107520,25 @@ hHt ajO onc afP -fID -fID -fID -fID -fID -fID -fID -afP -jzw +peY +rOB +rOB +rOB +rOB +rOB +nBC +dEV +gbo fon jHX -tky +jVq gFx -cDQ -cDQ -cDQ -cDQ -cDQ -cDQ +xjM +xjM +xjM +xjM +xjM +xjM nAN mZo mZo @@ -108055,11 +107546,11 @@ shl mZo mZo nAN -fFt -wLV +pOM +glw uzP uzP -bRY +ngi tgn nAN nAN @@ -108071,31 +107562,31 @@ hHu hHu hHu hHu -kEv +xnh nAN jWM mzs jJS -hBW -kZm -lYK +qfj +jPF +pDH hOe mzs -kLi +wJo mzs cnO nAN -wyr +ajk rTL rTL rTL rTL -bQr +mPp qMy -feS -kxv +jtn +mYz nAN -gpY +lJk fID mVX mVX @@ -108275,36 +107766,36 @@ ddZ kcU onc onc -fID -bWt -fID +aLA +cqt +qZa onc onc onc -fID -xiX -fID +etQ +dBY +etQ onc afP -lmE -fID -fID -fID -fID -fID -fID -oVu -gbo +sbw +rOB +rOB +rOB +rOB +rOB +lLm +afP +dZk fon jHX -akY +xOy gFx -sXo -jXa -jXa -jXa -jXa -jXa +psK +psn +psn +psn +psn +psn nAN mZo mZo @@ -108312,18 +107803,18 @@ shl mZo mZo nAN -toV -qpb +fGy +spd uzP uzP -tRQ +rBs byz -mRL +pvS nAN shl shl -uGD -jhi +ocx +dnT shl shl nAN @@ -108331,23 +107822,23 @@ nAN nAN nAN nAN -apo +xjZ mTv fAg fAg fAg moU -evN +ftT nAN -agC -agC +qJo +qJo nAN -cqr +pUC rTL rTL rTL rTL -xbP +fnW nAN nAN nAN @@ -108531,37 +108022,37 @@ hRt hRt onc onc -fID -fID -fID -fID -fID +nTJ +ezH +puY +vKg +nTJ onc -fID -fID -fID -fID -fID +wtY +xCK +jkW +vwM +wtY afP -fID -fID -fID -fID -fID -fID -fID +sbw +rOB +rOB +rOB +rOB +rOB +nnz afP dZk fon jHX -uKN +oUw gFx -uUe -uUe -wzD -wzD -wzD -wzD +jHF +jHF +rNf +rNf +rNf +rNf nAN mXf mZo @@ -108569,48 +108060,48 @@ shl mXf mZo nAN -cSM -vum +yeO +nmE uzP uzP uzP -uGD -uGD -uGD -uGD -uGD +ocx +ocx +ocx +ocx +ocx uzP uzP uzP -uGD -qUi +ocx +tmG vEt -hSO -jGg +kwn +bGQ nAN nAN -naX +ina hHu mzs mzs cnO -ryO -mSD -guW -guW -gDX -izf +lSW +aoW +erZ +erZ +waZ +tzO rTL rTL rTL rTL -ohc +tAi fAg rWE nAN -xTT -aAm -aus +axT +ook +ccL nAN mVX mVX @@ -108788,37 +108279,37 @@ mVX mVX mVX onc -fID -fID -fID -fID -fID +nTJ +hUb +puY +eTN +nTJ onc -fID -fID -fID -fID -fID +wtY +eLA +jkW +eqe +wtY afP -fID -fID -fID -fID -fID -fID -fID +sbw +rOB +rOB +nLn +rOB +rOB +sbw afP dZk fon jHX -vBV +cgv gFx -aFy -aFy -aFy -aFy -aFy -aFy +sgW +sgW +sgW +sgW +sgW +sgW nAN mZo mZo @@ -108826,8 +108317,8 @@ shl mZo mZo nAN -nUc -uGD +qse +ocx uzP uzP uzP @@ -108840,34 +108331,34 @@ uzP uzP uzP uzP -eTE +gzR tgn nAN nAN nAN nAN nAN -pIz -hJM -eZD -pIz +bVt +geF +vYK +bVt nAN nAN nAN nAN nAN -cqr +pUC rTL rTL rTL rTL -ohc +tAi fAg fAg -orN -gLu -gLu -qVW +cPL +lPb +lPb +rHK nAN mVX mVX @@ -109045,37 +108536,37 @@ mVX mVX mVX onc -fID -fID -fID -fID -fID +nTJ +wmI +puY +wXd +nTJ onc -fID -fID -fID -fID -fID +wtY +lFU +jkW +uFt +wtY afP -fID -fID -fID -fID -fID -fID -fID +sbw +sbw +ipi +ipi +ipi +sbw +sbw ecV -oYw +vsV fon jHX -geh +riL gFx -rrh -rrh -jBz -jBz -jBz -jBz +qjA +qjA +tlp +tlp +tlp +tlp nAN mZo mZo @@ -109083,9 +108574,9 @@ shl mZo mZo nAN -rpx -uGD -uGD +wZH +ocx +ocx uzP uzP uzP @@ -109097,34 +108588,34 @@ uzP uzP uzP uzP -pGs +thl tgn nAN nAN -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -nAN -cIa -equ -equ -equ -equ -dmX +dTg +usR +usR +tKr +sZA +sZA +tKr +usR +usR +tKr +usR +nAN +tnU +ruu +ruu +ruu +ruu +oZM fAg fAg -orN -gLu -gLu -gLu +cPL +lPb +lPb +lPb nAN mVX mVX @@ -109302,37 +108793,37 @@ mVX mVX mVX onc -fID -fID -fID -fID -fID +nTJ +nTJ +iAH +nTJ +nTJ onc -fID -fID -fID -fID -fID +wtY +wtY +iVV +wtY +wtY afP -fID -fID -fID -fID -fID -fID -fID +mVX +bbq +bbq +bbq +bbq +bbq +mVX afP -jXf -fqL +dlT +yeh tgA -mZi +hAX gFx -gdn -nfo -nfo -nfo -nfo -nfo +aLo +quA +quA +quA +quA +quA nAN mZo mZo @@ -109343,45 +108834,45 @@ nAN nAN gjP nAN -iAW -jpB -jpB -jpB -jpB -jpB -qfG +oWf +tqG +tqG +tqG +tqG +tqG +ejx uzP uzP uzP -uGD -tRQ +ocx +rBs byz nAN nAN -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW +usR +usR +ajs +taZ +aLg +evp +fDh +vpr +agB +hVq +hQV nAN -nrO -xfU -oGC -dJw +kmt +qog +jNk +rTs nAN tdy -ntq +xCR fAg nAN -awn -uSe -jtt +uTt +kzR +sxu nAN mVX mVX @@ -109485,7 +108976,7 @@ mVX mVX mVX mVX -eCq +mVX mVX mVX mVX @@ -109560,15 +109051,15 @@ mVX mVX jMD mVX -fID -fID -fID +nTJ +oMf +nTJ mVX jMD mVX -fID -fID -fID +wtY +vWm +wtY mVX jMD mVX @@ -109598,42 +109089,42 @@ mZo mZo nAN mCQ -ths +ooD nAN -pHZ +dxk rjE rjE rjE rjE rjE -qfG -bZG -vrB -boG -uGD +ejx +lgV +iuv +kvh +ocx uSN uSN nAN -erq -vUA -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -nAN -hEG -lHe -tdw -ntc -nAN -aXC -faQ +xEr +pZG +woV +woV +woV +woV +woV +woV +taZ +lQg +hVq +hQV +nAN +tkR +vgt +mbA +qnE +nAN +gpm +aKz fAg nAN nAN @@ -109793,41 +109284,289 @@ mVX mVX mVX mVX -jMD +jMD +mVX +mVX +wLM +vNw +wLM +vNw +wLM +jMD +jMD +jMD +wLM +vNw +wLM +vNw +wLM +mVX +mVX +mVX +mVX +mVX +mVX +jMD +mVX +mVX +mVX +mVX +mVX +jMD +mVX +mVX +mVX +mVX +mVX +jMD +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +nAN +lRD +lRD +shl +lRD +lRD +nAN +tbt +mCb +nAN +nkz +tAB +fAg +fAg +fAg +fAg +bhj +nQM +tgn +dPr +uSN +uSN +jMD +jMD +nAN +usR +usR +taZ +taZ +taZ +taZ +taZ +xie +kQO +hVq +hQV +nAN +nAN +eRb +dOf +rHW +nAN +iXF +xfD +uJU +fXf +nAN +nAN +lJk +tad +mVX +mVX +pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +"} +(223,1,1) = {" +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX -wLM -vNw -wLM -vNw -wLM -jMD -jMD -jMD -wLM -vNw -wLM -vNw -wLM mVX mVX mVX mVX mVX mVX -jMD mVX mVX mVX mVX mVX -jMD mVX mVX mVX mVX mVX -jMD +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +pNM +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +vAA +vAA +vAA +vAA +yjN +vAA +iil +vAA +bud +bud +bud +wkN +uEW +vAA +uEW +vAA +vAA +wkN +bud +bud +wkN +vAA +vAA +mVX +mVX +mVX mVX mVX mVX @@ -109847,56 +109586,65 @@ mVX mVX mVX mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +rFY +rFY +rFY +rFY +rFY nAN -lRD -lRD -shl -lRD -lRD nAN -aqG -mCb nAN -nkz -aIk -fAg -fAg -fAg -fAg -qml -uVZ -tgn -nFb +nAN +nAN +pYv +uOj +ugM +uea +oUi +nAN +nAN +uSN uSN uSN jMD +mVX +mVX jMD +dTg +usR +usR +usR +usR +usR +usR +beS +beS +tKr +usR +mVX +nAN +shl +shl +nAN +nAN +nAN +nAN nAN -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW -eHW nAN nAN -gIq -dEN -uZI nAN -quz -fvO -mcK -tmn nAN nAN -gpY -ono mVX mVX pNM @@ -109908,7 +109656,7 @@ mVX mVX mVX "} -(223,1,1) = {" +(224,1,1) = {" mVX mVX mVX @@ -110045,35 +109793,39 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -hRH -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +wkN +rpQ +rOi +ayR +sms +wkN +sMr +sWd +izX +izX +izX +izX +dNe +sWd +dNe +uOA +wkN +uVo +vpD +aaa +vNc +vAA +eLd +iVX +mVX +mVX +mVX +mVX mVX mVX mVX @@ -110105,48 +109857,11 @@ mVX mVX mVX mVX -iae -iae -iae -iae -iae -nAN -nAN -nAN -nAN -nAN -nDw -uOj -cGx -uea -aoZ -nAN -nAN -uSN -uSN -uSN -jMD mVX mVX -jMD -eHW -eHW -eHW -eHW -eHW -eHW -eHW -jMD -jMD mVX mVX mVX -nAN -shl -shl -nAN -nAN -nAN nAN nAN nAN @@ -110156,22 +109871,21 @@ nAN nAN mVX mVX -pNM mVX mVX mVX mVX mVX mVX +jMD mVX -"} -(224,1,1) = {" mVX mVX mVX mVX mVX mVX +jMD mVX mVX mVX @@ -110190,6 +109904,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -110197,6 +109912,8 @@ mVX mVX mVX mVX +"} +(225,1,1) = {" mVX mVX mVX @@ -110229,7 +109946,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -110261,6 +109977,10 @@ mVX mVX mVX mVX +pNM +mVX +mVX +mVX mVX mVX mVX @@ -110284,7 +110004,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -110302,35 +110021,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -110342,6 +110032,10 @@ mVX mVX mVX mVX +pNM +mVX +mVX +mVX mVX mVX mVX @@ -110361,6 +110055,30 @@ mVX mVX mVX mVX +bud +esN +rPC +oQJ +qJx +syr +dNe +izX +izX +izX +izX +izX +dNe +izX +dNe +izX +bud +tHp +qom +qom +vUY +vAA +eLd +iVX mVX mVX mVX @@ -110371,31 +110089,6 @@ mVX mVX mVX mVX -nAN -nAN -nAN -nAN -nAN -nAN -nAN -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -jMD -mVX -mVX -mVX -mVX -mVX -mVX -mVX -jMD -mVX mVX mVX mVX @@ -110413,7 +110106,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -110421,8 +110113,6 @@ mVX mVX mVX mVX -"} -(225,1,1) = {" mVX mVX mVX @@ -110452,6 +110142,7 @@ mVX mVX mVX mVX +jMD mVX mVX mVX @@ -110470,6 +110161,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -110477,6 +110169,8 @@ mVX mVX mVX mVX +"} +(226,1,1) = {" mVX mVX mVX @@ -110486,7 +110180,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -110559,47 +110252,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -110637,6 +110289,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -110651,7 +110304,6 @@ mVX mVX mVX mVX -jMD mVX mVX mVX @@ -110659,6 +110311,31 @@ mVX mVX mVX mVX +vAA +vAA +esN +qGu +sfc +sle +syr +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +izX +bud +tHp +qom +qom +bBU +vAA +eLd +iVX mVX mVX mVX @@ -110670,7 +110347,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -110678,8 +110354,6 @@ mVX mVX mVX mVX -"} -(226,1,1) = {" mVX mVX mVX @@ -110725,6 +110399,7 @@ mVX mVX mVX mVX +jMD mVX mVX mVX @@ -110751,6 +110426,8 @@ mVX mVX mVX mVX +"} +(227,1,1) = {" mVX mVX mVX @@ -110798,64 +110475,6 @@ mVX mVX mVX mVX -pNM -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -110872,6 +110491,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -110908,7 +110528,6 @@ mVX mVX mVX mVX -jMD mVX mVX mVX @@ -110935,13 +110554,6 @@ mVX mVX mVX mVX -"} -(227,1,1) = {" -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -110952,6 +110564,35 @@ mVX mVX mVX mVX +vAA +wkN +bud +wkN +vAA +vAA +esN +qGu +wJl +bwU +bud +dNe +izX +izX +izX +izX +izX +izX +izX +dNe +izX +wkN +vdg +qom +qom +epb +vAA +vAA +vAA mVX mVX mVX @@ -111000,7 +110641,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111016,6 +110656,7 @@ mVX mVX mVX mVX +jMD mVX mVX mVX @@ -111034,6 +110675,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111041,6 +110683,8 @@ mVX mVX mVX mVX +"} +(228,1,1) = {" mVX mVX mVX @@ -111055,7 +110699,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111073,35 +110716,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -111134,6 +110748,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111165,11 +110780,6 @@ mVX mVX mVX mVX -jMD -mVX -mVX -mVX -mVX mVX mVX mVX @@ -111184,25 +110794,6 @@ mVX mVX mVX mVX -pNM -mVX -mVX -mVX -mVX -mVX -mVX -mVX -"} -(228,1,1) = {" -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -111212,6 +110803,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111229,6 +110821,35 @@ mVX mVX mVX mVX +wkN +xnF +pSS +dDZ +qzL +vAA +esN +qGu +wJl +bwU +bud +dNe +eoF +izX +jYK +izX +izX +izX +eoF +dNe +dNe +uSG +qom +qom +qom +tOK +vAA +eLd +iVX mVX mVX mVX @@ -111257,7 +110878,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111320,64 +110940,8 @@ mVX mVX mVX mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX +"} +(229,1,1) = {" mVX mVX mVX @@ -111449,24 +111013,6 @@ mVX mVX mVX mVX -"} -(229,1,1) = {" -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -111532,6 +111078,35 @@ mVX mVX mVX mVX +bud +vcC +qfz +qfz +qFm +vAA +jlQ +wTK +sle +sns +wkN +sNX +wkN +bud +wkN +bud +wkN +bud +wkN +uIy +dNe +uSG +qom +qom +qom +vRi +vAA +eLd +iVX mVX mVX mVX @@ -111569,7 +111144,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111587,35 +111161,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -111644,6 +111189,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111651,6 +111197,8 @@ mVX mVX mVX mVX +"} +(230,1,1) = {" mVX mVX mVX @@ -111698,7 +111246,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111706,8 +111253,6 @@ mVX mVX mVX mVX -"} -(230,1,1) = {" mVX mVX mVX @@ -111717,6 +111262,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111789,6 +111335,35 @@ mVX mVX mVX mVX +bud +koI +rxF +vFD +rxF +mdM +wkN +rRm +rRm +wkN +vAA +sOe +sWw +tsj +tTF +tsj +uAh +tsj +sWw +dNe +uPe +wkN +vdH +vqK +vJp +vSD +vAA +vAA +vAA mVX mVX mVX @@ -111826,7 +111401,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111844,35 +111418,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -111901,6 +111446,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -111908,6 +111454,8 @@ mVX mVX mVX mVX +"} +(231,1,1) = {" mVX mVX mVX @@ -111955,7 +111503,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -111963,8 +111510,6 @@ mVX mVX mVX mVX -"} -(231,1,1) = {" mVX mVX mVX @@ -111974,6 +111519,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112046,6 +111592,35 @@ mVX mVX mVX mVX +bud +pAM +rxF +vFD +vFD +mdY +rqz +wDS +wDS +wDS +sCS +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +izX +vAA +vAA +vAA +vAA +vAA +vAA +eLd +iVX mVX mVX mVX @@ -112083,7 +111658,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112101,35 +111675,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -112158,6 +111703,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112165,6 +111711,8 @@ mVX mVX mVX mVX +"} +(232,1,1) = {" mVX mVX mVX @@ -112212,7 +111760,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112220,8 +111767,6 @@ mVX mVX mVX mVX -"} -(232,1,1) = {" mVX mVX mVX @@ -112231,6 +111776,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112303,6 +111849,35 @@ mVX mVX mVX mVX +bud +lOH +rxF +vFD +vFD +mdY +dgT +wDS +wDS +wDS +sCS +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +izX +vAA +vAA +vAA +vAA +vAA +vAA +eLd +iVX mVX mVX mVX @@ -112340,7 +111915,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112358,35 +111932,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -112415,6 +111960,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112422,6 +111968,8 @@ mVX mVX mVX mVX +"} +(233,1,1) = {" mVX mVX mVX @@ -112469,7 +112017,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112477,8 +112024,6 @@ mVX mVX mVX mVX -"} -(233,1,1) = {" mVX mVX mVX @@ -112488,6 +112033,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112560,6 +112106,35 @@ mVX mVX mVX mVX +bud +qEN +rxF +vFD +rxF +mdM +wkN +kph +kph +wkN +vAA +sOe +hsz +tzJ +oPx +tzJ +uDh +tzJ +hsz +dNe +uPe +wkN +veO +vst +vst +lnZ +vAA +vAA +vAA mVX mVX mVX @@ -112597,7 +112172,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112615,35 +112189,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -112672,6 +112217,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112679,6 +112225,8 @@ mVX mVX mVX mVX +"} +(234,1,1) = {" mVX mVX mVX @@ -112726,7 +112274,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112734,8 +112281,6 @@ mVX mVX mVX mVX -"} -(234,1,1) = {" mVX mVX mVX @@ -112745,6 +112290,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112817,6 +112363,35 @@ mVX mVX mVX mVX +bud +nCH +qhG +qhG +qIt +vAA +tEN +rUk +xaA +ybu +wkN +sNX +wkN +bud +wkN +bud +wkN +bud +wkN +uIy +dNe +uSZ +dNe +dNe +dNe +lgR +vAA +eLd +iVX mVX mVX mVX @@ -112854,7 +112429,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112872,35 +112446,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -112929,6 +112474,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -112936,6 +112482,8 @@ mVX mVX mVX mVX +"} +(235,1,1) = {" mVX mVX mVX @@ -112983,7 +112531,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -112991,8 +112538,6 @@ mVX mVX mVX mVX -"} -(235,1,1) = {" mVX mVX mVX @@ -113002,6 +112547,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113074,6 +112620,35 @@ mVX mVX mVX mVX +wkN +pvA +qlQ +qwd +umm +vAA +qqG +til +wLl +soN +bud +dNe +sXP +izX +tZV +izX +izX +izX +sXP +dNe +dNe +uSZ +dNe +dNe +dNe +vSK +vAA +eLd +iVX mVX mVX mVX @@ -113111,8 +112686,6 @@ mVX mVX mVX mVX -pNM -mVX mVX mVX mVX @@ -113129,35 +112702,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -113187,6 +112731,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113194,6 +112739,8 @@ mVX mVX mVX mVX +"} +(236,1,1) = {" mVX mVX mVX @@ -113240,7 +112787,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -113248,8 +112794,6 @@ mVX mVX mVX mVX -"} -(236,1,1) = {" mVX mVX mVX @@ -113260,6 +112804,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113286,6 +112831,7 @@ mVX mVX mVX mVX +eCq mVX mVX mVX @@ -113331,6 +112877,36 @@ mVX mVX mVX mVX +vAA +wkN +bud +wkN +vAA +vAA +ugU +til +wLl +vDy +bud +dNe +izX +izX +izX +izX +izX +izX +izX +dNe +izX +wkN +vhp +dNe +dNe +vZr +vAA +vAA +vAA +mVX mVX mVX mVX @@ -113368,7 +112944,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -113386,35 +112961,6 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -113442,6 +112988,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113449,6 +112996,23 @@ mVX mVX mVX mVX +"} +(237,1,1) = {" +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn mVX mVX mVX @@ -113505,24 +113069,6 @@ mVX mVX mVX mVX -"} -(237,1,1) = {" -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -mVX mVX mVX mVX @@ -113592,6 +113138,31 @@ mVX mVX mVX mVX +vAA +vAA +oDr +til +wrD +xaA +sDa +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +dNe +izX +bud +ezN +dNe +dNe +pTf +vAA +eLd +iVX mVX mVX mVX @@ -113625,53 +113196,11 @@ mVX mVX mVX mVX -pNM -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA mVX mVX mVX @@ -113716,6 +113245,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113723,6 +113253,23 @@ mVX mVX mVX mVX +"} +(238,1,1) = {" +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn +xVn mVX mVX mVX @@ -113754,7 +113301,6 @@ mVX mVX mVX mVX -pNM mVX mVX mVX @@ -113762,23 +113308,6 @@ mVX mVX mVX mVX -"} -(238,1,1) = {" -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn -xVn mVX mVX mVX @@ -113789,6 +113318,7 @@ mVX mVX mVX mVX +pNM mVX mVX mVX @@ -113827,40 +113357,6 @@ mVX mVX mVX mVX -pNM -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX -mVX mVX mVX mVX @@ -113877,12 +113373,12 @@ mVX mVX mVX mVX +pNM mVX mVX mVX mVX mVX -pNM mVX mVX mVX @@ -113900,35 +113396,30 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +bud +rqT +rXx +slQ +spf +sDa +dNe +izX +izX +izX +izX +izX +izX +izX +dNe +izX +bud +ezN +dNe +dNe +pTf +vAA +eLd +iVX mVX mVX mVX @@ -114157,35 +113648,35 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +wkN +rsS +rYn +rYn +sra +wkN +sRl +sZH +izX +izX +izX +izX +izX +sZH +uKc +uOA +wkN +ezN +dNe +dNe +pTf +vAA +eLd +iVX mVX mVX mVX @@ -114414,35 +113905,35 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +vAA +wkN +bud +bud +wkN +vAA +vAA +wkN +bud +bud +bud +wkN +vAA +vAA +vAA +vAA +vAA +bud +vtX +vKS +bud +vAA +vAA +mVX mVX mVX mVX @@ -114671,35 +114162,35 @@ mVX mVX mVX mVX -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA -eWA +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX +mVX mVX mVX mVX diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm index a660768c920..1ff16844f16 100644 --- a/_maps/map_files/nova/nova.dmm +++ b/_maps/map_files/nova/nova.dmm @@ -3414,6 +3414,20 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) +"aAP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cryo) "aAV" = ( /obj/machinery/atmospherics/pipe/multiz{ dir = 4 @@ -8037,23 +8051,6 @@ icon_state = "dark" }, /area/engineering/aienter) -"bil" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" - }, -/area/medical/cloning) "bio" = ( /obj/structure/bookcase, /turf/simulated/floor/wood, @@ -15137,6 +15134,17 @@ icon_state = "darkred" }, /area/security/permahallway) +"cgR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cryo) "cgX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -21107,6 +21115,23 @@ icon_state = "vault" }, /area/turret_protected/aisat_interior/secondary) +"cZo" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whiteblue" + }, +/area/medical/cloning) "cZt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -21379,10 +21404,6 @@ icon_state = "purplefull" }, /area/medical/research/nhallway) -"dcl" = ( -/obj/effect/spawner/random_spawners/blood_5, -/turf/simulated/floor/plating, -/area/maintenance/secpost) "dcq" = ( /turf/simulated/wall/r_wall, /area/toxins/xenobiology) @@ -30041,17 +30062,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/bridge) -"epN" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cryo) "epP" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -35638,6 +35648,25 @@ /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/storage/tech) +"fgL" = ( +/obj/machinery/camera{ + c_tag = "Central Bridge Hallway East 2"; + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -30 + }, +/turf/simulated/floor/engine{ + slowdown = -0.3 + }, +/area/hallway/primary/central) "fgN" = ( /obj/machinery/computer/crew, /obj/structure/cable{ @@ -36211,13 +36240,6 @@ icon_state = "darkred" }, /area/turret_protected/aisat_interior/secondary) -"fkL" = ( -/obj/machinery/vending/boozeomat, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/simulated/floor/wood/dark, -/area/ntrep) "fkO" = ( /obj/structure/railing/corner{ dir = 4 @@ -38568,10 +38590,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/storage/secure) -"fBy" = ( -/obj/effect/decal/cleanable/spiderling_remains, -/turf/simulated/floor/plating, -/area/maintenance/secpost) "fBE" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -38639,6 +38657,26 @@ icon_state = "dark" }, /area/crew_quarters/chief) +"fCz" = ( +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/medical/glass{ + id = "cloninglab"; + name = "Cloning Lab"; + req_access = list(5) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cloning) "fCA" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -40566,11 +40604,6 @@ }, /turf/simulated/floor/carpet/red, /area/lawoffice) -"fQX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/vomit, -/turf/simulated/floor/plating, -/area/maintenance/secpost) "fQY" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing{ @@ -42063,6 +42096,24 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) +"gbK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = -30 + }, +/turf/simulated/floor/engine{ + slowdown = -0.3 + }, +/area/hallway/primary/central) "gbN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -49013,24 +49064,6 @@ icon_state = "red" }, /area/hallway/primary/central/second/west) -"hdq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -30 - }, -/turf/simulated/floor/engine{ - slowdown = -0.3 - }, -/area/hallway/primary/central) "hdt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/girder, @@ -58394,29 +58427,6 @@ icon_state = "whitegreen" }, /area/medical/virology/lab) -"iza" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cloning) "izb" = ( /obj/machinery/power/solar{ name = "South-East Solar Panel" @@ -62331,6 +62341,13 @@ /obj/structure/closet, /turf/simulated/floor/plating, /area/maintenance/starboard) +"jfC" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/ntrep) "jfD" = ( /obj/structure/toilet/secret{ dir = 1 @@ -66742,6 +66759,32 @@ icon_state = "neutralfull" }, /area/civilian/barber) +"jLR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal{ + dir = 8; + icon_state = "golden_stripes" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/sortjunction/reversed{ + dir = 1; + name = "Captain Office"; + sortType = 18 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/bridge) "jLT" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ @@ -67062,34 +67105,6 @@ icon_state = "neutralfull" }, /area/hallway/primary/central/nw) -"jOe" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/button/windowtint{ - pixel_y = -24; - pixel_x = 24; - id = "ntrepprivate"; - name = "Door tint control" - }, -/obj/machinery/door_control{ - id = "NTRprivate"; - name = "Privacy Shutters Control"; - pixel_x = 26; - pixel_y = -33; - req_access = list(73) - }, -/obj/structure/disposalpipe/trunk/multiz/down{ - dir = 2 - }, -/turf/simulated/floor/carpet/black, -/area/ntrep) "jOs" = ( /obj/structure/cable{ icon_state = "0-8" @@ -67277,6 +67292,10 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/apmaint) +"jQq" = ( +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plating, +/area/maintenance/secpost) "jQt" = ( /obj/machinery/light{ dir = 1; @@ -73313,17 +73332,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/tourist) -"kOr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cloning) "kOs" = ( /obj/structure/chair/sofa/left, /obj/random/therapy, @@ -76677,13 +76685,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/fsmaint) -"loQ" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/carpet/black, -/area/ntrep) "loR" = ( /obj/effect/decal/warning_stripes/yellow, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -77705,20 +77706,6 @@ icon_state = "red" }, /area/security/main) -"lxy" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "dark" - }, -/area/medical/genetics) "lxA" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/unary/vent_scrubber{ @@ -77915,21 +77902,6 @@ dir = 1 }, /area/security/brigstaff) -"lzn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cloning) "lzo" = ( /obj/item/flag/nt, /obj/machinery/light{ @@ -79403,6 +79375,11 @@ icon_state = "darkgrey" }, /area/engineering/mechanic_workshop/hangar) +"lLc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/vomit, +/turf/simulated/floor/plating, +/area/maintenance/secpost) "lLh" = ( /obj/effect/decal/cleanable/dust, /obj/effect/turf_decal/siding/wood, @@ -83579,32 +83556,6 @@ }, /turf/space/openspace, /area/space) -"mpH" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/turf_decal{ - dir = 8; - icon_state = "golden_stripes" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - name = "Captain Office"; - sortType = 18 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/bridge) "mpL" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -86626,20 +86577,6 @@ icon_state = "neutralfull" }, /area/hallway/primary/central/se) -"mND" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cryo) "mNG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -87197,6 +87134,17 @@ icon_state = "neutralcorner" }, /area/maintenance/apmaint) +"mRP" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cloning) "mSa" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -90730,24 +90678,6 @@ }, /turf/simulated/floor/wood/dark, /area/crew_quarters/bar/atrium) -"nrr" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/medical/glass{ - id = "cloninglab"; - name = "Genetics Lab"; - req_access = list(9) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "dark" - }, -/area/medical/genetics) "nrs" = ( /obj/structure/lattice, /obj/structure/window/reinforced, @@ -91361,6 +91291,10 @@ icon_state = "dark" }, /area/atmos) +"nwA" = ( +/obj/effect/spawner/random_spawners/blood_5, +/turf/simulated/floor/plating, +/area/maintenance/secpost) "nwG" = ( /obj/structure/cable{ d1 = 4; @@ -92163,26 +92097,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/tourist) -"nBP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/junction/reversed{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cryo) "nBS" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small{ @@ -116037,6 +115951,13 @@ icon_state = "neutral" }, /area/crew_quarters/serviceyard) +"rcy" = ( +/obj/machinery/vending/boozeomat, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/simulated/floor/wood/dark, +/area/ntrep) "rcB" = ( /obj/structure/table/reinforced, /obj/item/radio, @@ -119102,19 +119023,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/captain/bedroom) -"rzi" = ( -/obj/machinery/computer/rdconsole/core, -/obj/effect/decal/warning_stripes/northwest, -/obj/machinery/requests_console{ - department = "Science"; - departmentType = 2; - name = "Research Request Console"; - pixel_x = -30 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/toxins/lab) "rzl" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -119346,6 +119254,34 @@ /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, /area/maintenance/backstage) +"rAR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/button/windowtint{ + pixel_y = -24; + pixel_x = 24; + id = "ntrepprivate"; + name = "Door tint control" + }, +/obj/machinery/door_control{ + id = "NTRprivate"; + name = "Privacy Shutters Control"; + pixel_x = 26; + pixel_y = -33; + req_access = list(73) + }, +/obj/structure/disposalpipe/trunk/multiz/down{ + dir = 2 + }, +/turf/simulated/floor/carpet/black, +/area/ntrep) "rBa" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/table/wood/fancy/red, @@ -130089,6 +130025,11 @@ icon_state = "dark" }, /area/chapel/office) +"tbV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random_spawners/blood_5, +/turf/simulated/floor/plating, +/area/maintenance/secpost) "tci" = ( /obj/structure/chair/wood{ dir = 8 @@ -133236,6 +133177,20 @@ icon_state = "dark" }, /area/chapel/office) +"txj" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "dark" + }, +/area/medical/genetics) "txo" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -142188,6 +142143,29 @@ dir = 8 }, /area/crew_quarters/locker) +"uNu" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cloning) "uNv" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -147696,25 +147674,6 @@ icon_state = "dark" }, /area/turret_protected/aisat_interior) -"vFN" = ( -/obj/machinery/camera{ - c_tag = "Central Bridge Hallway East 2"; - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = -30 - }, -/turf/simulated/floor/engine{ - slowdown = -0.3 - }, -/area/hallway/primary/central) "vFV" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -148891,26 +148850,6 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/fore2) -"vOz" = ( -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/medical/glass{ - id = "cloninglab"; - name = "Cloning Lab"; - req_access = list(5) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/cloning) "vOB" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -152851,6 +152790,19 @@ }, /turf/simulated/floor/plating, /area/atmos) +"wrr" = ( +/obj/machinery/computer/rdconsole/core, +/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/requests_console{ + department = "Research"; + departmentType = 2; + name = "Research Request Console"; + pixel_x = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/toxins/lab) "wrz" = ( /turf/simulated/openspace, /area/security/processing) @@ -158030,11 +157982,6 @@ }, /turf/simulated/floor/wood/fancy/cherry, /area/crew_quarters/theatre) -"xhp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random_spawners/blood_5, -/turf/simulated/floor/plating, -/area/maintenance/secpost) "xhr" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -159179,6 +159126,24 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/xenozoo) +"xqb" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/medical/glass{ + id = "cloninglab"; + name = "Genetics Lab"; + req_access = list(9) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "dark" + }, +/area/medical/genetics) "xqq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -161253,6 +161218,21 @@ }, /turf/simulated/floor/wood/fancy/cherry, /area/crew_quarters/theatre) +"xFq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cloning) "xFr" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -161317,6 +161297,26 @@ /obj/effect/decal/ants, /turf/simulated/floor/plating, /area/security/permabrig) +"xFT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/junction/reversed{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/cryo) "xGl" = ( /obj/machinery/alarm{ pixel_y = 24 @@ -190112,12 +190112,12 @@ jvn tdr clY qcI -lxy -nrr -kOr -kOr -lzn -bil +txj +xqb +mRP +mRP +xFq +cZo nEG hya fXb @@ -190374,13 +190374,13 @@ qRz eri fcC hPA -iza -vOz -epN -epN -mND -epN -nBP +uNu +fCz +cgR +cgR +aAP +cgR +xFT qgs rOG ieh @@ -190930,7 +190930,7 @@ tkq bje mKV bvT -hdq +gbK bje tkq tkq @@ -198620,7 +198620,7 @@ wqw uVH hQo jlb -rzi +wrr iuU tYL cod @@ -203266,7 +203266,7 @@ tkq bje vFC bvT -vFN +fgL bje tkq tkq @@ -254619,7 +254619,7 @@ ozQ kux ozQ ozQ -fkL +rcy ozQ ozQ ozQ @@ -255218,7 +255218,7 @@ ieI gtF otn kZy -fQX +lLc chE ddQ bbZ @@ -255648,8 +255648,8 @@ lVZ wdp ozQ pLK -jOe -loQ +rAR +jfC lnp qIY tHo @@ -255732,7 +255732,7 @@ orm kfz xKb thB -dcl +nwA xic ddQ oqM @@ -256758,7 +256758,7 @@ btM syu gVD bbZ -fBy +jQq mVH bRV wre @@ -257275,7 +257275,7 @@ awC xRZ pWi wUw -fBy +jQq ihn xXG aiQ @@ -257533,7 +257533,7 @@ xRZ wre wCs rhi -xhp +tbV uhC cPv tUk @@ -258047,7 +258047,7 @@ hoH mTa mqL jYH -fBy +jQq awC ibR jAH @@ -265423,7 +265423,7 @@ qCF mXr ihk kjR -mpH +jLR tbl biB icw diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm index 69eead89e69..4705a3b27af 100644 --- a/_maps/map_files/shuttles/admin_admin.dmm +++ b/_maps/map_files/shuttles/admin_admin.dmm @@ -302,7 +302,9 @@ name = "administration shuttle"; roundstart_move = "admin_away"; timid = 1; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /obj/machinery/door/airlock/external{ frequency = 1331; diff --git a/_maps/map_files/shuttles/admin_alien.dmm b/_maps/map_files/shuttles/admin_alien.dmm index 82746b1582c..9e9dd7294f4 100644 --- a/_maps/map_files/shuttles/admin_alien.dmm +++ b/_maps/map_files/shuttles/admin_alien.dmm @@ -551,7 +551,9 @@ id = "admin"; name = "administration shuttle"; roundstart_move = "admin_away"; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /obj/machinery/door/airlock/external{ frequency = 1331; diff --git a/_maps/map_files/shuttles/admin_armory.dmm b/_maps/map_files/shuttles/admin_armory.dmm index 8bd1d8dd154..ba389eb175d 100644 --- a/_maps/map_files/shuttles/admin_armory.dmm +++ b/_maps/map_files/shuttles/admin_armory.dmm @@ -386,7 +386,9 @@ name = "NRV Sparta"; roundstart_move = "admin_away"; timid = 1; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; diff --git a/_maps/map_files/shuttles/admin_club.dmm b/_maps/map_files/shuttles/admin_club.dmm index 44af234de90..39c541c3447 100644 --- a/_maps/map_files/shuttles/admin_club.dmm +++ b/_maps/map_files/shuttles/admin_club.dmm @@ -695,7 +695,9 @@ name = "administration shuttle"; roundstart_move = "admin_away"; timid = 1; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /obj/machinery/door/airlock/external{ frequency = 1331; diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm index 87258fc2e5b..8bcd211bd48 100644 --- a/_maps/map_files/shuttles/admin_hospital.dmm +++ b/_maps/map_files/shuttles/admin_hospital.dmm @@ -720,7 +720,9 @@ name = "NHV Asclepius"; roundstart_move = "admin_away"; timid = 1; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /obj/machinery/door/airlock/external{ frequency = 1331; diff --git a/_maps/map_files/shuttles/admin_interview.dmm b/_maps/map_files/shuttles/admin_interview.dmm index 636b40deeff..378e6fb48fc 100644 --- a/_maps/map_files/shuttles/admin_interview.dmm +++ b/_maps/map_files/shuttles/admin_interview.dmm @@ -764,7 +764,9 @@ name = "administration shuttle"; roundstart_move = "admin_away"; timid = 1; - width = 18 + width = 18; + port_direction = 2; + preferred_direction = 8 }, /obj/machinery/door/airlock/external{ frequency = 1331; diff --git a/_maps/map_files/shuttles/cargo_base.dmm b/_maps/map_files/shuttles/cargo_base.dmm index ec5a950183e..11aef1a701a 100644 --- a/_maps/map_files/shuttles/cargo_base.dmm +++ b/_maps/map_files/shuttles/cargo_base.dmm @@ -60,7 +60,8 @@ req_access = list(31) }, /obj/docking_port/mobile/supply{ - timid = 1 + timid = 1; + port_direction = 4 }, /turf/simulated/floor/shuttle, /area/shuttle/supply) diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm index 41c3251a232..9956cb41b58 100644 --- a/_maps/map_files/shuttles/emergency_bar.dmm +++ b/_maps/map_files/shuttles/emergency_bar.dmm @@ -286,7 +286,8 @@ height = 13; name = "The Emergency Escape Bar"; timid = 1; - width = 24 + width = 24; + port_direction = 8 }, /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm index e26948b9c1a..e17eb241c6c 100644 --- a/_maps/map_files/shuttles/emergency_clown.dmm +++ b/_maps/map_files/shuttles/emergency_clown.dmm @@ -181,7 +181,8 @@ height = 13; name = "Snappop(tm)!"; timid = 1; - width = 24 + width = 24; + port_direction = 8 }, /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm index 36a2ef668a1..14110c42fe6 100644 --- a/_maps/map_files/shuttles/emergency_cramped.dmm +++ b/_maps/map_files/shuttles/emergency_cramped.dmm @@ -80,7 +80,8 @@ }, /obj/docking_port/mobile/emergency{ name = "Secure Transport Vessel 5"; - timid = 1 + timid = 1; + port_direction = 8 }, /turf/simulated/floor/shuttle{ icon = 'icons/turf/floors.dmi'; diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm index f5cc5d8ceb3..0b381ff8faf 100644 --- a/_maps/map_files/shuttles/emergency_cyb.dmm +++ b/_maps/map_files/shuttles/emergency_cyb.dmm @@ -485,7 +485,8 @@ dwidth = 11; height = 18; timid = 1; - width = 29 + width = 29; + port_direction = 8 }, /turf/simulated/floor/plasteel, /area/shuttle/escape) diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm index 3e42cfa6e95..49e07237764 100644 --- a/_maps/map_files/shuttles/emergency_dept.dmm +++ b/_maps/map_files/shuttles/emergency_dept.dmm @@ -513,7 +513,8 @@ dwidth = 11; height = 18; timid = 1; - width = 29 + width = 29; + port_direction = 8 }, /turf/simulated/floor/plasteel, /area/shuttle/escape) diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm index 9b686e5ec79..076e8e57ac3 100644 --- a/_maps/map_files/shuttles/emergency_meta.dmm +++ b/_maps/map_files/shuttles/emergency_meta.dmm @@ -836,7 +836,9 @@ height = 14; name = "Meta emergency shuttle"; timid = 1; - width = 25 + width = 25; + port_direction = 8; + preferred_direction = 4 }, /obj/machinery/door/airlock/shuttle{ id_tag = "s_docking_airlock"; diff --git a/_maps/map_files/shuttles/emergency_mil.dmm b/_maps/map_files/shuttles/emergency_mil.dmm index 16b5c37634a..128bf9b82ff 100644 --- a/_maps/map_files/shuttles/emergency_mil.dmm +++ b/_maps/map_files/shuttles/emergency_mil.dmm @@ -389,7 +389,8 @@ dwidth = 11; height = 13; timid = 1; - width = 24 + width = 24; + port_direction = 8 }, /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm index 8ccb2334757..754f8b6dc71 100644 --- a/_maps/map_files/shuttles/emergency_narnar.dmm +++ b/_maps/map_files/shuttles/emergency_narnar.dmm @@ -199,7 +199,8 @@ height = 13; name = "Shuttle 667"; timid = 1; - width = 24 + width = 24; + port_direction = 8 }, /obj/machinery/door/airlock/cult/friendly, /turf/simulated/floor/engine/cult, diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm index 16a8c69e197..f4eddc3f1c5 100644 --- a/_maps/map_files/shuttles/emergency_old.dmm +++ b/_maps/map_files/shuttles/emergency_old.dmm @@ -32,7 +32,8 @@ dwidth = 11; height = 13; timid = 1; - width = 24 + width = 24; + port_direction = 8 }, /obj/machinery/door/airlock/shuttle{ aiControlDisabled = 1; diff --git a/_maps/map_files/shuttles/ferry_SMgen.dmm b/_maps/map_files/shuttles/ferry_SMgen.dmm index 1dd08b46cbe..9230195ae24 100644 --- a/_maps/map_files/shuttles/ferry_SMgen.dmm +++ b/_maps/map_files/shuttles/ferry_SMgen.dmm @@ -93,7 +93,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_base.dmm b/_maps/map_files/shuttles/ferry_base.dmm index 3539323eb64..2d48bfee719 100644 --- a/_maps/map_files/shuttles/ferry_base.dmm +++ b/_maps/map_files/shuttles/ferry_base.dmm @@ -80,7 +80,8 @@ id = "ferry"; name = "ferry shuttle"; roundstart_move = "ferry_away"; - width = 5 + width = 5; + preferred_direction = 4 }, /turf/simulated/floor/shuttle, /area/shuttle/transport) diff --git a/_maps/map_files/shuttles/ferry_cargo.dmm b/_maps/map_files/shuttles/ferry_cargo.dmm index ef174ea9ec8..33193520c35 100644 --- a/_maps/map_files/shuttles/ferry_cargo.dmm +++ b/_maps/map_files/shuttles/ferry_cargo.dmm @@ -69,7 +69,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /turf/simulated/floor/shuttle, diff --git a/_maps/map_files/shuttles/ferry_chem.dmm b/_maps/map_files/shuttles/ferry_chem.dmm index 7c5bc9d6b73..5a2d29dda08 100644 --- a/_maps/map_files/shuttles/ferry_chem.dmm +++ b/_maps/map_files/shuttles/ferry_chem.dmm @@ -83,7 +83,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /turf/simulated/floor/shuttle, diff --git a/_maps/map_files/shuttles/ferry_clown.dmm b/_maps/map_files/shuttles/ferry_clown.dmm index 5216eb4bbb5..79fb0111089 100644 --- a/_maps/map_files/shuttles/ferry_clown.dmm +++ b/_maps/map_files/shuttles/ferry_clown.dmm @@ -99,7 +99,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/bananium/glass{ diff --git a/_maps/map_files/shuttles/ferry_cult.dmm b/_maps/map_files/shuttles/ferry_cult.dmm index 094cacde69a..9c9d8e7c624 100644 --- a/_maps/map_files/shuttles/ferry_cult.dmm +++ b/_maps/map_files/shuttles/ferry_cult.dmm @@ -97,7 +97,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /turf/simulated/floor/engine/cult, /area/shuttle/transport) diff --git a/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm b/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm index 1194537a946..63fd0a5eb3b 100644 --- a/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm +++ b/_maps/map_files/shuttles/ferry_deepdarkdungeon.dmm @@ -50,7 +50,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/hatch{ diff --git a/_maps/map_files/shuttles/ferry_doomsday.dmm b/_maps/map_files/shuttles/ferry_doomsday.dmm index 4e910c53ff6..265517293af 100644 --- a/_maps/map_files/shuttles/ferry_doomsday.dmm +++ b/_maps/map_files/shuttles/ferry_doomsday.dmm @@ -70,7 +70,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm index aca9a9bee30..c9679ea6c2d 100644 --- a/_maps/map_files/shuttles/ferry_meat.dmm +++ b/_maps/map_files/shuttles/ferry_meat.dmm @@ -125,7 +125,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /turf/simulated/floor/shuttle, /area/shuttle/transport) diff --git a/_maps/map_files/shuttles/ferry_medical.dmm b/_maps/map_files/shuttles/ferry_medical.dmm index 4ae45f281dc..2874b7f20f9 100644 --- a/_maps/map_files/shuttles/ferry_medical.dmm +++ b/_maps/map_files/shuttles/ferry_medical.dmm @@ -75,7 +75,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_meteorshelp.dmm b/_maps/map_files/shuttles/ferry_meteorshelp.dmm index 69ed833962e..e7d1734ada9 100644 --- a/_maps/map_files/shuttles/ferry_meteorshelp.dmm +++ b/_maps/map_files/shuttles/ferry_meteorshelp.dmm @@ -23,7 +23,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_mime.dmm b/_maps/map_files/shuttles/ferry_mime.dmm index 768d2afbfe7..aee1beb5e25 100644 --- a/_maps/map_files/shuttles/ferry_mime.dmm +++ b/_maps/map_files/shuttles/ferry_mime.dmm @@ -50,7 +50,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/tranquillite{ diff --git a/_maps/map_files/shuttles/ferry_prisoner.dmm b/_maps/map_files/shuttles/ferry_prisoner.dmm index 1df393b50da..aa785fe5592 100644 --- a/_maps/map_files/shuttles/ferry_prisoner.dmm +++ b/_maps/map_files/shuttles/ferry_prisoner.dmm @@ -15,7 +15,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_slave.dmm b/_maps/map_files/shuttles/ferry_slave.dmm index 30d91567d8b..d5b47d09ba3 100644 --- a/_maps/map_files/shuttles/ferry_slave.dmm +++ b/_maps/map_files/shuttles/ferry_slave.dmm @@ -155,7 +155,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /turf/simulated/floor/shuttle, diff --git a/_maps/map_files/shuttles/ferry_theatrehelp.dmm b/_maps/map_files/shuttles/ferry_theatrehelp.dmm index c55b1a39997..9690851fb4f 100644 --- a/_maps/map_files/shuttles/ferry_theatrehelp.dmm +++ b/_maps/map_files/shuttles/ferry_theatrehelp.dmm @@ -57,7 +57,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_ussp.dmm b/_maps/map_files/shuttles/ferry_ussp.dmm index 88315f76b2b..b37422a4f48 100644 --- a/_maps/map_files/shuttles/ferry_ussp.dmm +++ b/_maps/map_files/shuttles/ferry_ussp.dmm @@ -15,7 +15,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_vip.dmm b/_maps/map_files/shuttles/ferry_vip.dmm index eedc1b6bbfa..b3a2a8c7a1b 100644 --- a/_maps/map_files/shuttles/ferry_vip.dmm +++ b/_maps/map_files/shuttles/ferry_vip.dmm @@ -158,7 +158,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /obj/machinery/door/airlock/shuttle{ diff --git a/_maps/map_files/shuttles/ferry_zoo.dmm b/_maps/map_files/shuttles/ferry_zoo.dmm index 736c225ce9e..898d9d54eb2 100644 --- a/_maps/map_files/shuttles/ferry_zoo.dmm +++ b/_maps/map_files/shuttles/ferry_zoo.dmm @@ -126,7 +126,8 @@ name = "ferry shuttle"; roundstart_move = "ferry_away"; timid = 1; - width = 5 + width = 5; + preferred_direction = 4 }, /obj/structure/fans/tiny, /turf/simulated/floor/noslip{ diff --git a/_maps/map_files/templates/piratbase.dmm b/_maps/map_files/templates/piratbase.dmm index b2937e83da7..881a8228388 100644 --- a/_maps/map_files/templates/piratbase.dmm +++ b/_maps/map_files/templates/piratbase.dmm @@ -705,7 +705,8 @@ name = "Pirate Corvette"; rebuildable = 1; width = 17; - dwidth = 8 + dwidth = 8; + port_direction = 4 }, /obj/docking_port/stationary{ dir = 8; diff --git a/code/__DEFINES/_globals.dm b/code/__DEFINES/_globals.dm index 5eff5ebbc57..57f2abb3d41 100644 --- a/code/__DEFINES/_globals.dm +++ b/code/__DEFINES/_globals.dm @@ -31,6 +31,8 @@ #define GLOBAL_LIST_INIT_TYPED(X, Typepath, InitValue) GLOBAL_RAW(/list##Typepath/X); GLOBAL_MANAGED(X, InitValue) +#define GLOBAL_LIST_EMPTY_TYPED(X, Typepath) GLOBAL_LIST_INIT_TYPED(X, Typepath, list()) + #define GLOBAL_DATUM_INIT(X, Typepath, InitValue) GLOBAL_RAW(Typepath/##X); GLOBAL_MANAGED(X, InitValue) #define GLOBAL_VAR(X) GLOBAL_RAW(/##X); GLOBAL_UNMANAGED(X) diff --git a/code/__DEFINES/dcs/signals_lazy_templates.dm b/code/__DEFINES/dcs/signals_lazy_templates.dm new file mode 100644 index 00000000000..556ad6c886f --- /dev/null +++ b/code/__DEFINES/dcs/signals_lazy_templates.dm @@ -0,0 +1,2 @@ +/// Fired on the lazy template datum when the template is finished loading. (list/loaded_atoms) +#define COMSIG_LAZY_TEMPLATE_LOADED "lazy_template_loaded" diff --git a/code/__DEFINES/dcs/signals_turf.dm b/code/__DEFINES/dcs/signals_turf.dm new file mode 100644 index 00000000000..185183713ca --- /dev/null +++ b/code/__DEFINES/dcs/signals_turf.dm @@ -0,0 +1,2 @@ +///from base of /datum/turf_reservation/proc/Release: (datum/turf_reservation/reservation) +#define COMSIG_TURF_RESERVATION_RELEASED "turf_reservation_released" diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index b224f0706f6..756ab49803e 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -122,10 +122,29 @@ #define DF_VAR_EDITED (1<<1) #define DF_ISPROCESSING (1<<2) -//turf-only flags -#define NOJAUNT 1 -#define NO_LAVA_GEN 2 //Blocks lava rivers being generated on the turf -#define NO_RUINS 4 +//TURF FLAGS +/// If a turf cant be jaunted through. +#define NOJAUNT (1<<0) +/// If a turf is an usused reservation turf awaiting assignment +#define UNUSED_RESERVATION_TURF (1<<1) +/// If a turf is a reserved turf +#define RESERVATION_TURF (1<<2) +/// Blocks lava rivers being generated on the turf. +#define NO_LAVA_GEN (1<<3) +/// Blocks ruins spawning on the turf. +#define NO_RUINS (1<<4) + +//AREA FLAGS +/// If false, loading multiple maps with this area type will create multiple instances. +#define UNIQUE_AREA (1<<0) +/// If mining tunnel generation is allowed in this area +#define CAVES_ALLOWED (1<<1) +/// If flora are allowed to spawn in this area randomly through tunnel generation +#define FLORA_ALLOWED (1<<2) +/// If mobs can be spawned by natural random generation +#define MOB_SPAWN_ALLOWED (1<<3) +/// If megafauna can be spawned by natural random generation +#define MEGAFAUNA_SPAWN_ALLOWED (1<<4) //ORGAN TYPE FLAGS #define AFFECT_ROBOTIC_ORGAN 1 @@ -185,18 +204,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define MOBILITY_FLAGS_CARBON_DEFAULT (MOBILITY_MOVE|MOBILITY_STAND|MOBILITY_PICKUP|MOBILITY_USE|MOBILITY_UI|MOBILITY_STORAGE|MOBILITY_PULL|MOBILITY_REST|MOBILITY_LIEDOWN) #define MOBILITY_FLAGS_REST_CAPABLE_DEFAULT (MOBILITY_MOVE|MOBILITY_STAND|MOBILITY_PICKUP|MOBILITY_USE|MOBILITY_UI|MOBILITY_STORAGE|MOBILITY_PULL|MOBILITY_REST|MOBILITY_LIEDOWN) - -//MINING AREA FLAGS -/// If mining tunnel generation is allowed in this area -#define CAVES_ALLOWED (1<<1) -/// If flora are allowed to spawn in this area randomly through tunnel generation -#define FLORA_ALLOWED (1<<2) -/// If mobs can be spawned by natural random generation -#define MOB_SPAWN_ALLOWED (1<<3) -/// If megafauna can be spawned by natural random generation -#define MEGAFAUNA_SPAWN_ALLOWED (1<<4) - - // timed_action_flags parameter for [/proc/do_after()] /// Can do the action even if mob moves location. #define DA_IGNORE_USER_LOC_CHANGE (1<<0) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 56b86f0524b..d915e3b9cf3 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -117,6 +117,15 @@ #define PLANE_CRITICAL_FUCKO_PARALLAX (PLANE_CRITICAL_DISPLAY|PLANE_CRITICAL_NO_EMPTY_RELAY) +//---------- Plane Master offsetting_flags ------------- +// Describes how different plane masters behave regarding being offset +/// This plane master will not be offset itself, existing only once with an offset of 0 +/// Mostly used for planes that really don't need to be duplicated, like the hud planes +#define BLOCKS_PLANE_OFFSETTING (1<<0) +/// This plane master will have its relays offset to match the highest rendering plane that matches the target +/// Required for making things like the blind fullscreen not render over runechat +#define OFFSET_RELAYS_MATCH_HIGHEST (1<<1) + /// A value of /datum/preference/numeric/multiz_performance that disables the option #define MULTIZ_PERFORMANCE_DISABLE -1 /// We expect at most 3 layers of multiz diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 381b6b2e6f8..4ffa1a41511 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -103,3 +103,4 @@ /// Machines with this flag will not start processing when it's spawned. Use this if you want to manually control when a machine starts processing. #define START_PROCESSING_MANUALLY (1<<1) +#define ORE_REDEMPTION "Плавильная печь" diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index ee9f75b8798..7ced20b795e 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -100,39 +100,6 @@ #define in_range(source, user) (get_dist(source, user) <= 1) -#define RANGE_TURFS(RADIUS, CENTER) \ - RECT_TURFS(RADIUS, RADIUS, CENTER) - -#define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ - block( \ - max(CENTER.x - (H_RADIUS), 1), max(CENTER.y - (V_RADIUS), 1), CENTER.z, \ - min(CENTER.x + (H_RADIUS), world.maxx), min(CENTER.y + (V_RADIUS), world.maxy), CENTER.z \ - ) - -/// Returns the turfs on the edge of a square with CENTER in the middle and with the given RADIUS. If used near the edge of the map, will still work fine. -// order of the additions: top edge + bottom edge + left edge + right edge -#define RANGE_EDGE_TURFS(RADIUS, CENTER)\ - (CENTER.y + RADIUS < world.maxy ? block(max(CENTER.x - RADIUS, 1), min(CENTER.y + RADIUS, world.maxy), CENTER.z, min(CENTER.x + RADIUS, world.maxx), min(CENTER.y + RADIUS, world.maxy), CENTER.z) : list()) +\ - (CENTER.y - RADIUS > 1 ? block(max(CENTER.x - RADIUS, 1), max(CENTER.y - RADIUS, 1), CENTER.z, min(CENTER.x + RADIUS, world.maxx), max(CENTER.y - RADIUS, 1), CENTER.z) : list()) +\ - (CENTER.x - RADIUS > 1 ? block(max(CENTER.x - RADIUS, 1), min(CENTER.y + RADIUS - 1, world.maxy), CENTER.z, max(CENTER.x - RADIUS, 1), max(CENTER.y - RADIUS + 1, 1), CENTER.z) : list()) +\ - (CENTER.x + RADIUS < world.maxx ? block(min(CENTER.x + RADIUS, world.maxx), min(CENTER.y + RADIUS - 1, world.maxy), CENTER.z, min(CENTER.x + RADIUS, world.maxx), max(CENTER.y - RADIUS + 1, 1), CENTER.z) : list()) - -/// Returns a list of turfs in the rectangle specified by BOTTOM LEFT corner and height/width, checks for being outside the world border for you -#define CORNER_BLOCK(corner, width, height) CORNER_BLOCK_OFFSET(corner, width, height, 0, 0) - -/// Returns a list of turfs similar to CORNER_BLOCK but with offsets -#define CORNER_BLOCK_OFFSET(corner, width, height, offset_x, offset_y) ((block(locate(corner.x + offset_x, corner.y + offset_y, corner.z), locate(min(corner.x + (width - 1) + offset_x, world.maxx), min(corner.y + (height - 1) + offset_y, world.maxy), corner.z)))) - -/// Returns an outline (neighboring turfs) of the given block -#define CORNER_OUTLINE(corner, width, height) ( \ - CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, -1) + \ - CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, height) + \ - CORNER_BLOCK_OFFSET(corner, 1, height, -1, 0) + \ - CORNER_BLOCK_OFFSET(corner, 1, height, width, 0)) - -/// Returns a list of around us -#define TURF_NEIGHBORS(turf) (CORNER_BLOCK_OFFSET(turf, 3, 3, -1, -1) - turf) - #define FOR_DVIEW(type, range, center, invis_flags) \ GLOB.dview_mob.loc = center; \ GLOB.dview_mob.set_invis_see(invis_flags); \ diff --git a/code/__DEFINES/multiz.dm b/code/__DEFINES/multiz.dm index 9d167495fa8..370eaa8ba45 100644 --- a/code/__DEFINES/multiz.dm +++ b/code/__DEFINES/multiz.dm @@ -1,4 +1,8 @@ /// Attempt to get the turf below the provided one according to Z traits -#define GET_TURF_BELOW(turf) ((!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_DOWN]) ? null : get_step((turf), DOWN)) +#define GET_TURF_BELOW(turf) ( \ + (turf.turf_flags & RESERVATION_TURF) ? SSmapping.get_reservation_from_turf(turf)?.get_turf_below(turf) : \ + (!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_DOWN]) ? null : get_step((turf), DOWN)) /// Attempt to get the turf above the provided one according to Z traits -#define GET_TURF_ABOVE(turf) ((!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_UP]) ? null : get_step((turf), UP)) +#define GET_TURF_ABOVE(turf) ( \ + (turf.turf_flags & RESERVATION_TURF) ? SSmapping.get_reservation_from_turf(turf)?.get_turf_above(turf) : \ + (!(turf) || !length(SSmapping.multiz_levels) || !SSmapping.multiz_levels[(turf).z][Z_LEVEL_UP]) ? null : get_step((turf), UP)) diff --git a/code/__DEFINES/request_consoles.dm b/code/__DEFINES/request_consoles.dm new file mode 100644 index 00000000000..806eabf4e55 --- /dev/null +++ b/code/__DEFINES/request_consoles.dm @@ -0,0 +1,91 @@ +// Request Console Department Types +#define RC_ASSIST 1 // Request Assistance +#define RC_SUPPLY 2 // Request Supplies +#define RC_INFO 4 // Relay Info + +// Request Console Screens +#define RCS_MAINMENU 0 // Main menu +#define RCS_RQSUPPLY 1 // Request supplies +#define RCS_RQASSIST 2 // Request assistance +#define RCS_SENDINFO 3 // Relay information +#define RCS_SENTPASS 4 // Message sent successfully +#define RCS_SENTFAIL 5 // Message sent unsuccessfully +#define RCS_VIEWMSGS 6 // View messages +#define RCS_MESSAUTH 7 // Authentication before sending +#define RCS_ANNOUNCE 8 // Send announcement +#define RCS_SHIPPING 9 // Print Shipping Labels/Packages +#define RCS_SHIP_LOG 10 // View Shipping Label Log + +// Radio list +#define ENGI_ROLES list(RC_ATMOSPHERICS, RC_MECHANIC, RC_ENGINEERING, RC_CHIEF_ENGINEER_DESK, RC_TECH_STORAGE, RC_TELECOMS_ADMIN) +#define SEC_ROLES list(RC_WARDEN, RC_SECURITY, RC_DETECTIVE, RC_LABOR_CAMP, RC_BRIG_MEDBAY, RC_HEAD_OF_SECURITY_DESK) +#define MISC_ROLES list(RC_BAR, RC_CHAPEL, RC_KITCHEN, RC_HYDROPONICS, RC_JANITORIAL) +#define MED_ROLES list(RC_VIROLOGY, RC_MEDBAY, RC_MORGUE, RC_CHEMISTRY, RC_CHIEF_MEDICAL_OFFICER_DESK) +#define COM_ROLES list(RC_BLUESHIELD, RC_NT_REPRESENTATIVE, RC_HEAD_OF_PERSONNEL_DESK, RC_CAPTAIN_DESK, RC_BRIDGE) +#define SCI_ROLES list(RC_ROBOTICS, RC_SCIENCE, RC_RESEARCH, RC_GENETICS, RC_XENOBIOLOGY, RC_RESEARCH_DIRECTOR_DESK) + +// Request Console Departments + +//Civilian +#define RC_PRIMARY_TOOL_STORAGE "Primary Tool Storage" +#define RC_LOCKER_ROOM "Locker Room" +#define RC_ARRIVAL_SHUTTLE "Arrival Shuttle" +#define RC_CREW_QUARTERS "Crew Quarters" + +// Medical +#define RC_MEDBAY "Medbay" +#define RC_VIROLOGY "Virology" +#define RC_MORGUE "Morgue" +#define RC_CHEMISTRY "Chemistry" + +// RND +#define RC_ROBOTICS "Robotics" +#define RC_SCIENCE "Science" +#define RC_RESEARCH "Research" +#define RC_XENOBIOLOGY "Xenobiology" +#define RC_GENETICS "Genetics" + +// Engineering +#define RC_ENGINEERING "Engineering" +#define RC_TECH_STORAGE "Tech storage" +#define RC_MECHANIC "Mechanic" +#define RC_ATMOSPHERICS "Atmospherics" + +// Security +#define RC_SECURITY "Security" +#define RC_DETECTIVE "Detective" +#define RC_WARDEN "Warden" +#define RC_LABOR_CAMP "Labor Camp" + +// Cargo +#define RC_CARGO_BAY "Cargo Bay" + +// Service +#define RC_BAR "Bar" +#define RC_HYDROPONICS "Hydroponics" +#define RC_JANITORIAL "Janitorial" +#define RC_KITCHEN "Kitchen" +#define RC_CHAPEL "Chapel" + +// Comand +#define RC_RESEARCH_DIRECTOR_DESK "Research Director's Desk" +#define RC_HEAD_OF_PERSONNEL_DESK "Head of Personnel's Desk" +#define RC_CHIEF_ENGINEER_DESK "Chief Engineer's Desk" +#define RC_CHIEF_MEDICAL_OFFICER_DESK "Chief Medical Officer's Desk" +#define RC_QUARTERMASTER_DESK "Quartermaster's Desk" +#define RC_HEAD_OF_SECURITY_DESK "Head of Security's Desk" +#define RC_CAPTAIN_DESK "Captain's Desk" +#define RC_AI "AI" +#define RC_BRIDGE "Bridge" +#define RC_EVA "EVA" + +// Central Command Dependent +#define RC_BLUESHIELD "Blueshield" +#define RC_INTERNAL_AFFAIRS_OFFICE "Internal Affairs Office" +#define RC_NT_REPRESENTATIVE "NT Representative" +#define RC_CENTRAL_COMMAND "Central Command" + +// NOT USED IN MAPS +#define RC_BRIG_MEDBAY "Brig Medbay" +#define RC_TELECOMS_ADMIN "Telecoms Admin" + diff --git a/code/__DEFINES/rituals.dm b/code/__DEFINES/rituals.dm index c33d531225c..463623c9f72 100644 --- a/code/__DEFINES/rituals.dm +++ b/code/__DEFINES/rituals.dm @@ -1,8 +1,8 @@ /// Used in ritual variables -#define DEFAULT_RITUAL_RANGE_FIND 1 -#define DEFAULT_RITUAL_COOLDOWN (100 SECONDS) -#define DEFAULT_RITUAL_DISASTER_PROB 10 -#define DEFAULT_RITUAL_FAIL_PROB 10 +#define DEFAULT_RITUAL_RANGE_FIND 1 +#define DEFAULT_RITUAL_COOLDOWN (100 SECONDS) +#define DEFAULT_RITUAL_DISASTER_PROB 10 +#define DEFAULT_RITUAL_FAIL_PROB 10 /// Ritual object bitflags #define RITUAL_STARTED (1<<0) #define RITUAL_ENDED (1<<1) diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm new file mode 100644 index 00000000000..9fe6a94d9ce --- /dev/null +++ b/code/__DEFINES/shuttles.dm @@ -0,0 +1,51 @@ +// these define the time taken for the shuttle to get to SS13 +// and the time before it leaves again +#define SHUTTLE_CALLTIME 6000 //10 minutes = 6000 deciseconds - time taken for emergency shuttle to reach the station when called (in deciseconds) +#define SHUTTLE_DOCKTIME 1800 //3 minutes = 1800 deciseconds - time taken for emergency shuttle to leave again once it has docked (in deciseconds) +#define SHUTTLE_ESCAPETIME 1200 //2 minutes = 1200 deciseconds - time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) + +//shuttle mode defines +/// Shuttles "ingites" checking for transit zone +#define SHUTTLE_IGNITING "igniting" +/// Idle status +#define SHUTTLE_IDLE "idle" +/// Shuttle in "recall" state. +#define SHUTTLE_RECALL "recall" +/// Shuttle called and is flying to station +#define SHUTTLE_CALL "call" +/// Shuttle docked +#define SHUTTLE_DOCKED "docked" +/// Special state caused by external forces (doomsday device example) +#define SHUTTLE_STRANDED "stranded" +/// Escaped and is returning to CentCom +#define SHUTTLE_ESCAPE "escape" +/// Docked back to CentCom +#define SHUTTLE_ENDGAME "endgame: game over" +/// Shuttle is recharging +#define SHUTTLE_RECHARGING "recharging" + +#define EMERGENCY_IDLE_OR_RECALLED (SSshuttle.emergency && ((SSshuttle.emergency.mode == SHUTTLE_IDLE) || (SSshuttle.emergency.mode == SHUTTLE_RECALL))) +#define EMERGENCY_ESCAPED_OR_ENDGAMED (SSshuttle.emergency && ((SSshuttle.emergency.mode == SHUTTLE_ESCAPE) || (SSshuttle.emergency.mode == SHUTTLE_ENDGAME))) +#define EMERGENCY_AT_LEAST_DOCKED (SSshuttle.emergency && SSshuttle.emergency.mode != SHUTTLE_IDLE && SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_CALL) +#define EMERGENCY_PAST_POINT_OF_NO_RETURN ((SSshuttle.emergency && SSshuttle.emergency.mode == SHUTTLE_CALL && !SSshuttle.canRecall()) || EMERGENCY_AT_LEAST_DOCKED) + +#define SHUTTLE_CONSOLE_RECHARGING "recharging" + +// Shuttle return values +#define SHUTTLE_CAN_DOCK "can_dock" +#define SHUTTLE_NOT_A_DOCKING_PORT "not_a_docking_port" +#define SHUTTLE_DWIDTH_TOO_LARGE "docking_width_too_large" +#define SHUTTLE_WIDTH_TOO_LARGE "width_too_large" +#define SHUTTLE_DHEIGHT_TOO_LARGE "docking_height_too_large" +#define SHUTTLE_HEIGHT_TOO_LARGE "height_too_large" +#define SHUTTLE_ALREADY_DOCKED "we_are_already_docked" +#define SHUTTLE_SOMEONE_ELSE_DOCKED "someone_else_docked" + +// Ripples, effects that signal a shuttle's arrival +#define SHUTTLE_RIPPLE_TIME 100 +#define SHUTTLE_RIPPLE_FADEIN 50 + +#define TRANSIT_REQUEST 1 +#define TRANSIT_READY 2 + +#define SHUTTLE_TRANSIT_BORDER 16 diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index ef24654d9ad..bc88c845735 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -10,43 +10,6 @@ #define MAINT (1<<3) // under maintaince #define EMPED (1<<4) // temporary broken by EMP pulse -/* - Shuttles -*/ - -// these define the time taken for the shuttle to get to SS13 -// and the time before it leaves again -#define SHUTTLE_CALLTIME 6000 //10 minutes = 6000 deciseconds - time taken for emergency shuttle to reach the station when called (in deciseconds) -#define SHUTTLE_DOCKTIME 1800 //3 minutes = 1800 deciseconds - time taken for emergency shuttle to leave again once it has docked (in deciseconds) -#define SHUTTLE_ESCAPETIME 1200 //2 minutes = 1200 deciseconds - time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) - -//shuttle mode defines -#define SHUTTLE_IGNITING 0 -#define SHUTTLE_IDLE 1 -#define SHUTTLE_RECALL 2 -#define SHUTTLE_CALL 3 -#define SHUTTLE_DOCKED 4 -#define SHUTTLE_STRANDED 5 -#define SHUTTLE_ESCAPE 6 -#define SHUTTLE_ENDGAME 7 -#define SHUTTLE_RECHARGING 8 - -#define SHUTTLE_CONSOLE_RECHARGING "recharging" - -// Shuttle return values -#define SHUTTLE_CAN_DOCK "can_dock" -#define SHUTTLE_NOT_A_DOCKING_PORT "not_a_docking_port" -#define SHUTTLE_DWIDTH_TOO_LARGE "docking_width_too_large" -#define SHUTTLE_WIDTH_TOO_LARGE "width_too_large" -#define SHUTTLE_DHEIGHT_TOO_LARGE "docking_height_too_large" -#define SHUTTLE_HEIGHT_TOO_LARGE "height_too_large" -#define SHUTTLE_ALREADY_DOCKED "we_are_already_docked" -#define SHUTTLE_SOMEONE_ELSE_DOCKED "someone_else_docked" - -// Ripples, effects that signal a shuttle's arrival -#define SHUTTLE_RIPPLE_TIME 100 -#define SHUTTLE_RIPPLE_FADEIN 50 - /* Logic */ diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 99c907bbf84..82f12afc7f6 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -16,8 +16,54 @@ /// Used only by /turf/openspace. Show and grants access to what's under. #define TURF_FULLTRANSPARENT 2 +#define CHANGETURF_IGNORE_AIR (1<<0) // This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air +#define CHANGETURF_KEEP_CABLING (1<<1) // This flags prevents from cables being removed. Used in maploader only + #define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS) +//supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a +///Returns a list of turf in a square +#define RANGE_TURFS(RADIUS, CENTER) \ + RECT_TURFS(RADIUS, RADIUS, CENTER) + +#define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ + block( \ + max(CENTER.x - (H_RADIUS), 1), max(CENTER.y - (V_RADIUS), 1), CENTER.z, \ + min(CENTER.x + (H_RADIUS), world.maxx), min(CENTER.y + (V_RADIUS), world.maxy), CENTER.z \ + ) + +/// Returns the turfs on the edge of a square with CENTER in the middle and with the given RADIUS. If used near the edge of the map, will still work fine. +// order of the additions: top edge + bottom edge + left edge + right edge +#define RANGE_EDGE_TURFS(RADIUS, CENTER)\ + (CENTER.y + RADIUS < world.maxy ? block(max(CENTER.x - RADIUS, 1), min(CENTER.y + RADIUS, world.maxy), CENTER.z, min(CENTER.x + RADIUS, world.maxx), min(CENTER.y + RADIUS, world.maxy), CENTER.z) : list()) +\ + (CENTER.y - RADIUS > 1 ? block(max(CENTER.x - RADIUS, 1), max(CENTER.y - RADIUS, 1), CENTER.z, min(CENTER.x + RADIUS, world.maxx), max(CENTER.y - RADIUS, 1), CENTER.z) : list()) +\ + (CENTER.x - RADIUS > 1 ? block(max(CENTER.x - RADIUS, 1), min(CENTER.y + RADIUS - 1, world.maxy), CENTER.z, max(CENTER.x - RADIUS, 1), max(CENTER.y - RADIUS + 1, 1), CENTER.z) : list()) +\ + (CENTER.x + RADIUS < world.maxx ? block(min(CENTER.x + RADIUS, world.maxx), min(CENTER.y + RADIUS - 1, world.maxy), CENTER.z, min(CENTER.x + RADIUS, world.maxx), max(CENTER.y - RADIUS + 1, 1), CENTER.z) : list()) + +/// Returns a list of turfs in the rectangle specified by BOTTOM LEFT corner and height/width, checks for being outside the world border for you +#define CORNER_BLOCK(corner, width, height) CORNER_BLOCK_OFFSET(corner, width, height, 0, 0) + +/// Returns a list of turfs similar to CORNER_BLOCK but with offsets +#define CORNER_BLOCK_OFFSET(corner, width, height, offset_x, offset_y) ((block(locate(corner.x + offset_x, corner.y + offset_y, corner.z), locate(min(corner.x + (width - 1) + offset_x, world.maxx), min(corner.y + (height - 1) + offset_y, world.maxy), corner.z)))) + +/// Returns an outline (neighboring turfs) of the given block +#define CORNER_OUTLINE(corner, width, height) ( \ + CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, -1) + \ + CORNER_BLOCK_OFFSET(corner, width + 2, 1, -1, height) + \ + CORNER_BLOCK_OFFSET(corner, 1, height, -1, 0) + \ + CORNER_BLOCK_OFFSET(corner, 1, height, width, 0)) + +/// Returns a list of around us +#define TURF_NEIGHBORS(turf) (CORNER_BLOCK_OFFSET(turf, 3, 3, -1, -1) - turf) + +///Returns all turfs in a zlevel +#define Z_TURFS(ZLEVEL) block(1,1,ZLEVEL, world.maxx, world.maxy, ZLEVEL) + +///Returns all currently loaded turfs +#define ALL_TURFS(...) block(1, 1, 1, world.maxx, world.maxy, world.maxz) + +#define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3])) + /// Maximum amount of time, (in deciseconds) a tile can be wet for. #define MAXIMUM_WET_TIME (5 MINUTES) diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index cee8eb95a4c..d84c596ee59 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -109,6 +109,8 @@ var/area/affected_areas = list() for(var/turf/the_turf as anything in turfs) var/area/old_area = the_turf.loc + old_area.turfs_to_uncontain += the_turf + newA.contained_turfs += the_turf //keep rack of all areas affected by turf changes affected_areas[old_area.name] = old_area @@ -140,6 +142,14 @@ return TRUE +/proc/require_area_resort() + GLOB.sortedAreas = null + +/// Returns a sorted version of GLOB.areas, by name +/proc/get_sorted_areas() + if(!GLOB.sortedAreas) + GLOB.sortedAreas = sortTim(GLOB.areas.Copy(), /proc/cmp_name_asc) + return GLOB.sortedAreas #undef BLUEPRINTS_MAX_ROOM_SIZE diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 7d02649e2d5..8add087388b 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -346,13 +346,13 @@ GLOBAL_LIST_INIT(adjacent_direction_lookup, generate_adjacent_directions()) var/turned_adjacency = REVERSE_DIR(junction_dir) var/turf/neighbor_turf = get_step(src, turned_adjacency & (NORTH|SOUTH)) var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, offset_spokesman = src, plane = FLOOR_PLANE) - if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) + if(!neighbor_turf?.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) neighbor_turf = get_step(src, turned_adjacency & (EAST|WEST)) - if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) + if(!neighbor_turf?.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) neighbor_turf = get_step(src, turned_adjacency) - if(!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) + if(!neighbor_turf?.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) if(!get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency)) //if all else fails, ask our own turf underlay_appearance.icon = DEFAULT_UNDERLAY_ICON underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 6d54bc934d9..f97fce1531b 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -646,204 +646,179 @@ The _flatIcons list is a cache for generated icon files. */ // Creates a single icon from a given /atom or /image. Only the first argument is required. -/proc/getFlatIcon(image/A, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE) - //Define... defines. - var/static/icon/flat_template = icon('icons/effects/effects.dmi', "nothing") - - #define BLANK icon(flat_template) - #define SET_SELF(SETVAR) do { \ - var/icon/SELF_ICON=icon(icon(curicon, curstate, base_icon_dir),"",SOUTH,no_anim?1:null); \ - if(A.alpha<255) { \ - SELF_ICON.Blend(rgb(255,255,255,A.alpha),ICON_MULTIPLY);\ - } \ - if(A.color) { \ - if(islist(A.color)){ \ - SELF_ICON.MapColors(arglist(A.color))} \ - else{ \ - SELF_ICON.Blend(A.color,ICON_MULTIPLY)} \ - } \ - ##SETVAR=SELF_ICON;\ - } while (0) - #define INDEX_X_LOW 1 - #define INDEX_X_HIGH 2 - #define INDEX_Y_LOW 3 - #define INDEX_Y_HIGH 4 - - #define flatX1 flat_size[INDEX_X_LOW] - #define flatX2 flat_size[INDEX_X_HIGH] - #define flatY1 flat_size[INDEX_Y_LOW] - #define flatY2 flat_size[INDEX_Y_HIGH] - #define addX1 add_size[INDEX_X_LOW] - #define addX2 add_size[INDEX_X_HIGH] - #define addY1 add_size[INDEX_Y_LOW] - #define addY2 add_size[INDEX_Y_HIGH] - - if(!A || A.alpha <= 0) - return BLANK - - var/noIcon = FALSE +/proc/getFlatIcon(image/appearance, defdir, deficon, defstate, defblend, start = TRUE, no_anim = TRUE) + // Loop through the underlays, then overlays, sorting them into the layers list + #define PROCESS_OVERLAYS_OR_UNDERLAYS(flat, process, base_layer) \ + for (var/i in 1 to process.len) { \ + var/image/current = process[i]; \ + if (!current) { \ + continue; \ + } \ + if (current.plane != FLOAT_PLANE && current.plane != appearance.plane) { \ + continue; \ + } \ + var/current_layer = current.layer; \ + if (current_layer < 0) { \ + if (current_layer <= -1000) { \ + return flat; \ + } \ + current_layer = base_layer + appearance.layer + current_layer / 1000; \ + } \ + for (var/index_to_compare_to in 1 to layers.len) { \ + var/compare_to = layers[index_to_compare_to]; \ + if (current_layer < layers[compare_to]) { \ + layers.Insert(index_to_compare_to, current); \ + break; \ + } \ + } \ + layers[current] = current_layer; \ + } + + var/static/icon/flat_template = icon('icons/blanks/32x32.dmi', "nothing") + + if(!appearance || appearance.alpha <= 0) + return icon(flat_template) + if(start) if(!defdir) - defdir = A.dir + defdir = appearance.dir if(!deficon) - deficon = A.icon + deficon = appearance.icon if(!defstate) - defstate = A.icon_state + defstate = appearance.icon_state if(!defblend) - defblend = A.blend_mode + defblend = appearance.blend_mode + + var/curicon = appearance.icon || deficon + var/curstate = appearance.icon_state || defstate + var/curdir = (!appearance.dir || appearance.dir == SOUTH) ? defdir : appearance.dir - var/curicon = A.icon || deficon - var/curstate = A.icon_state || defstate + var/render_icon = curicon - if(!((noIcon = (!curicon)))) + if (render_icon) var/curstates = icon_states(curicon) if(!(curstate in curstates)) - if("" in curstates) + if ("" in curstates) curstate = "" else - noIcon = TRUE // Do not render this object. + render_icon = FALSE - var/curdir - var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have - - //These should use the parent's direction (most likely) - if(!A.dir || A.dir == SOUTH) - curdir = defdir - else - curdir = A.dir + var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have //Try to remove/optimize this section ASAP, CPU hog. //Determines if there's directionals. - if(!noIcon && curdir != SOUTH) - var/exist = FALSE - var/static/list/checkdirs = list(NORTH, EAST, WEST) - for(var/i in checkdirs) //Not using GLOB for a reason. - if(length(icon_states(icon(curicon, curstate, i)))) - exist = TRUE - break - if(!exist) + if(render_icon && curdir != SOUTH) + if ( + !length(icon_states(icon(curicon, curstate, NORTH))) \ + && !length(icon_states(icon(curicon, curstate, EAST))) \ + && !length(icon_states(icon(curicon, curstate, WEST))) \ + ) base_icon_dir = SOUTH - // if(!base_icon_dir) base_icon_dir = curdir - ASSERT(!BLEND_DEFAULT) //I might just be stupid but lets make sure this define is 0. + var/curblend = appearance.blend_mode || defblend - var/curblend = A.blend_mode || defblend - - if(A.overlays.len || A.underlays.len) - var/icon/flat = BLANK + if(appearance.overlays.len || appearance.underlays.len) + var/icon/flat = icon(flat_template) // Layers will be a sorted list of icons/overlays, based on the order in which they are displayed var/list/layers = list() var/image/copy // Add the atom's icon itself, without pixel_x/y offsets. - if(!noIcon) - copy = image(icon=curicon, icon_state=curstate, layer=A.layer, dir=base_icon_dir) - copy.color = A.color - copy.alpha = A.alpha + if(render_icon) + copy = image(icon=curicon, icon_state=curstate, layer=appearance.layer, dir=base_icon_dir) + copy.color = appearance.color + copy.alpha = appearance.alpha copy.blend_mode = curblend - layers[copy] = A.layer - - // Loop through the underlays, then overlays, sorting them into the layers list - for(var/process_set in 0 to 1) - var/list/process = process_set? A.overlays : A.underlays - for(var/i in 1 to process.len) - var/image/current = process[i] - if(!current) - continue - if(current.plane != FLOAT_PLANE && current.plane != A.plane) - continue - var/current_layer = current.layer - if(current_layer < 0) - if(current_layer <= -1000) - return flat - current_layer = process_set + A.layer + current_layer / 1000 - - for(var/p in 1 to layers.len) - var/image/cmp = layers[p] - if(current_layer < layers[cmp]) - layers.Insert(p, current) - break - layers[current] = current_layer + layers[copy] = appearance.layer + + PROCESS_OVERLAYS_OR_UNDERLAYS(flat, appearance.underlays, 0) + PROCESS_OVERLAYS_OR_UNDERLAYS(flat, appearance.overlays, 1) var/icon/add // Icon of overlay being added - // Current dimensions of flattened icon - var/list/flat_size = list(1, flat.Width(), 1, flat.Height()) - // Dimensions of overlay being added - var/list/add_size[4] + var/flatX1 = 1 + var/flatX2 = flat.Width() + var/flatY1 = 1 + var/flatY2 = flat.Height() - for(var/V in layers) - var/image/I = V - if(I.alpha == 0) + var/addX1 = 0 + var/addX2 = 0 + var/addY1 = 0 + var/addY2 = 0 + + for(var/image/layer_image as anything in layers) + if(layer_image.alpha == 0) continue - if(I == copy) // 'I' is an /image based on the object being flattened. + if(layer_image == copy) // 'layer_image' is an /image based on the object being flattened. curblend = BLEND_OVERLAY - add = icon(I.icon, I.icon_state, base_icon_dir) + add = icon(layer_image.icon, layer_image.icon_state, base_icon_dir) else // 'I' is an appearance object. - add = getFlatIcon(image(I), curdir, curicon, curstate, curblend, FALSE, no_anim) + add = getFlatIcon(image(layer_image), curdir, curicon, curstate, curblend, FALSE, no_anim) if(!add) continue + // Find the new dimensions of the flat icon to fit the added overlay - add_size = list( - min(flatX1, I.pixel_x+1), - max(flatX2, I.pixel_x+add.Width()), - min(flatY1, I.pixel_y+1), - max(flatY2, I.pixel_y+add.Height()) + addX1 = min(flatX1, layer_image.pixel_x + 1) + addX2 = max(flatX2, layer_image.pixel_x + add.Width()) + addY1 = min(flatY1, layer_image.pixel_y + 1) + addY2 = max(flatY2, layer_image.pixel_y + add.Height()) + + if ( + addX1 != flatX1 \ + && addX2 != flatX2 \ + && addY1 != flatY1 \ + && addY2 != flatY2 \ ) - - if(flat_size ~! add_size) // Resize the flattened icon so the new icon fits flat.Crop( - addX1 - flatX1 + 1, - addY1 - flatY1 + 1, - addX2 - flatX1 + 1, - addY2 - flatY1 + 1 + addX1 - flatX1 + 1, + addY1 - flatY1 + 1, + addX2 - flatX1 + 1, + addY2 - flatY1 + 1 ) - flat_size = add_size.Copy() + + flatX1 = addX1 + flatX2 = addY1 + flatY1 = addX2 + flatY2 = addY2 // Blend the overlay into the flattened icon - flat.Blend(add, blendMode2iconMode(curblend), I.pixel_x + 2 - flatX1, I.pixel_y + 2 - flatY1) + flat.Blend(add, blendMode2iconMode(curblend), layer_image.pixel_x + 2 - flatX1, layer_image.pixel_y + 2 - flatY1) - if(A.color) - if(islist(A.color)) - flat.MapColors(arglist(A.color)) + if(appearance.color) + if(islist(appearance.color)) + flat.MapColors(arglist(appearance.color)) else - flat.Blend(A.color, ICON_MULTIPLY) + flat.Blend(appearance.color, ICON_MULTIPLY) - if(A.alpha < 255) - flat.Blend(rgb(255, 255, 255, A.alpha), ICON_MULTIPLY) + if(appearance.alpha < 255) + flat.Blend(rgb(255, 255, 255, appearance.alpha), ICON_MULTIPLY) if(no_anim) //Clean up repeated frames var/icon/cleaned = new /icon() cleaned.Insert(flat, "", SOUTH, 1, 0) - . = cleaned + return cleaned else - . = icon(flat, "", SOUTH) - else //There's no overlays. - if(!noIcon) - SET_SELF(.) - - //Clear defines - #undef flatX1 - #undef flatX2 - #undef flatY1 - #undef flatY2 - #undef addX1 - #undef addX2 - #undef addY1 - #undef addY2 - - #undef INDEX_X_LOW - #undef INDEX_X_HIGH - #undef INDEX_Y_LOW - #undef INDEX_Y_HIGH - - #undef BLANK - #undef SET_SELF + return icon(flat, "", SOUTH) + else if (render_icon) // There's no overlays. + var/icon/final_icon = icon(icon(curicon, curstate, base_icon_dir), "", SOUTH, no_anim ? TRUE : null) + + if (appearance.alpha < 255) + final_icon.Blend(rgb(255,255,255, appearance.alpha), ICON_MULTIPLY) + + if (appearance.color) + if (islist(appearance.color)) + final_icon.MapColors(arglist(appearance.color)) + else + final_icon.Blend(appearance.color, ICON_MULTIPLY) + + return final_icon + + #undef PROCESS_OVERLAYS_OR_UNDERLAYS /proc/getIconMask(atom/A)//By yours truly. Creates a dynamic mask for a mob/whatever. /N var/icon/alpha_mask = new(A.icon,A.icon_state)//So we want the default icon and icon state of A. diff --git a/code/__HELPERS/level_traits.dm b/code/__HELPERS/level_traits.dm index ae935df35c7..3575a008d7b 100644 --- a/code/__HELPERS/level_traits.dm +++ b/code/__HELPERS/level_traits.dm @@ -13,6 +13,9 @@ /proc/is_admin_level(z) return check_level_trait(z, ADMIN_LEVEL) +/proc/is_reserved_level(z) + return check_level_trait(z, RESERVED_LEVEL) + /proc/is_away_level(z) return check_level_trait(z, AWAY_LEVEL) diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index 414a16636ec..dfcd3a304a3 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -1,3 +1,39 @@ +/// Datum which stores information about a matrix decomposed with decompose(). +/datum/decompose_matrix + ///? + var/scale_x = 1 + ///? + var/scale_y = 1 + ///? + var/rotation = 0 + ///? + var/shift_x = 0 + ///? + var/shift_y = 0 + +/// Decomposes a matrix into scale, shift and rotation. +/// +/// If other operations were applied on the matrix, such as shearing, the result +/// will not be precise. +/// +/// Negative scales are now supported. =) +/matrix/proc/decompose() + var/datum/decompose_matrix/decompose_matrix = new + . = decompose_matrix + var/flip_sign = (a*e - b*d < 0)? -1 : 1 // Det < 0 => only 1 axis is flipped - start doing some sign flipping + // If both axis are flipped, nothing bad happens and Det >= 0, it just treats it like a 180° rotation + // If only 1 axis is flipped, we need to flip one direction - in this case X, so we flip a, b and the x scaling + decompose_matrix.scale_x = sqrt(a * a + d * d) * flip_sign + decompose_matrix.scale_y = sqrt(b * b + e * e) + decompose_matrix.shift_x = c + decompose_matrix.shift_y = f + if(!decompose_matrix.scale_x || !decompose_matrix.scale_y) + return + // If only translated, scaled and rotated, a/xs == e/ys and -d/xs == b/xy + var/cossine = (a/decompose_matrix.scale_x + e/decompose_matrix.scale_y) / 2 + var/sine = (b/decompose_matrix.scale_y - d/decompose_matrix.scale_x) / 2 * flip_sign + decompose_matrix.rotation = arctan(cossine, sine) * flip_sign + /matrix/proc/TurnTo(old_angle, new_angle) . = new_angle - old_angle Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 631b480129c..caf4f02f671 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -531,45 +531,58 @@ Returns 1 if the chain up to the area contains the given typepath steps++ return TRUE - -//Returns: all the areas in the world -/proc/return_areas() - var/list/area/areas = list() - for(var/area/A in world) - areas += A - return areas - -//Returns: all the areas in the world, sorted. -/proc/return_sorted_areas() - return sortAtom(return_areas()) - //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all areas of that type in the world. -/proc/get_areas(var/areatype) - if(!areatype) return null - if(istext(areatype)) areatype = text2path(areatype) +/proc/get_areas(areatype, subtypes=TRUE) + if(!areatype) + return null + if(istext(areatype)) + areatype = text2path(areatype) if(isarea(areatype)) var/area/areatemp = areatype areatype = areatemp.type - var/list/areas = new/list() - for(var/area/N in world) - if(istype(N, areatype)) areas += N + var/list/areas = list() + if(subtypes) + var/list/cache = typecacheof(areatype) + for(var/area/area_to_check as anything in GLOB.areas) + if(cache[area_to_check.type]) + areas += area_to_check + else + for(var/area/area_to_check as anything in GLOB.areas) + if(area_to_check.type == areatype) + areas += area_to_check return areas //Takes: Area type as text string or as typepath OR an instance of the area. //Returns: A list of all turfs in areas of that type of that type in the world. -/proc/get_area_turfs(var/areatype) - if(!areatype) return null - if(istext(areatype)) areatype = text2path(areatype) +/proc/get_area_turfs(areatype, subtypes=TRUE) + if(!areatype) + return null + if(istext(areatype)) + areatype = text2path(areatype) if(isarea(areatype)) var/area/areatemp = areatype areatype = areatemp.type - var/list/turfs = new/list() - for(var/area/N in world) - if(N.type == areatype) - for(var/turf/T in N) turfs += T + // Pull out the areas + var/list/areas_to_pull = list() + if(subtypes) + var/list/cache = typecacheof(areatype) + for(var/area/area_to_check as anything in GLOB.areas) + if(!cache[area_to_check.type]) + continue + areas_to_pull += area_to_check + else + for(var/area/area_to_check as anything in GLOB.areas) + if(area_to_check.type != areatype) + continue + areas_to_pull += area_to_check + + // Now their turfs + var/list/turfs = list() + for(var/area/pull_from as anything in areas_to_pull) + turfs += pull_from.get_contained_turfs() return turfs //Takes: Area type as text string or as typepath OR an instance of the area. @@ -582,7 +595,7 @@ Returns 1 if the chain up to the area contains the given typepath areatype = areatemp.type var/list/atoms = new/list() - for(var/area/N in world) + for(var/area/N as anything in GLOB.areas) if(istype(N, areatype)) for(var/atom/A in N) atoms += A diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 965ce2e5456..f78faaef94a 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -21,3 +21,11 @@ DEFINE_BITFIELD(datum_flags, list( "DF_VAR_EDITED" = DF_VAR_EDITED, "DF_USE_TAG" = DF_USE_TAG, )) + +DEFINE_BITFIELD(turf_flags, list( + "NOJAUNT" = NOJAUNT, + "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF, + "RESERVATION_TURF" = RESERVATION_TURF, + "NO_LAVA_GEN" = NO_LAVA_GEN, + "NO_RUINS" = NO_RUINS, +)) diff --git a/code/_globalvars/lists/misc.dm b/code/_globalvars/lists/misc.dm index e618c431cec..94ed2142887 100644 --- a/code/_globalvars/lists/misc.dm +++ b/code/_globalvars/lists/misc.dm @@ -49,6 +49,10 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( GLOBAL_LIST_INIT(ruin_landmarks, list()) +/// List of all the maps that have been cached for /proc/load_map +GLOBAL_LIST_EMPTY(cached_maps) + + GLOBAL_LIST_INIT(round_end_sounds, list( 'sound/AI/newroundsexy.ogg' = 2.3 SECONDS, 'sound/misc/apcdestroyed.ogg' = 3 SECONDS, diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index 3d120ec892e..6a4e744fbed 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -18,8 +18,6 @@ GLOBAL_LIST_INIT(celltimers_list, list()) // list of all cell timers GLOBAL_LIST_INIT(cell_logs, list()) GLOBAL_LIST_INIT(navigation_computers, list()) -GLOBAL_LIST_INIT(all_areas, list()) -GLOBAL_LIST_INIT(all_unique_areas, list()) // List of all unique areas. AKA areas with there_can_be_many = FALSE GLOBAL_LIST_INIT(machines, list()) GLOBAL_LIST_INIT(syndiepads, list()) //list of all syndiepads GLOBAL_LIST_INIT(syndie_cargo_consoles, list()) //list of all syndie cargo consoles diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm index 243c072bfde..b85cce5badf 100644 --- a/code/_globalvars/mapping.dm +++ b/code/_globalvars/mapping.dm @@ -1,8 +1,3 @@ -#define Z_NORTH 1 -#define Z_EAST 2 -#define Z_SOUTH 3 -#define Z_WEST 4 - GLOBAL_LIST_INIT(cardinal, list(NORTH, SOUTH, EAST, WEST)) GLOBAL_LIST_INIT(diagonals, list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) @@ -28,6 +23,15 @@ GLOBAL_LIST(global_map) // This is the array of zlevels | list(list(1,5),list(4, //3 - AI satellite //5 - empty space +/// Just a list of all the area objects in the game +/// Note, areas can have duplicate types +GLOBAL_LIST_EMPTY(areas) +/// Used by jump-to-area etc. Updated by area/updateName() +/// If this is null, it needs to be recalculated. Use get_sorted_areas() as a getter please +GLOBAL_LIST_EMPTY(sortedAreas) +/// An association from typepath to area instance. Only includes areas with `unique` set. +GLOBAL_LIST_EMPTY_TYPED(areas_by_type, /area) + GLOBAL_LIST_EMPTY(wizardstart) GLOBAL_LIST_EMPTY(newplayer_start) GLOBAL_LIST_EMPTY(latejoin) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index e4e268cb523..b5d04cac6a0 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -103,7 +103,7 @@ for(var/group_key as anything in master_groups) var/datum/plane_master_group/group = master_groups[group_key] - group.transform_lower_turfs(src, current_plane_offset) + group.build_planes_offset(src, current_plane_offset) /datum/hud/proc/should_use_scale() return should_sight_scale(mymob.sight) @@ -122,10 +122,9 @@ current_plane_offset = new_offset SEND_SIGNAL(src, COMSIG_HUD_OFFSET_CHANGED, old_offset, new_offset) - if(should_use_scale()) - for(var/group_key as anything in master_groups) - var/datum/plane_master_group/group = master_groups[group_key] - group.transform_lower_turfs(src, new_offset) + for(var/group_key as anything in master_groups) + var/datum/plane_master_group/group = master_groups[group_key] + group.build_planes_offset(src, new_offset) /datum/hud/Destroy() if(mymob.hud_used == src) diff --git a/code/_onclick/hud/plane_master/_plane_master.dm b/code/_onclick/hud/plane_master/_plane_master.dm index 6d304e82909..a0876cf82ae 100644 --- a/code/_onclick/hud/plane_master/_plane_master.dm +++ b/code/_onclick/hud/plane_master/_plane_master.dm @@ -18,9 +18,9 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) /// The plane master group we're a member of, our "home" var/datum/plane_master_group/home - /// If our plane master allows for offsetting - /// Mostly used for planes that really don't need to be duplicated, like the hud planes - var/allows_offsetting = TRUE + /// If our plane master has different offsetting logic + /// Possible flags are defined in [_DEFINES/layers.dm] + var/offsetting_flags = NONE /// Our offset from our "true" plane, see below var/offset /// When rendering multiz, lower levels get their own set of plane masters diff --git a/code/_onclick/hud/plane_master/plane_master_group.dm b/code/_onclick/hud/plane_master/plane_master_group.dm index e79f66373e2..9b443102a38 100644 --- a/code/_onclick/hud/plane_master/plane_master_group.dm +++ b/code/_onclick/hud/plane_master/plane_master_group.dm @@ -9,6 +9,8 @@ var/datum/hud/our_hud /// List in the form "[plane]" = object, the plane masters we own var/list/atom/movable/screen/plane_master/plane_masters = list() + /// Does it needs to offset to work properly + var/do_offset = TRUE /// The visual offset we are currently using var/active_offset = 0 /// What, if any, submap we render onto @@ -45,7 +47,7 @@ our_hud = viewing_hud our_hud.master_groups[key] = src show_hud() - transform_lower_turfs(our_hud, active_offset) + build_planes_offset(our_hud, active_offset) /// Hide the plane master from its current hud, fully clear it out /datum/plane_master_group/proc/orphan_hud() @@ -64,7 +66,7 @@ hide_hud() rebuild_plane_masters() show_hud() - transform_lower_turfs(our_hud, active_offset) + build_planes_offset(our_hud, active_offset) /// Regenerate our plane masters, this is useful if we don't have a mob but still want to rebuild. Such in the case of changing the screen_loc of relays /datum/plane_master_group/proc/rebuild_plane_masters() @@ -93,7 +95,7 @@ /datum/plane_master_group/proc/build_plane_masters(starting_offset, ending_offset) for(var/atom/movable/screen/plane_master/mytype as anything in get_plane_types()) for(var/plane_offset in starting_offset to ending_offset) - if(plane_offset != 0 && !initial(mytype.allows_offsetting)) + if(plane_offset != 0 && (initial(mytype.offsetting_flags) & BLOCKS_PLANE_OFFSETTING)) continue var/atom/movable/screen/plane_master/instance = new mytype(null, null, src, plane_offset) plane_masters["[instance.plane]"] = instance @@ -106,7 +108,7 @@ // It would be nice to setup parallaxing for stairs and things when doing this // So they look nicer. if you can't it's all good, if you think you can sanely look at monster's work // It's hard, and potentially expensive. be careful -/datum/plane_master_group/proc/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) +/datum/plane_master_group/proc/build_planes_offset(datum/hud/source, new_offset, use_scale = TRUE) // Check if this feature is disabled for the client, in which case don't use scale. var/mob/our_mob = our_hud?.mymob if(!(our_mob?.canon_client?.prefs.toggles2 & PREFTOGGLE_2_PARALLAX_MULTIZ)) @@ -128,7 +130,7 @@ scale_by = 1 var/list/offsets = list() - var/multiz_boundary = our_mob?.canon_client?.prefs?.multiz_detail + var/multiz_boundary = do_offset ? our_mob?.canon_client?.prefs?.multiz_detail : MULTIZ_DETAIL_LOW //low means no offset // We accept negatives so going down "zooms" away the drop above as it goes for(var/offset in -SSmapping.max_plane_offset to SSmapping.max_plane_offset) // Multiz boundaries disable transforms @@ -150,7 +152,11 @@ for(var/plane_key in plane_masters) var/atom/movable/screen/plane_master/plane = plane_masters[plane_key] - if(!plane.allows_offsetting) + if(plane.offsetting_flags & BLOCKS_PLANE_OFFSETTING) + if(plane.offsetting_flags & OFFSET_RELAYS_MATCH_HIGHEST) + // Don't offset the plane, do offset where the relays point + // Required for making things like the blind fullscreen not render over runechat + plane.offset_relays_in_place(new_offset) continue var/visual_offset = plane.offset - new_offset @@ -175,14 +181,15 @@ /// If you wanna try someday feel free, but I can't manage it /datum/plane_master_group/popup relay_loc = "LEFT,TOP" + do_offset = FALSE -/datum/plane_master_group/popup/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) +/datum/plane_master_group/popup/build_planes_offset(datum/hud/source, new_offset, use_scale = TRUE) return ..(source, new_offset, FALSE) /// Holds the main plane master /datum/plane_master_group/main -/datum/plane_master_group/main/transform_lower_turfs(datum/hud/source, new_offset, use_scale = TRUE) +/datum/plane_master_group/main/build_planes_offset(datum/hud/source, new_offset, use_scale = TRUE) if(use_scale) return ..(source, new_offset, source.should_use_scale()) return ..() diff --git a/code/_onclick/hud/plane_master/plane_master_subtypes.dm b/code/_onclick/hud/plane_master/plane_master_subtypes.dm index 93340abaa3b..0696490d4ff 100644 --- a/code/_onclick/hud/plane_master/plane_master_subtypes.dm +++ b/code/_onclick/hud/plane_master/plane_master_subtypes.dm @@ -258,7 +258,7 @@ appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_planes = list(RENDER_PLANE_NON_GAME) mouse_opacity = MOUSE_OPACITY_TRANSPARENT - allows_offsetting = FALSE + offsetting_flags = BLOCKS_PLANE_OFFSETTING|OFFSET_RELAYS_MATCH_HIGHEST /atom/movable/screen/plane_master/runechat @@ -290,7 +290,7 @@ plane = HUD_PLANE appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_planes = list(RENDER_PLANE_NON_GAME) - allows_offsetting = FALSE + offsetting_flags = BLOCKS_PLANE_OFFSETTING|OFFSET_RELAYS_MATCH_HIGHEST /atom/movable/screen/plane_master/above_hud name = "Above HUD" @@ -298,7 +298,7 @@ plane = ABOVE_HUD_PLANE appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_planes = list(RENDER_PLANE_NON_GAME) - allows_offsetting = FALSE + offsetting_flags = BLOCKS_PLANE_OFFSETTING|OFFSET_RELAYS_MATCH_HIGHEST /atom/movable/screen/plane_master/splashscreen name = "Splashscreen" @@ -306,4 +306,4 @@ plane = SPLASHSCREEN_PLANE appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR render_relay_planes = list(RENDER_PLANE_NON_GAME) - allows_offsetting = FALSE + offsetting_flags = BLOCKS_PLANE_OFFSETTING|OFFSET_RELAYS_MATCH_HIGHEST diff --git a/code/_onclick/hud/plane_master/render_plate.dm b/code/_onclick/hud/plane_master/render_plate.dm index 02608d44716..5290ece4cc9 100644 --- a/code/_onclick/hud/plane_master/render_plate.dm +++ b/code/_onclick/hud/plane_master/render_plate.dm @@ -282,6 +282,8 @@ // That's what this is for if(show_to) show_to.screen += relay + if(offsetting_flags & OFFSET_RELAYS_MATCH_HIGHEST && home.our_hud) + offset_relay(relay, home.our_hud.current_plane_offset) return relay /// Breaks a connection between this plane master, and the passed in place @@ -304,3 +306,40 @@ return relay return null + +/** + * Offsets our relays in place using the given parameter by adjusting their plane and + * layer values, avoiding changing the layer for relays with custom-set layers. + * + * Used in [proc/build_planes_offset] to make the relays for non-offsetting planes + * match the highest rendering plane that matches the target, to avoid them rendering + * on the highest level above things that should be visible. + * + * Parameters: + * - new_offset: the offset we will adjust our relays to + */ +/atom/movable/screen/plane_master/proc/offset_relays_in_place(new_offset) + for(var/atom/movable/render_plane_relay/rpr in relays) + offset_relay(rpr, new_offset) + +/** + * Offsets a given render relay using the given parameter by adjusting its plane and + * layer values, avoiding changing the layer if it has a custom-set layer. + * + * Parameters: + * - rpr: the render plane relay we will offset + * - new_offset: the offset we will adjust it by + */ +/atom/movable/screen/plane_master/proc/offset_relay(atom/movable/render_plane_relay/rpr, new_offset) + var/base_relay_plane = PLANE_TO_TRUE(rpr.plane) + var/old_offset = PLANE_TO_OFFSET(rpr.plane) + rpr.plane = GET_NEW_PLANE(base_relay_plane, new_offset) + + var/old_offset_plane = real_plane - (PLANE_RANGE * old_offset) + var/old_layer = (old_offset_plane + abs(LOWEST_EVER_PLANE * 30)) + if(rpr.layer != old_layer) // Avoid overriding custom-set layers + return + + var/offset_plane = real_plane - (PLANE_RANGE * new_offset) + var/new_layer = (offset_plane + abs(LOWEST_EVER_PLANE * 30)) + rpr.layer = new_layer diff --git a/code/controllers/configuration/entries/config.dm b/code/controllers/configuration/entries/config.dm index f6570a41142..f8e12a2cabe 100644 --- a/code/controllers/configuration/entries/config.dm +++ b/code/controllers/configuration/entries/config.dm @@ -832,3 +832,6 @@ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/str_list/lobby_music + +/datum/config_entry/string/override_away_mission + default = null diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index c326ad0adaf..fc30c731a17 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -322,12 +322,11 @@ SUBSYSTEM_DEF(air) /datum/controller/subsystem/air/proc/setup_allturfs() - var/list/turfs_to_init = block(1, 1, 1, world.maxx, world.maxy, world.maxz) // Clear active turfs - faster than removing every single turf in the world // one-by-one, and Initialize_Atmos only ever adds `src` back in. active_turfs.Cut() var/time = -1 //If it was 0, the very first turfs wouldn't go properly through init. See LINDA_system.dm#95 - for(var/turf/T as anything in turfs_to_init) + for(var/turf/T as anything in ALL_TURFS()) if(T.blocks_air || !T.init_air) continue T.Initialize_Atmos(time) diff --git a/code/controllers/subsystem/area_contents.dm b/code/controllers/subsystem/area_contents.dm new file mode 100644 index 00000000000..9f734340446 --- /dev/null +++ b/code/controllers/subsystem/area_contents.dm @@ -0,0 +1,54 @@ +#define ALLOWED_LOOSE_TURFS 500 +/** + * Responsible for managing the sizes of area.contained_turfs and area.turfs_to_uncontain + * These lists do not check for duplicates, which is fine, but it also means they can balloon in size over time + * as a consequence of repeated changes in area in a space + * They additionally may not always resolve often enough to avoid memory leaks + * This is annoying, so lets keep an eye on them and cut them down to size if needed + */ +SUBSYSTEM_DEF(area_contents) + name = "Area Contents" + flags = SS_NO_INIT + runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT + var/list/currentrun + var/list/area/marked_for_clearing = list() + +/datum/controller/subsystem/area_contents/get_stat_details() + var/total_clearing_from = 0 + var/total_to_clear = 0 + for(var/area/to_clear as anything in marked_for_clearing) + total_to_clear += length(to_clear.turfs_to_uncontain) + total_clearing_from += length(to_clear.contained_turfs) + return "A:[length(currentrun)] MR:[length(marked_for_clearing)] TC:[total_to_clear] CF:[total_clearing_from]" + + +/datum/controller/subsystem/area_contents/fire(resumed) + if(!resumed) + currentrun = GLOB.areas.Copy() + + while(length(currentrun)) + var/area/test = currentrun[length(currentrun)] + if(length(test.turfs_to_uncontain) > ALLOWED_LOOSE_TURFS) + marked_for_clearing |= test + currentrun.len-- + if(MC_TICK_CHECK) + return + + // Alright, if we've done a scan on all our areas, it's time to knock the existing ones down to size + while(length(marked_for_clearing)) + var/area/clear = marked_for_clearing[length(marked_for_clearing)] + + // The operation of cutting large lists can be expensive + // It scales almost directly with the size of the list we're cutting with + // Because of this, we're gonna stick to cutting 1 entry at a time + // There's no reason to batch it I promise, this is faster. No overtime too + var/amount_cut = 0 + var/list/cut_from = clear.turfs_to_uncontain + for(amount_cut in 1 to length(cut_from)) + clear.contained_turfs -= cut_from[amount_cut] + if(MC_TICK_CHECK) + cut_from.Cut(1, amount_cut + 1) + return + + clear.turfs_to_uncontain = list() + marked_for_clearing.len-- diff --git a/code/controllers/subsystem/non-firing/mapping.dm b/code/controllers/subsystem/mapping.dm similarity index 71% rename from code/controllers/subsystem/non-firing/mapping.dm rename to code/controllers/subsystem/mapping.dm index 1680d0cc703..5c4657f5e8a 100644 --- a/code/controllers/subsystem/non-firing/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(mapping) name = "Mapping" init_order = INIT_ORDER_MAPPING // 7 - flags = SS_NO_FIRE + runlevels = ALL ss_id = "mapping" /// What map datum are we using var/datum/map/map_datum @@ -17,6 +17,22 @@ SUBSYSTEM_DEF(mapping) var/list/multiz_levels = list() var/list/areas_in_z = list() + + /// Not actually unused turfs they're unused but reserved for use for whatever requests them. "[zlevel_of_turf]" = list(turfs) + var/list/turf/unused_turfs = list() + /// list of turf reservations + var/list/datum/turf_reservations + /// list of turf = datum/turf_reservation + var/list/used_turfs = list() + /// List of lists of turfs to reserve + var/list/lists_to_reserve = list() + + var/list/reservation_ready = list() + var/clearing_reserved_turfs = FALSE + + /// Amount of reserved levels we created so far. Mostly we will have only one + var/num_of_res_levels = 0 + /// List of z level (as number) -> plane offset of that z level /// Used to maintain the plane cube var/list/z_level_to_plane_offset = list() @@ -102,12 +118,17 @@ SUBSYSTEM_DEF(mapping) previous_maps = maps /datum/controller/subsystem/mapping/Initialize() + if(initialized) + return setupPlanes() find_last_played_maps() var/datum/lavaland_theme/lavaland_theme_type = pick(subtypesof(/datum/lavaland_theme)) ASSERT(lavaland_theme_type) lavaland_theme = new lavaland_theme_type log_startup_progress("We're in the mood for [initial(lavaland_theme.name)] today...") //We load this first. In the event some nerd ever makes a surface map, and we don't have it in lavaland in the event lavaland is disabled. + + require_area_resort() + // Start creating z-levels and content in it // Load all Z level templates preloadTemplates() // Load the station @@ -130,7 +151,6 @@ SUBSYSTEM_DEF(mapping) // Setup the Z-level linkage GLOB.space_manager.do_transition_setup() - generate_z_level_linkages(GLOB.space_manager.z_list) if(!CONFIG_GET(flag/disable_lavaland)) // Spawn Lavaland ruins and rivers. @@ -154,43 +174,38 @@ SUBSYSTEM_DEF(mapping) else log_startup_progress("Skipping lavaland ruins...") + // Create transit/reserve area for shuttle to fly in and out + initialize_reserved_level() + // End creating z-levels + // Re-sort again all areas + require_area_resort() + // reassure that multiz_levels list is filled. (We do it in manage_z_level inside add_new_zlevel) + generate_z_level_linkages(GLOB.space_manager.z_list) + // Now we make a list of areas for teleport locs // TOOD: Make these locs into lists on the SS itself, not globs - - var/list/all_areas = list() - for(var/area/areas in world) - all_areas += areas - - for(var/area/AR as anything in all_areas) + for(var/area/AR as anything in get_sorted_areas()) if(AR.no_teleportlocs) continue if(GLOB.teleportlocs[AR.name]) continue - var/list/pickable_turfs = list() - for(var/turf/turfs in AR) - pickable_turfs += turfs - break - var/turf/picked = safepick(pickable_turfs) - if(picked && is_station_level(picked.z)) + if(!AR.has_contained_turfs()) + continue + if(is_station_level(AR.z)) GLOB.teleportlocs[AR.name] = AR GLOB.teleportlocs = sortAssoc(GLOB.teleportlocs) - for(var/area/AR as anything in all_areas) + for(var/area/AR as anything in get_sorted_areas()) if(GLOB.ghostteleportlocs[AR.name]) continue - var/list/pickable_turfs = list() - for(var/turf/turfs in AR) - pickable_turfs += turfs - break - if(length(pickable_turfs)) - GLOB.ghostteleportlocs[AR.name] = AR + GLOB.ghostteleportlocs[AR.name] = AR GLOB.ghostteleportlocs = sortAssoc(GLOB.ghostteleportlocs) // Now we make a list of areas that exist on the station. Good for if you don't want to select areas that exist for one station but not others. Directly references existing_station_areas = list() - for(var/area/AR as anything in all_areas) + for(var/area/AR as anything in get_sorted_areas()) var/list/pickable_turfs = list() for(var/turf/turfs in AR) pickable_turfs += turfs @@ -207,6 +222,66 @@ SUBSYSTEM_DEF(mapping) return SS_INIT_SUCCESS +/datum/controller/subsystem/mapping/fire(resumed) + // Cache for sonic speed + var/list/unused_turfs = src.unused_turfs + var/list/world_turf_contents = GLOB.areas_by_type[world.area].contained_turfs + var/list/lists_to_reserve = src.lists_to_reserve + var/index = 0 + while(length(lists_to_reserve)) + var/list/packet = lists_to_reserve[index + 1] + var/packetlen = length(packet) + while(packetlen) + if(MC_TICK_CHECK) + lists_to_reserve.Cut(1, index) + return + var/turf/T = packet[packetlen] + T.empty(RESERVED_TURF_TYPE, RESERVED_TURF_TYPE, null, TRUE) + LAZYINITLIST(unused_turfs["[T.z]"]) + unused_turfs["[T.z]"] |= T + var/area/old_area = T.loc + old_area.turfs_to_uncontain += T + T.turf_flags |= UNUSED_RESERVATION_TURF + world_turf_contents += T + packet.len-- + packetlen = length(packet) + + index++ + // If we're here, we're done with that lad + lists_to_reserve.len-- + lists_to_reserve.Cut(1, index) + +/datum/controller/subsystem/mapping/proc/wipe_reservations(wipe_safety_delay = 100) + if(clearing_reserved_turfs || !initialized) //in either case this is just not needed. + return + clearing_reserved_turfs = TRUE + SSshuttle.transit_requesters.Cut() + message_admins("Clearing dynamic reservation space.") + var/list/obj/docking_port/mobile/in_transit = list() + for(var/obj/docking_port/stationary/transit/T in SSshuttle.transit) + if(!istype(T)) + continue + in_transit[T] = T.get_docked() + var/go_ahead = world.time + wipe_safety_delay + if(in_transit.len) + message_admins("Shuttles in transit detected. Attempting to fast travel. Timeout is [go_ahead/10] seconds.") + var/list/cleared = list() + for(var/i in in_transit) + INVOKE_ASYNC(src, PROC_REF(safety_clear_transit_dock), i, in_transit[i], cleared) + UNTIL((go_ahead < world.time) || (cleared.len == in_transit.len)) + do_wipe_turf_reservations() + clearing_reserved_turfs = FALSE + +/datum/controller/subsystem/mapping/proc/safety_clear_transit_dock(obj/docking_port/stationary/transit/T, obj/docking_port/mobile/M, list/returning) + M.setTimer(0) + var/error = M.dock(M.destination) + if(!error) + returning += M + qdel(T, TRUE) + +/datum/controller/subsystem/mapping/proc/get_reservation_from_turf(turf/T) + RETURN_TYPE(/datum/turf_reservation) + return used_turfs[T] /datum/controller/subsystem/mapping/proc/setupPlanes() plane_offset_to_true = list() @@ -322,6 +397,7 @@ SUBSYSTEM_DEF(mapping) GLOB.maploader.load_map(file("_maps/map_files/generic/syndicatebase.dmm"), z_offset = taipan_z_level) log_startup_progress("Loaded Taipan in [stop_watch(watch)]s") +// move it to code/datums/ruins.dm and make global proc plz thx k /datum/controller/subsystem/mapping/proc/seedRuins(list/z_levels = null, budget = 0, whitelist = /area/space, list/potentialRuins) if(!z_levels || !z_levels.len) WARNING("No Z levels provided - Not generating ruins") @@ -411,14 +487,97 @@ SUBSYSTEM_DEF(mapping) log_world("Ruin loader finished with [budget] left to spend.") +/// Adds a new reservation z level. A bit of space that can be handed out on request +/// Of note, reservations default to transit turfs, to make their most common use, shuttles, faster +/datum/controller/subsystem/mapping/proc/add_reservation_zlevel(for_shuttles) + num_of_res_levels++ + var/new_res_z = GLOB.space_manager.add_new_zlevel(RESERVED_ZONE+" #[num_of_res_levels]", linkage = UNAFFECTED, traits = list(ADMIN_LEVEL, BLOCK_TELEPORT, RESERVED_LEVEL)) + return new_res_z + + +/// Requests a /datum/turf_reservation based on the given width, height, and z_size. You can specify a z_reservation to use a specific z level, or leave it null to use any z level. +/datum/controller/subsystem/mapping/proc/request_turf_block_reservation( + width, + height, + z_size = 1, + z_reservation = null, + reservation_type = /datum/turf_reservation, + turf_type_override = null, +) + UNTIL((!z_reservation || reservation_ready["[z_reservation]"]) && !clearing_reserved_turfs) + var/datum/turf_reservation/reserve = new reservation_type + if(!isnull(turf_type_override)) + reserve.turf_type = turf_type_override + if(!z_reservation) + for(var/i in levels_by_trait(RESERVED_LEVEL)) + if(reserve.reserve(width, height, z_size, i)) + return reserve + //If we didn't return at this point, theres a good chance we ran out of room on the exisiting reserved z levels, so lets try a new one + var/datum/space_level/newReserved = add_reservation_zlevel() + initialize_reserved_level(newReserved.zpos) + if(reserve.reserve(width, height, z_size, newReserved.zpos)) + return reserve + else + if(!check_level_trait(z_reservation, RESERVED_LEVEL)) + return + else + if(reserve.reserve(width, height, z_size, z_reservation)) + return reserve + QDEL_NULL(reserve) + +//This is not for wiping reserved levels, use wipe_reservations() for that. +/datum/controller/subsystem/mapping/proc/initialize_reserved_level() + num_of_res_levels++ + var/my_z = GLOB.space_manager.add_new_zlevel(RESERVED_ZONE+" #[num_of_res_levels]", linkage = UNAFFECTED, traits = list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC, RESERVED_LEVEL)) + UNTIL(!clearing_reserved_turfs) //regardless, lets add a check just in case. + clearing_reserved_turfs = TRUE //This operation will likely clear any existing reservations, so lets make sure nothing tries to make one while we're doing it. + var/turf/A = get_turf(locate(SHUTTLE_TRANSIT_BORDER, SHUTTLE_TRANSIT_BORDER, my_z)) + var/turf/B = get_turf(locate(world.maxx - SHUTTLE_TRANSIT_BORDER, world.maxy - SHUTTLE_TRANSIT_BORDER, my_z)) + var/block = block(A, B) + for(var/turf/T in block) + // No need to empty() these, because it's world init and they're already /turf/space. + T.turf_flags |= UNUSED_RESERVATION_TURF + CHECK_TICK + + unused_turfs["[my_z]"] = block + reservation_ready["[my_z]"] = TRUE + clearing_reserved_turfs = FALSE + +/// Schedules a group of turfs to be handed back to the reservation system's control +/// If await is true, will sleep until the turfs are finished work +/datum/controller/subsystem/mapping/proc/reserve_turfs(list/turfs, await = FALSE) + lists_to_reserve += list(turfs) + if(await) + UNTIL(!length(turfs)) + +//DO NOT CALL THIS PROC DIRECTLY, CALL wipe_reservations(). +/datum/controller/subsystem/mapping/proc/do_wipe_turf_reservations() + UNTIL(initialized) //This proc is for AFTER init, before init turf reservations won't even exist and using this will likely break things. + if(SSshuttle && SSshuttle.transit_requesters) + SSshuttle.transit_requesters.Cut() + for(var/i in turf_reservations) + var/datum/turf_reservation/TR = i + if(!QDELETED(TR)) + qdel(TR, TRUE) + UNSETEMPTY(turf_reservations) + var/list/clearing = list() + for(var/l in unused_turfs) //unused_turfs is a assoc list by z = list(turfs) + if(islist(unused_turfs[l])) + clearing |= unused_turfs[l] + //used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already. + clearing |= used_turfs + unused_turfs.Cut() + used_turfs.Cut() + reserve_turfs(clearing, await = TRUE) + /// Generate the turfs of the area /datum/controller/subsystem/mapping/proc/run_map_terrain_generation() - for(var/area/A in world) + for(var/area/A in GLOB.areas) A.RunTerrainGeneration() /// Populate the turfs of the area /datum/controller/subsystem/mapping/proc/run_map_terrain_population() - for(var/area/A in world) + for(var/area/A in GLOB.areas) A.RunTerrainPopulation() /datum/controller/subsystem/mapping/proc/generate_z_level_linkages(z_list) @@ -443,10 +602,12 @@ SUBSYSTEM_DEF(mapping) /// Takes a z level datum, and tells the mapping subsystem to manage it /// Also handles things like plane offset generation, and other things that happen on a z level to z level basis -/datum/controller/subsystem/mapping/proc/manage_z_level(datum/space_level/new_z) +/datum/controller/subsystem/mapping/proc/manage_z_level(datum/space_level/new_z, filled_with_space, contain_turfs = TRUE) // Build our lookup lists var/z_value = new_z.zpos log_debug(z_value) + /// multiz_levels list update + generate_linkages_for_z_level(z_value) // We are guarenteed that we'll always grow bottom up // Suck it jannies z_level_to_plane_offset.len += 1 @@ -463,11 +624,26 @@ SUBSYSTEM_DEF(mapping) if(below_offset) update_plane_tracking(new_z) + if(contain_turfs) + build_area_turfs(z_value, filled_with_space) + // And finally, misc global generation // We'll have to update this if offsets change, because we load lowest z to highest z generate_lighting_appearance_by_z(z_value) +/datum/controller/subsystem/mapping/proc/build_area_turfs(z_level, space_guaranteed) + // If we know this is filled with default tiles, we can use the default area + // Faster + if(space_guaranteed) + var/area/global_area = GLOB.areas_by_type[world.area] + global_area.contained_turfs += Z_TURFS(z_level) + return + + for(var/turf/to_contain as anything in Z_TURFS(z_level)) + var/area/our_area = to_contain.loc + our_area.contained_turfs += to_contain + /datum/controller/subsystem/mapping/proc/update_plane_tracking(datum/space_level/update_with) // We're essentially going to walk down the stack of connected z levels, and set their plane offset as we go var/plane_offset = 0 @@ -523,7 +699,7 @@ SUBSYSTEM_DEF(mapping) var/offset_plane = GET_NEW_PLANE(plane_to_use, plane_offset) var/string_plane = "[offset_plane]" - if(!initial(master_type.allows_offsetting)) + if(initial(master_type.offsetting_flags) & BLOCKS_PLANE_OFFSETTING) plane_offset_blacklist[string_plane] = TRUE var/render_target = initial(master_type.render_target) if(!render_target) @@ -546,7 +722,7 @@ SUBSYSTEM_DEF(mapping) /proc/generate_lighting_appearance_by_z(z_level) if(length(GLOB.default_lighting_underlays_by_z) < z_level) GLOB.default_lighting_underlays_by_z.len = z_level - GLOB.default_lighting_underlays_by_z[z_level] = mutable_appearance(LIGHTING_ICON, "transparent_lighting_object", z_level, null, LIGHTING_PLANE, 255, RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM, offset_const = GET_Z_PLANE_OFFSET(z_level)) + GLOB.default_lighting_underlays_by_z[z_level] = mutable_appearance(LIGHTING_ICON, "transparent_lighting_object", z_level * 0.01, null, LIGHTING_PLANE, 255, RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM, offset_const = GET_Z_PLANE_OFFSET(z_level)) /datum/controller/subsystem/mapping/Recover() flags |= SS_NO_INIT diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 2a075b5d712..0dcf1b4908c 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -1,4 +1,5 @@ #define CALL_SHUTTLE_REASON_LENGTH 12 +#define MAX_TRANSIT_REQUEST_RETRIES 10 SUBSYSTEM_DEF(shuttle) name = "Shuttle" @@ -13,6 +14,11 @@ SUBSYSTEM_DEF(shuttle) var/list/stationary = list() var/list/transit = list() + /// A list of all the mobile docking ports currently requesting a spot in hyperspace. + var/list/transit_requesters = list() + /// An associative list of the mobile docking ports that have failed a transit request, with the amount of times they've actually failed that transit request, up to MAX_TRANSIT_REQUEST_RETRIES + var/list/transit_request_failures = list() + //emergency shuttle stuff var/obj/docking_port/mobile/emergency/emergency var/obj/docking_port/mobile/emergency/backup/backup_shuttle @@ -49,11 +55,12 @@ SUBSYSTEM_DEF(shuttle) cargo_money_account = GLOB.department_accounts["Cargo"] if(!emergency) - WARNING("No /obj/docking_port/mobile/emergency placed on the map!") - if(!backup_shuttle) - WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!") + log_runtime(EXCEPTION("No /obj/docking_port/mobile/emergency placed on the map!")) + if(!backup_shuttle) + message_admins("There's no emergency docking ports on the map! The game will be unresolvable. To resolve this problem load emergency shuttle template manually, and call register() on the mobile docking port.") + log_runtime(EXCEPTION("AND NO /obj/docking_port/mobile/emergency/backup placed on the map!")) if(!supply) - WARNING("No /obj/docking_port/mobile/supply placed on the map!") + log_runtime(EXCEPTION("No /obj/docking_port/mobile/supply placed on the map!")) initial_load() @@ -79,24 +86,52 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/fire(resumed = FALSE) points += points_per_decisecond * wait for(var/thing in mobile) - if(thing) - var/obj/docking_port/mobile/P = thing - P.check() + if(!thing) + mobile.Remove(thing) continue + var/obj/docking_port/mobile/P = thing + P.check() CHECK_TICK - mobile.Remove(thing) + for(var/obj/docking_port/stationary/transit/T in transit) + if(!T.owner) + qdel(T, force=TRUE) + continue + // This next one removes transit docks/zones that aren't + // immediately being used. This will mean that the zone creation + // code will be running a lot. + var/obj/docking_port/mobile/owner = T.owner + if(owner) + var/idle = owner.mode == SHUTTLE_IDLE + var/not_centcom_evac = owner != emergency + var/not_in_use = (!T.get_docked()) + if(idle && not_centcom_evac && not_in_use) + qdel(T, force=TRUE) + + if(!SSmapping.clearing_reserved_turfs) + while(transit_requesters.len) + var/requester = popleft(transit_requesters) + var/success = generate_transit_dock(requester) + if(!success) // BACK OF THE QUEUE + transit_request_failures[requester]++ + if(transit_request_failures[requester] < MAX_TRANSIT_REQUEST_RETRIES) + transit_requesters += requester + else + var/obj/docking_port/mobile/M = requester + M.transit_failure() + if(MC_TICK_CHECK) + break /datum/controller/subsystem/shuttle/proc/getShuttle(id) for(var/obj/docking_port/mobile/M in mobile) if(M.id == id) return M - WARNING("couldn't find shuttle with id: [id]") + log_runtime(EXCEPTION("couldn't find shuttle with id: [id]")) /datum/controller/subsystem/shuttle/proc/getDock(id) for(var/obj/docking_port/stationary/S in stationary) if(S.id == id) return S - WARNING("couldn't find dock with id: [id]") + log_runtime(EXCEPTION("couldn't find dock with id: [id]")) /datum/controller/subsystem/shuttle/proc/secondsToRefuel() var/elapsed = world.time - SSticker.round_start_time @@ -105,9 +140,11 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/requestEvac(mob/user, call_reason) if(!emergency) - WARNING("requestEvac(): There is no emergency shuttle, but the shuttle was called. Using the backup shuttle instead.") + log_runtime(EXCEPTION("requestEvac(): There is no emergency shuttle, but the shuttle was called. Using the backup shuttle instead.")) + message_admins("requestEvac(): There is no emergency shuttle, but the shuttle was called. Using the backup shuttle instead.") if(!backup_shuttle) - WARNING("requestEvac(): There is no emergency shuttle, or backup shuttle!\ + message_admins("requestEvac(): There is no emergency shuttle, or backup shuttle! The game will be unresolvable. This is possibly a mapping error. To resolve this problem load emergency shuttle template manually, and call register() on the mobile docking port.") + WARNING("requestEvac(): There is no emergency shuttle, or backup shuttle! \ The game will be unresolvable.This is possibly a mapping error, \ more likely a bug with the shuttle \ manipulation system, or badminry. It is possible to manually \ @@ -131,6 +168,9 @@ SUBSYSTEM_DEF(shuttle) if(SHUTTLE_DOCKED) to_chat(user, "The emergency shuttle is already here.") return + if(SHUTTLE_IGNITING) + to_chat(user, "The emergency shuttle is firing its engines to leave.") + return if(SHUTTLE_ESCAPE) to_chat(user, "The emergency shuttle is moving away to a safe distance.") return @@ -158,9 +198,6 @@ SUBSYSTEM_DEF(shuttle) add_game_logs("has called the shuttle.", user) message_admins("[key_name_admin(user)] has called the shuttle.") - return - - // Called when an emergency shuttle mobile docking port is // destroyed, which will only happen with admin intervention /datum/controller/subsystem/shuttle/proc/emergencyDeregister() @@ -211,7 +248,7 @@ SUBSYSTEM_DEF(shuttle) break if(callShuttle) - if(emergency.mode < SHUTTLE_CALL) + if(emergency.mode == SHUTTLE_IDLE) emergency.request(null, 2.5) add_game_logs("There is no means of calling the shuttle anymore. Shuttle automatically called.") message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") @@ -253,6 +290,106 @@ SUBSYSTEM_DEF(shuttle) M.areaInstance << M.fly_sound return 0 //dock successful + +/datum/controller/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M) + if(!istype(M)) + throw EXCEPTION("[M] is not a mobile docking port") + + if(M.assigned_transit) + return + else + if(!(M in transit_requesters)) + transit_requesters += M + +/datum/controller/subsystem/shuttle/proc/generate_transit_dock(obj/docking_port/mobile/M) + // First, determine the size of the needed zone + // Because of shuttle rotation, the "width" of the shuttle is not + // always x. + var/travel_dir = M.preferred_direction + // Remember, the direction is the direction we appear to be + // coming from + var/dock_angle = dir2angle(M.preferred_direction) + dir2angle(M.port_direction) + 180 + var/dock_dir = angle2dir(dock_angle) + + var/transit_width = SHUTTLE_TRANSIT_BORDER * 2 + var/transit_height = SHUTTLE_TRANSIT_BORDER * 2 + + // Shuttles travelling on their side have their dimensions swapped + // from our perspective + switch(dock_dir) + if(NORTH, SOUTH) + transit_width += M.width + transit_height += M.height + if(EAST, WEST) + transit_width += M.height + transit_height += M.width + + + var/transit_path = /turf/space/transit + switch(travel_dir) + if(NORTH) + transit_path = /turf/space/transit/north + if(SOUTH) + transit_path = /turf/space/transit/south + if(EAST) + transit_path = /turf/space/transit/east + if(WEST) + transit_path = /turf/space/transit/west + + var/datum/turf_reservation/proposal = SSmapping.request_turf_block_reservation( + transit_width, + transit_height, + 1, + reservation_type = /datum/turf_reservation/transit, + turf_type_override = transit_path, + ) + + if(!istype(proposal)) + return FALSE + + var/turf/bottomleft = proposal.bottom_left_turfs[1] + // Then create a transit docking port in the middle + var/coords = M.return_coords(0, 0, dock_dir) + /* 0------2 + | | + | | + | x | + 3------1 + */ + + var/x0 = coords[1] + var/y0 = coords[2] + var/x1 = coords[3] + var/y1 = coords[4] + // Then we want the point closest to -infinity,-infinity + var/x2 = min(x0, x1) + var/y2 = min(y0, y1) + // Then invert the numbers + var/transit_x = bottomleft.x + SHUTTLE_TRANSIT_BORDER + abs(x2) + var/transit_y = bottomleft.y + SHUTTLE_TRANSIT_BORDER + abs(y2) + + var/turf/midpoint = locate(transit_x, transit_y, bottomleft.z) + if(!midpoint) + return FALSE + var/area/old_area = midpoint.loc + old_area.turfs_to_uncontain += proposal.reserved_turfs + var/area/shuttle/transit/A = new() + A.parallax_movedir = travel_dir + A.contents = proposal.reserved_turfs + A.contained_turfs = proposal.reserved_turfs + var/obj/docking_port/stationary/transit/new_transit_dock = new(midpoint) + new_transit_dock.reserved_area = proposal + new_transit_dock.name = "Transit for [M.id]/[M.name]" + new_transit_dock.owner = M + new_transit_dock.assigned_area = A + + // Add 180, because ports point inwards, rather than outwards + new_transit_dock.setDir(angle2dir(dock_angle)) + + M.assigned_transit = new_transit_dock + return new_transit_dock + + /datum/controller/subsystem/shuttle/proc/initial_move() for(var/obj/docking_port/mobile/M in mobile) if(!M.roundstart_move) @@ -344,3 +481,4 @@ SUBSYSTEM_DEF(shuttle) #undef CALL_SHUTTLE_REASON_LENGTH +#undef MAX_TRANSIT_REQUEST_RETRIES diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 8569ab6a2be..5bedde447e3 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -130,7 +130,7 @@ SUBSYSTEM_DEF(ticker) SSvote.start_vote(new /datum/vote/crew_transfer) next_autotransfer = world.time + CONFIG_GET(number/vote_autotransfer_interval) - var/game_finished = SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || mode.station_was_nuked + var/game_finished = SSshuttle.emergency.mode == SHUTTLE_ENDGAME || mode.station_was_nuked if(CONFIG_GET(flag/continuous_rounds)) mode.check_finished() // some modes contain var-changing code in here, so call even if we don't uses result else diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a6de1c0034c..e998b43c6cc 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1097,14 +1097,14 @@ var/area/detonation_area = null if(alert(usr, "Do you want to pick detonation area yourself? No will randomise it", "Pick objective", "Yes", "No") == "No") for(var/sanity in 1 to 100) // 100 checks at most. - var/area/selected_area = pick(return_sorted_areas()) + var/area/selected_area = pick(get_sorted_areas()) if(selected_area && is_station_level(selected_area.z) && selected_area.valid_territory) //Целью должна быть зона на станции! if(selected_area in bomb_objective.area_blacklist) continue random_detonation_area = selected_area break else - detonation_area = input("Select area:", "Objective area") as null|anything in return_sorted_areas() + detonation_area = input("Select area:", "Objective area") as null|anything in get_sorted_areas() bomb_objective.detonation_location = detonation_area ? detonation_area : random_detonation_area bomb_objective.explanation_text = "Взорвите выданную вам бомбу в [bomb_objective.detonation_location]. Учтите, что бомбу нельзя активировать на не предназначенной для подрыва территории!" @@ -2127,8 +2127,7 @@ return var/list/area_choices = list() - for(var/a in return_sorted_areas()) - var/area/A = a + for(var/area/A in get_sorted_areas()) if(A.outdoors || !is_station_level(A.z)) continue area_choices += A diff --git a/code/datums/outfits/outfit_security_clown.dm b/code/datums/outfits/outfit_security_clown.dm index 9f628a62c9c..23acd23ca3c 100644 --- a/code/datums/outfits/outfit_security_clown.dm +++ b/code/datums/outfits/outfit_security_clown.dm @@ -134,6 +134,7 @@ //=========== security clown equipment =========== /obj/item/pda/clown/security default_cartridge = /obj/item/cartridge/clown + default_request_console_cartridge = /obj/item/cartridge/request_console/clown_security icon_state = "pda-security-clown" desc = "Переносной микрокомпьютер от Синктроник Системс, LTD. Этот КПК разработан по заказу тайного покупателя, пожелавшего хонкнуться нераскрытым. Поверхность покрыта политетрафторэтиленом и банановым налётом." ttone = "honk" diff --git a/code/datums/outfits/plasmamen.dm b/code/datums/outfits/plasmamen.dm index adbb0d9120c..4c2ceef46cf 100644 --- a/code/datums/outfits/plasmamen.dm +++ b/code/datums/outfits/plasmamen.dm @@ -104,6 +104,12 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/cargo uniform = /obj/item/clothing/under/plasmaman/cargo +/datum/outfit/plasmaman/qm + name = "Quartermaster Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/qm + uniform = /obj/item/clothing/under/plasmaman/qm + /datum/outfit/plasmaman/mining name = "Mining Plasmaman" @@ -116,6 +122,24 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/medical uniform = /obj/item/clothing/under/plasmaman/medical +/datum/outfit/plasmaman/brigdoc + name = "Brigmed Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/brigphysician + uniform = /obj/item/clothing/under/plasmaman/brigphysician + +/datum/outfit/plasmaman/paramedic + name = "Paramedic Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/paramedic + uniform = /obj/item/clothing/under/plasmaman/paramedic + +/datum/outfit/plasmaman/coroner + name = "Coroner Plasmaman" + + head = /obj/item/clothing/head/helmet/space/plasmaman/medical/coroner + uniform = /obj/item/clothing/under/plasmaman/coroner + /datum/outfit/plasmaman/cmo name = "Chief Medical Officer Plasmaman" @@ -173,7 +197,7 @@ /datum/outfit/plasmaman/engineering/mecha name = "Mechanic Plasmaman" head = /obj/item/clothing/head/helmet/space/plasmaman/engineering/mecha - uniform = /obj/item/clothing/under/plasmaman/engineering + uniform = /obj/item/clothing/under/plasmaman/mechanic /datum/outfit/plasmaman/ce name = "Chief Engineer Plasmaman" diff --git a/code/datums/rituals.dm b/code/datums/rituals.dm index ddc50d1f680..b9bbb005f19 100644 --- a/code/datums/rituals.dm +++ b/code/datums/rituals.dm @@ -156,7 +156,7 @@ LAZYADD(invokers_list, invoker) for(var/mob/living/carbon/human/human as anything in invokers_list) - if(!do_after(human, cast_time, ritual_object, extra_checks = CALLBACK(src, PROC_REF(action_check_contents)))) + if(!do_after(human, cast_time, ritual_object, DA_IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, PROC_REF(action_check_contents)))) . = FALSE return . @@ -385,7 +385,7 @@ fail_chance = 50 extra_invokers = 1 cooldown_after_cast = 480 SECONDS - cast_time = 70 SECONDS + cast_time = 30 SECONDS ritual_should_del_things_on_fail = TRUE required_things = list( /obj/item/twohanded/spear = 3, @@ -439,15 +439,20 @@ fail_chance = 30 shaman_only = TRUE cooldown_after_cast = 900 SECONDS - cast_time = 50 SECONDS + cast_time = 30 SECONDS extra_invokers = 1 /datum/ritual/ashwalker/summon/do_ritual(mob/living/carbon/human/invoker) var/list/ready_for_summoning = list() for(var/mob/living/carbon/human/human in GLOB.mob_list) - if(isashwalker(human)) - LAZYADD(ready_for_summoning, human) + if(!human.ckey) + continue + + if(!isashwalker(human)) + continue + + LAZYADD(ready_for_summoning, human) if(!LAZYLEN(ready_for_summoning)) return RITUAL_FAILED_ON_PROCEED @@ -457,17 +462,24 @@ if(!human) return RITUAL_FAILED_ON_PROCEED - LAZYADD(invokers, invoker) + deal_damage() + summon(human) - for(var/mob/living/carbon/human/summoner as anything in invokers) + return RITUAL_SUCCESSFUL + +/datum/ritual/ashwalker/summon/proc/deal_damage() + for(var/mob/living/carbon/human/summoner in range(finding_range, ritual_object)) summoner.blood_volume -= (summoner.blood_volume * 0.20) summoner.apply_damage(25, def_zone = pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) - human.forceMove(ritual_object) + return TRUE + +/datum/ritual/ashwalker/summon/proc/summon(mob/living/carbon/human/human) + human.forceMove(get_turf(ritual_object)) human.vomit() human.Weaken(10 SECONDS) - return RITUAL_SUCCESSFUL + return TRUE /datum/ritual/ashwalker/summon/disaster(mob/living/carbon/human/invoker) if(!prob(70)) @@ -499,7 +511,7 @@ disaster_prob = 30 fail_chance = 30 cooldown_after_cast = 600 SECONDS - cast_time = 60 SECONDS + cast_time = 30 SECONDS charges = 3 shaman_only = TRUE extra_invokers = 2 @@ -565,7 +577,7 @@ fail_chance = 40 charges = 1 cooldown_after_cast = 800 SECONDS - cast_time = 80 SECONDS + cast_time = 30 SECONDS shaman_only = TRUE extra_invokers = 4 required_things = list( @@ -640,7 +652,7 @@ charges = 3 extra_invokers = 2 cooldown_after_cast = 180 SECONDS - cast_time = 100 SECONDS + cast_time = 30 SECONDS shaman_only = TRUE disaster_prob = 25 fail_chance = 35 @@ -707,7 +719,7 @@ disaster_prob = 30 fail_chance = 50 cooldown_after_cast = 360 SECONDS - cast_time = 90 SECONDS + cast_time = 30 SECONDS shaman_only = TRUE required_things = list( /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 1, @@ -788,7 +800,7 @@ extra_invokers = 2 charges = 1 cooldown_after_cast = 120 SECONDS - cast_time = 40 SECONDS + cast_time = 30 SECONDS ritual_should_del_things_on_fail = TRUE required_things = list( /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit = 1, @@ -872,7 +884,7 @@ name = "Soul ritual" extra_invokers = 3 cooldown_after_cast = 1200 SECONDS - cast_time = 60 SECONDS + cast_time = 30 SECONDS required_things = list( /mob/living/carbon/human = 3, /obj/item/stack/sheet/animalhide/ashdrake = 1 @@ -1085,7 +1097,7 @@ cooldown_after_cast = 150 SECONDS shaman_only = TRUE extra_invokers = 2 - cast_time = 60 SECONDS + cast_time = 30 SECONDS required_things = list( /mob/living/carbon/human = 2 ) @@ -1161,7 +1173,7 @@ shaman_only = TRUE disaster_prob = 35 extra_invokers = 1 - cast_time = 60 SECONDS + cast_time = 30 SECONDS required_things = list( /mob/living/simple_animal = 1, /obj/item/organ/internal/regenerative_core = 1, diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm index 0c3d4db56e1..e4b561170c9 100644 --- a/code/datums/ruins.dm +++ b/code/datums/ruins.dm @@ -26,3 +26,41 @@ mappath = prefix + suffix ..(path = mappath) +/datum/map_template/ruin/proc/try_to_place(z, allowed_areas) + var/sanity = PLACEMENT_TRIES + while(sanity > 0) + sanity-- + var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(width / 2) + var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(height / 2) + var/turf/central_turf = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z) + var/valid = TRUE + + for(var/turf/check in get_affected_turfs(central_turf,1)) + var/area/new_area = get_area(check) + if(!(istype(new_area, allowed_areas)) || check.turf_flags & NO_RUINS) + valid = FALSE + break + + if(!valid) + continue + + log_world("Ruin \"[name]\" placed at ([central_turf.x], [central_turf.y], [central_turf.z])") + + for(var/i in get_affected_turfs(central_turf, 1)) + var/turf/T = i + for(var/obj/structure/spawner/nest in T) + qdel(nest) + for(var/mob/living/simple_animal/monster in T) + qdel(monster) + for(var/obj/structure/flora/ash/plant in T) + qdel(plant) + + load(central_turf,centered = TRUE) + loaded++ + + for(var/turf/T in get_affected_turfs(central_turf, 1)) + T.turf_flags |= NO_RUINS + + new /obj/effect/landmark/ruin(central_turf, src) + return TRUE + return FALSE diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 0a525769ad5..5a149ea7dc0 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) /obj/effect/proc_holder/spell/proc/invocation(mob/user = usr) //spelling the spell out and setting it on recharge/reducing charges amount switch(invocation_type) if("shout") - if(!user.IsVocal()) + if(!user.IsVocal() || user.cannot_speak_loudly()) user.custom_emote(EMOTE_VISIBLE, "дела%(ет,ют)% безумные жесты!") else if(prob(50))//Auto-mute? Fuck that noise diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 16af8085544..35188b7f1fe 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -123,7 +123,7 @@ /obj/effect/dummy/spell_jaunt/proc/can_move(turf/target_turf, mob/user) - if(target_turf.flags & NOJAUNT) + if(target_turf.turf_flags & NOJAUNT) return FALSE var/dir = get_dir_multiz(get_turf(src), target_turf) if(dir & (UP|DOWN)) diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index 7bae9da4316..09d8a024805 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -55,8 +55,7 @@ affectareas += V for(var/V in protected_areas) affectareas -= get_areas(V) - for(var/V in affectareas) - var/area/A = V + for(var/area/A in affectareas) if(A.z in impacted_z_levels) impacted_areas |= A CHECK_TICK diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm index c5e6610a26e..cddd6ae0bd8 100644 --- a/code/datums/weather/weather_types/ash_storm.dm +++ b/code/datums/weather/weather_types/ash_storm.dm @@ -41,19 +41,12 @@ /datum/weather/ash_storm/proc/update_eligible_areas() var/list/eligible_areas = list() for(var/z in impacted_z_levels) - eligible_areas += GLOB.space_manager.areas_in_z["[z]"] - - // Don't play storm audio to shuttles that are not at lavaland - var/miningShuttleDocked = is_shuttle_docked("mining", "mining_away") - if(!miningShuttleDocked) - eligible_areas -= get_areas(/area/shuttle/mining) - - var/laborShuttleDocked = is_shuttle_docked("laborcamp", "laborcamp_away") - if(!laborShuttleDocked) - eligible_areas -= get_areas(/area/shuttle/siberia) + eligible_areas += SSmapping.areas_in_z["[z]"] for(var/i in 1 to eligible_areas.len) var/area/place = eligible_areas[i] + if(istype(place, /area/shuttle)) // Don't play storm audio to shuttles that are not at lavaland + continue if(place.outdoors) outside_areas |= place else diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm index 90e051a827c..4aa454b8ff4 100644 --- a/code/datums/weather/weather_types/snow_storm.dm +++ b/code/datums/weather/weather_types/snow_storm.dm @@ -31,7 +31,7 @@ /datum/weather/snow_storm/proc/update_eligible_areas() var/list/eligible_areas = list() for(var/z in impacted_z_levels) - eligible_areas += GLOB.space_manager.areas_in_z["[z]"] + eligible_areas += SSmapping.areas_in_z["[z]"] for(var/i in 1 to eligible_areas.len) var/area/place = eligible_areas[i] diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 374e9206374..9469b60ba46 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -10,9 +10,18 @@ icon_state = "unknown" layer = AREA_LAYER plane = AREA_PLANE //Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE. - luminosity = 0 mouse_opacity = MOUSE_OPACITY_TRANSPARENT invisibility = INVISIBILITY_LIGHTING + + /// List of all turfs currently inside this area. Acts as a filtered bersion of area.contents + /// For faster lookup (area.contents is actually a filtered loop over world) + /// Semi fragile, but it prevents stupid so I think it's worth it + var/list/turf/contained_turfs = list() + /// Contained turfs is a MASSIVE list, so rather then adding/removing from it each time we have a problem turf + /// We should instead store a list of turfs to REMOVE from it, then hook into a getter for it + /// There is a risk of this and contained_turfs leaking, so a subsystem will run it down to 0 incrementally if it gets too large + var/list/turf/turfs_to_uncontain = list() + var/valid_territory = TRUE //used for cult summoning areas on station zlevel var/map_name // Set in New(); preserves the name set by the map maker, even if renamed by the Blueprints. var/lightswitch = TRUE @@ -48,12 +57,6 @@ var/xenobiology_compatible = FALSE //Can the Xenobio management console transverse this area by default? var/nad_allowed = FALSE //is the station NAD allowed on this area? - // This var is used with the maploader (modules/awaymissions/maploader/reader.dm) - // if this is 1, when used in a map snippet, this will instantiate a unique - // area from any other instances already present (meaning you can have - // separate APCs, and so on) - var/there_can_be_many = FALSE - var/global/global_uid = 0 var/uid @@ -75,7 +78,9 @@ var/can_get_auto_cryod = TRUE var/hide_attacklogs = FALSE // For areas such as thunderdome, lavaland syndiebase, etc which generate a lot of spammy attacklogs. Reduces log priority. + ///Used by shuttle to move space visually. It is set by docking_port/mobile.preferred_direction var/parallax_movedir = 0 + ///Sets if area/shuttle is in move or not var/moving = FALSE /// "Haunted" areas such as the morgue and chapel are easier to boo. Because flavor. var/is_haunted = FALSE @@ -90,12 +95,14 @@ ///This datum, if set, allows terrain generation behavior to be ran on Initialize() // This is unfinished, used in Lavaland var/datum/map_generator/cave_generator/map_generator - var/area_flags = 0 + var/area_flags = NONE /area/New(loc, ...) - if(!there_can_be_many) // Has to be done in New else the maploader will fuck up and find subtypes for the parent - GLOB.all_unique_areas[type] = src - GLOB.all_areas += src + // This interacts with the map loader, so it needs to be set immediately + // rather than waiting for atoms to initialize. + if (area_flags & UNIQUE_AREA) + GLOB.areas_by_type[type] = src + GLOB.areas += src ..() /area/Initialize(mapload) @@ -111,17 +118,11 @@ base_lighting_color = null static_lighting = TRUE - - if(requires_power) - luminosity = 0 - else + if(!requires_power) power_light = TRUE power_equip = TRUE power_environ = TRUE - if(static_lighting) - luminosity = 0 - . = ..() if(!static_lighting) @@ -137,22 +138,21 @@ . = ..() power_change() // all machines set to current power level, also updates lighting icon +/** + * Register this area as belonging to a z level + * + * Ensures the item is added to the SSmapping.areas_in_z list for this z + */ /area/proc/reg_in_areas_in_z() - if(contents.len) - var/list/areas_in_z = GLOB.space_manager.areas_in_z - var/z - for(var/i in 1 to contents.len) - var/atom/thing = contents[i] - if(!thing) - continue - z = thing.z - break - if(!z) - WARNING("No z found for [src]") - return - if(!areas_in_z["[z]"]) - areas_in_z["[z]"] = list() - areas_in_z["[z]"] += src + if(!has_contained_turfs()) + return + var/list/areas_in_z = SSmapping.areas_in_z + if(!z) + WARNING("No z found for [src]") + return + if(!areas_in_z["[z]"]) + areas_in_z["[z]"] = list() + areas_in_z["[z]"] += src /area/proc/get_cameras() var/list/cameras = list() @@ -215,8 +215,29 @@ else if(firedoor.density) INVOKE_ASYNC(firedoor, TYPE_PROC_REF(/obj/machinery/door/firedoor, open)) +/area/proc/get_contained_turfs() + if(length(turfs_to_uncontain)) + cannonize_contained_turfs() + return contained_turfs + +/// Ensures that the contained_turfs list properly represents the turfs actually inside us +/area/proc/cannonize_contained_turfs() + // This is massively suboptimal for LARGE removal lists + // Try and keep the mass removal as low as you can. We'll do this by ensuring + // We only actually add to contained turfs after large changes (Also the management subsystem) + // Do your damndest to keep turfs out of /area/space as a stepping stone + // That sucker gets HUGE and will make this take actual tens of seconds if you stuff turfs_to_uncontain + contained_turfs -= turfs_to_uncontain + turfs_to_uncontain = list() + +/// Returns TRUE if we have contained turfs, FALSE otherwise +/area/proc/has_contained_turfs() + return length(contained_turfs) - length(turfs_to_uncontain) > 0 /area/Destroy() + if(GLOB.areas_by_type[type] == src) + GLOB.areas_by_type[type] = null + GLOB.areas -= src STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/game/area/ss13_areas.dm b/code/game/area/ss13_areas.dm index 2b86eaa3fed..010db83df7d 100644 --- a/code/game/area/ss13_areas.dm +++ b/code/game/area/ss13_areas.dm @@ -57,7 +57,7 @@ This applies to all STANDARD station areas outdoors = TRUE ambientsounds = SPACE_SOUNDS sound_environment = SOUND_AREA_SPACE - there_can_be_many = TRUE + area_flags = UNIQUE_AREA /area/space/nearstation icon_state = "space_near" @@ -89,7 +89,6 @@ This applies to all STANDARD station areas valid_territory = FALSE has_gravity = STANDARD_GRAVITY static_lighting = TRUE - parallax_movedir = NORTH sound_environment = SOUND_ENVIRONMENT_ROOM /area/shuttle/arrival @@ -187,8 +186,6 @@ This applies to all STANDARD station areas /area/shuttle/transport icon_state = "shuttle" - name = "Transport Shuttle" - parallax_movedir = EAST /area/shuttle/transport1 icon_state = "shuttle" @@ -224,7 +221,6 @@ This applies to all STANDARD station areas /area/shuttle/specops name = "Special Ops Shuttle" icon_state = "shuttlered" - parallax_movedir = EAST /area/shuttle/specops/centcom name = "Special Ops Shuttle" @@ -238,7 +234,6 @@ This applies to all STANDARD station areas name = "Syndicate Elite Shuttle" icon_state = "shuttlered" nad_allowed = TRUE - parallax_movedir = SOUTH /area/shuttle/syndicate_elite/mothership name = "Syndicate Elite Shuttle" @@ -252,7 +247,6 @@ This applies to all STANDARD station areas name = "Syndicate SIT Shuttle" icon_state = "shuttlered" nad_allowed = TRUE - parallax_movedir = SOUTH /area/shuttle/assault_pod name = "Steel Rain" @@ -265,7 +259,6 @@ This applies to all STANDARD station areas /area/shuttle/administration name = "Nanotrasen Vessel" icon_state = "shuttlered" - parallax_movedir = WEST /area/shuttle/administration/centcom name = "Nanotrasen Vessel Centcom" @@ -364,7 +357,6 @@ This applies to all STANDARD station areas /area/shuttle/salvage/abandoned_ship name = "Abandoned Ship" icon_state = "yellow" - parallax_movedir = WEST /area/shuttle/salvage/clown_asteroid name = "Clown Asteroid" @@ -405,7 +397,6 @@ This applies to all STANDARD station areas /area/shuttle/trade/sol name = "Sol Freighter" - parallax_movedir = WEST /area/shuttle/freegolem name = "Free Golem Ship" @@ -416,6 +407,14 @@ This applies to all STANDARD station areas name = "Pirate Corvette" icon_state = "shuttle" +/area/shuttle/transit + name = "Hyperspace" + desc = "Weeeeee" + static_lighting = FALSE + base_lighting_color = COLOR_WHITE + base_lighting_alpha = 255 + + /area/airtunnel1/ // referenced in airtunnel.dm:759 /area/dummy/ // Referenced in engine.dm:261 @@ -642,7 +641,7 @@ This applies to all STANDARD station areas /area/exploration/methlab name = "Abandoned Drug Lab" icon_state = "green" - there_can_be_many = TRUE + area_flags = UNIQUE_AREA has_gravity = STANDARD_GRAVITY //Abductors @@ -1841,7 +1840,7 @@ This applies to all STANDARD station areas name = "Unknown Teleporter" icon_state = "teleporter" ambientsounds = list('sound/ambience/ambimalf.ogg', 'sound/ambience/signal.ogg') - there_can_be_many = TRUE + area_flags = UNIQUE_AREA /area/toxins/explab name = "E.X.P.E.R.I-MENTOR Lab" @@ -2442,7 +2441,7 @@ This applies to all STANDARD station areas /area/djstation name = "Ruskie DJ Station" icon_state = "DJ" - there_can_be_many = TRUE + area_flags = UNIQUE_AREA has_gravity = STANDARD_GRAVITY /area/djstation/solars @@ -2565,7 +2564,7 @@ This applies to all STANDARD station areas /area/derelict/teleporter name = "Derelict Teleporter" icon_state = "teleporter" - there_can_be_many = TRUE + area_flags = UNIQUE_AREA /area/derelict/annex name = "Derelict Annex" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 755a19232bb..dd61d7c4241 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -179,14 +179,21 @@ if(!T) return + if(is_reserved_level(T.z)) + for(var/obj/docking_port/mobile/mobile in SSshuttle.mobile) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) + for(var/area/shuttle/shuttle_area in mobile.shuttle_areas) + if(T in shuttle_area) + return TRUE + if(!is_admin_level(T.z))//if not, don't bother return - //check for centcomm shuttles - for(var/centcom_shuttle in list("emergency", "pod1", "pod2", "pod3", "pod4", "ferry")) - var/obj/docking_port/mobile/M = SSshuttle.getShuttle(centcom_shuttle) - if(T in M.areaInstance) - return TRUE + //Check for centcom shuttles + for(var/obj/docking_port/mobile/mobile in SSshuttle.mobile) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) + if(T in mobile.areaInstance) + return TRUE //finally check for centcom itself return istype(T.loc, /area/centcom) diff --git a/code/game/gamemodes/antag_paradise/antag_paradise.dm b/code/game/gamemodes/antag_paradise/antag_paradise.dm index fd86374286d..e0187d71d54 100644 --- a/code/game/gamemodes/antag_paradise/antag_paradise.dm +++ b/code/game/gamemodes/antag_paradise/antag_paradise.dm @@ -42,7 +42,7 @@ /datum/game_mode/antag_paradise/process() - if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) return PROCESS_KILL if(!COOLDOWN_STARTED(src, antag_making_cooldown) || !COOLDOWN_FINISHED(src, antag_making_cooldown)) diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index bb38bd19105..0cc8ef5626e 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -23,7 +23,7 @@ /datum/game_mode/traitor/autotraitor/proc/autotraitor_check(max_traitors = 1) - if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) return message_admins("Performing AutoTraitor Check") diff --git a/code/game/gamemodes/clockwork/clockwork_objectives.dm b/code/game/gamemodes/clockwork/clockwork_objectives.dm index 9342de8ca9a..f8fa9b2cc51 100644 --- a/code/game/gamemodes/clockwork/clockwork_objectives.dm +++ b/code/game/gamemodes/clockwork/clockwork_objectives.dm @@ -141,7 +141,7 @@ ritual_spots = new() var/sanity = 0 while(length(ritual_spots) < RATVAR_SUMMON_POSSIBILITIES && sanity < 100) - var/area/summon = pick(return_sorted_areas() - ritual_spots) + var/area/summon = pick(get_sorted_areas() - ritual_spots) var/valid_spot = FALSE if(summon && is_station_level(summon.z) && summon.valid_territory) // Check if there's a turf that you can walk on, if not it's not valid for(var/turf/T as anything in get_area_turfs(summon)) diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index 4f857df6f01..edb74a71734 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -166,7 +166,7 @@ summon_spots = new() var/sanity = 0 while(length(summon_spots) < SUMMON_POSSIBILITIES && sanity < 100) - var/area/summon = pick(return_sorted_areas() - summon_spots) + var/area/summon = pick(get_sorted_areas() - summon_spots) var/valid_spot = FALSE if(summon && is_station_level(summon.z) && summon.valid_territory) // Check if there's a turf that you can walk on, if not it's not valid for(var/turf/T as anything in get_area_turfs(summon)) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index e628ab013cd..fbdc4c534a2 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -182,7 +182,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(!L) return if(invocation) - if(!L.IsVocal()) + if(!L.IsVocal() || L.cannot_speak_loudly()) L.custom_emote(EMOTE_VISIBLE, message = pick("рису%(ет,ют)% в воздухе тайные символы.","зловеще жестикулиру%(ет,ют)%.","молча произнос%(ит,ят)% слова призыва.","клад%(ёт,ут)% руки на руну, активируя ее.")) else L.say(invocation) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 6796065e042..8ef7feab05c 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -176,7 +176,7 @@ * Check to be called by ticker */ /datum/game_mode/proc/check_finished() - if((SSshuttle.emergency && SSshuttle.emergency.mode >= SHUTTLE_ENDGAME) || station_was_nuked) + if((SSshuttle.emergency && SSshuttle.emergency.mode == SHUTTLE_ENDGAME) || station_was_nuked) return TRUE return FALSE @@ -204,7 +204,7 @@ var/list/area/escape_locations = list(/area/shuttle/escape, /area/shuttle/escape_pod1/centcom, /area/shuttle/escape_pod2/centcom, /area/shuttle/escape_pod3/centcom, /area/shuttle/escape_pod5/centcom) - if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) //shuttle didn't get to centcom + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) //shuttle didn't get to centcom escape_locations -= /area/shuttle/escape for(var/mob/player in GLOB.player_list) @@ -225,7 +225,7 @@ if(player_area?.type in escape_locations) escaped_total++ - if(player_area?.type == SSshuttle.emergency.areaInstance.type && SSshuttle.emergency.mode >= SHUTTLE_ENDGAME) + if(player_area?.type == SSshuttle.emergency.areaInstance.type && SSshuttle.emergency.mode == SHUTTLE_ENDGAME) escaped_on_shuttle++ if(player_area?.type == /area/shuttle/escape_pod1/centcom) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 4685377069f..94d9d3f5ca8 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -548,8 +548,8 @@ */ /turf/defile() - if(flags & NOJAUNT) - flags &= ~NOJAUNT + if(turf_flags & NOJAUNT) + turf_flags &= ~NOJAUNT new /obj/effect/temp_visual/revenant(loc) /turf/simulated/floor/defile() @@ -560,13 +560,13 @@ make_plating(intact) /turf/simulated/floor/plating/defile() - if(flags & NOJAUNT) - flags &= ~NOJAUNT + if(turf_flags & NOJAUNT) + turf_flags &= ~NOJAUNT new /obj/effect/temp_visual/revenant(loc) /turf/simulated/floor/engine/cult/defile() - if(flags & NOJAUNT) - flags &= ~NOJAUNT + if(turf_flags & NOJAUNT) + turf_flags &= ~NOJAUNT new /obj/effect/temp_visual/revenant(loc) /turf/simulated/wall/defile() diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 0e6c0bd5aa5..9891af7473d 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -303,7 +303,7 @@ if(!D.onCentcom()) disk_rescued = 0 break - var/crew_evacuated = (SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + var/crew_evacuated = EMERGENCY_ESCAPED_OR_ENDGAMED //var/operatives_are_dead = is_operatives_are_dead() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index b98c490b0b6..94d79c24da9 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -546,7 +546,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list) /datum/objective/hijack/check_completion() - if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME) return FALSE for(var/datum/mind/player in get_owners()) @@ -568,7 +568,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list) * We're fine to use `owner` instead of `get_owners()`. */ /datum/objective/hijackclone/check_completion() - if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME || !owner.current) + if(SSshuttle.emergency.mode != SHUTTLE_ENDGAME || !owner.current) return FALSE var/area/shuttle_area = SSshuttle.emergency.areaInstance @@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list) if(SSticker.mode.station_was_nuked) return TRUE - if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) + if(!EMERGENCY_ESCAPED_OR_ENDGAMED) return FALSE var/area/shuttle_area = SSshuttle.emergency.areaInstance @@ -645,7 +645,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list) if(SSticker.mode.station_was_nuked) // If they escaped the blast somehow, let them win. return TRUE - if(SSshuttle.emergency.mode < SHUTTLE_ENDGAME) + if(!EMERGENCY_ESCAPED_OR_ENDGAMED) return FALSE for(var/datum/mind/player in owners) @@ -1422,7 +1422,7 @@ GLOBAL_LIST_EMPTY(admin_objective_list) /datum/objective/plant_explosive/proc/choose_target_area() for(var/sanity in 1 to 100) // 100 checks at most. - var/area/selected_area = pick(return_sorted_areas()) + var/area/selected_area = pick(get_sorted_areas()) if(selected_area && is_station_level(selected_area.z) && selected_area.valid_territory) //Целью должна быть зона на станции! if(selected_area in area_blacklist) continue diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 31de44198d5..9b73aa94ccd 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -108,7 +108,7 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been var/mob/mob = M if(is_station_level(mob.z)) check_station_player(mob) - else if(SSshuttle.emergency.mode >= SHUTTLE_ENDGAME && istype(get_area(mob), SSshuttle.emergency.areaInstance)) + else if(EMERGENCY_ESCAPED_OR_ENDGAMED && istype(get_area(mob), SSshuttle.emergency.areaInstance)) check_shuttle_player(mob) check_apc_power() @@ -367,7 +367,7 @@ GLOBAL_VAR(scoreboard) // Variable to save the scoreboard string once it's been if(damaged_health) dat += "Самый потрёпанный из эвакуировавшихся: [damaged_name], [damaged_job]: [damaged_health] урона ([damaged_key])
" else - if(SSshuttle.emergency.mode <= SHUTTLE_STRANDED) + if(!EMERGENCY_ESCAPED_OR_ENDGAMED) dat += "Станция не была эвакуирована!
" else dat += "Никто не выжил!
" diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index a5a87ecf59e..448fbc55d30 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -267,7 +267,7 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() - if(check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X + if(check_shadow_victory() && EMERGENCY_ESCAPED_OR_ENDGAMED) //Doesn't end instantly - this is hacky and I don't know of a better way ~X SSticker.mode_result = "shadowling win - shadowling ascension" to_chat(world, "Shadowling Victory") to_chat(world, "The shadowlings have ascended and taken over the station!") @@ -275,7 +275,7 @@ Made by Xhuis SSticker.mode_result = "shadowling loss - shadowling killed" to_chat(world, "Crew Major Victory") to_chat(world, "The shadowlings have been killed by the crew!") - else if(!check_shadow_victory() && SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + else if(!check_shadow_victory() && EMERGENCY_ESCAPED_OR_ENDGAMED) SSticker.mode_result = "shadowling loss - crew escaped" to_chat(world, "Crew Minor Victory") to_chat(world, "The crew escaped the station before the shadowlings could ascend!") diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index 73d8c4dd4dd..ad080d13777 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -116,7 +116,7 @@ qdel(B) /datum/game_mode/wizard/raginmages/proc/make_more_mages() - if(making_mage || SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + if(making_mage || EMERGENCY_ESCAPED_OR_ENDGAMED) return FALSE making_mage = TRUE diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index fb1a7c90f5e..4487ab7fe0a 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -403,8 +403,8 @@ else menu_state=value -/proc/call_shuttle_proc(var/mob/user, var/reason) - if(GLOB.sent_strike_team == 1) +/proc/call_shuttle_proc(mob/user, reason) + if(GLOB.sent_strike_team == TRUE || GLOB.security_level == SEC_LEVEL_EPSILON) to_chat(user, span_warning("Central Command will not allow the shuttle to be called. Consider all contracts terminated.")) return @@ -416,7 +416,7 @@ to_chat(user, span_warning("The emergency shuttle may not be sent at this time. Please try again later.")) return - if(SSshuttle.emergency.mode > SHUTTLE_ESCAPE) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) to_chat(user, span_warning("The emergency shuttle may not be called while returning to Central Command.")) return @@ -427,14 +427,14 @@ return -/proc/init_shift_change(var/mob/user, var/force = 0) +/proc/init_shift_change(mob/user, force = 0) // if force is 0, some things may stop the shuttle call if(!force) if(SSshuttle.emergencyNoEscape) to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") return - if(GLOB.sent_strike_team == 1) + if(GLOB.sent_strike_team == TRUE || GLOB.security_level == SEC_LEVEL_EPSILON) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") return diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index a5523d86e21..0dec2464fd9 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -1,32 +1,6 @@ /******************** Requests Console ********************/ /** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */ -//Request Console Department Types -#define RC_ASSIST 1 //Request Assistance -#define RC_SUPPLY 2 //Request Supplies -#define RC_INFO 4 //Relay Info - -//Request Console Screens -#define RCS_MAINMENU 0 // Main menu -#define RCS_RQSUPPLY 1 // Request supplies -#define RCS_RQASSIST 2 // Request assistance -#define RCS_SENDINFO 3 // Relay information -#define RCS_SENTPASS 4 // Message sent successfully -#define RCS_SENTFAIL 5 // Message sent unsuccessfully -#define RCS_VIEWMSGS 6 // View messages -#define RCS_MESSAUTH 7 // Authentication before sending -#define RCS_ANNOUNCE 8 // Send announcement -#define RCS_SHIPPING 9 // Print Shipping Labels/Packages -#define RCS_SHIP_LOG 10 // View Shipping Label Log - -//Radio list -#define ENGI_ROLES list("Atmospherics","Mechanic","Engineering","Chief Engineer's Desk","Telecoms Admin") -#define SEC_ROLES list("Warden","Security","Brig Medbay","Head of Security's Desk") -#define MISC_ROLES list("Bar","Chapel","Kitchen","Hydroponics","Janitorial") -#define MED_ROLES list("Virology","Chief Medical Officer's Desk","Medbay") -#define COM_ROLES list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge") -#define SCI_ROLES list("Robotics","Science","Research Director's Desk") - #define RQ_NONEW_MESSAGES 0 #define RQ_NORMALPRIORITY 1 #define RQ_HIGHPRIORITY 2 @@ -69,6 +43,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) var/print_cooldown = 0 //cooldown on shipping label printer, stores the in-game time of when the printer will next be ready var/obj/item/radio/Radio var/radiochannel = "" + var/list/connected_apps = list() /obj/machinery/requests_console/Initialize(mapload) @@ -90,7 +65,6 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) GLOB.req_console_supplies |= department if(departmentType & RC_INFO) GLOB.req_console_information |= department - update_icon(UPDATE_OVERLAYS) @@ -109,6 +83,8 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) if(departmentType & RC_INFO) GLOB.req_console_information -= department QDEL_NULL(Radio) + for(var/datum/data/pda/app/request_console/app as anything in connected_apps) + app.on_rc_destroyed(src) return ..() /obj/machinery/requests_console/attack_ghost(user as mob) @@ -120,7 +96,6 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) /obj/machinery/requests_console/attack_hand(user as mob) if(..(user)) return - ui_interact(user) @@ -193,9 +168,9 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) message = new_message screen = RCS_MESSAUTH switch(params["priority"]) - if("1") + if(1) priority = RQ_NORMALPRIORITY - if("2") + if(2) priority = RQ_HIGHPRIORITY else priority = RQ_NONEW_MESSAGES @@ -238,9 +213,9 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) radiochannel = "Command" else if(recipient in SCI_ROLES) radiochannel = "Science" - else if(recipient == "AI") + else if(recipient == RC_AI) radiochannel = "AI Private" - else if(recipient == "Cargo Bay") + else if(recipient == RC_CARGO_BAY) radiochannel = "Supply" write_to_message_log("Message sent to [recipient] at [station_time_timestamp()] - [message]") Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]") @@ -292,38 +267,46 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) return ..() if(istype(I, /obj/item/card/id)) - var/obj/item/card/id/id = I add_fingerprint(user) - switch(screen) - if(RCS_MESSAUTH) - msgVerified = "Verified by [id.registered_name] ([id.assignment])" - SStgui.update_uis(src) - return ATTACK_CHAIN_PROCEED_SUCCESS - if(RCS_ANNOUNCE) - if(ACCESS_RC_ANNOUNCE in id.GetAccess()) - announceAuth = TRUE - announcement.announcer = id.assignment ? "[id.assignment] [id.registered_name]" : id.registered_name - SStgui.update_uis(src) - return ATTACK_CHAIN_PROCEED_SUCCESS - reset_message() - to_chat(user, span_warning("You are not authorized to send announcements.")) - SStgui.update_uis(src) - return ATTACK_CHAIN_PROCEED_SUCCESS - if(RCS_SHIPPING) - msgVerified = "Sender verified as [id.registered_name] ([id.assignment])" - SStgui.update_uis(src) - return ATTACK_CHAIN_PROCEED_SUCCESS + return login_console(screen, I, src) if(istype(I, /obj/item/stamp)) - if(screen == RCS_MESSAUTH) - add_fingerprint(user) - msgStamped = "Stamped with the [I.name]" - SStgui.update_uis(src) - return ATTACK_CHAIN_PROCEED_SUCCESS + return stamp_messauth(screen, I, src, user) return ..() +/obj/machinery/requests_console/proc/stamp_messauth(screen, obj/item/stamp/stamp, obj/ui_object, mob/user, is_distant=FALSE) + if(screen == RCS_MESSAUTH) + if(!is_distant) + add_fingerprint(user) + msgStamped = "Stamped with the [stamp.name]" + SStgui.update_uis(ui_object) + return ATTACK_CHAIN_PROCEED_SUCCESS + return ATTACK_CHAIN_PROCEED + +/obj/machinery/requests_console/proc/login_console(screen, obj/item/card/id/id, obj/ui_object, mob/user) + switch(screen) + if(RCS_MESSAUTH) + msgVerified = "Verified by [id.registered_name] ([id.assignment])" + SStgui.update_uis(ui_object) + return ATTACK_CHAIN_PROCEED_SUCCESS + if(RCS_ANNOUNCE) + if(ACCESS_RC_ANNOUNCE in id.GetAccess()) + announceAuth = TRUE + announcement.announcer = id.assignment ? "[id.assignment] [id.registered_name]" : id.registered_name + SStgui.update_uis(ui_object) + return ATTACK_CHAIN_PROCEED_SUCCESS + reset_message() + to_chat(user, span_warning("You are not authorized to send announcements.")) + SStgui.update_uis(ui_object) + return ATTACK_CHAIN_PROCEED_SUCCESS + if(RCS_SHIPPING) + msgVerified = "Sender verified as [id.registered_name] ([id.assignment])" + SStgui.update_uis(ui_object) + return ATTACK_CHAIN_PROCEED_SUCCESS + return ATTACK_CHAIN_PROCEED + /obj/machinery/requests_console/proc/reset_message(mainmenu = FALSE) message = "" recipient = "" @@ -353,14 +336,20 @@ GLOBAL_LIST_EMPTY(allRequestConsoles) playsound(loc, 'sound/machines/twobeep.ogg', 50, TRUE) atom_say(title) + var/rendered_message switch(priority) if(RQ_HIGHPRIORITY) // High - write_to_message_log("Высокий приоритет - От: [linkedSender] - [message]") + rendered_message = "Высокий приоритет - От: [linkedSender] - [message]" else // Normal - write_to_message_log("От: [linkedSender] - [message]") + rendered_message = "От: [linkedSender] - [message]" + + if(!isnull(rendered_message)) + write_to_message_log(rendered_message, source == ORE_REDEMPTION) -/obj/machinery/requests_console/proc/write_to_message_log(message) +/obj/machinery/requests_console/proc/write_to_message_log(message, ore_message = FALSE) + for(var/datum/data/pda/app/request_console/app as anything in connected_apps) + app.on_rc_message_recieved(src, message, ore_message) message_log = list(message) + message_log /obj/machinery/requests_console/proc/print_label(tag_name, tag_index) diff --git a/code/game/machinery/tcomms/core.dm b/code/game/machinery/tcomms/core.dm index 934d55f45ae..b7110523246 100644 --- a/code/game/machinery/tcomms/core.dm +++ b/code/game/machinery/tcomms/core.dm @@ -35,12 +35,17 @@ /obj/machinery/tcomms/core/Initialize(mapload) . = ..() link_password = GenerateKey() - reachable_zlevels |= loc.z - var/turf/above = GET_TURF_ABOVE(loc) + var/turf/our_turf = get_turf(loc) + if(!isturf(our_turf)) + log_runtime(EXCEPTION("Tcomms core is in non-turf loc!")) + message_admins("Tcomms core is in non-turf loc. Inform maintainrs about it.") + return + reachable_zlevels |= our_turf.z + var/turf/above = GET_TURF_ABOVE(our_turf) while(above) reachable_zlevels |= above.z above = GET_TURF_ABOVE(above) - var/turf/below = GET_TURF_BELOW(loc) + var/turf/below = GET_TURF_BELOW(our_turf) while(below) reachable_zlevels |= below.z below = GET_TURF_BELOW(below) @@ -129,14 +134,19 @@ return // Refresh the list reachable_zlevels = list() + var/turf/our_turf = get_turf(loc) + if(!isturf(our_turf)) + log_runtime(EXCEPTION("Tcomms core is in non-turf loc!")) + message_admins("Tcomms core is in non-turf loc. Inform maintainrs about it.") + return // Add itself as a reachable Z-level reachable_zlevels |= loc.z // add adjacent zlevels above and below - var/turf/above = GET_TURF_ABOVE(loc) + var/turf/above = GET_TURF_ABOVE(our_turf) while(above) reachable_zlevels |= above.z above = GET_TURF_ABOVE(above) - var/turf/below = GET_TURF_BELOW(loc) + var/turf/below = GET_TURF_BELOW(our_turf) while(below) reachable_zlevels |= below.z below = GET_TURF_BELOW(below) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index e1019d94cc0..00f7bb53eb2 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -76,7 +76,7 @@ if(!control_area) control_area = get_area(src) else if(istext(control_area)) - for(var/area/A in world) + for(var/area/A as anything in GLOB.areas) if(A.name && A.name == control_area) control_area = A break diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c9c8237cd9f..a7af66b69be 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1941,16 +1941,27 @@ "Пинг!" ) req_access = list(ACCESS_MEDICAL) - products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, /obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, - /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/diphenhydramine = 4, - /obj/item/reagent_containers/glass/bottle/salicylic = 4, /obj/item/reagent_containers/glass/bottle/potassium_iodide = 3, /obj/item/reagent_containers/glass/bottle/saline = 5, - /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/ether = 4, /obj/item/reagent_containers/glass/bottle/atropine = 3, - /obj/item/reagent_containers/glass/bottle/oculine = 2, /obj/item/reagent_containers/glass/bottle/toxin = 4, /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/calomel = 10, /obj/item/reagent_containers/syringe/heparin = 4, /obj/item/reagent_containers/hypospray/autoinjector = 5, /obj/item/reagent_containers/food/pill/salbutamol = 10, - /obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, /obj/item/stack/medical/bruise_pack = 4, - /obj/item/stack/medical/ointment = 4, /obj/item/stack/medical/splint = 4, /obj/item/reagent_containers/glass/beaker = 4, /obj/item/reagent_containers/dropper = 4, /obj/item/healthanalyzer = 4, - /obj/item/healthupgrade = 4, /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, /obj/item/reagent_containers/iv_bag/slime = 1) + products = list(/obj/item/reagent_containers/hypospray/autoinjector = 5, + /obj/item/stack/medical/bruise_pack = 4, /obj/item/stack/medical/ointment = 4, + /obj/item/stack/medical/bruise_pack/advanced = 4, /obj/item/stack/medical/ointment/advanced = 4, + /obj/item/stack/medical/bruise_pack/extended = 2, /obj/item/stack/medical/ointment/extended = 2, + /obj/item/stack/medical/splint = 4, + /obj/item/reagent_containers/food/pill/patch/styptic = 4, /obj/item/reagent_containers/food/pill/patch/silver_sulf = 4, + /obj/item/reagent_containers/applicator/brute = 3, /obj/item/reagent_containers/applicator/burn = 3, + /obj/item/healthanalyzer = 4,/obj/item/healthupgrade = 4, + /obj/item/reagent_containers/hypospray/safety = 2, /obj/item/sensor_device = 2, /obj/item/pinpointer/crew = 2, + /obj/item/reagent_containers/food/pill/mannitol = 10, /obj/item/reagent_containers/food/pill/salbutamol = 10, /obj/item/reagent_containers/food/pill/mutadone = 5, + /obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/syringe/calomel = 10, + /obj/item/reagent_containers/syringe/insulin = 6, /obj/item/reagent_containers/syringe/heparin = 4, + /obj/item/reagent_containers/glass/bottle/oculine = 2, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, + /obj/item/reagent_containers/glass/bottle/saline = 5, /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/glass/bottle/salicylic = 4, /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/ether = 4, + /obj/item/reagent_containers/glass/bottle/potassium_iodide = 3, /obj/item/reagent_containers/glass/bottle/atropine = 3, + /obj/item/reagent_containers/glass/bottle/diphenhydramine = 4, /obj/item/reagent_containers/glass/bottle/toxin = 4, + /obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 4, /obj/item/reagent_containers/glass/beaker = 4, + /obj/item/reagent_containers/iv_bag/slime = 1) contraband = list(/obj/item/reagent_containers/glass/bottle/sulfonal = 1, /obj/item/reagent_containers/glass/bottle/pancuronium = 1) + prices = list(/obj/item/stack/medical/bruise_pack/extended = 200, /obj/item/stack/medical/ointment/extended = 200) armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 716c499ae69..77bf40091d7 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -430,7 +430,10 @@ move_result = mechsteprand() move_type = MECHAMOVE_RAND else if(direction & (UP|DOWN)) - var/turf/above = GET_TURF_ABOVE(loc) + var/turf/T = get_turf(loc) + if(!isturf(T)) + return + var/turf/above = GET_TURF_ABOVE(T) if(!(direction & UP) || !can_z_move(DOWN, above, null, ZMOVE_FALL_FLAGS|ZMOVE_CAN_FLY_CHECKS|ZMOVE_FEEDBACK, occupant)) if(zMove(direction, z_move_flags = ZMOVE_FLIGHT_FLAGS)) playsound(src, stepsound, 40, 1) diff --git a/code/game/objects/effects/mapping_helpers.dm b/code/game/objects/effects/mapping_helpers.dm index 32fa37356c1..3f85eb54ac6 100644 --- a/code/game/objects/effects/mapping_helpers.dm +++ b/code/game/objects/effects/mapping_helpers.dm @@ -104,7 +104,7 @@ /obj/effect/mapping_helpers/no_lava/New() var/turf/T = get_turf(src) - T.flags |= NO_LAVA_GEN + T.turf_flags |= NO_LAVA_GEN . = ..() /obj/effect/mapping_helpers/light diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 45a1bd4ad9f..bcd658b57b4 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -368,23 +368,23 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( /obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, verbage = "says") if(!on) - return 0 // the device has to be on + return FALSE // the device has to be on // Fix for permacell radios, but kinda eh about actually fixing them. if(!M || !message_pieces) - return 0 + return FALSE // Uncommenting this. To the above comment: // The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom if(wires.is_cut(WIRE_RADIO_TRANSMIT)) // The device has to have all its wires and shit intact - return 0 + return FALSE - if(!M.IsVocal()) - return 0 + if(!M.IsVocal() || M.cannot_speak_loudly()) + return FALSE if(M.is_muzzled()) var/obj/item/clothing/mask/muzzle/muzzle = M.wear_mask if(muzzle.radio_mute) - return 0 + return FALSE var/jammed = FALSE var/turf/position = get_turf(src) @@ -398,10 +398,10 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( switch(message_mode) //special cases // This is if the connection fails if(RADIO_CONNECTION_FAIL) - return 0 + return FALSE // This is if were using either a binary key, or a hivemind through a headset somehow. Dont ask. if(RADIO_CONNECTION_NON_SUBSPACE) - return 1 + return TRUE if(!istype(message_mode, /datum/radio_frequency)) //if not a special case, it should be returning a radio connection return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 4dacf7fdb14..7f6a7410bc6 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -238,6 +238,17 @@ return ATTACK_CHAIN_PROCEED return ..() +/obj/item/stack/medical/bruise_pack/extended + name = "extended trauma kit" + singular_name = "extended trauma kit" + desc = "An extended trauma kit for severe injuries." + icon_state = "extended_trauma_kit" + item_state = "extended_trauma_kit" + belt_icon = "advanced_trauma_kit" + heal_brute = 30 + stop_bleeding = 0 + amount = 12 + max_amount = 12 //Ointment// @@ -292,6 +303,16 @@ return ATTACK_CHAIN_PROCEED return ..() +/obj/item/stack/medical/ointment/extended + name = "extended burn kit" + singular_name = "extended burn kit" + desc = "An extended treatment kit for severe burns." + icon_state = "extended_burn_kit" + item_state = "extended_burn_kit" + belt_icon = "advanced_burn_kit" + heal_burn = 30 + amount = 12 + max_amount = 12 //Medical Herbs// /obj/item/stack/medical/bruise_pack/comfrey diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7adedbe8dca..70577d1b582 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -697,7 +697,7 @@ icon_state = "redfox" /obj/random/plushie/item_to_spawn() - return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff)) //exclude the base type. + return pick(subtypesof(/obj/item/toy/plushie) - typesof(/obj/item/toy/plushie/fluff) - subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart)) //exclude the base type and 11 random plasma plushies /obj/item/toy/plushie/corgi name = "corgi plushie" @@ -1282,11 +1282,61 @@ /obj/item/toy/plushie/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" + icon_state = "plasmaman_plushie_civillian" attack_verb = list("burns", "space beasts", "fwooshes") var/pmanlbite = 'sound/effects/extinguish.ogg' var/cooldown = FALSE +/obj/item/toy/plushie/plasmamanplushie/random/Initialize(mapload) + . = ..() + var/choice = pick(subtypesof(/obj/item/toy/plushie/plasmamanplushie/standart)) + new choice(loc) + return INITIALIZE_HINT_QDEL + + +/obj/item/toy/plushie/plasmamanplushie/standart/sindie + name = "syndicate plasmaman plushie" + icon_state = "plasmaman_plushie_syndicomm" + +/obj/item/toy/plushie/plasmamanplushie/standart/doctor + name = "medical doctor plasmaman plushie" + icon_state = "plasmaman_plushie_doctor" + +/obj/item/toy/plushie/plasmamanplushie/standart/brigmed + name = "brig physician plasmaman plushie" + icon_state = "plasmaman_plushie_brigphysician" + +/obj/item/toy/plushie/plasmamanplushie/standart/chemist + name = "chemist plasmaman plushie" + icon_state = "plasmaman_plushie_chemist" + +/obj/item/toy/plushie/plasmamanplushie/standart/scientist + name = "scientist plasmaman plushie" + icon_state = "plasmaman_plushie_scientist" + +/obj/item/toy/plushie/plasmamanplushie/standart/engineer + name = "station engineer plasmaman plushie" + icon_state = "plasmaman_plushie_engineer" + +/obj/item/toy/plushie/plasmamanplushie/standart/atmostech + name = "atmospheric technician plasmaman plushie" + icon_state = "plasmaman_plushie_atmostech" + +/obj/item/toy/plushie/plasmamanplushie/standart/officer + name = "security officer plasmaman plushie" + icon_state = "plasmaman_plushie_officer" + +/obj/item/toy/plushie/plasmamanplushie/standart/captain + name = "captain plasmaman plushie" + icon_state = "plasmaman_plushie_captain" + +/obj/item/toy/plushie/plasmamanplushie/standart/ntr + name = "nanotrasen representative plasmaman plushie" + icon_state = "plasmaman_plushie_ntr" + +/obj/item/toy/plushie/plasmamanplushie/standart/miner + name = "shaft miner plasmaman plushie" + icon_state = "plasmaman_plushie_shaftminer" /obj/item/toy/plushie/plasmamanplushie/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE) . = ..() @@ -1299,7 +1349,7 @@ return ..() playsound(src, 'sound/effects/extinguish.ogg', 20, 0) - visible_message("Plasmaflood!") + visible_message("Plasssma iss Eternal!") cooldown = TRUE addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 3 SECONDS) diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 7ac81bb320f..b2a9d586e16 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(tendrils, list()) for(var/F in RANGE_TURFS(1, src)) if(ismineralturf(F)) var/turf/simulated/mineral/M = F - M.ChangeTurf(M.turf_type, FALSE, FALSE, TRUE) + M.ChangeTurf(M.turf_type, FALSE, FALSE, CHANGETURF_IGNORE_AIR) /obj/structure/spawner/lavaland/deconstruct(disassembled) new /obj/effect/collapse(loc) @@ -130,5 +130,5 @@ GLOBAL_LIST_INIT(tendrils, list()) visible_message(span_boldannounceic("The tendril falls inward, the ground around it widening into a yawning chasm!")) for(var/turf/T in range(2,src)) if(!T.density) - T.TerraformTurf(/turf/simulated/floor/chasm/straight_down/lava_land_surface) + T.ChangeTurf(/turf/simulated/floor/chasm/straight_down/lava_land_surface) qdel(src) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 811044f0adf..edb78e8bfcd 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -57,14 +57,14 @@ var/datum/component/wet_floor/new_wet_floor_component = copy_to_turf.AddComponent(/datum/component/wet_floor) new_wet_floor_component.InheritComponent(slip) -/turf/simulated/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE, copy_existing_baseturf = TRUE) +/turf/simulated/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, after_flags = NONE, copy_existing_baseturf = TRUE) . = ..() queue_smooth_neighbors(src) -/turf/simulated/AfterChange(ignore_air = FALSE, keep_cabling = FALSE, oldType) +/turf/simulated/AfterChange(flags, oldType) ..() RemoveLattice() - if(!ignore_air) + if(!(flags & CHANGETURF_IGNORE_AIR)) assimilate_air() //////Assimilate Air////// diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 278250e093e..0f3515602ea 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama user.put_in_hands(stack_dropped, ignore_anim = FALSE) return ChangeTurf(/turf/simulated/floor/plating) -/turf/simulated/floor/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE, copy_existing_baseturf = TRUE) +/turf/simulated/floor/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, after_flags = NONE, copy_existing_baseturf = TRUE) if(!isfloorturf(src)) return ..() //fucking turfs switch the fucking src of the fucking running procs if(!ispath(T, /turf/simulated/floor)) @@ -377,7 +377,7 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama new_window.dir = cdir else new our_rcd.window_type(src) - ChangeTurf(our_rcd.floor_type, ignore_air = TRUE) // Platings go under windows. + ChangeTurf(our_rcd.floor_type, after_flags = CHANGETURF_IGNORE_AIR) // Platings go under windows. return RCD_ACT_SUCCESSFULL if(RCD_MODE_FIRELOCK) if(our_rcd.checkResource(8, user)) diff --git a/code/game/turfs/simulated/floor/hull.dm b/code/game/turfs/simulated/floor/hull.dm index 518ed50ceb7..87734796767 100644 --- a/code/game/turfs/simulated/floor/hull.dm +++ b/code/game/turfs/simulated/floor/hull.dm @@ -16,7 +16,7 @@ name = "shuttle ceiling plating" var/old_turf_type = /turf/simulated/openspace // set to this one, if getting oldtype got ruined somehow -/turf/simulated/floor/engine/hull/ceiling/AfterChange(ignore_air, keep_cabling, oldType) +/turf/simulated/floor/engine/hull/ceiling/AfterChange(flags, oldType) . = ..() old_turf_type = oldType diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm index 0f98f4f00bf..5e09252ceab 100644 --- a/code/game/turfs/simulated/floor/lava.dm +++ b/code/game/turfs/simulated/floor/lava.dm @@ -321,4 +321,4 @@ /turf/simulated/floor/lava/mapping_lava/LateInitialize() . = ..() if(SSmapping.lavaland_theme?.primary_turf_type) - ChangeTurf(SSmapping.lavaland_theme.primary_turf_type, ignore_air = TRUE) + ChangeTurf(SSmapping.lavaland_theme.primary_turf_type, after_flags = CHANGETURF_IGNORE_AIR) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 7c5d81932eb..65d85a33951 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -151,7 +151,7 @@ if(baseturf == /turf/baseturf_bottom) ReplaceWithLattice() else - TerraformTurf(baseturf) + ChangeTurf(baseturf) /turf/simulated/floor/plating/airless icon_state = "plating" diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm index 118cd6a5a77..a4ac5b40aa2 100644 --- a/code/game/turfs/simulated/floor/transparent.dm +++ b/code/game/turfs/simulated/floor/transparent.dm @@ -155,8 +155,8 @@ break_tile() */ -/turf/simulated/floor/glass/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE, copy_existing_baseturf = TRUE) - return ..(T, defer_change, FALSE, ignore_air, copy_existing_baseturf) +/turf/simulated/floor/glass/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, after_flags = NONE, copy_existing_baseturf = TRUE) + return ..(T, defer_change, FALSE, after_flags, copy_existing_baseturf) /turf/simulated/floor/glass/reinforced diff --git a/code/game/turfs/simulated/openspace.dm b/code/game/turfs/simulated/openspace.dm index ba45c35d94c..7f137721754 100644 --- a/code/game/turfs/simulated/openspace.dm +++ b/code/game/turfs/simulated/openspace.dm @@ -44,7 +44,7 @@ . = ..() AddElement(/datum/element/turf_z_transparency) -/turf/simulated/openspace/ChangeTurf(path, defer_change, keep_icon, ignore_air, copy_existing_baseturf) +/turf/simulated/openspace/ChangeTurf(path, defer_change, keep_icon, after_flags, copy_existing_baseturf) UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON) return ..() diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm index b3825a80e87..ba7c29b1f2f 100644 --- a/code/game/turfs/simulated/river.dm +++ b/code/game/turfs/simulated/river.dm @@ -48,7 +48,7 @@ while(num_spawned < nodes && possible_locs.len) var/turf/T = pick(possible_locs) var/area/A = get_area(T) - if(!istype(A, whitelist_area_type) || (T.flags & NO_LAVA_GEN)) + if(!istype(A, whitelist_area_type) || (T.turf_flags & NO_LAVA_GEN)) possible_locs -= T else river_nodes += new /obj/effect/landmark/river_waypoint(T) @@ -61,7 +61,7 @@ continue W.connected = TRUE var/turf/cur_turf = get_turf(W) - cur_turf.ChangeTurf(river_turf_type, ignore_air = TRUE) + cur_turf.ChangeTurf(river_turf_type, after_flags = CHANGETURF_IGNORE_AIR) var/turf/target_turf = get_turf(pick(river_nodes - W)) if(!target_turf) break @@ -86,13 +86,13 @@ message_admins("Encountered a null turf in river loop.") break var/area/new_area = get_area(cur_turf) - if(!istype(new_area, whitelist_area_type) || (cur_turf.flags & NO_LAVA_GEN)) //Rivers will skip ruins + if(!istype(new_area, whitelist_area_type) || (cur_turf.turf_flags & NO_LAVA_GEN)) //Rivers will skip ruins detouring = 0 cur_dir = get_dir(cur_turf, target_turf) cur_turf = get_step(cur_turf, cur_dir) continue else - var/turf/river_turf = cur_turf.ChangeTurf(river_turf_type, ignore_air = TRUE) + var/turf/river_turf = cur_turf.ChangeTurf(river_turf_type, after_flags = CHANGETURF_IGNORE_AIR) if(prob(1)) new /obj/effect/spawner/bridge(river_turf) spread_turf(river_turf, spread_prob, spread_prob_loss, whitelist_area_type) @@ -108,7 +108,7 @@ for(var/F in RANGE_TURFS(1, start_turf) - start_turf) var/turf/T = F var/area/new_area = get_area(T) - if(!T || (T.density && !istype(T, whitelist_turf_type)) || istype(T, /turf/simulated/floor/indestructible) || istype(T, /turf/simulated/wall/indestructible) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.flags & NO_LAVA_GEN) ) + if(!T || (T.density && !istype(T, whitelist_turf_type)) || istype(T, /turf/simulated/floor/indestructible) || istype(T, /turf/simulated/wall/indestructible) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.turf_flags & NO_LAVA_GEN) ) continue if(get_dir(start_turf, F) in GLOB.cardinal) @@ -118,17 +118,17 @@ for(var/F in cardinal_turfs) //cardinal turfs are always changed but don't always spread var/turf/T = F - if(!istype(T, start_turf.type) && T.ChangeTurf(start_turf.type, ignore_air = TRUE) && prob(probability)) + if(!istype(T, start_turf.type) && T.ChangeTurf(start_turf.type, after_flags = CHANGETURF_IGNORE_AIR) && prob(probability)) spread_turf(T, probability - prob_loss, prob_loss, whitelisted_area) if(prob(1)) new /obj/effect/spawner/bridge(T) for(var/F in diagonal_turfs) //diagonal turfs only sometimes change, but will always spread if changed var/turf/T = F - if(!istype(T, shoreline_turf_type) && prob(probability) && T.ChangeTurf(start_turf.type, ignore_air = TRUE)) + if(!istype(T, shoreline_turf_type) && prob(probability) && T.ChangeTurf(start_turf.type, after_flags = CHANGETURF_IGNORE_AIR)) spread_turf(T, probability - prob_loss, prob_loss, whitelisted_area) else if(istype(T, whitelist_turf_type) && !istype(T, start_turf.type)) - T.ChangeTurf(shoreline_turf_type, ignore_air = TRUE) + T.ChangeTurf(shoreline_turf_type, after_flags = CHANGETURF_IGNORE_AIR) if(prob(1)) new /obj/effect/spawner/bridge(T) diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm index 63a8fd39c47..66a3f4bddfd 100644 --- a/code/game/turfs/simulated/shuttle.dm +++ b/code/game/turfs/simulated/shuttle.dm @@ -68,13 +68,25 @@ /turf/simulated/wall/shuttle/nodiagonal icon_state = "shuttle-15" +/turf/simulated/wall/shuttle/nodiagonal/Initialize() + . = ..() + icon_state = "shuttle" + /turf/simulated/wall/shuttle/nosmooth icon_state = "shuttle_ns" smooth = NONE +/turf/simulated/wall/shuttle/nosmooth/Initialize() + . = ..() + icon_state = "shuttle" + /turf/simulated/wall/shuttle/onlyselfsmooth canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS +/turf/simulated/wall/shuttle/onlyselfsmooth/Initialize() + . = ..() + icon_state = "shuttle" + /turf/simulated/wall/shuttle/onlyselfsmooth/nodiagonal icon_state = "shuttle-15" @@ -82,6 +94,9 @@ icon_state = "overspace" fixed_underlay = list("space"=1) +/turf/simulated/wall/shuttle/overspace/Initialize() + . = ..() + icon_state = "shuttle" /turf/simulated/wall/shuttle/copyTurf(turf/T) . = ..() diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm index f7ada6c4534..70ccfcd56a2 100644 --- a/code/game/turfs/simulated/walls_indestructible.dm +++ b/code/game/turfs/simulated/walls_indestructible.dm @@ -247,9 +247,9 @@ desc = "A cold metal wall engraved with indecipherable symbols. Studying them causes your head to pound." icon = 'icons/turf/walls/cult_wall.dmi' icon_state = "cult" - smooth = SMOOTH_BITMASK + smooth = NONE canSmoothWith = null - smoothing_groups = NONE + smoothing_groups = null /turf/simulated/wall/indestructible/mineral_rock diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm index 65deec2e08f..6b58a40ad1c 100644 --- a/code/game/turfs/simulated/walls_misc.dm +++ b/code/game/turfs/simulated/walls_misc.dm @@ -4,6 +4,7 @@ icon = 'icons/turf/walls/cult_wall.dmi' icon_state = "cult" canSmoothWith = null + smoothing_groups = null smooth = NONE sheet_type = /obj/item/stack/sheet/runed_metal sheet_amount = 1 @@ -16,6 +17,7 @@ icon = 'icons/turf/walls/cult_wall.dmi' icon_state = "cult" canSmoothWith = null + smoothing_groups = null smooth = NONE sheet_type = /obj/item/stack/sheet/runed_metal_fake sheet_amount = 1 diff --git a/code/game/turfs/space/openspace.dm b/code/game/turfs/space/openspace.dm index b82b97f923d..1c1fd2b4c9a 100644 --- a/code/game/turfs/space/openspace.dm +++ b/code/game/turfs/space/openspace.dm @@ -24,7 +24,7 @@ generate_space_underlay(underlay_appearance, asking_turf) return TRUE // stops ruining parallax space -/turf/space/openspace/ChangeTurf(path, defer_change, keep_icon, ignore_air, copy_existing_baseturf) +/turf/space/openspace/ChangeTurf(path, defer_change, keep_icon, after_flags, copy_existing_baseturf) UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON) return ..() diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 5b588a6f492..9bf35efa8e9 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -69,7 +69,7 @@ if(light_sources) // Turn off starlight, if present set_light_on(FALSE) -/turf/space/AfterChange(ignore_air, keep_cabling = FALSE, oldType) +/turf/space/AfterChange(flags = NONE, oldType) ..() var/datum/space_level/S = GLOB.space_manager.get_zlev(z) S.add_to_transit(src) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 1e4dd1a991f..22b652537d5 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -1,7 +1,10 @@ /turf/space/transit + name = "\proper hyperspace" icon_state = "black_arrow" dir = SOUTH plane = PLANE_SPACE + baseturf = /turf/space/transit + turf_flags = NOJAUNT /turf/space/transit/north dir = NORTH @@ -15,24 +18,45 @@ /turf/space/transit/west dir = WEST +/turf/space/transit/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_TURF_RESERVATION_RELEASED, PROC_REF(launch_contents)) + +/turf/space/transit/Destroy() + //Signals are NOT removed from turfs upon replacement, and we get replaced ALOT, so unregister our signal + UnregisterSignal(src, list(COMSIG_TURF_RESERVATION_RELEASED)) + + return ..() /turf/space/transit/attackby(obj/item/I, mob/user, params) //Overwrite because we dont want people building rods in space. return ATTACK_CHAIN_BLOCKED_ALL +///Get rid of all our contents, called when our reservation is released (which in our case means the shuttle arrived) +/turf/space/transit/proc/launch_contents(datum/turf_reservation/reservation) + SIGNAL_HANDLER + + for(var/atom/movable/movable in contents) + dump_in_space(movable) /turf/space/transit/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if(!arrived) return if(!arrived.simulated || istype(arrived, /obj/docking_port)) return //this was fucking hilarious, the docking ports were getting thrown to random Z-levels + if(isobserver(arrived)) + return + dump_in_space(arrived) + +///Dump a movable in a random valid spacetile +/proc/dump_in_space(atom/movable/dumpee) var/max = world.maxx-TRANSITIONEDGE var/min = 1+TRANSITIONEDGE //now select coordinates for a border turf var/_x var/_y - switch(dir) + switch(dumpee.dir) if(SOUTH) _x = rand(min,max) _y = max @@ -48,8 +72,8 @@ var/list/levels_available = get_all_linked_levels_zpos() var/turf/T = locate(_x, _y, pick(levels_available)) - arrived.forceMove(T) - arrived.newtonian_move(dir) + dumpee.forceMove(T) + dumpee.newtonian_move(dumpee.dir) /turf/space/transit/rpd_act() diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 03351c6cad7..6800b4e398e 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -5,6 +5,9 @@ vis_flags = VIS_INHERIT_ID // Important for interaction with and visualization of openspace. + /// Turf bitflags, see code/__DEFINES/flags.dm + var/turf_flags = NONE + var/intact = TRUE var/turf/baseturf = /turf/baseturf_bottom /// negative for faster, positive for slower @@ -89,12 +92,12 @@ if(SSmapping.max_plane_offset) if(!SSmapping.plane_offset_blacklist["[plane]"]) plane = plane - (PLANE_RANGE * SSmapping.z_level_to_plane_offset[z]) - var/turf/T = GET_TURF_ABOVE(src) - if(T) - T.multiz_turf_new(src, DOWN) - T = GET_TURF_BELOW(src) - if(T) - T.multiz_turf_new(src, UP) + var/turf/T = GET_TURF_ABOVE(src) + if(T) + T.multiz_turf_new(src, DOWN) + T = GET_TURF_BELOW(src) + if(T) + T.multiz_turf_new(src, UP) // by default, vis_contents is inherited from the turf that was here before // Checking length(vis_contents) in a proc this hot has huge wins for performance. @@ -131,10 +134,13 @@ stack_trace("Incorrect turf deletion") changing_turf = FALSE - var/turf/V = GET_TURF_ABOVE(src) - V?.multiz_turf_del(src, DOWN) - V = GET_TURF_BELOW(src) - V?.multiz_turf_del(src, UP) + if(GET_LOWEST_STACK_OFFSET(z)) + var/turf/T = GET_TURF_ABOVE(src) + if(T) + T.multiz_turf_del(src, DOWN) + T = GET_TURF_BELOW(src) + if(T) + T.multiz_turf_del(src, UP) if(force) ..() @@ -275,11 +281,8 @@ /turf/proc/dismantle_wall(devastated = FALSE, explode = FALSE) return -/turf/proc/TerraformTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE) - return ChangeTurf(path, defer_change, keep_icon, ignore_air) - //Creates a new turf -/turf/proc/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE, copy_existing_baseturf = TRUE) +/turf/proc/ChangeTurf(path, defer_change = FALSE, keep_icon = TRUE, after_flags = NONE, copy_existing_baseturf = TRUE) switch(path) if(null) return @@ -318,7 +321,9 @@ //We do this here so anything that doesn't want to persist can clear itself var/list/old_comp_lookup = comp_lookup?.Copy() var/list/old_signal_procs = signal_procs?.Copy() + var/carryover_turf_flags = (RESERVATION_TURF | UNUSED_RESERVATION_TURF) & turf_flags var/turf/W = new path(src) + W.turf_flags |= carryover_turf_flags // WARNING WARNING // Turfs DO NOT lose their signals when they get replaced, REMEMBER THIS @@ -335,7 +340,7 @@ W.baseturf = old_baseturf if(!defer_change) - W.AfterChange(ignore_air, oldType = old_type) + W.AfterChange(after_flags, oldType = old_type) W.blueprint_data = old_blueprint_data @@ -400,11 +405,11 @@ return FALSE // I'm including `ignore_air` because BYOND lacks positional-only arguments -/turf/proc/AfterChange(ignore_air = FALSE, keep_cabling = FALSE, oldType = null) //called after a turf has been replaced in ChangeTurf() +/turf/proc/AfterChange(flags, oldType = null) //called after a turf has been replaced in ChangeTurf() levelupdate() CalculateAdjacentTurfs() - if(SSair && !ignore_air) + if(SSair && !(flags & CHANGETURF_IGNORE_AIR)) SSair.add_to_active(src) //update firedoor adjacency @@ -414,7 +419,7 @@ for(var/obj/machinery/door/firedoor/FD in T) FD.CalculateAffectingAreas() - if(!keep_cabling && !can_have_cabling()) + if(!(flags & CHANGETURF_KEEP_CABLING) && !can_have_cabling()) for(var/obj/structure/cable/C in contents) qdel(C) @@ -435,7 +440,7 @@ INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/mecha, take_damage), 100, "brute") /turf/proc/Bless() - flags |= NOJAUNT + turf_flags |= NOJAUNT /turf/proc/burn_down() return diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e94b2d95848..5cd8ffa5b59 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -162,6 +162,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, list( /client/proc/view_runtimes, /client/proc/admin_serialize, /client/proc/jump_to_ruin, + /client/proc/clear_dynamic_transit, /client/proc/toggle_medal_disable, /client/proc/uid_log, /client/proc/visualise_active_turfs, diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index f82ab795574..b1140ff264e 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -355,11 +355,11 @@ dat += "Current Game Mode: [SSticker.mode.name]
" dat += "Round Duration: [ROUND_TIME_TEXT()]
" dat += "Emergency shuttle
" - if(SSshuttle.emergency.mode < SHUTTLE_CALL) + if(SSshuttle.emergency.mode == SHUTTLE_IDLE) dat += "Call Shuttle
" else var/timeleft = SSshuttle.emergency.timeLeft() - if(SSshuttle.emergency.mode < SHUTTLE_DOCKED) + if(SSshuttle.emergency.mode == SHUTTLE_CALL) dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
" dat += "Send Back
" else diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 37c10d36971..ac4ef3e2fd5 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -356,19 +356,20 @@ edit_admin_permissions() else if(href_list["call_shuttle"]) - if(!check_rights(R_ADMIN)) return + if(!check_rights(R_ADMIN)) + return switch(href_list["call_shuttle"]) if("1") - if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) + if(EMERGENCY_AT_LEAST_DOCKED) return SSshuttle.emergency.request() log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station") if("2") - if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) + if(EMERGENCY_AT_LEAST_DOCKED) return switch(SSshuttle.emergency.mode) if(SHUTTLE_CALL) @@ -3103,7 +3104,7 @@ GLOB.gravity_is_on = FALSE log_and_message_admins("toggled global gravity OFF.") - for(var/area/area as anything in GLOB.all_areas) + for(var/area/area as anything in GLOB.areas) area.gravitychange() if("power") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 6ba99d10bec..098d30589d3 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -14,7 +14,7 @@ var/jumping // Thing to jump to switch(chosen) if("Area") - jumping = tgui_input_list(src, "Area to jump to", "Jump to Area", return_sorted_areas()) + jumping = tgui_input_list(src, "Area to jump to", "Jump to Area", get_sorted_areas()) if(jumping) return jumptoarea(jumping) if("Mob") @@ -187,7 +187,7 @@ if(!check_rights(R_ADMIN)) return - var/area/A = tgui_input_list(usr, "Pick an area.", "Pick an area", return_sorted_areas()) + var/area/A = tgui_input_list(usr, "Pick an area.", "Pick an area", get_sorted_areas()) if(!A) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 816d7254024..c13e06fa52a 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -493,7 +493,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) var/list/areas_with_multiple_APCs = list() var/list/areas_with_multiple_air_alarms = list() - for(var/area/A in world) + for(var/area/A as anything in GLOB.areas) areas_all |= A.type for(var/thing in GLOB.apcs) @@ -1022,3 +1022,17 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) render_stats(SSoverlays.stats, src) + +/client/proc/clear_dynamic_transit() + set category = "Debug" + set name = "Clear Dynamic Turf Reservations" + set desc = "Deallocates all reserved space, restoring it to round start \ + conditions." + if(!check_rights(R_DEBUG)) + return + var/answer = alert("WARNING: THIS WILL WIPE ALL RESERVED SPACE TO A CLEAN SLATE! ANY MOVING SHUTTLES, ELEVATORS, OR IN-PROGRESS PHOTOGRAPHY WILL BE DELETED!", "Really wipe dynamic turfs?", "YES", "NO") + if(answer != "YES") + return + log_and_message_admins("cleared dynamic transit space.") + SSblackbox.record_feedback("tally", "admin_verb", 1, "CDT") // If... + SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens. diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c575a7714bc..33ee500e67e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -861,7 +861,7 @@ Traitors and the like can also be revived with the previous role mostly intact. set category = "Admin" set name = "Call Shuttle" - if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) + if(EMERGENCY_AT_LEAST_DOCKED) return if(!check_rights(R_ADMIN)) @@ -893,7 +893,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return - if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) + if(EMERGENCY_AT_LEAST_DOCKED) return if(SSshuttle.emergency.canRecall == FALSE) diff --git a/code/modules/antagonists/borer/borer_datum.dm b/code/modules/antagonists/borer/borer_datum.dm index de9c3e868bb..9d8ac31ed63 100644 --- a/code/modules/antagonists/borer/borer_datum.dm +++ b/code/modules/antagonists/borer/borer_datum.dm @@ -3,16 +3,20 @@ show_in_roundend = FALSE job_rank = ROLE_BORER special_role = SPECIAL_ROLE_BORER - var/mob/living/simple_animal/borer/user // our borer - var/mob/living/carbon/human/host // our host - var/mob/living/carbon/human/previous_host // previous host, used to del transferable effects from previous host. - + var/mob/living/simple_animal/borer/user + var/mob/living/carbon/human/host + /// previous host, used to del transferable effects from previous host. + var/mob/living/carbon/human/previous_host + /// Rank of our borer var/datum/borer_rank/borer_rank - var/list/learned_focuses = list() // what focuses learned borer - var/datum/borer_misc/change_host_and_scale/scaling = new // chemical scaling, gained when acquired unique host - - var/reproductions = 0 // used to upgrade rank - var/evo_points = 0 // used for borer shopping, gained by reproductions + /// Which focuses we have + var/list/learned_focuses = list() + /// chemical scaling, gained when acquired unique host + var/datum/borer_misc/change_host_and_scale/scaling = new + /// used to upgrade rank + var/reproductions = 0 + /// used for borer shopping, gained by reproductions + var/evo_points = 0 var/tick_interval = 1 SECONDS @@ -68,13 +72,6 @@ reproductions++ evo_points++ - if(!borer_rank?.required_reproductions) - return - - if(reproductions < borer_rank.required_reproductions) - return - - reproductions -= borer_rank.required_reproductions update_rank() return @@ -194,16 +191,17 @@ if(QDELING(src)) return -/datum/antagonist/borer/proc/update_rank() - switch(borer_rank.type) - if(BORER_RANK_YOUNG) - borer_rank = new BORER_RANK_MATURE(user) - if(BORER_RANK_MATURE) - borer_rank = new BORER_RANK_ADULT(user) - if(BORER_RANK_ADULT) - borer_rank = new BORER_RANK_ELDER(user) +/datum/antagonist/borer/proc/update_rank() + if(!borer_rank?.required_reproductions || !borer_rank.next_rank_type) + return FALSE + + if(reproductions < borer_rank.required_reproductions) + return FALSE + reproductions -= borer_rank.required_reproductions + borer_rank = new borer_rank.next_rank_type(user) to_chat(user.controlling ? host : user, span_notice("Вы эволюционировали. Ваш текущий ранг - [borer_rank.rankname].")) + return TRUE /datum/borer_misc // category for small datums. diff --git a/code/modules/antagonists/borer/borer_rank.dm b/code/modules/antagonists/borer/borer_rank.dm index ca1dde7becf..2bdc3dad883 100644 --- a/code/modules/antagonists/borer/borer_rank.dm +++ b/code/modules/antagonists/borer/borer_rank.dm @@ -1,8 +1,10 @@ /datum/borer_rank var/rankname = "Error" - var/required_reproductions = null // how many reproductions we need to gain new rank + /// how many reproductions we need to gain new rank + var/required_reproductions var/datum/antagonist/borer/parent var/mob/living/simple_animal/borer/owner + var/next_rank_type /datum/borer_rank/Destroy(force) parent = null @@ -23,14 +25,17 @@ /datum/borer_rank/young rankname = "Young" required_reproductions = REPRODUCTIONS_TO_MATURE + next_rank_type = BORER_RANK_MATURE /datum/borer_rank/mature rankname = "Mature" required_reproductions = REPRODUCTIONS_TO_ADULT + next_rank_type = BORER_RANK_ADULT /datum/borer_rank/adult rankname = "Adult" required_reproductions = REPRODUCTIONS_TO_ELDER + next_rank_type = BORER_RANK_ELDER /datum/borer_rank/elder rankname = "Elder" diff --git a/code/modules/antagonists/space_dragon/space_dragon_datum.dm b/code/modules/antagonists/space_dragon/space_dragon_datum.dm index c62f7508570..2e3e7f86aac 100644 --- a/code/modules/antagonists/space_dragon/space_dragon_datum.dm +++ b/code/modules/antagonists/space_dragon/space_dragon_datum.dm @@ -102,7 +102,7 @@ * */ /datum/antagonist/space_dragon/proc/rift_checks() - if((rifts_charged == 3 || (SSshuttle.emergency.mode == SHUTTLE_DOCKED && rifts_charged > 0)) && !objective_complete) + if((rifts_charged == 3 || (EMERGENCY_AT_LEAST_DOCKED && rifts_charged > 0)) && !objective_complete) victory() return if(riftTimer == -1) @@ -162,7 +162,7 @@ rift.time_charged = rift.max_charge SSshuttle.emergency.canRecall = FALSE SSshuttle.emergencyNoEscape = FALSE - if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED) + if(EMERGENCY_AT_LEAST_DOCKED) return SSshuttle.emergency.request(coefficient = 0.5) diff --git a/code/modules/antagonists/space_ninja/ninja_shuttle.dm b/code/modules/antagonists/space_ninja/ninja_shuttle.dm index a50e3e763cf..fab3616058b 100644 --- a/code/modules/antagonists/space_ninja/ninja_shuttle.dm +++ b/code/modules/antagonists/space_ninja/ninja_shuttle.dm @@ -29,5 +29,4 @@ /area/shuttle/ninja icon_state = "shuttlegrn" name = "\improper Spider Clan \"Ombra\" Shuttle" - parallax_movedir = SOUTH nad_allowed = TRUE diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm index 6fe5ac0e6b4..ac226905fbb 100644 --- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm @@ -192,8 +192,7 @@ if(!possible_zones) // Compute the list of all zones by their name first var/list/all_areas_by_name = list() - for(var/a in GLOB.all_areas) - var/area/A = a + for(var/area/A in GLOB.areas) if(A.outdoors || !is_station_level(A.z)) continue var/i = findtext(A.map_name, name_fixer) diff --git a/code/modules/awaymissions/cordon.dm b/code/modules/awaymissions/cordon.dm new file mode 100644 index 00000000000..bc645308c6a --- /dev/null +++ b/code/modules/awaymissions/cordon.dm @@ -0,0 +1,50 @@ +/// Turf type that appears to be a world border, completely impassable and non-interactable to all physical (alive) entities. +/turf/cordon + name = "cordon" + icon = 'icons/turf/walls.dmi' + icon_state = "cordon" + invisibility = INVISIBILITY_ABSTRACT + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + explosion_block = INFINITY + explosion_vertical_block = INFINITY + opacity = TRUE + density = TRUE + blocks_air = TRUE + init_air = FALSE + turf_flags = NOJAUNT + baseturf = /turf/cordon + +/turf/cordon/acid_act() + return FALSE + +/turf/cordon/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay) + return + +/turf/cordon/singularity_act() + return + +/turf/cordon/bullet_act() + return + +/turf/cordon/Adjacent(atom/neighbor, atom/target, atom/movable/mover) + return + +/turf/cordon/Bumped(atom/movable/bumped_atom) + . = ..() + + dump_in_space(bumped_atom) + +/// Area used in conjuction with the cordon turf to create a fully functioning world border. +/area/misc/cordon + name = "CORDON" + icon_state = "cordon" + static_lighting = FALSE + base_lighting_alpha = 255 + area_flags = UNIQUE_AREA + requires_power = FALSE + +/area/misc/cordon/Entered(atom/movable/arrived, area/old_area) + . = ..() + for(var/mob/living/enterer as anything in arrived.get_all_contents_type(/mob/living)) + to_chat(enterer, span_userdanger("This was a bad idea...")) + enterer.dust(TRUE, FALSE, TRUE) diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm index 58edda29e7a..ec5b14a87b1 100644 --- a/code/modules/awaymissions/maploader/reader.dm +++ b/code/modules/awaymissions/maploader/reader.dm @@ -83,12 +83,14 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) var/xcrd var/ycrd = text2num(dmmRegex.group[4]) + y_offset - 1 var/zcrd = text2num(dmmRegex.group[5]) + z_offset - 1 + var/new_z = FALSE if(!measureOnly) if(zcrd > world.maxz) if(shouldCropMap) continue else + new_z = TRUE GLOB.space_manager.increase_max_zlevel_to(zcrd) // create a new z_level if needed bounds[MAP_MINX] = min(bounds[MAP_MINX], xcrdStart) @@ -137,7 +139,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) var/model_key = copytext(line, tpos, tpos + key_len) if(!grid_models[model_key]) throw EXCEPTION("Undefined model key in DMM: [model_key]. Map file: [fname].") - parse_grid(grid_models[model_key], xcrd, ycrd, zcrd, LM) + parse_grid(grid_models[model_key], xcrd, ycrd, zcrd, LM, new_z) // After this call, it is NOT safe to reference `dmmRegex` without another call to // "Find" - we might've hit a map loader here and changed its state CHECK_TICK @@ -162,7 +164,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) for(var/t in block(bounds[MAP_MINX], bounds[MAP_MINY], bounds[MAP_MINZ], bounds[MAP_MAXX], bounds[MAP_MAXY], bounds[MAP_MAXZ])) var/turf/T = t // we do this after we load everything in. if we don't; we'll have weird atmos bugs regarding atmos adjacent turfs - T.AfterChange(TRUE, keep_cabling = TRUE) + T.AfterChange(CHANGETURF_IGNORE_AIR|CHANGETURF_KEEP_CABLING) CHECK_TICK return bounds @@ -184,7 +186,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) * 4) Instanciates the atom with its variables * */ -/datum/dmm_suite/proc/parse_grid(model = "", xcrd = 0, ycrd = 0, zcrd = 0, datum/dmm_suite/loaded_map/LM) +/datum/dmm_suite/proc/parse_grid(model = "", xcrd = 0, ycrd = 0, zcrd = 0, datum/dmm_suite/loaded_map/LM, new_z) /*Method parse_grid() - Accepts a text string containing a comma separated list of type paths of the same construction as those contained in a .dmm file, and instantiates them. @@ -255,7 +257,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) // first instance the /area and remove it from the members list index = members.len - + var/area/old_area var/turf/crds = locate(xcrd, ycrd, zcrd) if(members[index] != /area/template_noop) // We assume `members[index]` is an area path, as above, yes? I will operate @@ -264,13 +266,17 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) throw EXCEPTION("Oh no, I thought this was an area!") GLOB._preloader.setup(members_attributes[index]) // preloader for assigning set variables on atom creation - var/atom/instance = LM.area_path_to_real_area(members[index]) + // If this parsed map doesn't have that area already, we check the global cache + var/area/area_instance = LM.area_path_to_real_area(members[index]) - if(crds) - instance.contents.Add(crds) + if(!new_z) + old_area = crds.loc + old_area.turfs_to_uncontain += crds + area_instance.contained_turfs.Add(crds) + area_instance.contents.Add(crds) - if(GLOB.use_preloader && instance) - GLOB._preloader.load(instance) + if(GLOB.use_preloader && area_instance) + GLOB._preloader.load(area_instance) // then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect @@ -480,22 +486,25 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new()) // yet have a single area type for use of mapping, instead of creating // a new area type for each new ruin /datum/dmm_suite/loaded_map - var/list/area_list = list() + /// List of area types we've loaded AS A PART OF THIS MAP + /// We do this to allow non unique areas, so we'll only load one per map + var/list/area/loaded_areas = list() var/index = 1 // To store the state of the regex /datum/dmm_suite/loaded_map/proc/area_path_to_real_area(area/A) - if(!ispath(A, /area)) - throw EXCEPTION("Wrong argument to `area_path_to_real_area`") - - if(!(A in area_list)) - if(initial(A.there_can_be_many)) - area_list[A] = new A - else - if(!GLOB.all_unique_areas[A]) - GLOB.all_unique_areas[A] = new A // No locate here else it will find a subtype of the one we're looking for - area_list[A] = GLOB.all_unique_areas[A] - - return area_list[A] + var/area/area_instance = loaded_areas[A] + if(!area_instance) + var/area_type = A + // If this parsed map doesn't have that area already, we check the global cache + area_instance = GLOB.areas_by_type[area_type] + // If the global list DOESN'T have this area it's either not a unique area, or it just hasn't been created yet + if (!area_instance) + area_instance = new area_type(null) + if(!area_instance) + CRASH("[area_type] failed to be new'd, what'd you do?") + loaded_areas[area_type] = area_instance + + return area_instance /area/template_noop name = "Area Passthrough" diff --git a/code/modules/awaymissions/mission_code/ruins/graveyard.dm b/code/modules/awaymissions/mission_code/ruins/graveyard.dm index a33dc6dda2e..78482d54a3a 100644 --- a/code/modules/awaymissions/mission_code/ruins/graveyard.dm +++ b/code/modules/awaymissions/mission_code/ruins/graveyard.dm @@ -18,7 +18,6 @@ /area/shuttle/funeral icon_state = "shuttle3" name = "Suneral Shuttle" - parallax_movedir = SOUTH nad_allowed = TRUE /obj/machinery/computer/shuttle/funeral diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index aa48e50a3a6..5387ca9e2cc 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -14,12 +14,15 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away T.ChangeTurf(T.baseturf) /proc/loadAwayLevel() - if(!GLOB.potentialRandomZlevels || !GLOB.potentialRandomZlevels.len) + if((!GLOB.potentialRandomZlevels || !GLOB.potentialRandomZlevels.len) && !CONFIG_GET(string/override_away_mission)) log_startup_progress_global("Mapping", "No away missions found.") return var/watch = start_watch() log_startup_progress_global("Mapping", "Loading away mission...") - var/map = pick(GLOB.potentialRandomZlevels) + var/map = !CONFIG_GET(string/override_away_mission) ? pick(GLOB.potentialRandomZlevels) : CONFIG_GET(string/override_away_mission) + if(CONFIG_GET(string/override_away_mission)) + log_startup_progress_global("Mapping", "Away mission overridden by configuration to [CONFIG_GET(string/override_away_mission)].") + var/file = wrap_file(map) var/bounds = GLOB.maploader.load_map(file, 1, 1, 1, shouldCropMap = FALSE, measureOnly = TRUE) var/total_z = bounds[MAP_MAXZ] - bounds[MAP_MINZ] + 1 @@ -73,42 +76,3 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away return potentialMaps - -/datum/map_template/ruin/proc/try_to_place(z, allowed_areas) - var/sanity = PLACEMENT_TRIES - while(sanity > 0) - sanity-- - var/width_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(width / 2) - var/height_border = TRANSITIONEDGE + SPACERUIN_MAP_EDGE_PAD + round(height / 2) - var/turf/central_turf = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z) - var/valid = TRUE - - for(var/turf/check in get_affected_turfs(central_turf,1)) - var/area/new_area = get_area(check) - if(!(istype(new_area, allowed_areas)) || check.flags & NO_RUINS) - valid = FALSE - break - - if(!valid) - continue - - log_world("Ruin \"[name]\" placed at ([central_turf.x], [central_turf.y], [central_turf.z])") - - for(var/i in get_affected_turfs(central_turf, 1)) - var/turf/T = i - for(var/obj/structure/spawner/nest in T) - qdel(nest) - for(var/mob/living/simple_animal/monster in T) - qdel(monster) - for(var/obj/structure/flora/ash/plant in T) - qdel(plant) - - load(central_turf,centered = TRUE) - loaded++ - - for(var/turf/T in get_affected_turfs(central_turf, 1)) - T.flags |= NO_RUINS - - new /obj/effect/landmark/ruin(central_turf, src) - return TRUE - return FALSE diff --git a/code/modules/client/preference/loadout/loadout_plushie.dm b/code/modules/client/preference/loadout/loadout_plushie.dm index 431f0d6c20e..e90ab2146e2 100644 --- a/code/modules/client/preference/loadout/loadout_plushie.dm +++ b/code/modules/client/preference/loadout/loadout_plushie.dm @@ -44,9 +44,26 @@ path = /obj/item/toy/plushie/greyplushie /datum/gear/plushie/plasmamanplushie - display_name = "Plasmaman Plushie" + display_name = "Plasmaman Plushie, select" path = /obj/item/toy/plushie/plasmamanplushie +/datum/gear/plushie/plasmamanplushie/New() + ..() + var/list/plasmamans = list(/obj/item/toy/plushie/plasmamanplushie, + /obj/item/toy/plushie/plasmamanplushie/standart/sindie, + /obj/item/toy/plushie/plasmamanplushie/standart/doctor, + /obj/item/toy/plushie/plasmamanplushie/standart/brigmed, + /obj/item/toy/plushie/plasmamanplushie/standart/chemist, + /obj/item/toy/plushie/plasmamanplushie/standart/scientist, + /obj/item/toy/plushie/plasmamanplushie/standart/engineer, + /obj/item/toy/plushie/plasmamanplushie/standart/atmostech, + /obj/item/toy/plushie/plasmamanplushie/standart/officer, + /obj/item/toy/plushie/plasmamanplushie/standart/captain, + /obj/item/toy/plushie/plasmamanplushie/standart/ntr, + /obj/item/toy/plushie/plasmamanplushie/standart/miner, + ) + gear_tweaks += new /datum/gear_tweak/path(plasmamans, src, TRUE) + /datum/gear/plushie/shardplushie display_name = "Shard Plushie" path = /obj/item/toy/plushie/shardplushie diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 7a371b75989..6e9a574847c 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -2632,7 +2632,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts for(var/group_key as anything in my_hud.master_groups) var/datum/plane_master_group/group = my_hud.master_groups[group_key] - group.transform_lower_turfs(my_hud, my_hud.current_plane_offset) + group.build_planes_offset(my_hud, my_hud.current_plane_offset) if("parallax_multiz") toggles2 ^= PREFTOGGLE_2_PARALLAX_MULTIZ @@ -2642,7 +2642,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts for(var/group_key as anything in my_hud.master_groups) var/datum/plane_master_group/group = my_hud.master_groups[group_key] - group.transform_lower_turfs(my_hud, my_hud.current_plane_offset) + group.build_planes_offset(my_hud, my_hud.current_plane_offset) if("keybindings") if(!keybindings_overrides) diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index 2cef26fd5e9..d047654588f 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -533,7 +533,7 @@ for(var/group_key as anything in my_hud.master_groups) var/datum/plane_master_group/group = my_hud.master_groups[group_key] - group.transform_lower_turfs(my_hud, my_hud.current_plane_offset) + group.build_planes_offset(my_hud, my_hud.current_plane_offset) /datum/preference_toggle/toggle_vote_popup name = "Toggle Vote Popup" diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1c051689a33..ac3749345c2 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -62,7 +62,7 @@ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT resistance_flags = NONE - armor = list("melee" = 15, "bullet" = 25, "laser" = 15, "energy" = 15, "bomb" = 20, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + armor = list("melee" = 25, "bullet" = 30, "laser" = 20, "energy" = 25, "bomb" = 35, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) /obj/item/clothing/gloves/botanic_leather desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 0e7ac2bcb7f..56db1c4aadf 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -317,7 +317,7 @@ desc = "An intimidating tribal helmet, it doesn't look very comfortable." flags_inv = parent_type::flags_inv|HIDEMASK|HIDENAME flags_cover = HEADCOVERSEYES - armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 45, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) icon_state = "skull" item_state = "skull" strip_delay = 100 diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 51f3161fb41..e17f94aa6a6 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -417,7 +417,7 @@ desc = "These wraps, made from goliath hide, make your feet feel snug and secure, while still being breathable and light." icon_state = "footwraps_goliath" item_state = "footwraps_goliath" - armor = list("melee" = 5, "bullet" = 5, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0) + armor = list("melee" = 10, "bullet" = 10, "laser" = 15, "energy" = 5, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 0) resistance_flags = FIRE_PROOF paintable = FALSE diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index cb45dbfe08f..292f6636e5c 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -149,6 +149,24 @@ HUDType = DATA_HUD_MEDICAL_ADVANCED examine_extensions = EXAMINE_HUD_MEDICAL +/obj/item/clothing/head/helmet/space/plasmaman/medical/brigphysician + name = "brig physician's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman brig doctors, having two red stripes down its length to denote as much." + icon_state = "brigphysician_envirohelm" + item_state = "brigphysician_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/medical/coroner + name = "coroner's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman coroners, having two white stripes down its length to denote as much." + icon_state = "coroner_envirohelm" + item_state = "coroner_envirohelm" + +/obj/item/clothing/head/helmet/space/plasmaman/medical/paramedic + name = "paramedic's plasma envirosuit helmet" + desc = "An envirohelmet designed for plasmaman paramedics, having two white stripes down its length to denote as much." + icon_state = "paramedic_envirohelm" + item_state = "paramedic_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/cmo name = "chief medical officer's plasma envirosuit helmet" desc = "An envirohelmet designed for plasmamen employed as the chief medical officer." @@ -229,9 +247,9 @@ /obj/item/clothing/head/helmet/space/plasmaman/engineering/mecha name = "mechanic plasma envirosuit helmet" - desc = "A space-worthy helmet specially designed for engineer plasmamen, the usual purple stripes being replaced by engineering's orange." - icon_state = "engineer_envirohelm" - item_state = "engineer_envirohelm" + desc = "A space-worthy helmet specially designed for mechanic plasmamen, the usual purple stripes being replaced by engineering's orange." + icon_state = "mechanic_envirohelm" + item_state = "mechanic_envirohelm" HUDType = DATA_HUD_DIAGNOSTIC /obj/item/clothing/head/helmet/space/plasmaman/engineering/ce @@ -258,10 +276,16 @@ /obj/item/clothing/head/helmet/space/plasmaman/cargo name = "cargo plasma envirosuit helmet" - desc = "A plasmaman envirohelmet designed for cargo techs and quartermasters." + desc = "A plasmaman envirohelmet designed for cargo techs." icon_state = "cargo_envirohelm" item_state = "cargo_envirohelm" +/obj/item/clothing/head/helmet/space/plasmaman/qm + name = "quartermaster's plasma envirosuit helmet" + desc = "A plasmaman envirohelmet designed for quartermasters." + icon_state = "qm_envirohelm" + item_state = "qm_envirohelm" + /obj/item/clothing/head/helmet/space/plasmaman/mining name = "mining plasma envirosuit helmet" desc = "A khaki helmet given to plasmaman miners operating on Lavaland." diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 90ba49e6345..32abf1fb95c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -639,7 +639,7 @@ item_state = "goliath_cloak" desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits." allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe) - armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot + armor = list("melee" = 40, "bullet" = 15, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot hoodtype = /obj/item/clothing/head/hooded/goliath body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS @@ -648,7 +648,7 @@ icon_state = "golhood" item_state = "golhood" desc = "A protective & concealing hood." - armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) + armor = list("melee" = 40, "bullet" = 15, "laser" = 30, "energy" = 15, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) flags_inv = HIDEHAIR flags_cover = HEADCOVERSEYES @@ -682,7 +682,7 @@ icon_state = "bonearmor" item_state = "bonearmor" blood_overlay_type = "armor" - armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + armor = list("melee" = 45, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe) body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS sprite_sheets = list( diff --git a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm index 6e86461364c..1ba0eb88171 100644 --- a/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm +++ b/code/modules/clothing/under/jobs/plasmamen/civilian_service.dm @@ -1,6 +1,6 @@ /obj/item/clothing/under/plasmaman/cargo name = "cargo plasma envirosuit" - desc = "An envirosuit used by plasmaman quartermasters and cargo techs alike, due to the logistical problems of differentiating the two by the length of their pant legs." + desc = "An envirosuit used by plasmaman cargo techs, due to the logistical problems of differentiating the two by the length of their pant legs." icon_state = "cargo_envirosuit" item_state = "cargo_envirosuit" item_color = "cargo_envirosuit" @@ -12,6 +12,12 @@ item_state = "explorer_envirosuit" item_color = "explorer_envirosuit" +/obj/item/clothing/under/plasmaman/qm + name = "quartermaster plasma envirosuit" + desc = "An envirosuit used by plasmaman quartermasters, due to the logistical problems of differentiating the two by the length of their pant legs." + icon_state = "qm_envirosuit" + item_state = "qm_envirosuit" + item_color = "qm_envirosuit" /obj/item/clothing/under/plasmaman/chef name = "chef's plasma envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering.dm b/code/modules/clothing/under/jobs/plasmamen/engineering.dm index 8b4e59bbb93..f17d80f6304 100644 --- a/code/modules/clothing/under/jobs/plasmamen/engineering.dm +++ b/code/modules/clothing/under/jobs/plasmamen/engineering.dm @@ -19,3 +19,9 @@ item_state = "atmos_envirosuit" item_color = "atmos_envirosuit" +/obj/item/clothing/under/plasmaman/mechanic + name = "mechanic plasma envirosuit" + desc = "An airtight suit designed to be used by plasmamen employed as mechanics, the usual purple stripes being replaced by engineering's orange. It protects the user from fire and acid damage." + icon_state = "mechanic_envirosuit" + item_state = "mechanic_envirosuit" + item_color = "mechanic_envirosuit" diff --git a/code/modules/clothing/under/jobs/plasmamen/medsci.dm b/code/modules/clothing/under/jobs/plasmamen/medsci.dm index 531bc3fb124..1cba254830e 100644 --- a/code/modules/clothing/under/jobs/plasmamen/medsci.dm +++ b/code/modules/clothing/under/jobs/plasmamen/medsci.dm @@ -53,3 +53,24 @@ icon_state = "chemist_envirosuit" item_state = "chemist_envirosuit" item_color = "chemist_envirosuit" + +/obj/item/clothing/under/plasmaman/brigphysician + name = "brigphysician plasma envirosuit" + desc = "A plasmaman envirosuit designed for brigphysicians." + icon_state = "brigphysician_envirosuit" + item_state = "brigphysician_envirosuit" + item_color = "brigphysician_envirosuit" + +/obj/item/clothing/under/plasmaman/coroner + name = "coroner plasma envirosuit" + desc = "A plasmaman envirosuit designed for coroners." + icon_state = "coroner_envirosuit" + item_state = "coroner_envirosuit" + item_color = "coroner_envirosuit" + +/obj/item/clothing/under/plasmaman/paramedic + name = "paramedic plasma envirosuit" + desc = "A plasmaman envirosuit designed for paramedics." + icon_state = "paramedic_envirosuit" + item_state = "paramedic_envirosuit" + item_color = "paramedic_envirosuit" diff --git a/code/modules/events/ghostpiano.dm b/code/modules/events/ghostpiano.dm index cf7e2b7205e..bdeebab2340 100644 --- a/code/modules/events/ghostpiano.dm +++ b/code/modules/events/ghostpiano.dm @@ -15,7 +15,7 @@ /datum/event/ghostpiano/proc/get_spawning_turf() var/list/availableareas = list() - for(var/area/maintenance/area in GLOB.all_areas) + for(var/area/maintenance/area in GLOB.areas) availableareas += area if(!length(availableareas)) return diff --git a/code/modules/events/headcrabs.dm b/code/modules/events/headcrabs.dm index 55f136fd96e..40d9a14a624 100644 --- a/code/modules/events/headcrabs.dm +++ b/code/modules/events/headcrabs.dm @@ -13,7 +13,7 @@ /datum/event/headcrabs/start() var/list/availableareas = list() - for(var/area/maintenance/A in GLOB.all_areas) + for(var/area/maintenance/A in GLOB.areas) availableareas += A var/area/randomarea = pick(availableareas) var/list/turf/simulated/floor/turfs = list() diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index ab9c99d6fb4..905fab2a920 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -32,7 +32,7 @@ spawn_area_type = pick(spawn_areas) for(var/areapath in typesof(spawn_area_type)) - var/area/A = locate(areapath) in GLOB.all_areas + var/area/A = locate(areapath) in GLOB.areas if(isnull(A)) continue for(var/turf/simulated/floor/F in A.contents) diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 6ef6ead8e31..0a2ebd04bb9 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -40,7 +40,7 @@ GLOB.event_announcement.Announce("[pick("Вирус `Gr3y.T1d3`","Вредоносный троян")] обнаружен в подсистеме [(eventDept == "Security")? "заключения":"безопасности"] на [station_name()]. Немедленно обеспечьте безопасность всех затронутых отсеков. Рекомендуется участие ИИ станции.", "АВАРИЙНОЕ ОПОВЕЩЕНИЕ [eventDept].") /datum/event/prison_break/start() - for(var/area/A in world) + for(var/area/A as anything in GLOB.areas) if(is_type_in_list(A,areaType) && !is_type_in_list(A,areaNotType)) areas += A diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 415f9c04b43..a75d05b9d43 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -16,7 +16,7 @@ var/obj/structure/spacevine/SV = new() - for(var/area/hallway/A in world) + for(var/area/hallway/A in GLOB.areas) for(var/turf/F in A) if(F.Enter(SV)) turfs += F @@ -155,7 +155,7 @@ if(prob(50)) ChangeTurf(baseturf) -/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, ignore_air = FALSE, copy_existing_baseturf = TRUE) +/turf/simulated/floor/vines/ChangeTurf(turf/simulated/floor/T, defer_change = FALSE, keep_icon = TRUE, after_flags = NONE, copy_existing_baseturf = TRUE) . = ..() //Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't for(var/obj/structure/spacevine/SV in src) diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm index 89ca589b959..1ecca32f013 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm @@ -147,6 +147,31 @@ to_chat(user, span_warning("You have no idea how to cook with [I].")) return ATTACK_CHAIN_PROCEED|ATTACK_CHAIN_NO_AFTERATTACK +/obj/machinery/kitchen_machine/AltClick(mob/living/carbon/human/human) + if(!istype(human) || !human.Adjacent(src)) + return + + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) + return + + if(operating) + return + + add_fingerprint(human) + cook() + +/obj/machinery/kitchen_machine/CtrlShiftClick(mob/living/carbon/human/human) + if(!istype(human) || !human.Adjacent(src)) + return + + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) + return + + if(operating) + return + + add_fingerprint(human) + dispose(human) /obj/machinery/kitchen_machine/screwdriver_act(mob/living/user, obj/item/I) . = TRUE @@ -458,13 +483,16 @@ update_icon(UPDATE_ICON_STATE) updateUsrDialog() -/obj/machinery/kitchen_machine/proc/dispose() +/obj/machinery/kitchen_machine/proc/dispose(mob/user) for(var/obj/O in contents) O.forceMove(loc) + if(reagents.total_volume) dirty++ + reagents.clear_reagents() - to_chat(usr, "You dispose of \the [src]'s contents.") + to_chat(user, span_notice("You dispose of \the [src]'s contents.")) + updateUsrDialog() /obj/machinery/kitchen_machine/proc/muck_start() @@ -525,7 +553,8 @@ cook() if("dispose") - dispose() + dispose(usr) + return diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm index d90aacc18d7..4bd355eaa48 100644 --- a/code/modules/lighting/lighting_area.dm +++ b/code/modules/lighting/lighting_area.dm @@ -87,7 +87,6 @@ GLOBAL_LIST_INIT_TYPED(fullbright_overlays, /mutable_appearance, list(create_ful add_overlay(lighting_effects[1]) var/list/z_offsets = SSmapping.z_level_to_plane_offset for(var/turf/T in src) - T.luminosity = 1 // This outside loop is EXTREMELY hot because it's run by space tiles. Don't want no part in that // We will only add overlays to turfs not on the first z layer, because that's a significantly lesser portion // And we need to do them separate, or lighting will go fuckey diff --git a/code/modules/lighting/lighting_object.dm b/code/modules/lighting/lighting_object.dm index d1d543f68e8..58094af31c1 100644 --- a/code/modules/lighting/lighting_object.dm +++ b/code/modules/lighting/lighting_object.dm @@ -42,7 +42,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) stack_trace("a lighting object was assigned to a turf that already had a lighting object!") affected_turf.lighting_object = src - affected_turf.luminosity = 0 // This path is really hot. this is faster // Really this should be a global var or something, but lets not think about that yes? @@ -59,7 +58,6 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) SSlighting.objects_queue -= src if (isturf(affected_turf)) affected_turf.lighting_object = null - affected_turf.luminosity = 1 affected_turf = null return ..() @@ -109,8 +107,7 @@ GLOBAL_LIST_EMPTY(default_lighting_underlays_by_z) alpha_corner.cache_r, alpha_corner.cache_g, alpha_corner.cache_b, 00, 00, 00, 00, 01 ) - - affected_turf.luminosity = set_luminosity + SSdemo.mark_turf(affected_turf) diff --git a/code/modules/lighting/lighting_setup.dm b/code/modules/lighting/lighting_setup.dm index 352ea856127..6ce2b7ef8bd 100644 --- a/code/modules/lighting/lighting_setup.dm +++ b/code/modules/lighting/lighting_setup.dm @@ -1,5 +1,5 @@ /proc/create_all_lighting_objects() - for(var/area/A in world) + for(var/area/A as anything in GLOB.areas) if(!A.static_lighting) continue diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 30c1fc20f0d..99129fc902c 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -273,8 +273,6 @@ if(source_turf) var/uses_multiz = !!GET_LOWEST_STACK_OFFSET(source_turf.z) - var/oldlum = source_turf.luminosity - source_turf.luminosity = CEILING(light_range, 1) if(uses_multiz) for(var/turf/T in view(CEILING(light_range, 1), source_turf)) if(IS_OPAQUE_TURF(T)) @@ -311,8 +309,6 @@ INSERT_CORNERS(corners, T) SSdemo.mark_turf(T) - source_turf.luminosity = oldlum - SETUP_CORNERS_CACHE(src) var/list/datum/lighting_corner/new_corners = (corners - src.effect_str) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 82abf5c9b97..3650601de72 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -223,7 +223,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe) icon_state = "pathcloak" item_state = "pathcloak" - armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 35, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) + armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 60, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) resistance_flags = FIRE_PROOF body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT @@ -253,7 +253,7 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR flags_cover = HEADCOVERSEYES - armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 35, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) + armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 40, "bomb" = 60, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50) resistance_flags = FIRE_PROOF min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index 0de7bbb7c58..a36867067e5 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -237,7 +237,7 @@ user.visible_message("[user] turns \the [T] into [transform_string]!") message_admins("[key_name_admin(user)] fired the lava staff at [ADMIN_COORDJMP(T)]") add_attack_logs(user, target, "fired lava staff", ATKLOG_MOST) - T.TerraformTurf(turf_type, keep_icon = FALSE) + T.ChangeTurf(turf_type, keep_icon = FALSE) timer = world.time + create_cooldown qdel(L) else @@ -246,7 +246,7 @@ return else user.visible_message("[user] turns \the [T] into [reset_string]!") - T.TerraformTurf(reset_turf_type, keep_icon = FALSE) + T.ChangeTurf(reset_turf_type, keep_icon = FALSE) timer = world.time + reset_cooldown playsound(T,'sound/magic/fireball.ogg', 200, 1) diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 88e8c24624b..2fe4ec95358 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -322,7 +322,7 @@ activation_sound = 'sound/magic/timeparadox2.ogg' var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook, /obj/item/clothing/mask/facehugger, /obj/item/contractor_uplink, - /obj/item/dice/d20/fate, /obj/item/gem, /obj/item/guardiancreator) + /obj/item/dice/d20/fate, /obj/item/gem, /obj/item/guardiancreator, /obj/item/dna_upgrader) /obj/machinery/anomalous_crystal/refresher/New() ..() diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 21d4e613711..1a312d331fb 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -3,7 +3,15 @@ //Internal /obj/item/storage/backpack/shared name = "paradox bag" - desc = "Somehow, it's in two places at once." + desc = "Каким-то образом, эта сумка существует в двух местах одновременно." + ru_names = list( + NOMINATIVE = "парадоксальная сумка", + GENITIVE = "парадоксальной сумки", + DATIVE = "парадоксальной сумке", + ACCUSATIVE = "парадоксальную сумку", + INSTRUMENTAL = "парадоксальной сумкой", + PREPOSITIONAL = "парадоксальной сумке" + ) max_combined_w_class = 60 max_w_class = WEIGHT_CLASS_NORMAL cant_hold = list(/obj/item/storage/backpack/shared) @@ -13,7 +21,7 @@ // basically we cannot put one bag in the storage if another one is already there if(istype(I) && I.bag && I.bag == src && I.twin_storage && I.twin_storage.loc == src) if(!stop_messages) - to_chat(usr, span_warning("Yo dawg, and how are you going to do it?")) + balloon_alert(usr, "невозможно!") return FALSE return ..() @@ -21,7 +29,15 @@ //External /obj/item/shared_storage name = "paradox bag" - desc = "Somehow, it's in two places at once." + desc = "Каким-то образом, эта сумка существует в двух местах одновременно." + ru_names = list( + NOMINATIVE = "парадоксальная сумка", + GENITIVE = "парадоксальной сумки", + DATIVE = "парадоксальной сумке", + ACCUSATIVE = "парадоксальную сумку", + INSTRUMENTAL = "парадоксальной сумкой", + PREPOSITIONAL = "парадоксальной сумке" + ) icon = 'icons/obj/storage.dmi' icon_state = "cultpack" slot_flags = ITEM_SLOT_BACK @@ -111,7 +127,15 @@ /obj/item/book_of_babel name = "Book of Babel" - desc = "An ancient tome written in countless tongues." + desc = "Древнейший фолиант, написанный в бесчисленном множестве языков." + ru_names = list( + NOMINATIVE = "книга Вавилона", + GENITIVE = "книги Вавилона", + DATIVE = "книге Вавилона", + ACCUSATIVE = "книгу Вавилона", + INSTRUMENTAL = "книгой Вавилона", + PREPOSITIONAL = "книге Вавилона" + ) icon = 'icons/obj/library.dmi' icon_state = "book1" w_class = 2 @@ -119,11 +143,14 @@ /obj/item/book_of_babel/attack_self(mob/living/carbon/user) if(HAS_TRAIT(user, TRAIT_NO_BABEL)) - user.visible_message(span_notice("[user] suddenly stops, releasing [src].")) - to_chat(user, span_warning("You don't know what a book is or what to do with it.")) + user.visible_message( + span_notice("[user] внезапно останавлива[pluralize_ru(user, "ет", "ют")]ся, недоумённо глядя на [declent_ru(GENITIVE)]."), + span_warning("Вы понятия не имеете, что это такое и что с этим делать.") + ) + return - to_chat(user, "You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.") + to_chat(user, "Вы упоённо пролистываете страницы книги, вбирая в себя знания всех существующих языков во Вселенной. К сожалению, [declent_ru(NOMINATIVE)] не выдерживает такого напора и рассыпается в прах. Ой...") user.grant_all_babel_languages() new /obj/effect/decal/cleanable/ash(get_turf(user)) user.temporarily_remove_item_from_inventory(src) @@ -138,7 +165,15 @@ /obj/item/reagent_containers/glass/bottle/potion/flight name = "strange elixir" - desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'." + desc = "Флакон с едва ли не святой аурой, исходящей от него. Вы пытаетесь прочитать надпись на бутылке, но текст неразборчив." + ru_names = list( + NOMINATIVE = "странный эликсир", + GENITIVE = "странного эликсира", + DATIVE = "странному эликсиру", + ACCUSATIVE = "странный эликсир", + INSTRUMENTAL = "странным эликсиром", + PREPOSITIONAL = "странном эликсире" + ) list_reagents = list("flightpotion" = 5) /obj/item/reagent_containers/glass/bottle/potion/update_icon_state() @@ -150,20 +185,20 @@ /datum/reagent/flightpotion name = "Flight Potion" id = "flightpotion" - description = "Strange mutagenic compound of unknown origins." + description = "Странный мутагенный состав неизвестного происхождения." reagent_state = LIQUID color = "#FFEBEB" /datum/reagent/flightpotion/reaction_mob(mob/living/M, method = REAGENT_TOUCH, reac_volume, show_message = 1) - to_chat(M, "This item is currently non-functional.") + to_chat(M, span_warning("Данный предмет нефункционален на текущий момент.")) /*if(ishuman(M) && M.stat != DEAD) var/mob/living/carbon/human/H = M if(!ishumanbasic(H) || reac_volume < 5) // implying xenohumans are holy if(method == INGEST && show_message) - to_chat(H, "You feel nothing but a terrible aftertaste.") + to_chat(H, span_notice("Кроме отвратительного послевкусия у вас во рту, вы ничего не почувствовали.")) return ..() - to_chat(H, "A terrible pain travels down your back as wings burst out!") + to_chat(H, span_danger("Невыносимая боль проходит через вашу спину, как вдруг оттуда вырываются крылья!")) H.set_species(/datum/species/angel) playsound(H.loc, 'sound/items/poster_ripped.ogg', 50, 1, -1) H.adjustBruteLoss(20) @@ -172,7 +207,15 @@ /obj/item/jacobs_ladder name = "jacob's ladder" - desc = "A celestial ladder that violates the laws of physics." + desc = "Небесная лестница, нарушающая законы физики." + ru_names = list( + NOMINATIVE = "лестница Иакова", + GENITIVE = "лестницы Иакова", + DATIVE = "лестнице Иакова", + ACCUSATIVE = "лестницу Иакова", + INSTRUMENTAL = "лестницей Иакова", + PREPOSITIONAL = "лестнице Иакова" + ) icon = 'icons/obj/structures.dmi' icon_state = "ladder" @@ -180,7 +223,7 @@ var/turf/T = get_turf(src) var/ladder_x = T.x var/ladder_y = T.y - to_chat(user, "You unfold the ladder. It extends much farther than you were expecting.") + to_chat(user, span_notice("Вы разворачиваете лестницу. Она уходит значительно дальше, чем вы ожидали.")) var/last_ladder = null for(var/i in 1 to world.maxz) if(is_admin_level(i) || is_away_level(i) || is_taipan(i)) @@ -195,12 +238,27 @@ // Inherit from unbreakable but don't set ID, to suppress the default Z linkage /obj/structure/ladder/unbreakable/jacob name = "jacob's ladder" - desc = "An indestructible celestial ladder that violates the laws of physics." - + desc = "Нерушимая небесная лестница, нарушающая законы физики." + ru_names = list( + NOMINATIVE = "лестница Иакова", + GENITIVE = "лестницы Иакова", + DATIVE = "лестнице Иакова", + ACCUSATIVE = "лестницу Иакова", + INSTRUMENTAL = "лестницей Иакова", + PREPOSITIONAL = "лестнице Иакова" + ) //Wisp Lantern /obj/item/wisp_lantern name = "spooky lantern" - desc = "This lantern gives off no light, but is home to a friendly wisp." + desc = "Эта лампа не источает света, но является пристанищем для дружелюбного духа." + ru_names = list( + NOMINATIVE = "жуткая лампа", + GENITIVE = "жуткой лампы", + DATIVE = "жуткой лампе", + ACCUSATIVE = "жуткую лампу", + INSTRUMENTAL = "жуткой лампой", + PREPOSITIONAL = "жуткой лампе" + ) icon = 'icons/obj/lighting.dmi' icon_state = "lantern-blue" item_state = "lantern" @@ -222,33 +280,31 @@ /obj/item/wisp_lantern/attack_self(mob/user) if(!wisp) - to_chat(user, "The wisp has gone missing!") + balloon_alert(user, "дух исчезает") update_icon(UPDATE_ICON_STATE) return if(wisp.loc == src) RegisterSignal(user, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight)) - to_chat(user, "You release the wisp. It begins to bob around your head.") + balloon_alert(user, "дух выпущен") wisp.forceMove(user) update_icon(UPDATE_ICON_STATE) INVOKE_ASYNC(wisp, TYPE_PROC_REF(/atom/movable, orbit), user, 20) set_light_on(FALSE) user.update_sight() - to_chat(user, "The wisp enhances your vision.") SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed") // freed else UnregisterSignal(user, COMSIG_MOB_UPDATE_SIGHT) - to_chat(user, "You return the wisp to the lantern.") + balloon_alert("дух возвращён") wisp.stop_orbit() wisp.forceMove(src) set_light_on(TRUE) user.update_sight() - to_chat(user, "Your vision returns to normal.") update_icon(UPDATE_ICON_STATE) SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned") // returned @@ -263,7 +319,7 @@ if(wisp.loc == src) qdel(wisp) else - wisp.visible_message("[wisp] has a sad feeling for a moment, then it passes.") + wisp.visible_message(span_notice("Дух огорчённо вздыхает, а затем улетает восвояси.")) return ..() /obj/item/wisp_lantern/proc/update_user_sight(mob/user) @@ -273,7 +329,15 @@ /obj/effect/wisp name = "friendly wisp" - desc = "Happy to light your way." + desc = "Счастливо освещает вам путь." + ru_names = list( + NOMINATIVE = "дружелюбный дух", + GENITIVE = "дружелюбного духа", + DATIVE = "дружелюбному духу", + ACCUSATIVE = "дружелюбного духа", + INSTRUMENTAL = "дружелюбным духом", + PREPOSITIONAL = "дружелюбном духе" + ) icon = 'icons/obj/lighting.dmi' icon_state = "orb" light_range = 7 @@ -282,7 +346,15 @@ //Red/Blue Cubes /obj/item/warp_cube name = "blue cube" - desc = "A mysterious blue cube." + desc = "Мистический синий куб." + ru_names = list( + NOMINATIVE = "синий куб", + GENITIVE = "синего куба", + DATIVE = "синему кубу", + ACCUSATIVE = "синий куб", + INSTRUMENTAL = "синим кубом", + PREPOSITIONAL = "синем кубе" + ) icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "blue_cube" var/obj/item/warp_cube/linked @@ -295,11 +367,11 @@ /obj/item/warp_cube/attack_self(mob/user) if(!linked) - to_chat(user, "[src] fizzles uselessly.") + balloon_alert(user, "куб искрится и шипит") return if(is_in_teleport_proof_area(user) || is_in_teleport_proof_area(linked)) - to_chat(user, "[src] sparks and fizzles.") + balloon_alert(user, "куб искрится и шипит.") return if(do_after(user, 1.5 SECONDS, user)) var/datum/effect_system/smoke_spread/smoke = new @@ -313,12 +385,20 @@ smoke2.set_up(1, 0, user.loc) smoke2.start() else - to_chat(user, "You need to hold still to use [src].") + balloon_alert(user, "прервано из-за движения") /obj/item/warp_cube/red name = "red cube" - desc = "A mysterious red cube." + desc = "Мистический красный куб." + ru_names = list( + NOMINATIVE = "красный куб", + GENITIVE = "красного куба", + DATIVE = "красному кубу", + ACCUSATIVE = "красный куб", + INSTRUMENTAL = "красным кубом", + PREPOSITIONAL = "красном кубе" + ) icon_state = "red_cube" /obj/item/warp_cube/red/New() @@ -332,7 +412,15 @@ /obj/item/gun/magic/hook name = "meat hook" - desc = "Mid or feed." + desc = "Ты погляди, свежее мясо!" + ru_names = list( + NOMINATIVE = "мясной крюк", + GENITIVE = "мясного крюка", + DATIVE = "мясному крюку", + ACCUSATIVE = "мясной крюк", + INSTRUMENTAL = "мясным крюком", + PREPOSITIONAL = "мясном крюке" + ) ammo_type = /obj/item/ammo_casing/magic/hook icon_state = "hook" item_state = "chain" @@ -343,7 +431,15 @@ /obj/item/ammo_casing/magic/hook name = "hook" - desc = "a hook." + desc = "Это крюк." + ru_names = list( + NOMINATIVE = "крюк", + GENITIVE = "крюка", + DATIVE = "крюку", + ACCUSATIVE = "крюк", + INSTRUMENTAL = "крюком", + PREPOSITIONAL = "крюке" + ) projectile_type = /obj/item/projectile/hook caliber = "hook" icon_state = "hook" @@ -372,7 +468,7 @@ var/turf/firer_turf = get_turf(firer) var/mob/living/L = target if(!L.anchored && L.loc) - L.visible_message("[L] is snagged by [firer]'s hook!") + L.visible_message(span_danger("[firer] зацепля[pluralize_ru(firer, "ет", "ют")] [L] [declent_ru(INSTRUMENTAL)]!")) ADD_TRAIT(L, TRAIT_UNDENSE, UNIQUE_TRAIT_SOURCE(src)) // Ensures the hook does not hit the target multiple times L.forceMove(firer_turf) REMOVE_TRAIT(L, TRAIT_UNDENSE, UNIQUE_TRAIT_SOURCE(src)) @@ -385,7 +481,15 @@ //Immortality Talisman /obj/item/immortality_talisman name = "Immortality Talisman" - desc = "A dread talisman that can render you completely invulnerable." + desc = "Таинственный талисман, способный даровать неуязвимость." + ru_names = list( + NOMINATIVE = "Талисман Бессмертия", + GENITIVE = "Талисмана Бессмертия", + DATIVE = "Талисману Бессмертия", + ACCUSATIVE = "Талисман Бессмертия", + INSTRUMENTAL = "Талисманом Бессмертия", + PREPOSITIONAL = "Талисмане Бессмертия" + ) icon = 'icons/obj/lavaland/artefacts.dmi' icon_state = "talisman" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF @@ -406,7 +510,7 @@ /obj/item/immortality_talisman/attack_self(mob/user) if(!COOLDOWN_FINISHED(src, last_used_immortality_talisman)) - to_chat(user, span_warning("[src] is still recharging.")) + balloon_alert(user, "ещё не готово!") return var/turf/source_turf = get_turf(src) @@ -415,11 +519,11 @@ COOLDOWN_START(src, last_used_immortality_talisman, 60 SECONDS) SSblackbox.record_feedback("amount", "immortality_talisman_uses", 1) - user.visible_message(span_danger("[user] vanishes from reality, leaving a a hole in [user.p_their()] place!")) + user.visible_message(span_danger("[user] исчеза[pluralize_ru(user, "ет", "ют")] из реальности, оставляя после себя дыру в пространстве!")) var/obj/effect/immortality_talisman/effect = new(source_turf) effect.name = "hole in reality" - effect.desc = "It's shaped an awful lot like [user.name]." + effect.desc = "Подозрительно походит на силуэт [user.name]." effect.setDir(user.dir) user.forceMove(effect) user.add_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src)) @@ -438,7 +542,7 @@ user.remove_traits(list(TRAIT_NO_TRANSFORM, TRAIT_GODMODE), UNIQUE_TRAIT_SOURCE(src)) user.forceMove(effect_turf) - user.visible_message(span_danger("[user] pops back into reality!")) + user.visible_message(span_danger("[user] материализу[pluralize_ru(user.gender, "ет", "ют")]ся в пространстве, вновь возвращаясь в нашу реальность!")) effect.can_destroy = TRUE if(length(effect.contents)) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 842f46e041d..12a1ec2fb79 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -2,6 +2,7 @@ #define BASE_SHEET_MULT 0.5 #define POINT_MULT_ADD_PER_RATING 0.35 #define SHEET_MULT_ADD_PER_RATING 0.2 +#define MESSAGES_WAIT_TIME 1 MINUTES /** * # Ore Redemption Machine @@ -28,15 +29,16 @@ /// List of supply console department names that can receive a notification about ore dumps. /// A list may be provided as entry value to only notify when specific ore is dumped. var/list/supply_consoles = list( - "Science", - "Robotics", - "Research Director's Desk", - "Mechanic", - "Engineering" = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), - "Chief Engineer's Desk" = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), - "Atmospherics" = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), - "Bar" = list(MAT_URANIUM, MAT_PLASMA), - "Virology" = list(MAT_PLASMA, MAT_URANIUM, MAT_GOLD) + RC_SCIENCE, + RC_RESEARCH, + RC_ROBOTICS, + RC_RESEARCH_DIRECTOR_DESK, + RC_MECHANIC, + RC_ENGINEERING = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), + RC_CHIEF_ENGINEER_DESK = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), + RC_ATMOSPHERICS = list(MAT_METAL, MAT_GLASS, MAT_PLASMA), + RC_BAR = list(MAT_URANIUM, MAT_PLASMA), + RC_VIROLOGY = list(MAT_PLASMA, MAT_URANIUM, MAT_GOLD) ) // Variables /// The currently inserted ID. @@ -55,6 +57,7 @@ var/datum/research/files /// The currently inserted design disk. var/obj/item/disk/design_disk/inserted_disk + COOLDOWN_DECLARE(messages_cooldown) /obj/machinery/mineral/ore_redemption/New() ..() @@ -186,9 +189,13 @@ // Process it if(length(ore_buffer)) message_sent = FALSE + if(!COOLDOWN_STARTED(src, messages_cooldown)) + COOLDOWN_START(src, messages_cooldown, MESSAGES_WAIT_TIME) process_ores(ore_buffer) - else if(!message_sent) + + if(COOLDOWN_FINISHED(src, messages_cooldown) && !message_sent) SStgui.update_uis(src) + COOLDOWN_RESET(src, messages_cooldown) send_console_message() message_sent = TRUE @@ -484,7 +491,7 @@ if(!(C.department in supply_consoles)) continue if(!supply_consoles[C.department] || length(supply_consoles[C.department] - mats_in_stock)) - C.createMessage("Плавильная печь", "Новые ресурсы доступны!", msg, 1) // RQ_NORMALPRIORITY + C.createMessage(ORE_REDEMPTION, "Новые ресурсы доступны!", msg, 1) // RQ_NORMALPRIORITY /** * Tries to insert the ID card held by the given user into the machine. diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm index b9a48672e86..bcc9abbb6b4 100644 --- a/code/modules/mob/living/carbon/human/human_say.dm +++ b/code/modules/mob/living/carbon/human/human_say.dm @@ -95,13 +95,13 @@ var/obj/item/organ/internal/lungs = get_organ_slot(INTERNAL_ORGAN_LUNGS) if((breathes && !lungs) || (breathes && lungs && lungs.is_dead())) return FALSE - if(getOxyLoss() > 10 || AmountLoseBreath() >= 8 SECONDS) - emote("gasp") - return FALSE if(mind) return !mind.miming return TRUE +/mob/living/carbon/human/cannot_speak_loudly() + return getOxyLoss() > 10 || AmountLoseBreath() >= 8 SECONDS + /mob/living/carbon/human/proc/SetSpecialVoice(new_voice) if(new_voice) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index d9982ae1f02..41a5e79ee60 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -140,15 +140,27 @@ if(JOB_TITLE_HOS) O = new /datum/outfit/plasmaman/hos - if(JOB_TITLE_CARGOTECH, JOB_TITLE_QUARTERMASTER) + if(JOB_TITLE_CARGOTECH) O = new /datum/outfit/plasmaman/cargo + if(JOB_TITLE_QUARTERMASTER) + O = new /datum/outfit/plasmaman/qm + if(JOB_TITLE_MINER) O = new /datum/outfit/plasmaman/mining - if(JOB_TITLE_DOCTOR, JOB_TITLE_INTERN, JOB_TITLE_BRIGDOC, JOB_TITLE_PARAMEDIC, JOB_TITLE_CORONER) + if(JOB_TITLE_DOCTOR, JOB_TITLE_INTERN) O = new /datum/outfit/plasmaman/medical + if(JOB_TITLE_BRIGDOC) + O = new /datum/outfit/plasmaman/brigdoc + + if(JOB_TITLE_PARAMEDIC) + O = new /datum/outfit/plasmaman/paramedic + + if(JOB_TITLE_CORONER) + O = new /datum/outfit/plasmaman/coroner + if(JOB_TITLE_CMO) O = new /datum/outfit/plasmaman/cmo diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index be1a0129fd8..10ac49a2132 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -290,6 +290,9 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key) var/list/hsp = handle_speech_problems(message_pieces, verb) verb = hsp["verb"] + if(cannot_speak_loudly()) + return whisper(message) + var/list/used_radios = list() if(handle_message_mode(message_mode, message_pieces, verb, used_radios)) return TRUE diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d1020156e82..2d71404ccba 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -142,7 +142,7 @@ // blind_message (optional) is what blind people will hear e.g. "You hear something!" /mob/visible_message(message, self_message, blind_message, list/ignored_mobs, chat_message_type) if(!isturf(loc)) // mobs inside objects (such as lockers) shouldn't have their actions visible to those outside the object - for(var/mob/mob as anything in (get_mobs_in_view(3, src, include_radio = FALSE) - ignored_mobs)) + for(var/mob/mob as anything in viewers(3, src) - ignored_mobs) if(mob.see_invisible < invisibility) continue //can't view the invisible var/msg = message @@ -155,7 +155,7 @@ mob.show_message(msg, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE, chat_message_type) return - for(var/mob/mob as anything in (get_mobs_in_view(7, src, include_radio = FALSE) - ignored_mobs)) + for(var/mob/mob as anything in viewers(7, src) - ignored_mobs) if(mob.see_invisible < invisibility) continue //can't view the invisible var/msg = message @@ -169,7 +169,7 @@ // message is output to anyone who can see, e.g. "The [src] does something!" // blind_message (optional) is what blind people will hear e.g. "You hear something!" /atom/proc/visible_message(message, self_message, blind_message, list/ignored_mobs) - for(var/mob/mob as anything in (get_mobs_in_view(7, src, include_radio = FALSE) - ignored_mobs)) + for(var/mob/mob as anything in viewers(7, src) - ignored_mobs) mob.show_message(message, EMOTE_VISIBLE, blind_message, EMOTE_AUDIBLE) @@ -184,7 +184,7 @@ if(hearing_distance) range = hearing_distance var/msg = message - for(var/mob/M in get_mobs_in_view(range, src)) + for(var/mob/M as anything in viewers(range, src)) M.show_message(msg, EMOTE_AUDIBLE, deaf_message, EMOTE_VISIBLE) // based on say code @@ -211,7 +211,7 @@ var/range = 7 if(hearing_distance) range = hearing_distance - for(var/mob/M in get_mobs_in_view(range, src)) + for(var/mob/M as anything in viewers(range, src)) M.show_message(message, EMOTE_AUDIBLE, deaf_message, EMOTE_VISIBLE) @@ -638,7 +638,7 @@ return FALSE /mob/proc/can_use_machinery(obj/machinery/mach) - return IsAdvancedToolUser() + return IsAdvancedToolUser() /mob/proc/swap_hand() return @@ -673,7 +673,7 @@ var/mob/living/picked = tgui_input_list(usr, "Please select an NPC to respawn as", "Respawn as NPC", allowed_creatures) if(!picked) return - + if(picked == "Mouse") become_mouse() return @@ -684,7 +684,7 @@ if(QDELETED(picked_mob) || picked_mob.key || picked_mob.stat == DEAD) to_chat(usr, span_warning("[capitalize(picked_mob)] is no longer available to respawn!")) return - + if(istype(picked_mob, /mob/living/simple_animal/borer)) var/mob/living/simple_animal/borer/borer = picked_mob borer.transfer_personality(usr.client) @@ -693,7 +693,7 @@ to_chat(usr, span_notify(message)) GLOB.respawnable_list -= usr picked_mob.key = key - + /mob/proc/become_mouse() var/timedifference = world.time - client.time_joined_as_mouse @@ -818,17 +818,20 @@ //Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() - return 0 + return FALSE /mob/proc/can_see_food() return FALSE //Can this mob leave its location without breaking things terrifically? /mob/proc/can_safely_leave_loc() - return 1 // Yes, you can + return TRUE // Yes, you can /mob/proc/IsVocal() - return 1 + return TRUE + +/mob/proc/cannot_speak_loudly() + return FALSE /mob/proc/get_access_locations() return list() diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 5eaa8ad55a0..008f311e06c 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -232,7 +232,7 @@ if(INCORPOREAL_REVENANT) //Incorporeal move, but blocked by holy-watered tiles var/turf/simulated/floor/stepTurf = get_step(L, direct) if(stepTurf) - if(stepTurf.flags & NOJAUNT) + if(stepTurf.turf_flags & NOJAUNT) move_delay += 0.5 SECONDS to_chat(L, span_warning("Святые силы блокируют Ваш путь.")) return FALSE diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index f68feabe24c..404cb514df6 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -511,9 +511,9 @@ dat += "Продолжительность раунда: [round(hours)]h [round(mins)]m
" dat += "Уровень угрозы на станции: [get_security_level_ru_colors()]
" - if(SSshuttle.emergency.mode >= SHUTTLE_ESCAPE) + if(EMERGENCY_ESCAPED_OR_ENDGAMED) dat += "Станция была эвакуирована.
" - else if(SSshuttle.emergency.mode >= SHUTTLE_CALL) + else if((SSshuttle.emergency.mode == SHUTTLE_CALL) || EMERGENCY_AT_LEAST_DOCKED) dat += "В настоящее время станция проходит процедуру эвакуации.
" if(length(SSjobs.prioritized_jobs)) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index a851ee2abfc..7cdcd84ac49 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -623,7 +623,7 @@ toner = 0 /obj/machinery/photocopier/MouseDrop_T(mob/target, mob/living/user) - if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || isAI(user) || target == copymob) + if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || isAI(user)) return if(check_mob()) //is target mob or another mob on this photocopier already? return diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm deleted file mode 100644 index 5de5afdb2f2..00000000000 --- a/code/modules/paperwork/photography.dm +++ /dev/null @@ -1,717 +0,0 @@ -/* Photography! - * Contains: - * Camera - * Camera Film - * Photos - * Photo Albums - */ - -/******* -* film * -*******/ -/obj/item/camera_film - name = "film cartridge" - icon = 'icons/obj/items.dmi' - desc = "A camera film cartridge. Insert it into a camera to reload it." - icon_state = "film" - item_state = "electropack" - w_class = WEIGHT_CLASS_TINY - resistance_flags = FLAMMABLE - - -/******** -* photo * -********/ -/obj/item/photo - name = "photo" - icon = 'icons/obj/items.dmi' - icon_state = "photo" - item_state = "paper" - w_class = WEIGHT_CLASS_SMALL - resistance_flags = FLAMMABLE - max_integrity = 50 - var/blueprints = 0 // Does this have the blueprints? - var/icon/img //Big photo image - var/scribble //Scribble on the back. - var/icon/tiny - var/photo_size = 3 - var/log_text = "" //Used for sending to Discord and just logging - -/obj/item/photo/attack_self(mob/user) - user.examinate(src) - - -/obj/item/photo/attackby(obj/item/I, mob/user, params) - if(is_pen(I) || istype(I, /obj/item/toy/crayon)) - add_fingerprint(user) - if(!user.is_literate()) - to_chat(user, span_warning("You don't know how to write!")) - return ATTACK_CHAIN_PROCEED - var/txt = tgui_input_text(user, "What would you like to write on the back?", "Photo Writing") - if(!txt || !Adjacent(user) || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) - return ATTACK_CHAIN_PROCEED - scribble = txt - return ATTACK_CHAIN_PROCEED_SUCCESS - - if(istype(I, /obj/item/lighter)) - burnphoto(I, user) - return ATTACK_CHAIN_BLOCKED_ALL - - return ..() - - -/obj/item/photo/proc/burnphoto(obj/item/lighter/P, mob/user) - var/class = "" - - if(P.lit && !user.incapacitated() && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) - if(istype(P, /obj/item/lighter/zippo)) - class = "" - - user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like [user.p_theyre()] trying to burn it!", \ - "[class]You hold [P] up to [src], burning it slowly.") - - spawn(20) - if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) - user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ - "[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") - - if(user.is_in_inactive_hand(src)) - user.temporarily_remove_item_from_inventory(src) - - new /obj/effect/decal/cleanable/ash(get_turf(src)) - qdel(src) - - else - to_chat(user, "You must hold \the [P] steady to burn \the [src].") - -/obj/item/photo/examine(mob/user) - . = ..() - if(in_range(user, src) || isobserver(user)) - show(user) - else - . += "It is too far away." - -/obj/item/photo/proc/show(mob/user) - var/icon/img_shown = new/icon(img) - var/colormatrix = user.get_screen_colour() - // Apply colorblindness effects, if any. - if(islist(colormatrix)) - img_shown.MapColors( - colormatrix[1], colormatrix[2], colormatrix[3], - colormatrix[4], colormatrix[5], colormatrix[6], - colormatrix[7], colormatrix[8], colormatrix[9], - ) - usr << browse_rsc(img_shown, "tmp_photo.png") - usr << browse({"[name]"} \ - + "" \ - + "" \ - + "[scribble ? "
Written on the back:
[scribble]" : ""]"\ - + "", "window=Photo[UID()];size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") - onclose(usr, "Photo[UID()]") - return - -/obj/item/photo/verb/rename() - set name = "Rename photo" - set category = "Object" - set src in usr - - if(usr.incapacitated() || !isAI(usr) && HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) - return - - var/n_name = tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", name) - if(!n_name) - return - //loc.loc check is for making possible renaming photos in clipboards - if((loc == usr || (loc.loc && loc.loc == usr)) && !usr.incapacitated() && !HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) - name = "[(n_name ? text("[n_name]") : "photo")]" - add_fingerprint(usr) - - -/************** -* photo album * -**************/ -/obj/item/storage/photo_album - name = "Photo album" - icon = 'icons/obj/items.dmi' - icon_state = "album" - item_state = "briefcase" - can_hold = list(/obj/item/photo) - resistance_flags = FLAMMABLE - drop_sound = 'sound/items/handling/book_drop.ogg' - pickup_sound = 'sound/items/handling/book_pickup.ogg' - - -/********* -* camera * -*********/ -/obj/item/camera - name = "camera" - icon = 'icons/obj/items.dmi' - desc = "A polaroid camera. 10 photos left." - icon_state = "camera" - item_state = "camera" - w_class = WEIGHT_CLASS_SMALL - slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_NECK - var/list/matter = list("metal" = 2000) - var/pictures_max = 10 - var/pictures_left = 10 - var/on = 1 - var/blueprints = 0 - var/icon_on = "camera" - var/icon_off = "camera_off" - var/item_on = "camera" - var/item_off = "camera_off" - var/size = 3 - var/see_ghosts = 0 //for the spoop of it - var/flashing_lights = TRUE - - sprite_sheets = list( - SPECIES_GREY = 'icons/mob/clothing/species/grey/neck.dmi', - SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/neck.dmi', - SPECIES_DRASK = 'icons/mob/clothing/species/drask/neck.dmi', - SPECIES_VOX = 'icons/mob/clothing/species/vox/neck.dmi', - SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi', - SPECIES_WRYN = 'icons/mob/clothing/species/wryn/neck.dmi' - ) - - -/obj/item/camera/spooky/CheckParts(list/parts_list) - ..() - var/obj/item/camera/C = locate(/obj/item/camera) in contents - if(C) - pictures_max = C.pictures_max - pictures_left = C.pictures_left - visible_message("[C] has been imbued with godlike power!") - qdel(C) - - -GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","horror","shadow","ghostian2")) - -/obj/item/camera/spooky - name = "camera obscura" - desc = "A polaroid camera, some say it can see ghosts!" - see_ghosts = 1 - -/obj/item/camera/AltShiftClick(mob/user) - if(!issilicon(usr) && (usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))) - return - - flashing_lights = !flashing_lights - - to_chat(usr, span_notice("You turned [src] flashing lights [flashing_lights ? "on" : "off"], making natural light [flashing_lights ? "invisible" : "visible"]")) - -/obj/item/camera/verb/change_size() - set name = "Set Photo Focus" - set category = "Object" - - if(!issilicon(usr) && (usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))) - return - - var/nsize = tgui_input_list(usr, "Photo Size", "Pick a size of resulting photo.", list(1,3,5,7)) - if(nsize) - size = nsize - to_chat(usr, "Camera will now take [size]x[size] photos.") - - -/obj/item/camera/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE) - return ATTACK_CHAIN_PROCEED - - -/obj/item/camera/attack_self(mob/user) - on = !on - update_icon(UPDATE_ICON_STATE) - to_chat(user, "You switch the camera [on ? "on" : "off"].") - return - -/obj/item/camera/update_icon_state() - icon_state = on ? icon_on : icon_off - item_state = on ? item_on : item_off - - -/obj/item/camera/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/camera_film)) - add_fingerprint(user) - if(pictures_left) - to_chat(user, span_warning("The [name] still has some film in it.")) - return ATTACK_CHAIN_PROCEED - if(!user.drop_transfer_item_to_loc(I, src)) - return ..() - to_chat(user, span_notice("You have fully refilled [src]'s film amount.")) - pictures_left = pictures_max - qdel(I) - return ATTACK_CHAIN_BLOCKED_ALL - - return ..() - - -/obj/item/camera/examine(mob/user) - . = ..() - . += span_notice("Press Alt + Shift + Left Click on [src] to toggle camera flashing") - -/obj/item/camera/proc/get_icon(list/turfs, turf/center, mob/user) - - //Bigger icon base to capture those icons that were shifted to the next tile - //i.e. pretty much all wall-mounted machinery - var/icon/res = icon('icons/effects/96x96.dmi', "") - res.Scale(size*32, size*32) - // Initialize the photograph to black. - res.Blend("#000", ICON_OVERLAY) - - var/atoms[] = list() - for(var/turf/the_turf in turfs) - // Add ourselves to the list of stuff to draw - atoms.Add(the_turf) - // As well as anything that isn't invisible. - - for(var/atom/A in the_turf) - if(istype(A, /atom/movable/lighting_object)) - if(flashing_lights) - continue //Do not apply lighting, making whole image full bright. - - if(A.invisibility) - if(see_ghosts && istype(A,/mob/dead/observer)) - var/mob/dead/observer/O = A - if(O.orbiting) - continue - if(user.mind && !(user.mind.assigned_role == JOB_TITLE_CHAPLAIN)) - atoms.Add(image('icons/mob/mob.dmi', O.loc, pick(GLOB.SpookyGhosts), 4, SOUTH)) - else - atoms.Add(image('icons/mob/mob.dmi', O.loc, "ghost", 4, SOUTH)) - else//its not a ghost - continue - else//not invisable, not a spookyghost add it. - var/disguised = null - if(user.viewing_alternate_appearances && user.viewing_alternate_appearances.len && ishuman(A) && A.alternate_appearances && A.alternate_appearances.len) //This whole thing and the stuff below just checks if the atom is a Solid Snake cosplayer. - for(var/datum/alternate_appearance/alt_appearance in user.viewing_alternate_appearances) - if(alt_appearance.owner == A) //If it turns out they are, don't blow their cover. That'd be rude. - atoms.Add(image(alt_appearance.img, A.loc, layer = 4, dir = A.dir)) //Render their disguise. - atoms.Remove(A) //Don't blow their cover. - disguised = 1 - continue - if(!disguised) //If they aren't, treat them normally. - atoms.Add(A) - - - // Sort the atoms into their layers - var/list/sorted = sort_atoms_by_layer(atoms) - var/center_offset = (size-1)/2 * 32 + 1 - for(var/i; i <= sorted.len; i++) - var/atom/A = sorted[i] - if(istype(A, /atom/movable/lighting_object)) - continue //Lighting objects render last, need to be above all atoms and turfs displayed - if(A) - var/icon/img = getFlatIcon(A)//build_composite_icon(A) - if(istype(A, /obj/item/areaeditor/blueprints/ce)) - blueprints = 1 - - // If what we got back is actually a picture, draw it. - if(isicon(img)) - // Check if we're looking at a mob that's lying down - if(isliving(A)) - var/mob/living/living = A - if(living.body_position == LYING_DOWN) - // If they are, apply that effect to their picture. - img.BecomeLying() - - // Calculate where we are relative to the center of the photo - var/xoff = (A.x - center.x) * 32 + center_offset - var/yoff = (A.y - center.y) * 32 + center_offset - if(ismovable(A)) - xoff+=A:step_x - yoff+=A:step_y - - res.Blend(img, blendMode2iconMode(A.blend_mode), A.pixel_x + xoff, A.pixel_y + yoff) - - // Render any contained effects on top. - for(var/turf/the_turf in turfs) - // Calculate where we are relative to the center of the photo - var/xoff = (the_turf.x - center.x) * 32 + center_offset - var/yoff = (the_turf.y - center.y) * 32 + center_offset - res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff) - - // Render lighting objects to make picture look nice - for(var/atom/movable/lighting_object/light in sorted) - var/xoff = (light.x - center.x) * 32 + center_offset - var/yoff = (light.y - center.y) * 32 + center_offset - res.Blend(getFlatIcon(light), blendMode2iconMode(BLEND_MULTIPLY), light.pixel_x + xoff, light.pixel_y + yoff) - - return res - - -/obj/item/camera/proc/get_mobs(turf/the_turf) - var/mob_detail - for(var/mob/M in the_turf) - if(M.invisibility) - if(see_ghosts && istype(M,/mob/dead/observer)) - var/mob/dead/observer/O = M - if(O.orbiting) - continue - if(!mob_detail) - mob_detail = "You can see a g-g-g-g-ghooooost! " - else - mob_detail += "You can also see a g-g-g-g-ghooooost!" - else - continue - - var/holding = null - - if(iscarbon(M)) - var/mob/living/carbon/A = M - if(A.l_hand || A.r_hand) - if(A.l_hand) holding = "They are holding \a [A.l_hand]" - if(A.r_hand) - if(holding) - holding += " and \a [A.r_hand]" - else - holding = "They are holding \a [A.r_hand]" - - if(!mob_detail) - mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]. " - else - mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]." - return mob_detail - -/obj/item/camera/proc/add_log(turf/the_turf) - var/mob_detail - for(var/mob/M in the_turf) - var/holding = null - if(iscarbon(M)) - var/mob/living/carbon/A = M - if(A.l_hand || A.r_hand) - if(A.l_hand) holding = "holding [A.l_hand]" - if(A.r_hand) - if(holding) - holding += " and [A.r_hand]" - else - holding = "holding [A.r_hand]" - if(!mob_detail) - mob_detail = "[A.client ? "[A.client.ckey]/" : "nockey"]([A]) on photo[A:health < 75 ? " hurt":""].[holding ? " [holding]":"."]. " - else - mob_detail += "Also [A.client ? "[A.client.ckey]/" : "nockey"]([A]) on the photo[A:health < 75 ? " hurt":""].[holding ? " [holding]":"."]." - return mob_detail - -/obj/item/camera/afterattack(atom/target, mob/user, flag, params) - if(!on || !pictures_left || ismob(target.loc)) - return - captureimage(target, user, flag) - - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) - if(flashing_lights) - set_light(3, 2, LIGHT_COLOR_TUNGSTEN, l_on = TRUE) - addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_light), 0), 2) - pictures_left-- - desc = "A polaroid camera. It has [pictures_left] photos left." - to_chat(user, "[pictures_left] photos left.") - on = FALSE - update_icon(UPDATE_ICON_STATE) - if(istype(src, /obj/item/camera/spooky)) - if(user.mind && user.mind.assigned_role == JOB_TITLE_CHAPLAIN && see_ghosts) - if(prob(24)) - handle_haunt(user) - addtimer(CALLBACK(src, PROC_REF(delayed_turn_on)), 6.4 SECONDS) - - -/obj/item/camera/proc/delayed_turn_on() - on = TRUE - update_icon(UPDATE_ICON_STATE) - - -/obj/item/camera/proc/can_capture_turf(turf/T, mob/user) - var/viewer = user - if(user.client) //To make shooting through security cameras possible - viewer = user.client.eye - var/can_see = (T in view(viewer)) //No x-ray vision cameras. - return can_see - -/obj/item/camera/proc/captureimage(atom/target, mob/user, flag) - var/x_c = target.x - (size-1)/2 - var/y_c = target.y + (size-1)/2 - var/z_c = target.z - var/list/turfs = list() - var/log = "Made by [user.name] in [get_area(user)]. " - var/mobs = "" - for(var/i = 1; i <= size; i++) - for(var/j = 1; j <= size; j++) - var/turf/T = locate(x_c, y_c, z_c) - if(isopenspaceturf(T)) - T = GET_TURF_BELOW(T) // Multi-Z - if(can_capture_turf(T, user)) - turfs.Add(T) - mobs += get_mobs(T) - log += add_log(T) - x_c++ - y_c-- - x_c = x_c - size - - var/datum/picture/P = createpicture(target, user, turfs, mobs, flag, blueprints, log) - printpicture(user, P) - -/obj/item/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag, blueprints, logs) - var/icon/photoimage = get_icon(turfs, target, user) - - var/icon/small_img = icon(photoimage) - var/icon/tiny_img = icon(photoimage) - var/icon/ic = icon('icons/obj/items.dmi',"photo") - var/icon/pc = icon('icons/obj/bureaucracy.dmi', "photo") - small_img.Scale(8, 8) - tiny_img.Scale(4, 4) - ic.Blend(small_img,ICON_OVERLAY, 10, 13) - pc.Blend(tiny_img,ICON_OVERLAY, 12, 19) - - var/datum/picture/P = new() - if(istype(src,/obj/item/camera/digital)) - P.fields["name"] = tgui_input_text(user, "Name photo:", "Photo", encode = FALSE) - P.name = P.fields["name"]//So the name is displayed on the print/delete list. - else - P.fields["name"] = "photo" - P.fields["author"] = user - P.fields["icon"] = ic - P.fields["tiny"] = pc - P.fields["img"] = photoimage - P.fields["desc"] = mobs - P.fields["pixel_x"] = rand(-10, 10) - P.fields["pixel_y"] = rand(-10, 10) - P.fields["size"] = size - P.fields["log"] = logs - - return P - -/obj/item/camera/proc/printpicture(mob/user, var/datum/picture/P) - var/obj/item/photo/Photo = new/obj/item/photo() - Photo.loc = user.loc - if(!user.get_inactive_hand()) - user.put_in_inactive_hand(Photo) - - if(blueprints) - Photo.blueprints = 1 - blueprints = 0 - Photo.construct(P) - -/obj/item/photo/proc/construct(var/datum/picture/P) - name = P.fields["name"] - icon = P.fields["icon"] - tiny = P.fields["tiny"] - img = P.fields["img"] - desc = P.fields["desc"] - pixel_x = P.fields["pixel_x"] - pixel_y = P.fields["pixel_y"] - photo_size = P.fields["size"] - log_text = P.fields["log"] - -/obj/item/photo/proc/copy() - var/obj/item/photo/p = new/obj/item/photo() - - p.icon = icon(icon, icon_state) - p.img = icon(img) - p.tiny = icon(tiny) - p.name = name - p.desc = desc - p.scribble = scribble - p.blueprints = blueprints - - return p - - -///hauntings, like hallucinations but more spooky -/obj/item/camera/proc/handle_haunt(mob/user) - var/static/list/creepyasssounds = list( - 'sound/effects/ghost.ogg', - 'sound/effects/ghost2.ogg', - 'sound/effects/heartbeat.ogg', - 'sound/effects/screech.ogg', - 'sound/hallucinations/behind_you1.ogg', - 'sound/hallucinations/behind_you2.ogg', - 'sound/hallucinations/far_noise.ogg', - 'sound/hallucinations/growl1.ogg', - 'sound/hallucinations/growl2.ogg', - 'sound/hallucinations/growl3.ogg', - 'sound/hallucinations/im_here1.ogg', - 'sound/hallucinations/im_here2.ogg', - 'sound/hallucinations/i_see_you1.ogg', - 'sound/hallucinations/i_see_you2.ogg', - 'sound/hallucinations/look_up1.ogg', - 'sound/hallucinations/look_up2.ogg', - 'sound/hallucinations/over_here1.ogg', - 'sound/hallucinations/over_here2.ogg', - 'sound/hallucinations/over_here3.ogg', - 'sound/hallucinations/turn_around1.ogg', - 'sound/hallucinations/turn_around2.ogg', - 'sound/hallucinations/veryfar_noise.ogg', - 'sound/hallucinations/wail.ogg', - ) - SEND_SOUND(user, pick(creepyasssounds)) - - -/***************** -* digital camera * -******************/ -/obj/item/camera/digital - name = "digital camera" - desc = "A digital camera. A small screen shows there is space for 10 photos left." - var/list/datum/picture/saved_pictures = list() - pictures_left = 30 - var/max_storage = 10 - - -/obj/item/camera/digital/afterattack(atom/target, mob/user, flag, params) - if(!on || !pictures_left || ismob(target.loc)) return - captureimage(target, user, flag) - - playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) - - desc = "A digital camera. A small screen shows that there are currently [length(saved_pictures)] pictures stored." - on = FALSE - update_icon(UPDATE_ICON_STATE) - addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/camera, delayed_turn_on)), 6.4 SECONDS) - - -/obj/item/camera/digital/captureimage(atom/target, mob/user, flag) - if(saved_pictures.len >= max_storage) - to_chat(user, "Maximum photo storage capacity reached.") - return - to_chat(user, "Picture saved.") - var/x_c = target.x - (size-1)/2 - var/y_c = target.y + (size-1)/2 - var/z_c = target.z - var/list/turfs = list() - var/log = "Made by [user.name] in [get_area(user)]. " - var/mobs = "" - for(var/i = 1; i <= size; i++) - for(var/j = 1; j <= size; j++) - var/turf/T = locate(x_c, y_c, z_c) - if(can_capture_turf(T, user)) - turfs.Add(T) - mobs += get_mobs(T) - log += add_log(T) - x_c++ - y_c-- - x_c = x_c - size - - var/datum/picture/P = createpicture(target, user, turfs, mobs, flag, blueprints, log) - saved_pictures += P - -/obj/item/camera/digital/verb/print_picture() - set name = "Print picture" - set category = "Object" - set src in usr - - if(saved_pictures.len == 0) - to_chat(usr, "No images saved.") - return - if(pictures_left == 0) - to_chat(usr, "There is no film left to print.") - return - - var/datum/picture/P = null - P = tgui_input_list(usr, "Select image to print", "Print image", saved_pictures) - if(P) - printpicture(usr,P) - pictures_left -- - -/obj/item/camera/digital/verb/delete_picture() - set name = "Delete picture" - set category = "Object" - set src in usr - - if(saved_pictures.len == 0) - to_chat(usr, "No images saved") - return - var/datum/picture/P = null - P = tgui_input_list(usr, "Select image to delete", "Delete image", saved_pictures) - if(P) - saved_pictures -= P - -/************** -*video camera * -***************/ -#define CAMERA_STATE_COOLDOWN 2 SECONDS -GLOBAL_LIST_EMPTY(active_video_cameras) - -/obj/item/videocam - name = "video camera" - icon = 'icons/obj/items.dmi' - desc = "video camera that can send live feed to the entertainment network." - icon_state = "videocam" - item_state = "videocam" - w_class = WEIGHT_CLASS_SMALL - slot_flags = ITEM_SLOT_BELT - materials = list(MAT_METAL=2000) - var/on = FALSE - var/video_cooldown = 0 - var/obj/machinery/camera/portable/camera - var/canhear_range = 7 - - -/obj/item/videocam/Destroy() - if(on) - camera_state() - return ..() - - -/obj/item/videocam/update_icon_state() - icon_state = "videocam[on ? "_on" : ""]" - - -/obj/item/videocam/proc/update_feeds() - if(on) - GLOB.active_video_cameras |= src - else - GLOB.active_video_cameras -= src - - for(var/obj/machinery/computer/security/telescreen/entertainment/TV in GLOB.machines) - TV.update_icon(UPDATE_OVERLAYS) - - -/obj/item/videocam/proc/camera_state(mob/living/carbon/user) - if(on) - camera.c_tag = null - QDEL_NULL(camera) - else - camera = new(src, list("news"), user.name) - on = !on - update_icon(UPDATE_ICON_STATE) - visible_message(span_notice("The video camera has been turned [on ? "on" : "off"].")) - update_feeds() - - -/obj/item/videocam/attack_self(mob/user) - if(world.time < video_cooldown) - to_chat(user, span_warning("[src] is overheating, give it some time.")) - return - camera_state(user) - - -/obj/item/videocam/dropped(mob/user, slot, silent = FALSE) - . = ..() - if(on) - camera_state() - - -/obj/item/videocam/examine(mob/user) - . = ..() - if(in_range(user, src)) - . += span_notice("This video camera can send live feeds to the entertainment network. It's [on ? "" : "in"]active.") - - -/obj/item/videocam/hear_talk(mob/M, list/message_pieces) - var/msg = multilingual_to_message(message_pieces) - if(camera && on) - if(get_dist(src, M) <= canhear_range) - talk_into(M, msg) - for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines) - if(T.watchers[M] == camera) - T.atom_say(msg) - - -/obj/item/videocam/hear_message(mob/M, msg) - if(camera && on) - for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines) - if(T.watchers[M] == camera) - T.atom_say(msg) - - -/obj/item/videocam/advanced - name = "advanced video camera" - desc = "This video camera allows you to send live feeds even when attached to a belt." - slot_flags = ITEM_SLOT_BELT - diff --git a/code/modules/paperwork/photography/camera.dm b/code/modules/paperwork/photography/camera.dm new file mode 100644 index 00000000000..c3e4d6bbaf9 --- /dev/null +++ b/code/modules/paperwork/photography/camera.dm @@ -0,0 +1,344 @@ +/* + * Camera + */ +/obj/item/camera + name = "camera" + icon = 'icons/obj/items.dmi' + desc = "A polaroid camera. 10 photos left." + icon_state = "camera" + item_state = "camera" + w_class = WEIGHT_CLASS_SMALL + slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_NECK + var/list/matter = list("metal" = 2000) + var/pictures_max = 10 + var/pictures_left = 10 + var/on = 1 + var/icon_on = "camera" + var/icon_off = "camera_off" + var/item_on = "camera" + var/item_off = "camera_off" + var/size = 3 + var/see_ghosts = 0 //for the spoop of it + var/flashing_lights = TRUE + + sprite_sheets = list( + SPECIES_GREY = 'icons/mob/clothing/species/grey/neck.dmi', + SPECIES_KIDAN = 'icons/mob/clothing/species/kidan/neck.dmi', + SPECIES_DRASK = 'icons/mob/clothing/species/drask/neck.dmi', + SPECIES_VOX = 'icons/mob/clothing/species/vox/neck.dmi', + SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/neck.dmi', + SPECIES_WRYN = 'icons/mob/clothing/species/wryn/neck.dmi' + ) + + +/obj/item/camera/examine(mob/user) + . = ..() + . += span_notice("Alt-Click to change photo size.") + . += span_notice("Alt-Shift-Click on [src] to toggle camera flashing") + + + +/obj/item/camera/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim = FALSE) + return ATTACK_CHAIN_PROCEED + +/obj/item/camera/attack_self(mob/user) + on = !on + update_icon(UPDATE_ICON_STATE) + to_chat(user, "You switch the camera [on ? "on" : "off"].") + return + +/obj/item/camera/update_icon_state() + icon_state = on ? icon_on : icon_off + item_state = on ? item_on : item_off + +/obj/item/camera/AltClick(mob/user) + if(!issilicon(user) && (user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))) + return + + var/nsize = tgui_input_list(user, "Photo Size", "Pick a size of resulting photo.", list(1,3,5,7)) + if(nsize) + size = nsize + to_chat(user, span_notice("Camera will now take [size]x[size] photos.")) + +/obj/item/camera/AltShiftClick(mob/user) + if(!issilicon(usr) && (usr.incapacitated() || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED))) + return + + flashing_lights = !flashing_lights + + to_chat(usr, span_notice("You turned [src] flashing lights [flashing_lights ? "on" : "off"], making natural light [flashing_lights ? "invisible" : "visible"]")) + +/obj/item/camera/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/camera_film)) + add_fingerprint(user) + if(pictures_left) + to_chat(user, span_warning("The [name] still has some film in it.")) + return ATTACK_CHAIN_PROCEED + if(!user.drop_transfer_item_to_loc(I, src)) + return ..() + to_chat(user, span_notice("You have fully refilled [src]'s film amount.")) + pictures_left = pictures_max + qdel(I) + return ATTACK_CHAIN_BLOCKED_ALL + + return ..() + +/obj/item/camera/proc/get_mobs(turf/the_turf) + var/mob_detail + for(var/mob/M in the_turf) + if(M.invisibility) + if(see_ghosts && istype(M,/mob/dead/observer)) + var/mob/dead/observer/O = M + if(O.orbiting) + continue + if(!mob_detail) + mob_detail = "You can see a g-g-g-g-ghooooost! " + else + mob_detail += "You can also see a g-g-g-g-ghooooost!" + else + continue + + var/holding = null + + if(iscarbon(M)) + var/mob/living/carbon/A = M + if(A.l_hand || A.r_hand) + if(A.l_hand) holding = "They are holding \a [A.l_hand]" + if(A.r_hand) + if(holding) + holding += " and \a [A.r_hand]" + else + holding = "They are holding \a [A.r_hand]" + + if(!mob_detail) + mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]. " + else + mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]." + return mob_detail + +/obj/item/camera/proc/add_log(turf/the_turf) + var/mob_detail + for(var/mob/M in the_turf) + var/holding = null + if(iscarbon(M)) + var/mob/living/carbon/A = M + if(A.l_hand || A.r_hand) + if(A.l_hand) holding = "holding [A.l_hand]" + if(A.r_hand) + if(holding) + holding += " and [A.r_hand]" + else + holding = "holding [A.r_hand]" + if(!mob_detail) + mob_detail = "[A.client ? "[A.client.ckey]/" : "nockey"]([A]) on photo[A:health < 75 ? " hurt":""].[holding ? " [holding]":"."]. " + else + mob_detail += "Also [A.client ? "[A.client.ckey]/" : "nockey"]([A]) on the photo[A:health < 75 ? " hurt":""].[holding ? " [holding]":"."]." + return mob_detail + +/obj/item/camera/afterattack(atom/target, mob/user) + if(!on || !pictures_left || ismob(target.loc)) + return + + playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) + if(flashing_lights) + set_light(3, 2, LIGHT_COLOR_TUNGSTEN, l_on = TRUE) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_light), 0), 2) + pictures_left-- + desc = "A polaroid camera. It has [pictures_left] photos left." + to_chat(user, span_notice("[pictures_left] photos left.")) + on = FALSE + update_icon(UPDATE_ICON_STATE) + if(istype(src, /obj/item/camera/spooky)) + if(user.mind && user.mind.assigned_role == JOB_TITLE_CHAPLAIN && see_ghosts) + if(prob(24)) + handle_haunt(user) + addtimer(CALLBACK(src, PROC_REF(delayed_turn_on)), 6.4 SECONDS) + captureimage(target, user) // It's expensive proc so that's why we do it after all the cheap ones + + +/obj/item/camera/proc/delayed_turn_on() + on = TRUE + update_icon(UPDATE_ICON_STATE) + + +/obj/item/camera/proc/can_capture_turf(turf/T, mob/user) + var/viewer = user + if(user.client) //To make shooting through security cameras possible + viewer = user.client.eye + var/can_see = (T in view(viewer)) //No x-ray vision cameras. + return can_see + +/obj/item/camera/proc/captureimage(atom/target, mob/user) + var/turf/target_turf = get_turf(target) + var/list/turfs = list() + var/log = "Made by [user.name] in [get_area(user)]. " + var/mobs = "" + var/get_blueprints = FALSE + var/range = size * 2 + 1 + for(var/turf/placeholder as anything in CORNER_BLOCK_OFFSET(target_turf, range, range, -size, -size)) + while(isopenspaceturf(placeholder)) //Multi-z photography + placeholder = GET_TURF_BELOW(placeholder) + if(!placeholder) + break + + if(placeholder && ((isAI(user) && GLOB.cameranet.checkTurfVis(placeholder)) || can_capture_turf(placeholder, user))) + turfs += placeholder + mobs += get_mobs(placeholder) + log += add_log(placeholder) + if(locate(/obj/item/areaeditor/blueprints) in placeholder) + get_blueprints = TRUE + + var/datum/picture/P = createpicture(target, user, turfs, mobs, log, get_blueprints) + printpicture(user, P) + +/obj/item/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, logs, have_blueprints = FALSE) + var/range = size * 2 + 1 + var/clone_area = SSmapping.request_turf_block_reservation(range, range, 1) + var/icon/photoimage = camera_get_icon(turfs, target, user, size*32, clone_area, size, range) + qdel(clone_area) + photoimage.Blend("#000", ICON_UNDERLAY) + + + var/icon/small_img = icon(photoimage) + var/icon/tiny_img = icon(photoimage) + var/icon/ic = icon('icons/obj/items.dmi',"photo") + var/icon/pc = icon('icons/obj/bureaucracy.dmi', "photo") + small_img.Scale(8, 8) + tiny_img.Scale(4, 4) + ic.Blend(small_img,ICON_OVERLAY, 10, 13) + pc.Blend(tiny_img,ICON_OVERLAY, 12, 19) + + var/datum/picture/P = new() + if(istype(src,/obj/item/camera/digital)) + P.fields["name"] = tgui_input_text(user, "Name photo:", "Photo", encode = FALSE) + P.name = P.fields["name"]//So the name is displayed on the print/delete list. + else + P.fields["name"] = "photo" + P.fields["author"] = user + P.fields["icon"] = ic + P.fields["tiny"] = pc + P.fields["img"] = photoimage + P.fields["desc"] = mobs + P.fields["pixel_x"] = rand(-10, 10) + P.fields["pixel_y"] = rand(-10, 10) + P.fields["size"] = size + P.fields["log"] = logs + P.fields["blueprints"] = have_blueprints + + return P + +/obj/item/camera/proc/printpicture(mob/user, datum/picture/P) + var/obj/item/photo/Photo = new/obj/item/photo() + Photo.loc = user.loc + if(!user.get_inactive_hand()) + user.put_in_inactive_hand(Photo) + + Photo.construct(P) + +///hauntings, like hallucinations but more spooky +/obj/item/camera/proc/handle_haunt(mob/user) + var/static/list/creepyasssounds = list( + 'sound/effects/ghost.ogg', + 'sound/effects/ghost2.ogg', + 'sound/effects/heartbeat.ogg', + 'sound/effects/screech.ogg', + 'sound/hallucinations/behind_you1.ogg', + 'sound/hallucinations/behind_you2.ogg', + 'sound/hallucinations/far_noise.ogg', + 'sound/hallucinations/growl1.ogg', + 'sound/hallucinations/growl2.ogg', + 'sound/hallucinations/growl3.ogg', + 'sound/hallucinations/im_here1.ogg', + 'sound/hallucinations/im_here2.ogg', + 'sound/hallucinations/i_see_you1.ogg', + 'sound/hallucinations/i_see_you2.ogg', + 'sound/hallucinations/look_up1.ogg', + 'sound/hallucinations/look_up2.ogg', + 'sound/hallucinations/over_here1.ogg', + 'sound/hallucinations/over_here2.ogg', + 'sound/hallucinations/over_here3.ogg', + 'sound/hallucinations/turn_around1.ogg', + 'sound/hallucinations/turn_around2.ogg', + 'sound/hallucinations/veryfar_noise.ogg', + 'sound/hallucinations/wail.ogg', + ) + SEND_SOUND(user, pick(creepyasssounds)) + + +/* + * Digital Camera + */ +/obj/item/camera/digital + name = "digital camera" + desc = "A digital camera. A small screen shows there is space for 10 photos left." + var/list/datum/picture/saved_pictures = list() + pictures_left = 30 + var/max_storage = 10 + +/obj/item/camera/digital/examine(mob/user) + . = ..() + . += span_notice("Ctrl-Click to print picture.") + . += span_notice("Ctrl-Shift-Click to delete picture.") + +/obj/item/camera/digital/afterattack(atom/target, mob/user) + if(!on || !pictures_left || ismob(target.loc)) return + captureimage(target, user) + + playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3) + + desc = "A digital camera. A small screen shows that there are currently [length(saved_pictures)] pictures stored." + on = FALSE + update_icon(UPDATE_ICON_STATE) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/camera, delayed_turn_on)), 6.4 SECONDS) + + +/obj/item/camera/digital/captureimage(atom/target, mob/user) + if(saved_pictures.len >= max_storage) + to_chat(user, span_notice("Maximum photo storage capacity reached.")) + return + to_chat(user, "Picture saved.") + var/turf/target_turf = get_turf(target) + var/list/turfs = list() + var/log = "Made by [user.name] in [get_area(user)]. " + var/mobs = "" + var/get_blueprints = FALSE + var/range = size * 2 + 1 + for(var/turf/placeholder as anything in CORNER_BLOCK_OFFSET(target_turf, range, range, -size, -size)) + while(isopenspaceturf(placeholder)) //Multi-z photography + placeholder = GET_TURF_BELOW(placeholder) + if(!placeholder) + break + + if(placeholder && ((isAI(user) && GLOB.cameranet.checkTurfVis(placeholder)) || can_capture_turf(placeholder, user))) + turfs += placeholder + mobs += get_mobs(placeholder) + log += add_log(placeholder) + if(locate(/obj/item/areaeditor/blueprints) in placeholder) + get_blueprints = TRUE + + var/datum/picture/P = createpicture(target, user, turfs, mobs, get_blueprints, log) + saved_pictures += P + +/obj/item/camera/digital/CtrlClick(mob/user) + if(saved_pictures.len == 0) + to_chat(user, span_warning("No images saved.")) + return + if(pictures_left == 0) + to_chat(user, span_warning("There is no film left to print.")) + return + var/datum/picture/P = tgui_input_list(user, "Select image to print", "Print image", saved_pictures) + if(pictures_left == 0) + to_chat(user, span_warning("There is no film left to print.")) + return + if(P) + printpicture(user, P) + pictures_left-- + +/obj/item/camera/digital/CtrlShiftClick(mob/user) + if(saved_pictures.len == 0) + to_chat(user, span_warning("No images saved")) + return + var/datum/picture/P = tgui_input_list(user, "Select image to delete", "Delete image", saved_pictures) + if(P) + saved_pictures -= P + diff --git a/code/modules/paperwork/photography/camera_image_capturing.dm b/code/modules/paperwork/photography/camera_image_capturing.dm new file mode 100644 index 00000000000..81a7a4d5138 --- /dev/null +++ b/code/modules/paperwork/photography/camera_image_capturing.dm @@ -0,0 +1,120 @@ +/obj/effect/appearance_clone + +/obj/effect/appearance_clone/New(loc, atom/A) //Intentionally not Initialize(), to make sure the clone assumes the intended appearance in time for the camera getFlatIcon. + if(istype(A)) + appearance = A.appearance + dir = A.dir + if(ismovable(A)) + var/atom/movable/AM = A + step_x = AM.step_x + step_y = AM.step_y + . = ..() + +/obj/item/camera/proc/camera_get_icon(list/turfs, turf/center, mob/user, psize = 96, datum/turf_reservation/clone_area, size, total) + + var/skip_normal = FALSE + var/wipe_atoms = FALSE + + var/list/atoms = list() + if(istype(clone_area) && total == clone_area.width && total == clone_area.height && size >= 0) + var/turf/bottom_left = clone_area.bottom_left_turfs[1] + var/cloned_center_x = round(bottom_left.x + ((total - 1) / 2)) + var/cloned_center_y = round(bottom_left.y + ((total - 1) / 2)) + for(var/turf/T in turfs) + var/offset_x = T.x - center.x + var/offset_y = T.y - center.y + var/turf/newT = locate(cloned_center_x + offset_x, cloned_center_y + offset_y, bottom_left.z) + if(!(newT in clone_area.reserved_turfs)) //sanity check so we don't overwrite other areas somehow + continue + atoms += new /obj/effect/appearance_clone(newT, T) + if(T.loc.icon_state) + atoms += new /obj/effect/appearance_clone(newT, T.loc) + for(var/atom/A in T.contents) + if(istype(A, /atom/movable/lighting_object)) + continue + if(!A.invisibility || (see_ghosts && isobserver(A))) + atoms += new /obj/effect/appearance_clone(newT, A) + skip_normal = TRUE + wipe_atoms = TRUE + center = locate(cloned_center_x, cloned_center_y, bottom_left.z) + + if(!skip_normal) + for(var/turf/T in turfs) + atoms += T + for(var/atom/movable/A in T) + if(flashing_lights && istype(A, /atom/movable/lighting_object)) + continue //Do not apply lighting, making whole image full bright. + if(A.invisibility) + if(!(see_ghosts && isobserver(A))) + continue + atoms += A + CHECK_TICK + + //Bigger icon base to capture those icons that were shifted to the next tile + //i.e. pretty much all wall-mounted machinery + var/icon/res = icon('icons/blanks/96x96.dmi', "nothing") + res.Scale(psize, psize) + + var/list/sorted = list() + var/j + for(var/i in 1 to atoms.len) + var/atom/c = atoms[i] + for(j = sorted.len, j > 0, --j) + var/atom/c2 = sorted[j] + if((c2.plane <= c.plane) && (c2.layer <= c.layer)) + break + sorted.Insert(j+1, c) + CHECK_TICK + + var/xcomp = FLOOR(psize / 2, 1) - 15 + var/ycomp = FLOOR(psize / 2, 1) - 15 + + if(!skip_normal) //these are not clones + for(var/atom/A in sorted) + if(istype(A, /atom/movable/lighting_object)) + continue //Lighting objects render last, need to be above all atoms and turfs displayed + var/xo = (A.x - center.x) * world.icon_size + A.pixel_x + xcomp + var/yo = (A.y - center.y) * world.icon_size + A.pixel_y + ycomp + if(ismovable(A)) + var/atom/movable/AM = A + xo += AM.step_x + yo += AM.step_y + var/icon/img = getFlatIcon(A, no_anim = TRUE) + res.Blend(img, blendMode2iconMode(A.blend_mode), xo, yo) + CHECK_TICK + else + for(var/X in sorted) //these are clones + var/obj/effect/appearance_clone/clone = X + var/icon/img = getFlatIcon(clone, no_anim = TRUE) + if(img) + // Center of the image in X + var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x + // Center of the image in Y + var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y + + if(clone.transform) // getFlatIcon doesn't give a snot about transforms. + var/datum/decompose_matrix/decompose = clone.transform.decompose() + // Scale in X, Y + if(decompose.scale_x != 1 || decompose.scale_y != 1) + var/base_w = img.Width() + var/base_h = img.Height() + // scale_x can be negative + img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y) + if(decompose.scale_x < 0) + img.Flip(EAST) + xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x) + yo -= base_h * (decompose.scale_y - 1) / 2 + // Rotation + if(decompose.rotation != 0) + img.Turn(decompose.rotation) + // Shift + xo += decompose.shift_x + yo += decompose.shift_y + + res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo) + CHECK_TICK + + if(wipe_atoms) + QDEL_LIST(atoms) + + return res diff --git a/code/modules/paperwork/photography/other.dm b/code/modules/paperwork/photography/other.dm new file mode 100644 index 00000000000..3c1e6743cb3 --- /dev/null +++ b/code/modules/paperwork/photography/other.dm @@ -0,0 +1,45 @@ +/* + * Camera Film Cartridge + */ +/obj/item/camera_film + name = "film cartridge" + icon = 'icons/obj/items.dmi' + desc = "A camera film cartridge. Insert it into a camera to reload it." + icon_state = "film" + item_state = "electropack" + w_class = WEIGHT_CLASS_TINY + resistance_flags = FLAMMABLE + +/* + * Spooky Camera + */ +/obj/item/camera/spooky + name = "camera obscura" + desc = "A polaroid camera, some say it can see ghosts!" + see_ghosts = 1 + +/obj/item/camera/spooky/CheckParts(list/parts_list) + ..() + var/obj/item/camera/C = locate(/obj/item/camera) in contents + if(C) + pictures_max = C.pictures_max + pictures_left = C.pictures_left + visible_message("[C] has been imbued with godlike power!") + qdel(C) + +/obj/item/camera/proc/get_spooky_ghost() + var/static/list/ghosts = list("ghost","shade","shade2","ghost-narsie","horror","shadow","ghostian2") + return pick(ghosts) + +/* + * Photo Album + */ +/obj/item/storage/photo_album + name = "Photo album" + icon = 'icons/obj/items.dmi' + icon_state = "album" + item_state = "briefcase" + can_hold = list(/obj/item/photo) + resistance_flags = FLAMMABLE + drop_sound = 'sound/items/handling/book_drop.ogg' + pickup_sound = 'sound/items/handling/book_pickup.ogg' diff --git a/code/modules/paperwork/photography/photo.dm b/code/modules/paperwork/photography/photo.dm new file mode 100644 index 00000000000..6aace8f5d46 --- /dev/null +++ b/code/modules/paperwork/photography/photo.dm @@ -0,0 +1,123 @@ +/obj/item/photo + name = "photo" + icon = 'icons/obj/items.dmi' + icon_state = "photo" + item_state = "paper" + w_class = WEIGHT_CLASS_SMALL + resistance_flags = FLAMMABLE + max_integrity = 50 + var/blueprints = 0 // Does this have the blueprints? + var/icon/img //Big photo image + var/scribble //Scribble on the back. + var/icon/tiny + var/photo_size = 3 + var/log_text = "" //Used for sending to Discord and just logging + +/obj/item/photo/examine(mob/user) + . = ..() + if(in_range(user, src) || isobserver(user)) + show(user) + . += span_notice("Alt-Click to rename photo.") + else + . += "It is too far away." + +/obj/item/photo/attack_self(mob/user) + user.examinate(src) + +/obj/item/photo/attackby(obj/item/I, mob/user, params) + if(is_pen(I) || istype(I, /obj/item/toy/crayon)) + add_fingerprint(user) + if(!user.is_literate()) + to_chat(user, span_warning("You don't know how to write!")) + return ATTACK_CHAIN_PROCEED + var/txt = tgui_input_text(user, "What would you like to write on the back?", "Photo Writing") + if(!txt || !Adjacent(user) || user.incapacitated() || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + return ATTACK_CHAIN_PROCEED + scribble = txt + return ATTACK_CHAIN_PROCEED_SUCCESS + + if(istype(I, /obj/item/lighter)) + burnphoto(I, user) + return ATTACK_CHAIN_BLOCKED_ALL + + return ..() + +/obj/item/photo/AltClick(mob/user) + if(user.incapacitated() || !isAI(usr) && HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + return + + var/n_name = tgui_input_text(user, "What would you like to label the photo?", "Photo Labelling", name) + if(!n_name) + return + //loc.loc check is for making possible renaming photos in clipboards + if((loc == user || (loc.loc && loc.loc == user)) && !user.incapacitated() && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + name = "[(n_name ? text("[n_name]") : "photo")]" + add_fingerprint(user) + +/obj/item/photo/proc/burnphoto(obj/item/lighter/P, mob/user) + var/class = "" + + if(P.lit && !user.incapacitated() && !HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) + if(istype(P, /obj/item/lighter/zippo)) + class = "" + + user.visible_message("[class][user] holds \the [P] up to \the [src], it looks like [user.p_theyre()] trying to burn it!", \ + "[class]You hold [P] up to [src], burning it slowly.") + + spawn(20) + if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) + user.visible_message("[class][user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ + "[class]You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") + + if(user.is_in_inactive_hand(src)) + user.temporarily_remove_item_from_inventory(src) + + new /obj/effect/decal/cleanable/ash(get_turf(src)) + qdel(src) + + else + to_chat(user, "You must hold \the [P] steady to burn \the [src].") + +/obj/item/photo/proc/show(mob/user) + var/icon/img_shown = new/icon(img) + var/colormatrix = user.get_screen_colour() + // Apply colorblindness effects, if any. + if(islist(colormatrix)) + img_shown.MapColors( + colormatrix[1], colormatrix[2], colormatrix[3], + colormatrix[4], colormatrix[5], colormatrix[6], + colormatrix[7], colormatrix[8], colormatrix[9], + ) + usr << browse_rsc(img_shown, "tmp_photo.png") + usr << browse({"[name]"} \ + + "" \ + + "" \ + + "[scribble ? "
Written on the back:
[scribble]" : ""]"\ + + "", "window=Photo[UID()];size=[64*photo_size]x[scribble ? 400 : 64*photo_size]") + onclose(usr, "Photo[UID()]") + return + +/obj/item/photo/proc/construct(datum/picture/P) + name = P.fields["name"] + icon = P.fields["icon"] + tiny = P.fields["tiny"] + img = P.fields["img"] + desc = P.fields["desc"] + pixel_x = P.fields["pixel_x"] + pixel_y = P.fields["pixel_y"] + photo_size = P.fields["size"] + log_text = P.fields["log"] + blueprints = P.fields["blueprints"] + +/obj/item/photo/proc/copy() + var/obj/item/photo/p = new/obj/item/photo() + + p.icon = icon(icon, icon_state) + p.img = icon(img) + p.tiny = icon(tiny) + p.name = name + p.desc = desc + p.scribble = scribble + p.blueprints = blueprints + + return p diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/photography/silicon_camera.dm similarity index 94% rename from code/modules/paperwork/silicon_photography.dm rename to code/modules/paperwork/photography/silicon_camera.dm index 346f864e5d9..fbe317c46a4 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/photography/silicon_camera.dm @@ -19,12 +19,12 @@ /obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used name = "Drone photo camera" -/obj/item/camera/siliconcam/proc/injectaialbum(var/datum/picture/P, var/sufix = "") //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectaialbum(datum/picture/P, sufix = "") //stores image information to a list similar to that of the datacore photos_taken++ P.fields["name"] = "Image [photos_taken][sufix]" aipictures += P -/obj/item/camera/siliconcam/proc/injectmasteralbum(var/datum/picture/P) //stores image information to a list similar to that of the datacore +/obj/item/camera/siliconcam/proc/injectmasteralbum(datum/picture/P) //stores image information to a list similar to that of the datacore var/mob/living/silicon/robot/C = src.loc if(C.connected_ai) var/mob/A = P.fields["author"] diff --git a/code/modules/paperwork/photography/video_camera.dm b/code/modules/paperwork/photography/video_camera.dm new file mode 100644 index 00000000000..d6544f47f4d --- /dev/null +++ b/code/modules/paperwork/photography/video_camera.dm @@ -0,0 +1,82 @@ +GLOBAL_LIST_EMPTY(active_video_cameras) + +/* + * Video Camera + */ +/obj/item/videocam + name = "video camera" + icon = 'icons/obj/items.dmi' + desc = "video camera that can send live feed to the entertainment network." + icon_state = "videocam" + item_state = "videocam" + w_class = WEIGHT_CLASS_SMALL + slot_flags = ITEM_SLOT_BELT + materials = list(MAT_METAL=2000) + var/on = FALSE + var/video_cooldown = 0 + var/obj/machinery/camera/portable/camera + var/canhear_range = 7 + +/obj/item/videocam/examine(mob/user) + . = ..() + if(in_range(user, src)) + . += span_notice("This video camera can send live feeds to the entertainment network. It's [on ? "" : "in"]active.") + +/obj/item/videocam/Destroy() + if(on) + camera_state() + return ..() + +/obj/item/videocam/update_icon_state() + icon_state = "videocam[on ? "_on" : ""]" + +/obj/item/videocam/proc/update_feeds() + if(on) + GLOB.active_video_cameras |= src + else + GLOB.active_video_cameras -= src + + for(var/obj/machinery/computer/security/telescreen/entertainment/TV in GLOB.machines) + TV.update_icon(UPDATE_OVERLAYS) + +/obj/item/videocam/proc/camera_state(mob/living/carbon/user) + if(on) + camera.c_tag = null + QDEL_NULL(camera) + else + camera = new(src, list("news"), user.name) + on = !on + update_icon(UPDATE_ICON_STATE) + visible_message(span_notice("The video camera has been turned [on ? "on" : "off"].")) + update_feeds() + +/obj/item/videocam/attack_self(mob/user) + if(world.time < video_cooldown) + to_chat(user, span_warning("[src] is overheating, give it some time.")) + return + camera_state(user) + +/obj/item/videocam/dropped(mob/user, slot, silent = FALSE) + . = ..() + if(on) + camera_state() + +/obj/item/videocam/hear_talk(mob/M, list/message_pieces) + var/msg = multilingual_to_message(message_pieces) + if(camera && on) + if(get_dist(src, M) <= canhear_range) + talk_into(M, msg) + for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines) + if(T.watchers[M] == camera) + T.atom_say(msg) + +/obj/item/videocam/hear_message(mob/M, msg) + if(camera && on) + for(var/obj/machinery/computer/security/telescreen/T in GLOB.machines) + if(T.watchers[M] == camera) + T.atom_say(msg) + +/obj/item/videocam/advanced + name = "advanced video camera" + desc = "This video camera allows you to send live feeds even when attached to a belt." + slot_flags = ITEM_SLOT_BELT diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index 90c01171c98..5cf60cd6afc 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -27,8 +27,12 @@ GLOBAL_LIST_EMPTY(PDAs) //Main variables var/owner = null var/default_cartridge = null // Access level defined by cartridge + /// Default request console cartridge + var/default_request_console_cartridge = null var/special_pen = null //special variable for nonstandart pens in new PDAs var/obj/item/cartridge/cartridge = null //current cartridge + /// Current request console cartridge + var/obj/item/cartridge/request_console/request_cartridge = null var/datum/data/pda/app/current_app = null var/datum/data/pda/app/lastapp = null @@ -107,6 +111,9 @@ GLOBAL_LIST_EMPTY(PDAs) if(default_cartridge) cartridge = new default_cartridge(src) cartridge.update_programs(src) + if(default_request_console_cartridge) + request_cartridge = new default_request_console_cartridge(src) + request_cartridge.update_programs(src) if(special_pen) new special_pen(src) else @@ -125,6 +132,7 @@ GLOBAL_LIST_EMPTY(PDAs) scanmode = null QDEL_LIST(programs) QDEL_NULL(cartridge) + QDEL_NULL(request_cartridge) QDEL_NULL(current_case) current_painting?.Cut() return ..() @@ -168,7 +176,7 @@ GLOBAL_LIST_EMPTY(PDAs) ui_interact(user) /obj/item/pda/proc/start_program(datum/data/pda/P) - if(P && ((P in programs) || (cartridge && (P in cartridge.programs)))) + if(P && ((P in programs) || (cartridge && (P in cartridge.programs)) || (request_cartridge && (P in request_cartridge.programs)))) return P.start() return 0 @@ -240,6 +248,8 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, "You remove the ID from the [name].") SStgui.update_uis(src) id = null + cartridge?.on_id_updated() + request_cartridge?.on_id_updated() update_icon(UPDATE_OVERLAYS) @@ -294,6 +304,8 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/I = user.get_active_hand() if(istype(I, /obj/item/card/id) && user.drop_transfer_item_to_loc(I, src)) id = I + cartridge?.on_id_updated() + request_cartridge?.on_id_updated() update_icon(UPDATE_OVERLAYS) return TRUE return FALSE @@ -303,6 +315,8 @@ GLOBAL_LIST_EMPTY(PDAs) id.forceMove_turf() user.put_in_hands(id) id = I + cartridge?.on_id_updated() + request_cartridge?.on_id_updated() update_icon(UPDATE_OVERLAYS) return TRUE return FALSE @@ -399,8 +413,25 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, span_notice("You have put [I] onto the PDA.")) return ATTACK_CHAIN_BLOCKED_ALL + if(istype(I, /obj/item/cartridge/request_console)) + add_fingerprint(user) + if(request_cartridge) + to_chat(user, span_warning("The PDA is already holding another request cartridge.")) + return ATTACK_CHAIN_PROCEED + if(!user.drop_transfer_item_to_loc(I, src)) + return ..() + request_cartridge = I + request_cartridge.update_programs(src) + update_shortcuts() + to_chat(user, span_notice("You have inserted [I] into the PDA.")) + SStgui.update_uis(src) + if(request_cartridge.radio) + request_cartridge.radio.hostpda = src + return ATTACK_CHAIN_BLOCKED_ALL + if(istype(I, /obj/item/cartridge)) add_fingerprint(user) + if(cartridge) to_chat(user, span_warning("The PDA is already holding another cartridge.")) return ATTACK_CHAIN_PROCEED @@ -460,6 +491,13 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, span_notice("You have slided [I] into the PDA.
You can remove it with Ctrl-click.")) return ATTACK_CHAIN_BLOCKED_ALL + if(istype(I, /obj/item/stamp)) + var/result = cartridge?.stamp_act(I) + result |= request_cartridge?.stamp_act(I) + if(result) + return ATTACK_CHAIN_BLOCKED_ALL + return ATTACK_CHAIN_PROCEED + return ..() diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index 98e9d5fe1bd..17508353787 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -20,6 +20,14 @@ /datum/data/pda/proc/program_process() return +/datum/data/pda/proc/on_id_updated() + return + +/datum/data/pda/proc/stamp_act(obj/item/stamp/stamp) + if(!istype(stamp)) + return FALSE + return TRUE + /datum/data/pda/proc/program_hit_check() return diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index a4e2c4efaa8..85b14210e59 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -28,6 +28,24 @@ var/datum/data/pda/messenger_plugin/P = A P.pda = pda +/obj/item/cartridge/proc/stamp_act(stamp) + var/result = FALSE + for(var/A in programs) + var/datum/data/pda/P = A + result = result || P.stamp_act(stamp) + for(var/A in messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + result = result || P.stamp_act(stamp) + return result + +/obj/item/cartridge/proc/on_id_updated() + for(var/A in programs) + var/datum/data/pda/P = A + P.on_id_updated() + for(var/A in messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + P.on_id_updated() + /obj/item/cartridge/engineering name = "Power-ON Cartridge" icon_state = "cart-e" diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm index 6587438c319..34ce99b0a15 100644 --- a/code/modules/pda/pda_tgui.dm +++ b/code/modules/pda/pda_tgui.dm @@ -23,6 +23,8 @@ var/list/prog_list = programs.Copy() if(cartridge) prog_list |= cartridge.programs + if(request_cartridge) + prog_list |= request_cartridge.programs for(var/A in prog_list) var/datum/data/pda/P = A @@ -47,6 +49,7 @@ data["idLink"] = (id ? "[id.registered_name], [id.assignment]" : "--------") data["cartridge_name"] = cartridge ? cartridge.name : "" + data["request_cartridge_name"] = request_cartridge ? request_cartridge.name : "" data["stationTime"] = station_time_timestamp() data["app"] = list() @@ -96,6 +99,25 @@ P.unnotify() cartridge = null update_shortcuts() + if("Eject_Request")//Ejects the cart, only done from hub. + if(!isnull(request_cartridge)) + var/turf/T = loc + if(ismob(T)) + T = T.loc + var/obj/item/cartridge/C = request_cartridge + C.forceMove(T) + if(scanmode in C.programs) + scanmode = null + if(current_app in C.programs) + start_program(find_program(/datum/data/pda/app/main_menu)) + if(C.radio) + C.radio.hostpda = null + for(var/datum/data/pda/P in notifying_programs) + if(P in C.programs) + P.unnotify() + request_cartridge.update_programs(null) + request_cartridge = null + update_shortcuts() if("Authenticate")//Checks for ID id_check(usr, in_pda_usage = TRUE) if("Ringtone") diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm index d7e2a4f29ce..3ee62d5aeb8 100644 --- a/code/modules/pda/pdas.dm +++ b/code/modules/pda/pdas.dm @@ -1,36 +1,44 @@ /obj/item/pda/medical default_cartridge = /obj/item/cartridge/medical + default_request_console_cartridge = /obj/item/cartridge/request_console/medical icon_state = "pda-medical" /obj/item/pda/viro default_cartridge = /obj/item/cartridge/medical + default_request_console_cartridge = /obj/item/cartridge/request_console/viro icon_state = "pda-virology" item_state = "pda-medical" /obj/item/pda/engineering default_cartridge = /obj/item/cartridge/engineering + default_request_console_cartridge = /obj/item/cartridge/request_console/engineering icon_state = "pda-engineer" /obj/item/pda/security default_cartridge = /obj/item/cartridge/security + default_request_console_cartridge = /obj/item/cartridge/request_console/security icon_state = "pda-security" /obj/item/pda/detective default_cartridge = /obj/item/cartridge/detective + default_request_console_cartridge = /obj/item/cartridge/request_console/detective icon_state = "pda-detective" /obj/item/pda/warden default_cartridge = /obj/item/cartridge/security + default_request_console_cartridge = /obj/item/cartridge/request_console/warden icon_state = "pda-warden" /obj/item/pda/janitor default_cartridge = /obj/item/cartridge/janitor + default_request_console_cartridge = /obj/item/cartridge/request_console/janitor icon_state = "pda-janitor" ttone = "slip" /obj/item/pda/toxins default_cartridge = /obj/item/cartridge/signal/toxins icon_state = "pda-science" + default_request_console_cartridge = /obj/item/cartridge/request_console/toxins ttone = "boom" /obj/item/pda/clown @@ -59,40 +67,49 @@ /obj/item/pda/heads/hop default_cartridge = /obj/item/cartridge/hop + default_request_console_cartridge = /obj/item/cartridge/request_console/hop icon_state = "pda-hop" /obj/item/pda/heads/hos default_cartridge = /obj/item/cartridge/hos + default_request_console_cartridge = /obj/item/cartridge/request_console/hos icon_state = "pda-hos" /obj/item/pda/heads/ce default_cartridge = /obj/item/cartridge/ce + default_request_console_cartridge = /obj/item/cartridge/request_console/ce icon_state = "pda-ce" /obj/item/pda/heads/cmo default_cartridge = /obj/item/cartridge/cmo + default_request_console_cartridge = /obj/item/cartridge/request_console/cmo icon_state = "pda-cmo" /obj/item/pda/heads/rd default_cartridge = /obj/item/cartridge/rd + default_request_console_cartridge = /obj/item/cartridge/request_console/rd icon_state = "pda-rd" /obj/item/pda/captain default_cartridge = /obj/item/cartridge/captain icon_state = "pda-captain" + default_request_console_cartridge = /obj/item/cartridge/request_console/captain detonate = 0 //toff = 1 /obj/item/pda/heads/ntrep default_cartridge = /obj/item/cartridge/supervisor + default_request_console_cartridge = /obj/item/cartridge/request_console/ntrep icon_state = "pda-h" /obj/item/pda/heads/magistrate default_cartridge = /obj/item/cartridge/supervisor + default_request_console_cartridge = /obj/item/cartridge/request_console/magistrate icon_state = "pda-h" /obj/item/pda/heads/blueshield default_cartridge = /obj/item/cartridge/hos + default_request_console_cartridge = /obj/item/cartridge/request_console/blueshield icon_state = "pda-h" /obj/item/pda/heads/ert @@ -109,14 +126,17 @@ /obj/item/pda/cargo default_cartridge = /obj/item/cartridge/quartermaster + default_request_console_cartridge = /obj/item/cartridge/request_console/cargo icon_state = "pda-cargo" /obj/item/pda/quartermaster default_cartridge = /obj/item/cartridge/quartermaster + default_request_console_cartridge = /obj/item/cartridge/request_console/quartermaster icon_state = "pda-qm" /obj/item/pda/shaftminer icon_state = "pda-miner" + default_request_console_cartridge = /obj/item/cartridge/request_console/shaftminer special_pen = /obj/item/pen/survival /obj/item/pda/syndicate @@ -144,19 +164,23 @@ /obj/item/pda/chaplain icon_state = "pda-chaplain" + default_request_console_cartridge = /obj/item/cartridge/request_console/chaplain ttone = "holy" /obj/item/pda/lawyer default_cartridge = /obj/item/cartridge/lawyer + default_request_console_cartridge = /obj/item/cartridge/request_console/lawyer icon_state = "pda-lawyer" ttone = "..." /obj/item/pda/botanist //default_cartridge = /obj/item/cartridge/botanist + default_request_console_cartridge = /obj/item/cartridge/request_console/botanist icon_state = "pda-hydro" /obj/item/pda/roboticist icon_state = "pda-roboticist" + default_request_console_cartridge = /obj/item/cartridge/request_console/roboticist /obj/item/pda/librarian icon_state = "pda-library" @@ -175,25 +199,31 @@ model_name = "Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition" /obj/item/pda/chef + default_request_console_cartridge = /obj/item/cartridge/request_console/chef icon_state = "pda-chef" /obj/item/pda/bar icon_state = "pda-bartender" + default_request_console_cartridge = /obj/item/cartridge/request_console/bar /obj/item/pda/atmos default_cartridge = /obj/item/cartridge/atmos + default_request_console_cartridge = /obj/item/cartridge/request_console/atmos icon_state = "pda-atmos" /obj/item/pda/chemist default_cartridge = /obj/item/cartridge/chemistry icon_state = "pda-chemistry" + default_request_console_cartridge = /obj/item/cartridge/request_console/chemist /obj/item/pda/geneticist default_cartridge = /obj/item/cartridge/medical icon_state = "pda-genetics" + default_request_console_cartridge = /obj/item/cartridge/request_console/geneticist /obj/item/pda/centcom default_cartridge = /obj/item/cartridge/centcom + default_request_console_cartridge = /obj/item/cartridge/request_console/centcom icon_state = "pda-h" /obj/item/pda/centcom/New() diff --git a/code/modules/pda/request_consoles_app.dm b/code/modules/pda/request_consoles_app.dm new file mode 100644 index 00000000000..3de9ca7784e --- /dev/null +++ b/code/modules/pda/request_consoles_app.dm @@ -0,0 +1,307 @@ +/datum/data/pda/app/request_console + name = "Request Consoles" + title = "Request Consoles" + icon = "archive" + template = "pda_request_console" + category = "Request Console" + update = PDA_APP_UPDATE + var/list/department_list + var/list/possible_consoles = list() + var/list/consoles_mute = list() + var/ore_message_reciver_dep + var/obj/machinery/requests_console/selected_console + +/datum/data/pda/app/request_console/New() + . = ..() + for(var/C in (GLOB.allRequestConsoles)) + var/obj/machinery/requests_console/console = C + if(QDELETED(console) || !istype(console)) + continue + if(console.department in department_list) + possible_consoles |= console + department_list -= console.department + console.connected_apps |= src + + +/datum/data/pda/app/request_console/Destroy() + selected_console = null + LAZYNULL(possible_consoles) + . = ..() + +/datum/data/pda/app/request_console/proc/on_rc_destroyed(datum/source) + possible_consoles -= source + SStgui.update_uis(pda) + +/datum/data/pda/app/request_console/proc/on_rc_message_recieved(obj/machinery/requests_console/source, message, isoremessage) + SIGNAL_HANDLER + if(isoremessage && source.department != ore_message_reciver_dep) + return + var/rendered_message = "Recieved on [source.name] : [message]" + if(!QDELETED(pda) && !consoles_mute[source]) + notify(rendered_message) + + +/datum/data/pda/app/request_console/update_ui(mob/user, list/data) + if(selected_console) + data += selected_console.ui_data(user) + data["selected_console"] = selected_console.name + else + data["selected_console"] = null + var/list/possible_consoles_data= list() + for(var/obj/machinery/requests_console/console as anything in possible_consoles) + possible_consoles_data += list(list("name" = console.name, "priority" = console.newmessagepriority, "muted" = consoles_mute[console])) + data["consoles_data"] = possible_consoles_data + +/datum/data/pda/app/request_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + var/name = params["name"] + var/obj/machinery/requests_console/clicked_console + for(var/atom/console as anything in possible_consoles) + if(console.name == name) + clicked_console = console + break + switch(action) + if("select") + if(!clicked_console) + return + selected_console = clicked_console + title = clicked_console.name + unnotify() + if("mute") + if(!clicked_console) + return + consoles_mute[clicked_console] = !consoles_mute[clicked_console] + if("back") + selected_console = null + title = initial(title) + else + selected_console?.ui_act(action, params, ui, state) + login() + SStgui.update_uis(pda) + + +/datum/data/pda/app/request_console/on_id_updated() + login() + + +/datum/data/pda/app/request_console/proc/login() + if(pda.id && selected_console) + selected_console.login_console(selected_console.screen, pda.id, pda, usr) + + +/datum/data/pda/app/request_console/stamp_act(obj/item/stamp/stamp) + if(!..() || !selected_console) + return FALSE + var/result = selected_console.stamp_messauth(selected_console.screen, stamp, pda, usr) + if(ATTACK_CHAIN_SUCCESS_CHECK(result)) + return TRUE + return FALSE + +/datum/data/pda/app/request_console/cargo + department_list = list(RC_CARGO_BAY) + +/datum/data/pda/app/request_console/shaftminer + department_list = list(RC_CARGO_BAY) + +/datum/data/pda/app/request_console/botanist + department_list = list(RC_HYDROPONICS) + +/datum/data/pda/app/request_console/chef + department_list = list(RC_KITCHEN) + +/datum/data/pda/app/request_console/bar + department_list = list(RC_BAR) + +/datum/data/pda/app/request_console/janitor + department_list = list(RC_JANITORIAL) + +/datum/data/pda/app/request_console/chaplain + department_list = list(RC_CHAPEL) + +/datum/data/pda/app/request_console/security + department_list = list(RC_SECURITY) + +/datum/data/pda/app/request_console/clown_security + department_list = list(RC_SECURITY) + +/datum/data/pda/app/request_console/lawyer + department_list = list(RC_INTERNAL_AFFAIRS_OFFICE) + +/datum/data/pda/app/request_console/medical + department_list = list( + RC_MEDBAY, + RC_MORGUE + ) + +/datum/data/pda/app/request_console/viro + department_list = list( + RC_MEDBAY, + RC_VIROLOGY, + RC_MORGUE + ) + +/datum/data/pda/app/request_console/engineering + department_list = list( + RC_TECH_STORAGE, + RC_ENGINEERING, + RC_ATMOSPHERICS, + RC_MECHANIC + ) + ore_message_reciver_dep = RC_MECHANIC + + +/datum/data/pda/app/request_console/detective + department_list = list( + RC_SECURITY, + RC_DETECTIVE + ) + +/datum/data/pda/app/request_console/warden + department_list = list( + RC_SECURITY, + RC_WARDEN, + RC_LABOR_CAMP + ) + +/datum/data/pda/app/request_console/toxins + department_list = list( + RC_SCIENCE, + RC_ROBOTICS, + RC_RESEARCH, + RC_XENOBIOLOGY + ) + ore_message_reciver_dep = RC_RESEARCH + +/datum/data/pda/app/request_console/hop + department_list = list( + RC_BAR, + RC_KITCHEN, + RC_HEAD_OF_PERSONNEL_DESK, + RC_BRIDGE, + RC_HYDROPONICS, + RC_JANITORIAL, + RC_CHAPEL + ) + +/datum/data/pda/app/request_console/hos + department_list = list(RC_SECURITY, + RC_WARDEN, + RC_LABOR_CAMP, + RC_HEAD_OF_SECURITY_DESK, + RC_BRIDGE, + RC_DETECTIVE) + +/datum/data/pda/app/request_console/ce + department_list = list( + RC_TECH_STORAGE, + RC_ENGINEERING, + RC_ATMOSPHERICS, + RC_MECHANIC, + RC_BRIDGE, + RC_AI, + RC_CHIEF_ENGINEER_DESK + ) + ore_message_reciver_dep = RC_MECHANIC + +/datum/data/pda/app/request_console/cmo + department_list = list( + RC_MEDBAY, + RC_VIROLOGY, + RC_MORGUE, + RC_GENETICS, + RC_BRIDGE, + RC_CHEMISTRY, + RC_CHIEF_MEDICAL_OFFICER_DESK + ) + +/datum/data/pda/app/request_console/rd + department_list = list( + RC_SCIENCE, + RC_ROBOTICS, + RC_RESEARCH, + RC_XENOBIOLOGY, + RC_GENETICS, + RC_BRIDGE, + RC_AI, + RC_RESEARCH_DIRECTOR_DESK + ) + ore_message_reciver_dep = RC_RESEARCH + +/datum/data/pda/app/request_console/captain + department_list = list( + RC_CHIEF_ENGINEER_DESK, + RC_CHIEF_MEDICAL_OFFICER_DESK, + RC_HEAD_OF_PERSONNEL_DESK, + RC_HEAD_OF_SECURITY_DESK, + RC_BRIDGE, + RC_QUARTERMASTER_DESK, + RC_AI, + RC_CAPTAIN_DESK, + RC_RESEARCH_DIRECTOR_DESK + ) + ore_message_reciver_dep = RC_RESEARCH_DIRECTOR_DESK + +/datum/data/pda/app/request_console/ntrep + department_list = list( + RC_NT_REPRESENTATIVE, + RC_BLUESHIELD, + RC_INTERNAL_AFFAIRS_OFFICE, + RC_BRIDGE + ) + +/datum/data/pda/app/request_console/magistrate + department_list = list( + RC_INTERNAL_AFFAIRS_OFFICE, + RC_BRIDGE + ) + +/datum/data/pda/app/request_console/blueshield + department_list = list( + RC_BLUESHIELD, + RC_BRIDGE + ) + +/datum/data/pda/app/request_console/quartermaster + department_list = list( + RC_CARGO_BAY, + RC_QUARTERMASTER_DESK, + RC_BRIDGE + ) + +/datum/data/pda/app/request_console/roboticist + department_list = list( + RC_RESEARCH, + RC_SCIENCE, + RC_ROBOTICS + ) + ore_message_reciver_dep = RC_ROBOTICS + +/datum/data/pda/app/request_console/atmos + department_list = list( + RC_TECH_STORAGE, + RC_ATMOSPHERICS, + RC_ENGINEERING + ) + ore_message_reciver_dep = RC_ATMOSPHERICS + +/datum/data/pda/app/request_console/chemist + department_list = list( + RC_CHEMISTRY, + RC_MEDBAY + ) + +/datum/data/pda/app/request_console/geneticist + department_list = list( + RC_GENETICS, + RC_MEDBAY + ) + +/datum/data/pda/app/request_console/centcom + department_list = list( + RC_BRIDGE, + RC_AI, + RC_BLUESHIELD, + RC_INTERNAL_AFFAIRS_OFFICE, + RC_NT_REPRESENTATIVE, + RC_CENTRAL_COMMAND, + RC_CAPTAIN_DESK + ) diff --git a/code/modules/pda/request_consoles_cart.dm b/code/modules/pda/request_consoles_cart.dm new file mode 100644 index 00000000000..f0d86786259 --- /dev/null +++ b/code/modules/pda/request_consoles_cart.dm @@ -0,0 +1,130 @@ +/obj/item/cartridge/request_console + name = "Request Console" + icon_state = "cart-req" + programs = list(new /datum/data/pda/app/request_console) + +/obj/item/cartridge/request_console/medical + name = "Medical Request" + programs = list(new /datum/data/pda/app/request_console/medical) + +/obj/item/cartridge/request_console/viro + name = "Virology Request" + programs = list(new /datum/data/pda/app/request_console/viro) + +/obj/item/cartridge/request_console/engineering + name = "Engineering Request" + programs = list(new /datum/data/pda/app/request_console/engineering) + +/obj/item/cartridge/request_console/security + name = "Security Request" + programs = list(new /datum/data/pda/app/request_console/security) + +/obj/item/cartridge/request_console/detective + name = "Detective Request" + programs = list(new /datum/data/pda/app/request_console/detective) + +/obj/item/cartridge/request_console/warden + name = "Warden Request" + programs = list(new /datum/data/pda/app/request_console/warden) + +/obj/item/cartridge/request_console/janitor + name = "Janitor Request" + programs = list(new /datum/data/pda/app/request_console/janitor) + +/obj/item/cartridge/request_console/toxins + name = "Sciense Request" + programs = list(new /datum/data/pda/app/request_console/toxins) + +/obj/item/cartridge/request_console/hop + name = "HOP Request" + programs = list(new /datum/data/pda/app/request_console/hop) + +/obj/item/cartridge/request_console/hos + name = "HOS Request" + programs = list(new /datum/data/pda/app/request_console/hos) + +/obj/item/cartridge/request_console/ce + name = "CE Request" + programs = list(new /datum/data/pda/app/request_console/ce) + +/obj/item/cartridge/request_console/cmo + name = "CMO Request" + programs = list(new /datum/data/pda/app/request_console/cmo) + +/obj/item/cartridge/request_console/rd + name = "RD Request" + programs = list(new /datum/data/pda/app/request_console/rd) + +/obj/item/cartridge/request_console/captain + name = "Captain Request" + programs = list(new /datum/data/pda/app/request_console/captain) + + +/obj/item/cartridge/request_console/ntrep + name = "NTR Request" + programs = list(new /datum/data/pda/app/request_console/ntrep) + +/obj/item/cartridge/request_console/magistrate + name = "Magistrate Request" + programs = list(new /datum/data/pda/app/request_console/magistrate) + +/obj/item/cartridge/request_console/blueshield + name = "Blueshield Request" + programs = list(new /datum/data/pda/app/request_console/blueshield) + +/obj/item/cartridge/request_console/cargo + name = "Cargo Request" + programs = list(new /datum/data/pda/app/request_console/cargo) + +/obj/item/cartridge/request_console/quartermaster + name = "QM Request" + programs = list(new /datum/data/pda/app/request_console/quartermaster) + +/obj/item/cartridge/request_console/shaftminer + name = "Shaftminer Request" + programs = list(new /datum/data/pda/app/request_console/shaftminer) + +/obj/item/cartridge/request_console/chaplain + name = "Chaplain Request" + programs = list(new /datum/data/pda/app/request_console/chaplain) + +/obj/item/cartridge/request_console/lawyer + name = "Internal Affairs Request" + programs = list(new /datum/data/pda/app/request_console/lawyer) + +/obj/item/cartridge/request_console/botanist + name = "Botanist Request" + programs = list(new /datum/data/pda/app/request_console/botanist) + +/obj/item/cartridge/request_console/roboticist + name = "Roboticist Request" + programs = list(new /datum/data/pda/app/request_console/roboticist) + +/obj/item/cartridge/request_console/chef + name = "Chef Request" + programs = list(new /datum/data/pda/app/request_console/chef) + +/obj/item/cartridge/request_console/bar + name = "Bartender Request" + programs = list(new /datum/data/pda/app/request_console/bar) + +/obj/item/cartridge/request_console/atmos + name = "Atmospherics Request" + programs = list(new /datum/data/pda/app/request_console/atmos) + +/obj/item/cartridge/request_console/chemist + name = "Chemist Request" + programs = list(new /datum/data/pda/app/request_console/chemist) + +/obj/item/cartridge/request_console/geneticist + name = "Geneticist Request" + programs = list(new /datum/data/pda/app/request_console/geneticist) + +/obj/item/cartridge/request_console/clown_security + name = "Clown Security Request" + programs = list(new /datum/data/pda/app/request_console/clown_security) + +/obj/item/cartridge/request_console/centcom + name = "Centcom Request" + programs = list(new /datum/data/pda/app/request_console/centcom) + diff --git a/code/modules/power/cable_multiz.dm b/code/modules/power/cable_multiz.dm index a52ee27bbea..faecbd4c488 100644 --- a/code/modules/power/cable_multiz.dm +++ b/code/modules/power/cable_multiz.dm @@ -77,13 +77,14 @@ else powernet.add_cable(C) //the cable was powernetless, let's just add it to our powernet - var/obj/structure/cable/multiz/above = locate(/obj/structure/cable/multiz) in (GET_TURF_ABOVE(loc)) + var/turf/T = loc + var/obj/structure/cable/multiz/above = locate(/obj/structure/cable/multiz) in (GET_TURF_ABOVE(T)) if(above && above?.powernet != powernet) if(!above.powernet) powernet.add_cable(above) else merge_powernets(powernet, above.powernet) - var/obj/structure/cable/multiz/below = locate(/obj/structure/cable/multiz) in (GET_TURF_BELOW(loc)) + var/obj/structure/cable/multiz/below = locate(/obj/structure/cable/multiz) in (GET_TURF_BELOW(T)) if(below && below?.powernet != powernet) if(!below.powernet) powernet.add_cable(below) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 2c68d8c9cb3..74e1e0e6f30 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -393,6 +393,8 @@ Angle = round(get_angle(src, current)) if(spread) Angle += (rand() - 0.5) * spread + if(firer) + hit_crawling_mobs_chance = firer.a_intent == INTENT_HELP ? 0 : 100 // Turn right away var/matrix/M = new M.Turn(Angle) @@ -422,6 +424,7 @@ current = curloc yo = new_y - curloc.y xo = new_x - curloc.x + hit_crawling_mobs_chance = 100 set_angle(get_angle(curloc, original)) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 3ca90cc829d..2785c3cfd6f 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -162,7 +162,6 @@ return default_unfasten_wrench(user, I) - /obj/machinery/reagentgrinder/attackby(obj/item/I, mob/user, params) if(user.a_intent == INTENT_HARM) return ..() @@ -232,7 +231,31 @@ updateUsrDialog() return ATTACK_CHAIN_BLOCKED_ALL +/obj/machinery/reagentgrinder/AltClick(mob/living/carbon/human/human) + if(!istype(human) || !human.Adjacent(src)) + return + + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) + return + + if(operating) + return + + add_fingerprint(human) + grind() + +/obj/machinery/reagentgrinder/CtrlShiftClick(mob/living/carbon/human/human) + if(!istype(human) || !human.Adjacent(src)) + return + if(human.incapacitated() || HAS_TRAIT(human, TRAIT_HANDS_BLOCKED)) + return + + if(operating) + return + + add_fingerprint(human) + detach(human) /obj/machinery/reagentgrinder/attack_ai(mob/user) return FALSE @@ -305,18 +328,20 @@ if("eject") eject() if ("detach") - detach() + detach(usr) -/obj/machinery/reagentgrinder/proc/detach() +/obj/machinery/reagentgrinder/proc/detach(mob/user) + if(user.stat) + return - if (usr.stat != 0) - return - if (!beaker) - return - beaker.loc = src.loc - beaker = null - update_icon(UPDATE_ICON_STATE) - updateUsrDialog() + if(!beaker) + return + + beaker.forceMove(get_turf(src)) + beaker = null + + update_icon(UPDATE_ICON_STATE) + updateUsrDialog() /obj/machinery/reagentgrinder/proc/eject() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 690204ef1ca..0e4e967da1a 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -21,6 +21,8 @@ var/turf/our_turf = get_turf(src) for(var/atom/movable/thing as anything in contents) thing.forceMove(our_turf) + qdel(thing) + wrapped = null return ..() diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index fcf50821b76..f09614ec5d3 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -100,17 +100,20 @@ GLOBAL_LIST_EMPTY(message_servers) if(RC.newmessagepriority < priority) RC.newmessagepriority = priority RC.update_icon(UPDATE_OVERLAYS) + var/rendered_message = null switch(priority) if(2) if(!RC.silent) playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1) RC.atom_say("PRIORITY Alert in [sender]") - RC.message_log += "High Priority message from [sender]: [authmsg]" + rendered_message = "High Priority message from [sender]: [authmsg]" else if(!RC.silent) playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1) RC.atom_say("Message from [sender]") - RC.message_log += "Message [sender]: [authmsg]" + rendered_message = "Message [sender]: [authmsg]" + if(!isnull(rendered_message)) + RC.write_to_message_log(rendered_message) /obj/machinery/message_server/attack_hand(user) // to_chat(user, "There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.") diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index c1e98b4a94b..505920c4fc8 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -171,7 +171,7 @@ //Setup random empty tile empty_tile_id = pick_n_take(left_ids) var/turf/empty_tile_turf = get_turf_for_id(empty_tile_id) - empty_tile_turf.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = FALSE) + empty_tile_turf.ChangeTurf(floor_type, keep_icon = FALSE) var/mutable_appearance/MA = new(puzzle_pieces["[empty_tile_id]"]) MA.layer = empty_tile_turf.layer + 0.1 empty_tile_turf.add_overlay(MA) @@ -180,7 +180,7 @@ var/list/empty_spots = left_ids.Copy() for(var/spot_id in empty_spots) var/turf/T = get_turf_for_id(spot_id) - T = T.ChangeTurf(floor_type, keep_icon = FALSE, ignore_air = FALSE) + T = T.ChangeTurf(floor_type, keep_icon = FALSE) var/obj/structure/puzzle_element/E = new element_type(T) elements += E var/chosen_id = pick_n_take(left_ids) diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index cb4ac6913f4..2c7933ca8a8 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -4,7 +4,7 @@ name = "\improper Unexplored Location" icon_state = "away" has_gravity = STANDARD_GRAVITY - there_can_be_many = TRUE + area_flags = UNIQUE_AREA static_lighting = TRUE ambientsounds = RUINS_SOUNDS sound_environment = SOUND_ENVIRONMENT_STONEROOM diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 2b56aa8705b..ea403d75025 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -231,7 +231,7 @@ GLOBAL_VAR_INIT(station_all_access, 0) // Why are these global procs? /proc/make_maint_all_access() - for(var/area/maintenance/A in GLOB.all_areas) // Why are these global lists? AAAAAAAAAAAAAA + for(var/area/maintenance/A in GLOB.areas) // Why are these global lists? AAAAAAAAAAAAAA for(var/obj/machinery/door/airlock/D in A.machinery_cache) D.emergency = 1 D.update_icon() @@ -240,7 +240,7 @@ GLOBAL_VAR_INIT(station_all_access, 0) SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("emergency maintenance access", "enabled")) /proc/revoke_maint_all_access() - for(var/area/maintenance/A in GLOB.all_areas) + for(var/area/maintenance/A in GLOB.areas) for(var/obj/machinery/door/airlock/D in A.machinery_cache) D.emergency = 0 D.update_icon() diff --git a/code/modules/security_levels/security_levels.dm b/code/modules/security_levels/security_levels.dm index 0f031dbc48e..1a24425f713 100644 --- a/code/modules/security_levels/security_levels.dm +++ b/code/modules/security_levels/security_levels.dm @@ -246,7 +246,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light, update), FALSE) /proc/unset_stationwide_emergency_lighting() - for(var/area/A as anything in GLOB.all_areas) + for(var/area/A as anything in GLOB.areas) if(!is_station_level(A.z)) continue if(!A.area_emergency_mode) @@ -268,7 +268,7 @@ GLOBAL_DATUM_INIT(security_announcement_down, /datum/announcement/priority/secur GLOB.security_announcement_up.Announce("Центральным командованием был установлен код ЭПСИЛОН. Все контракты расторгнуты.","ВНИМАНИЕ! КОД ЭПСИЛОН", new_sound = sound('sound/effects/epsilon.ogg')) GLOB.security_level = SEC_LEVEL_EPSILON post_status(STATUS_DISPLAY_ALERT, "epsilonalert") - for(var/area/A as anything in GLOB.all_areas) + for(var/area/A as anything in GLOB.areas) if(!is_station_level(A.z)) continue for(var/obj/machinery/light/light as anything in A.lights_cache) diff --git a/code/modules/shuttle/README.md b/code/modules/shuttle/README.md index 6a7168c1269..8bcbb9b6ee0 100644 --- a/code/modules/shuttle/README.md +++ b/code/modules/shuttle/README.md @@ -14,7 +14,7 @@ # Important note: -The following readme was last updated during Late 2015. The changes between Paradise & TG's shuttle system has diverged greatly since then. Do not take the documentation here's description of differences between tg & paradise seriously without double checking. +The following readme was last updated during Late 2015. The changes between Paradise & TG's shuttle system has diverged greatly since then. Do not take the documentation here's description of differences between tg & paradise seriously without double checking. # Shuttle system ## Introduction @@ -45,6 +45,12 @@ Docking ports are split into two main types: `/obj/docking_port/stationary`, and `id`: This variable is used for any plain-text references to the docking port. It should always be lowercase. +У мобильных стыковочных портов `/obj/docking_port/mobile` есть две важные переменные которые указывают куда и каким образом будет двигаться шаттл. +`preferred_direction`: в какую сторону будет двигаться шатл. Рекомендуется ставить в ту стороны, в позиции которой шаттл вылетает от стыковки, +чтобы игре не требовалось крутить его и всех игроков на нём. +`port_direction`: указатель, с какой стороны стоит сам порт. Если поставить неправильно, то шаттл перевернёться и будет летать боком или задом. +По умолчанию если порт стоит в передней части, то север (1), с левой запад (8), с правой восток (4), сзади юг (2). + `width`, `height`: The width and height variables are **absolute** value variables which define the bounding box of the docking port. It is very important to note that these are different from the `dwidth` and `dheight` in terms of how they are counted. As they are @@ -84,9 +90,9 @@ The "bottom left corner" changes depending on the direction of the docking port so a docking port **facing north** that looks something like this: ``` -||| -||| -|||D| +||| +||| +|||D| ||||| ``` diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 234355a33fd..56b34ff48c0 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -85,7 +85,6 @@ width = 22 height = 11 dir = 4 - travelDir = 0 roundstart_move = "emergency_away" var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself @@ -114,35 +113,14 @@ return ..() -/obj/docking_port/mobile/emergency/timeLeft(divisor) - if(divisor <= 0) - divisor = 10 - if(!timer) - return round(SSshuttle.emergencyCallTime/divisor, 1) - - var/dtime = world.time - timer - switch(mode) - if(SHUTTLE_ESCAPE) - dtime = max(SSshuttle.emergencyEscapeTime - dtime, 0) - if(SHUTTLE_DOCKED) - dtime = max(SSshuttle.emergencyDockTime - dtime, 0) - else - - dtime = max(SSshuttle.emergencyCallTime - dtime, 0) - return round(dtime/divisor, 1) - /obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, coefficient=1, area/signalOrigin, reason, redAlert) - SSshuttle.emergencyCallTime = initial(SSshuttle.emergencyCallTime) * coefficient + var/call_time = SSshuttle.emergencyCallTime * coefficient switch(mode) - if(SHUTTLE_RECALL) - mode = SHUTTLE_CALL - timer = world.time - timeLeft(1) - if(SHUTTLE_IDLE) + // The shuttle can not normally be called while "recalling", so + // if this proc is called, it's via admin fiat + if(SHUTTLE_RECALL, SHUTTLE_IDLE, SHUTTLE_CALL) mode = SHUTTLE_CALL - timer = world.time - if(SHUTTLE_CALL) - if(world.time < timer) //this is just failsafe - timer = world.time + setTimer(call_time) else return @@ -161,7 +139,7 @@ if(mode != SHUTTLE_CALL) return - timer = world.time - timeLeft(1) + invertTimer() mode = SHUTTLE_RECALL if(prob(70)) @@ -233,7 +211,7 @@ setTimer(20) return mode = SHUTTLE_DOCKED - timer = world.time + setTimer(SSshuttle.emergencyDockTime) emergency_shuttle_docked.Announce("Эвакуационный шаттл совершил стыковку со станцией. У вас есть [timeLeft(600)] минуты, чтобы взобраться на борт эвакуационного шаттла.") /* @@ -251,9 +229,14 @@ sound_played = 0 mode = SHUTTLE_STRANDED + if(time_left <= 100) // 9 seconds left - start requesting transit zones for emergency and pods + for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) + M.check_transit_zone() // yeah, we even check for pods that aren't at station. just for safety + check_transit_zone() + if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch sound_played = 1 - for(var/area/shuttle/escape/E in world) + for(var/area/shuttle/escape/E in GLOB.areas) E << 'sound/effects/hyperspace_begin_new.ogg' if(time_left <= 0 && !SSshuttle.emergencyNoEscape) @@ -262,10 +245,9 @@ if(is_station_level(M.z)) //Will not launch from the mine/planet M.enterTransit() //now move the actual emergency shuttle to its transit dock - for(var/area/shuttle/escape/E in world) enterTransit() mode = SHUTTLE_ESCAPE - timer = world.time + setTimer(SSshuttle.emergencyEscapeTime) GLOB.priority_announcement.Announce("Эвакуационный шаттл покинул станцию. До прибытия в доки ЦК осталось [timeLeft(600)] минуты.") for(var/mob/M in GLOB.player_list) if(!isnewplayer(M) && !M.client.karma_spent && !(M.client.ckey in GLOB.karma_spenders) && !M.get_preference(PREFTOGGLE_DISABLE_KARMA_REMINDER)) @@ -277,7 +259,7 @@ for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) M.dock(SSshuttle.getDock("[M.id]_away")) - for(var/area/shuttle/escape/E in world) + for(var/area/shuttle/escape/E in GLOB.areas) E << 'sound/effects/hyperspace_end_new.ogg' // now move the actual emergency shuttle to centcomm @@ -291,17 +273,6 @@ mode = SHUTTLE_ENDGAME timer = 0 - open_dock() - -/obj/docking_port/mobile/emergency/proc/open_dock() - pass() -/* - for(var/obj/machinery/door/poddoor/shuttledock/D in airlocks) - var/turf/T = get_step(D, D.checkdir) - if(!isspaceturf(T)) - spawn(0) - D.open() -*/ //Leaving this here incase someone decides to port -tg-'s escape shuttle stuff: // This basically opens a big-ass row of blast doors when the shuttle arrives at centcom /obj/docking_port/mobile/pod @@ -315,18 +286,11 @@ /obj/docking_port/mobile/pod/New() ..() if(id == "pod") - WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.") + log_runtime(EXCEPTION("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")) /obj/docking_port/mobile/pod/cancel() return -/* - findTransitDock() - . = SSshuttle.getDock("[id]_transit") - if(.) return . - return ..() -*/ - /obj/machinery/computer/shuttle/pod name = "pod control computer" admin_controlled = 1 diff --git a/code/modules/shuttle/gamma.dm b/code/modules/shuttle/gamma.dm index 169606ded9e..8b0ba9627bc 100644 --- a/code/modules/shuttle/gamma.dm +++ b/code/modules/shuttle/gamma.dm @@ -6,9 +6,8 @@ width = 7 dir = 4 fly_sound = 'sound/effects/hyperspace_end.ogg' - callTime = 10 SECONDS - ignitionTime = 0 - roundstart_move = "gamma_away" + rechargeTime = 0 + callTime = 8 SECONDS /obj/docking_port/mobile/gamma/request(obj/docking_port/stationary/S) . = ..() diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 756b2100a86..ea463127747 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -13,9 +13,10 @@ anchored = TRUE var/id - dir = NORTH //this should point -away- from the dockingport door, ie towards the ship + // this should point -away- from the dockingport door, ie towards the ship + dir = NORTH var/width = 0 //size of covered area, perpendicular to dir - var/height = 0 //size of covered area, paralell to dir + var/height = 0 //size of covered area, parallel to dir var/dwidth = 0 //position relative to covered area, perpendicular to dir var/dheight = 0 //position relative to covered area, parallel to dir @@ -26,7 +27,7 @@ var/list/ripples = list() var/hidden = FALSE //are we invisible to shuttle navigation computers? - //these objects are indestructable + //these objects are indestructible /obj/docking_port/Destroy(force) if(force) ..() @@ -52,11 +53,11 @@ //returns a list(x0,y0, x1,y1) where points 0 and 1 are bounding corners of the projected rectangle /obj/docking_port/proc/return_coords(_x, _y, _dir) - if(!_dir) + if(_dir == null) _dir = dir - if(!_x) + if(_x == null) _x = x - if(!_y) + if(_y == null) _y = y //byond's sin and cos functions are inaccurate. This is faster and perfectly accurate @@ -157,8 +158,9 @@ var/turf_type = /turf/baseturf_bottom var/area_type = /area/space + var/last_dock_time - var/lock_shuttle_doors = 0 + var/lock_shuttle_doors = FALSE // Preset for adding whiteship docks to ruins. Has widths preset which will auto-assign the shuttle /obj/docking_port/stationary/whiteship @@ -185,18 +187,14 @@ //returns first-found touching shuttleport /obj/docking_port/stationary/get_docked() return locate(/obj/docking_port/mobile) in loc - /* - for(var/turf/T in return_ordered_turfs()) - . = locate(/obj/docking_port/mobile) in loc - if(.) - return . - */ /obj/docking_port/stationary/transit name = "In transit" turf_type = /turf/space/transit + var/datum/turf_reservation/reserved_area var/area/shuttle/transit/assigned_area - lock_shuttle_doors = 1 + lock_shuttle_doors = TRUE + var/obj/docking_port/mobile/owner /obj/docking_port/stationary/transit/register() if(!..()) @@ -207,6 +205,16 @@ SSshuttle.transit += src return 1 +/obj/docking_port/stationary/transit/Destroy(force=FALSE) + if(force) + SSshuttle.transit -= src + if(owner) + owner = null + if(!QDELETED(reserved_area)) + qdel(reserved_area) + reserved_area = null + return ..() + /obj/docking_port/mobile icon_state = "mobile" name = "shuttle" @@ -219,18 +227,33 @@ var/timer //used as a timer (if you want time left to complete move, use timeLeft proc) var/last_timer_length - var/rechargeTime = 50 - var/mode = SHUTTLE_IDLE //current shuttle mode (see global defines) - var/callTime = 50 //time spent in transit (deciseconds) - var/ignitionTime = 30 // time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles. - var/roundstart_move //id of port to send shuttle to at roundstart - var/travelDir = 0 //direction the shuttle would travel in - var/rebuildable = 0 //can build new shuttle consoles for this one + /// current shuttle state + var/mode = SHUTTLE_IDLE + /// time recharging before ready to launch again + var/rechargeTime = 5 SECONDS + /// time spent in transit (deciseconds) + var/callTime = 5 SECONDS + /// time spent "starting the engines". Also rate limits how often we try to reserve transit space if its ever full of transiting shuttles. + /// DO NOT set under 3 seconds. We need to reserve space before we can launch the shuttle. Also it'll break launch sound(not by not playing. it'll be unsynced) + var/ignitionTime = 3 SECONDS + /// id of port to send shuttle to at roundstart + var/roundstart_move + /// can build new shuttle consoles for this one + var/rebuildable = 0 + /// Doesn't throw runtimes if can't find the dock. Used by away shuttles(example ussp shuttle) which cannot get docks loaded in map. + var/alone_shuttle = FALSE + + /// The direction the shuttle prefers to travel in, ie what direction the animation will cause it to appear to be traveling in + var/preferred_direction = NORTH + /// relative direction of the docking port from the front of the shuttle. + /// Meaning, if port located at: front = NORTH, left side = WEST, right side = EAST, backside = SOUTH. + var/port_direction = NORTH var/mob/last_caller // Who called the shuttle the last time var/obj/docking_port/stationary/destination var/obj/docking_port/stationary/previous + var/obj/docking_port/stationary/transit/assigned_transit /obj/docking_port/mobile/New() ..() @@ -244,6 +267,8 @@ areaInstance.name = name areaInstance.contents += return_ordered_turfs() + areaInstance.parallax_movedir = preferred_direction + #ifdef DOCKING_PORT_HIGHLIGHT highlight("#0f0") #endif @@ -280,12 +305,13 @@ areaInstance = null destination = null previous = null + QDEL_NULL(assigned_transit) //don't need it where we're goin'! shuttle_areas = null return ..() //this is a hook for custom behaviour. Maybe at some point we could add checks to see if engines are intact /obj/docking_port/mobile/proc/canMove() - return 0 //0 means we can move + return 0 //0 means we can move // FALSE should've mean YOU CAN'T MOVE WTF //this is to check if this shuttle can physically dock at dock S /obj/docking_port/mobile/proc/canDock(obj/docking_port/stationary/S) @@ -325,9 +351,10 @@ else var/msg = "check_dock(): shuttle [src] cannot dock at [S], error: [status]" message_admins(msg) - throw EXCEPTION(msg) return FALSE +/obj/docking_port/mobile/proc/transit_failure() + message_admins("Shuttle [src] repeatedly failed to create transit zone.") //call the shuttle to destination S /obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S) @@ -361,22 +388,22 @@ if(mode != SHUTTLE_CALL) return - timer = world.time - timeLeft(1) + invertTimer() mode = SHUTTLE_RECALL /obj/docking_port/mobile/proc/enterTransit() . = FALSE previous = null var/obj/docking_port/stationary/S0 = get_docked() - var/obj/docking_port/stationary/S1 = findTransitDock() + var/obj/docking_port/stationary/S1 = assigned_transit if(S1) if(dock(S1, transit = TRUE)) - WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].") + log_runtime(EXCEPTION("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].")) else previous = S0 return TRUE else - WARNING("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]") + log_runtime(EXCEPTION("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]")) @@ -422,137 +449,141 @@ ripples.Cut() -/obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/S1) - var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance) - var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir) +/obj/docking_port/mobile/proc/ripple_area(obj/docking_port/stationary/new_dock) + var/list/old_turfs = return_ordered_turfs(x, y, z, dir, areaInstance) + var/list/new_turfs = return_ordered_turfs(new_dock.x, new_dock.y, new_dock.z, new_dock.dir) var/list/ripple_turfs = list() - for(var/i in 1 to L0.len) - var/turf/T0 = L0[i] - if(!T0) + for(var/i in 1 to old_turfs.len) + var/turf/oldT = old_turfs[i] + if(!oldT) continue - var/turf/T1 = L1[i] - if(!T1) + var/turf/newT = new_turfs[i] + if(!newT) continue - if(T0.type != T0.baseturf) - ripple_turfs += T1 + if(oldT.type != oldT.baseturf) + ripple_turfs += newT return ripple_turfs -//this is the main proc. It instantly moves our mobile port to stationary port S1 -//it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc -/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force = FALSE, transit = FALSE) +/// this is the main proc. It instantly moves our mobile port to stationary port S1 +/// it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc +/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/new_dock, force = FALSE, transit = FALSE) // Crashing this ship with NO SURVIVORS - if(S1.get_docked() == src) + if(new_dock.get_docked() == src) remove_ripples() - return + return DOCKING_SUCCESS if(!force) - if(!check_dock(S1)) - return -1 + if(!check_dock(new_dock)) + return DOCKING_BLOCKED if(canMove()) - return -1 + remove_ripples() + return DOCKING_IMMOBILIZED - var/obj/docking_port/stationary/S0 = get_docked() - var/turf_type = /turf/space - var/area_type = /area/space - if(S0) - if(S0.turf_type) - turf_type = S0.turf_type - if(S0.area_type) - area_type = S0.area_type + var/obj/docking_port/stationary/old_dock = get_docked() + var/turf_type = old_dock?.turf_type || /turf/space + var/area_type = old_dock?.area_type || /area/space //close and lock the dock's airlocks - closePortDoors(S0) + closePortDoors(old_dock) - var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance) - var/list/L1 = return_ordered_turfs(S1.x, S1.y, S1.z, S1.dir) + var/list/old_turfs = return_ordered_turfs(x, y, z, dir, areaInstance) + var/list/new_turfs = return_ordered_turfs(new_dock.x, new_dock.y, new_dock.z, new_dock.dir) - var/rotation = dir2angle(S1.dir)-dir2angle(dir) - if((rotation % 90) != 0) - rotation += (rotation % 90) //diagonal rotations not allowed, round up - rotation = SIMPLIFY_DEGREES(rotation) + var/rotation = 0 + if(new_dock.dir != dir) //Even when the dirs are the same rotation is coming out as not 0 for some reason + rotation = dir2angle(new_dock.dir)-dir2angle(dir) + if ((rotation % 90) != 0) + rotation += (rotation % 90) //diagonal rotations not allowed, round up + rotation = SIMPLIFY_DEGREES(rotation) //remove area surrounding docking port if(areaInstance.contents.len) var/area/A0 = locate("[area_type]") if(!A0) A0 = new area_type(null) - for(var/turf/T0 in L0) - A0.contents += T0 + for(var/turf/oldT in old_turfs) + A0.contents += oldT // Removes ripples remove_ripples() //move or squish anything in the way ship at destination - shuttle_smash(L0, L1, S1.dir) + shuttle_smash(old_turfs, new_turfs, new_dock.dir) - for(var/i in 1 to L0.len) - var/turf/T0 = L0[i] - if(!T0) + // begin transition + for(var/i in 1 to old_turfs.len) + /* CHECKING */ + var/turf/oldT = old_turfs[i] //old turf + if(!oldT) continue - var/turf/T1 = L1[i] - if(!T1) + var/turf/newT = new_turfs[i] //new turf + if(!newT) continue - areaInstance.contents += T1 + areaInstance.contents += newT - var/should_transit = !is_turf_blacklisted_for_transit(T0) + /* TAKEOFF */ + var/should_transit = !is_turf_blacklisted_for_transit(oldT) if(should_transit) // Only move over stuff if the transfer actually happened - T0.copyTurf(T1) + oldT.copyTurf(newT) //copy over air - if(issimulatedturf(T1)) - var/turf/simulated/Ts1 = T1 - Ts1.copy_air_with_tile(T0) + if(issimulatedturf(newT)) + var/turf/simulated/Ts1 = newT + Ts1.copy_air_with_tile(oldT) //move mobile to new location - for(var/atom/movable/AM in T0) - AM.onShuttleMove(T0, T1, rotation, last_caller) + for(var/atom/movable/AM in oldT) + AM.onShuttleMove(oldT, newT, rotation, last_caller) + //rotate turf if(rotation) - T1.shuttleRotate(rotation) + newT.shuttleRotate(rotation) + /* END TAKEOFF */ - var/turf/new_ceiling = GET_TURF_ABOVE(T1) // Do it before atmos readjust. + /* GIVE CEILING */ + var/turf/new_ceiling = GET_TURF_ABOVE(newT) // Do it before atmos readjust. if(new_ceiling && (isspaceturf(new_ceiling) || isopenspaceturf(new_ceiling))) //Check for open one, not wall // generate ceiling new_ceiling.ChangeTurf(/turf/simulated/floor/engine/hull/ceiling) // Always do this stuff as it ensures that the destination turfs still behave properly with the rest of the shuttle transit - //atmos and lighting stuff - SSair.remove_from_active(T1) - T1.CalculateAdjacentTurfs() - SSair.add_to_active(T1,1) - - T1.lighting_build_overlay() + /* UPDATE ATMOS & LIGHT */ + SSair.remove_from_active(newT) + newT.CalculateAdjacentTurfs() + SSair.add_to_active(newT, 1) + newT.lighting_build_overlay() if(!should_transit) continue // Don't want to actually change the skipped turf - // We make roof here, before the turf change and atmos change. or the atmos will BREAK - var/turf/old_ceiling = GET_TURF_ABOVE(T0) + /* REMOVE OLD CEILING */ + var/turf/old_ceiling = GET_TURF_ABOVE(oldT) if(old_ceiling && istype(old_ceiling, /turf/simulated/floor/engine/hull/ceiling)) // check if a ceiling was generated previously // remove old ceiling var/turf/simulated/floor/engine/hull/ceiling/old_shuttle_ceiling = old_ceiling old_shuttle_ceiling.ChangeTurf(old_shuttle_ceiling.old_turf_type) - T0.ChangeTurf(turf_type, keep_icon = FALSE) - - SSair.remove_from_active(T0) - T0.CalculateAdjacentTurfs() - SSair.add_to_active(T0,1) + /* RESTORE OLD TURF */ + oldT.ChangeTurf(turf_type, keep_icon = FALSE) + SSair.remove_from_active(oldT) + oldT.CalculateAdjacentTurfs() + SSair.add_to_active(oldT, 1) + // end transition areaInstance.moving = transit - for(var/A1 in L1) - var/turf/T1 = A1 - T1.postDock(S1) - for(var/atom/movable/mobile_docking_port in T1) - mobile_docking_port.postDock(S1) + for(var/A1 in new_turfs) + var/turf/newT = A1 + newT.postDock(new_dock) + for(var/atom/movable/mobile_docking_port in newT) + mobile_docking_port.postDock(new_dock) - loc = S1.loc - dir = S1.dir + loc = new_dock.loc + dir = new_dock.dir // Update mining and labor shuttle ash storm audio if(id in list("mining", "laborcamp") && !CONFIG_GET(flag/disable_lavaland)) @@ -562,7 +593,7 @@ W.update_eligible_areas() W.update_audio() - unlockPortDoors(S1) + unlockPortDoors(new_dock) /obj/docking_port/mobile/proc/is_turf_blacklisted_for_transit(turf/T) var/static/list/blacklisted_turf_types = typecacheof(GLOB.blacklisted_turf_types_for_transit) @@ -575,17 +606,16 @@ /obj/docking_port/mobile/proc/findRoundstartDock() - var/obj/docking_port/stationary/D - D = SSshuttle.getDock(roundstart_move) - - if(D) - return D + for(var/obj/docking_port/stationary/S in SSshuttle.stationary) + if(S.id == roundstart_move) + return S + if(!alone_shuttle) + log_runtime(EXCEPTION("couldn't find roundstart dock for \"[name]\" with id: [id]")) /obj/docking_port/mobile/proc/dockRoundstart() - // Instead of spending a lot of time trying to work out where to place - // our shuttle, just create it somewhere empty and send it to where - // it should go - . = dock_id(roundstart_move) + var/port = findRoundstartDock() + if(port) + return dock(port) /obj/docking_port/mobile/proc/dock_id(id) var/port = SSshuttle.getDock(id) @@ -601,67 +631,74 @@ //shuttle-door closing is handled in the dock() proc whilst looping through turfs //this one closes the door where we are docked at, if there is one there. -/obj/docking_port/mobile/proc/closePortDoors(obj/docking_port/stationary/S0) - if(!istype(S0)) - return 1 +/obj/docking_port/mobile/proc/closePortDoors(obj/docking_port/stationary/old_dock) + if(!istype(old_dock) || isnull(old_dock.id)) + return for(var/obj/machinery/door/airlock/A in GLOB.airlocks) - if(A.id_tag == S0.id) - spawn(-1) - A.close() - A.lock() + if(A.id_tag == old_dock.id) + A.close() + A.lock() -/obj/docking_port/mobile/proc/unlockPortDoors(obj/docking_port/stationary/S1) - if(!istype(S1)) - return 0 +/obj/docking_port/mobile/proc/unlockPortDoors(obj/docking_port/stationary/new_dock) + if(!istype(new_dock) || isnull(new_dock.id)) + return for(var/obj/machinery/door/airlock/A in GLOB.airlocks) - if(A.id_tag == S1.id) - spawn(-1) - if(A.locked) - A.unlock() + if(A.id_tag == new_dock.id) + if(A.locked) + A.unlock() //used by shuttle subsystem to check timers /obj/docking_port/mobile/proc/check() - check_effects() - - var/timeLeft = timeLeft(1) - - if(timeLeft <= 0) - switch(mode) - if(SHUTTLE_CALL) - if(dock(destination)) - setTimer(20) //can't dock for some reason, try again in 2 seconds - return - if(rechargeTime) - mode = SHUTTLE_RECHARGING - setTimer(rechargeTime) - return - if(SHUTTLE_RECALL) - if(dock(previous)) - setTimer(20) //can't dock for some reason, try again in 2 seconds - return - if(SHUTTLE_IGNITING) - if(enterTransit()) - mode = SHUTTLE_CALL - setTimer(callTime) - return - mode = SHUTTLE_IDLE - timer = 0 - destination = null + check_ripples() + + if(mode == SHUTTLE_IGNITING) + check_transit_zone() -/obj/docking_port/mobile/proc/check_effects() + if(timeLeft(1) > 0) + return + // If we can't dock or we don't have a transit slot, wait for 20 ds, + // then try again + switch(mode) + if(SHUTTLE_CALL) + if(dock(destination)) + setTimer(20) //can't dock for some reason, try again in 2 seconds + return + if(rechargeTime) + mode = SHUTTLE_RECHARGING + setTimer(rechargeTime) + return + if(SHUTTLE_RECALL) + if(dock(previous)) + setTimer(20) //can't dock for some reason, try again in 2 seconds + return + if(SHUTTLE_IGNITING) + if(enterTransit()) + mode = SHUTTLE_CALL + setTimer(callTime) + return + mode = SHUTTLE_IDLE + timer = 0 + destination = null + +/obj/docking_port/mobile/proc/check_ripples() if(!ripples.len) if((mode == SHUTTLE_CALL) || (mode == SHUTTLE_RECALL)) var/tl = timeLeft(1) if(tl <= SHUTTLE_RIPPLE_TIME) create_ripples(destination) +/obj/docking_port/mobile/proc/check_transit_zone() + if(assigned_transit) + return TRANSIT_READY + else + SSshuttle.request_transit_dock(src) + /obj/docking_port/mobile/proc/setTimer(wait) - if(timer <= 0) - timer = world.time - timer += wait - timeLeft(1) + timer = world.time + wait + last_timer_length = wait /obj/docking_port/mobile/proc/modTimer(multiple) var/time_remaining = timer - world.time @@ -683,13 +720,19 @@ /obj/docking_port/mobile/proc/timeLeft(divisor) if(divisor <= 0) divisor = 10 + var/ds_remaining if(!timer) - return round(callTime/divisor, 1) - return max( round((timer+callTime-world.time)/divisor,1), 0 ) + ds_remaining = callTime + else + ds_remaining = max(0, timer - world.time) + + . = round(ds_remaining / divisor, 1) // returns 3-letter mode string, used by status screens and mob status panel /obj/docking_port/mobile/proc/getModeStr() switch(mode) + if(SHUTTLE_IGNITING) + return "IGN" if(SHUTTLE_RECALL) return "RCL" if(SHUTTLE_CALL) diff --git a/code/modules/shuttle/shuttle_manipulator.dm b/code/modules/shuttle/shuttle_manipulator.dm index 3e56d46ce59..88733c63e0a 100644 --- a/code/modules/shuttle/shuttle_manipulator.dm +++ b/code/modules/shuttle/shuttle_manipulator.dm @@ -41,6 +41,8 @@ switch(mode) if(SHUTTLE_IDLE) . = "idle" + if(SHUTTLE_IGNITING) + . = "engines charging" if(SHUTTLE_RECALL) . = "recalled" if(SHUTTLE_CALL) @@ -51,6 +53,8 @@ . = "stranded" if(SHUTTLE_ESCAPE) . = "escape" + if(SHUTTLE_RECHARGING) + . = "recharging" if(!.) . = "ERROR" @@ -265,7 +269,7 @@ /obj/machinery/shuttle_manipulator/proc/load_template(datum/map_template/shuttle/S) // load shuttle template, centred at shuttle import landmark, - var/turf/landmark_turf = get_turf(locate("landmark*Shuttle Import")) + var/turf/landmark_turf = get_turf(locate("landmark*Shuttle Import")) // e.g. /obj/effect/landmark/shuttle_import S.load(landmark_turf, centered = TRUE) var/affected = S.get_affected_turfs(landmark_turf, centered=TRUE) diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index c0a515b3646..2e232ae93a3 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -10,7 +10,6 @@ callTime = 1200 dir = 8 - travelDir = 90 width = 12 dwidth = 5 height = 7 diff --git a/code/modules/space_management/space_reservation.dm b/code/modules/space_management/space_reservation.dm new file mode 100644 index 00000000000..5a2dd2ad9bf --- /dev/null +++ b/code/modules/space_management/space_reservation.dm @@ -0,0 +1,264 @@ + +//Yes, they can only be rectangular. +//Yes, I'm sorry. +/datum/turf_reservation + /// All turfs that we've reserved + var/list/reserved_turfs = list() + /// Turfs around the reservation for cordoning + var/list/cordon_turfs = list() + /// Area of turfs next to the cordon to fill with pre_cordon_area's + var/list/pre_cordon_turfs = list() + /// The width of the reservation + var/width = 0 + /// The height of the reservation + var/height = 0 + /// The z stack size of the reservation. Note that reservations are ALWAYS reserved from the bottom up + var/z_size = 0 + /// List of the bottom left turfs. Indexed by what their z index for this reservation is + var/list/bottom_left_turfs = list() + /// List of the top right turfs. Indexed by what their z index for this reservation is + var/list/top_right_turfs = list() + /// The turf type the reservation is initially made with + var/turf_type = /turf/space + ///Distance away from the cordon where we can put a "sort-cordon" and run some extra code (see make_repel). 0 makes nothing happen + var/pre_cordon_distance = 0 + +/datum/turf_reservation/transit + turf_type = /turf/space/transit + pre_cordon_distance = 7 + +/datum/turf_reservation/proc/Release() + bottom_left_turfs.Cut() + top_right_turfs.Cut() + + var/list/reserved_copy = reserved_turfs.Copy() + SSmapping.used_turfs -= reserved_turfs + reserved_turfs = list() + + var/list/cordon_copy = cordon_turfs.Copy() + SSmapping.used_turfs -= cordon_turfs + cordon_turfs = list() + + var/release_turfs = reserved_copy + cordon_copy + + for(var/turf/reserved_turf as anything in release_turfs) + SEND_SIGNAL(reserved_turf, COMSIG_TURF_RESERVATION_RELEASED, src) + + // Makes the linter happy, even tho we don't await this + INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, reserve_turfs), release_turfs) + +/// Attempts to calaculate and store a list of turfs around the reservation for cordoning. Returns whether a valid cordon was calculated +/datum/turf_reservation/proc/calculate_cordon_turfs(turf/bottom_left, turf/top_right) + if(bottom_left.x < 2 || bottom_left.y < 2 || top_right.x > (world.maxx - 2) || top_right.y > (world.maxy - 2)) + return FALSE // no space for a cordon here + + var/list/possible_turfs = CORNER_OUTLINE(bottom_left, width, height) + // if they're our cordon turfs, accept them + possible_turfs -= cordon_turfs + for(var/turf/cordon_turf as anything in possible_turfs) + if(!(cordon_turf.turf_flags & UNUSED_RESERVATION_TURF)) + return FALSE + + cordon_turfs |= possible_turfs + + if(pre_cordon_distance) + var/turf/offset_turf = locate(bottom_left.x + pre_cordon_distance, bottom_left.y + pre_cordon_distance, bottom_left.z) + var/list/to_add = CORNER_OUTLINE(offset_turf, width - pre_cordon_distance * 2, height - pre_cordon_distance * 2) //we step-by-stop move inwards from the outer cordon + for(var/turf/turf_being_added as anything in to_add) + pre_cordon_turfs |= turf_being_added //add one by one so we can filter out duplicates + + return TRUE + +/// Actually generates the cordon around the reservation, and marking the cordon turfs as reserved +/datum/turf_reservation/proc/generate_cordon() + for(var/turf/cordon_turf as anything in cordon_turfs) + var/area/misc/cordon/cordon_area = GLOB.areas_by_type[/area/misc/cordon] || new + var/area/old_area = cordon_turf.loc + old_area.turfs_to_uncontain += cordon_turf + cordon_area.contained_turfs += cordon_turf + cordon_area.contents += cordon_turf + // Its no longer unused, but its also not "used" + cordon_turf.turf_flags &= ~UNUSED_RESERVATION_TURF + cordon_turf.ChangeTurf(/turf/cordon) + SSmapping.unused_turfs["[cordon_turf.z]"] -= cordon_turf + // still gets linked to us though + SSmapping.used_turfs[cordon_turf] = src + + //swap the area with the pre-cordoning area + for(var/turf/pre_cordon_turf as anything in pre_cordon_turfs) + make_repel(pre_cordon_turf) + +///Register signals in the cordon "danger zone" to do something with whoever trespasses +/datum/turf_reservation/proc/make_repel(turf/pre_cordon_turf) + SHOULD_CALL_PARENT(TRUE) + //Okay so hear me out. If we place a special turf IN the reserved area, it will be overwritten, so we can't do that + //But signals are preserved even between turf changes, so even if we register a signal now it will stay even if that turf is overriden by the template + RegisterSignal(pre_cordon_turf, list(COMSIG_QDELETING, COMSIG_TURF_RESERVATION_RELEASED), PROC_REF(on_stop_repel)) + +/datum/turf_reservation/proc/on_stop_repel(turf/pre_cordon_turf) + SHOULD_CALL_PARENT(TRUE) + SIGNAL_HANDLER + + stop_repel(pre_cordon_turf) + +///Unregister all the signals we added in RegisterRepelSignals +/datum/turf_reservation/proc/stop_repel(turf/pre_cordon_turf) + UnregisterSignal(pre_cordon_turf, list(COMSIG_QDELETING, COMSIG_TURF_RESERVATION_RELEASED)) + +/datum/turf_reservation/transit/make_repel(turf/pre_cordon_turf) + ..() + + RegisterSignal(pre_cordon_turf, COMSIG_ATOM_ENTERED, PROC_REF(space_dump)) + +/datum/turf_reservation/transit/stop_repel(turf/pre_cordon_turf) + ..() + + UnregisterSignal(pre_cordon_turf, COMSIG_ATOM_ENTERED) + +/datum/turf_reservation/transit/proc/space_dump(atom/source, atom/movable/enterer) + SIGNAL_HANDLER + + if(!enterer) + return + if(!enterer.simulated || istype(enterer, /obj/docking_port)) + return //this was fucking hilarious, the docking ports were getting thrown to random Z-levels + if(!isobserver(enterer)) + return + dump_in_space(enterer) + +/// Internal proc which handles reserving the area for the reservation. +/datum/turf_reservation/proc/_reserve_area(width, height, zlevel) + src.width = width + src.height = height + if(width > world.maxx || height > world.maxy || width < 1 || height < 1) + return FALSE + var/list/avail = SSmapping.unused_turfs["[zlevel]"] + var/turf/BL + var/turf/TR + var/list/turf/final = list() + var/passing = FALSE + for(var/i in avail) + CHECK_TICK + BL = i + if(!(BL.turf_flags & UNUSED_RESERVATION_TURF)) + continue + if(BL.x + width > world.maxx || BL.y + height > world.maxy) + continue + TR = locate(BL.x + width - 1, BL.y + height - 1, BL.z) + if(!(TR.turf_flags & UNUSED_RESERVATION_TURF)) + continue + final = block(BL, TR) + if(!final) + continue + passing = TRUE + for(var/I in final) + var/turf/checking = I + if(!(checking.turf_flags & UNUSED_RESERVATION_TURF)) + passing = FALSE + break + if(passing) // found a potentially valid area, now try to calculate its cordon + passing = calculate_cordon_turfs(BL, TR) + if(!passing) + continue + break + if(!passing || !istype(BL) || !istype(TR)) + return FALSE + + bottom_left_turfs += BL + top_right_turfs += TR + + for(var/i in final) + var/turf/T = i + reserved_turfs |= T + SSmapping.unused_turfs["[T.z]"] -= T + SSmapping.used_turfs[T] = src + T.turf_flags = (T.turf_flags | RESERVATION_TURF) & ~UNUSED_RESERVATION_TURF + T.ChangeTurf(turf_type) + + + return TRUE + +/datum/turf_reservation/proc/reserve(width, height, z_size, z_reservation) + src.z_size = z_size + var/failed_reservation = FALSE + for(var/_ in 1 to z_size) + if(!_reserve_area(width, height, z_reservation)) + failed_reservation = TRUE + break + + if(failed_reservation) + Release() + return FALSE + + generate_cordon() + return TRUE + +/// Calculates the effective bounds information for the given turf. Returns a list of the information, or null if not applicable. +/datum/turf_reservation/proc/calculate_turf_bounds_information(turf/target) + for(var/z_idx in 1 to z_size) + //log_debug("[list2params(bottom_left_turfs)], [z_idx]") + var/turf/bottom_left = bottom_left_turfs[z_idx] + var/turf/top_right = top_right_turfs[z_idx] + var/bl_x = bottom_left.x + var/bl_y = bottom_left.y + var/tr_x = top_right.x + var/tr_y = top_right.y + + if(target.x < bl_x) + continue + + if(target.y < bl_y) + continue + + if(target.x > tr_x) + continue + + if(target.y > tr_y) + continue + + var/list/return_information = list() + return_information["z_idx"] = z_idx + return_information["offset_x"] = target.x - bl_x + return_information["offset_y"] = target.y - bl_y + return return_information + return null + +/// Gets the turf below the given target. Returns null if there is no turf below the target +/datum/turf_reservation/proc/get_turf_below(turf/target) + var/list/bounds_info = calculate_turf_bounds_information(target) + if(isnull(bounds_info)) + return null + + var/z_idx = bounds_info["z_idx"] + // check what z level, if its the max, then there is no turf below + if(z_idx == z_size) + return null + + var/offset_x = bounds_info["offset_x"] + var/offset_y = bounds_info["offset_y"] + var/turf/bottom_left = bottom_left_turfs[z_idx + 1] + return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) + +/// Gets the turf above the given target. Returns null if there is no turf above the target +/datum/turf_reservation/proc/get_turf_above(turf/target) + var/list/bounds_info = calculate_turf_bounds_information(target) + if(isnull(bounds_info)) + return null + + var/z_idx = bounds_info["z_idx"] + // check what z level, if its the min, then there is no turf above + if(z_idx == 1) + return null + + var/offset_x = bounds_info["offset_x"] + var/offset_y = bounds_info["offset_y"] + var/turf/bottom_left = bottom_left_turfs[z_idx - 1] + return locate(bottom_left.x + offset_x, bottom_left.y + offset_y, bottom_left.z) + +/datum/turf_reservation/New() + LAZYADD(SSmapping.turf_reservations, src) + +/datum/turf_reservation/Destroy() + Release() + LAZYREMOVE(SSmapping.turf_reservations, src) + return ..() diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm index 6d87270a74e..2e96cfbd0b2 100644 --- a/code/modules/space_management/zlevel_manager.dm +++ b/code/modules/space_management/zlevel_manager.dm @@ -12,8 +12,6 @@ GLOBAL_DATUM_INIT(space_manager, /datum/zlev_manager, new()) var/datum/spacewalk_grid/linkage_map var/initialized = 0 - var/list/areas_in_z = list() - // Populate our space level list // and prepare space transitions /datum/zlev_manager/proc/initialize() @@ -106,6 +104,10 @@ GLOBAL_DATUM_INIT(space_manager, /datum/zlev_manager, new()) * For convenience's sake returns the z-level added. * * This is a default way to create new z-level on your desire. + * + * * name - a name of new z-level. It should be unique. If you'll make multiple with same name, at least add "# [i]" in the end ("Ruin #1", "Ruin #2"...) + * * linkage - a state of how /turf/space on the edge of the z-level will interact with movable atoms. SELFLOOPING, CROSSLINKED will teleport, while UNAFFECTED won't do anything. + * * traits - traits/flags/attributes for z-level. All setting are in '_maps/_MAP_DEFINES.dm' */ /datum/zlev_manager/proc/add_new_zlevel(name, linkage = SELFLOOPING, traits = list(BLOCK_TELEPORT)) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, args) diff --git a/code/modules/spacepods/equipment.dm b/code/modules/spacepods/equipment.dm index e6e738083de..460a91cc7fd 100644 --- a/code/modules/spacepods/equipment.dm +++ b/code/modules/spacepods/equipment.dm @@ -38,12 +38,10 @@ projone.firer = usr projone.firer_source_atom = src projone.def_zone = BODY_ZONE_CHEST - projone.hit_crawling_mobs_chance = 33 // temporal soulution (or permanent), until weapons targeting rework projtwo.starting = get_turf(my_atom) projtwo.firer = usr projtwo.firer_source_atom = src projtwo.def_zone = BODY_ZONE_CHEST - projtwo.hit_crawling_mobs_chance = 33 spawn() playsound(src, fire_sound, 50, 1) projone.dumbfire(my_atom.dir) diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index 9e5855e8de9..4973d3ce5a3 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -1202,7 +1202,8 @@ if(direction & (UP|DOWN)) COOLDOWN_START(src, spacepod_move_cooldown, 0.5 SECONDS) - var/turf/above = GET_TURF_ABOVE(loc) + var/turf/T = get_turf(loc) + var/turf/above = GET_TURF_ABOVE(T) if((direction & UP) && can_z_move(DOWN, above, z_move_flags = ZMOVE_FALL_FLAGS)) // going up and can fall down is bad. return FALSE . = zMove(direction) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 83b5c23b8f7..1050823f257 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -1,6 +1,14 @@ /obj/item/retractor name = "retractor" - desc = "Retracts stuff." + desc = "Инструмент, используемый для расширения полостей при операциях." + ru_names = list( + NOMINATIVE = "ретрактор", + GENITIVE = "ретрактора", + DATIVE = "ретрактору", + ACCUSATIVE = "ретрактор", + INSTRUMENTAL = "ретрактором", + PREPOSITIONAL = "ретракторе", + ) icon = 'icons/obj/surgery.dmi' icon_state = "retractor" item_state = "retractor" @@ -16,19 +24,43 @@ /obj/item/retractor/laser name = "Advanced Laser Retractors" - desc = "A retractor with a laser tip. This one looks to be the pinnacle of precision energy a surgery tools!" + desc = "Ретрактор с лазерным наконечником. Последнее слово техники в сфере хирургических операций!" + ru_names = list( + NOMINATIVE = "лазерный ретрактор", + GENITIVE = "лазерного ретрактора", + DATIVE = "лазерному ретрактору", + ACCUSATIVE = "лазерный ретрактор", + INSTRUMENTAL = "лазерным ретрактором", + PREPOSITIONAL = "лазерном ретракторе", + ) icon_state = "retractor_laser" item_state = "retractor_laser" toolspeed = 0.4 /obj/item/retractor/augment - desc = "Micro-mechanical manipulator for retracting stuff." + desc = "Микромеханический манипулятор, используемый в хирургии для расширения полостей и закрепления надрезов." + ru_names = list( + NOMINATIVE = "микромеханический манипулятор", + GENITIVE = "микромеханического манипулятора", + DATIVE = "микромеханическому манипулятору", + ACCUSATIVE = "микромеханический манипулятор", + INSTRUMENTAL = "микромеханическим манипулятором", + PREPOSITIONAL = "микромеханическом манипуляторе", + ) w_class = WEIGHT_CLASS_TINY toolspeed = 0.5 /obj/item/hemostat name = "hemostat" - desc = "You think you have seen this before." + desc = "Инструмент для зажима кровоточащих сосудов во время операций." + ru_names = list( + NOMINATIVE = "гемостат", + GENITIVE = "гемостата", + DATIVE = "гемостату", + ACCUSATIVE = "гемостат", + INSTRUMENTAL = "гемостатом", + PREPOSITIONAL = "гемостате", + ) icon = 'icons/obj/surgery.dmi' icon_state = "hemostat" item_state = "hemostat" @@ -45,18 +77,34 @@ /obj/item/hemostat/laser name = "Advanced Laser Hemostat" - desc = "A hemostat with a laser clamp. This one looks to be the pinnacle of precision energy a surgery tools!" + desc = "Гемостат с лазерным зажимом. Последнее слово техники в сфере хирургических операций!" + ru_names = list( + NOMINATIVE = "лазерный гемостат", + GENITIVE = "лазерного гемостата", + DATIVE = "лазерному гемостату", + ACCUSATIVE = "лазерный гемостат", + INSTRUMENTAL = "лазерным гемостатом", + PREPOSITIONAL = "лазерном гемостате", + ) icon_state = "hemostat_laser" item_state = "hemostat_laser" toolspeed = 0.4 /obj/item/hemostat/augment - desc = "Tiny servos power a pair of pincers to stop bleeding." + desc = "Хирургический инструмент, состоящий из нескольких зажимов и сервомоторов. Используется для перекрытия сосудов и остановки возникающего кровотечения во время операции." toolspeed = 0.5 /obj/item/cautery name = "cautery" - desc = "This stops bleeding." + desc = "Хирургический инструмент, используемый для прижигания открытых ран и надрезов." + ru_names = list( + NOMINATIVE = "прижигатель", + GENITIVE = "прижигателя", + DATIVE = "прижигателю", + ACCUSATIVE = "прижигатель", + INSTRUMENTAL = "прижигателем", + PREPOSITIONAL = "прижигателе", + ) icon = 'icons/obj/surgery.dmi' icon_state = "cautery" item_state = "cautery" @@ -72,13 +120,21 @@ ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT) /obj/item/cautery/augment - desc = "A heated element that cauterizes wounds." + desc = "Нагревательный элемент, используемый для прижигания ран." toolspeed = 0.5 /obj/item/surgicaldrill name = "surgical drill" - desc = "You can drill using this item. You dig?" + desc = "Инструмент, предназначенный для сверления отверстий. Постарайтесь не попасть себе в глаз!" icon = 'icons/obj/surgery.dmi' + ru_names = list( + NOMINATIVE = "хирургическая дрель", + GENITIVE = "хирургической дрели", + DATIVE = "хирургической дрели", + ACCUSATIVE = "хирургическую дрель", + INSTRUMENTAL = "хирургической дрелью", + PREPOSITIONAL = "хирургической дрели", + ) icon_state = "drill" item_state = "drills" hitsound = 'sound/weapons/drill.ogg' @@ -95,20 +151,46 @@ . = ..() ADD_TRAIT(src, TRAIT_SURGICAL, ROUNDSTART_TRAIT) -/obj/item/surgicaldrill/suicide_act(mob/user) - to_chat(viewers(user), pick(span_suicide("[user] is pressing [src] to [user.p_their()] temple and activating it! It looks like [user.p_theyre()] trying to commit suicide."), - span_suicide("[user] is pressing [src] to [user.p_their()] chest and activating it! It looks like [user.p_theyre()] trying to commit suicide."))) - return BRUTELOSS +/obj/item/surgicaldrill/suicide_act(mob/living/user) + user.visible_message( + span_suicide("[user] наматыва[pluralize_ru(user.gender, "ет", "ют")] себя на [declent_ru(ACCUSATIVE)]!\n\ + Похоже, что [genderize_ru(user.gender, "он", "она", "оно", "они")] соверша[pluralize_ru(user.gender, "ет", "ют")] суицид!") + ) + + addtimer(CALLBACK(src, PROC_REF(second_act), user), 2.5 SECONDS) + user.SpinAnimation(3, 10) + + ADD_TRAIT(user, TRAIT_IMMOBILIZED, UNIQUE_TRAIT_SOURCE(src)) + playsound(user, 'sound/machines/juicer.ogg', 20, TRUE) + + return OBLITERATION + +/obj/item/surgicaldrill/proc/second_act(mob/user) + if(!user) + return + + for(var/obj/item/item in user.get_equipped_items()) + user.drop_item_ground(item) + + user.gib() /obj/item/surgicaldrill/laser name = "Advanced Laser Surgical Drill" - desc = "A surgery drill with a directed laser bit. This one looks to be the pinnacle of precision energy a surgery tools!" + desc = "Хирургическая дрель с узконаправленным лазерным элементом. Последнее слово техники в сфере хирургических операций!" + ru_names = list( + NOMINATIVE = "лазерная дрель", + GENITIVE = "лазерной дрели", + DATIVE = "лазерной дрели", + ACCUSATIVE = "лазерную дрель", + INSTRUMENTAL = "лазерной дрелью", + PREPOSITIONAL = "лазерной дрели", + ) icon_state = "drill_laser" item_state = "drill_laser" toolspeed = 0.4 /obj/item/surgicaldrill/augment - desc = "Effectively a small power drill contained within your arm, edges dulled to prevent tissue damage. May or may not pierce the heavens." + desc = "Небольшая электрическая дрель, находящаяся внутри вашей руки. Края затуплены, чтобы не повредить ткани. Не может пронзить небеса." hitsound = 'sound/weapons/circsawhit.ogg' force = 10 w_class = WEIGHT_CLASS_SMALL @@ -116,7 +198,15 @@ /obj/item/scalpel name = "scalpel" - desc = "Cut, cut, and once more cut." + desc = "Резать, резать и еще раз резать." + ru_names = list( + NOMINATIVE = "скальпель", + GENITIVE = "скальпеля", + DATIVE = "скальпелю", + ACCUSATIVE = "скальпель", + INSTRUMENTAL = "скальпелем", + PREPOSITIONAL = "скальпеле", + ) icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" item_state = "scalpel" @@ -142,14 +232,14 @@ /obj/item/scalpel/suicide_act(mob/user) - to_chat(viewers(user), pick(span_suicide("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide."), - span_suicide("[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide."), - span_suicide("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku."))) + to_chat(viewers(user), pick(span_suicide("[user] [declent_ru(INSTRUMENTAL)] среза[pluralize_ru(user.gender, "ет", "ют")] свою кожу! Похоже, что [genderize_ru(user.gender, "он", "она", "оно", "они")] соверша[pluralize_ru(user.gender, "ет", "ют")] суицид!"), + span_suicide("[user] реж[pluralize_ru(user.gender, "ет", "ут")] своё горло с помощью [declent_ru(GENITIVE)]! Похоже, что [genderize_ru(user.gender, "он", "она", "оно", "они")] соверша[pluralize_ru(user.gender, "ет", "ют")] суицид!"), + span_suicide("[user] вонза[pluralize_ru(user.gender, "ет", "ют")] [declent_ru(NOMINATIVE)] в свой желудок! Похоже, что [genderize_ru(user.gender, "он", "она", "оно", "они")] пыта[pluralize_ru(user.gender, "ет", "ют")]ся совершить сэппуку!"))) return BRUTELOSS /obj/item/scalpel/augment - desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy." + desc = "Миниатюрное сверхострое лезвие, которое крепится напрямую к вашей кости, обеспечивая дополнительную точность." toolspeed = 0.5 /* @@ -157,14 +247,22 @@ */ /obj/item/scalpel/laser //parent type name = "laser scalpel" - desc = "A scalpel augmented with a directed laser." + desc = "Скальпель, оборудованный направленным лазером." + ru_names = list( + NOMINATIVE = "лазерный скальпель", + GENITIVE = "лазерного скальпеля", + DATIVE = "лазерному скальпелю", + ACCUSATIVE = "лазерный скальпель", + INSTRUMENTAL = "лазерным скальпелем", + PREPOSITIONAL = "лазерном скальпеле", + ) icon_state = "scalpel_laser1_on" damtype = "fire" hitsound = 'sound/weapons/sear.ogg' /obj/item/scalpel/laser/laser1 //lasers also count as catuarys name = "Basic Laser Scalpel" - desc = "Скальпель, дополненный направленным лазером. Может быть усовершенствован." + desc = "Скальпель, дополненный направленным лазером. Может быть усовершенствован." icon_state = "scalpel_laser1_on" toolspeed = 0.8 @@ -182,8 +280,17 @@ /obj/item/scalpel/laser/manager //super tool! Retractor/hemostat name = "incision management system" - desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." + desc = "Этот небольшой хирургический аппарат по праву можно называть продолжением руки хирурга. Всего за несколько мгновений подготавливает и обрабатывает разрез, позволяя почти сразу перейти к основной стадии операции." icon_state = "scalpel_manager_on" + ru_names = list( + NOMINATIVE = "система обработки надрезов", + GENITIVE = "системы обработки надрезов", + DATIVE = "системе обработки надрезов", + ACCUSATIVE = "систему обработки надрезов", + INSTRUMENTAL = "системой обработки надрезов", + PREPOSITIONAL = "системе обработки надрезов", + ) + icon toolspeed = 0.2 /obj/item/scalpel/laser/manager/Initialize(mapload) @@ -193,18 +300,27 @@ /obj/item/scalpel/laser/manager/debug name = "debug IMS" - desc = "A wonder of modern medicine. This tool functions as any other sort of surgery tool, and finishes in only a fraction of the time. Hey, how'd you get your hands on this, anyway?" + desc = "Чудо современной медицины. Этот инструмент действует как любой другой хирургический инструмент и заканчивается в кратчайшие сроки. А как ты вообще это заполучил?" toolspeed = 0.01 /obj/item/scalpel/laser/manager/debug/attack_self(mob/user) . = ..() toolspeed = toolspeed == 0.5 ? 0.01 : 0.5 - to_chat(user, "[src] is now set to toolspeed [toolspeed]") + to_chat(user, "Установленная скорость инструмента у [declent_ru(GENITIVE)] - [toolspeed].") + balloon_alert(user, "скорость изменена") playsound(src, 'sound/effects/pop.ogg', 50, 0) //Change the mode /obj/item/circular_saw name = "circular saw" - desc = "For heavy duty cutting." + desc = "Инструмент, чтобы резать кости." + ru_names = list( + NOMINATIVE = "хирургическая пила", + GENITIVE = "хирургической пилы", + DATIVE = "хирургической пиле", + ACCUSATIVE = "хирургическую пилу", + INSTRUMENTAL = "хирургической пилой", + PREPOSITIONAL = "хирургической пиле", + ) icon = 'icons/obj/surgery.dmi' icon_state = "saw3" hitsound = 'sound/weapons/circsawhit.ogg' @@ -229,14 +345,22 @@ /obj/item/circular_saw/laser name = "Advanced Laser Circular Saw" - desc = "A saw with a circular laser disk. This one looks to be the pinnacle of precision energy a surgery tools!" + desc = "Пила с круглым лазерным диском. Последнее слово техники в сфере хирургических операций!" + ru_names = list( + NOMINATIVE = "лазерная хирургическая пила", + GENITIVE = "лазерной хирургической пилы", + DATIVE = "лазерной хирургической пиле", + ACCUSATIVE = "лазерную хирургическую пилу", + INSTRUMENTAL = "лазерной хирургической пилой", + PREPOSITIONAL = "лазерной хирургической пиле", + ) icon_state = "saw_laser" item_state = "saw_laser" origin_tech = "biotech=1;material=1" toolspeed = 0.6 /obj/item/circular_saw/augment - desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon." + desc = "Маленькая, но очень быстро вращающаяся пила. Края притуплены, чтобы предотвратить случайный порез внутри носителя." force = 10 w_class = WEIGHT_CLASS_SMALL toolspeed = 0.5 @@ -244,6 +368,15 @@ //misc, formerly from code/defines/weapons.dm /obj/item/bonegel name = "bone gel" + desc = "Небольшой баллончик, содержищий в себе гель, сращивающий и заживляющий кости." + ru_names = list( + NOMINATIVE = "костяной гель", + GENITIVE = "костяного геля", + DATIVE = "костяному гелю", + ACCUSATIVE = "костяной гель", + INSTRUMENTAL = "костяным гелем", + PREPOSITIONAL = "костяном геле", + ) icon = 'icons/obj/surgery.dmi' icon_state = "bone-gel" item_state = "bone-gel" @@ -262,6 +395,16 @@ /obj/item/FixOVein name = "FixOVein" + desc = "Небольшой баллончик, содержищий в себе гель, сращивающий и заживляющий кровеносные сосуды." + ru_names = list( + NOMINATIVE = "гель для сосудов", + GENITIVE = "гели для сосудов", + DATIVE = "гелю для сосудов", + ACCUSATIVE = "гель для сосудов", + INSTRUMENTAL = "гелью для сосудов", + PREPOSITIONAL = "геле для сосудов", + ) + ic icon = 'icons/obj/surgery.dmi' icon_state = "fixovein" item_state = "fixovein" @@ -280,6 +423,15 @@ /obj/item/bonesetter name = "bone setter" + desc = "Хирургический инструмент, предназначенный для вправления и закрепления костей." + ru_names = list( + NOMINATIVE = "костоправ", + GENITIVE = "костоправа", + DATIVE = "костоправу", + ACCUSATIVE = "костоправ", + INSTRUMENTAL = "костоправом", + PREPOSITIONAL = "костоправе", + ) icon = 'icons/obj/surgery.dmi' icon_state = "bone setter" item_state = "bone setter" @@ -298,7 +450,15 @@ /obj/item/bonesetter/laser name = "Advanced Laser Bone Setter" - desc = "A bone settler with a laser teeth. This one looks to be the pinnacle of precision energy a surgery tools!" + desc = "Инструмент для правки костей, оборудованный лазерными элементами. Последнее слово техники в сфере хирургических операций!" + ru_names = list( + NOMINATIVE = "лазерный костоправ", + GENITIVE = "лазерного костоправа", + DATIVE = "лазерному костоправу", + ACCUSATIVE = "лазерный костоправ", + INSTRUMENTAL = "лазерным костоправом", + PREPOSITIONAL = "лазерном костоправе", + ) icon_state = "bonesetter_laser" item_state = "bonesetter_laser" toolspeed = 0.4 @@ -308,7 +468,15 @@ /obj/item/surgical_drapes name = "surgical drapes" - desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control." + desc = "Хирургическая простыня, обеспечивающая оптимальную безопасность и инфекционный контроль." + ru_names = list( + NOMINATIVE = "хирургическая простыня", + GENITIVE = "хирургической простыни", + DATIVE = "хирургической простыне", + ACCUSATIVE = "хирургическую простыню", + INSTRUMENTAL = "хирургической простынёй", + PREPOSITIONAL = "хирургической простыне", + ) icon = 'icons/obj/surgery.dmi' icon_state = "surgical_drapes" w_class = WEIGHT_CLASS_SMALL diff --git a/config/example/config.txt b/config/example/config.txt index 3c2fab540af..bca18167b59 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -733,6 +733,9 @@ DEFAULT_MAP /datum/map/cyberiad ## Override server map by specified, uncomment to apply # OVERRIDE_MAP /datum/map/delta +## Override away mission map. Spawns it even if it is not mentioned in away_mission_config.txt +# OVERRIDE_AWAY_MISSION _maps/map_files/RandomZLevels/academy.dmm + ## Minimum number of space ruins levels to generate EXTRA_SPACE_RUIN_LEVELS_MIN 4 diff --git a/icons/blanks/32x32.dmi b/icons/blanks/32x32.dmi new file mode 100644 index 00000000000..6c4f2b33e0f Binary files /dev/null and b/icons/blanks/32x32.dmi differ diff --git a/icons/blanks/96x96.dmi b/icons/blanks/96x96.dmi new file mode 100644 index 00000000000..d79e60c111a Binary files /dev/null and b/icons/blanks/96x96.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index fb1262d618e..84c134a4867 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 367238253c7..bc3fa9ab1c9 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/human_races/r_nucleation.dmi b/icons/mob/human_races/r_nucleation.dmi index 8c38c42a20e..97a09e1b812 100644 Binary files a/icons/mob/human_races/r_nucleation.dmi and b/icons/mob/human_races/r_nucleation.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 5f35327a3f3..96176eec0f5 100755 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 004891ea390..6a85c0bdcc6 100755 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi b/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi index f2d9e01aecd..62701db9cea 100644 Binary files a/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi and b/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index daecb1d4de5..f0eeeb903e8 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index aa5e2230b06..a855ad214b7 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index d78818bfa5f..ac0fda9d2df 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 0d3952efe29..f5191611985 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/machines/sec_autolathe.dmi b/icons/obj/machines/sec_autolathe.dmi index 9f3b7cc8522..aafc234fbbe 100644 Binary files a/icons/obj/machines/sec_autolathe.dmi and b/icons/obj/machines/sec_autolathe.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 3d44421a2cd..477e975459f 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index ff26ec4599a..bfc1f869bb4 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi index 74e8409ad6a..1bb738a8a08 100644 Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi index 5a6eb8618a4..3022f705153 100644 Binary files a/icons/turf/walls/cult_wall.dmi and b/icons/turf/walls/cult_wall.dmi differ diff --git a/paradise.dme b/paradise.dme index d07486cf3fa..9b96ab95328 100644 --- a/paradise.dme +++ b/paradise.dme @@ -114,6 +114,7 @@ #include "code\__DEFINES\RCD.dm" #include "code\__DEFINES\reagents.dm" #include "code\__DEFINES\request.dm" +#include "code\__DEFINES\request_consoles.dm" #include "code\__DEFINES\rituals.dm" #include "code\__DEFINES\role_preferences.dm" #include "code\__DEFINES\rolebans.dm" @@ -122,6 +123,7 @@ #include "code\__DEFINES\secret_documents.dm" #include "code\__DEFINES\sensor_devices.dm" #include "code\__DEFINES\shuttle.dm" +#include "code\__DEFINES\shuttles.dm" #include "code\__DEFINES\sibyl.dm" #include "code\__DEFINES\sight.dm" #include "code\__DEFINES\sound.dm" @@ -154,7 +156,9 @@ #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\mapping.dm" #include "code\__DEFINES\dcs\signals.dm" +#include "code\__DEFINES\dcs\signals_lazy_templates.dm" #include "code\__DEFINES\dcs\signals_object.dm" +#include "code\__DEFINES\dcs\signals_turf.dm" #include "code\__DEFINES\traits\_traits.dm" #include "code\__DEFINES\traits\declarations.dm" #include "code\__DEFINES\traits\sources.dm" @@ -297,6 +301,7 @@ #include "code\controllers\subsystem\asset_loading.dm" #include "code\controllers\subsystem\capitalism.dm" #include "code\controllers\subsystem\chat.dm" +#include "code\controllers\subsystem\area_contents.dm" #include "code\controllers\subsystem\cleanup.dm" #include "code\controllers\subsystem\dbcore.dm" #include "code\controllers\subsystem\debugview.dm" @@ -314,6 +319,7 @@ #include "code\controllers\subsystem\jobs.dm" #include "code\controllers\subsystem\lighting.dm" #include "code\controllers\subsystem\machinery.dm" +#include "code\controllers\subsystem\mapping.dm" #include "code\controllers\subsystem\mobs.dm" #include "code\controllers\subsystem\nightshift.dm" #include "code\controllers\subsystem\npcpool.dm" @@ -347,7 +353,6 @@ #include "code\controllers\subsystem\non-firing\discord.dm" #include "code\controllers\subsystem\non-firing\holiday.dm" #include "code\controllers\subsystem\non-firing\ipintel.dm" -#include "code\controllers\subsystem\non-firing\mapping.dm" #include "code\controllers\subsystem\non-firing\medals.dm" #include "code\controllers\subsystem\non-firing\overlays.dm" #include "code\controllers\subsystem\non-firing\persistent_data.dm" @@ -1816,6 +1821,7 @@ #include "code\modules\atmospherics\machinery\portable\portable_atmospherics.dm" #include "code\modules\atmospherics\machinery\portable\pump.dm" #include "code\modules\atmospherics\machinery\portable\scrubber.dm" +#include "code\modules\awaymissions\cordon.dm" #include "code\modules\awaymissions\corpse.dm" #include "code\modules\awaymissions\exile.dm" #include "code\modules\awaymissions\gateway.dm" @@ -2768,10 +2774,14 @@ #include "code\modules\paperwork\papershredder.dm" #include "code\modules\paperwork\pen.dm" #include "code\modules\paperwork\photocopier.dm" -#include "code\modules\paperwork\photography.dm" -#include "code\modules\paperwork\silicon_photography.dm" #include "code\modules\paperwork\stamps.dm" #include "code\modules\paperwork\ticketmachine.dm" +#include "code\modules\paperwork\photography\camera.dm" +#include "code\modules\paperwork\photography\camera_image_capturing.dm" +#include "code\modules\paperwork\photography\other.dm" +#include "code\modules\paperwork\photography\photo.dm" +#include "code\modules\paperwork\photography\silicon_camera.dm" +#include "code\modules\paperwork\photography\video_camera.dm" #include "code\modules\pda\ai.dm" #include "code\modules\pda\app.dm" #include "code\modules\pda\cart.dm" @@ -2784,6 +2794,8 @@ #include "code\modules\pda\pda_tgui.dm" #include "code\modules\pda\pdas.dm" #include "code\modules\pda\radio.dm" +#include "code\modules\pda\request_consoles_app.dm" +#include "code\modules\pda\request_consoles_cart.dm" #include "code\modules\pda\utilities.dm" #include "code\modules\persistence\persistence.dm" #include "code\modules\point\point.dm" @@ -3018,6 +3030,7 @@ #include "code\modules\space_management\multiz_helper.dm" #include "code\modules\space_management\space_chunk.dm" #include "code\modules\space_management\space_level.dm" +#include "code\modules\space_management\space_reservation.dm" #include "code\modules\space_management\space_transition.dm" #include "code\modules\space_management\zlevel_manager.dm" #include "code\modules\spacepods\construction.dm" diff --git a/tgui/packages/tgui/interfaces/PDA.js b/tgui/packages/tgui/interfaces/PDA.js index 979e1bc44a0..1cc6b2e4343 100644 --- a/tgui/packages/tgui/interfaces/PDA.js +++ b/tgui/packages/tgui/interfaces/PDA.js @@ -75,7 +75,13 @@ export const PDA = (props, context) => { const PDAHeader = (props, context) => { const { act, data } = useBackend(context); - const { idInserted, idLink, stationTime, cartridge_name } = data; + const { + idInserted, + idLink, + stationTime, + cartridge_name, + request_cartridge_name, + } = data; return ( @@ -99,6 +105,18 @@ const PDAHeader = (props, context) => { } /> + +