diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 22a59bb5fa5e..0c96ffbd6d5f 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -375,8 +375,8 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/machinery/splicer, /obj/item/food/grown/poppy/lily, +/obj/machinery/plantgenes, /turf/open/floor/mineral/plastitanium, /area/ruin/powered/seedvault) "bb" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 4af93d6ff876..6d418b15bb42 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -875,6 +875,14 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"akI" = ( +/obj/structure/closet/cabinet, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/effect/spawner/random/food_or_drink/booze, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/port) "akS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1173,6 +1181,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/minisat, /obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /obj/structure/cable/layer3, +/obj/effect/landmark/navigate_destination/minisat_access_ai, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "anF" = ( @@ -1432,11 +1441,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/cargo/storage) -"aqa" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/snack, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "aqc" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -1503,6 +1507,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/maintenance/department/eva/abandoned) +"aqF" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/dice, +/obj/effect/spawner/random/entertainment/toy, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "aqS" = ( /obj/structure/bed{ dir = 4 @@ -2113,14 +2123,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/science/circuits) -"awC" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "awD" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -2343,6 +2345,12 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall/r_wall, /area/station/engineering/supermatter/room) +"azS" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) "azW" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -3523,7 +3531,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/navigate_destination, /obj/machinery/door/airlock{ name = "Locker Room" }, @@ -3936,7 +3943,6 @@ layer = 4.1 }, /obj/structure/railing{ - dir = 10; layer = 3.1 }, /turf/open/space/basic, @@ -4423,6 +4429,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/starboardquartersolar, /turf/open/floor/iron, /area/station/maintenance/solars/starboard/aft) "bbx" = ( @@ -4547,6 +4554,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) +"bcV" = ( +/obj/effect/turf_decal/bot_white, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "bdt" = ( /obj/structure/cable, /obj/machinery/power/energy_accumulator/tesla_coil/anchored, @@ -4629,11 +4641,11 @@ name = "Head of Personnel's Office" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/command/hop, +/obj/effect/landmark/navigate_destination/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "beP" = ( @@ -5715,6 +5727,27 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) +"bqF" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "bqP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7461,7 +7494,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/security/courtroom) "bLd" = ( @@ -8730,13 +8762,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/electronic_marketing_den) -"bYR" = ( -/obj/structure/closet/cabinet, -/obj/effect/spawner/random/food_or_drink/booze, -/obj/effect/spawner/random/food_or_drink/booze, -/obj/effect/spawner/random/food_or_drink/booze, -/turf/open/floor/plating, -/area/station/maintenance/port) "bYV" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -9911,6 +9936,21 @@ }, /turf/open/floor/iron, /area/station/tcommsat/server) +"cnz" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/line, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/iron/dark/textured_large, +/area/station/bitrunning/den) "cnE" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -10998,6 +11038,23 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"cCE" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "cCJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -11343,6 +11400,7 @@ name = "Turbine Generator Access" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/landmark/navigate_destination/incinerator, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "cGA" = ( @@ -11852,6 +11910,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/command/teleporter, +/obj/effect/landmark/navigate_destination/teleporter, /turf/open/floor/iron, /area/station/command/teleporter) "cNv" = ( @@ -11943,6 +12002,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/delta/abandtheatre, /turf/open/floor/iron, /area/station/service/theater/abandoned) "cOD" = ( @@ -12278,6 +12338,7 @@ /obj/effect/turf_decal/trimline/yellow/line{ dir = 8 }, +/obj/effect/landmark/navigate_destination/common/fitness, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, @@ -14148,13 +14209,6 @@ }, /turf/open/floor/iron, /area/station/science/lobby) -"dsj" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/light/small/directional/south, -/obj/effect/turf_decal/delivery, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron, -/area/station/engineering/main) "dso" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/machinery/rnd/server, @@ -15163,6 +15217,14 @@ /obj/structure/table/glass, /turf/open/floor/iron, /area/station/medical/cryo) +"dEq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/landmark/navigate_destination/library, +/turf/open/floor/wood, +/area/station/service/library) "dEv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/smooth_large, @@ -15575,6 +15637,13 @@ /obj/item/clothing/head/costume/cardborg, /turf/open/floor/wood, /area/station/service/theater/abandoned) +"dJY" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/court, +/turf/open/floor/iron/dark, +/area/station/security/courtroom) "dKg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16184,7 +16253,6 @@ /area/station/hallway/primary/fore) "dRK" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "dRO" = ( @@ -19926,12 +19994,6 @@ /obj/machinery/coffeemaker/impressa, /turf/open/floor/iron/dark, /area/station/medical/break_room) -"eOF" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "eOL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/turf_decal/stripes/line{ @@ -20169,6 +20231,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"eQJ" = ( +/obj/machinery/light/small/directional/south, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron, +/area/station/engineering/main) "eQK" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -20345,6 +20412,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/starboardbowsolar, /turf/open/floor/iron, /area/station/maintenance/solars/starboard/fore) "eUf" = ( @@ -20693,14 +20761,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"eXN" = ( -/obj/machinery/vending/wardrobe/engi_wardrobe, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "eXW" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall6"; @@ -21409,6 +21469,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/landmark/navigate_destination/common/shitter, /turf/open/floor/iron, /area/station/commons/toilet/restrooms) "ffo" = ( @@ -22271,6 +22332,7 @@ "fqZ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/plaque/static_plaque/golden/commission/delta, +/obj/effect/landmark/navigate_destination/dockarrival, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "frq" = ( @@ -23104,6 +23166,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/portbowsolar, /turf/open/floor/iron, /area/station/maintenance/solars/port/fore) "fAT" = ( @@ -23122,8 +23185,6 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "fAY" = ( @@ -23912,6 +23973,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"fMn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light_switch/directional/east, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/engineering/main) "fMo" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -24263,10 +24340,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/landmark/navigate_destination, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/navigate_destination/common/vaccommissary, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "fRa" = ( @@ -24675,6 +24752,15 @@ }, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"fXc" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "fXi" = ( /obj/machinery/light/directional/north, /obj/structure/sign/plaques/kiddie/badger{ @@ -24802,6 +24888,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/fore) +"fYe" = ( +/obj/effect/turf_decal/tile/neutral/anticorner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/port) "fYh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -25471,15 +25564,25 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron/dark, /area/station/science/auxlab/firing_range) +"gfQ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/circuit/green, +/area/station/engineering/main) "gfR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) -"gfX" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/deck, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "gga" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -25828,8 +25931,6 @@ /area/station/security/courtroom) "glb" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -26717,6 +26818,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/landmark/navigate_destination/lawyer, /turf/open/floor/iron, /area/station/service/lawoffice) "guI" = ( @@ -27022,6 +27124,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/command/gateway, +/obj/effect/landmark/navigate_destination/gateway, /turf/open/floor/iron, /area/station/command/gateway) "gyn" = ( @@ -27283,26 +27386,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"gCn" = ( -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "gCo" = ( /obj/structure/frame/machine{ anchored = 1 @@ -28283,6 +28366,23 @@ }, /turf/open/floor/iron, /area/station/security/prison) +"gOA" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Holodeck Access" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/common/holodeck, +/turf/open/floor/iron/dark, +/area/station/commons/fitness/recreation) "gOH" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plating, @@ -28939,7 +29039,6 @@ /obj/machinery/door/airlock/grunge{ name = "Morgue" }, -/obj/effect/landmark/navigate_destination, /obj/machinery/duct, /turf/open/floor/iron, /area/station/medical/morgue) @@ -28949,11 +29048,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"gXn" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/dice, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "gXr" = ( /obj/effect/mapping_helpers/dead_body_placer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -29878,12 +29972,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"hjP" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/toy, -/obj/effect/spawner/random/entertainment/toy, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "hjQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, @@ -30864,7 +30952,6 @@ /obj/machinery/door/airlock/engineering/glass{ name = "Auxiliary Tool Storage" }, -/obj/effect/landmark/navigate_destination, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30873,6 +30960,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 1 }, +/obj/effect/landmark/navigate_destination/tools, /turf/open/floor/iron, /area/station/commons/storage/tools) "hwK" = ( @@ -31683,7 +31771,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -31731,6 +31818,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"hIR" = ( +/obj/structure/table, +/obj/effect/spawner/random/entertainment/cigarette_pack, +/obj/effect/spawner/random/entertainment/toy, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "hIU" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -32263,6 +32356,22 @@ /obj/structure/reflector/box, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"hQO" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hQQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -32608,6 +32717,24 @@ }, /turf/open/floor/carpet/blue, /area/station/medical/psychology) +"hWc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/cable, +/obj/machinery/modular_computer/console/preset/engineering{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hWh" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -32653,6 +32780,20 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/aft) +"hWP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hWW" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -32669,15 +32810,6 @@ }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"hXd" = ( -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "hXf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -32814,6 +32946,15 @@ }, /turf/open/floor/wood/tile, /area/station/service/library/artgallery) +"hYi" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/dim/directional/south, +/obj/effect/landmark/start/hangover, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "hYn" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -34369,6 +34510,20 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"iqc" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iqd" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -37230,11 +37385,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"jcg" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible, -/turf/open/floor/iron, -/area/station/engineering/supermatter/room) "jcl" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners, /obj/structure/sink/directional/east, @@ -38537,6 +38687,21 @@ dir = 1 }, /area/station/hallway/primary/central/aft) +"jrg" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/abandoned, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/landmark/navigate_destination/delta/abandmedbay, +/turf/open/floor/iron, +/area/station/medical/abandoned) "jrp" = ( /turf/closed/wall, /area/station/cargo/storage) @@ -38931,6 +39096,7 @@ "jwy" = ( /obj/structure/chair/stool/directional/south, /obj/effect/turf_decal/trimline/purple/filled/warning, +/obj/effect/landmark/navigate_destination/research, /turf/open/floor/iron/white, /area/station/science/lobby) "jwA" = ( @@ -39647,6 +39813,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) +"jEo" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/firealarm/directional/south, +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "jEt" = ( /obj/structure/cable, /obj/machinery/door/firedoor, @@ -40137,18 +40310,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) -"jKY" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/camera/directional/south, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "jKZ" = ( /obj/structure/table/reinforced, /obj/machinery/button/door{ @@ -40628,7 +40789,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/medical/pharmacy) "jQq" = ( @@ -40715,6 +40875,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/common/shitter, /turf/open/floor/iron, /area/station/commons/toilet/locker) "jQY" = ( @@ -43349,6 +43510,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/portquartersolar, /turf/open/floor/iron, /area/station/maintenance/solars/port/aft) "kyD" = ( @@ -44160,6 +44322,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/delta/evamaint, /turf/open/floor/iron, /area/station/maintenance/department/eva/abandoned) "kIM" = ( @@ -44484,6 +44647,7 @@ /obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/delta/pioffice, /turf/open/floor/iron, /area/station/security/detectives_office/private_investigators_office) "kNk" = ( @@ -46879,6 +47043,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/commons/dorms) +"lsj" = ( +/obj/structure/table, +/obj/effect/spawner/random/food_or_drink/snack, +/obj/effect/spawner/random/entertainment/deck, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "lsl" = ( /obj/effect/turf_decal/bot, /obj/item/robot_suit, @@ -46980,10 +47150,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"ltt" = ( -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "ltu" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -47741,6 +47907,7 @@ /obj/effect/mapping_helpers/airlock/unres, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/delta/abandlibrary, /turf/open/floor/iron, /area/station/service/library/abandoned) "lCw" = ( @@ -48845,6 +49012,12 @@ }, /turf/open/floor/iron, /area/station/security/lockers) +"lPK" = ( +/obj/effect/turf_decal/tile/neutral/anticorner{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/maintenance/port) "lPM" = ( /obj/effect/turf_decal/loading_area, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -49262,6 +49435,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/aiupload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) "lUI" = ( @@ -50458,6 +50632,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"mmy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "mmM" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -51392,7 +51571,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/command/heads_quarters/cmo) "myI" = ( @@ -51901,7 +52079,6 @@ name = "Brig" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" }, @@ -51915,6 +52092,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/sec, /turf/open/floor/iron/dark, /area/station/security/brig) "mEH" = ( @@ -52053,13 +52231,13 @@ /obj/machinery/door/airlock/security{ name = "Detective's Office" }, -/obj/effect/landmark/navigate_destination, /obj/effect/mapping_helpers/airlock/access/all/security/detective, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/det, /turf/open/floor/iron, /area/station/security/detectives_office) "mGw" = ( @@ -52860,6 +53038,18 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/science/xenobiology) +"mOT" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/camera/directional/south, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{ + pixel_x = 5 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "mPg" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -53645,6 +53835,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/landmark/navigate_destination/delta/abandgameroom, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den/gaming) "mZr" = ( @@ -54818,6 +55009,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) "npE" = ( @@ -56169,7 +56362,6 @@ "nHf" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ - dir = 10; layer = 3.1 }, /turf/open/space/basic, @@ -57972,13 +58164,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"odD" = ( -/obj/structure/cable, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/east, -/turf/open/floor/iron, -/area/station/engineering/main) "odI" = ( /obj/effect/landmark/start/hangover, /obj/structure/table/wood/poker, @@ -58708,6 +58893,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, /turf/open/floor/iron/checker, /area/station/service/janitor) "omW" = ( @@ -61093,19 +61279,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"oVo" = ( -/obj/structure/cable, -/obj/structure/sign/warning/no_smoking/circle{ - pixel_x = 28; - pixel_y = -28 - }, -/obj/machinery/modular_computer/console/preset/engineering{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "oVp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61787,6 +61960,8 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/landmark/navigate_destination/atmos, +/obj/effect/landmark/navigate_destination/engineering, /turf/open/floor/iron, /area/station/engineering/lobby) "peK" = ( @@ -62291,12 +62466,6 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/carpet/green, /area/station/commons/lounge) -"pky" = ( -/obj/structure/cable, -/obj/machinery/power/smes/engineering, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/circuit/green, -/area/station/engineering/main) "pkA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62367,12 +62536,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"pll" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/port) "pln" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -63280,12 +63443,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/fore) -"pyh" = ( -/obj/structure/chair/office, -/obj/structure/sign/poster/random/directional/north, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "pyq" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -64260,6 +64417,20 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"pJm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/requests_console/directional/south{ + assistance_requestable = 1; + department = "Engineering"; + name = "Engineering Requests Console"; + supplies_requestable = 1 + }, +/obj/structure/sign/poster/official/do_not_question{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron, +/area/station/engineering/main) "pJo" = ( /obj/structure/cable, /obj/machinery/computer/security/telescreen{ @@ -64957,6 +65128,12 @@ }, /turf/open/floor/wood, /area/station/service/electronic_marketing_den) +"pQU" = ( +/obj/machinery/light/directional/south, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "pRk" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line{ @@ -65039,6 +65216,7 @@ name = "Auxiliary Construction Zone" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, +/obj/effect/landmark/navigate_destination/common/auxbaseconst, /turf/open/floor/iron, /area/station/construction/mining/aux_base) "pSr" = ( @@ -65298,6 +65476,7 @@ /obj/machinery/door/airlock/mining/glass{ name = "Bitrunning Den" }, +/obj/effect/landmark/navigate_destination/common/bitrunner, /turf/open/floor/iron/dark/textured_large, /area/station/bitrunning/den) "pUw" = ( @@ -66536,6 +66715,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/unres, +/obj/effect/landmark/navigate_destination/med, /turf/open/floor/iron, /area/station/medical/medbay/lobby) "qkf" = ( @@ -67144,15 +67324,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"qsv" = ( -/obj/machinery/light/directional/south, -/obj/machinery/computer/station_alert{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "qsw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -68025,7 +68196,6 @@ name = "Vault Door" }, /obj/structure/sign/warning/secure_area/directional/north, -/obj/effect/landmark/navigate_destination, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -68059,6 +68229,23 @@ }, /turf/open/floor/iron, /area/station/medical/virology) +"qDX" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/sign/warning/electric_shock/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "qDZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -68409,6 +68596,21 @@ }, /turf/open/floor/iron, /area/station/cargo/office) +"qIc" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Departures Lounge" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/obj/effect/landmark/navigate_destination/dockesc, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "qIf" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/mapping_helpers/broken_floor, @@ -70154,6 +70356,11 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"rgn" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/maintenance/port) "rgA" = ( /obj/structure/chair, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -70716,7 +70923,6 @@ /obj/item/radio/intercom/directional/south, /obj/structure/table/glass, /obj/item/food/grown/poppy/geranium, -/obj/machinery/infuser, /turf/open/floor/iron, /area/station/service/hydroponics) "rlQ" = ( @@ -72332,6 +72538,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/landmark/navigate_destination/delta/abandkitchen, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) "rIn" = ( @@ -73061,6 +73268,7 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/delta/abandsci, /turf/open/floor/iron, /area/station/science/research/abandoned) "rQp" = ( @@ -73289,14 +73497,6 @@ /obj/effect/spawner/random/trash/soap, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) -"rSG" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "rSJ" = ( /obj/machinery/telecomms/server/presets/engineering, /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ @@ -74211,6 +74411,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/landmark/navigate_destination/dockaux, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "seP" = ( @@ -75186,14 +75387,12 @@ /turf/open/floor/iron, /area/station/security/warden) "sst" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 8 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, /obj/effect/turf_decal/tile/yellow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "ssy" = ( @@ -75685,7 +75884,6 @@ /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, /obj/structure/cable, /obj/machinery/duct, /turf/open/floor/iron, @@ -76740,7 +76938,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, -/obj/effect/landmark/navigate_destination, +/obj/effect/landmark/navigate_destination/common/theatrebackstage, /turf/open/floor/iron, /area/station/service/theater) "sLc" = ( @@ -79600,7 +79798,6 @@ /obj/machinery/door/airlock/command/glass{ name = "Bridge Access" }, -/obj/effect/landmark/navigate_destination, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "bridge-right" @@ -79612,6 +79809,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark, /area/station/command/bridge) "tvG" = ( @@ -79864,12 +80062,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/security/range) -"tAh" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "tAj" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/newscaster/directional/east, @@ -80137,20 +80329,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"tCS" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "tCW" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -80378,6 +80556,16 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/fore) +"tFs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "tFG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -81197,6 +81385,13 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"tPd" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/maintenance/port) "tPk" = ( /obj/structure/lattice/catwalk, /obj/effect/landmark/generic_maintenance_landmark, @@ -82019,21 +82214,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"tZa" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/requests_console/directional/south{ - assistance_requestable = 1; - department = "Engineering"; - name = "Engineering Requests Console"; - supplies_requestable = 1 - }, -/obj/structure/sign/poster/official/do_not_question{ - pixel_x = 32 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/engineering/main) "tZi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82926,13 +83106,13 @@ name = "E.V.A. Storage" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/command/eva, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/eva, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "ukn" = ( @@ -83480,6 +83660,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/obj/effect/landmark/navigate_destination/delta/abandgambling, /turf/open/floor/iron, /area/station/service/abandoned_gambling_den) "urV" = ( @@ -87522,10 +87703,6 @@ /turf/open/floor/iron/grimy, /area/station/service/library/lounge) "vrs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -87545,6 +87722,13 @@ /obj/item/taperecorder, /turf/open/floor/iron/dark, /area/station/security/office) +"vrF" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/structure/steam_vent, +/turf/open/floor/iron, +/area/station/maintenance/port) "vrJ" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -87911,6 +88095,17 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"vvU" = ( +/obj/structure/sign/warning/no_smoking/circle{ + pixel_x = 28; + pixel_y = -28 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/station_alert{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "vwa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -88601,25 +88796,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"vDj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/line, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -8; - pixel_y = 17 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/holopad, -/turf/open/floor/iron/dark/textured_large, -/area/station/bitrunning/den) "vDm" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -89579,11 +89755,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/security/prison/garden) -"vRy" = ( -/obj/structure/table, -/obj/effect/spawner/random/entertainment/cigarette_pack, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "vRB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -90030,6 +90201,7 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark, /area/station/command/bridge) "vXQ" = ( @@ -90752,6 +90924,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/effect/landmark/navigate_destination/tcomms, /turf/open/floor/iron, /area/station/hallway/secondary/command) "wgc" = ( @@ -91757,12 +91930,6 @@ /obj/machinery/iv_drip, /turf/open/floor/iron, /area/station/medical/virology) -"wpW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/port) "wqk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -92474,6 +92641,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wxF" = ( +/obj/structure/chair/office, +/obj/structure/sign/poster/random/directional/north, +/turf/open/floor/carpet/black, +/area/station/maintenance/port) "wxI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -92662,7 +92834,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/medical/medbay) "wzT" = ( @@ -95144,6 +95315,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/effect/landmark/navigate_destination/delta/abandmarketbay, /turf/open/floor/iron, /area/station/service/electronic_marketing_den) "xhV" = ( @@ -96506,7 +96678,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination, +/obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron, /area/station/medical/chemistry) "xzQ" = ( @@ -96864,6 +97036,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/landmark/event_spawn, +/obj/effect/landmark/navigate_destination/chapel, /turf/open/floor/iron/grimy, /area/station/service/chapel) "xEE" = ( @@ -97756,6 +97929,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/supply/vault, +/obj/effect/landmark/navigate_destination/vault, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "xPz" = ( @@ -98675,7 +98849,6 @@ dir = 4 }, /obj/structure/railing{ - dir = 10; layer = 3.1 }, /turf/open/space/basic, @@ -99181,12 +99354,6 @@ /obj/item/hand_labeler, /turf/open/floor/plating, /area/station/maintenance/port) -"yix" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/maintenance/port) "yiA" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red{ @@ -99265,11 +99432,6 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/iron/dark/smooth_large, /area/station/science/genetics) -"yjV" = ( -/obj/structure/chair/office, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/black, -/area/station/maintenance/port) "ykb" = ( /obj/structure/table, /obj/item/storage/bag/plants/portaseeder, @@ -99432,6 +99594,15 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"ylS" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/vending/wardrobe/engi_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/engineering/main) "ylT" = ( /obj/machinery/newscaster/directional/west, /obj/effect/turf_decal/tile/brown{ @@ -119402,8 +119573,8 @@ tqa gnw lFQ mWF -jcg -jcg +mWF +mWF sst pgY gAw @@ -119661,7 +119832,7 @@ sHT glb dRK wcP -yeO +fXc nbZ gAw ifw @@ -125561,7 +125732,7 @@ gRE bEN ogj jaZ -eXN +ogj tqo grl iJU @@ -125818,7 +125989,7 @@ cui kpD vvH hcQ -dsj +eQJ rRD pgA hOa @@ -126074,8 +126245,8 @@ eOe bTN pWd geR -odD -tZa +ylS +pJm rRD adb odL @@ -126843,7 +127014,7 @@ slp aJu iSi mQF -qsv +jEo pTC lsf uGP @@ -127097,10 +127268,10 @@ rAH kdd gzF wGA -pky -tCS -gCn -oVo +aJu +tFs +hQO +vvU pTC goD sjH @@ -127354,10 +127525,10 @@ wGA wGA wGA wGA -pTC -pTC -pTC -gXx +gfQ +cCE +hWP +iqc pTC vcB eru @@ -127610,14 +127781,14 @@ emB hza ejp hza -quQ -vcB -lmJ -qVA -qAR -qev -yix -pps +pPy +fMn +bqF +qDX +hWc +pTC +lPK +fYe pTC qNN req @@ -127866,15 +128037,15 @@ uSR opq rrw fAX -tAh -crT -xhw -fBp -miM -uiM -rQi -qzu -cOt +uED +pPy +pTC +pTC +pTC +gXx +pTC +vrF +rgn pTC pFP pFP @@ -128124,14 +128295,14 @@ svI oEV sOM tFa -bPD -vcB -vcB -vcB -vcB +quQ vcB -qcM -cOt +lmJ +qVA +qAR +qev +azS +pps pTC jVS nED @@ -128381,14 +128552,14 @@ vBX dsy nps nps -vcB -vcB -dGQ -caW -bYR -vcB -jPf +crT +xhw +fBp +miM +uiM rQi +qzu +cOt pTC rnr lRx @@ -128638,12 +128809,12 @@ dGS slx uED fdJ +bPD +vcB +vcB +vcB +vcB vcB -qcM -ieM -iMH -gnW -ofk lhZ rQi pTC @@ -128896,14 +129067,14 @@ iCO uED ozx vcB -jtp -aqa -iPb -kCi +vcB +dGQ +caW +akI vcB lbX pgV -pll +jTw jTw lvI pxo @@ -129153,11 +129324,11 @@ iCO uED nXK vcB -pyh -hjP -eOF -awC -vcB +qcM +ieM +iMH +gnW +ofk qcM win vcB @@ -129410,10 +129581,10 @@ iCO axQ ilo vcB -yjV -gfX -rSG -qcM +jtp +lsj +iPb +kCi vcB jPf ant @@ -129667,10 +129838,10 @@ kAS uED nXK vcB -jtp -gXn -vRy -kCi +wxF +aqF +hIR +hYi vcB lbX pps @@ -129927,7 +130098,7 @@ rIU pSL nsH lbS -wpW +tPd vcB mYM iAM @@ -130181,7 +130352,7 @@ rRr uED nXK vcB -ltt +bcV hRs grA pTC @@ -143090,7 +143261,7 @@ arU dkL arU bDv -dgJ +qIc vaK vaK gFW @@ -143521,7 +143692,7 @@ pxS xMZ mlF qsF -jKY +mOT mdR lDY tpZ @@ -143777,8 +143948,8 @@ llj rer xMZ mDm -vDj -hXd +cnz +pQU mdR qmT tpZ @@ -144320,7 +144491,7 @@ dra omj epc omj -dra +dJY vtn mDw vwO @@ -145631,7 +145802,7 @@ wxv nHY nbd nHY -nbd +dEq lLJ nbd aBz @@ -149751,7 +149922,7 @@ pCY iOX pWX fWr -cbA +jrg hPu dHq pbu @@ -151776,7 +151947,7 @@ adM uHP dth fws -vHY +mmy rYA vHY hie @@ -154877,7 +155048,7 @@ mfC lsG mfC mfC -lsG +gOA mfC mfC fIQ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 8e2776eef326..2270243a2afc 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -497,17 +497,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron, /area/station/commons/dorms) -"akL" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/small/directional/west, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "akQ" = ( /obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/glass/reinforced/icemoon, @@ -4573,6 +4562,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/diagonal_edge, +/obj/effect/landmark/navigate_destination/kitchen, /turf/open/floor/iron/kitchen/diagonal, /area/station/service/kitchen) "bzB" = ( @@ -5043,6 +5033,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/sign/directions/cryo/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "bEH" = ( @@ -5863,6 +5854,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/landmark/navigate_destination/dockescpod1, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "bRz" = ( @@ -7051,7 +7043,6 @@ "cks" = ( /obj/item/wrench, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -7881,6 +7872,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"cyb" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/navigate_destination/icebox/maintsbar, +/turf/open/floor/wood, +/area/station/maintenance/port/aft) "cyh" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -8806,6 +8802,17 @@ /obj/structure/sign/poster/random/directional/south, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"cKR" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/light/small/directional/west, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/reagent_dispensers/fueltank/large, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "cLo" = ( /obj/machinery/recharge_station, /turf/open/floor/iron, @@ -9058,7 +9065,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/navigate_destination, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/textured, /area/station/service/hydroponics/garden) @@ -10447,6 +10453,8 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/landmark/navigate_destination/engineering, +/obj/effect/landmark/navigate_destination/atmos, /turf/open/floor/iron, /area/station/engineering/lobby) "djT" = ( @@ -11445,6 +11453,10 @@ dir = 5 }, /area/station/command/heads_quarters/rd) +"dAJ" = ( +/obj/effect/landmark/navigate_destination/bar, +/turf/open/openspace, +/area/station/service/bar/atrium) "dAO" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/turf_decal/siding/wood{ @@ -12158,6 +12170,10 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"dNb" = ( +/obj/structure/sign/directions/cryo/directional/west, +/turf/closed/wall, +/area/station/commons/storage/mining) "dNi" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/plating, @@ -14683,9 +14699,7 @@ /area/station/commons/fitness) "eDC" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "eDM" = ( @@ -14775,6 +14789,7 @@ cycle_id = "brigoutpost" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/landmark/navigate_destination/sec, /turf/open/floor/iron/dark/textured_edge{ dir = 8 }, @@ -18250,7 +18265,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, -/obj/effect/landmark/navigate_destination, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "fNp" = ( @@ -18269,6 +18283,7 @@ }, /area/station/engineering/engine_smes) "fNA" = ( +/obj/structure/sign/warning/bodysposal/directional/north, /turf/open/openspace, /area/station/medical/medbay/central) "fNK" = ( @@ -18904,7 +18919,6 @@ id_tag = "cargooffice"; name = "Cargo Office" }, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -18912,6 +18926,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/supply/general, /obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/effect/landmark/navigate_destination/cargo, /turf/open/floor/iron, /area/station/cargo/office) "gaq" = ( @@ -19082,7 +19097,6 @@ dir = 9 }, /obj/machinery/light/directional/north, -/obj/machinery/infuser, /obj/structure/table/glass, /turf/open/floor/iron/dark, /area/station/service/hydroponics) @@ -19751,16 +19765,6 @@ /obj/item/circuitboard/machine/chem_master, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"gmR" = ( -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/structure/reagent_dispensers/fueltank/large, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "gmW" = ( /turf/closed/wall, /area/station/commons/fitness) @@ -21094,6 +21098,10 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"gJR" = ( +/obj/structure/sign/directions/cryo/directional/north, +/turf/closed/wall, +/area/station/maintenance/central/lesser) "gJT" = ( /obj/structure/window/reinforced/spawner/directional/west, /turf/open/floor/iron/white/side{ @@ -21594,6 +21602,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /obj/effect/turf_decal/tile/yellow/full, +/obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron/large, /area/station/medical/treatment_center) "gTw" = ( @@ -22819,6 +22828,14 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"hpX" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/chapel, +/turf/open/floor/iron/sepia, +/area/station/service/library) "hqi" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -22881,6 +22898,11 @@ /obj/item/shovel/spade, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"hrG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/directions/cryo/directional/west, +/turf/open/floor/plating, +/area/station/hallway/primary/central) "hrJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -25893,6 +25915,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/detective, +/obj/effect/landmark/navigate_destination/det, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) "iry" = ( @@ -28122,6 +28145,7 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, +/obj/effect/landmark/navigate_destination/incinerator, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "jaS" = ( @@ -28979,6 +29003,10 @@ "jre" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) +"jrj" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) "jrk" = ( /obj/effect/spawner/random/structure/crate, /obj/effect/mapping_helpers/broken_floor, @@ -30327,8 +30355,8 @@ name = "Bridge" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron, /area/station/command/bridge) "jOj" = ( @@ -31250,6 +31278,7 @@ /area/station/science/ordnance/testlab) "kdF" = ( /obj/effect/spawner/random/vending/snackvend, +/obj/structure/sign/directions/cryo/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "kdJ" = ( @@ -31600,6 +31629,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"kit" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "kix" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Base" @@ -31962,14 +31995,6 @@ }, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) -"kpn" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "kpp" = ( /obj/structure/table/wood, /obj/item/storage/box/matches, @@ -33497,6 +33522,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/common/shitter, /turf/open/floor/iron/freezer, /area/station/commons/toilet) "kMF" = ( @@ -34947,8 +34973,8 @@ /obj/machinery/door/airlock/public/glass{ name = "Primary Tool Storage" }, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/tools, /turf/open/floor/iron/textured, /area/station/commons/storage/primary) "lka" = ( @@ -36426,13 +36452,13 @@ /obj/machinery/door/airlock/engineering{ name = "Telecommunications" }, -/obj/effect/landmark/navigate_destination, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/landmark/navigate_destination/tcomms, /turf/open/floor/iron, /area/station/tcommsat/computer) "lIK" = ( @@ -37032,6 +37058,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/tile/blue/full, +/obj/effect/landmark/navigate_destination/med, /turf/open/floor/iron/large, /area/station/medical/medbay/lobby) "lUw" = ( @@ -37440,6 +37467,7 @@ name = "Escape Pod Four" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/dockescpod3, /turf/open/floor/plating, /area/station/engineering/storage_shared) "mcl" = ( @@ -39898,6 +39926,7 @@ name = "Hydroponics" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, +/obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/textured_half{ dir = 1 }, @@ -40913,6 +40942,7 @@ name = "Unisex Showers" }, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/common/shitter, /turf/open/floor/iron/freezer, /area/station/commons/toilet) "nkO" = ( @@ -42344,7 +42374,6 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -43050,12 +43079,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"nOy" = ( -/obj/structure/sign/directions/cryo/directional/south{ - pixel_y = 1 - }, -/turf/closed/wall, -/area/station/service/hydroponics/garden) "nOB" = ( /obj/structure/railing{ dir = 4 @@ -43527,6 +43550,10 @@ dir = 1 }, /area/station/service/hydroponics) +"nVA" = ( +/obj/structure/sign/directions/cryo/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "nVB" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 @@ -43620,10 +43647,6 @@ /area/station/security/prison/safe) "nXl" = ( /obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nXn" = ( @@ -44289,6 +44312,7 @@ /obj/structure/disposalpipe/junction/flip{ dir = 8 }, +/obj/effect/landmark/navigate_destination/common/vaccommissary, /turf/open/floor/iron/dark, /area/station/commons/vacant_room/commissary) "oiO" = ( @@ -47550,6 +47574,14 @@ /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"pkv" = ( +/obj/machinery/light_switch/directional/west, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "pkM" = ( /obj/machinery/light/directional/south, /obj/effect/landmark/start/hangover, @@ -47638,19 +47670,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/security/holding_cell) -"pmQ" = ( -/obj/machinery/light_switch/directional/west, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "pna" = ( /obj/machinery/door/poddoor/preopen{ id = "Engineering"; @@ -48157,6 +48176,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/court, /turf/open/floor/iron/dark, /area/station/security/courtroom) "pvB" = ( @@ -48699,6 +48719,7 @@ name = "Escape Pod Three"; space_dir = 1 }, +/obj/effect/landmark/navigate_destination/dockescpod4, /turf/open/floor/iron/dark/textured, /area/station/security/processing) "pDI" = ( @@ -50088,6 +50109,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple/half, +/obj/effect/landmark/navigate_destination/research, /turf/open/floor/iron/half, /area/station/hallway/primary/starboard) "qaF" = ( @@ -50647,6 +50669,16 @@ /obj/structure/closet/crate, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) +"qlX" = ( +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "qmi" = ( /turf/open/floor/iron, /area/station/cargo/lobby) @@ -51841,9 +51873,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, -/obj/effect/landmark/navigate_destination, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, /turf/open/floor/iron, /area/station/service/janitor) "qGe" = ( @@ -52093,6 +52125,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/effect/landmark/navigate_destination/common/bitrunner, /turf/open/floor/iron, /area/station/bitrunning/den) "qKq" = ( @@ -53990,6 +54023,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/science/xenobiology) +"roD" = ( +/obj/structure/sign/directions/cryo/directional/west, +/turf/closed/wall, +/area/station/commons/toilet) "roH" = ( /obj/structure/chair/pew/right, /turf/open/floor/wood, @@ -54084,13 +54121,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"rqF" = ( -/obj/machinery/door/poddoor{ - id = "Secure Storage"; - name = "Secure Storage" - }, -/turf/open/floor/plating, -/area/station/engineering/engine_smes) "rqH" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/leather, @@ -54656,6 +54686,7 @@ /area/icemoon/surface/outdoors/nospawn) "rzS" = ( /obj/structure/sign/departments/chemistry/pharmacy/directional/west, +/obj/structure/sign/warning/bodysposal/directional/south, /turf/open/openspace, /area/station/medical/medbay/lobby) "rAr" = ( @@ -55275,11 +55306,11 @@ /obj/machinery/door/airlock/public/glass{ name = "Dormitory" }, -/obj/effect/landmark/navigate_destination, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/effect/landmark/navigate_destination/common/dorms, /turf/open/floor/iron, /area/station/commons/dorms) "rKQ" = ( @@ -55785,6 +55816,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/landmark/navigate_destination/dockescpod2, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "rTO" = ( @@ -56474,6 +56506,10 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/engine, /area/station/engineering/supermatter) +"seS" = ( +/obj/structure/sign/directions/cryo/directional/north, +/turf/closed/wall/r_wall, +/area/station/maintenance/central/greater) "seX" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -57142,6 +57178,24 @@ "sqt" = ( /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"sqv" = ( +/obj/machinery/door/poddoor{ + id = "Secure Storage"; + name = "Secure Storage" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/engineering/engine_smes) +"sqL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "sqN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -58186,10 +58240,6 @@ /area/mine/living_quarters) "sGJ" = ( /obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -58502,6 +58552,7 @@ id_tag = "FitnessShower"; name = "Cryogenic Storage" }, +/obj/effect/landmark/navigate_destination/common/cryogenics, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "sMY" = ( @@ -58562,6 +58613,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron, /area/station/command/bridge) "sOl" = ( @@ -58945,6 +58997,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"sVa" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/engineering/engine_smes) "sVf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62266,6 +62324,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/effect/landmark/navigate_destination/aiupload, /turf/open/floor/iron/dark/textured_large, /area/station/ai_monitored/turret_protected/ai_upload) "uan" = ( @@ -64307,9 +64366,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/medical/central) "uIV" = ( -/obj/machinery/meter, /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "uJn" = ( @@ -64329,10 +64386,6 @@ "uJt" = ( /turf/open/floor/carpet, /area/station/service/chapel) -"uJO" = ( -/obj/machinery/porta_turret/aux_base, -/turf/closed/wall/r_wall, -/area/station/security/lockers) "uJX" = ( /obj/structure/closet/firecloset, /obj/item/radio/intercom/directional/north, @@ -64848,6 +64901,13 @@ dir = 1 }, /area/station/engineering/main) +"uSM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/security/prison/safe) "uTc" = ( /obj/machinery/chem_heater/withbuffer, /obj/structure/window/reinforced/spawner/directional/north{ @@ -65714,6 +65774,17 @@ dir = 6 }, /area/station/science/research) +"vij" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Chapel" + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/chapel, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit/departure_lounge) "vip" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67247,11 +67318,11 @@ name = "Vault" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/supply/vault, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/landmark/navigate_destination/vault, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "vGJ" = ( @@ -69757,6 +69828,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, +/obj/effect/landmark/navigate_destination/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) "wxg" = ( @@ -71946,7 +72018,6 @@ /obj/machinery/door/airlock/research{ name = "Research Division Access" }, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/firedoor, @@ -72214,6 +72285,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/disposals, /turf/open/floor/plating, /area/station/maintenance/disposal) "xit" = ( @@ -72775,10 +72847,10 @@ name = "Tech Storage" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/effect/landmark/navigate_destination/techstorage, /turf/open/floor/plating, /area/station/engineering/storage/tech) "xsD" = ( @@ -74056,6 +74128,10 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/security/prison/visit) +"xMC" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/engineering/engine_smes) "xMI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -74823,12 +74899,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/ai_monitored/command/storage/eva) -"yaG" = ( -/obj/effect/landmark/navigate_destination/chapel, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/hallway/primary/starboard) "yaJ" = ( /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 4 @@ -170915,7 +170985,7 @@ wRa vVH nRO ulz -ulz +uSM ulz pNm eOz @@ -221835,7 +221905,7 @@ kMu esB oCO xJv -fsv +nVA fsv nDk fsv @@ -222092,7 +222162,7 @@ slv rEN oCO oCO -nOy +oCO aPI iKR aPI @@ -227021,7 +227091,7 @@ bln ptf qOl ace -ybu +cyb thW pRj uhP @@ -227779,8 +227849,8 @@ gjP ajw ajw aKb -pmQ -kpn +pkv +kit uAS ehu tFP @@ -231298,7 +231368,7 @@ tGr tGr tGr tGr -uJO +bDu bDu bDu bDu @@ -231880,7 +231950,7 @@ gfb gfb pYB gfb -gfb +seS nqU rcE rcE @@ -232691,7 +232761,7 @@ xYI mNY oXX mNY -hpd +jrj hpd hpd wkw @@ -232948,9 +233018,9 @@ csT mNY kCn mNY -yaL -rqF -rqF +xMC +sqv +sqv yaL yaL yaL @@ -233205,8 +233275,8 @@ kYq mNY kCn mNY -akL -tvF +cKR +sVa tvF izF gTK @@ -233462,8 +233532,8 @@ wmM mNY kCn mNY -gmR -tMD +qlX +sqL rMG lui twt @@ -234171,7 +234241,7 @@ tgn itN nuX yfF -pAZ +hrG dnq kgD utR @@ -235999,7 +236069,7 @@ qQC qQC kta kta -kta +dNb tqQ iuv vyb @@ -239054,7 +239124,7 @@ uja uja uja hsB -uja +roD wJk iuv ezK @@ -239076,7 +239146,7 @@ lpM lpM log sIt -sIt +gJR sIt log mhQ @@ -242659,7 +242729,7 @@ mrF ptO jRA jRA -jRA +dAJ ixH fmD ptO @@ -251913,7 +251983,7 @@ hUD qnm btQ hUD -uum +hpX uum hUD hUD @@ -253459,7 +253529,7 @@ gEE fTX wjS bMY -yaG +emp cYE lso pHX @@ -254997,7 +255067,7 @@ qPL pRG mtN dFt -vHI +vij vHI dFt dFt diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index d19cbd5e49e6..1d51253a6d62 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -29517,6 +29517,9 @@ /obj/machinery/firealarm/directional/west, /obj/item/radio/intercom/directional/north, /obj/machinery/pdapainter/supply, +/obj/machinery/byteforge{ + pixel_y = 14 + }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) "jGt" = ( @@ -69161,7 +69164,6 @@ }, /obj/item/reagent_containers/spray/cleaner, /obj/effect/turf_decal/bot, -/obj/machinery/infuser, /turf/open/floor/iron, /area/station/service/hydroponics) "wGD" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5d3a454518ed..7182dcf69a6f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3105,6 +3105,7 @@ cycle_id = "bridge-right" }, /obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark, /area/station/command/bridge) "bdb" = ( @@ -3420,6 +3421,7 @@ "biA" = ( /obj/machinery/holopad, /obj/effect/turf_decal/delivery, +/obj/effect/landmark/navigate_destination/dockesc, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "biI" = ( @@ -3434,19 +3436,6 @@ /obj/item/reagent_containers/cup/rag, /turf/open/floor/iron/white, /area/station/medical/abandoned) -"bje" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, -/obj/effect/decal/cleanable/oil/streak, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "bjB" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -4027,7 +4016,6 @@ name = "Dormitories" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4989,6 +4977,7 @@ /obj/structure/disposalpipe/sorting/mail/flip{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, /turf/open/floor/plating, /area/station/maintenance/port/fore) "bMY" = ( @@ -5262,12 +5251,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/medical/storage) -"bSY" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "bTj" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -5709,10 +5692,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"ceD" = ( -/obj/structure/table, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "ceF" = ( /obj/machinery/blackbox_recorder, /turf/open/floor/circuit/telecomms/mainframe, @@ -6398,6 +6377,8 @@ }, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, +/obj/effect/landmark/navigate_destination/atmos, +/obj/effect/landmark/navigate_destination/engineering, /turf/open/floor/iron, /area/station/engineering/break_room) "csz" = ( @@ -6574,7 +6555,6 @@ name = "Locker Room" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/commons/locker) "cvO" = ( @@ -6971,6 +6951,7 @@ /area/station/engineering/supermatter/room) "cBw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/common/shitter, /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "cBy" = ( @@ -7410,10 +7391,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"cML" = ( -/obj/structure/cable, -/turf/closed/wall/r_wall, -/area/station/maintenance/starboard/fore) "cMQ" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hopqueue"; @@ -7568,12 +7545,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"cPQ" = ( -/obj/structure/rack, -/obj/item/clothing/gloves/color/fyellow, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "cPT" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -9519,7 +9490,6 @@ /obj/machinery/door/airlock/external{ name = "Common Mining Dock" }, -/obj/effect/landmark/navigate_destination, /turf/open/floor/plating, /area/station/hallway/primary/port) "dEp" = ( @@ -9626,6 +9596,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/command/gateway, +/obj/effect/landmark/navigate_destination/gateway, /turf/open/floor/iron, /area/station/command/gateway) "dGv" = ( @@ -9680,16 +9651,6 @@ /obj/structure/sign/departments/telecomms/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"dHg" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/atmos_alert, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "dHG" = ( /obj/machinery/atmospherics/components/binary/crystallizer{ dir = 4 @@ -11725,16 +11686,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"erx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "erF" = ( /obj/structure/cable, /obj/machinery/door/airlock/virology/glass{ @@ -13783,7 +13734,6 @@ name = "MiniSat Access" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/door/poddoor/preopen{ id = "transitlockdown" @@ -13791,6 +13741,7 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, /obj/effect/mapping_helpers/airlock/access/any/command/general, /obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/landmark/navigate_destination/minisat_access_tcomms_ai, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) "fip" = ( @@ -15184,6 +15135,7 @@ cycle_id = "brig-entrance" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/landmark/navigate_destination/sec, /turf/open/floor/iron, /area/station/security/brig) "fMb" = ( @@ -15476,6 +15428,7 @@ /obj/structure/table, /obj/item/storage/crayons, /obj/effect/landmark/start/hangover, +/obj/effect/landmark/navigate_destination/common/dorms, /turf/open/floor/iron, /area/station/commons/dorms) "fRr" = ( @@ -15769,10 +15722,10 @@ "fXj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/railing/corner{ +/obj/structure/railing, +/obj/structure/railing{ dir = 8 }, -/obj/structure/railing/corner, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "fXm" = ( @@ -15788,6 +15741,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison) +"fYa" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "fYb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -16134,6 +16093,7 @@ /area/station/command/bridge) "gev" = ( /obj/effect/turf_decal/delivery, +/obj/effect/landmark/navigate_destination/common/vaccommissary, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "gey" = ( @@ -16610,6 +16570,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"gmR" = ( +/obj/machinery/firealarm/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/modular_computer/console/preset/engineering, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "gmS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -16954,7 +16921,7 @@ name = "Medbay Clinic" }, /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/effect/landmark/navigate_destination, +/obj/effect/landmark/navigate_destination/med, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "gtb" = ( @@ -17852,15 +17819,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/heads_quarters/captain/private) -"gLo" = ( -/obj/machinery/power/terminal, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/main) "gLy" = ( /obj/machinery/portable_atmospherics/pump/lil_pump, /obj/effect/turf_decal/siding/purple{ @@ -17950,15 +17908,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"gMG" = ( -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Power Monitoring" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/station_alert, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "gMO" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -19103,7 +19052,6 @@ /area/station/maintenance/starboard/aft) "hgE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, /obj/machinery/atmospherics/pipe/bridge_pipe/orange/hidden, /turf/open/floor/iron/stairs/right{ dir = 8 @@ -19588,6 +19536,15 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"hps" = ( +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Engineering - Power Monitoring" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "hpv" = ( /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -20975,6 +20932,16 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"hRA" = ( +/obj/structure/sign/warning/electric_shock{ + pixel_x = -31 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/engineering/main) "hRD" = ( /obj/structure/chair/office{ dir = 4 @@ -21552,6 +21519,7 @@ location = "15-Court" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/court, /turf/open/floor/iron/dark, /area/station/security/courtroom) "ibc" = ( @@ -22215,6 +22183,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"imV" = ( +/obj/structure/easel, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "inp" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -23213,15 +23185,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/main) -"iBp" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Departure Lounge Airlock" - }, -/obj/effect/landmark/navigate_destination, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "iBq" = ( /turf/closed/wall/r_wall, /area/station/maintenance/fore/lesser) @@ -23268,7 +23231,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/supply/vault, @@ -23577,6 +23539,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/medical) +"iIC" = ( +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/station_alert, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iIP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24416,6 +24388,13 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"iSq" = ( +/obj/machinery/light_switch/directional/west, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "iSI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -25377,6 +25356,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"jjU" = ( +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/computer/atmos_alert, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "jkj" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -26785,6 +26774,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"jJh" = ( +/obj/effect/landmark/navigate_destination/common/holodeck, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) "jJi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26846,6 +26841,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/landmark/navigate_destination/dockescpod4, /turf/open/floor/iron, /area/station/security/execution/transfer) "jKz" = ( @@ -29235,18 +29231,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/command/teleporter) -"kCq" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, -/obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/modular_computer/console/preset/engineering, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "kCC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -29482,17 +29466,6 @@ /obj/effect/landmark/start/bitrunner, /turf/open/floor/iron/dark/textured_half, /area/station/bitrunning/den) -"kHU" = ( -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light_switch/directional/north, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/iron/dark/smooth_large, -/area/station/bitrunning/den) "kIG" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/two, @@ -29779,6 +29752,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/portquartersolar, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) "kOf" = ( @@ -30032,7 +30006,6 @@ dir = 4; layer = 4.1 }, -/obj/structure/railing, /turf/open/floor/iron, /area/station/engineering/atmos) "kRi" = ( @@ -30599,7 +30572,10 @@ /area/station/engineering/atmos/pumproom) "laI" = ( /obj/structure/railing{ - dir = 5 + dir = 1 + }, +/obj/structure/railing{ + dir = 4 }, /turf/open/floor/plating/airless, /area/space/nearstation) @@ -32852,6 +32828,15 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"lRG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "lRS" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, /obj/effect/spawner/structure/window/reinforced, @@ -33106,6 +33091,11 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"lVE" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "lVH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -34632,6 +34622,7 @@ /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 10 }, +/obj/effect/landmark/navigate_destination/dockescpod3, /turf/open/floor/plating, /area/station/maintenance/department/engine) "mzD" = ( @@ -35177,6 +35168,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/portbowsolar, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) "mIi" = ( @@ -38863,11 +38855,6 @@ /obj/effect/spawner/random/entertainment/deck, /turf/open/floor/wood, /area/station/maintenance/port/aft) -"nXT" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/easel, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "nYa" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -39348,13 +39335,6 @@ /obj/effect/spawner/random/engineering/flashlight, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"ofk" = ( -/obj/machinery/light_switch/directional/west, -/obj/machinery/power/smes/engineering, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "ofQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, @@ -40423,6 +40403,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/starboardbowsolar, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) "ozB" = ( @@ -40984,6 +40965,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/effect/landmark/navigate_destination/incinerator, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) "oKc" = ( @@ -41024,13 +41006,13 @@ }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/any/command/general, /obj/effect/mapping_helpers/airlock/access/any/command/minisat, /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms, +/obj/effect/landmark/navigate_destination/tcomms, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "oKI" = ( @@ -41088,6 +41070,13 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/hos) +"oMy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/navigate_destination/dockescpod1, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "oMA" = ( /turf/closed/wall/r_wall, /area/station/science/cytology) @@ -41263,6 +41252,11 @@ /obj/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"oQb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "oQc" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for the Auxiliary Mining Base."; @@ -42244,6 +42238,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"piQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light_switch/directional/north, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "piT" = ( /obj/structure/rack, /obj/item/reagent_containers/cup/bottle/epinephrine{ @@ -42268,6 +42270,7 @@ /turf/open/floor/plating, /area/station/service/chapel/funeral) "pjd" = ( +/obj/effect/landmark/navigate_destination/dockescpod2, /turf/open/floor/plating, /area/station/commons/fitness/recreation) "pjh" = ( @@ -42554,11 +42557,11 @@ name = "Detective's Office" }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/security/detective, +/obj/effect/landmark/navigate_destination/det, /turf/open/floor/iron, /area/station/security/detectives_office) "pqc" = ( @@ -42929,6 +42932,12 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) +"pvX" = ( +/obj/machinery/power/terminal, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/station/engineering/main) "pvY" = ( /obj/machinery/camera/directional/north{ c_tag = "Holodeck - Fore"; @@ -43059,6 +43068,7 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron/white, /area/station/medical/chemistry) "pyP" = ( @@ -43572,8 +43582,8 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/effect/mapping_helpers/airlock/access/any/command/eva, +/obj/effect/landmark/navigate_destination/eva, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "pIv" = ( @@ -44510,6 +44520,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"pZI" = ( +/obj/effect/landmark/navigate_destination/library, +/turf/open/floor/carpet, +/area/station/service/library) "pZQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45818,6 +45832,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/supply/vault, +/obj/effect/landmark/navigate_destination/vault, /turf/open/floor/iron/dark, /area/station/construction/storage_wing) "qyr" = ( @@ -47314,6 +47329,9 @@ req_access = list("atmospherics") }, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos) "qZa" = ( @@ -48271,6 +48289,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"rtu" = ( +/obj/structure/table, +/obj/effect/spawner/random/maintenance, +/obj/item/clothing/gloves/color/fyellow, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "rtG" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -48604,6 +48628,15 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ryc" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/power/terminal, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "ryf" = ( /obj/structure/bookcase/random/reference, /obj/effect/turf_decal/siding/wood{ @@ -48832,6 +48865,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/dockarrival, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "rCn" = ( @@ -49678,6 +49712,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, +/obj/effect/landmark/navigate_destination/aiupload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload_foyer) "rPF" = ( @@ -49836,6 +49871,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/transit_tube) +"rRY" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/engineering/main) "rRZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -51984,8 +52023,8 @@ dir = 4 }, /obj/structure/cable, -/obj/effect/landmark/navigate_destination, /obj/effect/mapping_helpers/airlock/access/any/command/hop, +/obj/effect/landmark/navigate_destination/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "sDS" = ( @@ -52634,7 +52673,6 @@ /area/station/science/cytology) "sRb" = ( /obj/structure/table, -/obj/machinery/infuser, /obj/item/book/manual/hydroponics_pod_people, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -53069,17 +53107,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"sXe" = ( -/obj/effect/landmark/start/station_engineer, -/obj/machinery/light/directional/west, -/obj/structure/sign/warning/electric_shock{ - pixel_x = -31 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/engineering/main) "sXq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -53313,6 +53340,7 @@ /obj/effect/turf_decal/bot, /obj/structure/sink/directional/west, /obj/structure/sign/poster/random/directional/south, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron, /area/station/service/hydroponics) "tck" = ( @@ -54817,14 +54845,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) -"tCG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/landmark/navigate_destination, -/turf/open/floor/iron, -/area/station/security/brig) "tCJ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -56409,6 +56429,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, +/obj/effect/landmark/navigate_destination/dockaux, /turf/open/floor/plating, /area/station/hallway/secondary/entry) "ugE" = ( @@ -56919,6 +56940,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, +/obj/effect/landmark/navigate_destination/common/auxbaseconst, /turf/open/floor/iron, /area/station/construction/mining/aux_base) "uqp" = ( @@ -58384,7 +58406,6 @@ /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 }, -/obj/structure/railing/corner, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 }, @@ -59818,13 +59839,13 @@ name = "Bridge Access" }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/landmark/navigate_destination, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "bridge-left" }, /obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark, /area/station/command/bridge) "vph" = ( @@ -60196,6 +60217,7 @@ id_tag = "FitnessShower"; name = "Cryogenic Storage" }, +/obj/effect/landmark/navigate_destination/common/cryogenics, /turf/open/floor/iron/freezer, /area/station/commons/fitness/recreation) "vwP" = ( @@ -60612,6 +60634,13 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"vEF" = ( +/obj/effect/landmark/start/station_engineer, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/main) "vEH" = ( /obj/machinery/door/window/right/directional/east{ name = "Danger: Conveyor Access"; @@ -60937,11 +60966,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/drone_bay) -"vKm" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hazardvest, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "vKt" = ( /obj/structure/table/wood/fancy/royalblue, /obj/structure/sign/painting/library_secure{ @@ -61152,10 +61176,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing, /obj/structure/railing{ dir = 8; layer = 4.1 @@ -62354,6 +62374,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +"wjV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/chapel, +/turf/open/floor/iron/dark, +/area/station/service/chapel) "wjW" = ( /obj/structure/table/wood, /obj/item/cigbutt/cigarbutt{ @@ -64528,6 +64554,13 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"wYy" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/research, +/turf/open/floor/iron/white, +/area/station/science/lobby) "wYB" = ( /turf/closed/wall, /area/station/hallway/secondary/service) @@ -64705,6 +64738,13 @@ /obj/effect/mapping_helpers/mail_sorting/service/bar, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"xcR" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "xdm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -65494,7 +65534,6 @@ name = "Private Study"; req_access = list("library") }, -/obj/effect/landmark/navigate_destination, /turf/open/floor/engine/cult, /area/station/service/library) "xrf" = ( @@ -66066,6 +66105,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/landmark/navigate_destination/common/starboardquartersolar, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/aft) "xBx" = ( @@ -67320,6 +67360,10 @@ /obj/structure/mirror/directional/west, /turf/open/floor/wood, /area/station/maintenance/port/aft) +"xZv" = ( +/obj/effect/spawner/random/loafer, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "xZx" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -67613,6 +67657,12 @@ }, /turf/open/floor/engine, /area/station/engineering/atmospherics_engine) +"yen" = ( +/obj/effect/decal/cleanable/oil/streak, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/dark/smooth_large, +/area/station/bitrunning/den) "yeq" = ( /obj/machinery/conveyor{ dir = 1; @@ -77626,7 +77676,7 @@ edl cSk auJ jMZ -sCZ +oMy lGL qHs lMJ @@ -84278,7 +84328,7 @@ aaa aaa aaa aaa -mWd +aaa aaa aaa lMJ @@ -85058,7 +85108,7 @@ dHa ugJ edP jXu -bje +yen pII ttG oBV @@ -85315,7 +85365,7 @@ cTQ xte mzs jXu -kHU +piQ boz pPV pPV @@ -88697,7 +88747,7 @@ rSk sVY bla cWr -ecO +pZI rFB tmB wcL @@ -90451,7 +90501,7 @@ aaa bxr jXu rOz -sHu +xZv siY jXu aaa @@ -91585,7 +91635,7 @@ hsN jJi phR phR -phR +wjV phR pwq fkT @@ -95186,7 +95236,7 @@ opk krc bVB ltx -iBp +sou hQu cSv qVo @@ -96624,7 +96674,7 @@ ahj jwg wIr cJj -erx +klp lsP vYF eaP @@ -97395,7 +97445,7 @@ lPl prY mLL jxV -tCG +pXC pHb qwh iQg @@ -98222,7 +98272,7 @@ ylQ bGC wHu igr -ibw +wYy ibw nIP gFQ @@ -106146,12 +106196,12 @@ eBn qXB fwG ldO -vKm -tbd -cPQ -nXT -wyG -qXB +oQb +psZ +mSB +psZ +edC +psZ psZ qXB ttA @@ -106397,19 +106447,19 @@ lCN kbo psZ psZ -bSY +xcR kbo kbo eqt psZ psZ ckX -psZ -mSB -edC -psZ -psZ -psZ +uXd +rRY +uXd +uXd +rRY +uXd qXB gAU kQD @@ -106661,12 +106711,12 @@ tCS tCS tCS tCS -tCS -cML -tCS -tCS -cML -tCS +uXd +gmR +hRA +ryc +iSq +uXd tCS sqE sqE @@ -106919,10 +106969,10 @@ tfg ssI ssI uXd -kCq -sXe -gLo -ofk +jjU +vEF +pvX +fYa uXd fDL hSt @@ -107150,7 +107200,7 @@ pvY afD afD afD -afD +jJh afD afD afD @@ -107176,10 +107226,10 @@ tfg ssI mBw uXd -dHg +iIC gLK qul -acs +fYa uXd tKS nLz @@ -107417,7 +107467,7 @@ qXB dOx jCw jCw -jCw +lVE qXB lOK jcy @@ -107433,7 +107483,7 @@ bYp gXu oaC uXd -gMG +hps dWG uGm acs @@ -107931,10 +107981,10 @@ qXB oPZ wha jRz -ceD +rtu qXB cgL -wrn +imV tCS mHe wYx @@ -108190,7 +108240,7 @@ qXB qXB qXB qXB -igz +lRG tCS tCS cnK diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 0217356bd591..0da7b68198dd 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -531,14 +531,6 @@ /obj/structure/cable, /turf/open/floor/wood/tile, /area/station/service/library) -"agt" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/fore) "agv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -808,12 +800,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/dark, /area/station/hallway/floor3/aft) -"akh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/wood/tile, -/area/station/service/library) "aki" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -1125,12 +1111,6 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/medical) -"anW" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/wood/tile, -/area/station/service/library) "aof" = ( /obj/machinery/suit_storage_unit/radsuit, /obj/machinery/light/small/directional/west, @@ -1351,15 +1331,6 @@ dir = 1 }, /area/station/cargo/sorting) -"aqR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/aft) "aqU" = ( /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt/dust, @@ -1369,9 +1340,6 @@ /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -1529,14 +1497,6 @@ "asS" = ( /turf/open/floor/bamboo/tatami/black, /area/station/commons/storage/art) -"asU" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port) "asV" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/heavy, @@ -1547,19 +1507,7 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen) -"ata" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard/aft) "ate" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/purple/corner{ dir = 4 }, @@ -2650,7 +2598,7 @@ /area/station/maintenance/floor1/port/fore) "aGK" = ( /obj/structure/railing{ - dir = 9 + dir = 1 }, /obj/structure/chair/comfy/brown, /obj/machinery/door/firedoor/border_only{ @@ -3818,9 +3766,6 @@ /area/station/hallway/floor2/aft) "aWd" = ( /obj/effect/landmark/event_spawn, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 }, @@ -3918,7 +3863,6 @@ /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 9 }, -/obj/structure/railing/corner, /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/dark/textured, /area/station/medical/virology/isolation) @@ -4182,15 +4126,6 @@ }, /turf/open/floor/bamboo/tatami/black, /area/station/commons/storage/art) -"aZI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard/aft) "aZN" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -4210,21 +4145,6 @@ "aZW" = ( /turf/open/floor/pod/dark, /area/station/maintenance/floor1/port/aft) -"baa" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood/tile, -/area/station/service/library) "bad" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4450,7 +4370,6 @@ /turf/open/floor/iron/dark/side, /area/station/cargo/lobby) "bdx" = ( -/obj/structure/railing/corner, /obj/structure/chair/stool/bar/directional/east, /obj/structure/disposalpipe/segment{ dir = 9 @@ -4716,16 +4635,6 @@ /obj/structure/reflector/double, /turf/open/floor/plating/airless, /area/space/nearstation) -"bhb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/aft) "bhj" = ( /obj/effect/turf_decal/siding/white{ dir = 8 @@ -5157,12 +5066,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, /area/space/nearstation) -"blq" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/structure/hedge, -/obj/structure/window/reinforced/spawner/directional/west, -/turf/open/floor/grass, -/area/station/service/chapel) "blt" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/directional/west, @@ -5217,7 +5120,6 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "blO" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/green/corner, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -6253,6 +6155,12 @@ /obj/structure/girder, /turf/open/floor/plating, /area/station/maintenance/floor1/port/aft) +"bxc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/floor4/port/fore) "bxd" = ( /obj/structure/table, /obj/machinery/airalarm/directional/north, @@ -6585,9 +6493,6 @@ /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 5 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/dark/textured, /area/station/medical/virology/isolation) "bAu" = ( @@ -6772,9 +6677,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "bDr" = ( @@ -6790,11 +6692,9 @@ /turf/closed/wall/r_wall, /area/station/security/checkpoint) "bDO" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 4 - }, /obj/machinery/status_display/evac/directional/north, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bDU" = ( @@ -6963,6 +6863,16 @@ }, /turf/open/openspace, /area/station/maintenance/floor4/port/aft) +"bGM" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/pod, +/area/station/maintenance/floor4/port/aft) "bGP" = ( /obj/machinery/vending/cigarette, /obj/machinery/camera/autoname/directional/west, @@ -7014,21 +6924,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/maintenance/floor2/port) -"bIk" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/wood/tile, -/area/station/service/library) "bIl" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -7135,16 +7030,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/medical/abandoned) -"bJN" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/pod/light, -/area/station/maintenance/floor4/starboard/fore) "bJQ" = ( /obj/structure/railing/corner{ dir = 1 @@ -7829,12 +7714,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) -"bSj" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/wood/tile, -/area/station/service/library) "bSq" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 6 @@ -8391,16 +8270,11 @@ }, /area/station/hallway/floor2/aft) "caN" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, /obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/oil/streak, -/obj/effect/landmark/bitrunning/station_reward_spawn, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) "caQ" = ( @@ -11318,12 +11192,12 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/floor2/aft) "cPQ" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 5 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/water/jungle{ desc = "Filthy."; name = "untreated water"; @@ -11592,7 +11466,7 @@ "cTs" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/cable, -/turf/open/openspace, +/turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/port/aft) "cTw" = ( /obj/structure/table/reinforced, @@ -11613,9 +11487,6 @@ /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) "cTJ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/green/warning{ dir = 10 }, @@ -11921,9 +11792,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/railing/corner{ dir = 8 }, @@ -12490,15 +12358,6 @@ /obj/machinery/status_display/ai/directional/west, /turf/open/openspace, /area/station/ai_monitored/turret_protected/aisat/hallway) -"dfA" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard) "dfD" = ( /obj/structure/disposalpipe/trunk/multiz/down, /turf/open/floor/plating/foam, @@ -12510,9 +12369,6 @@ /turf/open/floor/iron/checker, /area/station/commons/locker) "dfY" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -12758,15 +12614,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/command/bridge) -"djX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/starboard/fore) "dke" = ( /obj/machinery/door/window/left/directional/south, /obj/machinery/door/window/left/directional/north, @@ -12798,12 +12645,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/supply/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"dkn" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/space/openspace, -/area/space) "dks" = ( /obj/structure/girder, /obj/item/stack/sheet/iron, @@ -13324,9 +13165,6 @@ /turf/open/floor/iron, /area/station/cargo/miningdock) "dso" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13852,9 +13690,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor4/port/fore) "dAk" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, @@ -14039,9 +13874,6 @@ /area/station/command/bridge) "dDF" = ( /obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 5 }, @@ -14310,12 +14142,13 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "dHd" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/airalarm/directional/north, /obj/machinery/status_display/ai/directional/east, /obj/structure/cable, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/textured_large, +/obj/machinery/power/terminal{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/iron, /area/station/engineering/engine_smes) "dHf" = ( /turf/open/floor/catwalk_floor/iron, @@ -14352,9 +14185,6 @@ /obj/effect/turf_decal/trimline/green/filled/arrow_cw{ dir = 10 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/light/cold/no_nightlight/directional/west, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/dark/textured, @@ -14430,13 +14260,6 @@ }, /turf/open/floor/iron/grimy, /area/station/science/xenobiology/hallway) -"dIO" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/fore) "dIQ" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -15344,7 +15167,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/aft) "dUU" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/green/warning{ dir = 9 }, @@ -16915,9 +16737,6 @@ "eoo" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -17152,9 +16971,6 @@ /area/station/tcommsat/server) "esu" = ( /obj/effect/turf_decal/trimline/green/filled/arrow_cw, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/dark/textured, /area/station/medical/virology/isolation) "esw" = ( @@ -17256,9 +17072,6 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/floor3/fore) "eud" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -17470,21 +17283,6 @@ }, /turf/open/floor/carpet/royalblack, /area/station/service/theater) -"ewH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "ewM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output, /obj/effect/turf_decal/trimline/red/line, @@ -18013,9 +17811,6 @@ /area/station/medical/psychology) "eGr" = ( /obj/effect/turf_decal/tile/green/full, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -18226,6 +18021,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/port) "eJs" = ( @@ -18235,6 +18033,12 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/hallway/floor3/fore) +"eJA" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "eJF" = ( /obj/machinery/airalarm/directional/south, /obj/item/kirbyplants/random, @@ -18417,7 +18221,6 @@ /area/station/commons/toilet) "eMj" = ( /obj/effect/turf_decal/tile/green/full, -/obj/machinery/infuser, /obj/structure/table, /turf/open/floor/iron, /area/station/service/hydroponics) @@ -19094,9 +18897,6 @@ /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) "eYp" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/green/warning{ dir = 6 }, @@ -19734,13 +19534,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/side, /area/station/hallway/floor1/fore) -"fio" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood/tile, -/area/station/service/library) "fiu" = ( /obj/machinery/light/directional/west, /turf/open/floor/carpet/red, @@ -20234,14 +20027,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard) -"foB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port/aft) "foF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20987,9 +20772,6 @@ /turf/open/floor/iron, /area/station/engineering/lobby) "fzG" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/green/warning{ dir = 4 }, @@ -21008,9 +20790,6 @@ /turf/open/floor/wood/tile, /area/station/command/heads_quarters/captain/private) "fzV" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/chair{ dir = 8 }, @@ -21071,15 +20850,6 @@ }, /turf/open/floor/iron, /area/station/hallway/floor3/aft) -"fAU" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/fore) "fBa" = ( /obj/structure/railing{ dir = 4 @@ -21912,13 +21682,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard) -"fLX" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "fMa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23310,15 +23073,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/plating/airless, /area/space/nearstation) -"geL" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "geW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23773,7 +23527,7 @@ "glN" = ( /obj/effect/mapping_helpers/airlock/access/any/security/armory, /obj/machinery/door/airlock/security/glass{ - name = "Armoury" + name = "Armory" }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23826,12 +23580,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"gmA" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor4/starboard/fore) "gmC" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{ dir = 4 @@ -23880,12 +23628,6 @@ /obj/effect/turf_decal/tile/green/full, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/storage/tech) -"gnj" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "gnm" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24626,9 +24368,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/aft) "gyp" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -24914,9 +24653,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/floor3/fore) "gCH" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -25492,16 +25228,6 @@ /obj/effect/spawner/random/structure/crate_abandoned, /turf/open/floor/pod/dark, /area/station/maintenance/floor1/port/aft) -"gKO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/aft) "gKQ" = ( /obj/structure/window/plasma/spawner, /obj/machinery/rnd/server/master, @@ -26468,15 +26194,6 @@ "gZu" = ( /turf/open/floor/iron/white, /area/station/science/lobby) -"gZG" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "gZJ" = ( /obj/structure/closet/secure_closet/captains, /obj/item/camera, @@ -26864,9 +26581,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) @@ -26995,18 +26709,6 @@ /obj/machinery/atmospherics/components/binary/pump, /turf/open/floor/plating, /area/station/maintenance/floor2/starboard/aft) -"hfE" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "hge" = ( /turf/open/floor/engine, /area/station/command/heads_quarters/rd) @@ -27535,9 +27237,6 @@ /obj/effect/turf_decal/stripes{ dir = 5 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/white, /area/station/science/ordnance/testlab) "hnK" = ( @@ -27602,18 +27301,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/floor1/fore) -"hoK" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port/fore) "hoU" = ( /obj/effect/spawner/random/contraband/landmine, /turf/open/floor/pod/dark, @@ -27735,7 +27422,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) "hqR" = ( -/obj/structure/railing/corner, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -28098,9 +27784,6 @@ /obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, @@ -28216,9 +27899,6 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/storage) "hxN" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -30596,9 +30276,6 @@ /obj/effect/turf_decal/arrows{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/wood/tile, /area/station/service/library/lounge) "igS" = ( @@ -30718,10 +30395,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor2/port) @@ -30777,13 +30450,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/light, /area/station/maintenance/floor1/port/fore) -"ijJ" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "ijL" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/textured_large, @@ -31359,13 +31025,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/eva) -"isk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/aft) "isl" = ( /obj/machinery/door/airlock/hatch{ name = "Shelter" @@ -32211,13 +31870,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/pod/light, /area/station/maintenance/floor4/port/fore) -"iEU" = ( -/obj/machinery/door/firedoor, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/pod/dark, -/area/station/maintenance/floor3/starboard) "iFn" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/effect/decal/cleanable/dirt, @@ -33011,9 +32663,6 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "iPV" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/green/warning{ dir = 1 }, @@ -33268,12 +32917,6 @@ }, /turf/open/floor/grass, /area/station/service/library/garden) -"iTJ" = ( -/obj/structure/railing/corner, -/obj/effect/spawner/random/structure/crate_abandoned, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/pod/light, -/area/station/maintenance/floor1/port) "iTM" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/tile/red/half{ @@ -33309,9 +32952,6 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark/side{ dir = 10 @@ -33600,15 +33240,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/science/auxlab) -"iYA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard) "iYE" = ( /obj/effect/turf_decal/trimline/brown/line{ dir = 4 @@ -33671,15 +33302,6 @@ dir = 8 }, /area/station/security/prison) -"iZi" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor4/port/aft) "iZA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/remains/human{ @@ -35891,15 +35513,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/maintenance/floor2/starboard/aft) -"jDL" = ( -/obj/effect/turf_decal/trimline/red/warning{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/pod/dark, -/area/station/hallway/secondary/entry) "jEc" = ( /obj/effect/mapping_helpers/airlock/access/any/supply/mining, /obj/structure/cable, @@ -36113,7 +35726,6 @@ /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port) "jFT" = ( -/obj/structure/railing/corner, /obj/effect/decal/cleanable/dirt, /obj/structure/grille, /turf/open/floor/pod/light, @@ -36802,7 +36414,6 @@ name = "Starboard Quarter Solars" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/construction, -/obj/structure/railing/corner, /turf/open/floor/pod/light, /area/station/maintenance/solars/starboard/aft) "jOX" = ( @@ -36874,9 +36485,6 @@ /turf/open/floor/iron/smooth, /area/station/cargo/office) "jPD" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/brown/filled/arrow_ccw{ dir = 4 }, @@ -36966,15 +36574,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) -"jQK" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "jQP" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/bottle/syrup_bottle/korta_nectar{ @@ -37404,7 +37003,6 @@ /turf/open/floor/iron, /area/station/cargo/storage) "jWR" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, @@ -37798,15 +37396,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/evidence) -"kcy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port) "kcA" = ( /obj/machinery/door/airlock/external, /obj/effect/mapping_helpers/airlock/access/any/engineering/external, @@ -38070,16 +37659,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) -"kgK" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood/tile, -/area/station/service/library) "kgT" = ( /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard) @@ -39258,6 +38837,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/textured_large, /area/station/cargo/storage) +"kwO" = ( +/obj/machinery/power/smes/engineering, +/turf/open/floor/iron, +/area/station/engineering/engine_smes) "kxf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39712,10 +39295,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/fore) -"kCk" = ( -/obj/structure/railing/corner, -/turf/open/floor/wood/tile, -/area/station/service/library) "kCm" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/holopad, @@ -39809,7 +39388,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor1/port/fore) "kEv" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/arrows, /turf/open/floor/wood/tile, /area/station/service/library) @@ -40288,9 +39866,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor1/starboard/fore) "kKk" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, @@ -40335,15 +39910,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/tile, /area/station/service/library) -"kKG" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard/aft) "kKJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/space_heater, @@ -40459,9 +40025,6 @@ /turf/open/floor/plating, /area/station/hallway/floor1/fore) "kLM" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -40704,15 +40267,6 @@ dir = 4 }, /area/station/hallway/floor4/aft) -"kQo" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard) "kQp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41025,16 +40579,6 @@ dir = 8 }, /area/station/service/chapel) -"kUe" = ( -/obj/structure/holosign/barrier/engineering, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/aft) "kUf" = ( /obj/effect/turf_decal/tile/blue/full, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42674,6 +42218,9 @@ dir = 10 }, /obj/structure/marker_beacon/burgundy, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) "lpe" = ( @@ -42901,9 +42448,6 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "lsm" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/green/warning{ dir = 10 }, @@ -43450,6 +42994,9 @@ dir = 6 }, /obj/structure/marker_beacon/burgundy, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) "lzA" = ( @@ -44267,15 +43814,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"lKh" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "lKj" = ( /obj/structure/closet/crate/solarpanel_small, /obj/structure/window/spawner/directional/west, @@ -44403,15 +43941,6 @@ /obj/structure/cable, /turf/open/floor/iron/white/smooth_corner, /area/station/commons/fitness/recreation) -"lMx" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/fore) "lMz" = ( /obj/effect/turf_decal/siding/thinplating_new{ dir = 8 @@ -44801,7 +44330,7 @@ /area/station/maintenance/floor2/port/aft) "lQt" = ( /obj/structure/railing{ - dir = 5 + dir = 1 }, /obj/structure/chair/comfy/brown, /obj/machinery/door/firedoor/border_only{ @@ -44892,9 +44421,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/door/firedoor/border_only, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor2/port) @@ -45790,14 +45316,6 @@ icon_state = "snow7" }, /area/station/hallway/floor2/fore) -"mdE" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/station/hallway/floor4/fore) "mdJ" = ( /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/yellow{ @@ -46287,7 +45805,7 @@ "mjP" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/cable, -/turf/open/openspace, +/turf/open/floor/catwalk_floor, /area/station/maintenance/floor3/port) "mjQ" = ( /obj/effect/turf_decal/tile/yellow, @@ -47251,10 +46769,6 @@ /turf/open/floor/iron/textured_large, /area/station/cargo/miningoffice) "mvg" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/machinery/camera{ c_tag = "Supermatter Foyer Cam #4"; network = list("ss13","engine") @@ -47586,7 +47100,7 @@ /area/station/maintenance/floor2/starboard/aft) "mzT" = ( /obj/structure/cable, -/turf/open/openspace, +/turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/port/aft) "mzW" = ( /obj/structure/cable, @@ -47762,10 +47276,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/port/aft) "mCQ" = ( @@ -48424,9 +47934,6 @@ /area/station/maintenance/floor1/port/aft) "mLk" = ( /obj/machinery/door/firedoor, -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/starboard) "mLm" = ( @@ -49221,9 +48728,6 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/exit/escape_pod) "mVp" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -49646,9 +49150,6 @@ /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -50210,9 +49711,6 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -50314,9 +49812,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor1/starboard/fore) "niA" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/trimline/green/corner{ dir = 4 }, @@ -50496,16 +49991,6 @@ /obj/structure/cable, /turf/open/floor/iron/solarpanel/airless, /area/station/solars/starboard/fore) -"nko" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/aft) "nkp" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50556,9 +50041,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/trimline/brown/line, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -50808,12 +50290,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) -"nnU" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/pod/light, -/area/station/maintenance/floor2/port/fore) "nnV" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/pod/light, @@ -51467,9 +50943,6 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/port/aft) "nvv" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 }, @@ -51532,12 +51005,6 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -51614,9 +51081,6 @@ /obj/item/cigbutt/cigarbutt{ pixel_x = 7 }, -/obj/effect/turf_decal/stripes{ - dir = 8 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -51776,15 +51240,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"nzm" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/fore) "nzq" = ( /obj/machinery/door/airlock/wood{ name = "Bedroom" @@ -51990,9 +51445,6 @@ }, /area/station/security/brig) "nBV" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -52010,15 +51462,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/side, /area/station/hallway/secondary/exit/departure_lounge) -"nCd" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard) "nCg" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/reagent_containers/pill/happinesspsych{ @@ -52667,9 +52110,6 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor/border_only, @@ -53192,7 +52632,6 @@ /obj/effect/turf_decal/trimline/yellow/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner, /obj/machinery/door/firedoor/border_only{ dir = 8 }, @@ -53218,13 +52657,6 @@ }, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port) -"nRn" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/fore) "nRo" = ( /obj/machinery/vending/games, /turf/open/floor/bamboo/tatami/black, @@ -53586,14 +53018,6 @@ "nWe" = ( /turf/closed/wall, /area/station/commons/fitness) -"nWf" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port) "nWk" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -54065,9 +53489,6 @@ /turf/open/floor/iron/dark/side, /area/station/hallway/floor4/aft) "ocu" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, @@ -54691,15 +54112,6 @@ dir = 4 }, /area/station/maintenance/floor1/starboard/aft) -"olt" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/fore) "olA" = ( /obj/effect/turf_decal/trimline/green/warning{ dir = 9 @@ -55467,11 +54879,13 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/turf_decal/stripes, /obj/effect/turf_decal/trimline/brown/line, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_half, /area/station/bitrunning/den) "owo" = ( @@ -55899,15 +55313,6 @@ /obj/structure/table, /turf/open/floor/catwalk_floor/iron, /area/station/cargo/office) -"oCe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/aft) "oCf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56158,13 +55563,6 @@ dir = 1 }, /area/station/hallway/floor3/aft) -"oGc" = ( -/obj/effect/turf_decal/trimline/red/warning{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/floor/pod/dark, -/area/station/hallway/secondary/entry) "oGf" = ( /obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -57373,14 +56771,6 @@ /obj/structure/grille, /turf/open/floor/plating/airless, /area/station/service/chapel) -"oXd" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/space/nearstation) "oXg" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58984,10 +58374,6 @@ /obj/machinery/hydroponics/constructable, /turf/open/floor/iron, /area/station/service/hydroponics) -"pwH" = ( -/obj/structure/railing/corner, -/turf/open/floor/engine/hull/reinforced, -/area/space/nearstation) "pwL" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -59193,9 +58579,6 @@ /turf/open/floor/iron, /area/station/engineering/gravity_generator) "pze" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59525,14 +58908,6 @@ /obj/machinery/duct, /turf/open/floor/iron/checker, /area/station/service/bar/atrium) -"pDX" = ( -/obj/structure/railing/corner, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/bar/atrium) "pEp" = ( /turf/open/openspace, /area/station/maintenance/floor2/port/aft) @@ -59628,14 +59003,6 @@ }, /turf/open/floor/iron/large, /area/station/command/gateway) -"pFy" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/fore) "pFA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -59763,15 +59130,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) -"pHQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port) "pHT" = ( /obj/structure/table/wood, /obj/item/paper/fluff/gateway, @@ -60113,7 +59471,6 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) "pMW" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/trimline/purple/corner, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -61965,12 +61322,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/floor4/starboard/aft) -"qng" = ( -/obj/structure/railing/corner, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port) "qnq" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 @@ -62431,7 +61782,6 @@ /turf/open/floor/pod/light, /area/station/maintenance/floor4/port/fore) "qtA" = ( -/obj/structure/railing/corner, /obj/structure/chair{ dir = 4 }, @@ -62503,14 +61853,6 @@ "qun" = ( /turf/closed/wall/r_wall, /area/station/science/genetics) -"quA" = ( -/obj/structure/railing/corner, -/obj/machinery/door/firedoor/border_only, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood/tile, -/area/station/service/library) "quB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63084,9 +62426,6 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port/fore) "qAM" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -63481,9 +62820,6 @@ }, /area/station/security/checkpoint) "qEB" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/green/corner{ dir = 8 }, @@ -64271,9 +63607,6 @@ /obj/effect/turf_decal/tile/green/full, /obj/machinery/camera/autoname/directional/west, /obj/machinery/vending/wallmed/directional/west, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -64660,14 +63993,6 @@ /obj/structure/sign/departments/psychology, /turf/closed/wall, /area/station/maintenance/floor1/port) -"qUV" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/obj/structure/cable, -/turf/open/floor/plating/airless, -/area/station/solars/starboard/aft) "qVa" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -65316,9 +64641,6 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) "rdK" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/structure/sign/poster/official/random/directional/south, /turf/open/floor/wood, /area/station/service/bar/atrium) @@ -65574,15 +64896,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/library/private) -"rgE" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/aft) "rgG" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -65804,9 +65117,6 @@ }, /area/station/maintenance/floor1/starboard/aft) "rjp" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 }, @@ -66726,15 +66036,6 @@ "ryx" = ( /turf/open/floor/carpet/royalblue, /area/station/commons/dorms/room4) -"ryz" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/fore) "ryA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -66754,13 +66055,6 @@ /obj/machinery/hydroponics/constructable, /turf/open/floor/plating, /area/station/maintenance/floor4/starboard) -"ryX" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "rza" = ( /obj/effect/turf_decal/trimline/brown/warning{ dir = 9 @@ -67006,6 +66300,9 @@ "rCO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/engine_smes) "rCQ" = ( @@ -67300,15 +66597,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood/tile, /area/station/service/chapel/office) -"rHP" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port) "rHX" = ( /obj/effect/turf_decal/bot_white/right, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -67623,15 +66911,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor1/port) -"rMc" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/fore) "rMl" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -68019,12 +67298,6 @@ dir = 4 }, /area/station/engineering/storage/tech) -"rSu" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/pod/light, -/area/station/maintenance/floor3/port) "rSw" = ( /turf/open/misc/asteroid/snow/standard_air{ icon_state = "snow1" @@ -68059,9 +67332,6 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -68259,13 +67529,6 @@ "rVk" = ( /turf/open/floor/iron, /area/station/security/courtroom) -"rVo" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/starboard/fore) "rVy" = ( /turf/open/floor/plating, /area/station/maintenance/floor4/port/fore) @@ -68385,6 +67648,12 @@ dir = 4 }, /area/station/hallway/floor3/aft) +"rXZ" = ( +/obj/effect/landmark/navigate_destination/dockaux, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/hallway/floor3/fore) "rYa" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 8 @@ -68621,12 +67890,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/floor2/starboard/aft) -"scu" = ( -/obj/structure/railing/corner, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/commons/vacant_room/commissary) "scv" = ( /turf/closed/wall/r_wall, /area/station/maintenance/disposal) @@ -69299,6 +68562,9 @@ /obj/structure/railing{ dir = 6 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/space/openspace, /area/space/nearstation) "soI" = ( @@ -69334,13 +68600,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/starboard/aft) -"spa" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/starboard) "spb" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/light_switch/directional/west, @@ -69550,15 +68809,6 @@ }, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/fore) -"ssz" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard/aft) "ssL" = ( /obj/machinery/door/airlock/science/glass{ name = "Research and Development" @@ -70225,9 +69475,6 @@ /turf/open/floor/wood, /area/station/maintenance/floor3/starboard/aft) "sBF" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/green/corner{ dir = 1 }, @@ -71193,9 +70440,6 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/arrows{ dir = 1 }, @@ -71872,9 +71116,6 @@ /turf/open/floor/wood/parquet, /area/station/medical/psychology) "sYw" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/brown/filled/arrow_ccw{ dir = 4 }, @@ -72014,9 +71255,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 }, -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) @@ -72076,15 +71314,6 @@ /obj/structure/cable, /turf/open/floor/wood/tile, /area/station/service/library) -"tbh" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port/fore) "tbp" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -72271,13 +71500,6 @@ /obj/machinery/light/dim/directional/west, /turf/open/floor/pod/light, /area/station/maintenance/floor2/starboard) -"tdB" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/starboard/aft) "tdF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73221,7 +72443,7 @@ "trz" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/station/maintenance/floor2/port) "trB" = ( /obj/machinery/ai_slipper{ @@ -74504,9 +73726,6 @@ /turf/open/floor/carpet/red, /area/station/commons/dorms/room1) "tKl" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark/side{ @@ -74920,9 +74139,6 @@ /turf/open/floor/iron/dark, /area/station/hallway/floor4/aft) "tQJ" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ @@ -75581,9 +74797,6 @@ /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) "ubi" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 @@ -75694,9 +74907,6 @@ }, /area/station/cargo/lobby) "ucS" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/trash/graffiti, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -75767,13 +74977,6 @@ }, /turf/open/floor/plating/foam, /area/station/maintenance/floor2/starboard/fore) -"uep" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port/fore) "ueu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -75881,9 +75084,6 @@ /turf/open/floor/iron/dark, /area/station/security/office) "ufL" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/trimline/yellow/corner{ dir = 1 }, @@ -76258,9 +75458,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/port/aft) "ukK" = ( @@ -77042,17 +76239,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard/fore) -"uxD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "uxF" = ( /obj/machinery/status_display/ai/directional/west, /obj/structure/flora/bush/sparsegrass/style_random, @@ -77549,9 +76735,6 @@ "uEY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor4/starboard/fore) "uFc" = ( @@ -77788,9 +76971,6 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -77964,23 +77144,6 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port) -"uLj" = ( -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/pod/light, -/area/station/maintenance/floor1/port) -"uLk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port/aft) "uLA" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -77997,12 +77160,10 @@ /turf/open/floor/carpet/royalblue, /area/station/commons/dorms/room4) "uLN" = ( -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/landmark/bitrunning/station_reward_spawn, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) "uLO" = ( @@ -79148,21 +78309,6 @@ "uZF" = ( /turf/closed/wall/r_wall, /area/station/maintenance/floor2/starboard/aft) -"uZG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/duct, -/obj/structure/railing, -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor4/port/aft) "uZV" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/machinery/door/airlock/hatch{ @@ -79932,12 +79078,16 @@ /obj/effect/turf_decal/trimline/brown/filled/mid_joiner{ dir = 8 }, -/obj/structure/railing{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, /turf/open/floor/carpet/red, /area/station/service/theater) "vlQ" = ( @@ -80306,7 +79456,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/railing/corner, /turf/open/openspace, /area/station/maintenance/floor2/port/aft) "vqz" = ( @@ -81437,13 +80586,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/floor1/port/aft) -"vFJ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "vFS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/random/maintenance, @@ -81815,15 +80957,6 @@ /obj/structure/rack, /turf/open/floor/iron/textured_large, /area/station/medical/chemistry) -"vKw" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "vKD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/light/dim/directional/north, @@ -82878,9 +82011,6 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "vZl" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/railing/corner{ dir = 8 }, @@ -82948,12 +82078,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/large, /area/station/security/prison/safe) -"waX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/starboard) "wba" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -83272,9 +82396,6 @@ /area/station/hallway/floor1/aft) "weg" = ( /obj/structure/sign/poster/official/random/directional/east, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/effect/turf_decal/arrows, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood/tile, @@ -83327,13 +82448,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"wfl" = ( -/obj/machinery/atmospherics/components/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "wfx" = ( /obj/machinery/door/window/brigdoor/left/directional/west, /obj/structure/cable, @@ -83408,12 +82522,6 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/dark/smooth_half, /area/station/engineering/storage/tech) -"wgo" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/pod/light, -/area/station/maintenance/floor1/starboard) "wgO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -84078,15 +83186,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/floor2/fore) -"wpa" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/fore) "wpc" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/bodycontainer/morgue{ @@ -84530,16 +83629,6 @@ dir = 4 }, /area/station/hallway/floor4/aft) -"wuS" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/railing/corner, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/port/fore) "wuZ" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, @@ -85555,9 +84644,6 @@ /turf/open/floor/pod/dark, /area/station/maintenance/floor4/starboard) "wHs" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -85653,9 +84739,6 @@ /turf/open/floor/iron/dark, /area/station/command/gateway) "wIC" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/side{ dir = 8 @@ -86362,9 +85445,6 @@ dir = 1 }, /obj/machinery/duct, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/structure/railing{ dir = 1 }, @@ -86785,15 +85865,6 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/starboard/aft) -"wWm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/aft) "wWn" = ( /obj/machinery/light/cold/no_nightlight/directional/east, /obj/item/radio/intercom/directional/east, @@ -87089,14 +86160,6 @@ /obj/item/shovel/spade, /turf/open/floor/iron, /area/station/service/hydroponics) -"xbj" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port) "xbk" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -87638,9 +86701,6 @@ /turf/open/floor/grass, /area/station/service/bar/atrium) "xit" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -87826,7 +86886,6 @@ /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 8 }, -/obj/structure/railing/corner, /obj/machinery/light/directional/north, /turf/open/floor/carpet/red, /area/station/service/theater) @@ -88105,7 +87164,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner, /obj/structure/railing{ dir = 1 }, @@ -88554,19 +87612,6 @@ /obj/structure/grille, /turf/open/floor/pod/light, /area/station/maintenance/floor2/port/fore) -"xvA" = ( -/obj/effect/turf_decal/tile/green/full, -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large, -/area/station/hallway/secondary/entry) "xvK" = ( /obj/structure/table/reinforced/rglass, /obj/item/clothing/gloves/latex, @@ -88812,15 +87857,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"xyC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/starboard) "xyD" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -88860,15 +87896,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness) -"xzr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor1/port/aft) "xzA" = ( /obj/machinery/light/cold/no_nightlight/directional/west, /turf/open/floor/iron, @@ -89487,9 +88514,6 @@ /turf/open/floor/iron/dark/side, /area/station/security/courtroom) "xHw" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/trimline/brown/filled/arrow_ccw{ dir = 4 }, @@ -89642,15 +88666,6 @@ /obj/effect/spawner/random/engineering/canister, /turf/open/floor/pod/dark, /area/station/maintenance/floor2/port) -"xJW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor3/port) "xKa" = ( /obj/effect/turf_decal/stripes/white/corner, /turf/open/floor/iron/dark/corner, @@ -89668,10 +88683,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/evidence) -"xKt" = ( -/obj/structure/railing/corner, -/turf/open/space/openspace, -/area/space) "xKy" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 8 @@ -89896,15 +88907,6 @@ dir = 1 }, /area/station/engineering/lobby) -"xNX" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/floor2/starboard/fore) "xOd" = ( /obj/structure/cable, /turf/closed/wall, @@ -90104,6 +89106,9 @@ dir = 10 }, /obj/structure/marker_beacon/burgundy, +/obj/structure/railing{ + dir = 8 + }, /turf/open/space/openspace, /area/space/nearstation) "xRG" = ( @@ -90254,12 +89259,6 @@ /obj/effect/turf_decal/tile/green/full, /turf/open/floor/iron, /area/station/service/hydroponics) -"xUk" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/turf/open/space/openspace, -/area/space) "xUI" = ( /obj/structure/cable, /obj/structure/chair/sofa/bench/left, @@ -90997,9 +89996,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 8 - }, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -91365,12 +90361,6 @@ /obj/effect/turf_decal/siding/wideplating_new{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/white/smooth_corner{ dir = 4 }, @@ -110122,7 +109112,7 @@ xob wnP nnV oic -rVo +rRf ala ala ala @@ -110662,7 +109652,7 @@ hJy hJy sui sui -olt +hOV hJy uoP cnW @@ -110893,7 +109883,7 @@ uzN aaC twL oic -djX +rRf jIW tNS ybF @@ -111407,7 +110397,7 @@ laS btP bxf oic -rVo +rRf wsw tNS thq @@ -111690,7 +110680,7 @@ hJy hJy vZl pxY -agt +omF hJy jMI eiM @@ -112178,7 +111168,7 @@ oic oic sBT qLI -djX +rRf lIe lIe joP @@ -112721,7 +111711,7 @@ kDQ sDT vZw hJy -dIO +iGt hJy hJy hJy @@ -114006,11 +112996,11 @@ hJy eqK iGt udE -fAU +iGt fqg fqg fqg -nzm +iGt iGt iGt iGt @@ -116321,8 +115311,8 @@ brj brj fmf jlx -jDL -oGc +uzn +uzn jlx cCR brj @@ -116578,7 +115568,7 @@ bsu qPM ixQ ixQ -xvA +eGr eGr ixQ ixQ @@ -119139,12 +118129,12 @@ tTU kyP pLe xgH -qng +dyS uya uya uya uya -xbj +dyS xgH twx dyS @@ -119653,12 +118643,12 @@ oMV dyS dyS qLN -nWf +dyS ema ema ema ema -asU +dyS xgH pLe dyS @@ -120162,9 +119152,9 @@ rpj ppf uOT xgH -iTJ +gbh xee -xbj +dyS xgH rTt trD @@ -126823,10 +125813,10 @@ whV whV whV jJm -wgo +sKW nSv vWS -xyC +erU crj nLk efr @@ -127077,7 +126067,7 @@ foI iGz nnN whV -spa +kSp bcK bcK kSp @@ -127849,7 +126839,7 @@ jJm nQw jJm kSp -waX +jJm vwJ bMD aut @@ -129688,7 +128678,7 @@ aIV xgH eKk hdA -uLj +eVk bQV bQV gaH @@ -133785,7 +132775,7 @@ igQ wec fOq sQD -iAS +eJA uRS pSG sQD @@ -134556,7 +133546,7 @@ hTS rBP nag rBP -oSt +kwO dHd tNC sQD @@ -136361,12 +135351,12 @@ xYU fYg fvP dEc -bhb +ulU vcr eCr uhx vcr -kUe +xep wRM nJt nJt @@ -137903,12 +136893,12 @@ unW dEc mSe uov -wWm +uov bwL bwL bwL bwL -xzr +uov nsX vcr cIW @@ -138412,8 +137402,8 @@ vap lQD juf klY -kfo -wfl +xgW +xgW dEc uhx uov @@ -138669,7 +137659,7 @@ uyD uyD uyD bDO -kfo +xgW mvg dEc ggX @@ -174891,7 +173881,7 @@ bQv tEb rYw uUG -wpa +kEI wwu wwu wwu @@ -175658,11 +174648,11 @@ ebA lXs gqP gqP -nRn +kEI lGh lGh lGh -lMx +kEI wwu mdC tTB @@ -176429,11 +175419,11 @@ ebA lXs gqP gqP -wpa +kEI egD tqw ozn -xNX +kEI pgS wwu xXe @@ -176943,7 +175933,7 @@ crd wwu wwu wwu -nRn +kEI eLK tqw cWF @@ -177714,11 +176704,11 @@ wwu cNf bDr wwu -wpa +kEI roe roe roe -pFy +dAk gaf vlo qln @@ -178257,7 +177247,7 @@ hLz uXA hLz jVu -wuS +hpW hLz hLz fGy @@ -179542,11 +178532,11 @@ hLz uXA uXA uXA -tbh +uXA wNb wNb wNb -hoK +jly jJu kxh lvM @@ -184680,7 +183670,7 @@ vXT vXT vXT vXT -nnU +vaF ssy xop mSZ @@ -188290,7 +187280,7 @@ dWR aal cdH cda -kcy +ybG fzm aal aal @@ -190090,7 +189080,7 @@ aal gzw gzw gzw -rHP +xit aal aal ucA @@ -190812,7 +189802,7 @@ vnK vnK vnK uBW -nCd +kpt sHv kpt kRS @@ -199853,7 +198843,7 @@ aal oVH oVH aal -pHQ +ybG iRN iRN aal @@ -202126,9 +201116,9 @@ mPw mPw mPw uJs -isk +mPw syP -rgE +mPw mPw dEt lgO @@ -202668,12 +201658,12 @@ rGL qjn wkw aXC -foB +qjn eCK qWN vqx jOj -uLk +xui xui xui xui @@ -207804,7 +206794,7 @@ hQT oyh oyh hQT -ilK +oyh oyh oyh oyh @@ -239923,7 +238913,7 @@ vpa gec qTD bks -bks +rXZ bks myU viZ @@ -242468,7 +241458,7 @@ ucA ucA iTg aZN -oXd +pRs soz ucA xuh @@ -242762,7 +241752,7 @@ gwL gwL xwI vuN -rMc +gyp oIj gwL jPd @@ -244057,7 +243047,7 @@ gwL uQL niP lGK -uep +dso eZa eZa eZa @@ -245346,7 +244336,7 @@ gwL gwL gwL vGT -ryz +dso gwL gwL ucA @@ -245571,7 +244561,7 @@ upT lXW aYJ ccp -pDX +ccp upT sjX rdK @@ -250484,7 +249474,7 @@ tGn tGn teV mUA -ewH +xpH eJl mUA tGn @@ -250998,7 +249988,7 @@ tGn npO bGc qwy -rSu +ajs tDf mUA tGn @@ -252798,7 +251788,7 @@ tGn tGn tGn tGn -vFJ +pSl mzA tGn tGn @@ -253052,10 +252042,10 @@ dfp qfT ldq tGn -vFJ +pSl fvb fvb -uxD +tDf aGQ tGn tGn @@ -253823,10 +252813,10 @@ lvs uZc tGn qCv -jQK +pSl kYC mex -xJW +pSl pSl cHT cHT @@ -254594,11 +253584,11 @@ mms dYf tGn ajs -ryX +jPG fBa fBa fBa -lKh +jPG tGn tGn ucA @@ -255622,11 +254612,11 @@ uwG kVM tGn mwg -vKw +jPG wNH oxJ wNH -geL +jPG tGn tGn ucA @@ -257118,7 +256108,7 @@ qrd qrd qrd qrd -iEU +mLk qrd qrd sSB @@ -257405,7 +256395,7 @@ wpI kNT ufN lFa -scu +ufN dDF eLw nVl @@ -258152,7 +257142,7 @@ qrd hqR jmU jmU -iYA +sSB ejP qrd eoe @@ -258663,7 +257653,7 @@ qrd xRM hVI eir -dfA +hqR aea aVs iGh @@ -258923,7 +257913,7 @@ qrd sSB aaw lFw -kQo +sSB isU cdj eAi @@ -263033,11 +262023,11 @@ cIM kRw fKd csM -kgK +blF knk -bSj +fzw rws -akh +fzw sXX kLM fzw @@ -263547,13 +262537,13 @@ cIM kRw fKd ngr -quA +blF tjc -anW +fzw pdO -kCk +fzw ePH -bIk +wjm tXV iMN eIz @@ -263847,7 +262837,7 @@ biO piR qeX cvf -nko +pOn rIY lRh piR @@ -264832,14 +263822,14 @@ cIM kRw iMN kjp -kgK +blF mAJ fll hav mJy kKE -baa -fio +wjm +bTe dCW dCW dCW @@ -265389,7 +264379,7 @@ pOn pOn pOn pOn -oCe +pOn uKD rTv piR @@ -265855,10 +264845,10 @@ ucA ucA kRw kRw -tdB +cIM oxP xhC -kKG +cIM kRw aNz ciM @@ -266626,10 +265616,10 @@ ucA ucA kRw kRw -ssz +cIM cWY veA -ata +cIM kRw qgh ciM @@ -267664,7 +266654,7 @@ qjq eJc jOT nHf -aZI +cIM kRw kRw kRw @@ -268458,12 +267448,12 @@ sjH uqi uqi uqi -gKO +uqi kRO aYq aYq aYq -aqR +pOn pOn pOn pOn @@ -273333,11 +272323,11 @@ ucA ucA ucA ucA -xKt +ucA djc djc djc -dkn +ucA ucA ucA ucA @@ -305963,7 +304953,7 @@ yjN uxw aLb eGK -bJN +bNb gEB cmw cHz @@ -307270,7 +306260,7 @@ uIx rhJ rhJ rhJ -pTI +bxc rao iES voT @@ -309827,7 +308817,7 @@ wjj oKq bJV hWp -mdE +gxn uPX ogl czp @@ -310319,7 +309309,7 @@ xHe kqp dIQ dIQ -gmA +hto uxw jBa xHe @@ -313148,7 +312138,7 @@ bYl kiw exv wMU -fLX +fPd ixd bDn gwe @@ -313919,7 +312909,7 @@ sab vuB vuB vuB -hfE +vuB bep hnG pNa @@ -318334,7 +317324,7 @@ duZ vEa fXs fXs -uZG +tPS sOU ncB ncB @@ -319617,8 +318607,8 @@ sWo jvz wyv ycM -nXQ -nXQ +bGM +bGM ukr bzM ncB @@ -321162,7 +320152,7 @@ ycM noA noA noA -iZi +pze ncB ncB ucA @@ -325231,7 +324221,7 @@ wiu rem rNo wOt -blq +rNo rNo oHC oHC @@ -332713,11 +331703,11 @@ vyR vyR vyR oyh -pwH -hQT -ijJ +oyh hQT ilK +hQT +oyh oyh oyh oyh @@ -333741,11 +332731,11 @@ vyR vyR vyR vyR -qWn +oyh itT -gZG +qWn itT -gnj +oyh oyh oyh oyh @@ -335031,7 +334021,7 @@ oyh oyh acl acl -xUk +ucA ucA ucA ucA @@ -336799,7 +335789,7 @@ ucA ucA eEE cUq -qUV +bjb lzq ucA ucA @@ -338869,11 +337859,11 @@ ucA ucA ucA ucA -xKt +ucA djc djc djc -dkn +ucA ucA ucA ucA diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 9ec0949445d6..a8787a400312 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -115,7 +115,7 @@ "acE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "acI" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/wood, @@ -189,7 +189,6 @@ pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/structure/cable, /obj/machinery/light/small/directional/east, /turf/open/floor/iron, @@ -380,6 +379,11 @@ /obj/structure/frame/computer, /turf/open/floor/plating, /area/station/service/electronic_marketing_den) +"ahg" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/light/small/maintenance/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/office) "ahh" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -425,7 +429,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; + name = "Engineering Access"; space_dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -524,7 +528,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/any/command/eva, -/obj/effect/landmark/navigate_destination, +/obj/effect/landmark/navigate_destination/eva, /turf/open/floor/mineral/titanium, /area/station/ai_monitored/command/storage/eva) "akv" = ( @@ -565,6 +569,7 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/cryo) "amg" = ( @@ -605,7 +610,7 @@ pixel_y = 1 }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "anP" = ( /obj/effect/turf_decal/trimline/yellow, /turf/open/floor/iron/dark/textured, @@ -679,6 +684,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ dir = 8 }, +/obj/item/stock_parts/cell, /turf/open/floor/iron/dark/textured_corner, /area/station/engineering/break_room) "aqC" = ( @@ -865,7 +871,7 @@ }, /obj/machinery/vending/wallmed/directional/west, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "avO" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 5 @@ -934,9 +940,7 @@ /turf/open/floor/iron/smooth, /area/station/science/genetics) "azK" = ( -/obj/machinery/mecha_part_fabricator{ - dir = 4 - }, +/obj/machinery/mecha_part_fabricator, /obj/effect/turf_decal/stripes/box, /turf/open/floor/noslip{ icon_state = "textured_white"; @@ -948,6 +952,7 @@ /obj/item/seeds/corn, /obj/item/seeds/corn, /obj/item/seeds/corn, +/mob/living/basic/mothroach, /turf/open/floor/grass, /area/station/service/hydroponics) "azP" = ( @@ -1024,7 +1029,7 @@ /obj/effect/turf_decal/trimline/blue/line, /obj/machinery/light/directional/north, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "aCp" = ( /mob/living/basic/butterfly, /obj/structure/cable, @@ -1294,7 +1299,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/hop, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ - name = "Head of Personel's office" + name = "Head of Personel's Office" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1335,7 +1340,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "aKV" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/gambling, @@ -1415,6 +1420,14 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/textured, /area/station/medical/morgue) +"aOb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "aOq" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -1919,7 +1932,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "aZB" = ( /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/engine, @@ -2339,9 +2352,7 @@ }, /area/station/science/robotics) "bkP" = ( -/obj/machinery/light/small/directional/east{ - dir = 1 - }, +/obj/machinery/light/small/maintenance/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "bkQ" = ( @@ -2360,7 +2371,7 @@ }, /obj/machinery/vending/wallmed/directional/south, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "blt" = ( /obj/structure/cable, /obj/machinery/light/small/directional/east{ @@ -2557,6 +2568,12 @@ /obj/effect/turf_decal/trimline/brown, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/aft) +"bpJ" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/east, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) "bpX" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -2766,7 +2783,7 @@ /area/station/hallway/secondary/service) "bwZ" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Captain's Quarters" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable, @@ -2776,6 +2793,9 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/captain/private) +"bxs" = ( +/turf/closed/wall/r_wall, +/area/station/medical/psychology) "bxM" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -2830,7 +2850,7 @@ /area/station/engineering/atmos/office) "bys" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Operating Storage Room" + name = "Medical Cold Room" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -3276,7 +3296,7 @@ /area/station/hallway/primary/central) "bHH" = ( /obj/machinery/door/airlock/hydroponics/glass{ - name = "Hydroponics" + name = "Chicken Ranch" }, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/structure/cable, @@ -3432,6 +3452,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/service) +"bKY" = ( +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/virology) "bLk" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, @@ -3793,10 +3824,12 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Recovery B" + }, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_b) "bUk" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -3906,7 +3939,7 @@ /area/station/service/electronic_marketing_den) "bXE" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Cargo Lobby" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/warning{ @@ -3960,6 +3993,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/cargo/storage) +"bZY" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 6 + }, +/obj/structure/closet/crate/decorations, +/obj/effect/turf_decal/bot, +/obj/item/lightreplacer, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "caj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -4000,11 +4042,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"cbM" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/structure/cable/industrial, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "cbS" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/engine, @@ -4152,6 +4189,11 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/station/commons/lounge) +"cfn" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/light/small/maintenance/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/central) "cfz" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -4357,7 +4399,7 @@ }, /obj/machinery/light/directional/east, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "clC" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/egg_incubator, @@ -4600,11 +4642,17 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "cvu" = ( /obj/structure/sink/kitchen/directional/east, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"cvx" = ( +/obj/effect/spawner/random/trash, +/obj/structure/cable, +/obj/machinery/light/small/maintenance/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "cvG" = ( /obj/effect/spawner/random/vending/colavend, /obj/effect/turf_decal/bot, @@ -4735,6 +4783,15 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"cAt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/public{ + name = "Common Room" + }, +/turf/open/floor/wood, +/area/station/commons/fitness/recreation/entertainment) "cAu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -4847,6 +4904,7 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/aiupload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "cCH" = ( @@ -5158,8 +5216,8 @@ }, /area/station/cargo/miningoffice) "cMb" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Medbay Lobby" +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" }, /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 4 @@ -5320,7 +5378,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "cQM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5433,33 +5491,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"cSD" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/camera/directional/north{ - c_tag = "Chief Engineer's Office" - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/effect/turf_decal/bot, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_corner{ - dir = 8 - }, -/area/station/engineering/break_room) "cSR" = ( /obj/effect/spawner/random/structure/grille, /turf/open/floor/iron, @@ -5552,8 +5583,8 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "cUY" = ( -/obj/machinery/light/small/directional/east, /obj/effect/spawner/random/structure/table_or_rack, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/central) "cVA" = ( @@ -5613,10 +5644,7 @@ /area/station/maintenance/port/central) "cXs" = ( /obj/structure/cable, -/obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - space_dir = 4 - }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "cXO" = ( @@ -5725,6 +5753,36 @@ /obj/effect/spawner/random/structure/closet_private, /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) +"dbE" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/camera/directional/north{ + c_tag = "Chief Engineer's Office" + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/effect/turf_decal/bot, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 7 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ + dir = 4 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 14 + }, +/turf/open/floor/iron/dark/textured_corner{ + dir = 8 + }, +/area/station/engineering/break_room) "dbI" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment, @@ -5907,11 +5965,11 @@ /area/station/tcommsat/server) "dgc" = ( /obj/machinery/door/airlock/maintenance{ - name = "CMO Maintenance" + name = "Psychology Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/all/medical/cmo, +/obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/plating, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "dgu" = ( /obj/structure/chair/sofa/right{ dir = 1 @@ -5968,7 +6026,7 @@ }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dhA" = ( /obj/machinery/modular_computer/console/preset/id, /obj/machinery/light/directional/north, @@ -6219,18 +6277,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"dnj" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 7 - }, -/obj/item/lightreplacer, -/obj/item/construction/plumbing/engineering, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "dnm" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/trimline/green/line{ @@ -6430,7 +6476,7 @@ /area/station/maintenance/starboard/central) "drc" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer" + name = "Engineering Maintenance" }, /obj/machinery/door/poddoor/preopen{ id = "ceprivacy"; @@ -6529,12 +6575,6 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, -/obj/item/clothing/suit/armor/riot/knight/yellow{ - name = "Engineering Knight armour" - }, -/obj/item/clothing/head/helmet/knight/yellow{ - name = "Engineering Knight helmet" - }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) "dtb" = ( @@ -6647,6 +6687,7 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "dxq" = ( +/obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark, /area/station/security/office) "dxr" = ( @@ -6680,7 +6721,7 @@ /area/station/science/genetics) "dyl" = ( /obj/machinery/door/airlock{ - name = "Hydroponics Backroom" + name = "Service Hallway" }, /obj/effect/mapping_helpers/airlock/access/all/service/general, /obj/structure/cable, @@ -6891,7 +6932,7 @@ /area/station/science/ordnance/office) "dEa" = ( /obj/machinery/door/airlock/public/glass{ - name = "Art Gallery" + name = "Library" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7022,7 +7063,7 @@ "dHt" = ( /obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/stairs, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "dHJ" = ( /obj/structure/cable, /obj/structure/reagent_dispensers/wall/peppertank/directional/east, @@ -7088,11 +7129,6 @@ /mob/living/basic/chicken, /turf/open/misc/sandy_dirt, /area/station/service/hydroponics/upper) -"dJR" = ( -/obj/machinery/light/small/directional/west, -/obj/effect/spawner/random/structure/table_or_rack, -/turf/open/floor/plating, -/area/station/maintenance/starboard/central) "dJU" = ( /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -7155,7 +7191,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dMc" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/power/apc/auto_name/directional/north, @@ -7291,7 +7327,7 @@ dir = 6 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "dPe" = ( /obj/machinery/grill, /obj/item/stack/sheet/mineral/coal/ten, @@ -7322,7 +7358,7 @@ dir = 1 }, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dQd" = ( /turf/open/floor/engine/plasma, /area/station/engineering/atmos) @@ -7361,7 +7397,7 @@ name = "Mender Moff" }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "dRJ" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, @@ -7588,7 +7624,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dXN" = ( /obj/machinery/status_display/ai, /obj/structure/table/glass, @@ -7617,6 +7653,7 @@ dir = 1; color = "#009dc4" }, +/obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "dYl" = ( @@ -7643,7 +7680,7 @@ dir = 1 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "dZk" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/mineral/titanium, @@ -7661,7 +7698,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "dZw" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -7782,6 +7819,13 @@ }, /turf/open/floor/carpet, /area/station/medical/office) +"ecc" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/light/small/maintenance/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "ecd" = ( /obj/machinery/telecomms/processor/preset_two, /obj/machinery/camera/autoname/directional/south, @@ -7804,7 +7848,7 @@ }, /obj/effect/turf_decal/trimline/blue/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ecC" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -7894,7 +7938,7 @@ }, /obj/machinery/door/window/brigdoor/security/cell{ id = "Cell 2"; - name = "Cell 2" + name = "Perma Transfer" }, /obj/structure/window/reinforced/tinted/frosted{ dir = 4 @@ -8066,12 +8110,12 @@ pixel_y = -3 }, /obj/structure/table/reinforced, -/obj/machinery/light/directional/north, /obj/machinery/door/window/right/directional/south{ dir = 8; name = "First Aid Supplies"; req_access = list("medical") }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "ejr" = ( @@ -8080,7 +8124,6 @@ /area/station/service/bar) "ejy" = ( /obj/effect/turf_decal/tile/green/half/contrasted, -/obj/machinery/light/directional/north, /obj/structure/table/reinforced, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) @@ -8163,7 +8206,7 @@ /area/station/command/heads_quarters/cmo) "emU" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; + name = "Departures"; space_dir = 4 }, /turf/open/floor/engine, @@ -8197,6 +8240,17 @@ /obj/structure/cable, /turf/open/floor/iron/stairs, /area/station/cargo/warehouse/upper) +"eoY" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 8 + }, +/area/station/engineering/main) "epb" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/camera/autoname/directional/south, @@ -8287,7 +8341,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eqO" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8356,7 +8410,7 @@ }, /obj/machinery/stasis, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "esh" = ( /obj/structure/toilet{ dir = 4 @@ -8380,6 +8434,7 @@ color = "#009dc4"; dir = 9 }, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "esx" = ( @@ -8391,15 +8446,15 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "esy" = ( -/obj/machinery/door/airlock/public/glass{ +/obj/structure/cable, +/obj/machinery/door/airlock/bathroom{ name = "Toilet" }, -/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) "esB" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Bridge Observation" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark/textured, @@ -8561,7 +8616,7 @@ /obj/effect/turf_decal/trimline/red/filled/warning, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig" + name = "Security" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -8676,6 +8731,7 @@ color = "#009dc4"; dir = 1 }, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "eAI" = ( @@ -8712,6 +8768,15 @@ dir = 4 }, /area/station/service/chapel) +"eBn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/obj/effect/spawner/random/structure/grille, +/obj/machinery/light/small/maintenance/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "eBo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/crate, @@ -8803,14 +8868,11 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "eDz" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, /area/station/maintenance/department/electrical) "eDF" = ( /obj/structure/table, -/obj/machinery/infuser, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -8837,7 +8899,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eDZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, @@ -8919,14 +8981,10 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/warning, -/turf/open/floor/iron/dark/textured_edge/airless{ +/turf/open/floor/iron/dark/textured_edge{ dir = 1 }, /area/station/science/lobby) -"eGh" = ( -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/carpet/neon/simple/orange/nodots, -/area/station/bitrunning/den) "eGI" = ( /obj/machinery/rnd/production/protolathe/department/science, /obj/effect/turf_decal/siding/purple, @@ -8935,8 +8993,8 @@ /turf/open/floor/iron/dark/textured_edge, /area/station/science/lab) "eGM" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Toilet" +/obj/machinery/door/airlock/bathroom{ + name = "Shower" }, /turf/open/floor/iron/showroomfloor, /area/station/medical/pharmacy) @@ -9078,7 +9136,7 @@ /area/station/security/office) "eJv" = ( /turf/closed/wall/r_wall, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "eJV" = ( /obj/structure/cable/industrial, /turf/open/floor/plating, @@ -9633,7 +9691,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "eXV" = ( /obj/effect/turf_decal/stripes{ dir = 10 @@ -9931,8 +9989,8 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "fdQ" = ( -/obj/machinery/light/small/directional/east, /obj/structure/closet/firecloset/full, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/central) "fep" = ( @@ -9941,6 +9999,11 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 }, +/obj/machinery/cell_charger{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/stock_parts/cell, /turf/open/floor/iron/dark/textured, /area/station/commons/storage/primary) "fet" = ( @@ -10043,6 +10106,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 1 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark, /area/station/security/office) "fgS" = ( @@ -10229,7 +10293,7 @@ /area/station/science/ordnance/office) "fnB" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Base" + name = "Mining Office" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10339,6 +10403,12 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) +"fpv" = ( +/obj/effect/turf_decal/trimline/red/filled/warning, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/obj/effect/landmark/start/prisoner, +/turf/open/floor/iron/dark, +/area/station/security/office) "fpx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10506,7 +10576,7 @@ "fvF" = ( /obj/structure/filingcabinet/filingcabinet, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "fvN" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -10989,6 +11059,7 @@ /obj/structure/cable/layer3, /obj/structure/fans/tiny/forcefield, /obj/effect/base_turf_modifier/pit, +/obj/effect/landmark/navigate_destination/minisat_access_ai, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "fHN" = ( @@ -11033,6 +11104,7 @@ color = "#009dc4"; dir = 5 }, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "fIV" = ( @@ -11335,7 +11407,9 @@ /turf/open/floor/iron/dark/textured, /area/station/maintenance/port/aft) "fQw" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -11808,6 +11882,7 @@ /obj/item/electronics/tracker, /obj/item/electronics, /obj/item/book/manual/wiki/grenades, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/station/maintenance/port/central) "gbq" = ( @@ -11882,8 +11957,9 @@ dir = 8 }, /obj/item/bedsheet/medical, +/obj/machinery/defibrillator_mount/directional/north, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "gcz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -12005,7 +12081,7 @@ "gfV" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "ggj" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/white/filled/warning{ @@ -12031,7 +12107,7 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ - name = "Head of Personel's office" + name = "Bridge Observation" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -12048,6 +12124,7 @@ /area/station/security/checkpoint/supply) "ggV" = ( /mob/living/basic/crab, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/holofloor/beach/water, /area/station/maintenance/starboard/aft) "ghc" = ( @@ -12358,9 +12435,11 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + name = "Recovery A" + }, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "gtk" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -12505,6 +12584,17 @@ /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"gwM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/engineering/main) "gwO" = ( /turf/closed/wall/r_wall, /area/station/medical/medbay/lobby) @@ -12604,7 +12694,12 @@ /obj/structure/drain, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) +"gzD" = ( +/obj/structure/closet/secure_closet/miner, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/engine, +/area/station/cargo/miningoffice) "gzE" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/white/line{ @@ -12690,7 +12785,7 @@ invisibility = 101 }, /obj/machinery/door/airlock/public/glass{ - name = "Medbay Lobby" + name = "Operating Theatre" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -12715,6 +12810,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, +/obj/effect/landmark/navigate_destination/bar, /turf/open/floor/carpet, /area/station/service/bar) "gBj" = ( @@ -12833,7 +12929,9 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "gEe" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Service Hallway" + }, /obj/effect/mapping_helpers/airlock/access/all/service/general, /obj/structure/cable, /turf/open/floor/wood, @@ -12981,7 +13079,7 @@ }, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "gJV" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden/crude, @@ -13130,6 +13228,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"gPF" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/patients_rooms/room_b) "gPH" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -13166,7 +13268,7 @@ name = "Psychology Office Fax Machine" }, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "gQC" = ( /obj/effect/gibspawner/xeno/bodypartless, /obj/structure/spider/stickyweb, @@ -13234,6 +13336,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "sci" }, +/obj/effect/landmark/navigate_destination/research, /turf/open/floor/iron/dark, /area/station/science/lobby) "gTr" = ( @@ -13299,7 +13402,7 @@ "gVL" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay Clinic" + name = "Medbay Office" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -13569,7 +13672,7 @@ }, /obj/effect/turf_decal/trimline/purple/line, /obj/structure/cable, -/turf/open/floor/iron/dark/textured_edge/airless{ +/turf/open/floor/iron/dark/textured_edge{ dir = 1 }, /area/station/science/lobby) @@ -13632,9 +13735,7 @@ }, /obj/effect/turf_decal/trimline/purple/warning, /obj/structure/cable, -/turf/open/floor/iron/dark/textured_edge/airless{ - dir = 1 - }, +/turf/open/floor/iron/dark/textured_edge, /area/station/science/lobby) "hcI" = ( /obj/machinery/light/directional/south, @@ -13764,6 +13865,7 @@ invisibility = 101 }, /obj/effect/spawner/random/trash/graffiti, +/obj/machinery/light/small/maintenance/directional/south, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "hgK" = ( @@ -14049,7 +14151,7 @@ /area/station/commons/fitness) "hoz" = ( /turf/closed/wall, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "hpg" = ( /turf/open/floor/iron/dark/textured_large, /area/station/commons/storage/emergency/starboard) @@ -14161,7 +14263,9 @@ /turf/open/floor/engine, /area/station/commons/storage/emergency/port) "htj" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -14323,7 +14427,9 @@ /turf/open/floor/plating/ocean, /area/ocean) "hwT" = ( -/obj/machinery/door/airlock/vault, +/obj/machinery/door/airlock/vault{ + name = "Secure Vault" + }, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "hwW" = ( @@ -14415,6 +14521,14 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) +"hza" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) "hzn" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 8 @@ -14591,7 +14705,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock" + name = "Test Subject Cell" }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /turf/open/floor/iron/dark/textured, @@ -14879,7 +14993,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "hJu" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14981,7 +15095,7 @@ /obj/machinery/light_switch/directional/west, /obj/item/folder/white, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "hMi" = ( /obj/effect/turf_decal/delivery, /obj/machinery/disposal/bin, @@ -15027,6 +15141,18 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"hMS" = ( +/obj/machinery/duct/industrial/waste, +/obj/effect/turf_decal/trimline/white/filled/line{ + color = "#00ff00" + }, +/obj/effect/turf_decal/trimline/white/line{ + dir = 1; + color = "#00ff00" + }, +/obj/structure/sign/directions/cryo/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) "hNe" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Warehouse" @@ -15037,6 +15163,7 @@ /area/station/engineering/main) "hNg" = ( /obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) "hNi" = ( @@ -15089,7 +15216,7 @@ /area/station/engineering/atmos) "hNZ" = ( /obj/machinery/door/airlock/virology/glass{ - name = "Isolation B" + name = "Isolation C" }, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -15360,7 +15487,7 @@ /area/station/hallway/secondary/exit/departure_lounge) "hVe" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab" + name = "Circuit Lab" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -15466,8 +15593,11 @@ /obj/item/clothing/glasses/hud/health, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 6 + }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "hXz" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -15509,6 +15639,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/main) +"hYO" = ( +/turf/closed/wall, +/area/station/medical/medbay/aft) "hZe" = ( /obj/docking_port/stationary{ dir = 4; @@ -15671,7 +15804,7 @@ /area/station/hallway/secondary/entry) "idm" = ( /obj/structure/disposaloutlet{ - name = "Prisoner Delivery" + name = "Disposals" }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -15803,7 +15936,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ihB" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -15868,7 +16001,7 @@ dir = 4 }, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + name = "Medbay Central" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 @@ -15879,7 +16012,7 @@ cycle_id = "medbay_lobby" }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ijM" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/trimline/yellow/filled/corner, @@ -15970,7 +16103,7 @@ }, /obj/item/kirbyplants/random, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "imq" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 @@ -16004,7 +16137,7 @@ /area/station/engineering/atmos/hfr_room) "imE" = ( /obj/machinery/door/airlock/mining/glass{ - name = "Mining Base" + name = "Mining Office" }, /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -16073,7 +16206,7 @@ "ipa" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ipf" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -16135,7 +16268,7 @@ /area/station/maintenance/starboard/upper) "iqr" = ( /obj/machinery/door/airlock/security{ - name = "Security Lounge" + name = "Security Break Room" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/structure/cable, @@ -16319,7 +16452,7 @@ /area/station/commons/lounge) "iut" = ( /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "iuY" = ( /obj/effect/turf_decal/tile/neutral/fourcorners{ color = "#009dc4" @@ -16737,7 +16870,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "iHJ" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet, @@ -16870,12 +17003,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" + name = "Atmospherics" }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/effect/landmark/navigate_destination/atmos, /turf/open/floor/plating, /area/station/engineering/atmos/hfr_room) "iLF" = ( @@ -16949,6 +17083,9 @@ "iMh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Fuel Pipe to Incinerator" + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "iMn" = ( @@ -17096,10 +17233,11 @@ /area/station/engineering/main) "iQE" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Teleporter Room" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/teleporter, /turf/open/floor/mineral/titanium/purple, /area/station/command/teleporter) "iQQ" = ( @@ -17233,6 +17371,12 @@ }, /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) +"iWk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "iWl" = ( /obj/machinery/vending/wardrobe/science_wardrobe, /obj/effect/turf_decal/tile/purple/opposingcorners{ @@ -17539,7 +17683,9 @@ /turf/open/floor/iron/dark/textured, /area/station/science/xenobiology) "jej" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -17713,7 +17859,7 @@ }, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "jiZ" = ( /obj/machinery/air_sensor/nitrogen_tank, /turf/open/floor/engine/n2, @@ -17738,7 +17884,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "jjp" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -17753,7 +17899,7 @@ /area/station/engineering/main) "jjG" = ( /obj/machinery/door/airlock/public/glass{ - name = "Toilet" + name = "Shower" }, /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -17773,7 +17919,8 @@ req_access = list("hop") }, /obj/machinery/door/window/brigdoor/right{ - dir = 4 + dir = 4; + name = "Head of Personnel's Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -17808,9 +17955,6 @@ pixel_x = 5; pixel_y = 7 }, -/obj/item/assembly/flash, -/obj/item/assembly/flash, -/obj/item/assembly/flash, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -17819,6 +17963,18 @@ }, /obj/item/book/manual/wiki/experimentor, /obj/item/book/manual/wiki/robotics_cyborgs, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, /turf/open/floor/noslip{ icon_state = "textured_white"; color = "#D381C9" @@ -17912,6 +18068,9 @@ /obj/item/wirecutters, /obj/item/cultivator, /obj/machinery/light_switch/directional/south, +/obj/item/grenade/chem_grenade/antiweed, +/obj/item/grenade/chem_grenade/antiweed, +/obj/item/grenade/chem_grenade/antiweed, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "jnZ" = ( @@ -17951,9 +18110,6 @@ /turf/open/floor/iron, /area/station/bitrunning/den) "jpm" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Theater - Backstage" - }, /obj/machinery/light/directional/south, /obj/effect/spawner/random/trash, /obj/structure/rack, @@ -18005,10 +18161,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) -"jrX" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating/ocean, -/area/ocean/generated_above) "jsj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -18046,7 +18198,22 @@ /obj/machinery/airalarm/directional/west, /obj/machinery/camera/directional/west, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) +"jtj" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/spawner/random/vending/colavend, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/hallway/primary/central) "jtn" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -18264,7 +18431,9 @@ /turf/open/floor/iron/dark/textured, /area/station/security/office) "jzj" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "Trench Elevator" + }, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningoffice) @@ -18303,9 +18472,6 @@ /obj/structure/sign/warning/fire/directional/east, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/components/binary/pump{ - name = "Fuel Pipe to Incinerator" - }, /obj/machinery/power/smes{ capacity = 9e+006; charge = 10000 @@ -18346,6 +18512,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 }, +/obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark, /area/station/security/office) "jAN" = ( @@ -18628,6 +18795,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/ai_monitored/command/storage/eva) +"jHb" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Fitness Backroom" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/bamboo, +/area/station/commons/fitness) "jHe" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 @@ -18930,6 +19106,9 @@ }, /turf/open/floor/iron, /area/station/service/library) +"jNR" = ( +/turf/closed/wall, +/area/station/medical/patients_rooms/room_b) "jNS" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -18993,7 +19172,7 @@ /obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "jPB" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -19252,7 +19431,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_b) "jWt" = ( /obj/machinery/ocean_elevator{ elevator_id = "mineshaft"; @@ -19534,14 +19713,6 @@ "kcP" = ( /turf/closed/wall, /area/station/commons/vacant_room/commissary) -"kda" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/structure/closet/crate/decorations, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "kdi" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -19824,9 +19995,7 @@ "kjZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation/entertainment) "kkl" = ( @@ -19872,6 +20041,7 @@ /area/station/hallway/primary/central/fore) "klp" = ( /obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/light/small/maintenance/directional/west, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "klr" = ( @@ -19923,6 +20093,8 @@ /obj/effect/turf_decal/trimline/yellow/filled/mid_joiner{ dir = 1 }, +/obj/item/stock_parts/cell, +/obj/item/stock_parts/cell, /turf/open/floor/engine, /area/station/engineering/main) "kmp" = ( @@ -20260,7 +20432,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" + name = "Gas Trubine Hall" }, /obj/structure/cable, /turf/open/floor/iron, @@ -20283,7 +20455,7 @@ /area/station/security/detectives_office) "kvV" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Cargo Lobby" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/warning{ @@ -20495,6 +20667,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 }, +/obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "kBA" = ( @@ -20544,7 +20717,7 @@ /area/station/security/office) "kCz" = ( /obj/machinery/door/airlock{ - name = "Bar" + name = "Barkeep's Office" }, /obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20619,8 +20792,8 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) "kDX" = ( -/obj/machinery/light/small/directional/north, /obj/effect/spawner/random/structure/table_or_rack, +/obj/machinery/light/small/maintenance/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/central) "kEi" = ( @@ -21040,6 +21213,7 @@ /area/station/service/hydroponics/upper) "kMx" = ( /obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/light/small/maintenance/directional/south, /turf/open/floor/plating, /area/station/maintenance/starboard/central) "kNp" = ( @@ -21088,7 +21262,7 @@ /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/mining/glass{ id_tag = "innercargo"; - name = "Cargo Bay" + name = "Cargo Auxiliary" }, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse/upper) @@ -21282,6 +21456,7 @@ /obj/machinery/door/airlock/glass_large{ name = "Head Of Personel Lobby" }, +/obj/effect/landmark/navigate_destination/hop, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "kSs" = ( @@ -21387,15 +21562,15 @@ /turf/open/floor/plating, /area/station/commons/toilet/locker) "kUS" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Toilet" - }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/machinery/door/airlock/bathroom{ + name = "Toilet" + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "kUY" = ( @@ -21599,6 +21774,13 @@ }, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) +"lbf" = ( +/obj/structure/cable/industrial, +/obj/machinery/power/terminal{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/engineering/main) "lbi" = ( /obj/effect/turf_decal/trimline/brown/corner, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -21772,7 +21954,7 @@ dir = 2 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lgp" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -21850,7 +22032,7 @@ /area/station/maintenance/port/aft) "lhr" = ( /obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" + name = "Engineering Front Desk" }, /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -22014,16 +22196,7 @@ dir = 8 }, /turf/open/floor/carpet, -/area/station/medical/medbay/central) -"lms" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/bamboo, -/area/station/commons/fitness) +/area/station/medical/psychology) "lmt" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/spaghetti/security, @@ -22099,6 +22272,7 @@ /mob/living/basic/mouse/rat, /obj/effect/spawner/random/trash, /obj/effect/spawner/random/trash, +/obj/machinery/light/small/maintenance/directional/south, /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "lpu" = ( @@ -22390,7 +22564,7 @@ /area/station/security/courtroom) "lxM" = ( /obj/machinery/door/airlock/public/glass{ - name = "Conveyor Access" + name = "Cryo" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/white/filled/warning{ @@ -22524,6 +22698,7 @@ invisibility = 101 }, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/tools, /turf/open/floor/iron, /area/ruin/space/ks13/engineering/secure_storage) "lAh" = ( @@ -22569,7 +22744,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "lAP" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, /obj/machinery/light/floor/has_bulb, @@ -22644,7 +22819,7 @@ /obj/structure/sign/departments/chemistry/pharmacy, /obj/machinery/vending/drugs, /turf/closed/wall/r_wall, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "lCD" = ( /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, @@ -22829,7 +23004,6 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "lGn" = ( @@ -22980,7 +23154,7 @@ dir = 1 }, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + name = "Medbay Central" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres{ @@ -22994,7 +23168,7 @@ cycle_id = "medbay_lobby" }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lJE" = ( /obj/structure/table/glass/plasmaglass, /obj/item/electronics/airlock, @@ -23010,7 +23184,7 @@ /area/station/maintenance/port/central) "lJV" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod One" + name = "Departures" }, /turf/open/floor/engine, /area/station/hallway/secondary/exit/departure_lounge) @@ -23058,13 +23232,6 @@ /obj/machinery/light/directional/south, /turf/closed/wall, /area/station/service/bar) -"lLl" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod Three"; - space_dir = 1 - }, -/turf/open/floor/engine, -/area/station/hallway/secondary/exit/departure_lounge) "lLz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23097,7 +23264,7 @@ /obj/effect/turf_decal/trimline/blue/corner, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "lMo" = ( /obj/structure/window/spawner/directional/south, /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ @@ -23457,7 +23624,6 @@ /area/station/hallway/primary/central) "lXc" = ( /obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) @@ -23485,7 +23651,8 @@ /area/station/hallway/primary/central/fore) "lYf" = ( /obj/machinery/door/poddoor/shutters{ - id = "cargodoor" + id = "cargodoor"; + name = "Cargo Bay Shutters" }, /turf/open/floor/plating, /area/station/cargo/storage) @@ -23588,6 +23755,7 @@ name = "Surgical Supplies"; req_access = list("surgery") }, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/white/textured, /area/station/medical/surgery/theatre) "maA" = ( @@ -23615,7 +23783,7 @@ /obj/machinery/camera/autoname/directional/north, /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_b) "mbp" = ( /obj/effect/overlay/palmtree_r, /turf/open/floor/holofloor/beach, @@ -23783,7 +23951,7 @@ /obj/effect/mapping_helpers/airlock/unres, /obj/machinery/door/airlock/mining/glass{ id_tag = "innercargo"; - name = "Cargo Bay" + name = "Cargo Auxiliary" }, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse/upper) @@ -23792,6 +23960,14 @@ /obj/item/stack/sheet/iron, /turf/open/floor/eighties/red, /area/station/service/electronic_marketing_den) +"mgQ" = ( +/obj/machinery/door/airlock/external{ + name = "Trench Elevator" + }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, +/obj/effect/landmark/navigate_destination/oshan/miningelevator, +/turf/open/floor/iron, +/area/station/cargo/miningoffice) "mgS" = ( /obj/machinery/light/directional/east, /turf/closed/wall, @@ -23802,6 +23978,10 @@ }, /turf/open/floor/engine, /area/station/commons/storage/emergency/starboard) +"mhd" = ( +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "mhX" = ( /obj/machinery/power/terminal{ dir = 1 @@ -23880,7 +24060,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mkv" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -23890,7 +24070,7 @@ /area/station/engineering/atmos) "mkE" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Two"; + name = "Departures"; space_dir = 1 }, /turf/open/floor/engine, @@ -24072,7 +24252,7 @@ /area/station/medical/office) "moq" = ( /obj/machinery/door/airlock/security{ - name = "Brig Office" + name = "Warden's Office" }, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/structure/cable, @@ -24232,7 +24412,7 @@ }, /obj/effect/turf_decal/trimline/blue/warning, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + name = "Medbay Central" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/unres{ @@ -24246,6 +24426,7 @@ cycle_id = "medbay_lobby" }, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/med, /turf/open/floor/iron/dark/textured, /area/station/medical/medbay/lobby) "msT" = ( @@ -24390,14 +24571,6 @@ }, /turf/open/floor/iron/dark/textured_corner, /area/station/engineering/main) -"mvi" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "mvl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -24427,6 +24600,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) +"mwm" = ( +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/station/medical/cryo) "mwr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24459,7 +24636,7 @@ /area/station/medical/medbay/lobby) "mxq" = ( /obj/machinery/door/airlock/research{ - name = "Research Division Access" + name = "Robotics Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/structure/disposalpipe/segment{ @@ -24495,6 +24672,20 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) +"myt" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Dorms" + }, +/obj/effect/turf_decal/trimline/white/filled/warning{ + dir = 1; + color = "#009dc4" + }, +/obj/effect/turf_decal/trimline/white/filled/warning{ + color = "#009dc4" + }, +/obj/effect/landmark/navigate_destination/dorms, +/turf/open/floor/iron/dark/textured, +/area/station/commons/dorms) "mzD" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/structure/cable, @@ -24573,7 +24764,7 @@ /obj/structure/chair/sofa/left/brown, /obj/machinery/light_switch/directional/north, /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "mBG" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/south{ @@ -24698,7 +24889,7 @@ /area/station/hallway/primary/central/fore) "mFK" = ( /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mFX" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/entertainment/arcade, @@ -24866,7 +25057,7 @@ }, /obj/machinery/iv_drip, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "mJW" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -24888,10 +25079,6 @@ /obj/item/food/pie/mimetart, /turf/open/floor/mineral/titanium/yellow, /area/station/maintenance/starboard/aft) -"mLg" = ( -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/engine, -/area/station/cargo/miningoffice) "mLp" = ( /obj/effect/turf_decal/trimline/white/filled/warning{ dir = 1; @@ -24973,7 +25160,7 @@ /turf/open/floor/engine, /area/station/engineering/main) "mMl" = ( -/obj/machinery/door/airlock/public/glass{ +/obj/machinery/door/airlock/bathroom{ name = "Toilet" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25181,7 +25368,6 @@ /area/station/maintenance/starboard/aft) "mSi" = ( /obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -25194,6 +25380,7 @@ /obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ dir = 8 }, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, /turf/open/floor/iron/dark/textured_edge{ dir = 8 }, @@ -25235,7 +25422,7 @@ /obj/structure/drain, /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "mTy" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/portable_atmospherics/scrubber, @@ -25564,7 +25751,7 @@ /area/station/security/office) "nbU" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Courtroom" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/red/filled/warning{ @@ -25812,12 +25999,13 @@ /area/station/hallway/secondary/exit/departure_lounge) "nhl" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Courtroom" }, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, /obj/effect/turf_decal/trimline/red/filled/warning, +/obj/effect/landmark/navigate_destination/court, /turf/open/floor/iron/dark/textured, /area/station/security/courtroom) "nhw" = ( @@ -25920,7 +26108,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "niT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -26015,7 +26203,7 @@ }, /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_a) "nkL" = ( /obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -26164,7 +26352,7 @@ /area/station/cargo/storage) "noF" = ( /turf/open/floor/carpet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "noG" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -26213,6 +26401,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, /turf/open/floor/plastic, /area/station/hallway/primary/central) "nqf" = ( @@ -26303,7 +26492,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "nsX" = ( /obj/effect/turf_decal/stripes{ dir = 5 @@ -26386,7 +26575,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "nuD" = ( /obj/machinery/computer/scan_consolenew, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -26468,7 +26657,7 @@ }, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "nwW" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -26598,6 +26787,14 @@ /obj/item/book/manual/wiki/ordnance, /turf/open/floor/carpet/blue, /area/station/commons/fitness/recreation/entertainment) +"nzs" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central/fore) "nzt" = ( /obj/structure/table/reinforced, /obj/item/flashlight, @@ -26714,7 +26911,7 @@ /area/station/command/heads_quarters/hop) "nCm" = ( /obj/machinery/door/airlock/command/glass{ - name = "Head of Personel's office" + name = "Head of Personel's Office" }, /obj/effect/mapping_helpers/airlock/access/any/command/hop, /obj/structure/cable, @@ -26888,7 +27085,7 @@ }, /obj/effect/turf_decal/trimline/blue/line, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "nGD" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -26903,6 +27100,14 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) +"nGX" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central) "nHa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26974,20 +27179,6 @@ /obj/effect/turf_decal/sand, /turf/open/floor/plating/ocean, /area/ocean) -"nIO" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Hole Access" - }, -/obj/machinery/duct/industrial/waste, -/obj/effect/turf_decal/trimline/white/filled/warning{ - color = "#009dc4" - }, -/obj/effect/turf_decal/trimline/white/filled/warning{ - dir = 1; - color = "#009dc4" - }, -/turf/open/floor/iron/dark/textured, -/area/station/hallway/primary/central) "nIT" = ( /obj/machinery/atmospherics/pipe/smart/simple/supply/visible{ dir = 5 @@ -27103,7 +27294,7 @@ /area/station/engineering/main) "nLt" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Operating Room" + name = "Operating Theatre" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/duct/industrial/waste, @@ -27122,6 +27313,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) +"nLO" = ( +/obj/effect/spawner/random/trash, +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "nLQ" = ( /obj/structure/table, /obj/item/kitchen/rollingpin, @@ -27145,6 +27341,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Chapel" }, +/obj/effect/landmark/navigate_destination/chapel, /turf/open/floor/iron/chapel{ dir = 8 }, @@ -27246,15 +27443,6 @@ /obj/structure/sign/chalkboard_menu, /turf/closed/wall, /area/station/service/cafeteria) -"nPx" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark/textured, -/area/station/hallway/primary/central/fore) "nPJ" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 6 @@ -27349,6 +27537,7 @@ /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "nTW" = ( @@ -27571,6 +27760,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"obz" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/plating, +/area/station/engineering/main) "obQ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -27596,7 +27790,7 @@ }, /obj/machinery/door/airlock/mining/glass{ id_tag = "innercargo"; - name = "Cargo Bay" + name = "Cargo Deliveries" }, /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) @@ -27801,6 +27995,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 1 }, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) "ogA" = ( @@ -28020,6 +28215,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"okY" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/light/small/maintenance/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "ols" = ( /turf/closed/wall, /area/station/medical/medbay/central) @@ -28124,7 +28324,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "onJ" = ( /obj/machinery/vending/mechcomp, /obj/effect/turf_decal/tile/purple/opposingcorners{ @@ -28277,7 +28477,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "ort" = ( -/obj/structure/cable, /turf/open/floor/iron/stairs{ dir = 4 }, @@ -28312,13 +28511,6 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/hydroponics) -"osy" = ( -/obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/east, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark/textured, -/area/station/hallway/primary/central) "osG" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -28365,7 +28557,7 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/pharmacy, /obj/effect/mapping_helpers/airlock/access/any/medical/general, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "otz" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -28446,7 +28638,7 @@ /area/station/service/chapel) "ouW" = ( /obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" + name = "Atmospherics" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/structure/fans/tiny/forcefield, @@ -28676,7 +28868,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "ozV" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, @@ -28741,6 +28933,11 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"oBK" = ( +/obj/effect/spawner/random/structure/grille, +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "oBO" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -28922,7 +29119,6 @@ /area/station/cargo/sorting) "oIg" = ( /obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -28989,7 +29185,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "oKD" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -29018,7 +29214,7 @@ "oMo" = ( /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "oMw" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -29063,7 +29259,7 @@ /area/station/security/checkpoint/customs) "oOg" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office" + name = "Crematorium" }, /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29123,10 +29319,11 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) "oQe" = ( -/obj/machinery/meter, /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/machinery/power/terminal{ + dir = 1 + }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "oQn" = ( @@ -29376,7 +29573,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig" + name = "Security Lounge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -29633,7 +29830,7 @@ "pfg" = ( /obj/item/kirbyplants/random, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pfl" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/disposal/bin{ @@ -29671,6 +29868,7 @@ /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 8 }, +/obj/effect/landmark/navigate_destination/dockesc, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) "pgi" = ( @@ -29763,7 +29961,8 @@ dir = 8 }, /obj/machinery/door/window/brigdoor/left{ - dir = 4 + dir = 4; + name = "Head of Personnel's Desk" }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -29818,7 +30017,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pjg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -30159,6 +30358,11 @@ }, /turf/open/floor/iron/dark/textured, /area/mine/storage/public) +"pqi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/rnd/server, +/turf/open/floor/circuit/telecomms/server, +/area/station/science/server) "pqp" = ( /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -30239,7 +30443,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "pse" = ( /obj/structure/table/wood, /obj/machinery/camera/autoname/directional/south, @@ -30282,6 +30486,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"pta" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Isolation A" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/medical/virology) "ptm" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -30365,7 +30578,6 @@ /turf/open/floor/iron, /area/station/commons/fitness/recreation/entertainment) "pww" = ( -/obj/machinery/door/airlock, /obj/machinery/door/firedoor, /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/warning{ @@ -30375,6 +30587,10 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/machinery/door/airlock/mining/glass{ + id_tag = "innercargo"; + name = "Cargo Bay" + }, /turf/open/floor/iron/dark/textured, /area/station/cargo/storage) "pwA" = ( @@ -30508,6 +30724,10 @@ /obj/structure/closet/crate, /turf/open/floor/carpet/executive, /area/station/command/bridge) +"pAa" = ( +/obj/machinery/plumbing/disposer, +/turf/open/floor/plating, +/area/station/maintenance/starboard/central) "pAg" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -30722,7 +30942,7 @@ }, /obj/machinery/light/directional/south, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pHe" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -30792,7 +31012,7 @@ autoclose = 0; frequency = 1449; id_tag = "xeno_airlock_exterior"; - name = "Xenobiology Lab External Airlock" + name = "Xenobiology Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable, @@ -30850,7 +31070,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "pIW" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -31042,11 +31262,23 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/central) +"pNk" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/structure/table, +/obj/item/healthanalyzer, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/light_switch/directional/west, +/obj/item/folder/white, +/turf/open/floor/iron/white/textured, +/area/station/medical/patients_rooms/room_b) "pNw" = ( /obj/effect/landmark/start/psychologist, /obj/structure/chair/office/light, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "pNB" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -31173,15 +31405,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"pPD" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/structure/closet/crate/rcd, -/obj/effect/turf_decal/bot, -/obj/machinery/light/no_nightlight/directional/east, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "pPR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31426,7 +31649,7 @@ /area/station/commons/lounge) "pXk" = ( /obj/machinery/door/airlock/research{ - name = "Ordnance Lab" + name = "Ordinance Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /obj/structure/cable, @@ -31483,7 +31706,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/turf/open/floor/iron/dark/textured_edge/airless{ +/turf/open/floor/iron/dark/textured_edge{ dir = 1 }, /area/station/science/lobby) @@ -31657,13 +31880,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/sorting) -"qbI" = ( -/obj/machinery/door/airlock/research{ - name = "Ordnance Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/xenobio, -/turf/open/floor/iron/dark/textured, -/area/station/science/xenobiology) "qbO" = ( /obj/effect/landmark/start/station_engineer, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -31743,7 +31959,7 @@ /area/station/medical/medbay/lobby) "qdj" = ( /obj/machinery/door/airlock{ - name = "Kitchen" + name = "Service Hallway" }, /obj/effect/mapping_helpers/airlock/access/all/service/general, /obj/machinery/door/firedoor, @@ -31901,7 +32117,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/psychology, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "qhu" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ @@ -32038,7 +32254,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_b) "qlS" = ( /obj/machinery/conveyor/auto/inside_corners{ dir = 10 @@ -32451,7 +32667,7 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "quy" = ( -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "quS" = ( @@ -32494,7 +32710,7 @@ dir = 2 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "qvJ" = ( /obj/machinery/computer/rdconsole{ dir = 8 @@ -32560,7 +32776,7 @@ "qxL" = ( /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/machinery/door/airlock{ - name = "Kitchen Access" + name = "The Goat Locker" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32620,10 +32836,11 @@ /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop" - }, /obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/machinery/door/airlock/engineering{ + name = "Tech Storage" + }, +/obj/effect/landmark/navigate_destination/techstorage, /turf/open/floor/iron/dark/textured, /area/station/engineering/storage/tech) "qAb" = ( @@ -32784,6 +33001,10 @@ /obj/effect/turf_decal/trimline/green/filled/warning, /turf/open/floor/iron/dark/textured, /area/station/commons/lounge) +"qFo" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/grimy, +/area/station/hallway/secondary/service) "qFt" = ( /obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 4 @@ -32820,7 +33041,13 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) +"qGL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "qGV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33243,7 +33470,7 @@ /area/station/command/heads_quarters/hop) "qRz" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "qRD" = ( @@ -33295,8 +33522,9 @@ pixel_y = 2 }, /obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "qRY" = ( /turf/closed/wall, /area/station/cargo/miningoffice) @@ -33347,7 +33575,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/upper) "qTc" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, @@ -33438,6 +33668,12 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"qWb" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Maintenance Garden" + }, +/turf/open/floor/grass, +/area/station/maintenance/starboard/upper) "qWf" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -33463,13 +33699,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) -"qWq" = ( -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "qWx" = ( /obj/structure/table/wood, /obj/structure/desk_bell{ @@ -33765,11 +33994,6 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/white/textured, /area/station/medical/pharmacy) -"rdF" = ( -/obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/service/hydroponics) "rdL" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -33916,7 +34140,9 @@ /turf/open/floor/iron/white/textured, /area/station/medical/medbay/lobby) "rhO" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + name = "External Access" + }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -33999,7 +34225,7 @@ /area/station/ai_monitored/security/armory) "riU" = ( /obj/machinery/door/airlock/research{ - name = "Ordnance Lab" + name = "Ordinance Lab" }, /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, @@ -34172,9 +34398,6 @@ }, /turf/open/floor/iron/dark/textured_edge, /area/station/science/lobby) -"rou" = ( -/turf/closed/wall/r_wall, -/area/station/medical/surgery/aft) "row" = ( /obj/machinery/ocean_elevator{ elevator_id = "mineshaft"; @@ -34327,6 +34550,9 @@ /area/station/security/checkpoint/customs) "rsL" = ( /obj/effect/spawner/structure/window/reinforced/plasma, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) "rsO" = ( @@ -34358,7 +34584,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rtr" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/machinery/portable_atmospherics/pump, @@ -34498,12 +34724,6 @@ }, /turf/open/floor/engine, /area/station/engineering/main) -"rxw" = ( -/obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/starboard/central) "rxF" = ( /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, @@ -34562,7 +34782,7 @@ }, /obj/machinery/stasis, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rzB" = ( /obj/effect/landmark/start/bartender, /obj/machinery/light/floor/has_bulb, @@ -34668,6 +34888,7 @@ id = "detective_shutters"; name = "Detective's Office Shutters" }, +/obj/effect/landmark/navigate_destination/det, /turf/open/floor/wood, /area/station/security/detectives_office) "rCz" = ( @@ -34782,7 +35003,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/curtain, /turf/open/floor/noslip, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rEC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34883,7 +35104,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "rHY" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -34895,7 +35116,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "rIh" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -34943,9 +35164,8 @@ /turf/open/floor/bamboo, /area/station/commons/fitness) "rJc" = ( -/obj/machinery/door/airlock/medical/glass{ - id_tag = "MedbayFoyer"; - name = "Medbay Clinic" +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 4 @@ -35046,7 +35266,7 @@ }, /obj/effect/turf_decal/stripes, /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; + name = "Engineering Access"; space_dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -35059,7 +35279,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/stairs, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "rLb" = ( /obj/machinery/duct/industrial/waste, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -35139,7 +35359,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "rNz" = ( /obj/machinery/door/airlock/security{ name = "Detective's Office" @@ -35498,6 +35718,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"rVE" = ( +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, +/turf/open/floor/carpet/neon/simple/orange/nodots, +/area/station/bitrunning/den) "rWm" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/trimline/brown, @@ -35527,9 +35752,6 @@ /turf/open/floor/engine, /area/station/engineering/main) "rWM" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Toilet" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -35538,6 +35760,9 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 }, +/obj/machinery/door/airlock/bathroom{ + name = "Toilet" + }, /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) "rXf" = ( @@ -35588,7 +35813,7 @@ }, /obj/structure/bookcase/random/reference, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "rZw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/duct/industrial/waste, @@ -35745,9 +35970,6 @@ /turf/open/floor/engine, /area/station/science/robotics/lab) "seR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Toilet" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/science/general, @@ -35757,6 +35979,9 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 }, +/obj/machinery/door/airlock/bathroom{ + name = "Toilet" + }, /turf/open/floor/iron/showroomfloor, /area/station/science/lobby) "seY" = ( @@ -35832,11 +36057,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) -"sgQ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/glass/reinforced, -/area/station/engineering/main) "shh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -35927,6 +36147,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/service) "skv" = ( @@ -35992,6 +36215,7 @@ name = "Kitchen" }, /obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/kitchen, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "smf" = ( @@ -36061,12 +36285,13 @@ /area/station/engineering/atmos) "som" = ( /obj/machinery/door/airlock/public/glass{ - name = "Chapel Office" + name = "Crematorium" }, /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/incinerator, /turf/open/floor/iron/dark, /area/station/service/chapel/office) "spI" = ( @@ -36216,6 +36441,10 @@ dir = 4 }, /area/station/security/warden) +"ssI" = ( +/obj/machinery/light/small/maintenance/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "ssO" = ( /mob/living/basic/pet/fox/renault, /obj/structure/bed/dogbed/renault, @@ -36223,7 +36452,7 @@ /area/station/command/heads_quarters/captain/private) "ssP" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Captain's Quarters" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/open/floor/iron/dark/textured, @@ -36523,7 +36752,7 @@ }, /obj/machinery/iv_drip, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "sAA" = ( /obj/structure/cable/industrial, /turf/open/floor/iron/stairs, @@ -36542,7 +36771,7 @@ dir = 9 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "sBe" = ( /obj/structure/table/wood, /obj/item/food/ready_donk/mac_n_cheese, @@ -36597,13 +36826,24 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/engineering/main) +"sCD" = ( +/obj/structure/cable, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/medical/medbay/lobby) "sCJ" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"sCR" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/trash, +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "sCS" = ( /obj/machinery/door/airlock/security{ - name = "Security Lounge" + name = "Security Locker Room" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -36691,7 +36931,8 @@ /area/station/hallway/secondary/exit/departure_lounge) "sFa" = ( /obj/machinery/door/poddoor/shutters{ - id = "cargodoor" + id = "cargodoor"; + name = "Warehouse Shutters" }, /turf/open/floor/plating, /area/station/cargo/warehouse) @@ -36711,7 +36952,7 @@ /area/station/command/heads_quarters/captain/private) "sFK" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Conference Room" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor/preopen{ @@ -36882,6 +37123,11 @@ }, /turf/open/floor/wood/large, /area/station/security/checkpoint/customs) +"sJJ" = ( +/obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "sJM" = ( /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/structure/table_or_rack, @@ -37342,7 +37588,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "sVF" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -37374,6 +37620,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"sWn" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/hallway/primary/central) "sWz" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -37415,6 +37676,14 @@ }, /turf/open/floor/plastic, /area/station/hallway/primary/central) +"sYk" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 1 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos) "sYn" = ( /turf/open/floor/wood, /area/station/cargo/miningoffice) @@ -37554,6 +37823,9 @@ /obj/structure/railing, /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) +"tdm" = ( +/turf/open/floor/carpet/neon/simple/orange/nodots, +/area/station/bitrunning/den) "tdt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37675,14 +37947,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) -"tgz" = ( -/obj/machinery/duct/industrial/waste, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small/directional/east, -/obj/effect/spawner/random/trash/graffiti, -/turf/open/floor/plating, -/area/station/maintenance/starboard/central) +/area/station/medical/patients_rooms/room_a) "tgE" = ( /turf/open/floor/iron/stairs{ dir = 4 @@ -37911,7 +38176,7 @@ /area/station/commons/fitness/recreation/entertainment) "toq" = ( /obj/machinery/door/airlock/security{ - name = "Evidence Storage"; + name = "Warden's Bunk"; id_tag = "wardbed" }, /obj/effect/mapping_helpers/airlock/access/all/security/armory, @@ -38019,11 +38284,8 @@ /turf/open/floor/iron/white/textured_large, /area/station/science/robotics/lab) "tsb" = ( -/obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - space_dir = 4 - }, /obj/structure/cable, +/obj/machinery/door/airlock/maintenance, /turf/open/floor/plating, /area/station/engineering/main) "tso" = ( @@ -38089,6 +38351,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/mapping_helpers/airlock/access/any/medical, /obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/mapping_helpers/airlock/access/any/medical, /turf/open/floor/iron/white/textured, /area/station/science/genetics) "tuT" = ( @@ -38125,7 +38388,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "tvt" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38245,11 +38508,7 @@ /turf/open/floor/wood, /area/station/commons/fitness/recreation/entertainment) "tzi" = ( -/obj/machinery/power/terminal, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) @@ -38260,9 +38519,6 @@ /turf/open/floor/wood, /area/station/commons/lounge) "tzt" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, /obj/machinery/door/firedoor, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/supply/general, @@ -38272,6 +38528,10 @@ /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 8 }, +/obj/machinery/door/airlock/mining/glass{ + id_tag = "innercargo"; + name = "Cargo Warehouse" + }, /turf/open/floor/iron/dark/textured, /area/station/cargo/warehouse) "tzD" = ( @@ -38351,7 +38611,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/surgery/aft) +/area/station/medical/patients_rooms/room_b) "tBQ" = ( /turf/closed/wall, /area/station/medical/surgery/theatre) @@ -38387,7 +38647,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "tCm" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 9 @@ -38769,6 +39029,10 @@ }, /turf/open/floor/plastic, /area/station/hallway/primary/central) +"tLw" = ( +/obj/machinery/light/small/maintenance/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "tLz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39342,11 +39606,12 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/janitor, /turf/open/floor/iron/dark, /area/station/service/janitor) "uby" = ( /obj/machinery/door/airlock/research{ - name = "Robotics Lab" + name = "Circuit Lab" }, /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -39466,23 +39731,24 @@ /obj/effect/turf_decal/trimline/red/filled/warning, /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; - name = "Brig" + name = "Security" }, /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" }, +/obj/effect/landmark/navigate_destination/sec, /turf/open/floor/iron/dark/textured, /area/station/security/office) "udB" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance" }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /obj/effect/turf_decal/trimline/red/filled/warning, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/plating, /area/station/maintenance/port/aft) "udH" = ( @@ -39548,7 +39814,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "ueN" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -39664,7 +39930,7 @@ /area/station/engineering/main) "uhe" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Cargo Lobby" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -39676,7 +39942,7 @@ "uhh" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = "MedbayFoyer"; - name = "Medbay Clinic" + name = "Medbay Office" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -39700,7 +39966,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured_large, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uhr" = ( /obj/structure/cable, /obj/structure/table, @@ -39720,7 +39986,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "uhB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -39855,6 +40121,9 @@ /area/station/command/heads_quarters/cmo) "umT" = ( /obj/effect/spawner/random/trash, +/obj/machinery/camera/directional/south{ + c_tag = "Theater - Backstage" + }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) "umX" = ( @@ -40361,10 +40630,6 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit, /area/station/tcommsat/server) -"uyC" = ( -/obj/effect/landmark/start/prisoner, -/turf/open/floor/plating/ocean/pit, -/area/ocean) "uyU" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 10 @@ -40432,7 +40697,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct/industrial/waste, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uAJ" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 4 @@ -40465,6 +40730,7 @@ /obj/structure/toilet, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/mob_spawn/corpse/human/assistant, +/obj/machinery/light/small/maintenance/directional/north, /turf/open/floor/iron/white, /area/station/maintenance/starboard/upper) "uBI" = ( @@ -40586,7 +40852,7 @@ /area/station/science/genetics) "uDY" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Conference Room" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor/preopen{ @@ -40688,7 +40954,7 @@ /area/station/engineering/atmos) "uGl" = ( /obj/machinery/door/airlock/public/glass{ - name = "Medbay Lobby" + name = "Genetics" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40698,7 +40964,7 @@ /area/station/science/genetics) "uGB" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Dorms" }, /obj/effect/turf_decal/trimline/white/filled/warning{ dir = 1; @@ -40710,7 +40976,9 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/dorms) "uGD" = ( -/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/airlock/maintenance{ + name = "Forbidden Garden" + }, /turf/open/floor/grass, /area/station/maintenance/starboard/upper) "uGO" = ( @@ -40731,7 +40999,7 @@ dir = 1 }, /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; + name = "External Access"; space_dir = 4 }, /obj/machinery/duct/industrial/waste, @@ -40879,7 +41147,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/wood/parquet, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "uKT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40898,6 +41166,7 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" }, +/obj/effect/landmark/navigate_destination/dockarrival, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) "uLl" = ( @@ -41008,7 +41277,7 @@ dir = 8 }, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uNu" = ( /obj/effect/turf_decal/stripes, /obj/structure/disposalpipe/segment, @@ -41041,7 +41310,7 @@ "uOF" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "uOL" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -41123,7 +41392,7 @@ /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth, /turf/open/floor/plating, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "uQJ" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/wood, @@ -41237,13 +41506,14 @@ /area/station/engineering/atmos) "uSv" = ( /obj/machinery/door/airlock/public/glass{ - name = "Art Gallery" + name = "Library" }, /obj/structure/cable, /obj/effect/turf_decal/trimline/green/filled/warning, /obj/effect/turf_decal/trimline/green/filled/warning{ dir = 1 }, +/obj/effect/landmark/navigate_destination/library, /turf/open/floor/iron/dark/textured, /area/station/service/library) "uSB" = ( @@ -41285,6 +41555,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"uTr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "uTw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/south{ @@ -41437,6 +41712,7 @@ pixel_y = 5 }, /obj/item/stack/cable_coil, +/obj/machinery/cell_charger, /turf/open/floor/iron, /area/ruin/space/ks13/engineering/secure_storage) "uVH" = ( @@ -41639,7 +41915,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction/flip, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vcU" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -41800,8 +42076,8 @@ /turf/open/floor/mineral/bananium, /area/station/maintenance/starboard/aft) "vfK" = ( -/obj/machinery/light/small/directional/east, /obj/effect/spawner/random/trash, +/obj/machinery/light/small/maintenance/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) "vfM" = ( @@ -42086,7 +42362,7 @@ /area/station/service/hydroponics) "vmt" = ( /obj/machinery/door/airlock/public/glass{ - name = "Central Access" + name = "Cargo Lobby" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -42099,6 +42375,7 @@ /obj/effect/turf_decal/trimline/brown/filled/warning{ dir = 4 }, +/obj/effect/landmark/navigate_destination/cargo, /turf/open/floor/iron/dark/diagonal, /area/station/cargo/lobby) "vmz" = ( @@ -42183,15 +42460,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/office) -"voC" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 6 - }, -/obj/structure/closet/crate/engineering, -/obj/effect/turf_decal/bot, -/obj/item/construction/plumbing/engineering, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/main) "voJ" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 1 @@ -42216,11 +42484,18 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /obj/structure/cable, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"vqk" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/hallway/primary/central/fore) "vqB" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/neutral, @@ -42234,6 +42509,17 @@ }, /turf/open/floor/iron/smooth, /area/station/commons/fitness/recreation) +"vqH" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/structure/closet/crate/rcd, +/obj/effect/turf_decal/bot, +/obj/machinery/light/no_nightlight/directional/east, +/obj/item/construction/plumbing/engineering, +/obj/item/construction/plumbing/engineering, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/main) "vrg" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -42679,6 +42965,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/navigate_destination/disposals, /turf/open/floor/plating, /area/station/maintenance/disposal) "vBW" = ( @@ -42693,7 +42980,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "vCo" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -43032,7 +43319,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/sign/warning/no_smoking, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vOg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43074,15 +43361,6 @@ "vPb" = ( /turf/open/floor/circuit/telecomms/server, /area/station/science/server) -"vPp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/floor/has_bulb, -/turf/open/floor/iron/dark/textured, -/area/station/hallway/primary/central/fore) "vPr" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -43274,7 +43552,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "vUu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43573,12 +43851,12 @@ /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/exit/departure_lounge) "waM" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Toilet" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/door/airlock/bathroom{ + name = "Toilet" + }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) "wbl" = ( @@ -43620,7 +43898,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 }, -/obj/machinery/light/very_dim/directional/north, +/obj/machinery/light/directional/north, /turf/open/floor/iron/dark, /area/station/science/lobby) "wcc" = ( @@ -43904,7 +44182,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wiA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43920,7 +44198,7 @@ /obj/machinery/duct/industrial/waste, /obj/structure/cable, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wiK" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, @@ -43987,6 +44265,11 @@ }, /turf/open/floor/iron/textured, /area/station/science/robotics/lab) +"wlw" = ( +/obj/effect/spawner/random/trash/graffiti, +/obj/machinery/light/small/maintenance/directional/north, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "wlx" = ( /turf/open/floor/iron/chapel{ dir = 4 @@ -44045,7 +44328,7 @@ "wnf" = ( /obj/effect/turf_decal/stripes, /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; + name = "External Access"; space_dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -44297,7 +44580,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /turf/open/floor/iron/white, -/area/station/medical/medbay/central) +/area/station/medical/psychology) "wtT" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -44309,7 +44592,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/medical_kiosk, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wuf" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -44337,7 +44620,7 @@ name = "Privacy Shutter" }, /obj/machinery/door/airlock/command/glass{ - name = "Chief Engineer" + name = "Chief Engineer's Office" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/ce, /turf/open/floor/iron, @@ -44477,6 +44760,7 @@ /obj/machinery/door/airlock/highsecurity{ name = "Secure Network Access" }, +/obj/effect/landmark/navigate_destination/tcomms, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "wzI" = ( @@ -44639,16 +44923,14 @@ /turf/open/floor/iron/dark/textured, /area/mine/storage/public) "wCH" = ( -/obj/machinery/defibrillator_mount/directional/north, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, /obj/effect/turf_decal/trimline/blue/corner{ dir = 8 }, -/obj/machinery/light/directional/east, /turf/closed/wall, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wCJ" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable, @@ -44805,7 +45087,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/line, -/turf/open/floor/iron/dark/textured_edge/airless{ +/turf/open/floor/iron/dark/textured_edge{ dir = 1 }, /area/station/science/lobby) @@ -44842,6 +45124,15 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/bridge) +"wIK" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/closed/wall/r_wall, +/area/station/medical/cryo) +"wJd" = ( +/obj/structure/cable, +/obj/machinery/light/small/maintenance/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/starboard/upper) "wJz" = ( /obj/effect/spawner/liquids_spawner{ reagent_list = list(/datum/reagent/ammonia/urine=400) @@ -44885,6 +45176,7 @@ dir = 9 }, /obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/spawner/random/vending/colavend, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central/fore) "wKV" = ( @@ -44993,7 +45285,7 @@ dir = 10 }, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "wOu" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/machinery/vending/wardrobe/jani_wardrobe, @@ -45197,9 +45489,6 @@ "wSx" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) @@ -45243,7 +45532,7 @@ /area/station/engineering/main) "wUi" = ( /obj/machinery/door/airlock/medical/glass{ - name = "Operating Room" + name = "Medical Cryogenics" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/duct/industrial/waste, @@ -45323,6 +45612,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/ocean, /area/ocean) +"wWz" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/structure/rack, +/obj/machinery/light/dim/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/cargo/warehouse) "wWE" = ( /obj/effect/mapping_helpers/airlock/access/any/command/hop, /obj/machinery/door/firedoor, @@ -45331,7 +45628,7 @@ name = "Council Blast Doors" }, /obj/machinery/door/airlock/command/glass{ - name = "Head of Personel's office" + name = "Head of Personel's Office" }, /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -45352,6 +45649,13 @@ /obj/item/crowbar, /turf/open/floor/iron/dark/textured, /area/station/hallway/secondary/entry) +"wXh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/closet/crate/decorations, +/obj/effect/turf_decal/bot, +/turf/open/floor/glass/reinforced, +/area/station/engineering/main) "wXn" = ( /obj/machinery/suit_storage_unit/mining, /obj/structure/disposalpipe/segment{ @@ -45404,7 +45708,7 @@ invisibility = 101 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wYo" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/item/restraints/legcuffs/beartrap, @@ -45472,7 +45776,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "wZW" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/door/firedoor, @@ -45484,7 +45788,7 @@ }, /obj/machinery/door/airlock/mining/glass{ id_tag = "innercargo"; - name = "Cargo Bay" + name = "Cargo Deliveries" }, /turf/open/floor/iron/dark/textured, /area/station/cargo/sorting) @@ -45499,6 +45803,7 @@ /obj/item/defibrillator/loaded, /obj/effect/turf_decal/tile/blue/full, /obj/structure/window/spawner/directional/north, +/obj/item/defibrillator/loaded, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "xae" = ( @@ -45738,9 +46043,6 @@ }, /obj/structure/window/spawner/directional/south, /obj/effect/turf_decal/tile/green/half/contrasted, -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics Monitoring" - }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) "xeT" = ( @@ -45783,7 +46085,7 @@ }, /obj/effect/turf_decal/trimline/blue/corner, /obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics Bay" + name = "Medbay Central" }, /obj/effect/mapping_helpers/airlock/unres{ dir = 1 @@ -45913,6 +46215,7 @@ "xkw" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, +/obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark/textured, /area/station/science/cytology) "xkQ" = ( @@ -45933,6 +46236,10 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/station/maintenance/port/central) +"xlk" = ( +/obj/machinery/light/small/maintenance/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/central) "xlo" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 9 @@ -46087,7 +46394,7 @@ }, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "xoP" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -46316,7 +46623,7 @@ /area/station/commons/lounge) "xtz" = ( /obj/machinery/door/airlock/command/glass{ - name = "Bridge" + name = "Conference Room" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46350,6 +46657,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) +"xtU" = ( +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/white/textured, +/area/station/medical/patients_rooms/room_b) "xtZ" = ( /turf/closed/wall, /area/station/commons/toilet/restrooms) @@ -46435,9 +46749,8 @@ /area/station/commons/storage/emergency/starboard) "xvO" = ( /obj/machinery/door/airlock/maintenance{ - name = "Security Maintenance" + name = "Security Suit Storage" }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 8 @@ -46451,6 +46764,7 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 8 }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark/textured, /area/station/security/brig) "xvP" = ( @@ -46498,11 +46812,6 @@ /obj/structure/cable, /turf/open/floor/plastic, /area/station/hallway/primary/central) -"xxc" = ( -/obj/machinery/light/small/directional/south, -/obj/effect/spawner/random/structure/table_or_rack, -/turf/open/floor/plating, -/area/station/maintenance/starboard/central) "xxx" = ( /obj/structure/window/reinforced/tinted/frosted{ dir = 4 @@ -46857,7 +47166,7 @@ }, /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/white/textured, -/area/station/medical/medbay/central) +/area/station/medical/medbay/aft) "xGf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46883,7 +47192,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xGC" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, @@ -46891,7 +47200,7 @@ "xGJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Foyer" + name = "Engineering Break Room" }, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/effect/turf_decal/trimline/yellow/filled/warning{ @@ -47274,7 +47583,7 @@ dir = 4 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xPG" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -47303,7 +47612,7 @@ }, /obj/machinery/door/airlock/security/glass{ id_tag = "innerbrig"; - name = "Brig" + name = "Security Lounge" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "brig-entrance" @@ -47472,10 +47781,10 @@ /turf/open/floor/iron, /area/station/commons/storage/emergency/port) "xUd" = ( -/obj/machinery/door/airlock/public/glass{ +/obj/structure/cable, +/obj/machinery/door/airlock/bathroom{ name = "Toilet" }, -/obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/restrooms) "xUe" = ( @@ -47532,6 +47841,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/service/general, +/obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/dark/textured, /area/station/service/hydroponics) "xUD" = ( @@ -47539,10 +47849,10 @@ /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/atmos/glass{ - name = "Distribution Loop" +/obj/effect/mapping_helpers/airlock/access/all/engineering/tech_storage, +/obj/machinery/door/airlock/engineering{ + name = "Tech Storage" }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos/office) "xUS" = ( @@ -47613,9 +47923,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) -"xXa" = ( -/turf/closed/wall, -/area/station/medical/treatment_center) "xXz" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -47669,7 +47976,7 @@ dir = 8 }, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "xZC" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/cable, @@ -47770,6 +48077,11 @@ /obj/item/book/manual/wiki/engineering_hacking{ pixel_y = 3 }, +/obj/machinery/cell_charger{ + pixel_y = 6; + pixel_x = -3 + }, +/obj/item/stock_parts/cell, /turf/open/floor/iron/dark/textured, /area/station/commons/storage/primary) "ycc" = ( @@ -47884,6 +48196,11 @@ "yfp" = ( /turf/open/floor/holofloor/beach/coast_b, /area/station/service/library) +"yfJ" = ( +/obj/effect/spawner/random/structure/table_or_rack, +/obj/machinery/light/small/maintenance/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/starboard/central) "yfT" = ( /obj/machinery/duct/industrial/waste, /obj/structure/extinguisher_cabinet/directional/west, @@ -47931,7 +48248,6 @@ /area/station/engineering/atmos/hfr_room) "ygr" = ( /obj/structure/cable, -/obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -47973,7 +48289,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) +/area/station/medical/medbay/central) "yhu" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -59620,7 +59936,7 @@ vzH vzH rbo qNr -vMQ +sCR vCD gZg wbs @@ -59861,7 +60177,7 @@ hLd bIX oRY ieT -quy +ieT gIs ygU vMQ @@ -59873,7 +60189,7 @@ skN vMQ ygU xsd -qRz +ygU vMQ pYn ygU @@ -60649,7 +60965,7 @@ wvr aIS bSj ieT -iAJ +eBn gZg cwX hfr @@ -61656,13 +61972,13 @@ jtn uSV vme qBz -rdF +dwb nzU vrw hbh sIf kwP -jZq +qFo qdj pqp pqp @@ -62397,7 +62713,7 @@ xuc cNf xuc xuc -tgz +qZA xuc xuc pJO @@ -62407,7 +62723,7 @@ xuc qZA xuc cNf -rxw +xuc xuc qZA gib @@ -63447,8 +63763,8 @@ rdt jMP vsU pVn -dJR pVn +yfJ jMP knN fXU @@ -63735,7 +64051,7 @@ oWO oWO oWO pug -mnD +jHb kmY kmY lCs @@ -63960,7 +64276,7 @@ iwq rdt pVn qZT -uSV +pAa jMP uSV fXU @@ -64723,8 +65039,8 @@ ins pIW lQS sul -osy -wFP +wSx +bpJ wFP wFP riK @@ -64995,7 +65311,7 @@ kOZ kOZ uxR cUp -nIO +kBt kfX wDZ jsj @@ -65214,7 +65530,7 @@ gXb gXb gXb gnk -xxc +pVn vwP vwP vwP @@ -65488,7 +65804,7 @@ tdt ovT fBG bec -uGB +myt fKV tYL keE @@ -65724,7 +66040,7 @@ aah meJ meJ gXb -weo +cfn utg jMP wop @@ -65732,7 +66048,7 @@ uSV cbu uSV cbu -uSV +xlk pyU bak eFg @@ -65791,7 +66107,7 @@ oWO oWO oWO nOf -lms +mnD pug kmY kmY @@ -68391,7 +68707,7 @@ bNX bNX hJH hCB -hlS +wWz jkc aej fNr @@ -68631,8 +68947,8 @@ kXk iSl wUo btg -eGh -eGh +tdm +rVE pEa wsx twN @@ -69395,7 +69711,7 @@ wdT wQd wdT ont -mLg +dGk hcx hcx dGk @@ -69652,7 +69968,7 @@ wdT koQ jkJ twN -mAw +gzD xAh hcx mAw @@ -69841,7 +70157,7 @@ meJ meJ kZY kZY -lDo +ecc hXX nLV nLV @@ -70101,7 +70417,7 @@ kZY kZY axQ kZY -nRM +oBK nLV nLV nLV @@ -70868,14 +71184,14 @@ meJ meJ meJ kZY -tAk +wlw oRN qpf mjl wjO aWJ qpf -tAk +wlw mFh eGM uUY @@ -70887,7 +71203,7 @@ hHy tXC wgD tYL -mLS +hMS pkw adv tRB @@ -71642,13 +71958,13 @@ kZY mFh bMU qpf +jNR +jNR +jNR hoz hoz hoz -hoz -hoz -hoz -rou +meC pUa pxi rdy @@ -71683,7 +71999,7 @@ gmy mXE dGk dGk -jzj +mgQ itp itp xMS @@ -71899,13 +72215,13 @@ fgS mFh oRN bzW -hoz +jNR jVF -hLY +pNk hoz iHd hLY -rou +meC xjX tfm tfm @@ -72156,13 +72472,13 @@ djZ djZ kLL mog -hoz -nkF +jNR +xtU tBf hoz nkF bkR -rou +meC ouC tfm qza @@ -72408,18 +72724,18 @@ nRM fiw mFh fgS -eJv -eJv -eJv +bxs +bxs +bxs dgc -eJv -hoz +bxs +jNR mbj qlJ hoz dZq tge -rou +meC mZI ccg nRr @@ -72664,19 +72980,19 @@ obQ ykG kLL fgS -eJv -eJv +bxs +bxs rZp jth iut gfV -hoz -acE +jNR +gPF bTW hoz gtg acE -rou +meC iPp wjP meC @@ -72780,9 +73096,9 @@ meJ fKl aYY aYY -uyC aYY -uyC +aYY +aYY aYY meJ meJ @@ -72927,7 +73243,7 @@ noF nuB pNw pHc -ols +hYO mJm jiC rNm @@ -73040,7 +73356,7 @@ aYY aYY aYY aYY -uyC +aYY meJ meJ meJ @@ -73178,7 +73494,7 @@ fiw fgS tAk fgS -eJv +bxs mBv noF uKC @@ -73435,7 +73751,7 @@ fiw fgS mFh tAk -eJv +bxs anf lmd gJS @@ -73551,7 +73867,7 @@ meJ meJ fKl aYY -uyC +aYY aYY aYY meJ @@ -73692,7 +74008,7 @@ hrC mFh fgS mFh -eJv +bxs gQq pjd nwz @@ -74323,7 +74639,7 @@ hzn nYP fgA dxq -tVQ +fpv yfj meJ meJ @@ -76274,7 +76590,7 @@ jvq fZX pTU iNI -jvq +tBQ wMO eeA nqf @@ -77046,11 +77362,11 @@ dvQ nhC nhC tBQ -xXa +ols uhh eXH -xXa -xXa +ols +ols nqU bKh xoE @@ -78316,7 +78632,7 @@ meJ qSI fgS fgS -fDX +wIK jEo hBQ bUR @@ -78403,7 +78719,7 @@ pLb pLb knF iiO -ydb +vqk fZn vAv nUw @@ -78573,7 +78889,7 @@ meJ qSI mFh fgS -fDX +wIK fDX eXC bDK @@ -78660,7 +78976,7 @@ jjK sLP lFA iiO -eKB +nzs fZn vAv iBl @@ -78830,8 +79146,8 @@ meJ qSI fgS tAk -fDX -fDX +wIK +mwm fxR vZL jSQ @@ -78848,12 +79164,12 @@ gct rzA vUo esa -xXa -xXa +ols +ols vSw pqz adf -wvy +sCD kAH cIO xCU @@ -80403,7 +80719,7 @@ bfN lGH jOH mSq -csW +tLw qQx csW kND @@ -80897,7 +81213,7 @@ gzZ gzZ gsm gzZ -gzZ +wJd gzZ kOH gsm @@ -80973,13 +81289,13 @@ qqB xxX dGd tKo -nPx +nzs iFe gZg iax swe jRZ -jRZ +okY ieT xSw ieT @@ -81230,7 +81546,7 @@ kZZ pGM dGd tKo -ydb +prr iFe gZg tPb @@ -81710,7 +82026,7 @@ kND kND kND lGH -xCU +nLO xCU kND kND @@ -82438,7 +82754,7 @@ fjQ kZY mFh fgS -uGD +qWb nDB nDB uGD @@ -82515,7 +82831,7 @@ eKC hmK qRJ txw -vPp +nzs iFe gqY iax @@ -82772,7 +83088,7 @@ kAb voJ qRJ txw -ydb +lul iFe gZg tPb @@ -83032,7 +83348,7 @@ txw ydb iFe gZg -plP +lpu mSd mjp hvz @@ -83212,7 +83528,7 @@ mFh fgS fgS fgS -fgS +mhd fgS rdb red @@ -83289,7 +83605,7 @@ ukS pmk iFe gZg -lpu +cvx mSd gZg gZg @@ -84232,7 +84548,7 @@ aah aah aah aah -jrX +aah meJ qSI nRM @@ -84523,7 +84839,7 @@ cOB wFP wFP wSx -wFP +hza oaW lDM pIW @@ -85013,7 +85329,7 @@ alo fgS gzZ wdA -qQF +pqi adu xjU iLR @@ -85289,7 +85605,7 @@ aKy bYC rIW gdO -bBP +nGX cUU uzj aqF @@ -87086,9 +87402,9 @@ xNg xNg xNg xNg -xNg +jtj qrD -xNg +sWn gvB lfh vwS @@ -87113,7 +87429,7 @@ gdp rmm pZA gdp -cSD +dbE xXz nfg gdp @@ -88639,7 +88955,7 @@ fgn jFx sGR pUQ -pUQ +sJJ pUQ qSp gaP @@ -88653,13 +88969,13 @@ xQn eMG tCB bQC -sgQ +wXh asg ssb -dnj cpM yab cTW +eoY jZd pHe jZd @@ -88913,13 +89229,13 @@ eXg qSp jbU sCq -rvE xyp eIg aFk weN weN weN +weN bOT hNe ijg @@ -89126,7 +89442,7 @@ kZY bzW mog eOA -eOA +ahg eOA aJj qEi @@ -89170,10 +89486,10 @@ hvh wUb yam sCq -qWq -lSE +iWk eIg qqf +obz fKr fKr fKr @@ -89427,10 +89743,10 @@ fFQ jvI poH auZ -cbM xKz sAA aBO +lbf ghz ghz ghz @@ -89684,11 +90000,11 @@ dnr jvI cME rvE -rvE dLS eIg huL hUd +hUd trB hUd njm @@ -89939,12 +90255,12 @@ fAb kdz wBn jvI -pPD +vqH iBn -kda -voC +bZY yab pVp +gwM wPi mty kKW @@ -90711,7 +91027,7 @@ nhJ hZm pDS dGs -dGs +ssI aBy wAo snT @@ -90884,10 +91200,10 @@ meJ meJ dNM rVs -wLh +aOb iMh -rVs -rVs +qGL +uTr cAb gYs jXk @@ -94738,7 +95054,7 @@ aah aah aah sks -uoJ +sYk lvw lvw kYi @@ -95354,7 +95670,7 @@ meJ tSn emU tSn -lLl +mkE tSn uKm lZu @@ -96280,7 +96596,7 @@ aah aah aah nLI -mvi +uoJ wNL wNL wNL @@ -97326,7 +97642,7 @@ swM eWH hhi jfa -qbI +fxe cvJ bAT qkx @@ -98626,7 +98942,7 @@ myr myr fMs fMs -fMs +cAt fMs tdl qyh @@ -98874,7 +99190,7 @@ gAb lQT fxe teK -sxa +rsS rsS nvs rsS @@ -100679,7 +100995,7 @@ kMl aTV qSk qSk -tCc +bKY hPj hPj hPj @@ -100932,7 +101248,7 @@ xdh iok bfx tZO -hNZ +pta bfx tZO hNZ diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index c96e55fd0c57..23162c70e2c1 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -1853,10 +1853,6 @@ /obj/item/paper/guides/jobs/security/labor_camp, /turf/open/floor/iron, /area/station/security/brig) -"gU" = ( -/obj/effect/landmark/bitrunning/station_reward_spawn, -/turf/open/floor/circuit/green, -/area/station/bitrunning/den) "gW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/radiation/rad_area/directional/north, @@ -1882,6 +1878,10 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron, /area/station/construction) +"ip" = ( +/obj/machinery/byteforge, +/turf/open/floor/circuit/green, +/area/station/bitrunning/den) "is" = ( /obj/structure/sign/warning/vacuum/external/directional/east, /turf/open/floor/iron, @@ -3223,7 +3223,7 @@ aa aa aa pl -gU +Lq Lq RW nk @@ -3315,8 +3315,8 @@ aa aa aa pl -gU Lq +ip RW nk pl diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 02154262d717..9e922d0d228f 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2,6 +2,15 @@ "aa" = ( /turf/open/space/basic, /area/space) +"ab" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("nukie") + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "ac" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -28,6 +37,24 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"ah" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/obj/structure/sign/poster/contraband/energy_swords{ + pixel_x = -32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"ai" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red, +/obj/item/toy/nuke{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "aj" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -66,6 +93,14 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/kitchen) +"ap" = ( +/obj/structure/sign/poster/contraband/energy_swords{ + pixel_y = 32 + }, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "aq" = ( /obj/effect/turf_decal/siding/green/end{ dir = 4 @@ -81,6 +116,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"as" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "au" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/iron/fifty, @@ -99,6 +138,12 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"av" = ( +/obj/machinery/light/cold/directional/south, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "aw" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -144,6 +189,12 @@ /obj/machinery/oven/range, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) +"aD" = ( +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/obj/structure/railing, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "aE" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -213,6 +264,9 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"aN" = ( +/turf/open/floor/carpet, +/area/centcom/wizard_station) "aO" = ( /obj/structure/window/plasma/spawner/directional/east, /obj/structure/window/plasma/spawner/directional/north, @@ -232,6 +286,9 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"aQ" = ( +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "aR" = ( /obj/item/kirbyplants{ icon_state = "plant-22" @@ -250,6 +307,14 @@ /obj/machinery/light/floor/has_bulb, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"aT" = ( +/obj/vehicle/ridden/scooter/skateboard{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron, +/area/centcom/wizard_station) "aU" = ( /obj/effect/turf_decal/siding/blue{ dir = 9 @@ -297,6 +362,19 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"bc" = ( +/obj/structure/fence/cut/medium{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"bd" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "be" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -305,6 +383,30 @@ /obj/structure/sink/directional/south, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) +"bf" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("nukie") + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"bg" = ( +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"bh" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/smart/simple/general/visible{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "bi" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -367,6 +469,27 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"bs" = ( +/obj/structure/railing, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "TEMP=2.7" + }, +/area/centcom/syndicate_mothership) +"bt" = ( +/obj/structure/sign/poster/contraband/gorlex_recruitment{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) +"bu" = ( +/obj/structure/dresser, +/obj/structure/noticeboard/directional/south, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "bv" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -393,6 +516,11 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"by" = ( +/turf/open/floor/iron/smooth_edge{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "bA" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular{ @@ -414,6 +542,19 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"bB" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/storage/pill_bottle{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/storage/pill_bottle{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "bC" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -421,6 +562,10 @@ /obj/structure/fake_stairs/wood/directional/east, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"bD" = ( +/obj/machinery/telecomms/allinone/nuclear, +/turf/open/floor/circuit/red/telecomms, +/area/centcom/central_command_areas/admin) "bE" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 4 @@ -437,6 +582,10 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"bG" = ( +/obj/machinery/light/cold/directional/south, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "bH" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -451,6 +600,14 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"bJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light/cold/directional/east, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "bM" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/evacuation) @@ -468,6 +625,13 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"bP" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) "bQ" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/landmark/prisonwarp, @@ -476,6 +640,14 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/prison/cells) +"bR" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "bS" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood/corner{ @@ -483,12 +655,25 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"bT" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) "bU" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/vending/boozeomat, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"bV" = ( +/obj/structure/fence/door/opened, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "bX" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/light/floor/has_bulb, @@ -580,6 +765,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"ck" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/fun_police{ + pixel_x = -32 + }, +/obj/machinery/light/cold/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bombthreat) "cl" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -607,6 +805,12 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) +"cp" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "cq" = ( /obj/structure/railing/wood, /turf/open/floor/glass/reinforced, @@ -662,6 +866,22 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"cz" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/obj/machinery/door/airlock/public/glass{ + name = "War Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/textured_large, +/area/centcom/syndicate_mothership/control) +"cA" = ( +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "cB" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -721,6 +941,14 @@ }, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) +"cL" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red{ + dir = 8 + }, +/obj/item/storage/fancy/donut_box, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "cM" = ( /obj/structure/chair/sofa/middle/brown{ dir = 4 @@ -733,6 +961,10 @@ /obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/prison/cells) +"cO" = ( +/obj/structure/statue/uranium/nuke, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "cP" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, /turf/open/floor/plating, @@ -794,10 +1026,19 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"cX" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "cY" = ( /obj/structure/fake_stairs/wood/directional/east, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"cZ" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/wood, +/area/centcom/wizard_station) "da" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -839,11 +1080,29 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"dg" = ( +/obj/machinery/atmospherics/components/trinary/mixer, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "dh" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"di" = ( +/turf/open/floor/iron/stairs/old, +/area/centcom/syndicate_mothership/control) +"dj" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/chair/stool/directional/east, +/obj/effect/landmark/start/nukeop, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "dk" = ( /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" @@ -855,6 +1114,52 @@ "dl" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/medical) +"dm" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/structure/table/reinforced/plasmarglass, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -2; + pixel_y = 3 + }, +/obj/item/assembly/signaler{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/assembly/signaler{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/assembly/timer{ + pixel_x = 12; + pixel_y = -9 + }, +/obj/item/assembly/timer{ + pixel_x = 15 + }, +/obj/item/assembly/prox_sensor{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/assembly/signaler{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/assembly/timer{ + pixel_x = 18; + pixel_y = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "dn" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -869,6 +1174,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"dp" = ( +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "dq" = ( /obj/structure/railing/wood{ dir = 1 @@ -877,6 +1186,22 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"dr" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/folder/white, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/machinery/light/cold/directional/west, +/obj/item/stack/spacecash/c200{ + pixel_y = 17 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "ds" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -936,6 +1261,13 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/borbop) +"dB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "dC" = ( /obj/machinery/modular_computer/console/preset/id/centcom{ dir = 8 @@ -956,6 +1288,52 @@ /obj/structure/curtain/cloth/fancy, /turf/open/indestructible/event/plating, /area/centcom/central_command_areas/kitchen) +"dF" = ( +/obj/structure/table/reinforced, +/obj/item/syndicatedetonator{ + desc = "This gaudy button can be used to instantly detonate syndicate bombs that have been activated on the station. It is also fun to press." + }, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) +"dH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/tank_dispenser, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"dI" = ( +/obj/structure/closet/crate/freezer{ + name = "pantry crate" + }, +/obj/structure/sign/poster/contraband/moffuchis_pizza{ + pixel_y = -32 + }, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/rice{ + pixel_y = 12 + }, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, +/obj/item/food/grown/wheat, +/obj/item/food/grown/wheat, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/reagent_containers/condiment/sugar, +/obj/item/food/grown/soybeans, +/obj/item/food/grown/soybeans, +/obj/item/food/grown/vanillapod, +/obj/item/food/grown/vanillapod, +/obj/item/food/grown/herbs, +/obj/item/food/grown/herbs, +/obj/item/food/grown/cocoapod, +/obj/item/food/grown/cocoapod, +/obj/item/food/grown/aloe, +/obj/item/food/grown/coffee, +/obj/item/food/grown/coffee, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "dJ" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/siding/dark{ @@ -974,6 +1352,24 @@ /obj/machinery/door/airlock/highsecurity, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"dL" = ( +/obj/structure/chair/sofa/bench{ + dir = 4 + }, +/obj/machinery/light/cold/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"dN" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Game Room" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "dO" = ( /obj/structure/railing/wood{ dir = 4 @@ -1022,6 +1418,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"dX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"dY" = ( +/obj/effect/turf_decal/tile/dark/opposingcorners, +/obj/structure/chair/stool/bar/directional/south, +/obj/effect/landmark/navigate_destination/centcom/borbop, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/borbop) "dZ" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -1035,6 +1443,11 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/hall) +"eb" = ( +/obj/structure/sink/kitchen/directional/south, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "ec" = ( /obj/structure/railing{ dir = 4; @@ -1066,6 +1479,24 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"ef" = ( +/obj/structure/fence/cut/medium, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"eg" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/rag, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"ei" = ( +/obj/machinery/griddle, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "ej" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/dark, @@ -1084,6 +1515,33 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"el" = ( +/obj/machinery/computer/atmos_control/noreconnect{ + atmos_chambers = list("nukiebase"="Burn Chamber"); + desc = "Used to monitor the Syndicate Ordnance Laboratory's burn chamber."; + dir = 1; + name = "Ordnance Chamber Monitor" + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/light/cold/directional/west{ + dir = 2 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"em" = ( +/obj/machinery/chem_mass_spec, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"en" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "eo" = ( /obj/structure/table/reinforced/titaniumglass, /obj/machinery/computer/security/wooden_tv, @@ -1100,6 +1558,10 @@ }, /turf/open/floor/carpet, /area/centcom/central_command_areas/hall) +"er" = ( +/obj/structure/filingcabinet/medical, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) "es" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ @@ -1114,6 +1576,15 @@ /obj/structure/hedge, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"eu" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "ev" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -1124,11 +1595,24 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"ex" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "ey" = ( /obj/structure/flora/bush/leavy, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"ez" = ( +/obj/machinery/button/door/directional/south{ + desc = "Looks like the elevator is under maintenance.."; + name = "Elevator Button" + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "eA" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -1165,6 +1649,12 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"eH" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) "eI" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/railing/wood, @@ -1173,6 +1663,11 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"eJ" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "eK" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -1180,6 +1675,26 @@ /obj/structure/hedge, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"eL" = ( +/obj/structure/destructible/cult/item_dispenser/altar{ + desc = "An altar dedicated to the Wizard Federation." + }, +/obj/item/knife/ritual, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"eM" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) +"eN" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) +"eO" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "eP" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth/fancy, @@ -1235,6 +1750,9 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"eZ" = ( +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bombthreat) "fa" = ( /obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/green{ @@ -1242,6 +1760,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"fc" = ( +/turf/open/floor/wood, +/area/centcom/wizard_station) +"fd" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "fe" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -1280,6 +1805,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) +"fk" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "fl" = ( /obj/machinery/door/airlock/centcom{ dir = 4; @@ -1301,6 +1833,17 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"fo" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/space_cube{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "fp" = ( /obj/structure/fake_stairs/wood/directional/south, /obj/machinery/light/floor/has_bulb, @@ -1314,6 +1857,10 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"fs" = ( +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "fu" = ( /obj/structure/hedge, /turf/open/floor/iron/dark, @@ -1332,6 +1879,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"fx" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "fy" = ( /obj/structure/signpost/salvation{ icon = 'icons/obj/structures.dmi'; @@ -1365,6 +1919,10 @@ /obj/machinery/stasis, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"fF" = ( +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/medical) "fH" = ( /obj/machinery/light/neon_lining{ dir = 1; @@ -1386,6 +1944,47 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"fK" = ( +/obj/structure/table/wood, +/obj/item/retractor, +/obj/machinery/light/directional/north, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"fL" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/machinery/door/puzzle/keycard/syndicate_chem, +/obj/structure/fans/tiny, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"fM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/trinary/filter{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"fN" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/smoke{ + pixel_y = 31 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"fP" = ( +/obj/structure/table/wood/fancy, +/obj/item/storage/photo_album, +/obj/machinery/light/directional/south, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "fQ" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -1445,6 +2044,17 @@ /obj/effect/landmark/ctf, /turf/open/space/basic, /area/space) +"ga" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"gb" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Cockpit" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "gc" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/wardrobe/bar_wardrobe, @@ -1474,6 +2084,12 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"gh" = ( +/obj/structure/sign/poster/contraband/revolver{ + pixel_y = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "gi" = ( /obj/docking_port/stationary{ dir = 4; @@ -1514,10 +2130,27 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"gm" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/closet/syndicate/personal, +/obj/machinery/camera/autoname/directional/west{ + network = list("nukie") + }, +/obj/item/stack/spacecash/c20, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_half, +/area/centcom/syndicate_mothership/control) "go" = ( /obj/structure/closet, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"gp" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "gq" = ( /obj/structure/railing{ dir = 8; @@ -1580,6 +2213,14 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"gw" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/table/optable, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/control) "gx" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -1603,6 +2244,14 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/medical) +"gA" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "gB" = ( /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" @@ -1610,6 +2259,12 @@ /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"gC" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 9 + }, +/turf/open/misc/ice/icemoon, +/area/centcom/syndicate_mothership/control) "gE" = ( /obj/machinery/light/floor/has_bulb, /obj/structure/flora/tree/jungle/style_3, @@ -1629,6 +2284,13 @@ /obj/item/stack/cannonball, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"gJ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "gK" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/table/reinforced, @@ -1661,6 +2323,10 @@ "gL" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/botany) +"gM" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bombthreat) "gN" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/machinery/light/neon_lining{ @@ -1675,6 +2341,10 @@ "gO" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/briefing) +"gP" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "gQ" = ( /obj/structure/chair/comfy/carp{ dir = 4 @@ -1698,6 +2368,17 @@ /obj/structure/fake_stairs/wood/directional/west, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"gU" = ( +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) +"gV" = ( +/turf/closed/wall/mineral/diamond, +/area/centcom/syndicate_mothership/control) +"gW" = ( +/obj/structure/table/rolling, +/obj/item/reagent_containers/cup/glass/bottle/juice/tomatojuice, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "gX" = ( /obj/structure/table/reinforced, /obj/item/storage/lockbox/loyalty, @@ -1724,6 +2405,12 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"hb" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "hc" = ( /obj/structure/railing/wood{ dir = 1 @@ -1749,6 +2436,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"hf" = ( +/obj/structure/flora/rock/icy/style_random{ + pixel_x = -7 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "hg" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 9 @@ -1777,6 +2470,10 @@ /obj/machinery/light/floor/has_bulb, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"hk" = ( +/obj/effect/decal/remains/xeno/larva, +/turf/open/floor/grass, +/area/centcom/wizard_station) "hm" = ( /obj/effect/turf_decal/siding/blue, /obj/effect/turf_decal/siding/blue/corner{ @@ -1785,6 +2482,17 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) +"hn" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/chair/sofa/bench/right, +/obj/structure/sign/poster/contraband/donut_corp{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/stone, +/area/centcom/syndicate_mothership/control) "ho" = ( /obj/structure/table/wood, /obj/item/folder/red, @@ -1802,6 +2510,11 @@ }, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"hq" = ( +/obj/item/cardboard_cutout, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/wizard_station) "hr" = ( /obj/structure/table/wood/fancy/green{ name = "Head Intern Desk" @@ -1811,6 +2524,20 @@ /obj/structure/window/plasma/spawner/directional/east, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"ht" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/autoname/directional/east{ + network = list("nukie") + }, +/obj/structure/noticeboard/directional/east, +/obj/item/folder/red, +/obj/item/stack/spacecash/c20{ + pixel_y = 9 + }, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "hw" = ( /obj/structure/chair/office{ dir = 4 @@ -1849,6 +2576,12 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"hC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "hD" = ( /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) @@ -1872,6 +2605,15 @@ /obj/machinery/computer/records/medical/laptop, /turf/open/floor/stone, /area/centcom/central_command_areas/admin) +"hG" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/rebels_unite{ + pixel_y = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "hH" = ( /turf/open/floor/holofloor/hyperspace, /area/space) @@ -1881,6 +2623,12 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"hJ" = ( +/obj/machinery/door/poddoor/incinerator_ordmix{ + id = "syn_ordmix_vent" + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) "hK" = ( /obj/structure/table/wood/fancy/green{ name = "Head Intern Desk" @@ -1899,6 +2647,19 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"hO" = ( +/obj/structure/railing/corner, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"hP" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "hQ" = ( /obj/structure/railing/wood{ dir = 1 @@ -1918,6 +2679,26 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"hS" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"hT" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/end, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/control) +"hV" = ( +/obj/effect/landmark/navigate_destination/centcom/boxing, +/turf/open/floor/carpet, +/area/centcom/central_command_areas/hall) "hX" = ( /obj/machinery/light/floor/has_bulb, /obj/item/kirbyplants{ @@ -1943,6 +2724,22 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) +"ia" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"ib" = ( +/obj/machinery/door/poddoor/shuttledock{ + checkdir = 1; + name = "Syndicate Blast Door"; + turftype = /turf/open/misc/asteroid/snow + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "ic" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/parquet, @@ -1968,6 +2765,14 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"if" = ( +/obj/structure/flora/grass/both/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "ig" = ( /obj/structure/chair/office{ dir = 4 @@ -1980,6 +2785,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin) +"ih" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/smooth_half, +/area/centcom/syndicate_mothership/control) "ii" = ( /obj/effect/turf_decal/siding/green{ dir = 8 @@ -2035,6 +2844,11 @@ /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"ir" = ( +/obj/machinery/shower/directional/south, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/freezer, +/area/centcom/syndicate_mothership/control) "is" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -2060,6 +2874,20 @@ "iu" = ( /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"iw" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/plunger{ + pixel_x = -9; + pixel_y = 15 + }, +/obj/item/construction/plumbing, +/obj/item/reagent_containers/dropper{ + pixel_x = 5; + pixel_y = 14 + }, +/obj/structure/noticeboard/directional/west, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "ix" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/light/floor/has_bulb, @@ -2068,9 +2896,19 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"iz" = ( +/obj/machinery/washing_machine, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "iA" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/admin_hangout) +"iB" = ( +/obj/machinery/power/shuttle_engine/propulsion, +/turf/open/floor/plating/airless, +/area/centcom/wizard_station) "iC" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer{ @@ -2096,6 +2934,19 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin) +"iE" = ( +/obj/structure/table/wood, +/obj/item/pizzabox, +/obj/item/storage/crayons{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/storage/crayons{ + pixel_x = 2; + pixel_y = 5 + }, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "iF" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supply) @@ -2121,6 +2972,20 @@ /obj/machinery/light/directional/north, /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"iJ" = ( +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"iK" = ( +/obj/structure/flora/tree/dead/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"iL" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "iN" = ( /obj/machinery/status_display/supply, /turf/closed/indestructible/riveted, @@ -2129,12 +2994,32 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"iP" = ( +/obj/structure/closet/cardboard, +/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{ + pixel_x = 32 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) +"iQ" = ( +/obj/structure/punching_bag, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "iR" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"iS" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"iV" = ( +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership) "iW" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -2151,6 +3036,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/centcom/central_command_areas/supply) +"iY" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/right{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "iZ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -2178,6 +3072,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"je" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "jf" = ( /obj/machinery/light/floor/has_bulb, /obj/machinery/hydroponics/constructable/helper, @@ -2190,6 +3090,14 @@ /obj/machinery/vending/wardrobe/engi_wardrobe, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"ji" = ( +/obj/machinery/computer/camera_advanced, +/turf/open/floor/wood, +/area/centcom/wizard_station) +"jj" = ( +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "jk" = ( /obj/machinery/door/poddoor{ id = "XCCQMLoaddoor2"; @@ -2233,6 +3141,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"jo" = ( +/obj/item/soap/homemade, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "jp" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/food_or_drink/pizzaparty, @@ -2243,6 +3156,10 @@ /obj/structure/closet/crate/freezer, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"jq" = ( +/obj/item/food/meat/slab/corgi, +/turf/open/floor/grass, +/area/centcom/wizard_station) "jr" = ( /obj/machinery/door/airlock/external/ruin{ name = "Supply Shuttle" @@ -2265,6 +3182,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"ju" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/figure/wizard, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "jv" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 5 @@ -2272,16 +3194,77 @@ /obj/machinery/vending/hydroseeds, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"jw" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"jx" = ( +/obj/effect/landmark/start/nukeop_leader, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"jy" = ( +/obj/machinery/door/airlock/hatch{ + name = "Tool Closet" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) +"jz" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Study" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "jA" = ( /obj/structure/fans/tiny/invisible, /turf/open/floor/holofloor/hyperspace, /area/space) +"jB" = ( +/obj/structure/sign/plaques/kiddie/badger{ + desc = "A list of names is engraved on this plaque. 'May their heroic sacrifices inspire your bravery' is carved at the bottom."; + name = "\improper Operative Remembrance Plaque"; + pixel_y = 27 + }, +/obj/structure/bed/dogbed/cayenne, +/mob/living/basic/carp/pet/cayenne, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "jC" = ( /obj/structure/chair/comfy/shuttle/tactical{ dir = 1 }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/evacuation/ship) +"jF" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/poddoor/shutters/indestructible{ + name = "Subterrainian Cargo Lift" + }, +/turf/open/floor/iron/dark/textured_half, +/area/centcom/syndicate_mothership/control) +"jG" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/computer/pandemic, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"jH" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership) "jI" = ( /obj/machinery/door/poddoor{ id = "XCCQMLoaddoor"; @@ -2327,6 +3310,20 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"jM" = ( +/obj/machinery/vending/medical, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) +"jN" = ( +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"jO" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight/lamp, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) "jP" = ( /obj/structure/hedge, /turf/open/floor/carpet, @@ -2356,6 +3353,18 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"jT" = ( +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"jV" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "jW" = ( /obj/machinery/computer/records/medical, /turf/open/floor/carpet/royalblue, @@ -2385,6 +3394,25 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"kc" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/smooth_half, +/area/centcom/syndicate_mothership/control) +"kd" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/obj/structure/sign/poster/contraband/gorlex_recruitment{ + pixel_y = 32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"ke" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "kf" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, @@ -2422,6 +3450,9 @@ }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) +"km" = ( +/turf/closed/wall/mineral/wood, +/area/centcom/syndicate_mothership/control) "kn" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/microwave, @@ -2468,6 +3499,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"ku" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "kv" = ( /obj/machinery/door/airlock/centcom{ name = "Waffles' Den" @@ -2481,6 +3515,42 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) +"kz" = ( +/obj/machinery/door/airlock/maintenance/external{ + name = "Bunk Room 1" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/catwalk_floor/iron, +/area/centcom/syndicate_mothership/control) +"kA" = ( +/turf/closed/indestructible/iron, +/area/centcom/syndicate_mothership/control) +"kB" = ( +/obj/machinery/vending/boozeomat, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) +"kD" = ( +/obj/structure/table/rolling, +/obj/item/reagent_containers/condiment/soymilk, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"kE" = ( +/obj/structure/table/wood, +/obj/item/pai_card, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"kF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) +"kH" = ( +/obj/machinery/light/small/directional/south, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "kI" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -2492,6 +3562,23 @@ dir = 4 }, /area/centcom/central_command_areas/hall) +"kK" = ( +/turf/closed/indestructible/fakedoor{ + name = "BUNKER 4337" + }, +/area/centcom/syndicate_mothership) +"kL" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/control) "kM" = ( /obj/structure/railing/wood, /obj/structure/table/reinforced, @@ -2510,16 +3597,54 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) -"kQ" = ( -/obj/structure/railing/wood{ - dir = 1 - }, -/turf/open/floor/iron/dark/herringbone, -/area/centcom/central_command_areas/medical) "kS" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/carpet, /area/centcom/central_command_areas/hall) +"kT" = ( +/obj/machinery/light/small/directional/east, +/obj/structure/closet/crate/freezer{ + name = "fruits and veggies freezer" + }, +/obj/item/food/grown/potato, +/obj/item/food/grown/potato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/pineapple, +/obj/item/food/grown/pineapple, +/obj/item/food/grown/cherries, +/obj/item/food/grown/cherries, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/citrus/orange, +/obj/item/food/grown/bell_pepper, +/obj/item/food/grown/bell_pepper, +/obj/item/food/grown/chili, +/obj/item/food/grown/chili, +/obj/item/food/grown/parsnip, +/obj/item/food/grown/parsnip, +/obj/item/food/grown/redbeet, +/obj/item/food/grown/redbeet, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/watermelon, +/obj/item/food/grown/peas, +/obj/item/food/grown/peas, +/obj/item/food/grown/onion, +/obj/item/food/grown/onion, +/obj/item/food/grown/eggplant, +/obj/item/food/grown/eggplant, +/obj/item/food/grown/banana, +/obj/item/food/grown/banana, +/obj/item/food/grown/apple, +/obj/item/food/grown/apple, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) +"kU" = ( +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"kV" = ( +/obj/item/food/meat/slab/xeno, +/turf/open/floor/grass, +/area/centcom/wizard_station) "kW" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/table/wood/fancy/royalblack, @@ -2529,6 +3654,47 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"kY" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wideplating{ + dir = 8 + }, +/obj/machinery/door/airlock/titanium{ + name = "Experiments Wing Decontamination" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) +"kZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"lb" = ( +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) +"le" = ( +/obj/effect/turf_decal/box, +/obj/structure/punching_bag, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "lg" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/chair/comfy/shuttle/tactical{ @@ -2557,6 +3723,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"lj" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "lk" = ( /obj/structure/chair/sofa/corp/left{ dir = 4; @@ -2588,6 +3760,16 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"lt" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "lu" = ( /obj/structure/railing/wood{ dir = 1 @@ -2596,6 +3778,30 @@ /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"lw" = ( +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"lx" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 6 + }, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe{ + pixel_y = 15 + }, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/control) "ly" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, @@ -2604,6 +3810,10 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"lz" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "lA" = ( /obj/structure/railing/wood, /obj/structure/railing/wood{ @@ -2611,6 +3821,19 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/ghost_spawn) +"lB" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/glass_large{ + name = "Disembarkents" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "lC" = ( /obj/effect/turf_decal/siding/dark/corner, /obj/effect/turf_decal/siding/dark{ @@ -2645,6 +3868,10 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"lG" = ( +/obj/structure/showcase/machinery/rng, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "lH" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -2672,11 +3899,30 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/general, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"lM" = ( +/obj/structure/toilet{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) +"lN" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"lP" = ( +/obj/machinery/light/cold/directional/south, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "lQ" = ( /obj/machinery/computer/records/medical/laptop, /obj/structure/table/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"lR" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/landmark/start/nukeop, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "lS" = ( /obj/structure/fans/tiny/invisible, /turf/open/floor/holofloor/hyperspace, @@ -2687,10 +3933,33 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) +"lU" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"lW" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "lX" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"lY" = ( +/obj/structure/table/reinforced, +/obj/item/paper/fluff/stations/centcom/disk_memo{ + pixel_x = -6; + pixel_y = -7 + }, +/obj/item/taperecorder{ + pixel_y = 15 + }, +/obj/item/stack/spacecash/c50, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) "lZ" = ( /obj/effect/turf_decal/siding/blue{ dir = 8 @@ -2736,6 +4005,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"mg" = ( +/obj/effect/landmark/navigate_destination/centcom/hydro, +/turf/open/floor/wood/large, +/area/centcom/central_command_areas/botany) "mh" = ( /obj/structure/bed, /obj/item/bedsheet/centcom, @@ -2748,6 +4021,15 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mj" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "mk" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -2767,6 +4049,13 @@ /obj/structure/closet/crate/mail/full, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mn" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "mp" = ( /obj/structure/chair/wood{ dir = 4 @@ -2792,12 +4081,6 @@ }, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) -"ms" = ( -/obj/effect/turf_decal/trimline/green/line{ - dir = 6 - }, -/turf/closed/indestructible/riveted, -/area/centcom/central_command_areas/botany) "mt" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -2809,17 +4092,65 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"mu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "mv" = ( /obj/machinery/door/poddoor/shutters/indestructible/preopen{ dir = 4 }, /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin) +"mx" = ( +/obj/machinery/power/shuttle_engine/heater{ + resistance_flags = 3 + }, +/obj/structure/window/reinforced/spawner/directional/north{ + color = "#008000"; + resistance_flags = 3 + }, +/turf/open/lava/airless, +/area/centcom/wizard_station) "my" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/crate/medical, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mz" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 14 + }, +/obj/machinery/light/cold/directional/north, +/obj/item/reagent_containers/dropper{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/reagent_containers/cup/bottle/formaldehyde{ + pixel_x = 8; + pixel_y = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "mA" = ( /obj/machinery/computer/records/medical{ dir = 1 @@ -2841,6 +4172,17 @@ "mD" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/ferry) +"mE" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"mF" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "mG" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -2876,6 +4218,29 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"mK" = ( +/obj/machinery/light/cold/directional/east, +/obj/item/kirbyplants/random, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"mL" = ( +/obj/machinery/light/small/red/directional/west, +/obj/structure/sign/poster/contraband/soviet_propaganda{ + pixel_x = -32 + }, +/obj/item/stack/sheet/cardboard/fifty, +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) +"mM" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) +"mO" = ( +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "mP" = ( /obj/structure/hedge, /turf/open/floor/wood/large, @@ -2890,6 +4255,16 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"mS" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/autoname/directional/east{ + network = list("nukie") + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"mT" = ( +/turf/open/floor/circuit/red/off, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "mU" = ( /obj/structure/flora/tree/palm, /obj/item/toy/plush/beeplushie{ @@ -2922,6 +4297,15 @@ /obj/effect/turf_decal/tile/dark_blue/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/botany) +"mY" = ( +/obj/structure/table/wood, +/obj/item/gun/magic/wand{ + desc = "Used in emergencies to reignite magma engines."; + max_charges = 0; + name = "wand of emergency engine ignition" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "mZ" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -2970,6 +4354,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"ne" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/end, +/obj/machinery/vending/hydronutrients, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "nf" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -3025,6 +4414,13 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"no" = ( +/obj/machinery/camera/autoname/directional/east{ + network = list("nukie") + }, +/obj/structure/closet/crate/cardboard/mothic, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "np" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood/corner{ @@ -3047,6 +4443,14 @@ dir = 1 }, /area/centcom/central_command_areas/hall) +"nu" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/tree/pine/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "nw" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -3058,6 +4462,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"nz" = ( +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 6 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "nB" = ( /obj/structure/filingcabinet/filingcabinet, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -3073,6 +4483,17 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"nD" = ( +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"nE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "nF" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -3089,12 +4510,33 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"nH" = ( +/obj/structure/urinal/directional/north, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "nI" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, /obj/machinery/light/directional/north, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"nK" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) +"nL" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red/corner{ + dir = 4 + }, +/obj/item/stack/spacecash/c1{ + pixel_y = 12 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"nM" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "nN" = ( /obj/structure/railing/wood{ dir = 8 @@ -3122,6 +4564,18 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"nS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) +"nT" = ( +/obj/item/kirbyplants/random, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "nU" = ( /obj/machinery/vending/boozeomat, /turf/open/floor/carpet/executive, @@ -3139,6 +4593,50 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"nY" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/machinery/recharger, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"nZ" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) +"oa" = ( +/obj/machinery/light/cold/directional/south, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"oc" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/door/window/left/directional/east, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "od" = ( /obj/structure/railing/wood{ dir = 1 @@ -3165,6 +4663,13 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"og" = ( +/obj/structure/railing, +/turf/open/floor/iron/stairs/old{ + dir = 8; + initial_gas_mix = "TEMP=2.7" + }, +/area/centcom/syndicate_mothership) "oh" = ( /obj/machinery/shower/directional/south, /obj/structure/drain, @@ -3180,6 +4685,7 @@ "ok" = ( /obj/structure/fight_button, /obj/machinery/light/floor/has_bulb, +/obj/effect/landmark/navigate_destination/centcom/duelbutton, /turf/open/floor/wood/large, /area/centcom/tdome/observation) "ol" = ( @@ -3204,6 +4710,13 @@ /obj/structure/fake_stairs/wood/directional/north, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"op" = ( +/obj/structure/window/reinforced/spawner/directional/north{ + color = "#008000"; + resistance_flags = 3 + }, +/turf/open/lava, +/area/centcom/wizard_station) "oq" = ( /obj/structure/railing/wood, /obj/structure/fake_stairs/wood/directional/west, @@ -3252,6 +4765,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"ow" = ( +/obj/structure/table/wood/fancy, +/obj/item/storage/dice{ + icon_state = "magicdicebag" + }, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "oy" = ( /obj/machinery/vending/wardrobe/curator_wardrobe, /obj/effect/turf_decal/siding/dark, @@ -3262,11 +4782,22 @@ dir = 1 }, /area/centcom/central_command_areas/hall) +"oz" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "oA" = ( /obj/structure/closet/crate/bin, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"oD" = ( +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/control) "oE" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -3281,6 +4812,47 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"oH" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = -2; + pixel_y = 13 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 1; + pixel_y = 14 + }, +/obj/item/reagent_containers/syringe{ + pixel_x = 4; + pixel_y = 15 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/reagent_containers/cup/bottle/radium{ + pixel_x = -8; + pixel_y = 9 + }, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"oI" = ( +/obj/structure/table/wood, +/obj/item/clothing/suit/wizrobe/magusred, +/obj/item/clothing/head/wizard/magus, +/obj/item/staff, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "oJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -3321,6 +4893,33 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"oP" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/structure/showcase/machinery/tv{ + desc = "Static fills the screen. If you can find the VCR, you might be able to watch those old Heist Movies again."; + name = "\improper Static Filled Tube(TM) Television" + }, +/obj/structure/sign/poster/contraband/rip_badger{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"oQ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light/cold/directional/south, +/obj/structure/chair/greyscale{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"oS" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "oT" = ( /obj/structure/table/wood, /obj/machinery/fax, @@ -3339,10 +4938,29 @@ /obj/machinery/status_display/evac/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"oV" = ( +/obj/structure/sign/poster/contraband/free_drone{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "oW" = ( /obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"oX" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/machinery/door/airlock/hatch{ + name = "Gangway" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "oY" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -3358,6 +4976,22 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"pa" = ( +/obj/item/kirbyplants/random, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) +"pb" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/grass, +/area/centcom/wizard_station) +"pc" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "pd" = ( /obj/item/clipboard, /obj/item/stamp/denied{ @@ -3375,10 +5009,31 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"pf" = ( +/obj/structure/chair/sofa/left/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "pg" = ( /obj/structure/flora/bush/large/style_3, /turf/open/floor/grass, /area/centcom/central_command_areas/botany) +"ph" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "pi" = ( /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) @@ -3419,6 +5074,20 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"pm" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"pn" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/door/window/right/directional/east, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "po" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -3439,6 +5108,26 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"pr" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/beer{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/toy/cards/deck/syndicate{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/effect/spawner/random/aimodule/syndicate, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"ps" = ( +/obj/machinery/air_sensor{ + chamber_id = "nukiebase"; + name = "syndicate ordnance gas sensor" + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) "pt" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/machinery/fax, @@ -3461,9 +5150,6 @@ "pw" = ( /obj/effect/turf_decal/trimline/blue, /obj/machinery/light/floor/has_bulb, -/obj/structure/railing/wood{ - dir = 1 - }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/medical) "px" = ( @@ -3517,6 +5203,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/ert) +"pE" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/corner, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "pG" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/hall) @@ -3548,6 +5241,49 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/evacuation) +"pO" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/pen{ + pixel_x = 9; + pixel_y = 18 + }, +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = -32 + }, +/obj/item/storage/box/beakers{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/item/storage/box/syringes{ + pixel_x = 4; + pixel_y = 17 + }, +/obj/item/assembly/igniter{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/item/assembly/igniter{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/assembly/igniter{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/assembly/timer{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/assembly/timer{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/assembly/timer{ + pixel_x = -6; + pixel_y = -5 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "pQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -3588,6 +5324,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/ert) +"pY" = ( +/obj/structure/frame/computer{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "pZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3600,6 +5342,13 @@ /obj/structure/table/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"qb" = ( +/obj/item/stack/spacecash/c20, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"qc" = ( +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "qe" = ( /obj/structure/table/reinforced/titaniumglass, /obj/machinery/fax{ @@ -3614,6 +5363,14 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"qg" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/tree/dead/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "qh" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -3638,6 +5395,20 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"qj" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/tree/dead/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"qk" = ( +/obj/machinery/shuttle_manipulator, +/turf/open/floor/circuit/red, +/area/centcom/syndicate_mothership/control) +"ql" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "qm" = ( /obj/structure/table/reinforced/titaniumglass, /obj/machinery/computer/records/security/laptop, @@ -3679,6 +5450,18 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"qr" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"qs" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/corner, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "qu" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -3703,20 +5486,32 @@ /obj/structure/window/plasma/spawner/directional/east, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) -"qz" = ( -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/item/storage/backpack/duffelbag/med/surgery, -/obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) -"qD" = ( -/obj/structure/table/reinforced, -/obj/machinery/infuser, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/botany) +"qy" = ( +/obj/structure/flora/rock/icy/style_random{ + pixel_x = -7 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"qA" = ( +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"qC" = ( +/obj/machinery/door/window/survival_pod{ + dir = 8; + name = "Toilet Door"; + opacity = 1 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north{ + name = "Frosted Window"; + opacity = 1 + }, +/obj/structure/toilet/greyscale{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "qE" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -3773,10 +5568,21 @@ /obj/structure/sign/nanotrasen, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/ferry) +"qS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/trinary/filter/flipped, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "qT" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet, /area/centcom/central_command_areas/kitchen) +"qU" = ( +/obj/structure/fence, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "qV" = ( /obj/machinery/chem_master/condimaster{ desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; @@ -3788,6 +5594,13 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"qW" = ( +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"qX" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "qY" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -3826,11 +5639,24 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/ert) +"rc" = ( +/obj/structure/dresser, +/obj/structure/noticeboard/directional/north, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "rd" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"re" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "rf" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -3871,6 +5697,9 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"rk" = ( +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "rl" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/railing/wood{ @@ -3896,6 +5725,11 @@ /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/admin) +"rp" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/shower/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "rq" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -3908,16 +5742,81 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"rs" = ( +/obj/structure/rack, +/obj/item/restraints/handcuffs/cable/pink, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"rt" = ( +/obj/machinery/computer/shuttle, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"ru" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"rv" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/hatch{ + name = "Workout Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) +"rx" = ( +/obj/structure/table/reinforced, +/obj/item/knife/combat/survival{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/reagent_containers/cup/glass/bottle/rum{ + pixel_x = -5; + pixel_y = 17 + }, +/obj/structure/sign/poster/contraband/red_rum{ + pixel_x = 32 + }, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"ry" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/turf/open/misc/ice/icemoon, +/area/centcom/syndicate_mothership/control) "rz" = ( /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"rA" = ( +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "rB" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"rC" = ( +/obj/effect/turf_decal/trimline/red, +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "rD" = ( /obj/structure/table/wood, /obj/machinery/light/floor/has_bulb, @@ -3940,6 +5839,15 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"rJ" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/components/tank/nitrogen, +/turf/open/space/basic, +/area/space/nearstation) +"rK" = ( +/obj/structure/sign/poster/contraband/cc64k_ad, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) "rL" = ( /obj/effect/turf_decal/siding/green{ dir = 10 @@ -3956,10 +5864,24 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"rN" = ( +/obj/machinery/door/window/survival_pod{ + name = "Frosted Door"; + opacity = 1 + }, +/turf/open/floor/iron/freezer, +/area/centcom/syndicate_mothership/control) +"rO" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/closet/syndicate/personal, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_half, +/area/centcom/syndicate_mothership/control) "rP" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 }, +/obj/structure/railing/wood, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/medical) "rQ" = ( @@ -3990,6 +5912,20 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"rS" = ( +/obj/machinery/vending/cola, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"rT" = ( +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) +"rU" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "rW" = ( /obj/structure/railing{ dir = 8; @@ -4058,10 +5994,38 @@ /obj/item/storage/belt/utility/full/engi, /turf/open/floor/circuit/green, /area/centcom/central_command_areas/admin) +"sf" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"sg" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "sh" = ( /obj/item/kirbyplants/random, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"si" = ( +/obj/machinery/hydroponics/constructable, +/obj/machinery/light/cold/directional/west, +/obj/item/seeds/cannabis{ + pixel_y = 8 + }, +/obj/item/cultivator{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "sj" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood{ @@ -4076,6 +6040,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"sk" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/indestructible/rock/snow, +/area/centcom/syndicate_mothership) "sm" = ( /obj/machinery/light/directional/south, /turf/open/floor/iron/dark/herringbone, @@ -4157,6 +6125,21 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"sy" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 10 + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) +"sz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/emcloset, +/obj/item/stack/spacecash/c100, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "sA" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -4177,6 +6160,15 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"sD" = ( +/obj/machinery/door/airlock/external/ruin, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "sE" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -4206,6 +6198,13 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/hall) +"sL" = ( +/obj/effect/decal/cleanable/blood/splatter, +/mob/living/basic/creature{ + name = "Experiment 35b" + }, +/turf/open/floor/grass, +/area/centcom/wizard_station) "sM" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -4216,6 +6215,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"sN" = ( +/obj/machinery/light/cold/directional/west, +/obj/structure/closet/crate/cardboard, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "sP" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/dark{ @@ -4229,6 +6233,11 @@ dir = 4 }, /area/centcom/central_command_areas/hall) +"sQ" = ( +/turf/closed/indestructible/fakeglass{ + color = "#008000" + }, +/area/centcom/wizard_station) "sS" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -4244,6 +6253,22 @@ /obj/structure/fans/tiny, /turf/open/floor/iron, /area/centcom/central_command_areas/evacuation) +"sW" = ( +/obj/structure/table/wood, +/obj/item/bikehorn/golden{ + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"sZ" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "ta" = ( /obj/machinery/light/floor/has_bulb, /turf/closed/indestructible/fakeglass, @@ -4255,6 +6280,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"tc" = ( +/obj/machinery/light/cold/directional/east, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "td" = ( /obj/structure/sign/departments/drop, /turf/closed/indestructible/riveted, @@ -4286,11 +6315,38 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"tg" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/chair/sofa/bench/left, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/stone, +/area/centcom/syndicate_mothership/control) +"th" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/sign/poster/contraband/gorlex_recruitment{ + pixel_y = -32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"ti" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "tk" = ( /obj/effect/turf_decal/trimline/blue, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) +"tl" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/wizard_station) "tm" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -4439,6 +6495,21 @@ }, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) +"tE" = ( +/obj/structure/sign/poster/contraband/masked_men{ + pixel_x = 32 + }, +/obj/machinery/chem_dispenser/fullupgrade, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"tG" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "TEMP=2.7" + }, +/area/centcom/syndicate_mothership) "tH" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -4465,6 +6536,53 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"tM" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/structure/railing/corner, +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) +"tN" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"tO" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) +"tP" = ( +/obj/structure/fence, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"tQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/hidden{ + dir = 4 + }, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"tV" = ( +/obj/machinery/atmospherics/pipe/smart/simple/general/visible, +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/expansion_bombthreat) "tW" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -4487,6 +6605,24 @@ /obj/structure/fake_stairs/wood/directional/west, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"tZ" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/structure/table/reinforced/plasmarglass, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/item/transfer_valve{ + pixel_x = 5 + }, +/obj/item/transfer_valve, +/obj/item/transfer_valve{ + pixel_x = -5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "ua" = ( /obj/structure/curtain/cloth/fancy, /turf/closed/indestructible/fakeglass, @@ -4547,6 +6683,17 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"un" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "uq" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/chair/stool/bar/directional/south, @@ -4650,6 +6797,9 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"uG" = ( +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "uH" = ( /obj/effect/turf_decal/stripes/line, /turf/closed/indestructible/riveted, @@ -4667,6 +6817,10 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) +"uM" = ( +/obj/structure/sign/poster/contraband/free_key, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) "uN" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -4695,6 +6849,13 @@ "uQ" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/hall) +"uR" = ( +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/fluff/tram_rail, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "uS" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/trimline/green/line, @@ -4714,6 +6875,21 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"uV" = ( +/obj/effect/decal/remains/xeno, +/turf/open/floor/grass, +/area/centcom/wizard_station) +"uW" = ( +/obj/structure/table/wood, +/obj/item/clothing/suit/wizrobe/magusblue, +/obj/item/clothing/head/wizard/magus, +/obj/item/staff, +/obj/structure/mirror/magic{ + pixel_y = 28 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "uZ" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -4727,6 +6903,23 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"vb" = ( +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"vc" = ( +/obj/item/food/meat/slab/human/mutant/lizard, +/turf/open/floor/grass, +/area/centcom/wizard_station) +"vd" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "ve" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -4753,6 +6946,10 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"vi" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "vj" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -4790,6 +6987,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"vn" = ( +/obj/structure/rack, +/obj/item/storage/toolbox/mechanical/old, +/obj/structure/sign/poster/contraband/pwr_game{ + pixel_y = 32 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) "vp" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, @@ -4817,6 +7022,16 @@ "vt" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/kitchen) +"vu" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"vv" = ( +/obj/structure/showcase/wizard, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "vw" = ( /obj/effect/landmark/prisonwarp, /turf/open/floor/iron/dark/herringbone, @@ -4824,6 +7039,13 @@ "vx" = ( /turf/open/floor/carpet/neon/simple/cyan, /area/centcom/central_command_areas/admin) +"vy" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark/end, +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "vz" = ( /obj/machinery/door/poddoor/shutters/cc/xcc, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -4915,6 +7137,30 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"vL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"vM" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/table/glass/plasmaglass, +/obj/structure/reagent_dispensers/wall/virusfood/directional/north, +/obj/item/clothing/gloves/latex, +/obj/item/healthanalyzer{ + pixel_y = 3 + }, +/obj/item/plant_analyzer, +/obj/item/clothing/glasses/science, +/obj/item/reagent_containers/spray/chemsprayer/bioterror{ + pixel_x = -6; + pixel_y = 10 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "vN" = ( /obj/structure/railing/wood, /obj/structure/table/reinforced, @@ -4938,6 +7184,13 @@ /obj/structure/flora/bush/large/style_3, /turf/open/floor/grass, /area/centcom/central_command_areas/medical) +"vQ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "vR" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -4947,16 +7200,30 @@ "vS" = ( /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) -"vT" = ( -/obj/effect/turf_decal/siding/wood/corner, -/turf/open/floor/wood/large, -/area/centcom/central_command_areas/medical) +"vU" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Frosted Window"; + opacity = 1 + }, +/obj/item/soap/syndie, +/obj/structure/sign/poster/contraband/got_wood{ + pixel_x = 32 + }, +/turf/open/floor/iron/freezer, +/area/centcom/syndicate_mothership/control) "vW" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"vX" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"vY" = ( +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "wa" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -4988,11 +7255,53 @@ "wf" = ( /turf/open/floor/carpet, /area/centcom/central_command_areas/hall) +"wg" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/circuit/red/off, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "wh" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/green, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"wi" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/screwdriver{ + pixel_x = 1; + pixel_y = 23 + }, +/obj/item/clothing/glasses/science{ + pixel_x = -5; + pixel_y = 11 + }, +/obj/machinery/reagentgrinder{ + pixel_x = 7; + pixel_y = 5 + }, +/obj/structure/noticeboard/directional/east, +/obj/item/grenade/chem_grenade{ + pixel_x = -4 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = -4 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = -4 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = -4 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"wj" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("nukie") + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "wk" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/stripes/line{ @@ -5010,6 +7319,15 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/borbop) +"wn" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/knife/kitchen, +/obj/structure/sign/poster/contraband/self_ai_liberation{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "wo" = ( /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" @@ -5032,6 +7350,11 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"ws" = ( +/obj/structure/closet/cardboard/metal, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "wt" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -5200,6 +7523,9 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"wU" = ( +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership) "wV" = ( /obj/machinery/computer/security/wooden_tv, /turf/open/floor/circuit/telecomms, @@ -5305,6 +7631,19 @@ /obj/machinery/light/directional/north, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"xm" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 6 + }, +/turf/open/misc/ice/icemoon, +/area/centcom/syndicate_mothership/control) +"xn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "xo" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -5324,6 +7663,25 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"xr" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"xt" = ( +/obj/docking_port/stationary{ + area_type = /area/centcom/syndicate_mothership/control; + dir = 2; + dwidth = 3; + height = 7; + name = "escape pod loader"; + roundstart_template = /datum/map_template/shuttle/assault_pod/default; + width = 7 + }, +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) "xu" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood{ @@ -5344,10 +7702,20 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/prison/cells) +"xw" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "xz" = ( /obj/machinery/door/airlock/centcom, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/botany) +"xA" = ( +/obj/structure/fence/cut/large{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "xB" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -5378,6 +7746,9 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"xE" = ( +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "xF" = ( /obj/structure/chair/office{ dir = 8 @@ -5405,6 +7776,12 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"xJ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/floor/engine, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "xK" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -5414,6 +7791,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"xL" = ( +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) +"xM" = ( +/turf/open/floor/grass, +/area/centcom/wizard_station) "xN" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -5426,6 +7809,12 @@ dir = 6 }, /area/centcom/central_command_areas/hall) +"xO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "xP" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/bananalamp, @@ -5461,24 +7850,52 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"xU" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/control) "xV" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"xW" = ( +/obj/structure/bookcase/random/reference/wizard, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "yb" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"yc" = ( +/obj/structure/flora/tree/dead/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "yd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"ye" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/hatch{ + name = "Security Checkpoint" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "yf" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 6 @@ -5579,6 +7996,11 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"yv" = ( +/turf/closed/indestructible/fakedoor{ + name = "Tac-Com" + }, +/area/centcom/syndicate_mothership/control) "yw" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/civilian{ @@ -5586,6 +8008,25 @@ }, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"yx" = ( +/obj/machinery/door/airlock/maintenance/external{ + name = "Bunk Room 2" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/catwalk_floor/iron, +/area/centcom/syndicate_mothership/control) +"yy" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/railing{ + dir = 6 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) "yz" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/bush/fullgrass/style_random, @@ -5602,9 +8043,16 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"yB" = ( +/obj/machinery/light/cold/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) "yC" = ( /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) +"yD" = ( +/turf/closed/indestructible/rock/snow, +/area/centcom/syndicate_mothership) "yE" = ( /obj/structure/railing/wrestling{ dir = 4 @@ -5614,6 +8062,12 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/hall) +"yF" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/wood, +/area/centcom/wizard_station) "yG" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/trimline/green/line{ @@ -5682,6 +8136,13 @@ /obj/item/gun/energy/ionrifle/carbine, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"yT" = ( +/obj/machinery/light/small/directional/south, +/obj/item/watertank{ + pixel_x = -10 + }, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "yU" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, @@ -5703,12 +8164,24 @@ }, /turf/open/space, /area/space) +"yW" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/centcom/syndicate_mothership/control) "yX" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/evacuation/ship) +"yY" = ( +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"yZ" = ( +/obj/structure/chair/stool/directional/west, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "za" = ( /obj/machinery/power/terminal{ dir = 1 @@ -5717,11 +8190,46 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"zb" = ( +/obj/machinery/vending/dinnerware, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"zc" = ( +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"zd" = ( +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) +"ze" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Observation Room" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "zf" = ( /obj/structure/flora/bush/flowers_yw/style_random, /obj/structure/flora/tree/jungle/style_5, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"zg" = ( +/obj/structure/chair/sofa/bench/left{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/punch_shit{ + pixel_y = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "zh" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -5737,6 +8245,18 @@ "zk" = ( /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/medical) +"zl" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/space/basic, +/area/space/nearstation) +"zm" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "zn" = ( /obj/machinery/light/directional/north, /obj/structure/table/reinforced, @@ -5804,6 +8324,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"zw" = ( +/obj/machinery/light/cold/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) "zx" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -5845,6 +8369,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"zB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple, +/obj/machinery/light/cold/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"zC" = ( +/obj/structure/table/wood/fancy, +/obj/item/camera/spooky, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "zD" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -5889,6 +8426,15 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/medical) +"zL" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "zM" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -6033,6 +8579,15 @@ dir = 8 }, /area/centcom/central_command_areas/evacuation/ship) +"Ag" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; + icon_state = "map-right-MS"; + pixel_y = 32 + }, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "Ah" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/machinery/light/neon_lining{ @@ -6044,6 +8599,14 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Ai" = ( +/obj/structure/sign/poster/contraband/lamarr{ + pixel_y = -32 + }, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) "Aj" = ( /obj/structure/railing/wood{ dir = 8 @@ -6074,10 +8637,36 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"Aq" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters/window{ + id = "FBBZ1"; + name = "Security Shutters" + }, +/obj/structure/fans/tiny, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Ar" = ( /obj/structure/fake_stairs/wood/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"At" = ( +/obj/structure/sign/poster/contraband/bountyhunters{ + pixel_x = -32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) +"Au" = ( +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "Av" = ( /obj/effect/turf_decal/siding/green, /turf/open/floor/iron/dark/herringbone, @@ -6089,6 +8678,17 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"Ax" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/pen{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/folder/red{ + pixel_x = -5 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "Ay" = ( /obj/structure/railing/wood, /obj/structure/table/reinforced, @@ -6196,6 +8796,11 @@ /obj/machinery/vending/autodrobe/all_access, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"AK" = ( +/obj/effect/turf_decal/trimline/red, +/obj/effect/turf_decal/trimline/red, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "AL" = ( /obj/structure/chair/office{ dir = 1 @@ -6225,6 +8830,16 @@ /obj/machinery/nuclearbomb/beer, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"AQ" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "AR" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/dice/d20, @@ -6241,6 +8856,16 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"AU" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "AV" = ( /obj/structure/hedge, /obj/structure/railing/wood{ @@ -6251,6 +8876,15 @@ /obj/structure/railing/wood, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"AW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/expansion_bombthreat) "AX" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -6259,10 +8893,27 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"AZ" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Ba" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"Bc" = ( +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"Bd" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Be" = ( /obj/item/clothing/head/soft/fishing_hat, /obj/structure/table/wood, @@ -6336,6 +8987,10 @@ /obj/machinery/vending/hydroseeds, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"Bj" = ( +/obj/effect/landmark/navigate_destination/centcom/dresser, +/turf/open/floor/iron/dark/herringbone, +/area/centcom/central_command_areas/hall) "Bk" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood{ @@ -6351,6 +9006,12 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"Bl" = ( +/obj/structure/table/wood, +/obj/item/storage/box/drinkingglasses, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Bm" = ( /obj/structure/reagent_dispensers/fueltank, /obj/item/weldingtool/experimental, @@ -6359,6 +9020,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"Bp" = ( +/obj/structure/fence/door, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"Bq" = ( +/obj/effect/landmark/start/wizard, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Br" = ( /obj/structure/railing/wood{ dir = 8 @@ -6374,6 +9043,26 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/evacuation) +"Bu" = ( +/obj/machinery/vending/drugs, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) +"Bv" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"Bx" = ( +/obj/structure/table/wood, +/obj/item/food/syndicake{ + pixel_y = 3 + }, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "By" = ( /obj/machinery/light/directional/south, /obj/structure/filingcabinet/chestdrawer, @@ -6410,10 +9099,28 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"BD" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "BE" = ( /obj/structure/fake_stairs/wood/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"BG" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"BH" = ( +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) "BI" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -6440,9 +9147,95 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"BL" = ( +/obj/machinery/light/small/directional/west, +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/fishmeat, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/obj/item/reagent_containers/condiment/enzyme{ + layer = 5 + }, +/obj/item/storage/fancy/egg_box, +/obj/item/storage/fancy/egg_box, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = -5; + pixel_y = 9 + }, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) +"BO" = ( +/obj/structure/bed{ + dir = 4 + }, +/obj/item/bedsheet/syndie{ + dir = 4 + }, +/turf/open/floor/iron/smooth_half, +/area/centcom/syndicate_mothership/control) +"BQ" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "BR" = ( /turf/open/floor/grass, /area/centcom/central_command_areas/evacuation/ship) +"BS" = ( +/mob/living/simple_animal/bot/medbot/mysterious{ + desc = "If you don't accidentally blow yourself up from time to time you're not really a wizard anyway."; + faction = list("neutral","silicon","creature"); + name = "Nobody's Perfect" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"BT" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Storage" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"BU" = ( +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) +"BV" = ( +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"BW" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) +"BX" = ( +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "BY" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -6469,6 +9262,19 @@ /obj/structure/chair/comfy/shuttle, /turf/open/floor/circuit/green, /area/centcom/central_command_areas/admin) +"Cd" = ( +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership/control) +"Ce" = ( +/obj/structure/table/wood, +/obj/item/dice/d20, +/obj/item/dice, +/turf/open/floor/carpet, +/area/centcom/wizard_station) +"Cf" = ( +/obj/structure/destructible/cult/item_dispenser/forge/engine, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Cg" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -6496,6 +9302,16 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"Ck" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/portable_atmospherics/canister, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"Cl" = ( +/turf/open/space/transit, +/area/space) "Cm" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/table/reinforced, @@ -6508,11 +9324,26 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"Cp" = ( +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Cq" = ( /obj/structure/chair/comfy/carp, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Cr" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Cs" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -6529,6 +9360,22 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"Cv" = ( +/obj/machinery/light/cold/directional/south, +/turf/open/floor/iron/smooth_half{ + dir = 1 + }, +/area/centcom/syndicate_mothership/control) +"Cw" = ( +/obj/effect/turf_decal/siding/red, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/item/stack/spacecash/c10{ + pixel_x = -19; + pixel_y = 10 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Cx" = ( /obj/machinery/door/airlock/centcom, /turf/open/floor/iron/dark, @@ -6552,6 +9399,17 @@ /obj/effect/turf_decal/trimline/green, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) +"CB" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"CC" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "CF" = ( /obj/machinery/suit_storage_unit/industrial, /obj/structure/window/reinforced/survival_pod/spawner/directional/east, @@ -6570,6 +9428,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/evacuation/ship) +"CI" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"CJ" = ( +/obj/structure/barricade/sandbags, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"CK" = ( +/obj/effect/turf_decal/stripes/full, +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) +"CL" = ( +/obj/docking_port/stationary{ + area_type = /area/centcom/syndicate_mothership; + dheight = 1; + dir = 4; + dwidth = 12; + height = 17; + name = "syndicate recon outpost"; + roundstart_template = /datum/map_template/shuttle/infiltrator/basic; + shuttle_id = "syndicate_away"; + width = 23 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "CM" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -6591,6 +9475,10 @@ /obj/structure/fireaxecabinet/directional/north, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) +"CP" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "CQ" = ( /obj/structure/injured_spawner, /turf/open/floor/iron/dark, @@ -6642,6 +9530,22 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"CX" = ( +/obj/structure/chair/stool/directional/south, +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = 32 + }, +/obj/effect/landmark/start/nukeop, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"CY" = ( +/obj/structure/chair/greyscale{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Da" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/bodycontainer/morgue, @@ -6659,6 +9563,29 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"Dc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Dd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) +"De" = ( +/obj/item/cautery/alien, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/wizard_station) +"Df" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Dg" = ( /obj/structure/hedge, /obj/structure/railing/wood, @@ -6681,12 +9608,29 @@ /obj/effect/turf_decal/siding/wood/corner, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"Dk" = ( +/obj/structure/chair/sofa/right/brown{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/revolver{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Dl" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 }, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"Dm" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red/corner, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Dn" = ( /obj/structure/flora/tree/palm, /obj/machinery/light/directional/north, @@ -6699,10 +9643,21 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) -"Dr" = ( +"Dp" = ( /obj/structure/table/reinforced, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/medical) +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"Dq" = ( +/obj/structure/railing{ + dir = 5 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "Dt" = ( /obj/machinery/modular_computer/console/preset/id/centcom, /obj/effect/turf_decal/siding/dark{ @@ -6710,6 +9665,12 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Dv" = ( +/obj/item/clothing/suit/wizrobe/black, +/obj/item/clothing/head/wizard/black, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/wizard_station) "Dw" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -6720,6 +9681,21 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin) +"Dy" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"Dz" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/barricade/sandbags, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "DA" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -6758,6 +9734,34 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) +"DH" = ( +/obj/machinery/igniter/incinerator_ordmix{ + id = "syn_ordmix_igniter" + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"DI" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) +"DJ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"DK" = ( +/obj/structure/sign/poster/contraband/c20r{ + pixel_y = -32 + }, +/obj/structure/cable, +/turf/open/floor/iron/smooth, +/area/centcom/syndicate_mothership/control) "DL" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -6769,6 +9773,21 @@ }, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"DN" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 15 + }, +/obj/item/grenade/chem_grenade, +/obj/item/stack/cable_coil, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 14 + }, +/obj/machinery/light/cold/directional/west, +/obj/item/stack/cable_coil, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "DO" = ( /obj/item/kirbyplants{ icon_state = "plant-22"; @@ -6808,6 +9827,12 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/ghost_spawn) +"DS" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "DU" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -6852,11 +9877,24 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"Ee" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "Ef" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/admin) +"Eg" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Break Room" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Eh" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -6866,6 +9904,20 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"Ei" = ( +/obj/machinery/door/airlock/titanium{ + name = "Restroom" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"Ek" = ( +/obj/item/toy/figure/syndie, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "El" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -6923,6 +9975,17 @@ /obj/machinery/vending/cola/black, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"Es" = ( +/obj/item/toy/plush/lizard_plushie/green{ + name = "Spots-The-Operative" + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"Eu" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/grass, +/area/centcom/wizard_station) "Ev" = ( /obj/structure/chair/sofa/corp/right, /obj/effect/turf_decal/tile/dark/opposingcorners, @@ -6997,6 +10060,19 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"EF" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/public/glass{ + name = "Cafeteria" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "EG" = ( /obj/effect/turf_decal/siding/green{ dir = 4 @@ -7069,6 +10145,14 @@ /obj/structure/chair/sofa/corp/left, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"ER" = ( +/obj/effect/turf_decal/tile/dark/diagonal_edge, +/obj/structure/table/reinforced, +/obj/item/knife, +/obj/item/knife, +/obj/item/kitchen/rollingpin, +/turf/open/floor/iron/white/diagonal, +/area/centcom/central_command_areas/kitchen) "ES" = ( /obj/effect/turf_decal/siding/green, /obj/effect/turf_decal/siding/green/corner{ @@ -7108,6 +10192,12 @@ }, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) +"EW" = ( +/obj/structure/railing/wood, +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "EZ" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -7132,6 +10222,19 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Fc" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 6 + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) +"Fd" = ( +/obj/structure/weightmachine/weightlifter, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Fe" = ( /obj/machinery/light/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -7165,6 +10268,12 @@ /obj/effect/landmark/basketball/game_area, /turf/open/space/basic, /area/space) +"Fl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Fm" = ( /obj/structure/table/reinforced/plastitaniumglass{ name = "Andrea's Desk" @@ -7187,6 +10296,27 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"Fr" = ( +/obj/machinery/camera/autoname/directional/north{ + network = list("nukie") + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) +"Fs" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) +"Ft" = ( +/obj/machinery/light/small/directional/north, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "Fv" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/reinforced, @@ -7196,9 +10326,22 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/kitchen) +"Fw" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/puzzle/keycard/syndicate_fridge, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "Fy" = ( /turf/open/chasm, /area/centcom/central_command_areas/admin) +"Fz" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership) "FA" = ( /obj/structure/flora/bush/large/style_3, /turf/open/floor/grass, @@ -7213,6 +10356,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"FC" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/processor/slime, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "FD" = ( /obj/structure/railing/wood{ dir = 1 @@ -7400,6 +10550,12 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin) +"Gf" = ( +/obj/structure/table/wood, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/ointment, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Gh" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -7431,6 +10587,23 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/white, /area/centcom/central_command_areas/evacuation/ship) +"Gj" = ( +/obj/structure/sink/kitchen/directional/west, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) +"Gk" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/purple, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Gl" = ( +/obj/structure/flora/grass/both/style_random, +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "Gm" = ( /obj/structure/railing/wood{ dir = 1 @@ -7451,12 +10624,24 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin_hangout) +"Go" = ( +/obj/machinery/computer/camera_advanced{ + dir = 4 + }, +/turf/open/floor/wood, +/area/centcom/wizard_station) "Gp" = ( /obj/structure/chair/wood{ dir = 8 }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"Gr" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 4 + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Gt" = ( /obj/machinery/door/airlock/centcom{ name = "Trapp's Office" @@ -7482,6 +10667,35 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) +"Gw" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"Gx" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/external/ruin, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) +"Gy" = ( +/obj/item/gun/energy/ionrifle, +/obj/structure/rack, +/obj/machinery/camera/autoname/directional/west{ + network = list("nukie") + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) "Gz" = ( /obj/machinery/computer/auxiliary_base/directional/north, /obj/structure/table/reinforced, @@ -7494,6 +10708,18 @@ "GA" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/ferry) +"GB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/fun_police{ + pixel_x = -32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bombthreat) "GC" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -7503,6 +10729,22 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"GE" = ( +/obj/structure/chair/stool/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"GF" = ( +/obj/structure/table/wood, +/obj/item/food/nachos{ + pixel_x = 7; + pixel_y = -14 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"GG" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "GI" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/autodrobe/all_access, @@ -7568,9 +10810,6 @@ /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) "GR" = ( -/obj/structure/railing/wood{ - dir = 4 - }, /obj/effect/turf_decal/siding/wood{ dir = 5 }, @@ -7587,6 +10826,18 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"GT" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/machinery/light/directional/west, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"GV" = ( +/obj/structure/mop_bucket, +/obj/item/mop, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "GW" = ( /turf/open/floor/carpet, /area/centcom/central_command_areas/admin_hangout) @@ -7612,6 +10863,18 @@ /obj/effect/mapping_helpers/airlock/access/any/admin/captain, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Ha" = ( +/obj/machinery/door/airlock/external/ruin, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Hb" = ( /obj/machinery/power/port_gen/pacman, /obj/structure/cable, @@ -7635,6 +10898,34 @@ /obj/item/toy/plush/lizard_plushie, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"Hf" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"Hg" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Hh" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/obj/machinery/door/airlock/highsecurity{ + name = "Sky Bridge" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/textured_large, +/area/centcom/syndicate_mothership/control) "Hi" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/light/directional/east, @@ -7667,6 +10958,10 @@ /obj/structure/sign/warning/yes_smoking/circle/directional/north, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Hn" = ( +/obj/structure/table/reinforced, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "Ho" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -7691,6 +10986,12 @@ }, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Hs" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/turf/open/misc/ice/icemoon, +/area/centcom/syndicate_mothership/control) "Ht" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -7713,11 +11014,19 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"Hx" = ( +/obj/structure/fence/cut/large, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Hy" = ( /obj/structure/window/plasma/spawner/directional/north, /obj/structure/window/plasma/spawner/directional/east, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"Hz" = ( +/obj/structure/table/wood, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "HA" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -7734,6 +11043,10 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"HC" = ( +/obj/machinery/chem_master, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "HD" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/dark{ @@ -7744,6 +11057,10 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"HF" = ( +/obj/structure/flora/rock/icy/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "HG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -7751,6 +11068,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"HH" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "HI" = ( /obj/effect/turf_decal/siding/blue, /obj/effect/turf_decal/siding/blue/corner{ @@ -7799,6 +11122,16 @@ }, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin_hangout) +"HO" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) "HP" = ( /obj/structure/hedge, /obj/structure/railing/wood, @@ -7835,6 +11168,14 @@ }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) +"HV" = ( +/obj/structure/barricade/sandbags, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "HW" = ( /obj/effect/turf_decal/siding/blue/corner, /turf/open/floor/iron/dark/herringbone, @@ -7888,6 +11229,19 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/admin) +"If" = ( +/obj/structure/chair/stool/directional/north, +/obj/effect/landmark/start/nukeop, +/obj/structure/sign/poster/contraband/donk_co{ + pixel_y = -32 + }, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"Ig" = ( +/obj/structure/dresser, +/obj/item/storage/backpack/satchel, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "Ih" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/supply) @@ -7917,6 +11271,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Im" = ( +/obj/item/coin/antagtoken, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/wizard_station) "In" = ( /obj/structure/table/reinforced/plastitaniumglass, /turf/open/floor/circuit/telecomms, @@ -7937,6 +11296,9 @@ /obj/structure/chair/stool/bar/directional/east, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/evacuation/ship) +"Iq" = ( +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Ir" = ( /obj/machinery/computer/emergency_shuttle{ dir = 1 @@ -7956,6 +11318,11 @@ "It" = ( /turf/open/indestructible/event/plating, /area/centcom/tdome/arena/actual) +"Iu" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Iv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -7965,11 +11332,20 @@ }, /turf/open/floor/stone, /area/centcom/central_command_areas/evacuation/ship) +"Iw" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "Iy" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/borbop) +"Iz" = ( +/obj/structure/flora/rock/pile/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "IA" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, @@ -7979,6 +11355,11 @@ /obj/structure/window/plasma/spawner/directional/east, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"IC" = ( +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "ID" = ( /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin) @@ -8057,6 +11438,24 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"IP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"IQ" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "IR" = ( /obj/structure/table/wood/fancy/royalblack, /obj/effect/turf_decal/siding/wood, @@ -8066,6 +11465,13 @@ /obj/machinery/door/poddoor/shutters/indestructible/preopen, /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin) +"IT" = ( +/obj/effect/turf_decal/stripes/box, +/obj/machinery/portable_atmospherics/pump/lil_pump{ + desc = "A betrayer to pump-kind." + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bombthreat) "IU" = ( /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) @@ -8090,17 +11496,46 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"IY" = ( +/obj/effect/baseturf_helper/asteroid/snow, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) "IZ" = ( /obj/structure/chair/wood, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"Ja" = ( +/obj/structure/chair/wood/wings{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "Jb" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/prison/cells) +"Jc" = ( +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Jd" = ( /obj/structure/fake_stairs/wood/directional/north, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"Je" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"Jf" = ( +/obj/structure/sign/poster/contraband/syndiemoth{ + pixel_x = 32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Jg" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/reinforced, @@ -8165,6 +11600,17 @@ /obj/machinery/computer/security/wooden_tv, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin_hangout) +"Jt" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/closet/syndicate/personal, +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "Ju" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, @@ -8192,6 +11638,23 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"Jx" = ( +/obj/structure/railing{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"Jy" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/machinery/door/puzzle/keycard/syndicate_bio, +/obj/structure/fans/tiny, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Jz" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, @@ -8221,6 +11684,14 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"JD" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Engine Room" + }, +/obj/structure/barricade/wooden, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "JE" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -8285,6 +11756,26 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation) +"JO" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/analyzer{ + pixel_x = 2; + pixel_y = 1 + }, +/obj/item/pipe_dispenser{ + desc = "A device used to rapidly pipe things. This one has a curious abundance of warning labels."; + name = "Syndicate Rapid Pipe Dispenser (RPD)"; + pixel_y = -3 + }, +/obj/item/flamethrower/full, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"JP" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "JQ" = ( /obj/structure/table/reinforced/titaniumglass, /obj/item/paper_bin, @@ -8301,6 +11792,15 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"JS" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "JT" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/wood{ @@ -8348,6 +11848,10 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"JZ" = ( +/obj/machinery/smartfridge/chemistry/virology/preloaded, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Ka" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -8397,6 +11901,12 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/briefing) +"Kf" = ( +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Kg" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/wood/corner{ @@ -8448,6 +11958,13 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"Kn" = ( +/obj/structure/chair/stool/directional/south, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Ko" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -8498,6 +12015,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"Kv" = ( +/obj/item/clothing/shoes/sneakers/marisa, +/obj/item/clothing/suit/wizrobe/marisa, +/obj/item/clothing/head/wizard/marisa, +/obj/item/staff/broom, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Kw" = ( /obj/structure/chair/office{ dir = 1 @@ -8517,6 +12041,13 @@ }, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"Kz" = ( +/obj/structure/fluff/tram_rail, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "KB" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -8526,6 +12057,50 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"KC" = ( +/obj/structure/table/wood/fancy, +/obj/item/skub{ + pixel_y = 16 + }, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) +"KD" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) +"KE" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/obj/structure/table/glass/plasmaglass, +/obj/machinery/reagentgrinder{ + pixel_x = -5; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -7; + pixel_y = -8 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 9; + pixel_y = -7 + }, +/obj/structure/sign/poster/contraband/lizard{ + pixel_x = -32 + }, +/obj/structure/sign/poster/contraband/kudzu{ + pixel_y = 32 + }, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 10; + pixel_y = 5 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "KF" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -8560,6 +12135,13 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"KL" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "KM" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark/corner{ @@ -8604,6 +12186,15 @@ "KQ" = ( /turf/open/floor/plating, /area/centcom/central_command_areas/evacuation/ship) +"KR" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "KS" = ( /obj/docking_port/stationary{ dir = 4; @@ -8633,6 +12224,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/centcom/central_command_areas/evacuation/ship) +"KW" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "KX" = ( /obj/structure/railing{ dir = 6; @@ -8700,6 +12299,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"Le" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red/corner{ + dir = 8 + }, +/obj/item/folder/red, +/obj/item/pen/red, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Lf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -8784,6 +12392,16 @@ /obj/effect/turf_decal/tile/orange/diagonal_edge, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Lr" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("nukie") + }, +/obj/machinery/chem_dispenser/mutagensaltpeter, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Ls" = ( /obj/machinery/biogenerator/admin, /obj/effect/turf_decal/siding/wood{ @@ -9020,6 +12638,18 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"LZ" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/closet/syndicate/personal, +/obj/structure/sign/poster/contraband/gorlex_recruitment{ + pixel_y = 32 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/full, +/turf/open/floor/iron/dark/textured_half{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "Ma" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, @@ -9070,6 +12700,18 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Mi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Mj" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/dark{ @@ -9097,6 +12739,14 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/grass, /area/centcom/central_command_areas/hall) +"Mn" = ( +/obj/effect/turf_decal/siding/thinplating, +/obj/machinery/door/window/survival_pod{ + name = "Surgery"; + opacity = 1 + }, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/control) "Mo" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, @@ -9107,17 +12757,68 @@ }, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Mq" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) +"Mr" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/obj/machinery/door/airlock/highsecurity{ + name = "Sky Bridge" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/textured_large, +/area/centcom/syndicate_mothership/control) +"Ms" = ( +/turf/closed/indestructible/riveted/uranium, +/area/centcom/wizard_station) "Mt" = ( /mob/living/simple_animal/bot/cleanbot/medbay, /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"Mu" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/airlock/titanium{ + name = "Experiments Wing Decontamination" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Mv" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Mw" = ( +/obj/effect/turf_decal/trimline/red, +/obj/effect/turf_decal/trimline/red, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north{ + network = list("nukie") + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Mx" = ( /obj/machinery/light/floor/has_bulb, /obj/structure/chair/comfy/carp{ @@ -9129,6 +12830,12 @@ /obj/structure/fake_stairs/wood/directional/north, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"Mz" = ( +/obj/machinery/microwave, +/obj/structure/table/reinforced/plastitaniumglass, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "MB" = ( /obj/structure/hedge, /obj/effect/turf_decal/siding/dark{ @@ -9192,6 +12899,16 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"ML" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/item/clothing/suit/wizrobe/red, +/obj/item/clothing/head/wizard/red, +/obj/item/staff, +/obj/item/clothing/shoes/sandal/magic, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "MM" = ( /obj/machinery/power/shuttle_engine/large, /turf/open/floor/plating, @@ -9233,6 +12950,42 @@ dir = 10 }, /area/centcom/central_command_areas/hall) +"MR" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 + }, +/obj/machinery/airalarm/unlocked{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"MS" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Observation Deck" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"MT" = ( +/obj/machinery/computer/camera_advanced/xenobio, +/obj/structure/noticeboard/directional/east, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"MV" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 5 + }, +/obj/structure/table/reinforced/plasmarglass, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = -11 + }, +/obj/item/storage/belt/medical, +/turf/open/floor/mineral/titanium/tiled/blue, +/area/centcom/syndicate_mothership/control) "MW" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/light/directional/west, @@ -9273,6 +13026,10 @@ /obj/structure/hedge, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"Ne" = ( +/obj/item/stack/sheet/mineral/sandbags, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) "Nf" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, @@ -9283,6 +13040,19 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"Nh" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/hatch{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "Ni" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 1 @@ -9298,6 +13068,13 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/prison/cells) +"Nk" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "Nm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -9305,6 +13082,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/textured, /area/centcom/central_command_areas/evacuation/ship) +"Nn" = ( +/obj/structure/table/reinforced/plastitaniumglass, +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/item/toy/plush/nukeplushie{ + name = "Sir Flash Nukedon"; + pixel_x = -2; + pixel_y = 14 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"No" = ( +/obj/effect/turf_decal/tile/dark/opposingcorners, +/obj/effect/portal/permanent{ + id = "arena" + }, +/turf/open/floor/iron/dark, +/area/centcom/tdome/observation) +"Np" = ( +/obj/structure/chair/office, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Nq" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -9328,6 +13127,28 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) +"Nu" = ( +/obj/structure/rack, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/ducts/fifty, +/obj/item/wrench{ + desc = "A little smidgeon of Freon..."; + name = "Freon" + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Nv" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"Nw" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bombthreat) "Nx" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -9350,6 +13171,14 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"NA" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "NB" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -9363,6 +13192,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"ND" = ( +/obj/machinery/vending/snack, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "NE" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/pod_storage) @@ -9370,6 +13203,12 @@ /obj/structure/fake_stairs/wood/directional/south, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"NG" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "NH" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/railing/wood{ @@ -9405,6 +13244,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"NM" = ( +/obj/structure/fence/cut/large, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "NN" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/trimline/green, @@ -9432,12 +13279,40 @@ /obj/machinery/rnd/production/techfab/department/medical, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"NU" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/structure/chair/sofa/bench, +/obj/machinery/light/cold/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/stone, +/area/centcom/syndicate_mothership/control) "NV" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"NY" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/machinery/door/puzzle/keycard/syndicate_bomb, +/obj/structure/fans/tiny, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"NZ" = ( +/obj/structure/chair/stool/bar/directional/west, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Ob" = ( /obj/structure/fireplace{ pixel_x = 0 @@ -9452,6 +13327,25 @@ }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) +"Oc" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red{ + dir = 1 + }, +/obj/item/folder/red, +/obj/item/pen/red, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"Od" = ( +/obj/effect/turf_decal/siding/purple, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Oe" = ( +/turf/open/misc/ice/icemoon, +/area/centcom/syndicate_mothership/control) "Of" = ( /obj/structure/curtain/cloth/fancy, /obj/effect/spawner/structure/window/reinforced, @@ -9471,6 +13365,12 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Oi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Oj" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, @@ -9546,6 +13446,10 @@ dir = 10 }, /area/centcom/central_command_areas/hall) +"Ot" = ( +/obj/structure/railing, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "Ou" = ( /obj/structure/table/wood, /obj/machinery/modular_computer/console/preset/id/centcom{ @@ -9553,11 +13457,33 @@ }, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/admin) +"Ov" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Ox" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/machinery/griddle, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/kitchen) +"Oy" = ( +/obj/machinery/button/door/directional/east{ + id = "FBBZ1"; + name = "Security Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"Oz" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 6 + }, +/obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/directional/east{ + network = list("nukie") + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "OA" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -9612,6 +13538,21 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark/smooth_large, /area/centcom/central_command_areas/evacuation/ship) +"OH" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/structure/sign/poster/contraband/cybersun_six_hundred{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"OI" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "OJ" = ( /obj/effect/turf_decal/siding/blue{ dir = 5 @@ -9625,11 +13566,18 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"OL" = ( +/turf/closed/indestructible/rock/snow, +/area/centcom/syndicate_mothership/control) "OM" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"ON" = ( +/obj/machinery/vending/magivend, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "OO" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/light/directional/west, @@ -9654,6 +13602,24 @@ /obj/machinery/coffeemaker/impressa, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/admin) +"OS" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/splatter, +/turf/open/floor/grass, +/area/centcom/wizard_station) +"OT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"OU" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "OV" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -9679,6 +13645,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"OY" = ( +/obj/structure/chair/office/light{ + dir = 1 + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Pa" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -9702,6 +13675,15 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Pd" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "Pe" = ( /obj/structure/railing/wood{ dir = 8 @@ -9714,10 +13696,22 @@ /obj/structure/fake_stairs/wood/directional/north, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/borbop) +"Ph" = ( +/obj/machinery/door/airlock/hatch{ + name = "Closet" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_edge, +/area/centcom/syndicate_mothership/control) "Pj" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Pk" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/item/kirbyplants/random, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Pl" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/dice/d10, @@ -9749,6 +13743,14 @@ }, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Ps" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Pt" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -9758,6 +13760,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"Pu" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/machinery/monkey_recycler, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Pv" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -9781,6 +13790,25 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"Py" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Pz" = ( +/obj/machinery/computer/shuttle/syndicate/recall{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) +"PA" = ( +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) +"PB" = ( +/obj/machinery/light/small/directional/north, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "PC" = ( /obj/machinery/button/door/indestructible{ id = "XCCQMLoaddoor"; @@ -9807,6 +13835,10 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/supply) +"PD" = ( +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/wizard_station) "PE" = ( /obj/machinery/newscaster{ pixel_x = 32 @@ -9814,6 +13846,10 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) +"PF" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/centcom/syndicate_mothership/control) "PG" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -9842,6 +13878,9 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) +"PL" = ( +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "PM" = ( /obj/structure/chair/office, /obj/effect/landmark/ert_spawn, @@ -9849,16 +13888,49 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"PN" = ( +/obj/structure/sign/poster/contraband/gorlex_recruitment{ + pixel_x = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "PO" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"PP" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/iron, +/area/centcom/syndicate_mothership/control) +"PQ" = ( +/obj/machinery/light/cold/directional/north, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"PS" = ( +/obj/machinery/computer/camera_advanced{ + dir = 8; + networks = list("nukie") + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "PT" = ( /obj/structure/fake_stairs/wood/directional/east, /obj/structure/railing/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"PU" = ( +/turf/open/floor/circuit/red, +/area/centcom/syndicate_mothership/control) +"PV" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Personal Quarters" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "PW" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) @@ -9895,6 +13967,21 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Qb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/c20r{ + pixel_x = 32 + }, +/obj/machinery/portable_atmospherics/canister/plasma, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"Qc" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/light/small/directional/south, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Qd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/drinkingglass{ @@ -9931,6 +14018,10 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/central_command_areas/evacuation) +"Qk" = ( +/obj/structure/cable, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) "Ql" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -9969,6 +14060,13 @@ }, /turf/open/floor/carpet/black, /area/centcom/central_command_areas/borbop) +"Qr" = ( +/obj/machinery/light/cold/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Qs" = ( /obj/effect/turf_decal/siding/blue/end{ dir = 4 @@ -9992,6 +14090,39 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Qw" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/andromeda_bitters{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) +"Qx" = ( +/turf/closed/indestructible/fakedoor{ + name = "Sub-Laboratory Elevator" + }, +/area/centcom/syndicate_mothership/control) +"Qy" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/structure/sign/poster/contraband/power{ + pixel_y = 32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) +"Qz" = ( +/obj/machinery/door/airlock/hatch{ + name = "Gangway" + }, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "QA" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -10038,6 +14169,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"QF" = ( +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wideplating, +/obj/machinery/door/airlock/external/ruin, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "QH" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, /obj/effect/turf_decal/tile/neutral/full, @@ -10075,11 +14218,36 @@ /obj/machinery/rnd/production/techfab/department/service, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"QO" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 4 + }, +/obj/machinery/door/airlock/highsecurity{ + name = "Sky Bridge" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/textured_large, +/area/centcom/syndicate_mothership/control) "QP" = ( /obj/effect/heretic_rune/big, /obj/structure/chair/musical, /turf/open/floor/plating/abductor, /area/centcom/central_command_areas/admin) +"QQ" = ( +/obj/structure/chair/wood/wings{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/centcom/wizard_station) +"QR" = ( +/obj/machinery/shower/directional/east, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/mineral/titanium/tiled, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "QS" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -10089,6 +14257,15 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin_hangout) +"QU" = ( +/obj/structure/flora/tree/pine/style_random, +/obj/structure/flora/grass/both/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "QV" = ( /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) @@ -10107,6 +14284,13 @@ /obj/machinery/light/directional/west, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"QZ" = ( +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"Rb" = ( +/obj/machinery/chem_heater/withbuffer, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Rc" = ( /obj/machinery/chem_master/condimaster, /turf/open/floor/iron/dark, @@ -10116,7 +14300,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 1 }, -/obj/structure/hedge, +/obj/machinery/chem_heater/debug, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) "Rf" = ( @@ -10126,6 +14310,10 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Rg" = ( +/obj/item/food/meat/slab/human/mutant/slime, +/turf/open/floor/grass, +/area/centcom/wizard_station) "Ri" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -10140,6 +14328,11 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) +"Rl" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) "Rm" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -10149,6 +14342,15 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/kitchen) +"Rn" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Ro" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -10170,12 +14372,23 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin_hangout) +"Rs" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Rt" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen/fourcolor, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"Ru" = ( +/obj/item/statuebust{ + pixel_y = 12 + }, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood, +/area/centcom/wizard_station) "Rv" = ( /obj/machinery/vending/boozeomat, /obj/item/reagent_containers/cup/glass/modglass/small{ @@ -10195,6 +14408,14 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/borbop) +"Rw" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Rx" = ( /obj/structure/railing/wrestling{ dir = 8 @@ -10232,6 +14453,26 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"RB" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Armoury" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) +"RC" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "RD" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -10270,6 +14511,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"RI" = ( +/obj/machinery/oven/range, +/obj/structure/sign/poster/contraband/eat{ + pixel_x = -32 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "RJ" = ( /obj/effect/decal/cleanable/fuel_pool, /turf/open/floor/grass, @@ -10309,6 +14558,28 @@ /obj/structure/hedge, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"RP" = ( +/obj/structure/flora/tree/dead/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) +"RQ" = ( +/obj/structure/rack, +/obj/item/katana/cursed{ + desc = "A gift from your benefactors."; + force = 20 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/centcom/syndicate_mothership/control) +"RR" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "RT" = ( /obj/machinery/light/directional/south, /turf/open/floor/grass, @@ -10334,6 +14605,15 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"RW" = ( +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "RX" = ( /obj/structure/railing/wood, /obj/effect/turf_decal/trimline/green/line, @@ -10373,9 +14653,28 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"Sg" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/machinery/door/poddoor/shutters{ + id = "FBBZ1"; + name = "Security Shutters" + }, +/obj/structure/fans/tiny, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Si" = ( /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/two) +"Sj" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/red, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Sk" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular, @@ -10387,6 +14686,36 @@ /obj/structure/chair/sofa/corp, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"Sn" = ( +/obj/machinery/light/cold/directional/west, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"Sp" = ( +/obj/structure/closet/crate/freezer{ + name = "meat freezer" + }, +/obj/item/food/meat/slab/bear, +/obj/item/food/meat/slab/bear, +/obj/item/food/meat/slab/bear, +/obj/item/food/meat/slab/bear, +/obj/item/food/meat/slab/gondola, +/obj/item/food/meat/slab/xeno, +/obj/item/food/meat/slab/xeno, +/obj/item/food/meat/slab/xeno, +/obj/item/food/meat/slab/killertomato, +/obj/item/food/meat/slab/killertomato, +/obj/item/food/meat/slab/killertomato, +/obj/item/food/meat/slab/spider, +/obj/item/food/meat/slab/penguin, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/grown/carrot, +/obj/item/food/grown/carrot, +/obj/item/food/grown/garlic, +/obj/item/food/grown/garlic, +/obj/item/food/grown/tomato, +/obj/item/food/grown/tomato, +/turf/open/floor/plastic, +/area/centcom/syndicate_mothership/expansion_fridgerummage) "Sq" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -10396,6 +14725,13 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"Sr" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark, +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Ss" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -10410,11 +14746,48 @@ /obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/botany) +"Sw" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 9 + }, +/obj/structure/table/glass/plasmaglass, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/item/storage/medkit/regular, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) +"Sx" = ( +/obj/structure/table/glass/plasmaglass, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/machinery/light/cold/directional/east, +/obj/item/gun/syringe/syndicate, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Sz" = ( /obj/structure/hedge, /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"SA" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"SB" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "SC" = ( /obj/structure/tank_dispenser/oxygen, /obj/structure/window/reinforced/survival_pod/spawner/directional/west, @@ -10465,6 +14838,21 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"SG" = ( +/obj/effect/turf_decal/siding/red/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"SH" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{ + chamber_id = "nukiebase"; + desc = "Has a valve and pump attached to it. Slightly more menacing than Nanotrasen's standard."; + dir = 1; + name = "syndicate air injector" + }, +/turf/open/floor/engine/vacuum, +/area/centcom/syndicate_mothership/expansion_bombthreat) "SI" = ( /obj/structure/closet, /turf/open/floor/iron/dark, @@ -10511,6 +14899,13 @@ }, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"SN" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "SO" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/machinery/light/neon_lining{ @@ -10523,6 +14918,19 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"SP" = ( +/obj/effect/turf_decal/siding/wideplating/dark, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/machinery/door/airlock/titanium{ + name = "Medical Bay" + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/smooth_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "SR" = ( /turf/open/floor/circuit/green, /area/centcom/central_command_areas/briefing) @@ -10560,6 +14968,9 @@ /obj/machinery/chem_dispenser/drinks/beer, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/borbop) +"Ta" = ( +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "Tb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -10623,6 +15034,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/evacuation/ship) +"Tn" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "Tp" = ( /obj/machinery/light/floor/has_bulb, /obj/effect/turf_decal/siding/wood{ @@ -10643,6 +15063,16 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/hall) +"Ts" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) +"Tt" = ( +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/control) "Tu" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -10684,6 +15114,12 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/three) +"TB" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "TC" = ( /obj/structure/curtain/bounty, /turf/closed/indestructible/fakeglass, @@ -10711,6 +15147,13 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/borbop) +"TH" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "TI" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -10785,6 +15228,11 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/evacuation) +"TT" = ( +/obj/structure/bed, +/obj/item/bedsheet/wiz, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "TU" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -10826,10 +15274,27 @@ /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, /area/centcom/central_command_areas/admin) +"Ub" = ( +/obj/machinery/vending/tool, +/turf/open/floor/mineral/titanium/yellow, +/area/centcom/syndicate_mothership/control) "Uc" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/admin_hangout) +"Ud" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) +"Ue" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Uf" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -10842,6 +15307,10 @@ /obj/effect/turf_decal/tile/dark/opposingcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin_hangout) +"Ui" = ( +/obj/machinery/light/small/directional/east, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "Uj" = ( /obj/structure/chair/sofa/corp/right, /turf/open/floor/carpet, @@ -10855,6 +15324,11 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin_hangout) +"Ul" = ( +/obj/structure/table/wood/fancy, +/obj/item/radio/headset, +/turf/open/floor/wood, +/area/centcom/wizard_station) "Up" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/light/neon_lining{ @@ -10867,6 +15341,15 @@ /obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"Ur" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/carpet, +/area/centcom/wizard_station) +"Us" = ( +/obj/effect/turf_decal/stripes/box, +/obj/structure/closet/emcloset, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "Ut" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -10890,6 +15373,10 @@ /obj/item/reagent_containers/cup/coffeepot/bluespace, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"Uw" = ( +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) "Ux" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -10904,11 +15391,18 @@ dir = 8 }, /obj/machinery/light/floor/has_bulb, +/obj/effect/portal/permanent{ + id = "arena" + }, /turf/open/floor/wood/parquet, /area/centcom/central_command_areas/borbop) "Uz" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/hall) +"UA" = ( +/obj/effect/landmark/navigate_destination/centcom/medical, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "UB" = ( /obj/structure/flora/bush/flowers_yw/style_random, /turf/open/floor/grass, @@ -10920,6 +15414,19 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"UD" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/red/corner, +/obj/item/folder/red, +/obj/item/pen/red, +/turf/open/floor/iron/dark/textured_large, +/area/centcom/syndicate_mothership/control) +"UE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/closed/indestructible/syndicate, +/area/centcom/syndicate_mothership/control) "UF" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/trimline/green/line{ @@ -10944,6 +15451,12 @@ /obj/effect/turf_decal/tile/dark_green/diagonal_centre, /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/botany) +"UJ" = ( +/obj/structure/closet/cardboard, +/obj/item/banhammer, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/centcom/wizard_station) "UK" = ( /obj/machinery/computer/operating{ dir = 4 @@ -10956,11 +15469,50 @@ /obj/machinery/vending/wardrobe/medi_wardrobe, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) +"UM" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/obj/structure/table/glass/plasmaglass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "UN" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/door/airlock/centcom, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/kitchen) +"UO" = ( +/obj/structure/table/wood, +/obj/item/clothing/head/wizard/tape, +/obj/item/clothing/suit/wizrobe/tape, +/obj/item/staff/tape, +/obj/item/stack/sticky_tape/super, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) +"UP" = ( +/obj/effect/turf_decal/siding/wideplating, +/obj/effect/turf_decal/siding/wideplating{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "General Quarters" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/turf/open/floor/iron/dark/textured_half, +/area/centcom/syndicate_mothership/control) +"UQ" = ( +/obj/structure/sign/poster/contraband/moffuchis_pizza{ + pixel_x = -32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "US" = ( /obj/structure/window/plasma/spawner/directional/north, /turf/open/indestructible/hotelwood, @@ -10978,6 +15530,16 @@ /obj/effect/spawner/random/exotic/antag_gear, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"UX" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ + dir = 10 + }, +/obj/machinery/light/cold/directional/east, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "UY" = ( /turf/open/floor/iron/dark/diagonal, /area/centcom/central_command_areas/medical) @@ -10995,12 +15557,52 @@ /obj/item/reagent_containers/cup/glass/mug/nanotrasen, /turf/open/floor/carpet/purple, /area/centcom/central_command_areas/admin) +"Vd" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"Ve" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "Vf" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin_hangout) +"Vg" = ( +/obj/structure/rack, +/obj/machinery/light/cold/directional/west, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/item/stock_parts/micro_laser/high{ + pixel_x = 12 + }, +/obj/item/wrench{ + desc = "A little smidgeon of Freon..."; + name = "Freon" + }, +/obj/item/stock_parts/micro_laser/high{ + pixel_x = -4; + pixel_y = -8 + }, +/obj/item/stock_parts/micro_laser/high{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/stock_parts/micro_laser/high{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/melee/powerfist, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "Vh" = ( /obj/structure/table/reinforced, /obj/item/storage/backpack/duffelbag/med/surgery{ @@ -11014,6 +15616,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/centcom/central_command_areas/evacuation/ship) +"Vi" = ( +/obj/structure/table/reinforced/plasmarglass, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "Vj" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/machinery/vending/clothing, @@ -11037,6 +15647,12 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/hall) +"Vm" = ( +/obj/structure/table/reinforced, +/obj/item/papercutter, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Vn" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -11058,6 +15674,12 @@ /obj/structure/mannequin, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Vq" = ( +/obj/structure/fence/cut/medium{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Vs" = ( /obj/effect/turf_decal/tile/dark/diagonal_edge, /obj/structure/table/wood/fancy/royalblue, @@ -11074,6 +15696,15 @@ }, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"Vt" = ( +/obj/machinery/light/cold/directional/east, +/obj/machinery/vending/snack/teal, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) "Vu" = ( /obj/structure/closet/secure_closet/ert_med, /obj/machinery/vending/wallmed/directional/south{ @@ -11122,6 +15753,31 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) +"Vz" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/vending/dinnerware, +/turf/open/floor/iron/white/herringbone, +/area/centcom/central_command_areas/kitchen) +"VB" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"VC" = ( +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "VD" = ( /turf/closed/wall/mineral/iron, /area/centcom/central_command_areas/admin) @@ -11158,6 +15814,9 @@ /obj/machinery/photocopier/gratis, /turf/open/floor/carpet/royalblue, /area/centcom/central_command_areas/admin) +"VK" = ( +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "VL" = ( /obj/machinery/modular_computer/console/preset/id/centcom{ dir = 1 @@ -11176,6 +15835,12 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/centcom/central_command_areas/armory) +"VN" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "VO" = ( /obj/machinery/door/poddoor/ert, /obj/effect/turf_decal/delivery, @@ -11199,6 +15864,11 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/centcom/central_command_areas/borbop) +"VT" = ( +/obj/structure/chair/stool/directional/north, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) "VU" = ( /obj/structure/chair/comfy/carp, /turf/open/floor/glass/reinforced, @@ -11244,6 +15914,30 @@ "Wb" = ( /turf/open/floor/wood/large, /area/centcom/tdome/observation) +"Wc" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"Wd" = ( +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/closed/indestructible/rock/snow, +/area/centcom/syndicate_mothership) +"We" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_smooth{ + initial_gas_mix = "TEMP=2.7" + }, +/area/centcom/syndicate_mothership) "Wf" = ( /obj/structure/railing/wood{ dir = 8 @@ -11281,6 +15975,25 @@ }, /turf/open/floor/carpet/executive, /area/centcom/central_command_areas/admin) +"Wm" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/structure/chair/office/light, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) +"Wn" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 4 + }, +/obj/structure/sign/poster/contraband/the_big_gas_giant_truth{ + pixel_y = 32 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/expansion_chemicalwarfare) "Wo" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/airlock/access/any/supply/general, @@ -11290,6 +16003,32 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"Wp" = ( +/obj/structure/table/wood/poker, +/obj/machinery/light/warm/directional/north, +/obj/item/reagent_containers/cup/glass/bottle/whiskey{ + pixel_x = -4; + pixel_y = 14 + }, +/obj/item/toy/cards/deck{ + pixel_x = 3; + pixel_y = 6 + }, +/obj/item/clothing/mask/cigarette/robust{ + pixel_x = -4; + pixel_y = 1 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = 12; + pixel_y = -6 + }, +/obj/effect/spawner/random/entertainment/lighter{ + pixel_x = 9; + pixel_y = -3 + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Wr" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -11329,6 +16068,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/medical) +"Ww" = ( +/mob/living/simple_animal/slime, +/turf/open/floor/circuit/red/off, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Wx" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -11340,6 +16083,20 @@ /obj/effect/landmark/ert_spawn, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"Wz" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 5 + }, +/obj/structure/sign/poster/contraband/rip_badger{ + pixel_x = 32 + }, +/obj/machinery/biogenerator, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) +"WA" = ( +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/icemoon, +/area/centcom/syndicate_mothership/control) "WB" = ( /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) @@ -11349,6 +16106,10 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"WD" = ( +/obj/structure/destructible/cult/item_dispenser/archives/library, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "WE" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -11368,9 +16129,6 @@ /turf/open/floor/circuit/telecomms, /area/centcom/central_command_areas/admin) "WJ" = ( -/obj/structure/railing/wood{ - dir = 8 - }, /obj/effect/turf_decal/siding/wood{ dir = 9 }, @@ -11382,6 +16140,25 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/botany) +"WK" = ( +/obj/structure/chair/bronze{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/centcom/syndicate_mothership/control) +"WL" = ( +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/chair/stool/directional/east, +/turf/open/floor/wood/tile, +/area/centcom/syndicate_mothership/control) +"WM" = ( +/obj/machinery/atmospherics/components/unary/passive_vent{ + dir = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership/expansion_bombthreat) "WN" = ( /obj/structure/table/wood, /obj/item/storage/box/drinkingglasses, @@ -11391,6 +16168,23 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/briefing) +"WO" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/button/ignition/incinerator/ordmix{ + id = "syn_ordmix_igniter"; + pixel_x = -6; + pixel_y = -30 + }, +/obj/machinery/button/door/directional/south{ + id = "syn_ordmix_vent"; + pixel_x = 5; + pixel_y = -29 + }, +/obj/machinery/camera/autoname/directional/south{ + network = list("nukie") + }, +/turf/open/floor/mineral/titanium/tiled/yellow, +/area/centcom/syndicate_mothership/expansion_bombthreat) "WP" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -11459,6 +16253,19 @@ }, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/admin) +"Xa" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/fluff/tram_rail{ + pixel_y = 17 + }, +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) "Xb" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -11469,6 +16276,13 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/centcom/central_command_areas/ghost_spawn) +"Xd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/turf/open/floor/iron, +/area/centcom/syndicate_mothership/control) "Xe" = ( /obj/structure/table/reinforced, /obj/item/grenade/c4{ @@ -11481,6 +16295,9 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/centcom/central_command_areas/ferry) +"Xf" = ( +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Xg" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood/corner{ @@ -11517,6 +16334,20 @@ dir = 8 }, /area/centcom/central_command_areas/hall) +"Xl" = ( +/obj/structure/table/wood, +/obj/item/storage/bag/tray, +/obj/item/food/burger/spell, +/turf/open/floor/carpet, +/area/centcom/wizard_station) +"Xm" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 9 + }, +/turf/open/lava/plasma/ice_moon, +/area/centcom/syndicate_mothership/control) "Xn" = ( /obj/structure/chair/office{ dir = 4 @@ -11556,6 +16387,29 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/one) +"Xt" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/mech_bay_recharge_port, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"Xu" = ( +/obj/docking_port/stationary{ + dwidth = 25; + height = 50; + name = "Syndicate Auxiliary Shuttle Dock"; + shuttle_id = "emergency_syndicate"; + width = 50 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"Xv" = ( +/obj/machinery/camera/autoname/directional/west{ + network = list("nukie") + }, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Xw" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin_hangout) @@ -11625,10 +16479,27 @@ }, /turf/open/floor/carpet/red, /area/centcom/central_command_areas/admin) +"XH" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west{ + network = list("nukie") + }, +/obj/structure/chair/greyscale{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "XI" = ( /obj/structure/table/abductor, /turf/open/floor/glass/reinforced, /area/centcom/central_command_areas/admin) +"XJ" = ( +/turf/open/floor/iron/smooth_edge{ + dir = 8 + }, +/area/centcom/syndicate_mothership/control) "XK" = ( /obj/machinery/firealarm/directional/south, /obj/structure/closet/crate/bin, @@ -11636,10 +16507,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/supply) +"XM" = ( +/turf/open/floor/plating/elevatorshaft, +/area/centcom/syndicate_mothership/control) "XN" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"XO" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark/textured_half{ + dir = 4 + }, +/area/centcom/syndicate_mothership/control) "XP" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -11648,12 +16528,34 @@ /obj/effect/turf_decal/tile/orange/diagonal_edge, /turf/open/floor/iron/white/diagonal, /area/centcom/central_command_areas/hall) +"XQ" = ( +/obj/structure/chair/greyscale{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership) "XR" = ( /obj/structure/table/wood, /obj/machinery/light/small/directional/west, /obj/item/toy/plush/lizard_plushie, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"XS" = ( +/obj/structure/flora/tree/dead/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"XT" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/sink/directional/south, +/obj/item/shovel/spade{ + pixel_x = -4 + }, +/obj/item/reagent_containers/cup/bucket, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "XU" = ( /obj/effect/turf_decal/siding/dark{ dir = 6 @@ -11753,6 +16655,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/borbop) +"Yh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden/layer5, +/turf/closed/indestructible/opsglass, +/area/centcom/syndicate_mothership/control) "Yi" = ( /obj/machinery/computer/camera_advanced, /turf/open/floor/iron/dark/herringbone, @@ -11778,11 +16687,42 @@ "Yn" = ( /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/supplypod) +"Yq" = ( +/obj/machinery/door/airlock{ + icon = 'icons/obj/doors/airlocks/station/uranium.dmi'; + name = "Bathroom" + }, +/turf/open/floor/engine/cult, +/area/centcom/wizard_station) "Yt" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/fake_stairs/wood/directional/east, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) +"Yu" = ( +/obj/machinery/vending/cigarette/syndicate, +/turf/open/floor/catwalk_floor/titanium, +/area/centcom/syndicate_mothership/control) +"Yv" = ( +/obj/structure/mirror/magic{ + pixel_y = 28 + }, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) +"Yw" = ( +/obj/structure/table/reinforced, +/obj/item/storage/backpack/duffelbag/med/surgery, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/storage/backpack/duffelbag/med/surgery{ + pixel_y = 10; + pixel_x = -10 + }, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/medical) "Yx" = ( /turf/open/floor/iron/white/herringbone, /area/centcom/central_command_areas/evacuation/ship) @@ -11802,6 +16742,10 @@ }, /turf/open/floor/carpet, /area/centcom/central_command_areas/admin) +"YA" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/wood, +/area/centcom/wizard_station) "YB" = ( /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/iron/dark, @@ -11854,6 +16798,10 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) +"YM" = ( +/obj/structure/closet/cardboard, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "YN" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -11879,6 +16827,19 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/hall) +"YU" = ( +/obj/structure/lattice/catwalk, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 5 + }, +/turf/open/floor/plating/snowed/icemoon, +/area/centcom/syndicate_mothership/control) +"YV" = ( +/obj/structure/bed, +/obj/item/bedsheet/syndie, +/turf/open/floor/iron/smooth_half, +/area/centcom/syndicate_mothership/control) "YW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 8 @@ -11899,13 +16860,6 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark/herringbone, /area/centcom/central_command_areas/botany) -"Za" = ( -/obj/effect/turf_decal/tile/dark/diagonal_edge, -/obj/structure/table/reinforced, -/obj/item/knife, -/obj/item/knife, -/turf/open/floor/iron/white/diagonal, -/area/centcom/central_command_areas/kitchen) "Zb" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/door/airlock/centcom{ @@ -11917,13 +16871,39 @@ "Zc" = ( /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/admin) +"Zd" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/floor/engine, +/area/centcom/syndicate_mothership/expansion_bioterrorism) "Zf" = ( /turf/closed/indestructible/fakeglass, /area/centcom/central_command_areas/admin) +"Zh" = ( +/obj/structure/window/reinforced/survival_pod/spawner/directional/south{ + name = "Tinted Window"; + opacity = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/expansion_bombthreat) "Zi" = ( /obj/item/kirbyplants/fullysynthetic, /turf/open/floor/mineral/titanium/white, /area/centcom/central_command_areas/admin) +"Zj" = ( +/obj/effect/turf_decal/tile/dark/opposingcorners, +/obj/effect/landmark/navigate_destination/centcom/kitchen, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/kitchen) +"Zk" = ( +/obj/machinery/light/cold/directional/east, +/turf/open/floor/plating, +/area/centcom/syndicate_mothership/control) "Zl" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -11964,6 +16944,11 @@ /obj/machinery/shuttle_manipulator, /turf/open/floor/circuit/green, /area/centcom/central_command_areas/briefing) +"Zt" = ( +/obj/structure/flora/rock/pile/style_random, +/obj/structure/flora/grass/both/style_random, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) "Zu" = ( /obj/structure/fake_stairs/wood/directional/west, /obj/machinery/light/floor/has_bulb, @@ -11974,6 +16959,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/armory) +"Zw" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "Zx" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -11984,6 +16976,11 @@ icon_state = "boxing" }, /area/centcom/central_command_areas/admin) +"Zy" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/manifold, +/turf/open/space/basic, +/area/space/nearstation) "Zz" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /turf/open/floor/iron/dark, @@ -12010,6 +17007,18 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"ZC" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/wizoff{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/toy/cards/deck/tarot{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/carpet, +/area/centcom/wizard_station) "ZD" = ( /obj/structure/chair/sofa/corp/corner, /obj/machinery/light/floor/has_bulb, @@ -12049,6 +17058,30 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark/small, /area/centcom/central_command_areas/botany) +"ZI" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 1 + }, +/obj/structure/chair/sofa/bench/left{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) +"ZJ" = ( +/obj/structure/flora/rock/icy/style_random{ + pixel_x = -7 + }, +/obj/effect/light_emitter{ + set_cap = 1; + set_luminosity = 4 + }, +/turf/open/misc/asteroid/snow/airless, +/area/centcom/syndicate_mothership) +"ZK" = ( +/obj/structure/bookcase/random/adult, +/turf/open/floor/iron/white, +/area/centcom/wizard_station) "ZL" = ( /obj/effect/turf_decal/siding/dark{ dir = 9 @@ -12080,6 +17113,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/ferry) +"ZO" = ( +/obj/structure/chair/sofa/bench/right{ + dir = 8 + }, +/obj/structure/sign/poster/contraband/syndicate_pistol{ + pixel_y = 32 + }, +/turf/open/floor/mineral/titanium, +/area/centcom/syndicate_mothership/control) "ZP" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -12092,6 +17134,15 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supplypod/loading/four) +"ZR" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/plating/icemoon, +/area/centcom/syndicate_mothership/control) "ZS" = ( /obj/structure/railing/wood{ dir = 4 @@ -12100,10 +17151,28 @@ /obj/structure/railing/wood, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/hall) +"ZU" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/mineral/plastitanium/red, +/area/centcom/syndicate_mothership/expansion_bombthreat) "ZV" = ( /obj/structure/railing/wrestling, /turf/closed/indestructible/riveted, /area/centcom/central_command_areas/hall) +"ZW" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/rack, +/obj/item/storage/bag/plants, +/obj/item/clothing/suit/apron, +/obj/item/hatchet, +/turf/open/floor/mineral/plastitanium, +/area/centcom/syndicate_mothership/control) "ZX" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -13067,27 +18136,27 @@ aa aa aa aa +OL +OL +OL +OL +OL +OL +OL +OL +OL aa aa aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +OL +OL +OL +OL +OL aa aa aa @@ -13264,6 +18333,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +sQ +sQ +sQ +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa @@ -13291,60 +18392,28 @@ aa aa aa aa +OL +OL +ku +ku +ku +ku +ku +ku +ku +OL aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +OL +OL +OL +OL +OL +PL +PL +PL +PL +OL aa aa aa @@ -13521,6 +18590,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ms +Ms +Ov +WD +xW +WD +NG +Ms +sQ +sQ +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa @@ -13548,60 +18649,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +ku +gP +bB +iw +DN +pO +QR +ku +OL +OL +OL +PL +PL +PL +JZ +PL +rU +mT +Ww +PL +OL aa aa aa @@ -13778,6 +18847,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Go +fc +jz +QZ +QZ +QZ +QZ +QZ +MS +QZ +QZ +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa @@ -13805,60 +18906,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +ku +Nu +qc +qc +qc +qc +qc +ku +nK +nK +nK +PL +KE +oH +sf +si +uG +mT +mT +PL +OL aa aa aa @@ -14035,6 +19104,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ul +cZ +fc +Ms +QZ +QZ +QZ +QZ +QZ +Ms +QZ +aN +QZ +Ms +Ms +Ms +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa @@ -14062,60 +19163,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +ku +BD +Cp +Cp +Cp +Cp +Od +ku +rk +rk +rk +PL +vM +Ue +pE +ne +uG +uG +uG +PL +OL aa aa aa @@ -14292,6 +19361,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Ms +Ms +fc +fc +fc +fc +Ms +Ov +WD +QZ +WD +NG +Ms +QZ +QZ +QZ +Ms +Dv +De +UJ +Ms +Ms +sQ +Ms +Cl +Cl +Cl aa aa aa @@ -14319,60 +19420,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +ku +Qy +rC +Dc +vL +vu +Hg +ku +rk +rk +rk +PL +jG +cX +eO +ex +uG +mT +wg +PL +OL aa aa aa @@ -14549,6 +19618,38 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Ms +ji +yF +fc +fc +YA +Ms +Ms +sQ +sQ +sQ +Ms +Ms +fd +aN +QZ +BT +PD +PD +tl +JD +QZ +QZ +Ms +Cl +Cl +Cl aa aa aa @@ -14563,6 +19664,11 @@ aa aa aa aa +yD +yD +yD +yD +yD aa aa aa @@ -14571,65 +19677,28 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +OL +ku +TH +xr +AK +JP +JP +zB +ku +nK +Qx +nK +PL +mz +cX +pE +vy +uG +mT +mT +PL +OL aa aa aa @@ -14806,6 +19875,38 @@ aa aa aa aa +Cl +Cl +Ms +Ms +Ms +Ms +Ul +fc +fc +fc +Ru +Ms +Gf +QZ +QZ +QZ +BS +Ms +QZ +QZ +QZ +Ms +hq +Im +aT +Ms +Ms +JD +Ms +Ms +Ms +Cl aa aa aa @@ -14815,11 +19916,49 @@ aa aa aa aa +yD +yD +yD +yD +yD +yD +Wd +Wd +Wd +yD +yD +yD +yD aa aa aa aa aa +OL +ku +Mw +Cr +xO +Py +Oi +Gk +ku +kd +je +ah +uG +XT +qs +Hf +hS +uG +uG +uG +PL +OL +OL +OL +OL aa aa aa @@ -14838,6 +19977,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -14848,7 +20010,35 @@ aa aa aa aa +LV +LW +ik +ik +ik +ik +ik +ik +ik +LW +LV aa +"} +(12,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -14908,7507 +20098,6 @@ aa aa aa aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LW -ik -ik -ik -ik -ik -ik -ik -LW -LV -aa -"} -(12,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LW -zi -zi -zi -ik -zi -zi -zi -LW -LV -aa -"} -(13,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LW -zi -zi -zi -ik -zi -zi -zi -LW -LV -aa -"} -(14,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -pW -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LW -zi -zi -zi -ik -zi -zi -zi -LW -LV -aa -"} -(15,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LW -LW -LW -LW -LW -LW -LW -LW -LW -LV -aa -"} -(16,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -LV -aa -"} -(17,1,1) = {" -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -fX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -fR -aa -aa -aa -aa -aa -aa -aa -aa -"} -(18,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Fi -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(19,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -aa -"} -(20,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(21,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(22,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(23,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(24,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -Qe -pu -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(25,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -Di -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(26,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(27,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -jA -jA -jA -jA -jA -hH -hH -hH -hH -hH -jA -aa -"} -(28,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -KF -KF -KF -KF -KF -SS -Yn -Yn -EZ -EZ -EZ -EZ -EZ -QM -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -jA -lS -lS -lS -jA -hH -hH -hH -hH -hH -jA -aa -"} -(29,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -AH -AH -AH -AH -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -jA -lS -lS -lS -jA -hH -hH -hH -hH -hH -jA -aa -"} -(30,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -OP -AH -AH -AH -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -jA -lS -lS -lS -jA -hH -hH -hH -hH -hH -jA -aa -"} -(31,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -OP -OP -OP -OP -OP -PK -Yn -Yn -Vn -PW -Vn -PW -Vn -zZ -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -jA -jA -jA -jA -jA -hH -hH -hH -hH -hH -jA -aa -"} -(32,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -AH -AH -AH -AH -OP -PK -Yn -Yn -Vn -Vn -Vn -Vn -Vn -zZ -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(33,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -XD -XD -XD -XD -XD -Xs -Yn -Yn -Tz -Tz -Tz -Tz -Tz -zE -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(34,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(35,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -zM -zM -zM -zM -zM -zs -Yn -Yn -Pv -Pv -Pv -Pv -Pv -ZQ -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(36,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Se -Si -Se -Se -Se -Tc -Yn -Yn -Pm -Pm -Pm -Xh -Xh -Wt -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(37,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Se -Si -Se -Si -Se -Tc -Yn -Yn -Xh -Xh -Pm -Xh -Xh -Wt -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(38,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Se -Si -Se -Si -Se -Tc -Yn -Yn -Xh -Xh -Pm -Xh -Xh -Wt -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -hH -jA -aa -"} -(39,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Se -Se -Se -Si -Se -Tc -Yn -Yn -Pm -Pm -Pm -Pm -Pm -Wt -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -jA -aa -"} -(40,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Yn -Vk -Vk -Vk -Vk -Vk -Oq -Yn -Yn -Co -Co -Co -Co -Co -VP -Yn -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -"} -(41,1,1) = {" -aa aa aa aa @@ -22443,6 +20132,38 @@ aa aa aa aa +Cl +Ms +Ms +Rs +lG +Ms +Ms +Ms +ze +Ms +Ms +Ms +fK +QZ +QZ +QZ +OU +Ms +QZ +aN +QZ +Ms +Ms +Ms +Ms +Ms +QZ +QZ +Cf +op +Ms +Cl aa aa aa @@ -22451,9 +20172,50 @@ aa aa aa aa +yD +yD +jH +jH +jH +yD +Wd +Wd +Iz +Wd +Wd +Wd +Wd +yD +yD +yD aa aa aa +OL +ku +Wn +iJ +iJ +iJ +iJ +vb +Iq +DS +xU +oS +Jy +Vd +eO +cA +cA +Pu +uG +xJ +ga +Iw +Iw +Zw +OL aa aa aa @@ -22472,6 +20234,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -22482,7 +20267,35 @@ aa aa aa aa +LV +LW +zi +zi +zi +ik +zi +zi +zi +LW +LV aa +"} +(13,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22576,6 +20389,38 @@ aa aa aa aa +Cl +sQ +QZ +QZ +QZ +sQ +QZ +QZ +QZ +mF +ON +Ms +QZ +QZ +QZ +QZ +QZ +sQ +QZ +QZ +QZ +Ms +Ce +Ur +Ig +Ms +Hz +QZ +QZ +op +mx +iB aa aa aa @@ -22583,8 +20428,51 @@ aa aa aa aa +yD +yD +jH +jH +Fz +jH +jH +Wd +HF +xE +xE +Bd +Rw +Wd +Wd +Wd +yD +yD aa aa +OL +ku +Rb +qc +Np +qc +qc +qc +fL +DS +xU +oS +uG +Wz +Lr +MT +OY +FC +uG +Zd +ga +Iw +Iw +Zy +OL aa aa aa @@ -22603,6 +20491,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -22613,27 +20524,39 @@ aa aa aa aa +LV +LW +zi +zi +zi +ik +zi +zi +zi +LW +LV aa +"} +(14,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa aa -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn -Yn aa aa aa @@ -22663,8 +20586,6 @@ aa aa aa aa -"} -(42,1,1) = {" aa aa aa @@ -22720,38 +20641,95 @@ aa aa aa aa -gt -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa aa aa +Cl +sQ +rt +QZ +QZ +gb +QZ +QZ +QZ +QZ +QZ +Eg +QZ +QZ +eL +Bq +QZ +MS +QZ +aN +QZ +PV +aN +TT +aN +sQ +mY +QZ +QZ +op +mx +iB aa aa aa aa aa aa +yD +yD +jH +jH +Fz +Fz +Fz +jH +jH +xE +iK +Iz +xA +fx +fx +Ps +Wd +Wd +yD +yD +yD +yD +ku +ku +HC +tE +Sx +wi +em +Iq +DS +xU +lW +Nw +Nw +Nw +Nw +Nw +Nw +Nw +Nw +Nw +rJ +zl +Ud +OL aa aa aa @@ -22770,6 +20748,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +pW +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -22780,7 +20781,35 @@ aa aa aa aa +LV +LW +zi +zi +zi +ik +zi +zi +zi +LW +LV aa +"} +(15,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22874,12 +20903,90 @@ aa aa aa aa +Cl +sQ +QZ +QZ +QZ +sQ +QZ +QZ +QZ +vX +ND +Ms +QZ +QZ +QZ +QZ +QZ +sQ +QZ +QZ +QZ +Ms +iQ +Ui +Xl +Ms +UO +QZ +QZ +op +mx +iB aa aa aa aa aa aa +yD +jH +jH +Fz +Fz +Fz +Fz +Fz +jH +jH +xE +xE +Bd +fx +fx +fx +Rw +Wd +Wd +Wd +Wd +Wd +Wd +ku +ku +ku +ku +ku +ku +ku +Qr +xU +oa +Nw +zL +en +Vg +dm +GB +ck +Nw +Nw +Nw +Nw +Nw +OL aa aa aa @@ -22898,6 +21005,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -22908,7 +21038,35 @@ aa aa aa aa +LV +LW +LW +LW +LW +LW +LW +LW +LW +LW +LV aa +"} +(16,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -22920,8 +21078,6 @@ aa aa aa aa -"} -(43,1,1) = {" aa aa aa @@ -23004,12 +21160,90 @@ aa aa aa aa +Cl +Ms +Ms +as +vv +Ms +Ms +Ms +dN +Ms +Ms +Ms +uW +QZ +QZ +QZ +OU +Ms +QZ +aN +QZ +Ms +Ms +Ms +Ms +Ms +sW +QZ +Cf +op +Ms +Cl aa aa aa aa aa aa +yD +jH +Fz +Fz +Fz +Fz +Fz +Fz +Fz +jH +jH +xE +Bp +fx +fx +if +fx +fx +JS +Iz +xE +JS +ZJ +nK +kL +hT +Sw +dr +UM +oD +DS +xU +oS +kU +Wc +IQ +Wm +tZ +bh +qS +MR +tV +eH +qW +Nw +OL aa aa aa @@ -23028,6 +21262,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -23038,7 +21295,35 @@ aa aa aa aa +LV +LV +LV +LV +LV +LV +LV +LV +LV +LV +LV aa +"} +(17,1,1) = {" +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX +fX aa aa aa @@ -23132,12 +21417,90 @@ aa aa aa aa +Cl +Cl +Ms +Ms +Ms +Ms +aN +Ja +aN +zC +ow +Ms +oI +ML +Kv +QZ +QZ +Ms +QZ +QZ +QZ +Ms +nH +jo +ZK +Ms +Ms +sQ +Ms +Ms +Ms +Cl aa aa aa aa aa aa +yD +jH +jH +jH +jH +kK +jH +Fz +Fz +Fz +jH +xE +Bd +fx +fx +zc +ZJ +fx +xE +nD +xE +nD +yc +nK +gw +Mn +Rn +hP +oS +SP +DS +xU +oS +NY +eZ +eZ +eZ +eZ +hC +IT +WO +Nw +ps +DH +Nw +OL aa aa aa @@ -23156,6 +21519,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -23169,6 +21555,7 @@ aa aa aa aa +fR aa aa aa @@ -23178,11 +21565,7 @@ aa aa aa "} -(44,1,1) = {" -aa -aa -aa -aa +(18,1,1) = {" aa aa aa @@ -23238,6 +21621,7 @@ aa aa aa aa +Fi aa aa aa @@ -23290,12 +21674,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Ms +qX +ju +QQ +aN +fP +Ms +Ms +sQ +sQ +sQ +Ms +Ms +fd +aN +QZ +Yq +Ta +Ta +lM +Ms +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa aa aa aa +yD +Wd +jH +jH +xw +xL +jH +jH +kK +jH +jH +og +Bd +fx +fx +fx +if +nD +xE +fs +fs +xE +nD +nK +MV +lx +mj +Mi +Oz +oD +DS +xU +oS +kU +JO +eu +ZU +gp +Je +nz +ti +tV +SH +qW +Nw +OL aa aa aa @@ -23314,6 +21776,29 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa @@ -23336,6 +21821,8 @@ aa aa aa aa +"} +(19,1,1) = {" aa aa aa @@ -23434,8 +21921,6 @@ aa aa aa aa -"} -(45,1,1) = {" aa aa aa @@ -23446,11 +21931,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ee +aN +Ja +aN +sQ +vc +pb +sL +OS +pb +sQ +QZ +QZ +QZ +Ms +Yv +RC +KC +Ms +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa aa aa +yD +Wd +fx +Rw +jH +lz +XQ +pY +jH +iV +Us +jH +bs +Bd +fx +fx +fx +xE +eJ +xE +xE +nD +nK +nK +nK +nK +nK +nK +GG +GG +GG +Ve +vd +th +Nw +gJ +dg +DJ +gJ +fM +SB +el +gM +hJ +hJ +Nw +OL aa aa aa @@ -23469,11 +22033,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA aa +"} +(20,1,1) = {" aa aa aa @@ -23582,10 +22188,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +qX +ZC +QQ +sQ +Eu +xM +Eu +Rg +Eu +sQ +QZ +aN +QZ +Ms +Ms +Ms +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa aa +yD +Wd +fx +Rw +fx +jH +Vi +Ax +jH +jH +kK +jH +jH +bs +Bd +fx +fx +if +xE +xE +nD +nD +oD +oD +nK +Mz +wn +GT +RI +GG +BL +GG +nK +Mu +nK +Nw +vQ +dB +nE +Zh +OT +Nk +IP +Nw +WM +WM +Nw +OL aa aa aa @@ -23604,11 +22290,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(21,1,1) = {" aa aa aa @@ -23691,19 +22419,6 @@ aa aa aa aa -"} -(46,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -23730,9 +22445,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ee +aN +sQ +hk +jq +pb +xM +pb +sQ +QZ +QZ +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa +yD +Wd +fx +fx +Ps +fx +jH +wU +wU +jH +We +We +We +We +tG +Vq +fx +fx +Iz +xE +xE +eJ +oD +oD +zb +nK +ei +Bc +Bc +Bc +Fw +Au +GG +rp +Tt +XH +Nw +Ck +Qb +bJ +un +dH +UX +AW +Nw +tQ +tQ +Nw +OL aa aa aa @@ -23751,11 +22547,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(22,1,1) = {" aa aa aa @@ -23864,9 +22702,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ms +Ms +pb +xM +Eu +uV +kV +Ms +sQ +sQ +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa aa +yD +Wd +tP +NM +tP +tP +jH +qU +ef +jH +qU +qU +Hx +qU +qU +VN +fx +fx +fx +xE +qy +xE +oD +gW +VK +Nh +Bc +Bc +Bc +Qw +GG +dI +GG +sz +Tt +oQ +Nw +Nw +Nw +Nw +Nw +Nw +Nw +Nw +Nw +zm +zm +Nw +OL aa aa aa @@ -23885,11 +22804,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(23,1,1) = {" aa aa aa @@ -23904,13 +22865,6 @@ aa aa aa aa -KH -Lt -Lt -Lt -Lt -Lt -Lt aa aa aa @@ -23948,8 +22902,6 @@ aa aa aa aa -"} -(47,1,1) = {" aa aa aa @@ -24007,8 +22959,90 @@ aa aa aa aa +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Ms +Ms +Ms +Ms +Ms +Ms +Ms +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl +Cl aa aa +yD +Wd +xE +Ps +Rw +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +eJ +nD +Iz +oD +CY +VK +nK +eb +jx +Bc +fo +GG +Sp +GG +KL +Tt +ZW +nK +ir +rN +PN +Sn +lw +lN +UQ +Nw +Nw +Nw +Nw +OL aa aa aa @@ -24027,11 +23061,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(24,1,1) = {" aa aa aa @@ -24160,14 +23236,6 @@ aa aa aa aa -KH -Lt -KK -wk -Qt -Lk -cP -MM aa aa aa @@ -24182,6 +23250,56 @@ aa aa aa aa +yD +Wd +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +oD +oD +VK +VK +kB +TB +eg +GF +Bl +GG +kT +GG +nK +kY +nK +nK +ir +vU +dX +jT +jT +qC +qC +nK +OL +OL +OL +OL aa aa aa @@ -24200,32 +23318,53 @@ aa aa aa aa +Di +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +Qe +pu +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa "} -(48,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +(25,1,1) = {" aa aa aa @@ -24330,6 +23469,94 @@ aa aa aa aa +sk +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +if +xE +eJ +oD +vi +VK +lP +nK +Bv +NZ +NZ +BQ +GG +GG +GG +PF +nS +mn +nK +nK +nK +Ei +nK +nK +nK +nK +nK +OL +OL +OL +OL aa aa aa @@ -24348,11 +23575,53 @@ aa aa aa aa +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di +Di aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(26,1,1) = {" aa aa aa @@ -24417,23 +23686,6 @@ aa aa aa aa -Lt -tA -wX -HG -HG -Lk -cP -KQ -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -24462,22 +23714,6 @@ aa aa aa aa -"} -(49,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -24490,6 +23726,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +nD +xE +oD +Fd +VK +VK +rv +XJ +XJ +XJ +XJ +EF +mu +At +kF +kF +dp +eM +nK +iz +qr +uM +Wp +pf +Dk +oD +CC +Gl +OL +OL aa aa aa @@ -24535,7 +23859,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(27,1,1) = {" aa aa aa @@ -24640,6 +23983,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +eJ +xE +oD +kD +VK +VK +IY +Fr +nS +nS +nS +Yh +nS +aQ +gV +jB +kF +re +UP +Xd +Xd +yW +Iu +Bc +Bc +oD +vY +CC +jN +OL aa aa aa @@ -24658,6 +24089,22 @@ aa aa aa aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -24669,19 +24116,30 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +jA +jA +jA +jA +jA +hH +hH +hH +hH +hH +jA aa +"} +(28,1,1) = {" aa aa aa aa -KH -Lt -Lt -LJ -fW -SC -Lt -Lt aa aa aa @@ -24719,8 +24177,6 @@ aa aa aa aa -"} -(50,1,1) = {" aa aa aa @@ -24784,6 +24240,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +Iz +nD +oD +Fd +VK +VK +rv +by +by +by +by +EF +nS +aQ +aQ +aQ +tc +pa +nK +ap +Df +PP +Df +oP +Nn +oD +WA +WA +CI +OL aa aa aa @@ -24802,6 +24346,22 @@ aa aa aa aa +Yn +KF +KF +KF +KF +KF +SS +Yn +Yn +EZ +EZ +EZ +EZ +EZ +QM +Yn aa aa aa @@ -24813,7 +24373,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +jA +lS +lS +lS +jA +hH +hH +hH +hH +hH +jA aa +"} +(29,1,1) = {" aa aa aa @@ -24918,6 +24497,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +iK +oD +oD +ke +sy +nK +ru +WL +dj +jV +nK +Fs +wj +eM +eM +Qk +Qk +nK +nK +kz +nK +yx +nK +nK +nK +CP +WA +jj +OL aa aa aa @@ -24933,14 +24600,25 @@ aa aa aa aa -Lt -Lt -qp -Lt -Lt aa aa aa +Yn +AH +AH +AH +AH +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -24952,7 +24630,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +jA +lS +lS +lS +jA +hH +hH +hH +hH +hH +jA aa +"} +(30,1,1) = {" aa aa aa @@ -24976,8 +24673,6 @@ aa aa aa aa -"} -(51,1,1) = {" aa aa aa @@ -25059,6 +24754,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +nD +xE +oD +le +Qc +nK +CX +kE +Bx +VT +nK +hn +aQ +aQ +DK +nK +GV +nK +BO +xn +km +BU +BO +nK +vY +jj +CI +WA +OL aa aa aa @@ -25077,6 +24860,22 @@ aa aa aa aa +Yn +OP +AH +AH +AH +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -25088,7 +24887,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +jA +lS +lS +lS +jA +hH +hH +hH +hH +hH +jA aa +"} +(31,1,1) = {" aa aa aa @@ -25190,19 +25008,97 @@ aa aa aa aa -fT -Lo -Lf -Sd -pV aa aa aa -KH -Lt -Lt -Lt -KH +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +eJ +oD +Gr +Fc +nK +Ag +iE +pr +If +nK +NU +aQ +aQ +dp +Ph +yT +nK +rc +ih +km +kc +bu +nK +WA +CP +qj +vY +OL aa aa aa @@ -25221,6 +25117,22 @@ aa aa aa aa +Yn +OP +OP +OP +OP +OP +PK +Yn +Yn +Vn +PW +Vn +PW +Vn +zZ +Yn aa aa aa @@ -25232,38 +25144,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +jA +jA +jA +jA +jA +hH +hH +hH +hH +hH +jA aa "} -(52,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +(32,1,1) = {" aa aa aa @@ -25368,6 +25268,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +nD +xE +nD +oD +oD +Yu +nK +Ft +lR +yZ +kH +nK +tg +aQ +aQ +nT +nK +Gj +nK +YV +Ai +km +rA +YV +nK +RP +WA +vY +CC +OL aa aa aa @@ -25386,6 +25374,22 @@ aa aa aa aa +Yn +AH +AH +AH +AH +OP +PK +Yn +Yn +Vn +Vn +Vn +Vn +Vn +zZ +Yn aa aa aa @@ -25397,7 +25401,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(33,1,1) = {" aa aa aa @@ -25447,20 +25470,8 @@ aa aa aa aa -Lt -Lt -qp -Lt -Lt aa aa -KH -Lt -cl -HR -Gi -Lt -KH aa aa aa @@ -25490,8 +25501,6 @@ aa aa aa aa -"} -(53,1,1) = {" aa aa aa @@ -25516,6 +25525,95 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +eJ +qy +xE +oD +oD +nK +oD +oD +oD +oD +nK +UE +Hh +Hh +Qk +nK +nK +nK +oD +oD +nK +oD +oD +nK +nK +vY +vY +vY +OL +OL aa aa aa @@ -25533,6 +25631,22 @@ aa aa aa aa +Yn +XD +XD +XD +XD +XD +Xs +Yn +Yn +Tz +Tz +Tz +Tz +Tz +zE +Yn aa aa aa @@ -25544,7 +25658,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(34,1,1) = {" aa aa aa @@ -25649,6 +25782,98 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +nD +xE +Iz +CJ +nK +nK +xE +eJ +xE +XS +oD +UE +IC +IC +Qk +oD +BW +nK +Ts +Ts +Ts +Ts +Ts +nK +nK +vY +vY +vY +BG +OL +OL +OL +OL aa aa aa @@ -25663,6 +25888,22 @@ aa aa aa aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -25674,7 +25915,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(35,1,1) = {" aa aa aa @@ -25703,26 +25963,8 @@ aa aa aa aa -KH -Lt -aZ -Xj -cr -Lt aa aa -Lt -Vh -LI -CH -CH -PJ -Lt -Lt -Lt -Lt -Lt -KH aa aa aa @@ -25747,8 +25989,6 @@ aa aa aa aa -"} -(54,1,1) = {" aa aa aa @@ -25799,6 +26039,99 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +iK +xE +CJ +xE +nD +xE +nD +qy +xE +oD +lb +IC +IC +bP +oD +BW +CP +jN +vY +pm +vY +jj +WA +vY +vY +vY +vY +bc +vY +vY +vY +OL +OL aa aa aa @@ -25812,6 +26145,22 @@ aa aa aa aa +Yn +zM +zM +zM +zM +zM +zs +Yn +Yn +Pv +Pv +Pv +Pv +Pv +ZQ +Yn aa aa aa @@ -25823,7 +26172,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(36,1,1) = {" aa aa aa @@ -25928,6 +26296,99 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +nD +xE +nD +CJ +xE +xE +XS +xE +xE +eJ +oD +lb +IC +IC +bP +oD +BW +WA +CI +CP +jN +pm +vY +vY +vY +vY +vY +vY +BG +vY +vY +vY +vY +OL aa aa aa @@ -25941,6 +26402,22 @@ aa aa aa aa +Yn +Se +Si +Se +Se +Se +Tc +Yn +Yn +Pm +Pm +Pm +Xh +Xh +Wt +Yn aa aa aa @@ -25952,7 +26429,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(37,1,1) = {" aa aa aa @@ -25960,41 +26456,17 @@ aa aa aa aa -Lt -Xp -lg -KZ -aL -Lt -Lt aa -LH -LN -OW -yX -yX -Nm -Lt -ey -LG -pH -gj -Lt -KH aa -ut aa aa aa -LM aa aa aa -Pw aa aa aa -pJ aa aa aa @@ -26004,8 +26476,6 @@ aa aa aa aa -"} -(55,1,1) = {" aa aa aa @@ -26083,6 +26553,103 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +CJ +CJ +xE +xE +nD +xE +xE +oD +UE +mO +zd +Qk +oD +BW +vY +CC +WA +vY +vY +fk +vY +vY +fk +vY +vY +bV +vY +vY +vY +vY +OL +OL +OL +OL +OL aa aa aa @@ -26092,6 +26659,22 @@ aa aa aa aa +Yn +Se +Si +Se +Si +Se +Tc +Yn +Yn +Xh +Xh +Pm +Xh +Xh +Wt +Yn aa aa aa @@ -26103,7 +26686,26 @@ aa aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(38,1,1) = {" aa aa aa @@ -26208,6 +26810,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +Dz +fx +xE +xE +xE +nD +oD +UE +oV +DI +Qk +oD +BW +WA +vY +vY +fk +vY +vY +vY +vY +vY +vY +vY +BG +vY +vY +vY +vY +OL +OL +xm +vY +OL +OL aa aa aa @@ -26216,44 +26916,23 @@ aa aa aa aa +Yn +Se +Si +Se +Si +Se +Tc +Yn +Yn +Xh +Xh +Pm +Xh +Xh +Wt +Yn aa -Lw -QB -ec -Ae -HZ -QD -Lt -Lt -Lt -LO -Zq -Yx -AA -Da -Lt -iI -LF -BR -MC -EN -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -Lt -Lt -LC -Lt -KH aa aa aa @@ -26261,12 +26940,29 @@ aa aa aa aa -"} -(56,1,1) = {" aa aa aa +jA +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +hH +jA aa +"} +(39,1,1) = {" aa aa aa @@ -26371,6 +27067,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +fx +xE +xE +xE +oD +lb +IC +IC +bP +oD +BW +vY +vY +vY +vY +hO +nK +iS +iS +iS +hO +iS +nK +CB +vY +vY +vY +vY +vY +vY +vY +vY +OL aa aa aa @@ -26379,6 +27173,22 @@ aa aa aa aa +Yn +Se +Se +Se +Si +Se +Tc +Yn +Yn +Pm +Pm +Pm +Pm +Pm +Wt +Yn aa aa aa @@ -26390,7 +27200,26 @@ aa aa aa aa +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA +jA aa +"} +(40,1,1) = {" aa aa aa @@ -26474,43 +27303,6 @@ aa aa aa aa -Lw -Yi -fV -YW -vJ -aI -Lt -pZ -Lt -mB -Lj -fI -vq -OF -Lw -wP -ud -Iv -NI -NI -Lw -KP -JE -Vv -of -LD -KV -EL -Ew -Lu -KV -LD -TM -LD -JE -Tu -Lt aa aa aa @@ -26518,8 +27310,6 @@ aa aa aa aa -"} -(57,1,1) = {" aa aa aa @@ -26534,6 +27324,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +JS +fx +fx +fx +fx +fx +fx +fx +fx +xE +xE +xE +oD +lb +IC +IC +bP +oD +BW +vY +vY +vY +vY +aD +uR +rT +rT +rT +rT +rT +uR +Dq +CB +vY +vY +OL +vY +vY +vY +gC +OL aa aa aa @@ -26542,6 +27430,22 @@ aa aa aa aa +Yn +Vk +Vk +Vk +Vk +Vk +Oq +Yn +Yn +Co +Co +Co +Co +Co +VP +Yn aa aa aa @@ -26571,6 +27475,8 @@ aa aa aa aa +"} +(41,1,1) = {" aa aa aa @@ -26675,6 +27581,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +xE +xE +xE +xE +oD +UE +bt +KW +Qk +oD +BW +vY +vY +fk +hO +Jx +uR +rT +rT +rT +rT +rT +uR +rT +Gw +vY +vY +OL +OL +vY +gC +Oe +OL aa aa aa @@ -26683,6 +27687,22 @@ aa aa aa aa +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Yn aa aa aa @@ -26712,6 +27732,8 @@ aa aa aa aa +"} +(42,1,1) = {" aa aa aa @@ -26731,43 +27753,6 @@ aa aa aa aa -Lw -SX -jC -Hl -Hl -YW -gd -kr -dK -LQ -LQ -cj -cj -wT -Lm -HL -HJ -HJ -HJ -HJ -ci -QH -WE -WE -Li -Lb -Lb -WE -WE -Lb -Li -Li -Lb -bN -bN -bN -Lt aa aa aa @@ -26775,8 +27760,6 @@ aa aa aa aa -"} -(58,1,1) = {" aa aa aa @@ -26806,6 +27789,7 @@ aa aa aa aa +gt aa aa aa @@ -26854,6 +27838,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +Rw +if +fx +fx +fx +fx +xE +xE +xE +CJ +xE +xE +oD +UE +mO +zd +Qk +oD +BW +pm +vY +vY +Ot +rT +uR +AQ +AU +AU +AU +sg +uR +rT +HH +vY +WA +OL +vY +vY +Hs +xm +OL aa aa aa @@ -26907,6 +27989,8 @@ aa aa aa aa +"} +(43,1,1) = {" aa aa aa @@ -26988,43 +28072,6 @@ aa aa aa aa -Lw -Rp -bb -MH -fV -sm -Lt -OG -Lt -LR -Tm -Tm -Ff -yH -Lw -AD -oY -dn -dn -eR -Lw -KO -LA -nb -sB -zx -ZA -Lp -sB -DA -LA -Lp -FE -Lp -LB -tm -Lt aa aa aa @@ -27032,8 +28079,6 @@ aa aa aa aa -"} -(59,1,1) = {" aa aa aa @@ -27050,6 +28095,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +if +fx +Ps +if +fx +xE +Iz +nD +CJ +CJ +xE +xE +oD +lb +IC +IC +bP +oD +BW +jN +vY +vY +aD +rT +tO +Mq +gU +gU +gU +bT +nZ +rT +rT +sZ +vY +OL +ry +vY +OL +OL +OL aa aa aa @@ -27103,6 +28246,8 @@ aa aa aa aa +"} +(44,1,1) = {" aa aa aa @@ -27207,6 +28352,103 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +if +fx +iK +xE +xE +nD +xE +CJ +nD +xE +Zt +oD +lb +IC +IC +bP +oD +BW +CI +vY +vY +hf +Xm +Mq +gU +gU +gU +gU +gU +bT +RR +rT +Gw +CI +OL +OL +vY +vY +OL aa aa aa @@ -27245,43 +28487,6 @@ aa aa aa aa -Lw -CT -sw -dv -Lz -QD -Lt -Lt -Lt -KJ -Eq -Ip -Ip -JT -Lt -Dn -BR -LG -BR -RT -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -Lt -Lt -LP -Lt -KH aa aa aa @@ -27289,8 +28494,6 @@ aa aa aa aa -"} -(60,1,1) = {" aa aa aa @@ -27300,6 +28503,8 @@ aa aa aa aa +"} +(45,1,1) = {" aa aa aa @@ -27404,6 +28609,104 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +JS +fx +Iz +xE +nD +qy +xE +nD +CJ +xE +xE +XS +oD +UE +IC +IC +Qk +oD +BW +nK +vY +vY +vY +NA +gU +gU +gU +gU +gU +gU +gU +bR +rT +Dy +vY +OL +OL +OL +vY +OL +OL aa aa aa @@ -27457,6 +28760,8 @@ aa aa aa aa +"} +(46,1,1) = {" aa aa aa @@ -27502,41 +28807,17 @@ aa aa aa aa -Lt -sF -Ln -YH -Tb -Lt -Lt aa -Lt -ZG -AG -Qd -Tv -EH -Lt -Ll -LG -mU -RJ -Lt -KH aa -gi aa aa aa -cJ aa aa aa -KS aa aa aa -zr aa aa aa @@ -27546,8 +28827,6 @@ aa aa aa aa -"} -(61,1,1) = {" aa aa aa @@ -27587,6 +28866,105 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +nK +nK +nK +nK +nK +nK +xE +fs +qy +nD +nK +nK +Fs +Fs +QO +Mr +Qk +nK +nK +nK +PB +vY +vY +KD +xt +gU +gU +gU +gU +gU +gU +bR +rT +CB +qj +OL +OL +OL +vY +vY +OL +OL aa aa aa @@ -27595,6 +28973,13 @@ aa aa aa aa +KH +Lt +Lt +Lt +Lt +Lt +Lt aa aa aa @@ -27632,6 +29017,8 @@ aa aa aa aa +"} +(47,1,1) = {" aa aa aa @@ -27736,12 +29123,120 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +sN +Xv +Sg +nK +oD +oD +oD +oD +nK +fN +dL +SN +rA +rA +QF +di +di +Gx +vY +vY +vY +KD +gU +gU +gU +gU +gU +gU +gU +bR +rT +bd +vY +RP +OL +vY +Ek +vY +qb +OL +OL aa aa aa aa aa aa +KH +Lt +KK +wk +Qt +Lk +cP +MM aa aa aa @@ -27759,26 +29254,8 @@ aa aa aa aa -KH -Lt -LU -Ld -rG -Lt aa aa -Lt -EV -eX -mf -rz -wN -Lt -Lt -Lt -Lt -Lt -KH aa aa aa @@ -27797,14 +29274,14 @@ aa aa aa aa +"} +(48,1,1) = {" aa aa aa aa aa aa -"} -(62,1,1) = {" aa aa aa @@ -27903,12 +29380,120 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +Sg +lB +XO +VC +VC +XO +lB +VK +kZ +nM +rA +Cv +nK +nK +nK +nK +mS +vY +vY +YU +ZR +gU +gU +gU +gU +gU +tM +lt +CP +CC +vY +CI +OL +Ek +cO +Ek +vY +Hs +OL aa aa aa aa aa aa +Lt +tA +wX +HG +HG +Lk +cP +KQ aa aa aa @@ -27946,6 +29531,8 @@ aa aa aa aa +"} +(49,1,1) = {" aa aa aa @@ -28017,20 +29604,8 @@ aa aa aa aa -Lt -Lt -ge -Lt -Lt aa aa -KH -Lt -Cy -iC -Po -Lt -KH aa aa aa @@ -28060,16 +29635,122 @@ aa aa aa aa -"} -(63,1,1) = {" aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +Sg +Pd +XO +VC +VC +XO +Pd +VK +kZ +nM +rA +ez +nK +XM +XM +nK +nK +qj +vY +vY +Xa +ZR +gU +gU +gU +tM +ph +CP +jN +CI +vY +jj +OL +OL +Ek +vY +gC +Oe +OL aa aa aa aa aa aa +KH +Lt +Lt +LJ +fW +SC +Lt +Lt aa aa aa @@ -28107,6 +29788,8 @@ aa aa aa aa +"} +(50,1,1) = {" aa aa aa @@ -28211,6 +29894,106 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +bG +nK +nK +oD +oc +pn +oD +nK +ZO +tN +Pk +rA +rA +jF +XM +XM +XM +nK +OL +CI +WA +Kz +HO +kA +Qz +kA +yy +Kz +jj +CI +jN +CP +OL +OL +OL +OL +OL +OL +OL +OL aa aa aa @@ -28219,6 +30002,11 @@ aa aa aa aa +Lt +Lt +qp +Lt +Lt aa aa aa @@ -28257,6 +30045,14 @@ aa aa aa aa +"} +(51,1,1) = {" +aa +aa +aa +aa +aa +aa aa aa aa @@ -28274,19 +30070,9 @@ aa aa aa aa -fT -Lo -Rk -Sd -pV aa aa aa -KH -Lt -Lt -Lt -KH aa aa aa @@ -28317,8 +30103,6 @@ aa aa aa aa -"} -(64,1,1) = {" aa aa aa @@ -28367,6 +30151,102 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +oD +ws +Vm +AZ +Bc +rs +nK +ab +VB +Pk +rA +rA +jF +XM +XM +XM +nK +OL +vY +QU +Kz +CI +oD +Jc +oD +WA +Kz +jw +CP +OL +OL +OL +OL +OL +OL aa aa aa @@ -28379,8 +30259,20 @@ aa aa aa aa +fT +Lo +Lf +Sd +pV +aa aa aa +KH +Lt +Lt +Lt +KH +aa aa aa aa @@ -28410,6 +30302,8 @@ aa aa aa aa +"} +(52,1,1) = {" aa aa aa @@ -28514,6 +30408,97 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +Xu +ib +Xf +Xf +Xf +Aq +Bc +Bc +Bc +Bc +Bc +ye +VK +kZ +nM +rA +lj +nK +XM +XM +nK +nK +OL +OL +CI +Kz +jj +oD +lU +oD +RP +Kz +WA +jj +OL aa aa aa @@ -28533,11 +30518,19 @@ aa aa Lt Lt -ge +qp Lt Lt aa aa +KH +Lt +cl +HR +Gi +Lt +KH +aa aa aa aa @@ -28566,6 +30559,8 @@ aa aa aa aa +"} +(53,1,1) = {" aa aa aa @@ -28574,8 +30569,6 @@ aa aa aa aa -"} -(65,1,1) = {" aa aa aa @@ -28672,6 +30665,97 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +Aq +Oy +Jf +Bc +mE +av +nK +yY +Vt +OH +rA +Cv +nK +nK +nK +nK +OL +OL +OL +OL +Kz +WA +oD +Jc +oD +ql +nK +RP +OL +OL aa aa aa @@ -28688,6 +30772,26 @@ aa aa aa aa +KH +Lt +aZ +Xj +cr +Lt +aa +aa +Lt +Vh +LI +CH +CH +PJ +Lt +Lt +Lt +Lt +Lt +KH aa aa aa @@ -28712,6 +30816,8 @@ aa aa aa aa +"} +(54,1,1) = {" aa aa aa @@ -28786,17 +30892,6 @@ aa aa aa aa -KH -Lt -Lt -Te -DL -CF -Lt -Lt -aa -aa -aa aa aa aa @@ -28827,14 +30922,100 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +YM +Xf +bG +nK +nK +nK +PS +ht +rx +nK +nK +UE +nK +cz +cz +nK +rS +pc +nK +nK +nK +nK +nK +nK +oD +oD +Jc +nK +jj +WA +vY +OL aa aa aa aa -"} -(66,1,1) = {" -aa -aa aa aa aa @@ -28848,17 +31029,41 @@ aa aa aa aa +Lt +Xp +lg +KZ +aL +Lt +Lt aa +LH +LN +OW +yX +yX +Nm +Lt +ey +LG +pH +gj +Lt +KH aa +ut aa aa aa +LM aa aa aa +Pw aa aa aa +pJ aa aa aa @@ -28868,6 +31073,8 @@ aa aa aa aa +"} +(55,1,1) = {" aa aa aa @@ -28972,6 +31179,96 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +ZI +hb +nK +nK +nK +nK +nK +Ub +mL +oD +VK +VK +bf +BX +BX +Uw +qA +iL +oX +DS +lU +Jc +Jc +Jc +nK +OL +OL +OL +OL aa aa aa @@ -28989,6 +31286,43 @@ aa aa aa aa +Lw +QB +ec +Ae +HZ +QD +Lt +Lt +Lt +LO +Zq +Yx +AA +Da +Lt +iI +LF +BR +MC +EN +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +Lt +Lt +LC +Lt +KH aa aa aa @@ -28996,6 +31330,8 @@ aa aa aa aa +"} +(56,1,1) = {" aa aa aa @@ -29043,14 +31379,6 @@ aa aa aa aa -Lt -fz -za -MX -DL -ep -cP -MM aa aa aa @@ -29088,8 +31416,6 @@ aa aa aa aa -"} -(67,1,1) = {" aa aa aa @@ -29110,6 +31436,95 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +SA +gh +nK +gm +zw +Gy +nK +vn +BH +oD +VK +VK +Kn +UD +Dp +nL +GE +iL +nK +nK +nK +nK +nK +nK +nK +OL +Cd +OL aa aa aa @@ -29128,6 +31543,43 @@ aa aa aa aa +Lw +Yi +fV +YW +vJ +aI +Lt +pZ +Lt +mB +Lj +fI +vq +OF +Lw +wP +ud +Iv +NI +NI +Lw +KP +JE +Vv +of +LD +KV +EL +Ew +Lu +KV +LD +TM +LD +JE +Tu +Lt aa aa aa @@ -29135,6 +31587,8 @@ aa aa aa aa +"} +(57,1,1) = {" aa aa aa @@ -29239,6 +31693,95 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +iY +cp +nK +Jt +eN +RQ +nK +nK +jy +Fs +PQ +VK +Kn +ai +qk +nY +GE +iL +RW +nK +OL +OL +OL +OL +OL +OL +Cd +OL aa aa aa @@ -29257,6 +31800,43 @@ aa aa aa aa +Lw +SX +jC +Hl +Hl +YW +gd +kr +dK +LQ +LQ +cj +cj +wT +Lm +HL +HJ +HJ +HJ +HJ +ci +QH +WE +WE +Li +Lb +Lb +WE +WE +Lb +Li +Li +Lb +bN +bN +bN +Lt aa aa aa @@ -29264,6 +31844,8 @@ aa aa aa aa +"} +(58,1,1) = {" aa aa aa @@ -29300,14 +31882,6 @@ aa aa aa aa -KH -Lt -cT -Hb -OC -ep -cP -KQ aa aa aa @@ -29345,8 +31919,6 @@ aa aa aa aa -"} -(68,1,1) = {" aa aa aa @@ -29378,6 +31950,95 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +Tn +hG +nK +rO +eN +Ne +oD +VK +VK +kZ +VK +VK +Kn +Cw +PU +Oc +GE +iL +Xt +nK +OL +Cd +Cd +OL +Cd +OL +OL +OL aa aa aa @@ -29396,6 +32057,43 @@ aa aa aa aa +Lw +Rp +bb +MH +fV +sm +Lt +OG +Lt +LR +Tm +Tm +Ff +yH +Lw +AD +oY +dn +dn +eR +Lw +KO +LA +nb +sB +zx +ZA +Lp +sB +DA +LA +Lp +FE +Lp +LB +tm +Lt aa aa aa @@ -29403,6 +32101,8 @@ aa aa aa aa +"} +(59,1,1) = {" aa aa aa @@ -29507,6 +32207,94 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Xf +Xf +SA +VK +nK +LZ +Dd +Dd +RB +Fl +Fl +kZ +VK +VK +Kn +Le +cL +OI +GE +iL +CK +nK +OL +OL +OL +OL +OL +OL +OL aa aa aa @@ -29526,6 +32314,43 @@ aa aa aa aa +Lw +CT +sw +dv +Lz +QD +Lt +Lt +Lt +KJ +Eq +Ip +Ip +JT +Lt +Dn +BR +LG +BR +RT +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +Lt +Lt +LP +Lt +KH aa aa aa @@ -29533,6 +32358,8 @@ aa aa aa aa +"} +(60,1,1) = {" aa aa aa @@ -29558,15 +32385,6 @@ aa aa aa aa -KH -Lt -Lt -Lt -Lt -Lt -Lt -aa -aa aa aa aa @@ -29602,21 +32420,6 @@ aa aa aa aa -"} -(69,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -29661,6 +32464,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +ib +Xf +Zk +no +iY +zg +nK +rO +yB +iP +oD +VK +VK +kZ +VK +VK +Dm +BV +BV +BV +SG +Sr +rK +nK +nK +OL aa aa aa @@ -29685,17 +32571,41 @@ aa aa aa aa +Lt +sF +Ln +YH +Tb +Lt +Lt aa +Lt +ZG +AG +Qd +Tv +EH +Lt +Ll +LG +mU +RJ +Lt +KH aa +gi aa aa aa +cJ aa aa aa +KS aa aa aa +zr aa aa aa @@ -29705,6 +32615,8 @@ aa aa aa aa +"} +(61,1,1) = {" aa aa aa @@ -29809,6 +32721,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +nK +nK +nK +nK +nK +nK +nK +nK +nK +nK +nK +nK +oD +Ha +oD +VK +Sj +dF +lY +jO +Kf +iL +yv +Es +nK +OL aa aa aa @@ -29833,8 +32828,26 @@ aa aa aa aa +KH +Lt +LU +Ld +rG +Lt aa aa +Lt +EV +eX +mf +rz +wN +Lt +Lt +Lt +Lt +Lt +KH aa aa aa @@ -29860,16 +32873,7 @@ aa aa aa "} -(70,1,1) = {" -aa -aa -aa -aa -aa -aa -aa -aa -aa +(62,1,1) = {" aa aa aa @@ -29974,6 +32978,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +nK +nK +fx +Nv +fx +oz +nK +nK +Nv +fx +fx +ia +oD +Xf +oD +mK +Sj +PA +WK +PA +Kf +bg +nK +nK +nK +OL aa aa aa @@ -29999,8 +33086,20 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa +KH +Lt +Cy +iC +Po +Lt +KH aa aa aa @@ -30030,6 +33129,8 @@ aa aa aa aa +"} +(63,1,1) = {" aa aa aa @@ -30116,8 +33217,6 @@ aa aa aa aa -"} -(71,1,1) = {" aa aa aa @@ -30136,6 +33235,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +ia +fx +gA +fx +fx +ia +gA +fx +fx +KR +fx +oD +Xf +oD +nK +oD +er +Pz +Rl +oD +nK +nK +OL +OL +OL aa aa aa @@ -30161,9 +33343,19 @@ aa aa aa aa +fT +Lo +Rk +Sd +pV aa aa aa +KH +Lt +Lt +Lt +KH aa aa aa @@ -30194,6 +33386,8 @@ aa aa aa aa +"} +(64,1,1) = {" aa aa aa @@ -30298,6 +33492,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +oz +fx +KR +fx +fx +fx +fx +fx +fx +Nv +oD +mM +oD +qg +oD +oD +oD +oD +oD +ia +Wd +yD +xE +yD aa aa aa @@ -30323,6 +33600,11 @@ aa aa aa aa +Lt +Lt +ge +Lt +Lt aa aa aa @@ -30361,6 +33643,8 @@ aa aa aa aa +"} +(65,1,1) = {" aa aa aa @@ -30373,8 +33657,6 @@ aa aa aa aa -"} -(72,1,1) = {" aa aa aa @@ -30467,6 +33749,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +qg +fx +fx +gA +fx +nu +ia +fx +fx +fx +oD +Xf +oD +fx +gA +fx +ia +fx +fx +KR +Wd +yD +xE +yD aa aa aa @@ -30490,6 +33855,14 @@ aa aa aa aa +KH +Lt +Lt +Te +DL +CF +Lt +Lt aa aa aa @@ -30527,6 +33900,8 @@ aa aa aa aa +"} +(66,1,1) = {" aa aa aa @@ -30630,9 +34005,90 @@ aa aa aa aa -"} -(73,1,1) = {" aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +ia +fx +fx +fx +fx +fx +gA +ia +oD +Xf +oD +ia +fx +fx +fx +Nv +fx +fx +Wd +Wd +yD +yD aa aa aa @@ -30656,6 +34112,14 @@ aa aa aa aa +Lt +fz +za +MX +DL +ep +cP +MM aa aa aa @@ -30693,6 +34157,8 @@ aa aa aa aa +"} +(67,1,1) = {" aa aa aa @@ -30797,6 +34263,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +oD +sD +oD +fx +Nv +fx +fx +fx +gA +fx +ia +Wd +yD aa aa aa @@ -30821,6 +34369,14 @@ aa aa aa aa +KH +Lt +cT +Hb +OC +ep +cP +KQ aa aa aa @@ -30858,6 +34414,8 @@ aa aa aa aa +"} +(68,1,1) = {" aa aa aa @@ -30887,8 +34445,6 @@ aa aa aa aa -"} -(74,1,1) = {" aa aa aa @@ -30964,6 +34520,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +CL +xE +xE +xE +fx +gA +fx +fx +ia +fx +Wd +yD aa aa aa @@ -30989,6 +34627,13 @@ aa aa aa aa +KH +Lt +Lt +Lt +Lt +Lt +Lt aa aa aa @@ -31026,6 +34671,8 @@ aa aa aa aa +"} +(69,1,1) = {" aa aa aa @@ -31130,6 +34777,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +ia +gA +fx +Nv +fx +fx +yD aa aa aa @@ -31144,8 +34873,6 @@ aa aa aa aa -"} -(75,1,1) = {" aa aa aa @@ -31201,6 +34928,8 @@ aa aa aa aa +"} +(70,1,1) = {" aa aa aa @@ -31305,6 +35034,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +yD aa aa aa @@ -31374,6 +35185,8 @@ aa aa aa aa +"} +(71,1,1) = {" aa aa aa @@ -31401,8 +35214,6 @@ aa aa aa aa -"} -(76,1,1) = {" aa aa aa @@ -31480,6 +35291,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -31549,6 +35442,8 @@ aa aa aa aa +"} +(72,1,1) = {" aa aa aa @@ -31653,13 +35548,93 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa aa aa -"} -(77,1,1) = {" aa aa aa @@ -31724,6 +35699,8 @@ aa aa aa aa +"} +(73,1,1) = {" aa aa aa @@ -31828,6 +35805,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -31897,6 +35956,8 @@ aa aa aa aa +"} +(74,1,1) = {" aa aa aa @@ -31915,8 +35976,6 @@ aa aa aa aa -"} -(78,1,1) = {" aa aa aa @@ -32003,6 +36062,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -32072,6 +36213,8 @@ aa aa aa aa +"} +(75,1,1) = {" aa aa aa @@ -32172,12 +36315,92 @@ aa aa aa aa -"} -(79,1,1) = {" aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -32247,6 +36470,8 @@ aa aa aa aa +"} +(76,1,1) = {" aa aa aa @@ -32351,6 +36576,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -32420,6 +36727,8 @@ aa aa aa aa +"} +(77,1,1) = {" aa aa aa @@ -32429,8 +36738,6 @@ aa aa aa aa -"} -(80,1,1) = {" aa aa aa @@ -32526,6 +36833,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -32595,6 +36984,8 @@ aa aa aa aa +"} +(78,1,1) = {" aa aa aa @@ -32686,8 +37077,6 @@ aa aa aa aa -"} -(81,1,1) = {" aa aa aa @@ -32701,6 +37090,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +yD aa aa aa @@ -32770,6 +37241,8 @@ aa aa aa aa +"} +(79,1,1) = {" aa aa aa @@ -32874,6 +37347,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +yD aa aa aa @@ -32944,9 +37499,7 @@ aa aa aa "} -(82,1,1) = {" -aa -aa +(80,1,1) = {" aa aa aa @@ -33051,6 +37604,88 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +yD aa aa aa @@ -33120,6 +37755,8 @@ aa aa aa aa +"} +(81,1,1) = {" aa aa aa @@ -33200,8 +37837,6 @@ aa aa aa aa -"} -(83,1,1) = {" aa aa aa @@ -33226,6 +37861,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +HV +HV +HV +fx +Wd +yD +yD aa aa aa @@ -33294,6 +38012,8 @@ aa aa aa aa +"} +(82,1,1) = {" aa aa aa @@ -33398,6 +38118,89 @@ aa aa aa aa +yD +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +xE +xE +xE +xE +xE +xE +xE +xE +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +HV +fx +fx +fx +Wd +xE +yD aa aa aa @@ -33457,8 +38260,6 @@ aa aa aa aa -"} -(84,1,1) = {" aa aa aa @@ -33468,6 +38269,8 @@ aa aa aa aa +"} +(83,1,1) = {" aa aa aa @@ -33572,6 +38375,89 @@ aa aa aa aa +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +yD +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +Wd +Wd +Wd +yD +yD aa aa aa @@ -33640,6 +38526,8 @@ aa aa aa aa +"} +(84,1,1) = {" aa aa aa @@ -33714,8 +38602,6 @@ aa aa aa aa -"} -(85,1,1) = {" aa aa aa @@ -33800,6 +38686,34 @@ aa aa aa aa +yD +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +HV +HV +fx +Wd +Wd +yD +yD +yD aa aa aa @@ -33869,6 +38783,8 @@ aa aa aa aa +"} +(85,1,1) = {" aa aa aa @@ -33971,8 +38887,6 @@ aa aa aa aa -"} -(86,1,1) = {" aa aa aa @@ -34029,6 +38943,34 @@ aa aa aa aa +yD +xE +xE +fx +fx +HV +HV +HV +HV +fx +fx +fx +fx +HV +HV +fx +fx +HV +HV +HV +HV +fx +fx +Wd +xE +yD +xE +yD aa aa aa @@ -34098,6 +39040,8 @@ aa aa aa aa +"} +(86,1,1) = {" aa aa aa @@ -34228,8 +39172,6 @@ aa aa aa aa -"} -(87,1,1) = {" aa aa aa @@ -34258,6 +39200,34 @@ aa aa aa aa +yD +xE +xE +fx +fx +fx +fx +fx +fx +fx +fx +Wd +Wd +fx +fx +fx +fx +fx +fx +fx +fx +fx +fx +Wd +xE +yD +xE +yD aa aa aa @@ -34327,6 +39297,8 @@ aa aa aa aa +"} +(87,1,1) = {" aa aa aa @@ -34485,8 +39457,34 @@ aa aa aa aa -"} -(88,1,1) = {" +yD +yD +xE +fx +fx +fx +fx +fx +fx +fx +Wd +Wd +Wd +Wd +fx +fx +fx +fx +fx +fx +fx +fx +fx +Wd +yD +yD +yD +yD aa aa aa @@ -34556,6 +39554,8 @@ aa aa aa aa +"} +(88,1,1) = {" aa aa aa @@ -34715,6 +39715,33 @@ aa aa aa aa +yD +yD +Wd +Wd +Wd +Wd +fx +fx +Wd +Wd +yD +yD +Wd +Wd +Wd +Wd +fx +fx +fx +fx +fx +Wd +Wd +xE +yD +yD +yD aa aa aa @@ -34742,8 +39769,6 @@ aa aa aa aa -"} -(89,1,1) = {" aa aa aa @@ -34786,6 +39811,8 @@ aa aa aa aa +"} +(89,1,1) = {" aa aa aa @@ -34946,8 +39973,32 @@ aa aa aa aa +yD +yD +yD +yD +Wd +Wd +Wd +Wd +yD aa aa +yD +yD +yD +Wd +Wd +Wd +Wd +Wd +Wd +Wd +yD +yD +xE +xE +yD aa aa aa @@ -34999,8 +40050,6 @@ aa aa aa aa -"} -(90,1,1) = {" aa aa aa @@ -35019,6 +40068,8 @@ aa aa aa aa +"} +(90,1,1) = {" aa aa aa @@ -35182,11 +40233,29 @@ aa aa aa aa +yD +yD +yD +yD +yD +yD aa aa aa aa aa +yD +yD +yD +yD +yD +yD +yD +yD +xE +yD +yD +yD aa aa aa @@ -35437,13 +40506,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +yD +yD +yD +yD +yD +yD +yD aa aa aa @@ -35696,11 +40765,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +yD +yD +yD +yD +yD aa aa aa @@ -43159,7 +48228,7 @@ oJ lo oM iF -aa +bD On On GZ @@ -49559,7 +54628,7 @@ aa aa dS rd -qD +Hn xH uE dS @@ -51620,7 +56689,7 @@ LK kM cc XE -XE +mg Zp PO YZ @@ -52128,7 +57197,7 @@ dS kh Fg NJ -ms +dS dS LK RX @@ -52202,7 +57271,7 @@ TV qM Mo Jd -ew +No dh QC aa @@ -54184,7 +59253,7 @@ mQ mQ Rm Ac -RN +Vz Nx ZX mQ @@ -54955,7 +60024,7 @@ Rm vl IV IV -Za +ER IV GX tK @@ -55272,7 +60341,7 @@ wf wf wf wf -wf +hV vh sb sb @@ -55474,7 +60543,7 @@ IV GX tK gr -ao +Zj ao cE qT @@ -55503,7 +60572,7 @@ fD Lh Jm Jm -uq +dY Iy ui Jm @@ -57328,7 +62397,7 @@ GJ aA qK qK -qK +Bj qK qK OA @@ -57525,7 +62594,7 @@ aa aa aa dl -Dr +jM Nb Nb YL @@ -58039,7 +63108,7 @@ aa aa aa dl -Dr +Yw Nb Nb Nb @@ -59326,7 +64395,7 @@ cu Nb XW Cx -Nb +UA Ca Re vS @@ -59334,7 +64403,7 @@ vS IA JY rP -kQ +zk zk Lc Ar @@ -59584,10 +64653,10 @@ Nb FV dl Nb -Ca +EW ux vS -vT +fF wI xq rP @@ -60609,7 +65678,7 @@ aa aa aa dl -qz +Bu Nb Nb Nb diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index acd6f5664038..4a5776a356e9 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -149,7 +149,7 @@ /area/station/security/prison/safe) "aaA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "aaB" = ( /obj/structure/table, @@ -483,6 +483,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, +/obj/effect/landmark/navigate_destination/dockescpod4, /turf/open/floor/iron, /area/station/escapepodbay) "abB" = ( @@ -711,6 +712,8 @@ dir = 9 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "ach" = ( @@ -848,8 +851,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/open/floor/iron, /area/station/escapepodbay) @@ -945,12 +948,12 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/white/full, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/escapepodbay) "acP" = ( @@ -1135,6 +1138,7 @@ dir = 8 }, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "adk" = ( @@ -1622,17 +1626,9 @@ /area/station/asteroid) "aeA" = ( /obj/effect/turf_decal/tile/brown/fourcorners, -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, /obj/effect/decal/cleanable/oil/streak, /obj/structure/sign/poster/random/directional/north, /obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/effect/landmark/bitrunning/station_reward_spawn, /obj/machinery/light/neon_lining{ dir = 8; icon_state = "pink2_1" @@ -1641,6 +1637,7 @@ dir = 1; icon_state = "pink2_1" }, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) "aeB" = ( @@ -1814,12 +1811,7 @@ /area/station/cargo/miningdock) "afk" = ( /obj/effect/turf_decal/tile/brown/fourcorners, -/obj/effect/turf_decal/box/corners, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/landmark/bitrunning/station_reward_spawn, /obj/machinery/light/neon_lining{ dir = 4; icon_state = "pink2_1" @@ -1828,6 +1820,9 @@ dir = 1; icon_state = "pink2_1" }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/byteforge, +/obj/effect/turf_decal/box, /turf/open/floor/iron/dark/smooth_large, /area/station/bitrunning/den) "afl" = ( @@ -2174,14 +2169,10 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/disposal) "agt" = ( -/obj/structure/table/glass, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Common Channel"; - pixel_x = 0 +/obj/machinery/computer/old{ + dir = 8 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "agu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, @@ -2207,7 +2198,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "agw" = ( @@ -2233,24 +2223,13 @@ /obj/item/clothing/under/syndicate, /obj/item/clothing/under/syndicate, /obj/item/clothing/under/misc/syndicate_souvenir, -/obj/item/nullrod/clown, -/obj/item/clothing/mask/gas/clown_hat, -/obj/item/clothing/shoes/clown_shoes, -/obj/item/clothing/under/rank/civilian/clown/magic{ - name = "clown suit" - }, -/obj/item/storage/secure/safe/directional/north, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "agx" = ( /obj/structure/filingcabinet, /obj/structure/window/spawner/directional/north, -/obj/item/paper/monitorkey, -/obj/item/areaeditor/blueprints{ - name = "Station Layout"; - desc = "A crude mapping of the station layout based on leaked internal documents and orbital snapshots taken during construction. I'm not sure how up-to-date this is anymore..." - }, -/turf/open/floor/mineral/bananium, +/obj/item/paper/crumpled, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "agy" = ( /obj/structure/alien/weeds, @@ -2261,7 +2240,7 @@ /obj/structure/chair/comfy/carp{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "agA" = ( /obj/effect/turf_decal/sand/plating, @@ -2312,12 +2291,12 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "agG" = ( /obj/structure/dresser, /obj/item/clothing/mask/cigarette/cigar/havana, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "agH" = ( /obj/machinery/power/apc/auto_name/directional/west, @@ -2953,6 +2932,14 @@ /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/security/prison) +"akd" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/effect/landmark/navigate_destination/bar, +/obj/effect/landmark/navigate_destination/kitchen, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/center) "ake" = ( /obj/machinery/airalarm/directional/east, /obj/structure/tank_dispenser{ @@ -3783,7 +3770,7 @@ /area/station/cargo/miningdock/cafeteria) "atl" = ( /obj/structure/hoop, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "atC" = ( /obj/effect/decal/cleanable/dirt, @@ -4726,18 +4713,7 @@ /turf/open/floor/plating, /area/station/command/teleporter) "aBI" = ( -/obj/structure/table/glass, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 0 - }, -/obj/item/toy/figure/clown{ - pixel_x = 8; - pixel_y = 16 - }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "aBK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6685,7 +6661,7 @@ /area/station/command/heads_quarters/cmo) "aQh" = ( /obj/machinery/light/directional/east, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "aQj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -7745,7 +7721,7 @@ /area/station/medical/medbay/central) "bhG" = ( /obj/machinery/door/airlock/bananium, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "bhK" = ( /obj/structure/curtain, @@ -7994,9 +7970,6 @@ /obj/structure/closet/secure_closet/freezer/fridge/open, /obj/structure/window/spawner/directional/west, /obj/item/toy/plush/goatplushie, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/storage/box/donkpockets/donkpockethonk, -/obj/item/food/grown/banana, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "bmb" = ( @@ -8614,11 +8587,15 @@ /turf/open/floor/iron/white, /area/station/science/lower) "bxd" = ( -/obj/machinery/computer/message_monitor{ - dir = 1 - }, /obj/structure/sign/calendar/directional/south, -/turf/open/floor/mineral/bananium, +/obj/structure/table/glass, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel"; + pixel_x = 0 + }, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "bxr" = ( /obj/effect/decal/cleanable/dirt, @@ -9288,14 +9265,6 @@ }, /turf/open/floor/iron, /area/station/engineering/engine_smes) -"bHB" = ( -/obj/effect/landmark/navigate_destination/cargo, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/cargo/office) "bHE" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -9420,6 +9389,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "bJP" = ( @@ -9437,9 +9408,6 @@ /area/station/cargo/miningdock) "bKe" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/light/small/directional/east, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -9656,6 +9624,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "bNx" = ( @@ -9786,6 +9755,18 @@ }, /turf/open/floor/iron, /area/station/commons/fitness) +"bPp" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "bPq" = ( /obj/effect/turf_decal/trimline/neutral/warning, /turf/open/floor/iron/dark, @@ -9929,7 +9910,7 @@ "bSM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/light_switch/directional/south, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "bSS" = ( /obj/effect/spawner/structure/window, @@ -10093,6 +10074,13 @@ dir = 8 }, /area/station/command/bridge) +"bVn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "bVs" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green, @@ -10260,7 +10248,6 @@ pixel_x = 4; pixel_y = -32 }, -/obj/item/stack/sheet/mineral/bananium/five, /turf/open/floor/plating, /area/station/engineering/main) "bXr" = ( @@ -11273,13 +11260,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) "cmx" = ( -/obj/effect/decal/cleanable/confetti, /obj/machinery/button/door/directional/south{ req_access = "theatre"; id_tag = "honkbunker"; name = "Deadbolt" }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "cmH" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -11632,6 +11618,8 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "csR" = ( @@ -11652,6 +11640,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ctg" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/central/greater) "ctW" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -11740,6 +11740,13 @@ /obj/structure/cable, /turf/open/misc/asteroid/dug, /area/station/maintenance/department/cargo) +"cvB" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/common/fitness, +/turf/open/floor/iron, +/area/station/commons/fitness) "cvI" = ( /obj/structure/table, /obj/item/airlock_painter, @@ -11888,6 +11895,14 @@ /obj/item/storage/box/lights/tubes, /turf/open/floor/iron, /area/station/service/janitor) +"cxM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/valve/digital/layer2{ + name = "Chamber Waste Release" + }, +/turf/open/floor/iron, +/area/station/maintenance/disposal/incinerator) "cxV" = ( /obj/machinery/light/directional/east, /obj/structure/chair/office{ @@ -12059,7 +12074,12 @@ c_tag = "Service - Hydroponics" }, /obj/effect/turf_decal/tile/green/fourcorners, -/obj/machinery/infuser, +/obj/machinery/plantgenes, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, +/obj/item/botanical_lexicon, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "cAd" = ( @@ -12118,7 +12138,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "cBo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -13652,7 +13672,7 @@ /obj/machinery/door/airlock/external/glass{ name = "The Noise's Jam-Tastic Radical Listening Post" }, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "dbu" = ( /obj/effect/turf_decal/trimline/green/filled/line{ @@ -14878,6 +14898,8 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "dyB" = ( @@ -15653,7 +15675,7 @@ /obj/structure/chair{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "dLI" = ( /obj/machinery/door/airlock/maintenance_hatch{ @@ -16483,7 +16505,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/ladder, /obj/structure/railing{ - dir = 9; layer = 3.1 }, /turf/open/openspace, @@ -17953,7 +17974,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "exx" = ( /obj/effect/turf_decal/stripes/line{ @@ -18028,6 +18049,9 @@ /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 4 }, +/obj/machinery/camera/directional/west{ + c_tag = "Cargo - Bitrunning Den" + }, /turf/open/floor/iron/dark/textured_large, /area/station/bitrunning/den) "eyy" = ( @@ -18375,10 +18399,6 @@ }, /turf/open/floor/engine/air, /area/station/engineering/atmos) -"eES" = ( -/obj/structure/statue/bananium/clown, -/turf/open/indestructible/dark, -/area/ruin/powered/clownplanet) "eFd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/plasticflaps/opaque{ @@ -18408,7 +18428,6 @@ /obj/machinery/bluespace_beacon, /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/structure/cable, -/obj/effect/landmark/navigate_destination/teleporter, /turf/open/floor/iron, /area/station/command/teleporter) "eFo" = ( @@ -18573,7 +18592,7 @@ /area/station/service/library) "eJA" = ( /obj/machinery/light/very_dim/directional/south, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "eJQ" = ( /turf/open/floor/glass/reinforced, @@ -20096,7 +20115,7 @@ /obj/item/ammo_box/a357, /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "fkg" = ( @@ -20212,14 +20231,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/workout) -"flP" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/trimline/green/line{ - dir = 1 - }, -/obj/effect/landmark/navigate_destination/hydro, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics) "flQ" = ( /obj/machinery/door/airlock/external{ name = "External Access" @@ -20762,7 +20773,6 @@ dir = 1 }, /obj/structure/railing{ - dir = 10; layer = 3.1 }, /turf/open/openspace, @@ -22202,6 +22212,8 @@ dir = 5 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "fTz" = ( @@ -22220,7 +22232,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "fTP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22348,6 +22360,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"fXi" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/atmos) "fXB" = ( /obj/structure/chair/pew, /turf/open/floor/iron/chapel{ @@ -22627,6 +22647,10 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/service/hydroponics) +"gcJ" = ( +/obj/item/storage/toolbox/syndicate, +/turf/closed/mineral/random/stationside/asteroid/porus, +/area/ruin/powered/clownplanet) "gcN" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/decal/cleanable/dirt, @@ -23681,8 +23705,7 @@ "gxi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/plastic, -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "gxk" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -24105,6 +24128,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "gEy" = ( @@ -24739,9 +24763,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/eva) -"gNy" = ( -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "gNz" = ( /obj/machinery/light/directional/east, /turf/open/floor/engine, @@ -25254,11 +25275,7 @@ /area/station/medical/break_room) "gWk" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/storage/toolbox/syndicate, -/obj/structure/table, -/obj/effect/spawner/random/engineering/tool, -/obj/effect/spawner/random/mod, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "gWo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -25273,6 +25290,8 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "gWx" = ( @@ -25514,6 +25533,11 @@ }, /turf/open/floor/iron, /area/station/commons/storage/art) +"hbN" = ( +/obj/structure/cable, +/obj/structure/cable/layer1, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai) "hbQ" = ( /obj/machinery/camera/directional/north{ c_tag = "Civilian - Holodeck Controls" @@ -25840,6 +25864,8 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "hik" = ( @@ -26522,7 +26548,6 @@ dir = 4 }, /obj/structure/railing{ - dir = 9; layer = 3.1 }, /turf/open/floor/plating, @@ -27692,6 +27717,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/station/hallway/secondary/command) "hPW" = ( @@ -29262,6 +29290,7 @@ /obj/structure/showcase/cyborg/old{ pixel_y = 20 }, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "iqZ" = ( @@ -30640,7 +30669,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "iOi" = ( /turf/open/floor/wood/large, @@ -30669,7 +30698,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, -/turf/open/ballpit, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "iOG" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -30761,6 +30790,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "iQH" = ( @@ -30876,10 +30907,6 @@ /area/station/command/heads_quarters/hos) "iSw" = ( /obj/machinery/griddle, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = 4; - pixel_x = 32 - }, /obj/machinery/light/directional/east, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) @@ -31213,6 +31240,13 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"iWy" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/dockescpod1, +/turf/open/floor/iron, +/area/station/escapepodbay) "iWz" = ( /obj/machinery/door/airlock/external/glass{ name = "Supply Door Airlock" @@ -31417,7 +31451,7 @@ /area/station/maintenance/department/crew_quarters/dorms) "jap" = ( /obj/structure/chair/office, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "jav" = ( /obj/structure/alien/weeds/node, @@ -31769,7 +31803,7 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "jfu" = ( -/obj/structure/cable, +/obj/structure/cable/layer1, /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/hallway) "jfD" = ( @@ -32027,12 +32061,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"jjY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/engineering/flashlight, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "jkc" = ( /obj/machinery/status_display/ai/directional/west, /obj/structure/chair/office{ @@ -33174,6 +33202,12 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) +"jCy" = ( +/obj/effect/landmark/navigate_destination/common/holodeck, +/turf/open/floor/engine{ + name = "Holodeck Projector Floor" + }, +/area/station/holodeck/rec_center) "jCH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -33339,10 +33373,8 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, -/obj/machinery/suit_storage_unit/industrial, -/obj/item/mod/control/pre_equipped/cosmohonk, -/obj/item/mod/module/insignia/clown, -/turf/open/floor/mineral/bananium, +/obj/structure/tank_dispenser/oxygen, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "jFu" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -33427,7 +33459,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "jGX" = ( /obj/effect/landmark/event_spawn, @@ -33642,6 +33674,7 @@ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "jKZ" = ( @@ -35308,7 +35341,7 @@ /area/station/science/genetics) "knr" = ( /obj/machinery/light/directional/west, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "knC" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -36246,14 +36279,13 @@ /turf/open/floor/plating, /area/station/maintenance/tram/mid) "kFs" = ( -/obj/item/bedsheet/clown/double{ - dir = 4 +/obj/structure/bed{ + dir = 1 }, -/obj/structure/bed/double{ - dir = 4 +/obj/item/bedsheet/syndie{ + dir = 1 }, -/obj/item/pillow/clown, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "kFu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -38357,7 +38389,6 @@ /area/station/security/office) "ljC" = ( /obj/effect/turf_decal/siding/wood, -/obj/effect/landmark/navigate_destination/lawyer, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/lawoffice) @@ -38379,6 +38410,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/auxlab/firing_range) +"ljK" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron, +/area/station/escapepodbay) "ljU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39125,7 +39162,7 @@ "lwy" = ( /obj/machinery/porta_turret/ai, /obj/machinery/light/directional/north, -/obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/hallway) "lwB" = ( @@ -39271,6 +39308,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "lyQ" = ( @@ -39477,6 +39516,7 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) "lDM" = ( @@ -40502,6 +40542,7 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/cargo, /turf/open/floor/iron, /area/station/cargo/lobby) "lUf" = ( @@ -41175,6 +41216,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/landmark/navigate_destination/bridge, /turf/open/floor/iron, /area/station/command/bridge) "mfB" = ( @@ -41190,15 +41232,6 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) -"mfL" = ( -/obj/structure/reagent_dispensers/foamtank{ - tank_volume = 1000; - reagent_id = /datum/reagent/lube/superlube; - desc = "A wheeled lubricant tank designed for clowns on interstellar voyages. There is a Donk Co logo on the front."; - name = "Lubricant Reservoir" - }, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "mfT" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 @@ -43199,7 +43232,6 @@ /area/station/science/xenobiology) "mPf" = ( /obj/machinery/holopad, -/obj/effect/landmark/navigate_destination/bridge, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -43256,14 +43288,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) -"mQi" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "mQk" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -43558,6 +43582,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "mVu" = ( @@ -43727,6 +43753,8 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "mZt" = ( @@ -43754,7 +43782,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/turf/open/indestructible/honk, +/turf/open/misc/asteroid, /area/ruin/powered/clownplanet) "nag" = ( /obj/effect/decal/cleanable/dirt, @@ -43825,7 +43853,7 @@ pixel_x = 8; pixel_y = 14 }, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "naN" = ( /obj/machinery/door/firedoor, @@ -44560,6 +44588,8 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/meter, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "nmP" = ( @@ -44836,16 +44866,6 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) -"nqB" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "nqG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45108,6 +45128,8 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "nvB" = ( @@ -45912,7 +45934,7 @@ req_access = "theatre"; name = "Shoe Storage Annex" }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "nHW" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -46299,9 +46321,6 @@ /area/station/bitrunning/den) "nPp" = ( /obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 8 - }, /turf/open/floor/plating, /area/station/engineering/atmos) "nPv" = ( @@ -46716,6 +46735,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/tram/radshelter, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter/civil) "nVm" = ( @@ -49003,14 +49023,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"oMX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/effect/spawner/random/decoration/ornament, -/obj/item/stack/sheet/mineral/bananium/five, -/obj/item/reagent_containers/cup/beaker, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "oMZ" = ( /obj/machinery/holopad, /obj/structure/disposalpipe/segment{ @@ -49113,13 +49125,14 @@ dir = 4 }, /obj/machinery/door/airlock/research/glass{ - name = "Aseembly Lab" + name = "Assembly Lab" }, /obj/structure/barricade/wooden/crude, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/tram/abandonedmechbay, /turf/open/floor/iron, /area/station/maintenance/starboard/central) "oOJ" = ( @@ -50211,11 +50224,8 @@ "piT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/obj/machinery/turretid{ - pixel_y = -24; - req_access = "theatre" - }, -/turf/open/floor/mineral/bananium, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "piX" = ( /turf/open/floor/engine/n2o, @@ -51245,6 +51255,13 @@ /obj/item/disk/nuclear, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"pyB" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/dockescpod3, +/turf/open/floor/iron, +/area/station/escapepodbay) "pyF" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/west{ @@ -52377,7 +52394,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/railing{ - dir = 9; layer = 3.1 }, /obj/structure/railing{ @@ -52533,12 +52549,8 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/item/botanical_lexicon, -/obj/machinery/plantgenes, +/obj/item/reagent_containers/cup/watering_can, +/obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/service/hydroponics) "pQY" = ( @@ -52777,10 +52789,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/surgery/fore) -"pVy" = ( -/obj/machinery/light/directional/west, -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "pVD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, @@ -53507,9 +53515,14 @@ /turf/open/floor/iron/dark, /area/station/command/bridge) "qir" = ( -/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, /obj/structure/chair/plastic, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/smooth, /area/station/maintenance/department/medical) "qit" = ( @@ -53740,7 +53753,6 @@ dir = 4 }, /obj/structure/railing{ - dir = 9; layer = 3.1 }, /turf/open/floor/plating, @@ -53879,9 +53891,6 @@ "qoD" = ( /obj/structure/table, /obj/machinery/microwave, -/obj/structure/sign/poster/contraband/tipper_cream_soda{ - pixel_y = 35 - }, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "qoE" = ( @@ -54617,6 +54626,8 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "qzJ" = ( @@ -55250,7 +55261,7 @@ }, /obj/item/kitchen/fork, /obj/item/plate, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "qIL" = ( /obj/structure/chair/comfy/shuttle, @@ -56164,6 +56175,8 @@ "qXA" = ( /obj/effect/turf_decal/trimline/brown/filled/corner, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "qXS" = ( @@ -58664,6 +58677,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) "rOB" = ( @@ -59963,7 +59977,6 @@ pixel_x = 3 }, /obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/beaker/large, /turf/open/floor/iron/white, /area/ruin/powered/clownplanet) "slx" = ( @@ -60106,6 +60119,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) +"snU" = ( +/obj/effect/landmark/navigate_destination/common/shitter, +/turf/open/floor/iron/freezer, +/area/station/commons/toilet) "snZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -60643,16 +60660,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/central) -"swV" = ( -/obj/machinery/porta_turret/syndicate/teleport{ - desc = "A ballistic banana gun auto-turret that fires banana bullets. What the fuck?"; - name = "Banana Turret"; - req_access = "theatre"; - lethal_projectile = /obj/projectile/bullet/honker; - stun_projectile = /obj/projectile/bullet/honker - }, -/turf/open/indestructible/dark, -/area/ruin/powered/clownplanet) "swZ" = ( /obj/structure/ladder, /turf/open/floor/catwalk_floor/iron_smooth, @@ -61415,10 +61422,15 @@ /area/station/commons/dorms) "sJp" = ( /obj/structure/sign/clock/directional/south, -/obj/machinery/computer/camera_advanced/syndie{ - dir = 1 +/obj/item/paper/crumpled/bloody, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 0 }, -/turf/open/floor/mineral/bananium, +/obj/structure/table/glass, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "sJx" = ( /obj/structure/chair{ @@ -61887,6 +61899,7 @@ /turf/open/floor/iron/white, /area/station/medical/storage) "sQY" = ( +/obj/effect/spawner/random/loafer, /turf/open/floor/iron/smooth, /area/station/maintenance/department/eva) "sQZ" = ( @@ -62181,6 +62194,7 @@ }, /obj/machinery/holopad/secure, /obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/glass/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) "sVA" = ( @@ -63120,7 +63134,7 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/aft) "tkp" = ( -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "tkv" = ( /obj/structure/ladder, @@ -63174,7 +63188,6 @@ /area/station/command/meeting_room) "tld" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/landmark/navigate_destination/dockescpod1, /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/entry) @@ -63694,18 +63707,12 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "tsR" = ( -/obj/item/paper{ - default_raw_text = "Congradulations, agent 'INSERT NAME HERE'! You have been assigned reconnaissance duty among the orbiting rocks of Indecipheres! As this location was previously scouted as a potential build site for a Nanotrasen outpost, one of our benefactors has taken the oppertunity to pre-emptively construct a listening outpost within the region! You have been tasked with monitoring the potentially active future crew and logging all events onboard. If you are a Nanotrasen official who has stumbled upon this outpost before it could be properly established: Please ignore this entire paper."; - name = "initiation paperwork" - }, /obj/machinery/computer/records/medical/syndie{ dir = 1; req_access = list("syndicate") }, -/obj/structure/sign/poster/contraband/clown{ - pixel_y = -27 - }, -/turf/open/floor/mineral/bananium, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "tsY" = ( /obj/effect/decal/cleanable/dirt, @@ -63811,10 +63818,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"tun" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, -/turf/open/floor/mineral/bananium, -/area/ruin/powered/clownplanet) "tur" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -63832,9 +63835,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "engi-entrance" - }, /obj/machinery/door/poddoor/shutters/preopen{ id = "Engineering3" }, @@ -64566,7 +64566,7 @@ dir = 8 }, /obj/structure/window/spawner/directional/north, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/small, /area/ruin/powered/clownplanet) "tIA" = ( /obj/effect/decal/cleanable/dirt, @@ -64907,7 +64907,7 @@ c_tag = "Secure - AI Upper External North"; network = list("aicore") }, -/obj/structure/cable, +/obj/structure/cable/multilayer/connected, /turf/open/floor/engine/hull/reinforced, /area/station/ai_monitored/turret_protected/aisat/hallway) "tNJ" = ( @@ -66650,10 +66650,6 @@ }, /turf/open/floor/iron/dark/airless, /area/station/science/ordnance/freezerchamber) -"urq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/atmos) "urv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset, @@ -67067,6 +67063,8 @@ dir = 5 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "uxq" = ( @@ -68328,10 +68326,15 @@ /area/station/hallway/secondary/exit/departure_lounge) "uQP" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/railing, +/obj/structure/railing{ + dir = 1 + }, /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/iron/smooth, /area/station/maintenance/starboard/lesser) "uQR" = ( @@ -68979,6 +68982,8 @@ dir = 9 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "vaR" = ( @@ -70790,7 +70795,6 @@ dir = 1 }, /obj/structure/cable, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "vBG" = ( @@ -71032,7 +71036,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/airalarm/directional/west, -/obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/ruin/powered/clownplanet) "vDG" = ( @@ -71210,6 +71213,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) "vGI" = ( @@ -71633,13 +71639,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/department/crew_quarters/dorms) "vNV" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/decal/cleanable/dirt, /obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/catwalk_floor, /area/station/maintenance/port/central) "vOx" = ( @@ -72087,6 +72092,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/maintenance/central/greater) "vUW" = ( @@ -72560,7 +72566,7 @@ name = "Old TV"; desc = "An old TV, at some point, a clown watched too much TV on this." }, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "wdU" = ( /obj/machinery/door/firedoor, @@ -72613,6 +72619,13 @@ }, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/center) +"weG" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/dockescpod2, +/turf/open/floor/iron, +/area/station/escapepodbay) "weS" = ( /obj/structure/railing{ dir = 1 @@ -72986,6 +72999,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) "wlK" = ( @@ -73110,13 +73124,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"wnM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/decoration/material, -/obj/structure/table, -/obj/effect/spawner/random/engineering/material_cheap, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "wnN" = ( /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 @@ -73125,6 +73132,7 @@ pixel_y = -32; dir = 1 }, +/obj/effect/landmark/navigate_destination/common/cryogenics, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "woJ" = ( @@ -73478,8 +73486,7 @@ /area/station/medical/morgue) "wtK" = ( /obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/tank_dispenser/oxygen, -/turf/open/floor/mineral/bananium, +/turf/open/floor/iron/dark/herringbone, /area/ruin/powered/clownplanet) "wtQ" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -75310,6 +75317,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/effect/landmark/navigate_destination/tram/bankofcargo, /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) "wYE" = ( @@ -75501,6 +75509,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"xdi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/landmark/navigate_destination/dockaux, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "xdw" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/iron/dark, @@ -75606,7 +75621,7 @@ "xgi" = ( /obj/machinery/light/small/directional/north, /obj/machinery/light_switch/directional/north, -/turf/open/floor/carpet/neon/simple/yellow, +/turf/open/floor/iron/grimy, /area/ruin/powered/clownplanet) "xgp" = ( /obj/effect/turf_decal/trimline/red/filled/line, @@ -76454,10 +76469,6 @@ "xwf" = ( /turf/closed/wall/r_wall, /area/station/maintenance/central/greater) -"xwi" = ( -/obj/effect/spawner/random/trash/garbage, -/turf/open/floor/plating, -/area/ruin/powered/clownplanet) "xwz" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76637,6 +76648,7 @@ /obj/machinery/door/airlock/public/glass{ name = "Barber Shop" }, +/obj/effect/landmark/navigate_destination/common/barber, /turf/open/floor/wood/large, /area/station/service/barber) "xzq" = ( @@ -76656,6 +76668,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/eva, /obj/effect/mapping_helpers/airlock/access/any/command/gateway, /obj/effect/mapping_helpers/airlock/access/any/command/teleporter, +/obj/effect/landmark/navigate_destination/teleporter, /turf/open/floor/iron, /area/station/command/teleporter) "xzI" = ( @@ -76878,9 +76891,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/science) -"xDf" = ( -/turf/open/indestructible/honk, -/area/ruin/powered/clownplanet) "xDn" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 4 @@ -76917,6 +76927,7 @@ name = "Bitrunning Den" }, /obj/effect/mapping_helpers/airlock/access/any/supply/bit_den, +/obj/effect/landmark/navigate_destination/common/bitrunner, /turf/open/floor/iron, /area/station/bitrunning/den) "xEo" = ( @@ -77542,6 +77553,7 @@ dir = 4 }, /obj/machinery/atm, +/obj/effect/landmark/navigate_destination/common/dorms, /turf/open/floor/iron, /area/station/commons/dorms) "xPQ" = ( @@ -77655,9 +77667,7 @@ pixel_x = 0; pixel_y = 32 }, -/obj/structure/rack, -/obj/item/clothing/shoes/sneakers, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/ruin/powered/clownplanet) "xSr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77775,6 +77785,8 @@ /area/station/maintenance/department/crew_quarters/dorms) "xUC" = ( /obj/effect/spawner/random/engineering/tracking_beacon, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) "xUG" = ( @@ -78042,13 +78054,9 @@ /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 6 }, -/mob/living/simple_animal/pet/cat/kitten{ - name = "Blu"; - gender = "female" - }, /obj/structure/bed/dogbed{ desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."; - name = "cat bed" + name = "slime bed" }, /obj/machinery/conveyor_switch/oneway{ id = "hydrodropoff"; @@ -78056,6 +78064,10 @@ pixel_x = 10; pixel_y = 20 }, +/mob/living/simple_animal/slime/pet{ + colour = "orange"; + name = "Happy Accident" + }, /turf/open/floor/plastic, /area/station/engineering/break_room) "xYV" = ( @@ -81267,8 +81279,8 @@ nPb pkp pjA mZV -xDf -xDf +pkp +pkp pkp nPb vXM @@ -83571,7 +83583,7 @@ nPb oVB nPb gcp -gNy +tkp knr tkp tkp @@ -83832,7 +83844,7 @@ atl naI tkp tkp -tun +aaA iOC aaA dbr @@ -84345,13 +84357,13 @@ gcp qQm fTI agz -tun +aaA nHV piT gcp -eES coN -swV +coN +coN nPb nPb uww @@ -84601,7 +84613,7 @@ nPb gcp cKm agF -tun +aaA eJA gcp xAc @@ -85632,10 +85644,10 @@ gcp gcp gcp gcp -mfL -xwi -wnM -gcp +nPb +nPb +nPb +nPb nPb nPb pkp @@ -85888,11 +85900,11 @@ nPb nPb nPb nPb -gcp -gcp -oMX -jjY -gcp +nPb +nPb +nPb +nPb +nPb nPb pkp pkp @@ -86146,10 +86158,10 @@ nPb nPb nPb nPb -gcp -gcp -gcp -gcp +nPb +nPb +nPb +nPb nPb pkp nPb @@ -86402,7 +86414,7 @@ pkp nPb nPb oVB -nPb +gcJ nPb nPb nPb @@ -91961,19 +91973,19 @@ aaV aaV dDk mXt -abA +iWy itN dDk dDk dDk mXt -abA +weG itN dDk dDk dDk mXt -abA +pyB itN dDk dDk @@ -92482,8 +92494,8 @@ abm abm abf abf -abf -acA +ljK +bVn acN acT acA @@ -92739,7 +92751,7 @@ abf abX acf acp -acp +bPp acB acO acU @@ -93792,7 +93804,7 @@ xkx lMw hAD hAD -hAD +snU hAD hAD hAD @@ -96369,7 +96381,7 @@ mlI jsA wPE wPE -wPE +cvB wPE wPE wPE @@ -106072,7 +106084,7 @@ qxf qxf jIN ldD -vUP +ctg vUP wlo hSy @@ -110958,7 +110970,7 @@ wDw ale moV ptR -flP +tto feC sbv yka @@ -112306,13 +112318,13 @@ hmF iQU gqL xat -urq -urq -urq -urq -urq -urq -urq +gqL +gqL +gqL +gqL +gqL +gqL +gqL wQm wQm wQm @@ -112826,8 +112838,8 @@ wQm fja wQm wQm -urq -bZW +gqL +fXi wQm kdw aOV @@ -113084,7 +113096,7 @@ oqh wQm wQm eaq -bZW +fXi wQm oaX tsp @@ -115406,7 +115418,7 @@ hZr pHM hZr djX -mQi +hYn ixc ixc bNz @@ -117210,7 +117222,7 @@ nPp gTl bKe eno -nqB +qud vXM vXM mzx @@ -118489,7 +118501,7 @@ vde atC gqV atP -atP +cxM auf aum aup @@ -149622,7 +149634,7 @@ cdf nPb gcp jFt -pVy +knr wtK gcp gcp @@ -149880,7 +149892,7 @@ nPb gcp qBq exv -gNy +tkp agx aBI sJp @@ -150137,8 +150149,8 @@ nPb gcp qBq exv -gNy tkp +aBI jap tsR gcp @@ -150394,7 +150406,7 @@ nPb gcp iOh aQh -gNy +tkp tIw agt bxd @@ -155459,7 +155471,7 @@ etC jEu kqf dFP -dFP +xdi dFP ste jEu @@ -167032,7 +167044,7 @@ tnu ndb ndb ndb -ndb +jCy ndb ndb ndb @@ -176520,7 +176532,7 @@ vXM vXM vXM vXM -aEj +akd veL nOB fld @@ -190134,7 +190146,7 @@ vYl oGF cwG kum -bHB +dPu vbA nrM nLe @@ -193311,7 +193323,7 @@ jfu lwy sVz bNr -aoh +hbN fyX ffe mgi diff --git a/_maps/safehouses/bathroom.dmm b/_maps/safehouses/bathroom.dmm new file mode 100644 index 000000000000..62e928ac0543 --- /dev/null +++ b/_maps/safehouses/bathroom.dmm @@ -0,0 +1,155 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"c" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"e" = ( +/obj/effect/spawner/structure/window, +/obj/effect/decal/cleanable/blood/splatter/over_window, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"q" = ( +/obj/structure/urinal/directional/west, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"s" = ( +/obj/effect/landmark/bitrunning/cache_goal_turf, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/machinery/light/small/blacklight/directional/east, +/turf/open/floor/bitrunning_transport, +/area/virtual_domain/safehouse) +"v" = ( +/obj/machinery/light/small/blacklight/directional/east, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/tracks, +/obj/vehicle/ridden/wheelchair, +/obj/effect/spawner/random/medical/injector, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"x" = ( +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"y" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/blacklight/directional/west, +/obj/effect/spawner/random/medical/medkit, +/obj/effect/spawner/random/medical/medkit, +/obj/effect/spawner/random/medical/minor_healing, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"z" = ( +/obj/structure/sign/poster/abductor/random/directional/east, +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"D" = ( +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"G" = ( +/turf/closed/wall/mineral/silver, +/area/virtual_domain/safehouse) +"J" = ( +/obj/structure/railing, +/obj/effect/landmark/bitrunning/cache_goal_turf, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/turf/open/floor/bitrunning_transport, +/area/virtual_domain/safehouse) +"M" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/toilet{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"N" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"T" = ( +/obj/effect/landmark/bitrunning/hololadder_spawn, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"V" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"X" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/freezer, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) +"Z" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small/blacklight/directional/west, +/turf/open/floor/iron/freezer, +/area/virtual_domain/safehouse) + +(1,1,1) = {" +G +G +G +G +G +G +"} +(2,1,1) = {" +G +Z +M +q +y +G +"} +(3,1,1) = {" +G +c +D +a +T +G +"} +(4,1,1) = {" +X +a +D +D +T +G +"} +(5,1,1) = {" +G +V +x +N +T +G +"} +(6,1,1) = {" +G +s +J +z +v +e +"} +(7,1,1) = {" +G +G +G +G +G +G +"} diff --git a/_maps/virtual_domains/beach_bar.dmm b/_maps/virtual_domains/beach_bar.dmm index c64b07f12421..b9a7990e454f 100644 --- a/_maps/virtual_domains/beach_bar.dmm +++ b/_maps/virtual_domains/beach_bar.dmm @@ -15,6 +15,15 @@ /obj/machinery/grill, /turf/open/floor/wood, /area/virtual_domain/powered) +"ax" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain{ + pixel_y = 7; + pixel_x = 4 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain, +/turf/open/floor/wood, +/area/virtual_domain/powered) "aE" = ( /turf/open/floor/pod/light, /area/virtual_domain/powered) @@ -50,10 +59,12 @@ /obj/structure/fluff/beach_umbrella/cap, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"bZ" = ( -/obj/item/stack/sheet/iron/fifty, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, +"bS" = ( +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo"; + pixel_x = -4 + }, +/turf/open/floor/wood, /area/virtual_domain/powered) "cb" = ( /obj/structure/table/wood, @@ -119,6 +130,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/wood, /area/virtual_domain/powered) +"dZ" = ( +/obj/structure/bookcase/random/reference, +/turf/open/floor/wood, +/area/virtual_domain/powered) "ed" = ( /obj/machinery/atmospherics/components/tank/air{ dir = 1 @@ -129,37 +144,24 @@ /obj/structure/noticeboard/staff, /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/powered) -"es" = ( -/obj/structure/bookcase/random/reference, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"eT" = ( -/obj/structure/table/wood/poker, -/obj/item/storage/dice, -/obj/item/stack/spacecash/c1000, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"eU" = ( -/turf/open/misc/beach/sand/coastline_b, +"fr" = ( +/obj/item/melee/skateboard/hoverboard, +/obj/machinery/light/directional/west, +/turf/open/floor/pod/light, /area/virtual_domain/powered) -"fc" = ( +"fN" = ( /obj/structure/table/wood, /obj/item/reagent_containers/pill/happy, /obj/item/toy/figure/bartender{ pixel_x = -8; pixel_y = -1 }, -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{ +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain{ pixel_y = 8; pixel_x = 5 }, /turf/open/floor/wood, /area/virtual_domain/powered) -"fr" = ( -/obj/item/melee/skateboard/hoverboard, -/obj/machinery/light/directional/west, -/turf/open/floor/pod/light, -/area/virtual_domain/powered) "gh" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -172,9 +174,9 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/pod/light, /area/virtual_domain/powered) -"hx" = ( -/obj/effect/baseturf_helper/virtual_domain, -/turf/closed/wall/mineral/sandstone, +"hy" = ( +/obj/machinery/light/directional/south, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "hE" = ( /obj/structure/sign/departments/restroom/directional/east, @@ -186,6 +188,13 @@ }, /turf/open/floor/wood, /area/virtual_domain/powered) +"is" = ( +/obj/effect/turf_decal/sand, +/obj/item/coin/gold, +/obj/structure/railing, +/obj/machinery/media/jukebox, +/turf/open/floor/sepia, +/area/virtual_domain/powered) "iz" = ( /turf/closed/indestructible/binary, /area/lavaland/surface/outdoors/virtual_domain) @@ -238,6 +247,11 @@ /obj/machinery/reagentgrinder, /turf/open/floor/wood, /area/virtual_domain/powered) +"kK" = ( +/obj/structure/mirror/directional/west, +/obj/structure/sink/kitchen/directional/south, +/turf/open/floor/wood, +/area/virtual_domain/powered) "kT" = ( /obj/structure/chair/stool/bar/directional/south, /turf/open/floor/wood, @@ -262,11 +276,21 @@ /obj/item/canvas/twentythree_twentythree, /turf/open/misc/beach/sand, /area/virtual_domain/powered) +"nP" = ( +/obj/item/stack/sheet/iron/fifty, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, +/area/virtual_domain/powered) "oP" = ( /obj/structure/table/wood, /obj/machinery/reagentgrinder, /turf/open/floor/wood, /area/virtual_domain/powered) +"pi" = ( +/obj/machinery/vending/cigarette/beach, +/obj/effect/turf_decal/sand, +/turf/open/floor/iron, +/area/virtual_domain/powered) "pr" = ( /turf/template_noop, /area/template_noop) @@ -282,6 +306,18 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/misc/beach/sand, /area/virtual_domain/powered) +"qd" = ( +/obj/item/reagent_containers/condiment/milk, +/obj/item/reagent_containers/condiment/mayonnaise, +/obj/item/reagent_containers/condiment/flour, +/obj/item/reagent_containers/condiment/flour, +/turf/open/floor/wood, +/area/virtual_domain/powered) +"qR" = ( +/obj/effect/spawner/structure/window, +/obj/structure/curtain, +/turf/open/floor/plating, +/area/virtual_domain/powered) "qW" = ( /obj/item/melee/skateboard/hoverboard, /mob/living/basic/chicken{ @@ -289,6 +325,15 @@ }, /turf/open/misc/beach/sand, /area/virtual_domain/powered) +"ra" = ( +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawbacon, +/obj/item/food/meat/rawcutlet, +/obj/item/food/meat/rawcutlet, +/obj/item/food/meat/slab/rawcrab, +/obj/item/food/meat/slab/rawcrab, +/turf/open/floor/wood, +/area/virtual_domain/powered) "rc" = ( /obj/machinery/light/directional/east, /turf/open/floor/wood, @@ -305,32 +350,37 @@ /obj/item/canvas/twentythree_twentythree, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"rL" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/wood, +"rs" = ( +/obj/machinery/light/directional/east, +/turf/open/misc/beach/sand/coastline_b, /area/virtual_domain/powered) "rT" = ( /obj/item/toy/seashell, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"sj" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/pod/light, -/area/virtual_domain/powered) "sT" = ( /obj/effect/baseturf_helper/virtual_domain, /turf/template_noop, /area/virtual_domain/safehouse) -"tj" = ( +"tE" = ( /obj/machinery/door/airlock/public/glass{ - name = "Resort Lobby" + name = "Resort Casino" }, /turf/open/floor/wood, /area/virtual_domain/powered) +"tF" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/wood, +/area/virtual_domain/powered) "tZ" = ( /obj/structure/toilet, /turf/open/floor/wood, /area/virtual_domain/powered) +"uc" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/light/small/directional/east, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/virtual_domain/powered) "ug" = ( /obj/structure/closet/secure_closet{ icon_state = "cabinet"; @@ -354,23 +404,23 @@ /obj/item/cultivator, /turf/open/floor/iron/grimy, /area/virtual_domain/powered) -"uq" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain, -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{ - pixel_x = -4; - pixel_y = 8 - }, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"uI" = ( -/obj/structure/sign/warning/gas_mask/directional/west, -/turf/open/floor/plating, -/area/virtual_domain/powered) "uU" = ( /obj/effect/turf_decal/sand, /turf/open/floor/sepia, /area/virtual_domain/powered) +"ve" = ( +/obj/item/toy/dodgeball, +/obj/item/toy/dodgeball, +/obj/item/toy/dodgeball, +/obj/item/toy/dodgeball, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/virtual_domain/powered) +"vp" = ( +/obj/machinery/light/directional/east, +/obj/structure/chair/stool/bar/directional/south, +/turf/open/floor/wood, +/area/virtual_domain/powered) "vq" = ( /obj/machinery/oven/range, /turf/open/floor/wood, @@ -379,14 +429,6 @@ /obj/structure/chair/stool/directional/south, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"vC" = ( -/obj/machinery/chem_dispenser/drinks/fullupgrade{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/virtual_domain/powered) "vN" = ( /obj/structure/table/wood, /obj/item/reagent_containers/pill/morphine, @@ -418,31 +460,18 @@ /obj/item/reagent_containers/cup/glass/bottle/beer/light, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"wm" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Resort Casino" - }, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"wo" = ( -/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ - dir = 1 - }, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"ws" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Supply Room" - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "wD" = ( /turf/open/misc/beach/sand, /area/virtual_domain/powered) "xb" = ( /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/virtual_domain) +"xk" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/dice, +/obj/item/stack/spacecash/c1000, +/turf/open/floor/wood, +/area/virtual_domain/powered) "xq" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/south, @@ -517,25 +546,18 @@ /obj/machinery/food_cart, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"yB" = ( -/obj/item/instrument/guitar, -/turf/open/floor/carpet/blue, -/area/virtual_domain/powered) -"yF" = ( -/obj/item/bedsheet/dorms{ - dir = 4 - }, -/obj/structure/bed{ - dir = 4 +"yx" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain, +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain{ + pixel_x = -4; + pixel_y = 8 }, /turf/open/floor/wood, /area/virtual_domain/powered) -"yQ" = ( -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo"; - pixel_x = -4 - }, -/turf/open/floor/wood, +"yB" = ( +/obj/item/instrument/guitar, +/turf/open/floor/carpet/blue, /area/virtual_domain/powered) "yU" = ( /obj/structure/sign/warning/gas_mask/directional/north, @@ -577,10 +599,22 @@ /obj/machinery/reagentgrinder, /turf/open/floor/pod/light, /area/virtual_domain/powered) -"Bk" = ( -/obj/structure/urinal/directional/north, +"AP" = ( +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{ + dir = 1 + }, +/obj/structure/table/wood, /turf/open/floor/wood, /area/virtual_domain/powered) +"AS" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/misc/beach/sand/coastline_b, +/area/virtual_domain/powered) +"AZ" = ( +/turf/open/misc/beach/sand/coastline_b, +/area/virtual_domain/powered) "Br" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck/cas{ @@ -601,9 +635,18 @@ /obj/item/reagent_containers/condiment/saltshaker, /turf/open/floor/wood, /area/virtual_domain/powered) +"BJ" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck, +/turf/open/floor/wood, +/area/virtual_domain/powered) "BM" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/powered) +"BQ" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/pod/light, +/area/virtual_domain/powered) "Cb" = ( /obj/machinery/light/directional/north, /mob/living/basic/crab{ @@ -620,22 +663,37 @@ /obj/effect/mob_spawn/ghost_role/human/beach/lifeguard, /turf/open/floor/wood, /area/virtual_domain/powered) -"CG" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck, -/turf/open/floor/wood, -/area/virtual_domain/powered) "CO" = ( /obj/machinery/vending/dinnerware, /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/virtual_domain/powered) +"CW" = ( +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/structure/railing, +/turf/open/floor/sepia, +/area/virtual_domain/powered) "Db" = ( /obj/machinery/barsign/all_access, /turf/closed/wall/mineral/wood/nonmetal, /area/virtual_domain/powered) -"Dk" = ( -/obj/structure/sign/warning/secure_area, +"Ds" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Resort Lobby" + }, +/turf/open/floor/wood, +/area/virtual_domain/powered) +"Dt" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/sand, +/turf/open/misc/beach/sand, +/area/virtual_domain/powered) +"DL" = ( +/obj/effect/baseturf_helper/virtual_domain, /turf/closed/wall/mineral/sandstone, /area/virtual_domain/powered) "Em" = ( @@ -648,18 +706,22 @@ /obj/structure/table, /turf/open/floor/wood, /area/virtual_domain/powered) -"Eq" = ( -/obj/effect/mob_spawn/ghost_role/human/bartender{ - dir = 4 - }, -/turf/open/floor/wood, +"Et" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/plating, /area/virtual_domain/powered) "Ev" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, /area/virtual_domain/powered) -"EH" = ( -/obj/machinery/deepfryer, +"EC" = ( +/obj/structure/sign/warning/gas_mask/directional/west, +/turf/open/floor/plating, +/area/virtual_domain/powered) +"EP" = ( +/obj/machinery/light/directional/north, +/obj/machinery/washing_machine, /turf/open/floor/wood, /area/virtual_domain/powered) "Fn" = ( @@ -685,15 +747,6 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/virtual_domain/powered) -"Gt" = ( -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/rawbacon, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/rawcutlet, -/obj/item/food/meat/slab/rawcrab, -/obj/item/food/meat/slab/rawcrab, -/turf/open/floor/wood, -/area/virtual_domain/powered) "Gz" = ( /obj/structure/flora/tree/palm, /turf/open/misc/beach/sand, @@ -707,14 +760,21 @@ /obj/item/storage/medkit/brute, /turf/open/floor/wood, /area/virtual_domain/powered) -"GV" = ( -/obj/machinery/light/directional/south, -/turf/open/misc/beach/sand/coastline_b, +"GQ" = ( +/turf/open/floor/iron/grimy, /area/virtual_domain/powered) "Hs" = ( /obj/machinery/shower/directional/west, /turf/open/floor/iron/white, /area/virtual_domain/powered) +"HF" = ( +/obj/machinery/deepfryer, +/turf/open/floor/wood, +/area/virtual_domain/powered) +"Ia" = ( +/obj/structure/urinal/directional/north, +/turf/open/floor/wood, +/area/virtual_domain/powered) "Ii" = ( /obj/machinery/light/directional/west, /turf/open/floor/iron/stairs/left, @@ -756,44 +816,27 @@ /obj/structure/flora/rock/style_random, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"KZ" = ( -/obj/structure/flora/bush/stalky/style_random, -/turf/open/water/beach, +"Kd" = ( +/obj/structure/sign/warning/secure_area, +/turf/closed/wall/mineral/sandstone, /area/virtual_domain/powered) -"Ll" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 8 +"KH" = ( +/obj/structure/mineral_door/wood{ + name = "Croupier's Booth" }, -/obj/machinery/light/directional/west, -/obj/structure/railing, -/turf/open/floor/sepia, +/turf/open/floor/wood, /area/virtual_domain/powered) -"Lu" = ( -/obj/machinery/light/directional/east, -/turf/open/misc/beach/sand/coastline_b, +"KZ" = ( +/obj/structure/flora/bush/stalky/style_random, +/turf/open/water/beach, /area/virtual_domain/powered) "LD" = ( /turf/open/floor/plating, /area/virtual_domain/powered) -"LP" = ( -/obj/effect/turf_decal/sand, -/obj/structure/railing, -/turf/open/floor/sepia, -/area/virtual_domain/powered) "LW" = ( /obj/item/storage/cans/sixbeer, /turf/open/floor/carpet/orange, /area/virtual_domain/powered) -"Mp" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain{ - pixel_y = 7; - pixel_x = 4 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain, -/turf/open/floor/wood, -/area/virtual_domain/powered) "Mw" = ( /obj/structure/chair/sofa/right/brown, /turf/open/floor/wood, @@ -802,21 +845,19 @@ /obj/structure/chair/sofa/left/brown, /turf/open/floor/wood, /area/virtual_domain/powered) -"MS" = ( -/obj/structure/mineral_door/wood{ - name = "Croupier's Booth" - }, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"Ng" = ( -/obj/effect/spawner/structure/window, -/obj/structure/curtain, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Nr" = ( /obj/machinery/light/directional/north, /turf/open/misc/beach/sand, /area/virtual_domain/powered) +"Nw" = ( +/obj/item/bedsheet/dorms{ + dir = 4 + }, +/obj/structure/bed{ + dir = 4 + }, +/turf/open/floor/wood, +/area/virtual_domain/powered) "NM" = ( /obj/structure/closet/crate/hydroponics, /obj/item/food/grown/ambrosia/vulgaris, @@ -845,6 +886,11 @@ /obj/structure/sign/warning/gas_mask/directional/north, /turf/open/misc/beach/sand, /area/virtual_domain/powered) +"OO" = ( +/obj/effect/turf_decal/sand, +/obj/structure/railing, +/turf/open/floor/sepia, +/area/virtual_domain/powered) "OR" = ( /obj/machinery/light/directional/south, /turf/open/misc/beach/sand, @@ -865,14 +911,6 @@ /obj/machinery/light/directional/west, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"Pk" = ( -/obj/item/toy/dodgeball, -/obj/item/toy/dodgeball, -/obj/item/toy/dodgeball, -/obj/item/toy/dodgeball, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/virtual_domain/powered) "PM" = ( /obj/machinery/door/airlock/external/ruin, /turf/open/floor/plating, @@ -885,15 +923,18 @@ /obj/structure/curtain, /turf/open/floor/iron/white, /area/virtual_domain/powered) -"QO" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/virtual_domain/powered) "QP" = ( /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/virtual_domain/powered) +"QX" = ( +/obj/machinery/chem_dispenser/drinks/fullupgrade{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/virtual_domain/powered) "Rx" = ( /turf/open/floor/iron/stairs/medium, /area/virtual_domain/powered) @@ -909,12 +950,6 @@ /obj/item/clothing/neck/beads, /turf/open/floor/wood, /area/virtual_domain/powered) -"St" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/misc/beach/sand/coastline_b, -/area/virtual_domain/powered) "SB" = ( /obj/machinery/door/airlock/sandstone{ name = "Resort Bathroom" @@ -940,14 +975,6 @@ /obj/structure/fluff/beach_umbrella/security, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"TN" = ( -/obj/structure/mirror/directional/west, -/obj/structure/sink/kitchen/directional/south, -/turf/open/floor/wood, -/area/virtual_domain/powered) -"TR" = ( -/turf/open/floor/iron/grimy, -/area/virtual_domain/powered) "Ud" = ( /obj/effect/turf_decal/sand, /turf/open/misc/beach/sand, @@ -968,11 +995,6 @@ /obj/machinery/processor, /turf/open/floor/wood, /area/virtual_domain/powered) -"Vt" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/light/small/directional/east, -/turf/open/misc/asteroid/basalt/lava_land_surface, -/area/virtual_domain/powered) "VA" = ( /obj/machinery/computer/slot_machine, /turf/open/floor/wood, @@ -999,10 +1021,11 @@ "Ww" = ( /turf/open/water/beach, /area/virtual_domain/powered) -"WA" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/sand, -/turf/open/misc/beach/sand, +"WC" = ( +/obj/effect/mob_spawn/ghost_role/human/bartender{ + dir = 4 + }, +/turf/open/floor/wood, /area/virtual_domain/powered) "WL" = ( /obj/machinery/light/directional/north, @@ -1012,11 +1035,6 @@ /obj/structure/flora/bush/jungle/a/style_random, /turf/open/misc/beach/sand, /area/virtual_domain/powered) -"WP" = ( -/obj/machinery/light/directional/north, -/obj/machinery/washing_machine, -/turf/open/floor/wood, -/area/virtual_domain/powered) "WW" = ( /obj/effect/turf_decal/sand, /obj/machinery/icecream_vat, @@ -1054,14 +1072,15 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/virtual_domain/powered) +"YI" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Supply Room" + }, +/turf/open/floor/plating, +/area/virtual_domain/powered) "YJ" = ( /turf/open/floor/carpet/purple, /area/virtual_domain/powered) -"YL" = ( -/obj/machinery/vending/cigarette/beach, -/obj/effect/turf_decal/sand, -/turf/open/floor/iron, -/area/virtual_domain/powered) "YN" = ( /obj/effect/turf_decal/sand, /obj/machinery/light/directional/west, @@ -1072,31 +1091,12 @@ /obj/machinery/microwave, /turf/open/floor/wood, /area/virtual_domain/powered) -"Zp" = ( -/obj/machinery/light/directional/east, -/obj/structure/chair/stool/bar/directional/south, -/turf/open/floor/wood, -/area/virtual_domain/powered) "Zt" = ( /obj/structure/table/wood, /obj/item/reagent_containers/pill/morphine, /obj/item/storage/fancy/donut_box, /turf/open/floor/wood, /area/virtual_domain/powered) -"ZI" = ( -/obj/effect/turf_decal/sand, -/obj/item/coin/gold, -/obj/structure/railing, -/obj/machinery/media/jukebox, -/turf/open/floor/sepia, -/area/virtual_domain/powered) -"ZS" = ( -/obj/item/reagent_containers/condiment/milk, -/obj/item/reagent_containers/condiment/mayonnaise, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/flour, -/turf/open/floor/wood, -/area/virtual_domain/powered) (1,1,1) = {" pr @@ -1497,7 +1497,7 @@ Al Al xb xb -Vt +uc Al Al gl @@ -1553,12 +1553,12 @@ bf Bw Fn Ev -Eq +WC iR kG di Fn -hx +DL Al gl ml @@ -1586,7 +1586,7 @@ LD LD Fn Fn -Dk +Kd Fn Fn bQ @@ -1600,7 +1600,7 @@ TG TG TG TG -wo +AP Fn Al gl @@ -1627,7 +1627,7 @@ Fn LD pT LD -uI +EC LD pT PM @@ -1643,7 +1643,7 @@ TG TG TG TG -vC +QX Fn Al gl @@ -1670,7 +1670,7 @@ Fn Fn yU LD -QO +Et LD LD PM @@ -1683,9 +1683,9 @@ qc Fn Fn SD -Mp -uq -fc +ax +yx +fN Fn Fn Al @@ -1729,7 +1729,7 @@ dx kn kn kn -Ll +CW Fn Al gl @@ -1751,11 +1751,11 @@ pC yX ag kT -CG +BJ kT Fn as -YL +pi Ir IP YN @@ -1772,7 +1772,7 @@ uU lS lS lS -LP +OO Fn Al gl @@ -1793,8 +1793,8 @@ Fn Mw ag ag -Zp -eT +vp +xk TG Fn Ud @@ -1815,7 +1815,7 @@ uU lS NX lS -ZI +is Fn Al gl @@ -1838,7 +1838,7 @@ TG TG Fn Fn -MS +KH Fn wD wD @@ -1858,7 +1858,7 @@ uU lS lS lS -LP +OO Fn Al gl @@ -1877,8 +1877,8 @@ iz Al Fn Fn -wm -wm +tE +tE Fn wD wD @@ -1901,7 +1901,7 @@ uU uU uU uU -LP +OO Fn Fn gl @@ -1924,7 +1924,7 @@ wD wD wD wD -WA +Dt Ud Ud Ud @@ -1939,13 +1939,13 @@ TJ wb wD wD -St -St -St -St -St -St -GV +AS +AS +AS +AS +AS +AS +hy Fn gl gl @@ -1982,13 +1982,13 @@ yl ag wD wD -eU +AZ KZ Ww Ww Ww cG -eU +AZ Fn Al Al @@ -2017,7 +2017,7 @@ TG TG TG TG -Gt +ra BM wD wD @@ -2025,13 +2025,13 @@ Au wD rT wD -eU +AZ Ww Ww Ww Ww Ww -eU +AZ Fn Al iz @@ -2054,9 +2054,9 @@ wD JC wD BM -EH +HF TG -ZS +qd BM aw TG @@ -2068,13 +2068,13 @@ YJ YJ wD wD -eU +AZ Ww Ww Ww Ww Ww -eU +AZ Fn Al iz @@ -2111,13 +2111,13 @@ bQ wD wD wD -eU +AZ Ww Ww KZ KZ Ww -GV +hy Fn Al iz @@ -2140,7 +2140,7 @@ Gz LW wD BM -yQ +bS TG oP BM @@ -2154,13 +2154,13 @@ XP yB wD wD -eU +AZ KZ Ww KZ gh Ww -eU +AZ Fn Al iz @@ -2197,13 +2197,13 @@ XL wD wD wD -eU +AZ Ww Ww Ww Ww Ww -eU +AZ Fn Al iz @@ -2240,13 +2240,13 @@ xq jy wD wD -eU +AZ Ww cG Ww Ww KZ -eU +AZ Fn Al iz @@ -2283,13 +2283,13 @@ CA Uh wD qW -eU +AZ Ww Ww Ww Ww Ww -GV +hy Fn Al iz @@ -2325,14 +2325,14 @@ wD wD wD Jt -eU -eU -Lu -eU -eU -eU -eU -eU +AZ +AZ +rs +AZ +AZ +AZ +AZ +AZ Fn Al iz @@ -2349,8 +2349,8 @@ xW iz Al Fn -tj -tj +Ds +Ds Fn VX wD @@ -2399,7 +2399,7 @@ Fn jl Fn Fn -Ng +qR Fn Fn WO @@ -2441,12 +2441,12 @@ TG Fn Fn Fn -es +dZ OE -yF +Nw Fn Fn -Ng +qR Fn Fn wD @@ -2478,7 +2478,7 @@ xW iz Al Fn -WP +EP TG TG TG @@ -2488,9 +2488,9 @@ TG TG TG Fn -es +dZ OE -yF +Nw Fn Gz wD @@ -2588,7 +2588,7 @@ aE aE aE AI -sj +BQ aE NM Fn @@ -2607,7 +2607,7 @@ xW iz Al Fn -TN +kK TG Fn TG @@ -2621,14 +2621,14 @@ Fn SY Fn Fn -tj -tj +Ds +Ds Fn -ws +YI Fn Fn Fn -TR +GQ aE aE aE @@ -2650,7 +2650,7 @@ xW iz Al Fn -Bk +Ia dI Fn Fn @@ -2667,8 +2667,8 @@ TG TG TG Fn -Pk -bZ +ve +nP ed Fn Cv @@ -2705,7 +2705,7 @@ rc TG TG TG -rL +tF rc TG TG diff --git a/_maps/virtual_domains/clown_planet.dmm b/_maps/virtual_domains/clown_planet.dmm index 01d7b88a5efb..5ec58519e402 100644 --- a/_maps/virtual_domains/clown_planet.dmm +++ b/_maps/virtual_domains/clown_planet.dmm @@ -127,7 +127,6 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/baseturf_helper/virtual_domain, /turf/open/floor/plating, /area/virtual_domain/powered) "gH" = ( @@ -347,7 +346,6 @@ /area/virtual_domain/powered) "uX" = ( /obj/effect/mapping_helpers/no_lava, -/mob/living/basic/clown, /turf/open/floor/noslip, /area/virtual_domain/powered) "uY" = ( @@ -366,7 +364,6 @@ "wz" = ( /obj/machinery/light/small/directional/south, /obj/effect/mapping_helpers/no_lava, -/mob/living/basic/clown, /turf/open/floor/noslip, /area/virtual_domain/powered) "xt" = ( @@ -769,7 +766,7 @@ /area/virtual_domain/powered) "WT" = ( /obj/machinery/door/airlock/bananium, -/turf/open/indestructible/honk, +/turf/open/floor/carpet, /area/virtual_domain/powered) "WX" = ( /turf/open/indestructible/white, diff --git a/_maps/virtual_domains/gondola_asteroid.dmm b/_maps/virtual_domains/gondola_asteroid.dmm index 0fcd583ef25d..906ccbffbb9c 100644 --- a/_maps/virtual_domains/gondola_asteroid.dmm +++ b/_maps/virtual_domains/gondola_asteroid.dmm @@ -108,10 +108,6 @@ /obj/structure/flora/bush/sunny/style_random, /turf/open/floor/grass, /area/ruin/space/has_grav/powered/virtual_domain) -"V" = ( -/obj/structure/flora/coconuts, -/turf/open/floor/grass, -/area/ruin/space/has_grav/powered/virtual_domain) "W" = ( /obj/structure/flora/bush/ferny/style_random, /turf/open/floor/grass, @@ -504,7 +500,7 @@ C C C C -V +C C C C @@ -543,7 +539,7 @@ C W C C -V +C C C q @@ -636,7 +632,7 @@ C g C C -V +C C z C @@ -994,7 +990,7 @@ h C C q -V +C C C C @@ -1164,7 +1160,7 @@ h h C C -V +C C C C @@ -1317,7 +1313,7 @@ C q C C -V +C C h h @@ -1488,7 +1484,7 @@ C C C C -V +C C C C diff --git a/_maps/virtual_domains/pipedream.dmm b/_maps/virtual_domains/pipedream.dmm index 44bd845477a1..9a706f613e88 100644 --- a/_maps/virtual_domains/pipedream.dmm +++ b/_maps/virtual_domains/pipedream.dmm @@ -44,7 +44,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/preopen, /turf/open/floor/plating, /area/virtual_domain/powered) "bx" = ( @@ -58,14 +57,6 @@ /obj/structure/chair/plastic, /turf/open/floor/plating, /area/virtual_domain/powered) -"bG" = ( -/obj/structure/lattice/catwalk{ - name = "industrial lift" - }, -/obj/structure/closet/crate/preopen, -/obj/structure/railing, -/turf/open/chasm, -/area/virtual_domain/powered) "bS" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -181,10 +172,6 @@ dir = 8 }, /area/virtual_domain/powered) -"fj" = ( -/obj/structure/closet/crate/preopen, -/turf/open/floor/plating, -/area/virtual_domain/powered) "fl" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 @@ -277,10 +264,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron, /area/virtual_domain/powered) -"iz" = ( -/obj/structure/broken_flooring/corner, -/turf/open/floor/plating, -/area/virtual_domain/powered) "iI" = ( /obj/effect/turf_decal/trimline/yellow/corner{ dir = 8 @@ -400,12 +383,6 @@ }, /turf/open/floor/plating, /area/virtual_domain/powered) -"mh" = ( -/obj/structure/broken_flooring/pile{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "mu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -423,23 +400,6 @@ }, /turf/open/floor/iron, /area/virtual_domain/powered) -"nc" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/poster/official/safety_internals/directional/south, -/turf/open/floor/iron, -/area/virtual_domain/powered) -"nz" = ( -/obj/structure/broken_flooring/side/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "nD" = ( /obj/structure/disposalpipe/trunk/multiz, /turf/open/floor/plating, @@ -470,27 +430,12 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/virtual_domain/powered) -"oX" = ( -/obj/structure/broken_flooring/corner/directional/north, -/turf/open/floor/plating, -/area/virtual_domain/powered) "pa" = ( /obj/machinery/light/small/red/dim{ dir = 1 }, /turf/open/floor/carpet/orange, /area/virtual_domain/powered) -"pb" = ( -/obj/structure/broken_flooring/corner{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) -"pf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/effect/mapping_helpers/damaged_window, -/turf/open/floor/plating, -/area/virtual_domain/powered) "pi" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -500,12 +445,6 @@ /obj/structure/closet/crate/maint, /turf/open/floor/iron, /area/virtual_domain/powered) -"pv" = ( -/obj/structure/broken_flooring/side{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "pI" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/light/small/red/dim{ @@ -513,12 +452,6 @@ }, /turf/open/floor/iron, /area/virtual_domain/powered) -"pJ" = ( -/obj/structure/broken_flooring/pile{ - dir = 1 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "qc" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -662,15 +595,6 @@ }, /turf/open/floor/iron/cafeteria, /area/virtual_domain/powered) -"uv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/broken_flooring/pile{ - dir = 1 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "uz" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, @@ -689,10 +613,6 @@ icon_state = "carpet_royalblue-55" }, /area/virtual_domain/powered) -"uU" = ( -/obj/structure/broken_flooring/side, -/turf/open/floor/plating, -/area/virtual_domain/powered) "vb" = ( /obj/effect/turf_decal/trimline/yellow/line, /obj/effect/turf_decal/trimline/yellow/line{ @@ -734,7 +654,6 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/preopen, /turf/open/floor/plating, /area/virtual_domain/powered) "wh" = ( @@ -799,13 +718,6 @@ }, /turf/open/floor/plating, /area/virtual_domain/powered) -"xj" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/virtual_domain/powered) "xk" = ( /obj/machinery/light/dim{ dir = 4 @@ -929,10 +841,6 @@ /obj/item/ammo_casing/shotgun/buckshot, /turf/open/floor/iron, /area/virtual_domain/powered) -"Bh" = ( -/obj/structure/broken_flooring/corner/directional/east, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Bx" = ( /obj/structure/table/reinforced, /obj/machinery/microwave{ @@ -941,10 +849,6 @@ }, /turf/open/floor/iron, /area/virtual_domain/powered) -"BA" = ( -/obj/structure/broken_flooring/corner/directional/south, -/turf/open/floor/plating, -/area/virtual_domain/powered) "BI" = ( /obj/machinery/door/airlock/command/glass{ name = "Quartermaster's Office" @@ -998,13 +902,6 @@ icon_state = "carpet_royalblue-157" }, /area/virtual_domain/powered) -"CA" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/broken_flooring/side{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "CQ" = ( /obj/effect/spawner/random/trash/botanical_waste, /obj/item/trash/chips, @@ -1086,11 +983,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/cafeteria, /area/virtual_domain/powered) -"Fr" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/closet/crate/preopen, -/turf/open/floor/iron, -/area/virtual_domain/powered) "Fw" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/rock/pile/style_random, @@ -1170,10 +1062,6 @@ "Hn" = ( /turf/open/floor/iron/cafeteria, /area/virtual_domain/powered) -"HI" = ( -/obj/structure/broken_flooring/pile/directional/north, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Ib" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -1213,7 +1101,6 @@ /turf/open/floor/iron, /area/virtual_domain/powered) "Jm" = ( -/obj/structure/broken_flooring/pile/directional/north, /obj/machinery/light/dim, /turf/open/floor/plating, /area/virtual_domain/powered) @@ -1222,16 +1109,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, /obj/structure/sign/warning/doors/directional/east, /turf/open/floor/iron, /area/virtual_domain/powered) "Jq" = ( -/obj/structure/broken_flooring/pile{ - dir = 1 - }, /obj/structure/sign/poster/contraband/random/directional/west, /turf/open/floor/plating, /area/virtual_domain/powered) @@ -1262,11 +1143,6 @@ }, /turf/open/floor/plating, /area/virtual_domain/powered) -"KO" = ( -/obj/structure/broken_flooring/side/directional/north, -/obj/machinery/light/small/red/dim, -/turf/open/floor/plating, -/area/virtual_domain/powered) "KX" = ( /obj/structure/lattice/catwalk{ name = "industrial lift" @@ -1386,9 +1262,6 @@ /turf/open/floor/iron, /area/virtual_domain/powered) "On" = ( -/obj/structure/broken_flooring/side{ - dir = 4 - }, /obj/machinery/light/broken{ dir = 4 }, @@ -1410,7 +1283,6 @@ /area/virtual_domain/powered) "OQ" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/sign/poster/ripped/directional/west, /turf/open/floor/carpet/orange, /area/virtual_domain/powered) "OR" = ( @@ -1422,7 +1294,6 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/broken_flooring/corner, /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/virtual_domain/powered) @@ -1436,13 +1307,6 @@ /obj/structure/sign/poster/official/random/directional/east, /turf/open/floor/iron, /area/virtual_domain/powered) -"PH" = ( -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Qd" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 8 @@ -1607,9 +1471,6 @@ /turf/open/floor/iron, /area/virtual_domain/powered) "Tn" = ( -/obj/structure/broken_flooring/corner{ - dir = 4 - }, /mob/living/basic/hivebot, /turf/open/floor/plating, /area/virtual_domain/powered) @@ -1629,17 +1490,11 @@ }, /turf/open/floor/plating, /area/virtual_domain/powered) -"TH" = ( -/obj/structure/broken_flooring/corner/directional/south, -/obj/item/ammo_casing/shotgun/buckshot/spent, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Ue" = ( /obj/structure/table/reinforced, /obj/machinery/light/small/red/dim{ dir = 8 }, -/obj/structure/sign/poster/official/cleanliness/directional/west, /turf/open/floor/iron, /area/virtual_domain/powered) "Uw" = ( @@ -1648,10 +1503,6 @@ }, /turf/open/floor/plating, /area/virtual_domain/powered) -"UO" = ( -/obj/structure/broken_flooring/side/directional/north, -/turf/open/floor/plating, -/area/virtual_domain/powered) "UV" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 1 @@ -1696,13 +1547,6 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/cafeteria, /area/virtual_domain/powered) -"Vy" = ( -/obj/structure/broken_flooring/singular{ - dir = 4 - }, -/obj/effect/mob_spawn/corpse/human/factory/guard, -/turf/open/floor/plating, -/area/virtual_domain/powered) "VA" = ( /obj/machinery/light/small/red/dim{ dir = 1 @@ -1710,12 +1554,6 @@ /obj/structure/table, /turf/open/floor/plating, /area/virtual_domain/powered) -"VJ" = ( -/obj/structure/broken_flooring/corner{ - dir = 1 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "VL" = ( /obj/structure/sign/warning/secure_area/directional/south, /turf/open/floor/plating, @@ -1812,13 +1650,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/virtual_domain/powered) -"XP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/railing/corner/end{ - dir = 4 - }, -/turf/open/floor/plating, -/area/virtual_domain/powered) "XQ" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 @@ -1839,10 +1670,6 @@ /obj/item/gun/ballistic/revolver, /turf/open/floor/plating, /area/virtual_domain/powered) -"Yl" = ( -/obj/structure/broken_flooring/corner/directional/west, -/turf/open/floor/plating, -/area/virtual_domain/powered) "Ym" = ( /mob/living/simple_animal/pet/cat/space, /obj/structure/bed/dogbed{ @@ -1852,8 +1679,6 @@ pixel_x = 3; pixel_y = 4 }, -/obj/machinery/light/small/dim/directional/south, -/obj/structure/sign/poster/official/moth_hardhat/directional/west, /turf/open/floor/plating, /area/virtual_domain/powered) "Yt" = ( @@ -2282,7 +2107,7 @@ yQ yQ RJ eg -uU +kU gj kU Tn @@ -2292,8 +2117,8 @@ RJ eg eg uk -pf -pf +tr +tr eg eg qV @@ -2347,7 +2172,7 @@ nS kU Qj FK -nc +Sg eY aK aK @@ -2442,7 +2267,7 @@ eg eg VO kU -Fr +lN jw qk XR @@ -2479,10 +2304,10 @@ yM eg GV WT -xj +pi qk Qh -XP +mu lW ww EI @@ -2491,9 +2316,9 @@ Qh mu Yz xl -HI kU -Bh +kU +kU Kb kU hi @@ -2526,14 +2351,14 @@ eg kU sB WT -mh kU -pv +kU +kU AP IZ KX Wd -uv +gj DE Mi gj @@ -2582,7 +2407,7 @@ xl AP KX JT -bG +Wd qk DA DA @@ -2626,7 +2451,7 @@ eg qT Gb Uw -iz +kU jS gj rJ @@ -2645,7 +2470,7 @@ mu mu xl kU -oX +kU hi cF cw @@ -2679,13 +2504,13 @@ eg eg kU qk -PH +mu dA Po Jn aw OJ -CA +mu QN kU Uw @@ -2694,7 +2519,7 @@ kU Mc kU kh -fj +kU kU FK CX @@ -2742,7 +2567,7 @@ eg eg op kU -BA +kU iw kU kU @@ -2795,7 +2620,7 @@ Zb kU Yt kU -UO +kU hi CX eY @@ -2825,7 +2650,7 @@ ve Tt Xo DE -oX +kU eg Sl gV @@ -2834,11 +2659,11 @@ eg uC eg qK -mh +kU kU kU Qj -VJ +kU eg kU kU @@ -2878,11 +2703,11 @@ kU kU mE Mu -Yl -pJ +kU +kU eg kn -pb +kU kU kU kU @@ -2891,7 +2716,7 @@ kU YF eg eg -pf +tr tr XN eg @@ -2945,7 +2770,7 @@ qc ax bS fe -pf +tr hi hi af @@ -2973,7 +2798,7 @@ FO eg eg wg -uU +kU lN uz eg @@ -3027,7 +2852,7 @@ Mj Mj eY eY -UO +kU jH Nu eg @@ -3074,7 +2899,7 @@ Mj RJ Mj Mj -Vy +Kb hi eY CX @@ -3124,13 +2949,13 @@ RJ RJ eY Xm -TH +kU fw eY qW hi dx -pf +tr UV sn uP @@ -3275,7 +3100,7 @@ RJ eY NW UY -KO +YF eY fl jH @@ -3330,7 +3155,7 @@ eY CX jH Nu -pf +tr Xw MI ZI @@ -3478,7 +3303,7 @@ yQ RJ eg Ok -nz +gj IK eg RJ diff --git a/_maps/virtual_domains/psyker_shuffle.dmm b/_maps/virtual_domains/psyker_shuffle.dmm new file mode 100644 index 000000000000..9c846c650da6 --- /dev/null +++ b/_maps/virtual_domains/psyker_shuffle.dmm @@ -0,0 +1,1074 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/closet/crate/secure, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"b" = ( +/obj/item/restraints/legcuffs/beartrap/prearmed, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"e" = ( +/obj/item/gun/ballistic/shotgun/lethal, +/obj/structure/closet/crate/preopen, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"h" = ( +/obj/structure/closet/crate/preopen, +/obj/item/gun/ballistic/automatic/mini_uzi, +/obj/item/gun/ballistic/revolver{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = -3 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/gun/ballistic/revolver{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/gun/ballistic/revolver, +/turf/template_noop, +/area/virtual_domain/safehouse) +"k" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/ruin/space/has_grav/powered/virtual_domain) +"m" = ( +/obj/item/toy/gun{ + pixel_y = 3 + }, +/obj/structure/closet/crate/wooden, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"o" = ( +/turf/template_noop, +/area/template_noop) +"q" = ( +/obj/effect/landmark/bitrunning/crate_replacer, +/turf/closed/indestructible/binary, +/area/ruin/space/has_grav/powered/virtual_domain) +"r" = ( +/mob/living/simple_animal/hostile/mimic, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"s" = ( +/mob/living/simple_animal/hostile/mimic/crate, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"t" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"v" = ( +/obj/structure/closet/crate/hydroponics, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"x" = ( +/obj/item/gun/ballistic/shotgun/lethal, +/obj/item/gun/ballistic/revolver/mateba, +/obj/structure/closet/crate/preopen, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"B" = ( +/turf/template_noop, +/area/ruin/space/has_grav/powered/virtual_domain) +"F" = ( +/obj/structure/closet/crate/internals, +/obj/item/gun/ballistic/revolver/mateba, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"G" = ( +/obj/structure/closet/crate, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"K" = ( +/obj/structure/closet/crate/eva, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"M" = ( +/obj/machinery/door/airlock/abductor, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"N" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"O" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"P" = ( +/obj/structure/closet/crate/wooden, +/obj/item/gun/ballistic/revolver/mateba, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"Q" = ( +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"R" = ( +/obj/structure/closet/crate/secure/loot, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"S" = ( +/obj/structure/closet/crate/secure/bitrunning/encrypted, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"U" = ( +/obj/effect/landmark/bitrunning/safehouse_spawn, +/turf/template_noop, +/area/virtual_domain/safehouse) +"X" = ( +/obj/item/gun/ballistic/shotgun/lethal, +/obj/structure/closet/crate/preopen, +/obj/projectile/bullet/shotgun_frag12, +/obj/projectile/bullet/shotgun_frag12, +/obj/projectile/bullet/shotgun_frag12, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"Y" = ( +/turf/closed/indestructible/binary, +/area/ruin/space/has_grav/powered/virtual_domain) + +(1,1,1) = {" +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} +(2,1,1) = {" +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} +(3,1,1) = {" +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} +(4,1,1) = {" +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} +(5,1,1) = {" +o +o +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +Y +k +o +o +o +o +o +o +o +o +"} +(6,1,1) = {" +o +o +Y +Y +r +Q +Q +Q +Q +Q +Q +Q +Q +Q +a +Y +Y +Y +o +o +o +o +o +o +o +o +"} +(7,1,1) = {" +o +o +Y +Y +Y +K +Q +a +Q +Q +Y +Q +Q +Q +Q +Q +Y +Y +o +o +o +o +o +o +o +o +"} +(8,1,1) = {" +o +o +Y +Y +Y +m +Q +Q +Q +Y +Y +Y +Q +Q +Q +Q +Y +Y +o +o +o +o +o +o +o +o +"} +(9,1,1) = {" +o +o +Y +X +Y +Y +Q +Q +Q +Q +K +Y +Q +r +Y +Q +Y +Y +o +o +o +o +o +o +o +o +"} +(10,1,1) = {" +o +o +Y +b +Q +Y +Y +Q +Q +Q +Q +Q +Q +Y +Y +Q +Q +Y +o +o +o +o +o +o +o +o +"} +(11,1,1) = {" +o +o +Y +Q +Q +Q +Q +Q +Q +Y +Q +Q +Q +Q +Q +Q +Q +Y +o +o +o +o +o +o +o +o +"} +(12,1,1) = {" +o +o +Y +a +Q +b +Q +O +Q +Y +Q +Q +S +Q +Q +Q +Q +Y +o +o +o +o +o +o +o +o +"} +(13,1,1) = {" +o +o +Y +b +Q +Y +Q +Q +Q +Q +Q +Q +Q +Q +Y +Y +Q +Y +Y +Y +Y +Y +Y +Y +Y +o +"} +(14,1,1) = {" +o +o +Y +a +a +Y +Q +Q +Q +Q +Q +Q +Q +Q +Y +Q +Q +Q +t +t +t +t +t +U +Y +Y +"} +(15,1,1) = {" +o +o +Y +Y +Y +Y +Q +G +Q +Y +Y +Y +Q +Q +Q +Q +Q +Q +t +t +t +t +t +t +B +Y +"} +(16,1,1) = {" +o +o +Y +r +Q +Q +Q +Q +Q +Y +Y +Y +a +Q +Q +Q +Q +Q +t +h +t +t +t +t +B +Y +"} +(17,1,1) = {" +o +o +Y +Q +Y +Q +Q +Q +O +Y +Y +Y +a +Q +Q +Q +Q +Q +t +t +t +t +t +t +B +Y +"} +(18,1,1) = {" +o +o +Y +Q +Y +Q +Y +Y +Y +Y +Y +Y +Q +Q +Q +Q +Q +Q +t +t +t +t +t +t +B +Y +"} +(19,1,1) = {" +o +o +Y +Q +Y +Q +Q +P +Y +Y +Q +Q +Q +Q +Y +Y +Q +Q +t +t +t +t +t +t +B +Y +"} +(20,1,1) = {" +o +o +Y +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Y +Q +Q +t +t +t +t +t +N +B +Y +"} +(21,1,1) = {" +o +o +Y +a +Q +Q +Y +Q +Q +Y +Y +Q +Q +R +Q +Q +Q +Y +Y +Y +Y +Y +Y +Y +B +Y +"} +(22,1,1) = {" +o +o +Y +Y +Q +Q +Y +Q +Q +v +Q +Q +Q +Q +Q +Q +Q +Y +o +o +o +o +o +Y +B +Y +"} +(23,1,1) = {" +o +o +o +Y +Y +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Y +o +o +o +o +o +Y +Y +Y +"} +(24,1,1) = {" +o +o +Y +Y +Y +Y +Q +Q +Q +Q +Q +Y +Q +Q +Q +Q +Q +Y +o +o +o +o +o +o +o +o +"} +(25,1,1) = {" +Y +Y +Y +a +Y +Y +Y +Y +Q +Q +Q +Y +Q +Y +Q +Q +Y +Y +o +o +o +o +o +o +o +o +"} +(26,1,1) = {" +Y +a +Q +e +Q +Y +a +Q +Q +Q +Q +Y +Q +Y +Y +a +Y +Y +o +o +o +o +o +o +o +o +"} +(27,1,1) = {" +Y +Q +Q +Q +s +M +Q +Q +Q +Q +Y +Y +Q +Y +Q +Q +Q +Y +Y +o +o +o +o +o +o +o +"} +(28,1,1) = {" +Y +Y +Q +Q +a +Y +Q +a +Q +Q +Q +F +Q +Y +s +Q +Q +a +Y +o +o +o +o +o +o +o +"} +(29,1,1) = {" +Y +Y +Q +Q +Q +Y +Y +Y +Y +Y +Y +Y +Y +Y +Q +K +Q +Q +Y +o +o +o +o +o +o +o +"} +(30,1,1) = {" +Y +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +Q +a +Q +Q +Q +K +Y +o +o +o +o +o +o +o +"} +(31,1,1) = {" +Y +a +Q +s +Y +Y +Y +s +Q +Q +Q +Q +Y +Y +x +Y +Q +Y +Y +o +o +o +o +o +o +o +"} +(32,1,1) = {" +Y +a +Y +Y +Y +o +Y +Y +Q +a +Y +Y +Y +Y +Y +Y +Y +q +o +o +o +o +o +o +o +o +"} +(33,1,1) = {" +Y +Y +Y +o +o +o +o +Y +Y +Y +Y +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} diff --git a/_maps/virtual_domains/psyker_zombies.dmm b/_maps/virtual_domains/psyker_zombies.dmm new file mode 100644 index 000000000000..339c4e15e4c6 --- /dev/null +++ b/_maps/virtual_domains/psyker_zombies.dmm @@ -0,0 +1,1215 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/indestructible/binary, +/area/ruin/space/has_grav/powered/virtual_domain) +"b" = ( +/obj/item/pizzabox/bomb/armed, +/obj/structure/rack, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"c" = ( +/obj/structure/sign/warning/directional/west, +/turf/open/chasm/lavaland, +/area/ruin/space/has_grav/powered/virtual_domain) +"h" = ( +/obj/structure/rack, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"i" = ( +/obj/structure/sign/warning/directional/east, +/turf/open/chasm/lavaland, +/area/ruin/space/has_grav/powered/virtual_domain) +"o" = ( +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/structure/rack, +/obj/item/reagent_containers/cup/glass/bottle/rootbeer{ + pixel_x = 3 + }, +/obj/item/reagent_containers/cup/glass/bottle/rootbeer{ + pixel_x = -3 + }, +/obj/item/reagent_containers/cup/glass/bottle/rootbeer{ + pixel_y = 1 + }, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"r" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/template_noop, +/area/virtual_domain/safehouse) +"t" = ( +/turf/template_noop, +/area/virtual_domain/safehouse) +"x" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/abductor, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"A" = ( +/obj/effect/spawner/random/trash/caution_sign, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"B" = ( +/obj/machinery/door/airlock/abductor, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"F" = ( +/obj/structure/mystery_box/guns, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"K" = ( +/obj/effect/baseturf_helper/virtual_domain, +/turf/closed/indestructible/binary, +/area/ruin/space/has_grav/powered/virtual_domain) +"M" = ( +/obj/effect/mob_spawn/corpse/human/zombie, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"O" = ( +/obj/effect/landmark/bitrunning/safehouse_spawn, +/turf/template_noop, +/area/virtual_domain/safehouse) +"Q" = ( +/turf/open/chasm/lavaland, +/area/ruin/space/has_grav/powered/virtual_domain) +"R" = ( +/obj/effect/mine/explosive/light, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"T" = ( +/obj/machinery/door/airlock/abductor, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"U" = ( +/obj/effect/landmark/bitrunning/cache_spawn, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"V" = ( +/obj/structure/sign/warning/directional/east, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"W" = ( +/obj/effect/mob_spawn/corpse/human/cyber_police, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"X" = ( +/mob/living/simple_animal/hostile/zombie, +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) +"Y" = ( +/turf/open/indestructible/dark, +/area/ruin/space/has_grav/powered/virtual_domain) + +(1,1,1) = {" +o +o +o +o +o +o +o +o +o +o +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +"} +(2,1,1) = {" +o +o +o +o +o +o +o +o +a +a +a +Y +Y +Y +Y +Y +Y +a +a +o +o +o +o +o +o +o +o +o +"} +(3,1,1) = {" +o +o +a +a +a +a +a +a +a +Y +Y +Y +Y +Y +Y +Y +Y +Y +a +a +K +o +o +o +o +o +o +o +"} +(4,1,1) = {" +o +o +a +W +X +Y +B +Y +Y +Y +Y +R +a +a +X +Y +Y +Y +Y +a +a +o +o +o +o +o +o +o +"} +(5,1,1) = {" +o +o +a +b +b +p +a +R +Y +Y +Y +a +a +a +a +X +Y +Y +Y +Y +a +o +o +o +o +o +o +o +"} +(6,1,1) = {" +o +o +a +a +a +a +a +Y +Y +Y +a +a +Y +Y +a +a +a +a +Y +Y +a +o +o +o +o +o +o +o +"} +(7,1,1) = {" +o +o +a +a +a +a +a +a +Y +Y +a +Y +Y +Y +a +a +a +Y +Y +Y +a +o +o +o +o +o +o +o +"} +(8,1,1) = {" +o +o +a +a +X +Y +Y +Y +Y +Y +a +Y +Y +Y +Y +Y +Y +Y +R +a +a +o +o +o +o +o +o +o +"} +(9,1,1) = {" +o +o +a +a +W +Y +Y +Y +A +Y +a +X +Y +Y +Y +Y +Y +Y +Y +a +o +o +o +o +o +o +o +o +"} +(10,1,1) = {" +o +o +a +a +Y +Q +Q +Q +Q +Y +a +a +Y +Q +Q +Q +Q +Q +Y +a +o +o +o +o +o +o +o +o +"} +(11,1,1) = {" +o +o +a +Y +Y +Q +Q +Q +Q +Y +Y +a +Y +Q +Q +Q +Q +Q +Y +a +o +o +o +o +o +o +o +o +"} +(12,1,1) = {" +o +o +a +Y +Y +Y +Y +Y +Y +Y +Y +a +Y +Y +Y +Y +A +Y +Y +a +o +o +o +o +o +o +o +o +"} +(13,1,1) = {" +o +o +a +Y +Y +Y +a +a +Y +Y +Y +a +Y +a +Y +Y +Y +Y +Y +a +o +o +o +o +o +o +o +o +"} +(14,1,1) = {" +o +o +a +Y +Y +Y +Y +a +Y +Y +a +a +Y +a +Y +Y +Y +Y +Y +a +o +o +o +o +o +o +o +o +"} +(15,1,1) = {" +o +o +a +Y +R +Y +a +a +Y +Y +a +a +Y +a +a +Y +Y +Y +X +a +o +o +o +o +o +o +o +o +"} +(16,1,1) = {" +o +o +a +Y +Y +Y +X +a +Y +Y +X +a +Y +Y +a +Y +a +a +a +a +a +a +a +a +a +a +a +o +"} +(17,1,1) = {" +o +o +a +Y +V +Y +a +a +Y +Y +Y +x +Y +Y +Y +Y +a +h +Y +Y +t +t +t +t +t +O +a +o +"} +(18,1,1) = {" +o +o +a +Y +a +Q +a +a +Y +Y +a +a +X +Y +Y +Y +a +F +Y +Y +t +t +t +t +t +t +a +o +"} +(19,1,1) = {" +o +o +a +Q +Q +Q +a +X +Y +Y +a +a +a +Y +Y +Y +a +Y +Y +Y +t +t +t +t +t +t +a +o +"} +(20,1,1) = {" +o +o +a +Q +Q +Q +a +Y +Y +Y +a +Y +Y +Y +Y +Y +T +Y +Y +Y +t +t +t +t +t +t +a +o +"} +(21,1,1) = {" +o +o +a +a +Q +Q +a +a +Y +Y +a +a +Y +R +Y +Y +a +Y +Y +Y +t +t +t +t +t +t +a +o +"} +(22,1,1) = {" +o +o +a +a +Q +a +a +a +Y +Y +a +a +Y +Y +Y +Y +a +F +Y +Y +t +t +t +t +t +t +a +o +"} +(23,1,1) = {" +o +o +a +a +Q +a +a +a +Y +Y +a +a +a +a +Y +Y +a +h +Y +Y +t +t +t +t +t +r +a +o +"} +(24,1,1) = {" +o +o +a +a +Q +a +a +a +Y +Y +a +a +a +a +a +Y +a +a +a +a +a +a +a +a +a +a +a +o +"} +(25,1,1) = {" +o +o +a +c +Q +a +a +a +T +a +a +a +a +a +a +Y +Y +R +a +a +o +o +o +o +o +o +o +o +"} +(26,1,1) = {" +o +o +a +Q +Q +a +a +W +Y +W +a +a +a +Y +Y +Y +Y +Y +a +o +o +o +o +o +o +o +o +o +"} +(27,1,1) = {" +o +o +a +Y +Y +T +Y +Y +Y +a +a +a +Y +Y +R +Y +Y +a +a +o +o +o +o +o +o +o +o +o +"} +(28,1,1) = {" +o +o +a +Y +X +a +U +X +X +a +X +a +Y +Y +Y +Y +R +a +o +o +o +o +o +o +o +o +o +o +"} +(29,1,1) = {" +o +o +a +Y +a +a +a +a +a +a +Y +Y +Y +Y +a +a +a +a +o +o +o +o +o +o +o +o +o +o +"} +(30,1,1) = {" +o +o +a +Y +Y +R +a +a +R +Y +Y +Y +Y +Y +Y +Y +X +a +o +o +o +o +o +o +o +o +o +o +"} +(31,1,1) = {" +o +o +a +Y +Y +Y +a +Y +Y +Y +a +a +Y +Y +Y +M +a +a +o +o +o +o +o +o +o +o +o +o +"} +(32,1,1) = {" +o +o +a +Y +Y +Y +a +Y +R +a +a +a +a +Y +Y +Y +a +a +a +a +a +o +o +o +o +o +o +o +"} +(33,1,1) = {" +o +o +a +a +R +Y +a +Y +a +a +Y +Y +R +Y +Y +Y +Y +Y +Q +Q +a +o +o +o +o +o +o +o +"} +(34,1,1) = {" +o +o +o +a +Y +Y +Y +Y +Y +Y +Y +a +a +a +Y +M +Y +W +i +Q +a +o +o +o +o +o +o +o +"} +(35,1,1) = {" +o +o +o +a +Y +Y +Y +Y +X +a +a +a +a +a +a +a +a +a +a +a +a +o +o +o +o +o +o +o +"} +(36,1,1) = {" +o +o +o +a +a +a +a +a +a +a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} +(37,1,1) = {" +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +"} diff --git a/_maps/virtual_domains/stairs_and_cliffs.dmm b/_maps/virtual_domains/stairs_and_cliffs.dmm index 82e15fcc0909..8534a513098b 100644 --- a/_maps/virtual_domains/stairs_and_cliffs.dmm +++ b/_maps/virtual_domains/stairs_and_cliffs.dmm @@ -34,15 +34,6 @@ /obj/structure/railing/corner, /turf/open/cliff/snowrock/virtual_domain, /area/icemoon/underground/explored/virtual_domain) -"hc" = ( -/obj/structure/railing/corner/end{ - dir = 8 - }, -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/turf/open/misc/asteroid/snow, -/area/icemoon/underground/explored/virtual_domain) "hE" = ( /turf/open/floor/wood, /area/icemoon/underground/explored/virtual_domain) @@ -155,15 +146,6 @@ /obj/effect/decal/remains/plasma, /turf/open/misc/asteroid/snow, /area/icemoon/underground/explored/virtual_domain) -"Dz" = ( -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/turf/open/misc/asteroid/snow, -/area/icemoon/underground/explored/virtual_domain) "DB" = ( /obj/structure/flora/rock/icy/style_random, /obj/structure/flora/rock/pile/icy/style_random, @@ -213,15 +195,6 @@ /obj/structure/flora/grass/green/style_random, /turf/open/misc/asteroid/snow, /area/icemoon/underground/explored/virtual_domain) -"MP" = ( -/obj/structure/railing/corner/end/flip{ - dir = 4 - }, -/obj/structure/railing/corner/end{ - dir = 4 - }, -/turf/open/misc/asteroid/snow, -/area/icemoon/underground/explored/virtual_domain) "MT" = ( /obj/structure/railing/corner{ dir = 8 @@ -231,15 +204,6 @@ "Nv" = ( /turf/open/floor/iron/stairs, /area/icemoon/underground/explored/virtual_domain) -"NM" = ( -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/obj/structure/railing/corner/end{ - dir = 8 - }, -/turf/open/misc/asteroid/snow, -/area/icemoon/underground/explored/virtual_domain) "Pl" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 4 @@ -2465,7 +2429,7 @@ sM sM sM sM -MP +dR sM sM sM @@ -2773,7 +2737,7 @@ dR sM sM sM -NM +dR sM sM sM @@ -4303,7 +4267,7 @@ sM sM sM sw -Dz +dR sM sM sM @@ -4688,7 +4652,7 @@ sM sM sM dR -hc +dR sM sM sM diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm index 770f0967404c..ea3cebaedd1e 100644 --- a/_maps/virtual_domains/syndicate_assault.dmm +++ b/_maps/virtual_domains/syndicate_assault.dmm @@ -131,8 +131,13 @@ /area/ruin/space/has_grav/powered/virtual_domain) "cZ" = ( /obj/structure/table/reinforced, -/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, -/obj/item/ammo_box/magazine/m7mm, +/obj/item/gun/ballistic/automatic/l6_saw/unrestricted{ + pixel_y = 10 + }, +/obj/item/ammo_box/magazine/mm712x82{ + pixel_y = -4; + pixel_x = 3 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/virtual_domain) "da" = ( @@ -481,8 +486,10 @@ /turf/closed/wall/r_wall/syndicate, /area/ruin/space/has_grav/powered/virtual_domain) "rH" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/syndicate_access, +/obj/machinery/airalarm/syndicate{ + dir = 1; + pixel_y = 20 + }, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/virtual_domain) "rM" = ( diff --git a/_maps/virtual_domains/vaporwave.dmm b/_maps/virtual_domains/vaporwave.dmm index 984bbbe29148..495ca28d9782 100644 --- a/_maps/virtual_domains/vaporwave.dmm +++ b/_maps/virtual_domains/vaporwave.dmm @@ -83,7 +83,9 @@ }, /area/ruin/space/has_grav/powered/virtual_domain) "ll" = ( -/obj/structure/sign/poster/contraband/clown/directional/north, +/obj/structure/sign/poster/contraband/clown{ + pixel_y = 34 + }, /turf/open/floor/iron/vaporwave, /area/ruin/space/has_grav/powered/virtual_domain) "lu" = ( @@ -168,7 +170,7 @@ }, /area/ruin/space/has_grav/powered/virtual_domain) "HA" = ( -/turf/open/floor/holofloor/beach/coast, +/turf/open/floor/holofloor/beach/coast_t, /area/ruin/space/has_grav/powered/virtual_domain) "HV" = ( /obj/structure/chair/comfy/black{ diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 34a165ccf6db..3e7154b8e1fa 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -80,24 +80,25 @@ #define SKINTONES 12 #define ANIME 13 #define MUTCOLORS_SECONDARY 14 +#define SPECIES_FUR 15 /// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting -#define DYNCOLORS 15 -#define AGENDER 16 +#define DYNCOLORS 16 +#define AGENDER 17 /// Do not draw eyes or eyeless overlay -#define NOEYESPRITES 17 +#define NOEYESPRITES 18 ///If we have a limb-specific overlay sprite -#define HAS_MARKINGS 18 +#define HAS_MARKINGS 19 /// Do not draw blood overlay -#define NOBLOODOVERLAY 19 +#define NOBLOODOVERLAY 20 ///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png -#define NOAUGMENTS 20 +#define NOAUGMENTS 21 ///will be assigned a universal vampire themed last name shared by their department. this is preferenced! -#define BLOOD_CLANS 21 +#define BLOOD_CLANS 22 -#define REVIVESBYHEALING 22 -#define NOHUSK 23 -#define NOMOUTH 24 +#define REVIVESBYHEALING 23 +#define NOHUSK 24 +#define NOMOUTH 25 //organ slots #define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator" diff --git a/code/__DEFINES/computers.dm b/code/__DEFINES/computers.dm index ba3294ae6833..86bd44d30201 100644 --- a/code/__DEFINES/computers.dm +++ b/code/__DEFINES/computers.dm @@ -11,3 +11,5 @@ #define CATEGORY_BEPIS "Bepis Tech" #define CATEGORY_BITRUNNING_FLAIR "Misc" #define CATEGORY_BITRUNNING_TECH "Tech" +#define CATEGORY_BITRUNNING_COMBAT_GEAR "Combat gear" // monkeystation addition: bitrunning tech split up +#define CATEGORY_BITRUNNING_ABILITIES "Abilities" // monkeystation addition: bitrunning tech split up diff --git a/code/__DEFINES/dcs/signals/signals_bitrunning.dm b/code/__DEFINES/dcs/signals/signals_bitrunning.dm index 3d008449ee7b..957e61ae303c 100644 --- a/code/__DEFINES/dcs/signals/signals_bitrunning.dm +++ b/code/__DEFINES/dcs/signals/signals_bitrunning.dm @@ -29,3 +29,6 @@ /// from /obj/machinery/quantum_server/refreshParts(): (servo rating) #define COMSIG_BITRUNNER_SERVER_UPGRADED "bitrunner_server_upgraded" + +/// from /obj/machinery/quantum_server/scrub_vdom() +#define COMSIG_BITRUNNER_DOMAIN_SCRUBBED "bitrunner_domain_scrubbed" diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index e6664ffe6f06..5a1bdb0c2b71 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -70,6 +70,9 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Yes I know this is a stupid flag, no you can't take him from me #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<20) +/// Used for items that cannot be used directly to harm people with, ex. loafs +#define CANNOT_ATTACK_WITH (1<<21) + // Update flags for [/atom/proc/update_appearance] /// Update the atom's name #define UPDATE_NAME (1<<0) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index f7d18b3fe158..39d8be41b99a 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -80,6 +80,14 @@ #define JOB_LAWYER "Lawyer" #define JOB_CHAPLAIN "Chaplain" #define JOB_PSYCHOLOGIST "Psychologist" +//Spooktober +#define JOB_SPOOKTOBER_GHOST "Ghost" +#define JOB_SPOOKTOBER_GODZILLA "Discount Godzilla" +#define JOB_SPOOKTOBER_WIZARD "Diet Wizard" +#define JOB_SPOOKTOBER_YELLOWCLOWN "Yellow Clown" +#define JOB_SPOOKTOBER_SKELETON "Skeleton" +#define JOB_SPOOKTOBER_CANDYSALESMAN "Candy Salesman" +#define JOB_SPOOKTOBER_GORILLA "Gorilla" //ERTs #define JOB_ERT_DEATHSQUAD "Death Commando" #define JOB_ERT_COMMANDER "Emergency Response Team Commander" @@ -164,6 +172,8 @@ #define DEPARTMENT_ASSISTANT "Assistant" #define DEPARTMENT_BITFLAG_CAPTAIN (1<<9) #define DEPARTMENT_CAPTAIN "Captain" +#define DEPARTMENT_BITFLAG_SPOOKTOBER (1<<10) +#define DEPARTMENT_SPOOKTOBER "Spooktober" /* Job datum job_flags */ /// Whether the mob is announced on arrival. @@ -184,6 +194,8 @@ #define JOB_ASSIGN_QUIRKS (1<<7) /// Whether this job can be an intern. #define JOB_CAN_BE_INTERN (1<<8) +/// Whether this job is enabled/disabled by the spooktober config +#define JOB_SPOOKTOBER (1<<9) #define FACTION_NONE "None" #define FACTION_STATION "Station" diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 582584a2ab5b..7ef7a0f10c38 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -733,6 +733,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///Trait for the gamer quirk. #define TRAIT_GAMER "gamer" +/// Trait for the Extra-Sensory Paranoia quirk +#define TRAIT_PARANOIA "paranoia" + ///Trait for dryable items #define TRAIT_DRYABLE "trait_dryable" ///Trait for dried items diff --git a/code/__DEFINES/~monkestation/antagonists.dm b/code/__DEFINES/~monkestation/antagonists.dm index 546c343bfcf2..a54245a1447d 100644 --- a/code/__DEFINES/~monkestation/antagonists.dm +++ b/code/__DEFINES/~monkestation/antagonists.dm @@ -1,3 +1,14 @@ +/// List of areas blacklisted from area based traitor objectives +#define TRAITOR_OBJECTIVE_BLACKLISTED_AREAS list(/area/station/engineering/hallway, \ + /area/station/engineering/lobby, \ + /area/station/engineering/storage, \ + /area/station/science/lobby, \ + /area/station/science/ordnance/bomb, \ + /area/station/science/ordnance/freezerchamber, \ + /area/station/science/ordnance/burnchamber, \ + /area/station/security/prison, \ + ) + // Clock cultist #define IS_CLOCK(mob) ((FACTION_CLOCK in mob.faction) || mob?.mind?.has_antag_datum(/datum/antagonist/clock_cultist)) /// maximum amount of cogscarabs the clock cult can have diff --git a/code/__DEFINES/~monkestation/dcs/signals/signals_traitor.dm b/code/__DEFINES/~monkestation/dcs/signals/signals_traitor.dm new file mode 100644 index 000000000000..dc3ae8cda176 --- /dev/null +++ b/code/__DEFINES/~monkestation/dcs/signals/signals_traitor.dm @@ -0,0 +1,4 @@ +/// Sent when a bug activates +#define COMSIG_TRAITOR_BUG_ACTIVATED "traitor_bug_activated" +/// Sent when a T1de bug activates +#define COMSIG_GLOBAL_GREY_TIDE_TRAITOR "grey_tide_traitor" diff --git a/code/__DEFINES/~monkestation/storytellers.dm b/code/__DEFINES/~monkestation/storytellers.dm new file mode 100644 index 000000000000..a706f3804d87 --- /dev/null +++ b/code/__DEFINES/~monkestation/storytellers.dm @@ -0,0 +1,95 @@ + +//Could be bitflags, but that would require a good amount of translations, which eh, either way works for me +/// When the event is combat oriented (spawning monsters, inherently hostile antags) +#define TAG_COMBAT "combat" +/// When the event is spooky (broken lights, some antags) +#define TAG_SPOOKY "spooky" +/// When the event is destructive in a decent capacity (meteors, blob) +#define TAG_DESTRUCTIVE "destructive" +/// When the event impacts most of the crewmembers in some capacity (comms blackout) +#define TAG_COMMUNAL "communal" +/// When the event targets a person for something (appendix, heart attack) +#define TAG_TARGETED "targeted" +/// When the event is positive and helps the crew, in some capacity (Shuttle Loan, Supply Pod) +#define TAG_POSITIVE "positive" +/// When one of the crewmembers becomes an antagonist +#define TAG_CREW_ANTAG "crew_antag" +/// When the antagonist event is focused around team cooperation. +#define TAG_TEAM_ANTAG "team_antag" +/// When one of the non-crewmember players becomes an antagonist +#define TAG_OUTSIDER_ANTAG "away_antag" +/// When the event impacts the overmap +#define TAG_OVERMAP "overmap" +/// When the event requires the station to be in space (meteors, carp) +#define TAG_SPACE "space" +/// When the event requires the station to be on planetary. +#define TAG_PLANETARY "planetary" + +#define EVENT_TRACK_MUNDANE "Mundane" +#define EVENT_TRACK_MODERATE "Moderate" +#define EVENT_TRACK_MAJOR "Major" +#define EVENT_TRACK_ROLESET "Roleset" +#define EVENT_TRACK_OBJECTIVES "Objectives" + +#define ALL_EVENTS "All" +#define UNCATEGORIZED_EVENTS "Uncategorized" + +#define STORYTELLER_WAIT_TIME 5 SECONDS + +#define EVENT_POINT_GAINED_PER_SECOND 0.08 + +#define TRACK_FAIL_POINT_PENALTY_MULTIPLIER 0.75 + +#define GAMEMODE_PANEL_MAIN "Main" +#define GAMEMODE_PANEL_VARIABLES "Variables" + +#define MUNDANE_POINT_THRESHOLD 40 +#define MODERATE_POINT_THRESHOLD 70 +#define MAJOR_POINT_THRESHOLD 130 +#define ROLESET_POINT_THRESHOLD 150 +#define OBJECTIVES_POINT_THRESHOLD 170 + +#define MUNDANE_MIN_POP 4 +#define MODERATE_MIN_POP 6 +#define MAJOR_MIN_POP 20 +#define ROLESET_MIN_POP 25 +#define OBJECTIVES_MIN_POP 20 + +/// Defines for how much pop do we need to stop applying a pop scalling penalty to event frequency. +#define MUNDANE_POP_SCALE_THRESHOLD 25 +#define MODERATE_POP_SCALE_THRESHOLD 32 +#define MAJOR_POP_SCALE_THRESHOLD 45 +#define ROLESET_POP_SCALE_THRESHOLD 45 +#define OBJECTIVES_POP_SCALE_THRESHOLD 45 + +/// The maximum penalty coming from pop scalling, when we're at the most minimum point, easing into 0 as we reach the SCALE_THRESHOLD. This is treated as a percentage. +#define MUNDANE_POP_SCALE_PENALTY 35 +#define MODERATE_POP_SCALE_PENALTY 35 +#define MAJOR_POP_SCALE_PENALTY 35 +#define ROLESET_POP_SCALE_PENALTY 35 +#define OBJECTIVES_POP_SCALE_PENALTY 35 + +#define STORYTELLER_VOTE "storyteller" + +#define EVENT_TRACKS list(EVENT_TRACK_MUNDANE, EVENT_TRACK_MODERATE, EVENT_TRACK_MAJOR, EVENT_TRACK_ROLESET, EVENT_TRACK_OBJECTIVES) +#define EVENT_PANEL_TRACKS list(EVENT_TRACK_MUNDANE, EVENT_TRACK_MODERATE, EVENT_TRACK_MAJOR, EVENT_TRACK_ROLESET, EVENT_TRACK_OBJECTIVES, UNCATEGORIZED_EVENTS, ALL_EVENTS) + +/// Defines for the antag cap to prevent midround injections. +#define ANTAG_CAP_FLAT 2 +#define ANTAG_CAP_DENOMINATOR 9 + +///Below are defines for roundstart point pool. The GAIN ones are multiplied by ready population +#define ROUNDSTART_MUNDANE_BASE 20 +#define ROUNDSTART_MUNDANE_GAIN 0.5 + +#define ROUNDSTART_MODERATE_BASE 35 +#define ROUNDSTART_MODERATE_GAIN 1.2 + +#define ROUNDSTART_MAJOR_BASE 40 +#define ROUNDSTART_MAJOR_GAIN 2 + +#define ROUNDSTART_ROLESET_BASE 60 +#define ROUNDSTART_ROLESET_GAIN 4 + +#define ROUNDSTART_OBJECTIVES_BASE 40 +#define ROUNDSTART_OBJECTIVES_GAIN 2 diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index eed6ad7d1d12..8aa52fd5e81c 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -236,6 +236,8 @@ GLOBAL_LIST_INIT(round_end_images, world.file2list("data/image_urls.txt")) //Set news report and mode result mode.set_round_result() + SSgamemode.round_end_report() + SSgamemode.store_roundend_data() // store data on roundend for next round to_chat(world, span_infoplain(span_big(span_bold("


The round has ended.")))) log_game("The round has ended.") diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 465918bc4245..1686c6a2ca05 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -327,6 +327,8 @@ /datum/config_entry/string/overflow_job default = JOB_ASSISTANT +/datum/config_entry/flag/spooktober_enabled + /datum/config_entry/flag/grey_assistants /datum/config_entry/number/lavaland_budget diff --git a/code/controllers/master.dm b/code/controllers/master.dm index a7013f058ed6..f44a5f5161e9 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -282,6 +282,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations)) world.sleep_offline = FALSE initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10 + /// run votes + SSvote.initiate_vote(/datum/vote/storyteller, "pick round storyteller", forced = TRUE) // idk where else to run this lol /** * Initialize a given subsystem and handle the results. diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index 921cedc912fe..fc40b44676c8 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -66,6 +66,8 @@ SUBSYSTEM_DEF(economy) /// Tracks a temporary sum of all money in the system /// We need this on the subsystem because of yielding and such var/temporary_total = 0 + ///the mail crate we last generated + var/obj/structure/closet/crate/mail/economy/mail_crate /datum/controller/subsystem/economy/Initialize() //removes cargo from the split diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index e139ea091196..93aeb1504c03 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -134,6 +134,8 @@ SUBSYSTEM_DEF(job) if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new log_job_debug("Removed [job.title] due to map config") continue + if(!CONFIG_GET(flag/spooktober_enabled) && job.job_flags & JOB_SPOOKTOBER) //if spooktober's not enabled, don't load spooktober jobs + continue new_all_occupations += job name_occupations[job.title] = job type_occupations[job_type] = job diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index 21cd66c11a72..0b5626d68977 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -76,6 +76,9 @@ PROCESSING_SUBSYSTEM_DEF(station) for(var/iterator in 1 to amount) var/datum/station_trait/trait_type = pick_weight(selectable_traits_by_types[trait_sign]) //Rolls from the table for the specific trait type selectable_traits_by_types[trait_sign] -= trait_type + if(istype(trait_type, /datum/station_trait/late_arrivals) && SSmapping.config.map_name == "Oshan Station") + amount++ + continue setup_trait(trait_type) ///Creates a given trait of a specific type, while also removing any blacklisted ones from the future pool. diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 13df2be77ba9..517c26798a60 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -26,6 +26,7 @@ SUBSYSTEM_DEF(statpanels) global_data = list( "Map: [SSmapping.config?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, + "Storyteller: [SSgamemode.storyteller ? SSgamemode.storyteller.name : "N/A"]", //monkestation addition "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]", "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]", "Round Time: [ROUND_TIME()]", diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index d99019e61a57..83cc88c4063c 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -219,7 +219,7 @@ SUBSYSTEM_DEF(throwing) if (callback) callback.Invoke() - if(!thrownthing.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case. + if(!thrownthing?.currently_z_moving) // I don't think you can zfall while thrown but hey, just in case. var/turf/T = get_turf(thrownthing) T?.zFall(thrownthing) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index aed9754a2a46..c94405a1afa3 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -225,10 +225,14 @@ SUBSYSTEM_DEF(ticker) var/init_start = world.timeofday mode = new /datum/game_mode/dynamic - + SSgamemode.init_storyteller() //monkestation addition CHECK_TICK //Configure mode and assign player to special mode stuff var/can_continue = 0 + //monkestation addition start + can_continue = SSgamemode.pre_setup() + CHECK_TICK + //monkestation addition end can_continue = src.mode.pre_setup() //Choose antagonists CHECK_TICK can_continue = can_continue && SSjob.DivideOccupations() //Distribute jobs @@ -295,6 +299,8 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/PostSetup() set waitfor = FALSE + SSgamemode.storyteller.process(STORYTELLER_WAIT_TIME * 0.1) // we want this asap + SSgamemode.storyteller.round_started = TRUE mode.post_setup() GLOB.start_state = new /datum/station_state() GLOB.start_state.count() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 0513c666b774..787748405aaa 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -285,12 +285,16 @@ SUBSYSTEM_DEF(vote) "message" = vote.message, ) + if(vote.has_desc) + vote_data += list("desc" = vote.return_desc(vote_name)) + if(vote == current_vote) var/list/choices = list() for(var/key in current_vote.choices) choices += list(list( "name" = key, "votes" = current_vote.choices[key], + "desc" = current_vote.return_desc(key) )) data["currentVote"] = list( diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 221d4945c0e2..07d5763c6654 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -42,6 +42,9 @@ Behavior that's still missing from this component that original food items had t var/list/tastes ///The buffs these foods give when eaten var/food_buffs + ///how many bites we can get + var/total_bites = 0 + var/current_mask /datum/component/edible/Initialize( list/initial_reagents, @@ -74,6 +77,7 @@ Behavior that's still missing from this component that original food items had t src.tastes = string_assoc_list(tastes) src.check_liked = check_liked + setup_initial_reagents(initial_reagents) /datum/component/edible/RegisterWithParent() @@ -214,6 +218,8 @@ Behavior that's still missing from this component that original food items had t else owner.reagents.add_reagent(rid, amount) + total_bites = round(owner.reagents.total_volume / bite_consumption) + /datum/component/edible/proc/examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER @@ -310,7 +316,12 @@ Behavior that's still missing from this component that original food items had t var/atom/owner = parent - if((feeder.istate & ISTATE_HARM)) + var/obj/item/food/foodstuff + + if(istype(owner, /obj/item/food)) + foodstuff = owner + + if((feeder.istate & ISTATE_HARM) && !(foodstuff?.force_feed_on_aggression)) //monkestation edit - add loafing return . = COMPONENT_CANCEL_ATTACK_CHAIN //Point of no return I suppose @@ -438,6 +449,14 @@ Behavior that's still missing from this component that original food items had t var/fraction = min(bite_consumption / owner.reagents.total_volume, 1) owner.reagents.trans_to(eater, bite_consumption, transfered_by = feeder, methods = INGEST) bitecount++ + var/desired_mask = (total_bites / bitecount) + desired_mask = round(desired_mask) + desired_mask = max(1,desired_mask) + desired_mask = min(desired_mask, 4) + + if(desired_mask != current_mask) + current_mask = desired_mask + parent.add_filter("bite", 0, alpha_mask_filter(icon=icon('goon/icons/obj/food.dmi', "eating[desired_mask]"))) checkLiked(fraction, eater) if(!owner.reagents.total_volume) On_Consume(eater, feeder) @@ -565,6 +584,15 @@ Behavior that's still missing from this component that original food items had t if(bitecount == 0 || prob(50)) L.manual_emote("nibbles away at \the [parent].") bitecount++ + var/desired_mask = (total_bites / bitecount) + desired_mask = round(desired_mask) + desired_mask = max(1,desired_mask) + desired_mask = min(desired_mask, 4) + + if(desired_mask != current_mask) + current_mask = desired_mask + src.add_filter("bite", 0, alpha_mask_filter(icon=icon('goon/icons/obj/food.dmi', "eating[desired_mask]"))) + . = COMPONENT_CANCEL_ATTACK_CHAIN L.taste(owner.reagents) // why should carbons get all the fun? if(bitecount >= 5) diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm index 1a742c686785..40ec88529b19 100644 --- a/code/datums/components/manual_blinking.dm +++ b/code/datums/components/manual_blinking.dm @@ -8,7 +8,7 @@ var/check_every = 20 SECONDS var/grace_period = 6 SECONDS var/damage_rate = 1 // organ damage taken per tick - var/list/valid_emotes = list(/datum/emote/living/carbon/blink, /datum/emote/living/carbon/blink_r) + var/list/valid_emotes = list(/datum/emote/living/carbon/blink, /datum/emote/living/carbon/blink/blink_r) /datum/component/manual_blinking/Initialize() if(!iscarbon(parent)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 7457d488f115..9f7d6effc033 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -456,10 +456,6 @@ if(!current_turf) return FALSE - // Syndicate base is loaded in a reserved level. If not reserved, we don't care. - if(!is_reserved_level(current_turf.z)) - return FALSE - var/static/list/syndie_typecache = typecacheof(list( /area/centcom/syndicate_mothership, // syndicate base itself /area/shuttle/assault_pod, // steel rain diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index c8c1b2d45064..022de70d54a6 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -135,7 +135,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) var/waittime_h = 1800 /// Maximum amount of threat allowed to generate. - var/max_threat_level = 50 + var/max_threat_level = 0 //disables dynamic threat PLEASE DONT LET ME MERGE THIS /// The extra chance multiplier that a heavy impact midround ruleset will run next time. /// For example, if this is set to 50, then the next heavy roll will be about 50% more likely to happen. diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 5ab88b19956c..38b7062217af 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -370,7 +370,6 @@ cost = 7 minimum_round_time = 70 MINUTES requirements = REQUIREMENTS_VERY_HIGH_THREAT_NEEDED - ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_NUKIEBASE) flags = HIGH_IMPACT_RULESET var/list/operative_cap = list(2,2,3,3,4,5,5,5,5,5) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index b0404e7250a4..d016b0429037 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -450,7 +450,6 @@ requirements = list(90,90,90,80,60,40,30,20,10,10) flags = HIGH_IMPACT_RULESET antag_cap = list("denominator" = 18, "offset" = 1) - ruleset_lazy_templates = list(LAZY_TEMPLATE_KEY_NUKIEBASE) var/required_role = ROLE_NUCLEAR_OPERATIVE var/datum/team/nuclear/nuke_team diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 8a18bd039761..af686c27d624 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -9,6 +9,7 @@ /obj/machinery/door/airlock/Initialize(mapload) . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_GREY_TIDE, PROC_REF(grey_tide)) + RegisterSignal(SSdcs, COMSIG_GLOBAL_GREY_TIDE_TRAITOR, PROC_REF(grey_tide)) //monkestation edit /// Forces the airlock to unbolt and open /obj/machinery/door/airlock/proc/secure_open() @@ -35,7 +36,7 @@ locked = FALSE return ..() -/obj/machinery/door/airlock/proc/grey_tide(datum/source, list/grey_tide_areas) +/obj/machinery/door/airlock/proc/grey_tide(datum/source, list/grey_tide_areas, traitor_bug = FALSE) //monkestation edit: adds traitor_bug SIGNAL_HANDLER if(!is_station_level(z) || critical_machine) @@ -44,7 +45,12 @@ for(var/area_type in grey_tide_areas) if(!istype(get_area(src), area_type)) continue - INVOKE_ASYNC(src, PROC_REF(prison_open)) //Sleep gets called further down in open(), so we have to invoke async +//monkestation edit start + if(traitor_bug) + INVOKE_ASYNC(src, PROC_REF(traitor_bug_tide)) + else +//monkestation edit end + INVOKE_ASYNC(src, PROC_REF(prison_open)) //Sleep gets called further down in open(), so we have to invoke async /obj/machinery/airlock_sensor icon = 'icons/obj/airlock_machines.dmi' diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index a05659e0e18d..16f95ad06119 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -600,8 +600,3 @@ name = "Medical Order" greyscale_colors = CIRCUIT_COLOR_SUPPLY build_path = /obj/machinery/computer/department_orders/medical - -/obj/item/circuitboard/computer/quantum_console - name = "Quantum Server Console" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/computer/quantum_console diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 32c33148e534..46fa94eff8c3 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -1482,22 +1482,3 @@ greyscale_colors = CIRCUIT_COLOR_SCIENCE build_path = /obj/machinery/navbeacon req_components = list() - -/obj/item/circuitboard/machine/quantum_server - name = "Quantum Server" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/quantum_server - req_components = list( - /datum/stock_part/manipulator = 2, - /datum/stock_part/scanning_module = 1, - /datum/stock_part/capacitor = 1, - ) - -/obj/item/circuitboard/machine/netpod - name = "Netpod" - greyscale_colors = CIRCUIT_COLOR_SUPPLY - build_path = /obj/machinery/netpod - req_components = list( - /datum/stock_part/manipulator = 1, - /datum/stock_part/matter_bin = 2, - ) diff --git a/code/game/objects/items/food/_food.dm b/code/game/objects/items/food/_food.dm index a790cb65f4c4..b18f0b09f9fc 100644 --- a/code/game/objects/items/food/_food.dm +++ b/code/game/objects/items/food/_food.dm @@ -46,7 +46,8 @@ var/decomp_req_handle = FALSE ///Used to set custom decomposition times for food. Set to 0 to have it automatically set via the food's flags. var/decomposition_time = 0 - + ///If we want to still force feed food even on combat mode or harm intent - monkestation edit + var/force_feed_on_aggression = FALSE ///The food buffs the food has var/food_buffs = STATUS_EFFECT_FOOD_STAM_MEDIUM diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 9ee9f0e14738..3adb22909582 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -26,6 +26,7 @@ new /obj/item/clothing/under/syndicate(src) new /obj/item/clothing/under/syndicate/skirt(src) new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/mod/module/plasma_stabilizer(src) /obj/structure/closet/syndicate/nuclear desc = "It's a storage unit for a Syndicate boarding party." diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 86ca881ef3bc..c01ab9e5b21d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -118,6 +118,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list( /client/proc/drop_dynex_bomb, /client/proc/flip_ghost_spawn, /client/proc/forceEvent, + /client/proc/forceGamemode, /client/proc/generate_bulk_code, //monkestation addition /client/proc/generate_code, //monkestation addition /client/proc/mass_add_metacoins, //monkestation addition diff --git a/code/modules/admin/force_event.dm b/code/modules/admin/force_event.dm index 1c97936ac48d..e519d2f4ed8a 100644 --- a/code/modules/admin/force_event.dm +++ b/code/modules/admin/force_event.dm @@ -1,4 +1,5 @@ ///Allows an admin to force an event +/* /client/proc/forceEvent() set name = "Trigger Event" set category = "Admin.Events" @@ -15,7 +16,7 @@ var/datum/force_event/ui = new(usr) ui.ui_interact(usr) - +*/ /// Force Event Panel /datum/force_event diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index cc21cc3ebe45..b3600978a9a6 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -70,6 +70,7 @@ if(!check_rights(R_ADMIN)) return SSticker.mode.admin_panel() + SSgamemode.admin_panel(usr) //monkestation addition else if(href_list["call_shuttle"]) if(!check_rights(R_ADMIN)) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index d3e72238879b..ec147cb9fb9e 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -104,7 +104,9 @@ var/special_role_name = ROLE_NUCLEAR_OPERATIVE /// The applied outfit var/datum/outfit/syndicate/outfit = /datum/outfit/syndicate/reinforcement - /// The antag datam applied + /// The outfit given to plasmaman operatives + var/datum/outfit/syndicate/plasma_outfit = /datum/outfit/syndicate/reinforcement/plasmaman + /// The antag datum applied var/datum/antagonist/nukeop/antag_datum = /datum/antagonist/nukeop /// Style used by the droppod var/pod_style = STYLE_SYNDICATE @@ -144,11 +146,11 @@ else to_chat(user, span_warning("Unable to connect to Syndicate command. Please wait and try again later or use the beacon on your uplink to get your points refunded.")) -/obj/item/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T, kind, datum/mind/user) +/obj/item/antag_spawner/nuke_ops/spawn_antag(client/our_client, turf/T, kind, datum/mind/user) var/mob/living/carbon/human/nukie = new() var/obj/structure/closet/supplypod/pod = setup_pod() - C.prefs.safe_transfer_prefs_to(nukie, is_antag = TRUE) - nukie.ckey = C.key + our_client.prefs.safe_transfer_prefs_to(nukie, is_antag = TRUE) + nukie.ckey = our_client.key var/datum/mind/op_mind = nukie.mind if(length(GLOB.newplayer_start)) // needed as hud code doesn't render huds if the atom (in this case the nukie) is in nullspace, so just move the nukie somewhere safe nukie.forceMove(pick(GLOB.newplayer_start)) @@ -157,6 +159,7 @@ antag_datum = new() antag_datum.send_to_spawnpoint = FALSE + antag_datum.nukeop_outfit = use_subtypes ? pick(subtypesof(outfit)) : outfit var/datum/antagonist/nukeop/creator_op = user.has_antag_datum(/datum/antagonist/nukeop, TRUE) diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 2b21764e0835..c2809d680cc6 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -8,9 +8,13 @@ show_to_ghosts = TRUE hijack_speed = 2 //If you can't take out the station, take the shuttle instead. suicide_cry = "FOR THE SYNDICATE!!" + /// Which nukie team are we on? var/datum/team/nuclear/nuke_team - var/always_new_team = FALSE //If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team. - var/send_to_spawnpoint = TRUE //Should the user be moved to default spawnpoint. + /// If not assigned a team by default ops will try to join existing ones, set this to TRUE to always create new team. + var/always_new_team = FALSE + /// Should the user be moved to default spawnpoint after being granted this datum. + var/send_to_spawnpoint = TRUE + /// The DEFAULT outfit we will give to players granted this datum var/nukeop_outfit = /datum/outfit/syndicate preview_outfit = /datum/outfit/nuclear_operative_elite @@ -34,9 +38,12 @@ if(!nukeop_outfit) // this variable is null in instances where an antagonist datum is granted via enslaving the mind (/datum/mind/proc/enslave_mind_to_creator), like in golems. return - operative.set_species(/datum/species/human) //Plasmamen burn up otherwise, and besides, all other species are vulnerable to asimov AIs. Let's standardize all operatives being human. + // If our nuke_ops_species pref is set to TRUE, (or we have no client) make us a human + if(isnull(operative.client) || operative.client.prefs.read_preference(/datum/preference/toggle/nuke_ops_species)) + operative.set_species(/datum/species/human) + + operative.equip_species_outfit(nukeop_outfit) - operative.equipOutfit(nukeop_outfit) return TRUE /datum/antagonist/nukeop/greet() @@ -119,8 +126,6 @@ /// Actually moves our nukie to where they should be /datum/antagonist/nukeop/proc/move_to_spawnpoint() - // Ensure that the nukiebase is loaded, and wait for it if required - SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_NUKIEBASE) var/turf/destination = get_spawnpoint() owner.current.forceMove(destination) if(!owner.current.onSyndieBase()) @@ -233,7 +238,9 @@ name = "Nuclear Operative Leader" nukeop_outfit = /datum/outfit/syndicate/leader always_new_team = TRUE + /// Randomly chosen honorific, for distinction var/title + /// The nuclear challenge remote we will spawn this player with. var/challengeitem = /obj/item/nuclear_challenge /datum/antagonist/nukeop/leader/memorize_code() @@ -521,13 +528,6 @@ /// Returns whether or not syndicate operatives escaped. /proc/is_infiltrator_docked_at_syndiebase() var/obj/docking_port/mobile/infiltrator/infiltrator_port = SSshuttle.getShuttle("syndicate") + var/obj/docking_port/stationary/transit/infiltrator_dock = locate() in infiltrator_port.loc - var/datum/lazy_template/nukie_base/nukie_template = GLOB.lazy_templates[LAZY_TEMPLATE_KEY_NUKIEBASE] - if(!nukie_template) - return FALSE // if its not even loaded, cant be docked - - for(var/datum/turf_reservation/loaded_area as anything in nukie_template.reservations) - var/infiltrator_turf = get_turf(infiltrator_port) - if(infiltrator_turf in loaded_area.reserved_turfs) - return TRUE - return FALSE + return infiltrator_port && (is_centcom_level(infiltrator_port.z) || infiltrator_dock) diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm index 4b8560dc9186..bb8d4126fe6f 100644 --- a/code/modules/antagonists/nukeop/outfits.dm +++ b/code/modules/antagonists/nukeop/outfits.dm @@ -13,24 +13,37 @@ skillchips = list(/obj/item/skillchip/disk_verifier) box = /obj/item/storage/box/survival/syndie + /// Amount of TC to automatically store in this outfit's uplink. var/tc = 25 + /// Enables big voice on this outfit's headset, used for nukie leaders. var/command_radio = FALSE + /// The type of uplink to be given on equip. var/uplink_type = /obj/item/uplink/nuclear id_trim = /datum/id_trim/chameleon/operative +/datum/outfit/syndicate/plasmaman + name = "Syndicate Operative - Basic (Plasmaman)" + head = /obj/item/clothing/head/helmet/space/plasmaman/syndie + uniform = /obj/item/clothing/under/plasmaman/syndicate + r_hand = /obj/item/tank/internals/plasmaman/belt/full + /datum/outfit/syndicate/leader name = "Syndicate Leader - Basic" command_radio = TRUE id_trim = /datum/id_trim/chameleon/operative/nuke_leader +/datum/outfit/syndicate/leader/plasmaman + name = "Syndicate Leader - Basic (Plasmaman)" + head = /obj/item/clothing/head/helmet/space/plasmaman/syndie + uniform = /obj/item/clothing/under/plasmaman/syndicate + r_hand = /obj/item/tank/internals/plasmaman/belt/full + /datum/outfit/syndicate/post_equip(mob/living/carbon/human/nukie, visualsOnly = FALSE) if(visualsOnly) return - // We don't require the nukiebase be loaded to function, but lets go ahead and kick off loading just in case - INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_NUKIEBASE) var/obj/item/radio/radio = nukie.ears radio.set_frequency(FREQ_SYNDICATE) radio.freqlock = RADIO_FREQENCY_LOCKED @@ -64,6 +77,17 @@ /obj/item/pen/edagger = 1, ) +/datum/outfit/syndicate/full/plasmaman + name = "Syndicate Operative - Full Kit (Plasmaman)" + back = /obj/item/mod/control/pre_equipped/nuclear/plasmaman + uniform = /obj/item/clothing/under/plasmaman/syndicate + r_pocket = /obj/item/tank/internals/plasmaman/belt/full + mask = null + +/datum/outfit/syndicate/full/plasmaman/New() + backpack_contents += /obj/item/clothing/head/helmet/space/plasmaman/syndie + return ..() + /datum/outfit/syndicate/reinforcement name = "Syndicate Operative - Reinforcement" tc = 0 @@ -80,6 +104,13 @@ to_chat(H, span_notice("You're an agent of [faction], sent to accompany the nuclear squad on their mission. \ Support your allies, and remember: Down with Nanotrasen.")) +/datum/outfit/syndicate/reinforcement/plasmaman + name = "Syndicate Operative - Reinforcement (Plasmaman)" + head = /obj/item/clothing/head/helmet/space/plasmaman/syndie + uniform = /obj/item/clothing/under/plasmaman/syndicate + r_hand = /obj/item/tank/internals/plasmaman/belt/full + tc = 0 + /datum/outfit/syndicate/reinforcement/gorlex name = "Syndicate Operative - Gorlex Reinforcement" suit = /obj/item/clothing/suit/armor/vest/alt diff --git a/code/modules/antagonists/pirate/pirate_event.dm b/code/modules/antagonists/pirate/pirate_event.dm index 30dc8c84f31b..505292612241 100644 --- a/code/modules/antagonists/pirate/pirate_event.dm +++ b/code/modules/antagonists/pirate/pirate_event.dm @@ -9,11 +9,9 @@ description = "The crew will either pay up, or face a pirate assault." admin_setup = list(/datum/event_admin_setup/listed_options/pirates) map_flags = EVENT_SPACE_ONLY - -/datum/round_event_control/pirates/preRunEvent() - if (!SSmapping.is_planetary()) - return EVENT_CANT_RUN - return ..() + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_COMMUNAL) + checks_antag_cap = TRUE /datum/round_event/pirates ///admin chosen pirate team diff --git a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm index 1825a4c04860..3bea2dc77bc3 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm @@ -125,7 +125,7 @@ try_draw_new_rune(user, target) return COMPONENT_CANCEL_ATTACK_CHAIN - if (istype(target, /obj/effect/decal/cleanable/traitor_rune)) + if (istype(target, /obj/effect/decal/cleanable/traitor_rune) && multi_stage) //monkestation edit: adds multi_stage check try_complete_rune(user, target) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm index c8aad8e6b6ae..583bda9b590d 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm @@ -3,10 +3,11 @@ objectives = list( /datum/traitor_objective/ultimate/romerol = 1, /datum/traitor_objective/ultimate/battlecruiser = 1, - /datum/traitor_objective/ultimate/space_dragon = 1, +// /datum/traitor_objective/ultimate/space_dragon = 1, //monkestation removal /datum/traitor_objective/ultimate/supermatter_cascade = 1, /datum/traitor_objective/ultimate/infect_ai = 1, /datum/traitor_objective/ultimate/dark_matteor = 1, + /datum/traitor_objective/ultimate/wizard = 1, //monkestation edit ) weight = 100 diff --git a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm index 127d4b28ac55..63b6b4734db0 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm @@ -1,3 +1,5 @@ +//MONKESTATION FILE REMOVAL: REPLACED WITH THE /datum/traitor_objective/ultimate/wizard OBJECTIVE +/* /datum/traitor_objective/ultimate/space_dragon name = "Find a Space Carp and mutate their DNA with your own using a DNA harvester we will drop pod at %AREA%" description = "Go to %AREA%, and recieve the Carp DNA scanner. Use it on any Space Carp to harvest its DNA. \ @@ -47,4 +49,4 @@ "target" = get_turf(user), "style" = STYLE_SYNDICATE, "spawn" = /obj/item/storage/box/syndie_kit/space_dragon, - )) + ))*/ diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm index 39f03f517c4c..a832260665a0 100644 --- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm +++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm @@ -43,13 +43,16 @@ /area/station/security, )) - var/list/blacklisted_areas = typecacheof(list(/area/station/engineering/hallway, +//monkestation removal start +/* var/list/blacklisted_areas = typecacheof(list(/area/station/engineering/hallway, /area/station/engineering/lobby, /area/station/engineering/storage, /area/station/science/lobby, /area/station/science/ordnance/bomb, /area/station/security/prison, - )) + ))*/ +//monkestation removal end + var/list/blacklisted_areas = typecacheof(TRAITOR_OBJECTIVE_BLACKLISTED_AREAS) //monkestation edit var/list/possible_areas = GLOB.the_station_areas.Copy() for(var/area/possible_area as anything in possible_areas) @@ -119,10 +122,36 @@ /datum/traitor_objective/locate_weakpoint/proc/create_shockwave(center_x, center_y, center_z) var/turf/epicenter = locate(center_x, center_y, center_z) var/lowpop = (length(GLOB.clients) <= CONFIG_GET(number/minimal_access_threshold)) - if(lowpop) +//monkestation removal start +/* if(lowpop) explosion(epicenter, devastation_range = 2, heavy_impact_range = 4, light_impact_range = 6, explosion_cause = src) else - explosion(epicenter, devastation_range = 3, heavy_impact_range = 6, light_impact_range = 9, explosion_cause = src) + explosion(epicenter, devastation_range = 3, heavy_impact_range = 6, light_impact_range = 9, explosion_cause = src)*/ +//monkestation removal end +//monkestation edit start: now creates radiating(one explosion in each ring) light explosions + var/greatest_dist = 0 + var/list/turfs_to_collapse = list() + for(var/turf/collapsed_turf as anything in GLOB.station_turfs) + if(istype(get_area(collapsed_turf), /area/station/ai_monitored)) //remote bombing of these areas would be bad + continue + + var/dist = get_dist(epicenter, collapsed_turf) + if(dist > greatest_dist) + greatest_dist = dist + + if(!turfs_to_collapse["[dist]"]) + turfs_to_collapse["[dist]"] = list() + turfs_to_collapse["[dist]"] += collapsed_turf + + for(var/iterator in 1 to greatest_dist) + if(!turfs_to_collapse["[iterator]"]) + continue + for(var/i in 1 to (lowpop ? 1 : 2)) //if lowpop then only do one collapse per ring, otherwise do two + addtimer(CALLBACK(pick_n_take(turfs_to_collapse["[iterator]"]), TYPE_PROC_REF(/turf, structural_collapse), 6 SECONDS, list(0, 0, 3), list('sound/effects/creak1.ogg', \ + 'sound/effects/creak2.ogg', \ + 'sound/effects/creak3.ogg')), \ + 2 SECONDS * iterator) +//monkestation edit end priority_announce( "Attention crew, it appears that a high-power explosive charge has been detonated in your station's weakpoint, causing severe structural damage.", "[command_name()] High-Priority Update" @@ -228,7 +257,7 @@ inhand_icon_state = "plasticx4" worn_icon_state = "x4" - boom_sizes = list(3, 6, 9) + boom_sizes = list(1, 2, 3) //monkestation edit: from list(3, 6, 9), now creates a bunch of light explosions across the station /// Weakref to user's objective var/datum/weakref/objective_weakref diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index ce0020c8cadb..354b41bd984a 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -128,10 +128,12 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) /datum/objective_item/steal/traitor/captain_spare, ) -/datum/traitor_objective/steal_item/most_risky/generate_objective(datum/mind/generating_for, list/possible_duplicates) +//monkestation removal start, this was added with biddle traitor and then was just never removed when steal got reworked +/*/datum/traitor_objective/steal_item/most_risky/generate_objective(datum/mind/generating_for, list/possible_duplicates) if(!handler.get_completion_count(/datum/traitor_objective/steal_item/very_risky)) return FALSE - return ..() + return ..()*/ +//monkestation removal end /datum/traitor_objective/steal_item/generate_objective(datum/mind/generating_for, list/possible_duplicates) for(var/datum/traitor_objective/steal_item/objective as anything in possible_duplicates) @@ -266,7 +268,12 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) return if(IS_TRAITOR(user)) - if(target_object_type) +//monkestation edit start + var/datum/traitor_objective/tide_bug_department/resolved_objective = objective_weakref?.resolve() + if(resolved_objective) + . += span_notice("This device must be placed by using it in hand inside the [initial(resolved_objective.targeted_area?.name)].") +//monkestation edit end + else if(target_object_type) //monkestation edit: makes this an else if . += span_notice("This device must be placed by clicking on the [initial(target_object_type.name)] with it.") . += span_notice("Remember, you may leave behind fingerprints or fibers on the device. Use soap or similar to scrub it clean to be safe!") diff --git a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm index 88ec1686693f..f8b8a94716ca 100644 --- a/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm +++ b/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm @@ -1,5 +1,5 @@ /// Number of times you need to cast on the rune to complete it -#define GRAND_RUNE_INVOKES_TO_COMPLETE 3 +//#define GRAND_RUNE_INVOKES_TO_COMPLETE 3 //monkestation removal /// Base time to take to invoke one stage of the rune. This is done three times to complete the rune. #define BASE_INVOKE_TIME 7 SECONDS /// Time to add on to each step every time a previous rune is completed. @@ -90,22 +90,31 @@ /obj/effect/grand_rune/examine(mob/user) . = ..() - if (times_invoked >= GRAND_RUNE_INVOKES_TO_COMPLETE) + if (times_invoked >= invokes_needed) //monkestation edit: replaced GRAND_RUNE_INVOKES_TO_COMPLETE with invokes_needed . += span_notice("Its power seems to have been expended.") return if(!IS_WIZARD(user)) return - . += span_notice("Invoke this rune [GRAND_RUNE_INVOKES_TO_COMPLETE - times_invoked] more times to complete the ritual.") + . += span_notice("Invoke this rune [invokes_needed - times_invoked] more times to complete the ritual.")//monkestation edit: replaced GRAND_RUNE_INVOKES_TO_COMPLETE with invokes_needed /obj/effect/grand_rune/can_interact(mob/living/user) . = ..() if(!.) return - if(!IS_WIZARD(user)) +//monkestation edit start + if(!owning_mind && !IS_WIZARD(user)) + return FALSE + + else if(owning_mind && !(user.mind == owning_mind?.resolve())) return FALSE +//monkestation edit end +//monkestation removal start + /*if(!IS_WIZARD(user)) + return FALSE*/ +//monkestation removal end if(is_in_use) return FALSE - if (times_invoked >= GRAND_RUNE_INVOKES_TO_COMPLETE) + if (times_invoked >= invokes_needed) //monkestation edit: replaced GRAND_RUNE_INVOKES_TO_COMPLETE with invokes_needed return FALSE return TRUE @@ -157,7 +166,7 @@ for(var/obj/machinery/light/light in orange(4, src.loc)) light.flicker() - if(times_invoked >= GRAND_RUNE_INVOKES_TO_COMPLETE) + if(times_invoked >= invokes_needed) //monkestation edit: replaced GRAND_RUNE_INVOKES_TO_COMPLETE with invokes_needed on_invocation_complete(user) return flick("[icon_state]_flash", src) @@ -264,7 +273,7 @@ new_influence.after_drain() created++ -#undef GRAND_RUNE_INVOKES_TO_COMPLETE +//#undef GRAND_RUNE_INVOKES_TO_COMPLETE //monkestation removal #undef BASE_INVOKE_TIME #undef ADD_INVOKE_TIME diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 5f7ff984dc1f..cced5fe3f251 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -115,9 +115,6 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key) RegisterSignal(ritual, COMSIG_GRAND_RITUAL_FINAL_COMPLETE, PROC_REF(on_ritual_complete)) /datum/antagonist/wizard/proc/send_to_lair() - // And now we ensure that its loaded - SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_WIZARDDEN) - if(!owner.current) return if(!GLOB.wizardstart.len) diff --git a/code/modules/bitrunning/components/avatar_connection.dm b/code/modules/bitrunning/components/avatar_connection.dm index 2a151d05066d..24f42d8f3e51 100644 --- a/code/modules/bitrunning/components/avatar_connection.dm +++ b/code/modules/bitrunning/components/avatar_connection.dm @@ -68,7 +68,7 @@ /datum/component/avatar_connection/RegisterWithParent() ADD_TRAIT(parent, TRAIT_TEMPORARY_BODY, REF(src)) RegisterSignal(parent, COMSIG_BITRUNNER_SAFE_DISCONNECT, PROC_REF(on_safe_disconnect)) - RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_sever_connection), override = TRUE) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_sever_connection)) RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_linked_damage)) /datum/component/avatar_connection/UnregisterFromParent() @@ -79,7 +79,9 @@ /// Disconnects the avatar and returns the mind to the old_body. /datum/component/avatar_connection/proc/full_avatar_disconnect(forced = FALSE, datum/source) +#ifndef UNIT_TESTS return_to_old_body() +#endif var/obj/machinery/netpod/hosting_netpod = netpod_ref?.resolve() if(isnull(hosting_netpod) && istype(source, /obj/machinery/netpod)) diff --git a/code/modules/bitrunning/designs.dm b/code/modules/bitrunning/designs.dm new file mode 100644 index 000000000000..f20497c8dd46 --- /dev/null +++ b/code/modules/bitrunning/designs.dm @@ -0,0 +1,89 @@ +// Quantum server + +/obj/item/circuitboard/machine/quantum_server + name = "Quantum Server" + greyscale_colors = CIRCUIT_COLOR_SUPPLY + build_path = /obj/machinery/quantum_server + req_components = list( +// /datum/stock_part/servo = 2, MONKEYSTATION EDIT ORIGINAL - We have manipulators instead of servo's + /datum/stock_part/manipulator = 2, // MONKEYSTATION EDIT NEW - We have manipulators instead of servo's + /datum/stock_part/scanning_module = 1, + /datum/stock_part/capacitor = 1, + ) + +/** + * quantum server design + * are you absolutely sure?? + */ + +// Netpod + +/obj/item/circuitboard/machine/netpod + name = "Netpod" + greyscale_colors = CIRCUIT_COLOR_SUPPLY + build_path = /obj/machinery/netpod + req_components = list( +// /datum/stock_part/servo = 1, MONKEYSTATION EDIT ORIGINAL - We have manipulators instead of servo's + /datum/stock_part/manipulator = 1, // MONKEYSTATION EDIT NEW - We have manipulators instead of servo's + /datum/stock_part/matter_bin = 2, + ) + +/datum/design/board/netpod + name = "Netpod Board" + desc = "The circuit board for a netpod." + id = "netpod" + build_path = /obj/item/circuitboard/machine/netpod + category = list( + RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_CARGO + ) + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + +// Quantum console + +/obj/item/circuitboard/computer/quantum_console + name = "Quantum Console" + greyscale_colors = CIRCUIT_COLOR_SUPPLY + build_path = /obj/machinery/computer/quantum_console + +/datum/design/board/quantum_console + name = "Quantum Console Board" + desc = "Allows for the construction of circuit boards used to build a Quantum Console." + id = "quantum_console" + build_path = /obj/item/circuitboard/computer/quantum_console + category = list( + RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_CARGO + ) + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + +// Byteforge + +/obj/item/circuitboard/machine/byteforge + name = "Byteforge" + greyscale_colors = CIRCUIT_COLOR_SUPPLY + build_path = /obj/machinery/byteforge + req_components = list( + /datum/stock_part/micro_laser = 1, + ) + +/datum/design/board/byteforge + name = "Byteforge Board" + desc = "Allows for the construction of circuit boards used to build a Byteforge." + id = "byteforge" + build_path = /obj/item/circuitboard/machine/byteforge + category = list( + RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_CARGO + ) + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + + +/datum/techweb_node/bitrunning + id = "bitrunning" + display_name = "Bitrunning Technology" + description = "Bluespace technology has led to the development of quantum-scale computing, which unlocks the means to materialize atomic structures while executing advanced programs." + prereq_ids = list("practical_bluespace") + design_ids = list( + "byteforge", + "quantum_console", + "netpod", + ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm index 0ac35a2df8f2..daae0d15c09e 100644 --- a/code/modules/bitrunning/event.dm +++ b/code/modules/bitrunning/event.dm @@ -18,7 +18,7 @@ ROLE_CYBER_POLICE, ) -/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/bitrunning_glitch/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/bitrunning/objects/byteforge.dm b/code/modules/bitrunning/objects/byteforge.dm new file mode 100644 index 000000000000..c62149662104 --- /dev/null +++ b/code/modules/bitrunning/objects/byteforge.dm @@ -0,0 +1,56 @@ +/obj/machinery/byteforge + name = "byteforge" + + circuit = /obj/item/circuitboard/machine/byteforge + desc = "A machine used by the quantum server. Quantum code converges here, materializing decrypted assets from the virtual abyss." + icon = 'icons/obj/machines/bitrunning.dmi' + icon_state = "byteforge" + obj_flags = BLOCKS_CONSTRUCTION + /// Idle particles + var/mutable_appearance/byteforge_particles + +/obj/machinery/byteforge/Initialize(mapload) + . = ..() + + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/byteforge/LateInitialize() + . = ..() + + byteforge_particles = mutable_appearance(initial(icon), "on_particles", ABOVE_MOB_LAYER) + setup_particles() + +/obj/machinery/byteforge/update_appearance(updates) + . = ..() + + setup_particles() + +/// Adds the particle overlays to the byteforge +/obj/machinery/byteforge/proc/setup_particles() + cut_overlays() + + if(is_operational) + add_overlay(byteforge_particles) + +/// Begins spawning the crate - lights, overlays, etc +/obj/machinery/byteforge/proc/start_to_spawn(obj/structure/closet/crate/secure/bitrunning/encrypted/cache) + addtimer(CALLBACK(src, PROC_REF(spawn_crate), cache), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + + var/mutable_appearance/lighting = mutable_appearance(initial(icon), "on_overlay") + flick_overlay_view(lighting, 1 SECONDS) + +// set_light(l_range = 2, l_power = 1.5, l_color = LIGHT_COLOR_BABY_BLUE, l_on = TRUE) MONKEYSTATION EDIT ORIGINAL - We have changed lights + set_light(l_inner_range = 1, l_outer_range = 2, l_power = 1.5, l_color = LIGHT_COLOR_BABY_BLUE, l_on = TRUE) // MONKEYSTATION EDIT NEW + +/// Sparks, moves the crate to the location +/obj/machinery/byteforge/proc/spawn_crate(obj/structure/closet/crate/secure/bitrunning/encrypted/cache) + if(QDELETED(cache)) + return + + playsound(src, 'sound/magic/blink.ogg', 50, TRUE) + var/datum/effect_system/spark_spread/quantum/sparks = new() + sparks.set_up(5, 1, loc) + sparks.start() + + cache.forceMove(loc) + set_light(l_on = FALSE) diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm index b1cfab2078c0..66422b5386ab 100644 --- a/code/modules/bitrunning/objects/disks.dm +++ b/code/modules/bitrunning/objects/disks.dm @@ -13,9 +13,12 @@ /// Name of the choice made var/choice_made + var/monkeystation_override = FALSE // monkeystation change, override for disks with single powers/items + /obj/item/bitrunning_disk/Initialize(mapload) . = ..() - + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return icon_state = "[base_icon_state][rand(0, 7)]" update_icon() RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) @@ -25,6 +28,9 @@ examine_text += span_infoplain("This disk must be carried on your person into a netpod to be used.") + if(monkeystation_override) // monkeystation change, override for disks with single powers/items + return + if(isnull(choice_made)) examine_text += span_notice("To make a selection, toggle the disk in hand.") return diff --git a/code/modules/bitrunning/objects/host_monitor.dm b/code/modules/bitrunning/objects/host_monitor.dm index 16e0a78c22f6..2225e247fe29 100644 --- a/code/modules/bitrunning/objects/host_monitor.dm +++ b/code/modules/bitrunning/objects/host_monitor.dm @@ -1,11 +1,11 @@ /obj/item/bitrunning_host_monitor name = "host monitor" - - custom_materials = list(/datum/material/iron = 200) - desc = "A complex medical device that, when attached to an avatar's data stream, can detect the user of their host's health." +// custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2) // MONKEYSTATION EDIT ORIGINAL - we use the other material system + custom_materials = list(/datum/material/iron = 200) // MONKEYSTATION EDIT NEW + desc = "A complex electronic that will analyze the connection health between host and avatar." flags_1 = CONDUCT_1 - icon = 'icons/obj/telescience.dmi' - icon_state = "gps-b" + icon = 'icons/obj/device.dmi' + icon_state = "host_monitor" inhand_icon_state = "electronic" item_flags = NOBLUDGEON lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi' diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm index d78283c6a8b2..d727025c9286 100644 --- a/code/modules/bitrunning/objects/landmarks.dm +++ b/code/modules/bitrunning/objects/landmarks.dm @@ -44,11 +44,6 @@ qdel(src) -/// Where the crates get ported to station -/obj/effect/landmark/bitrunning/station_reward_spawn - name = "Bitrunning rewards spawn" - icon_state = "station" - /// Where the exit hololadder spawns /obj/effect/landmark/bitrunning/hololadder_spawn name = "Bitrunning hololadder spawn" @@ -68,3 +63,41 @@ /obj/effect/landmark/bitrunning/safehouse_spawn name = "Bitrunning safehouse spawn" icon_state = "safehouse" + +///Swaps the locations of an encrypted crate in the area with another randomly selected crate. +///Randomizes names, so you have to inspect crates manually. +/obj/effect/landmark/bitrunning/crate_replacer + name = "Bitrunning Goal Crate Randomizer" + icon_state = "crate" + +/obj/effect/landmark/bitrunning/crate_replacer/Initialize(mapload) + . = ..() + + #ifndef UNIT_TESTS + var/list/crate_list = list() + var/obj/structure/closet/crate/secure/bitrunning/encrypted/encrypted_crate + var/area/my_area = get_area(src) + + for(var/turf/area_turf as anything in my_area.get_contained_turfs()) + for(var/obj/structure/closet/crate/crate_to_check in area_turf) + if(istype(crate_to_check, /obj/structure/closet/crate/secure/bitrunning/encrypted)) + encrypted_crate = crate_to_check + crate_to_check.desc += span_hypnophrase(" This feels like the crate we're looking for!") + else + crate_list += crate_to_check + crate_to_check.name = "Unidentified Crate" + + if(!encrypted_crate) + stack_trace("Bitrunning Goal Crate Randomizer failed to find an encrypted crate to swap positions for.") + return + if(!length(crate_list)) + stack_trace("Bitrunning Goal Crate Randomizer failed to find any NORMAL crates to swap positions for.") + return + + var/original_location = encrypted_crate.loc + var/obj/structure/closet/crate/selected_crate = pick(crate_list) + + encrypted_crate.abstract_move(selected_crate.loc) + selected_crate.abstract_move(original_location) + + #endif diff --git a/code/modules/bitrunning/objects/netpod.dm b/code/modules/bitrunning/objects/netpod.dm index 2038dbee9fcd..cfd2aba2a809 100644 --- a/code/modules/bitrunning/objects/netpod.dm +++ b/code/modules/bitrunning/objects/netpod.dm @@ -189,7 +189,7 @@ return TRUE /obj/machinery/netpod/ui_interact(mob/user, datum/tgui/ui) - if(!is_operational) + if(!is_operational || occupant) return ui = SStgui.try_update_ui(user, src, ui) @@ -242,20 +242,12 @@ to_chat(player, span_notice("The machine disconnects itself and begins to drain.")) open_machine() -/** - * ### Disconnect occupant - * If this goes smoothly, should reconnect a receiving mind to the occupant's body - * - * This is the second stage of the process - if you want to disconn avatars start at the mind first - */ +/// Handles occupant post-disconnection effects like damage, sounds, etc /obj/machinery/netpod/proc/disconnect_occupant(forced = FALSE) - var/mob/living/mob_occupant = occupant - if(isnull(occupant) || !isliving(occupant)) - return - connected = FALSE - if(mob_occupant.stat == DEAD) + var/mob/living/mob_occupant = occupant + if(isnull(occupant) || !isliving(occupant) || mob_occupant.stat == DEAD) open_machine() return @@ -347,8 +339,9 @@ return server_ref = WEAKREF(server) - RegisterSignal(server, COMSIG_BITRUNNER_SERVER_UPGRADED, PROC_REF(on_server_upgraded), override = TRUE) - RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_complete), override = TRUE) + RegisterSignal(server, COMSIG_BITRUNNER_SERVER_UPGRADED, PROC_REF(on_server_upgraded)) + RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_COMPLETE, PROC_REF(on_domain_complete)) + RegisterSignal(server, COMSIG_BITRUNNER_DOMAIN_SCRUBBED, PROC_REF(on_domain_scrubbed)) return server @@ -395,6 +388,7 @@ account.bitrunning_points += reward_points * 100 +/// User inspects the machine /obj/machinery/netpod/proc/on_examine(datum/source, mob/examiner, list/examine_text) SIGNAL_HANDLER @@ -409,7 +403,15 @@ examine_text += span_notice("It is currently occupied by [occupant].") examine_text += span_notice("It can be pried open with a crowbar, but its safety mechanisms will alert the occupant.") +/// The domain has been fully purged, so we should double check our avatar is deleted +/obj/machinery/netpod/proc/on_domain_scrubbed(datum/source) + SIGNAL_HANDLER + + var/mob/living/current_avatar = avatar_ref?.resolve() + if(isnull(current_avatar)) + return + QDEL_NULL(current_avatar) /// When the server is upgraded, drops brain damage a little /obj/machinery/netpod/proc/on_server_upgraded(datum/source, servo_rating) diff --git a/code/modules/bitrunning/objects/bit_vendor.dm b/code/modules/bitrunning/objects/vendor.dm similarity index 94% rename from code/modules/bitrunning/objects/bit_vendor.dm rename to code/modules/bitrunning/objects/vendor.dm index 8db855cf62f9..a995c0c0b6a9 100644 --- a/code/modules/bitrunning/objects/bit_vendor.dm +++ b/code/modules/bitrunning/objects/vendor.dm @@ -19,8 +19,10 @@ order_categories = list( CATEGORY_BITRUNNING_FLAIR, - CATEGORY_BITRUNNING_TECH, +// CATEGORY_BITRUNNING_TECH, Monkestation removal: split up into combat gear and abilities tabs CATEGORY_BEPIS, + CATEGORY_BITRUNNING_COMBAT_GEAR, + CATEGORY_BITRUNNING_ABILITIES, ) blackbox_key = "bitrunning" diff --git a/code/modules/bitrunning/antagonists/outfit.dm b/code/modules/bitrunning/outfits.dm similarity index 61% rename from code/modules/bitrunning/antagonists/outfit.dm rename to code/modules/bitrunning/outfits.dm index 67e80add3a9b..9a0a69237819 100644 --- a/code/modules/bitrunning/antagonists/outfit.dm +++ b/code/modules/bitrunning/outfits.dm @@ -29,3 +29,18 @@ officer_uniform.has_sensor = NO_SENSORS officer_uniform.sensor_mode = SENSOR_OFF user.update_suit_sensors() + +/datum/outfit/echolocator + name = "Bitrunning Echolocator" + glasses = /obj/item/clothing/glasses/blindfold +// ears = /obj/item/radio/headset/psyker //Navigating without these is horrible. MONKEYSTATION EDIT ORIGINAL - we still have old psyker headsets + ears = /obj/item/radio/headset/syndicate/alt/psyker // MONKEYSTATION EDIT NEW + uniform = /obj/item/clothing/under/abductor + gloves = /obj/item/clothing/gloves/fingerless + shoes = /obj/item/clothing/shoes/jackboots + suit = /obj/item/clothing/suit/jacket/trenchcoat + id = /obj/item/card/id/advanced + +/datum/outfit/echolocator/post_equip(mob/living/carbon/human/user, visualsOnly) + . = ..() + user.psykerize() diff --git a/code/modules/bitrunning/server/loot.dm b/code/modules/bitrunning/server/loot.dm index 29b730aae784..8b3af95607c6 100644 --- a/code/modules/bitrunning/server/loot.dm +++ b/code/modules/bitrunning/server/loot.dm @@ -16,14 +16,16 @@ /// Generates a reward based on the given domain /obj/machinery/quantum_server/proc/generate_loot() - if(!length(receive_turfs) && !locate_receive_turfs()) + var/list/obj/machinery/byteforge/nearby_forges = get_nearby_forges() + if(isnull(nearby_forges)) + say(src, "No nearby byteforges detected.") return FALSE points += generated_domain.reward_points playsound(src, 'sound/machines/terminal_success.ogg', 30, 2) - var/turf/dest_turf = pick(receive_turfs) - if(isnull(dest_turf)) + var/obj/machinery/byteforge/chosen_forge = pick(nearby_forges) + if(isnull(chosen_forge)) stack_trace("Failed to find a turf to spawn loot crate on.") return FALSE @@ -34,11 +36,11 @@ certificate.name = "certificate of domain completion" certificate.update_appearance() - var/obj/structure/closet/crate/secure/bitrunning/decrypted/reward_crate = new(dest_turf, generated_domain, bonus) + var/obj/structure/closet/crate/secure/bitrunning/decrypted/reward_crate = new(src, generated_domain, bonus) reward_crate.manifest = certificate reward_crate.update_appearance() - spark_at_location(reward_crate) + chosen_forge.start_to_spawn(reward_crate) return TRUE /// Returns the markdown text containing domain completion information diff --git a/code/modules/bitrunning/server/map_handling.dm b/code/modules/bitrunning/server/map_handling.dm index b0500a400745..3b55edf76669 100644 --- a/code/modules/bitrunning/server/map_handling.dm +++ b/code/modules/bitrunning/server/map_handling.dm @@ -1,3 +1,4 @@ +#define ONLY_TURF 1 /// Gives all current occupants a notification that the server is going down /obj/machinery/quantum_server/proc/begin_shutdown(mob/user) @@ -119,7 +120,6 @@ new /obj/structure/closet/crate/secure/bitrunning/encrypted(pick(crate_turfs)) return TRUE -#define ONLY_TURF 1 // There should only ever be one turf at the bottom left of the map. /// Loads the safehouse /obj/machinery/quantum_server/proc/initialize_safehouse() @@ -160,7 +160,8 @@ /// Deletes all the tile contents /obj/machinery/quantum_server/proc/scrub_vdom() - SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR) // just in case + SEND_SIGNAL(src, COMSIG_BITRUNNER_SEVER_AVATAR) /// just in case someone's connected + SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_SCRUBBED) // avatar cleanup just in case if(length(generated_domain.reservations)) var/datum/turf_reservation/res = generated_domain.reservations[1] diff --git a/code/modules/bitrunning/server/quantum_server.dm b/code/modules/bitrunning/server/quantum_server.dm index 43621cf5a922..7fdedeaabc4a 100644 --- a/code/modules/bitrunning/server/quantum_server.dm +++ b/code/modules/bitrunning/server/quantum_server.dm @@ -48,8 +48,6 @@ var/servo_bonus = 0 /// The turfs we can place a hololadder on. var/turf/exit_turfs = list() - /// The turfs on station where we generate loot. - var/turf/receive_turfs = list() /obj/machinery/quantum_server/Initialize(mapload) . = ..() @@ -84,18 +82,18 @@ avatar_connection_refs.Cut() spawned_threat_refs.Cut() QDEL_NULL(exit_turfs) - QDEL_NULL(receive_turfs) QDEL_NULL(generated_domain) QDEL_NULL(generated_safehouse) QDEL_NULL(radio) /obj/machinery/quantum_server/update_appearance(updates) if(isnull(generated_domain) || !is_operational) - set_light(0) + set_light(l_on = FALSE) return ..() set_light_color(is_ready ? LIGHT_COLOR_BABY_BLUE : LIGHT_COLOR_FIRE) - set_light(2, 1.5) +// set_light(l_range = 2, l_power = 1.5, l_on = TRUE) MONKEYSTATION EDIT ORIGINAL - We have changed lights + set_light(l_inner_range = 1, l_outer_range = 2, l_power = 1.5, l_on = TRUE) // MONKEYSTATION EDIT NEW return ..() diff --git a/code/modules/bitrunning/server/util.dm b/code/modules/bitrunning/server/util.dm index 1d35e86de509..05e80a269804 100644 --- a/code/modules/bitrunning/server/util.dm +++ b/code/modules/bitrunning/server/util.dm @@ -107,14 +107,14 @@ return shuffle(mutation_candidate_refs) -/// Locates any turfs with crate out landmarks -/obj/machinery/quantum_server/proc/locate_receive_turfs() - for(var/obj/effect/landmark/bitrunning/station_reward_spawn/spawner in GLOB.landmarks_list) - if(IN_GIVEN_RANGE(src, spawner, MAX_DISTANCE)) - receive_turfs += get_turf(spawner) - qdel(spawner) +/// Locates any turfs with forges on them +/obj/machinery/quantum_server/proc/get_nearby_forges() + var/list/obj/machinery/byteforge/nearby_forges = list() - return length(receive_turfs) > 0 + for(var/obj/machinery/byteforge/forge in oview(MAX_DISTANCE, src)) + nearby_forges += forge + + return nearby_forges /// Finds any mobs with minds in the zones and gives them the bad news /obj/machinery/quantum_server/proc/notify_spawned_threats() @@ -132,10 +132,10 @@ to_chat(baddie, span_userdanger("You have been flagged for deletion! Thank you for your service.")) /// Do some magic teleport sparks -/obj/machinery/quantum_server/proc/spark_at_location(obj/crate) - playsound(crate, 'sound/magic/blink.ogg', 50, TRUE) +/obj/machinery/quantum_server/proc/spark_at_location(obj/cache) + playsound(cache, 'sound/magic/blink.ogg', 50, TRUE) var/datum/effect_system/spark_spread/quantum/sparks = new() - sparks.set_up(5, 1, get_turf(crate)) + sparks.set_up(5, 1, get_turf(cache)) sparks.start() #undef REDACTED diff --git a/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm index 871c2cb1338e..a6fb3e921e05 100644 --- a/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm +++ b/code/modules/bitrunning/virtual_domain/domains/beach_bar.dm @@ -8,12 +8,12 @@ map_name = "beach_bar" safehouse_path = /datum/map_template/safehouse/mine -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain name = "pina colada" desc = "Whose drink is this? Not yours, that's for sure. Well, it's not like they're going to miss it." list_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 30) -/obj/item/reagent_containers/cup/glass/drinkingglass/virtual_domain/Initialize(mapload, vol) +/obj/item/reagent_containers/cup/glass/drinkingglass/filled/virtual_domain/Initialize(mapload, vol) . = ..() AddComponent(/datum/component/bitrunning_points, \ diff --git a/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm index 4deacb4f9c59..01d58e398038 100644 --- a/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm +++ b/code/modules/bitrunning/virtual_domain/domains/gondola_asteroid.dm @@ -28,11 +28,7 @@ /datum/reagent/gondola_mutation_toxin/virtual_domain name = "Advanced Tranquility" - -/datum/reagent/gondola_mutation_toxin/virtual_domain/expose_mob(mob/living/exposed_mob, methods = TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) - . = ..() - if((methods & (PATCH|INGEST|INJECT)) || ((methods & VAPOR) && prob(min(reac_volume,100)*(1 - touch_protection)))) - exposed_mob.ForceContractDisease(new /datum/disease/transformation/gondola/virtual_domain(), FALSE, TRUE) + gondola_disease = /datum/disease/transformation/gondola/virtual_domain /datum/disease/transformation/gondola/virtual_domain stage_prob = 9 diff --git a/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm b/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm new file mode 100644 index 000000000000..2ca32bce9834 --- /dev/null +++ b/code/modules/bitrunning/virtual_domain/domains/psyker_shuffle.dm @@ -0,0 +1,12 @@ +/datum/lazy_template/virtual_domain/psyker_shuffle + name = "Crate Chaos" + cost = BITRUNNER_COST_LOW + desc = "Sneak into an abandoned corner of the virtual world, where they store all of the crates. \ + Warning -- Virtual domain does not support visual display. This mission must be completed using echolocation." + difficulty = BITRUNNER_DIFFICULTY_MEDIUM + help_text = "Getting used to echolocation may be difficult. Remember to walk slowly, and carefully inspect every crate you come across." + key = "psyker_shuffle" + map_name = "psyker_shuffle" + reward_points = BITRUNNER_REWARD_MEDIUM + safehouse_path = /datum/map_template/safehouse/bathroom + forced_outfit = /datum/outfit/echolocator diff --git a/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm b/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm new file mode 100644 index 000000000000..6e0d88fda28f --- /dev/null +++ b/code/modules/bitrunning/virtual_domain/domains/psyker_zombies.dm @@ -0,0 +1,16 @@ +/datum/lazy_template/virtual_domain/psyker_zombies + name = "Infected Domain" + cost = BITRUNNER_COST_MEDIUM + desc = "Another neglected corner of the virtual world. This one had to be abandoned due to zombie virus. \ + Warning -- Virtual domain does not support visual display. This mission must be completed using echolocation." + difficulty = BITRUNNER_DIFFICULTY_MEDIUM + help_text = "This once-beloved virtual domain has been corrupted by a virus, rendering it unstable, full of holes, and full of ZOMBIES! \ + There should be a Mystery Box nearby to help get you armed. Get armed, and finish what the cyber-police started!" + key = "psyker_zombies" + map_name = "psyker_zombies" + reward_points = BITRUNNER_REWARD_HIGH + safehouse_path = /datum/map_template/safehouse/bathroom + forced_outfit = /datum/outfit/echolocator +// extra_loot = list(/obj/item/radio/headset/psyker = 1) //Looks cool, might make your local burdened chaplain happy. MONKEYSTATION EDIT ORIGINAL - we still have old psyker headsets + extra_loot = list(/obj/item/radio/headset/syndicate/alt/psyker = 1) // MONKEYSTATION EDIT NEW + diff --git a/code/modules/bitrunning/virtual_domain/safehouses.dm b/code/modules/bitrunning/virtual_domain/safehouses.dm index bb42f690ac7e..6504d447f28c 100644 --- a/code/modules/bitrunning/virtual_domain/safehouses.dm +++ b/code/modules/bitrunning/virtual_domain/safehouses.dm @@ -46,6 +46,9 @@ /datum/map_template/safehouse/ice filename = "ice.dmm" +/datum/map_template/safehouse/bathroom + filename = "bathroom.dmm" + /** * Your safehouse here * /datum/map_template/safehouse/your_type diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm index 010dd131799f..f40e4fa1447c 100644 --- a/code/modules/cargo/markets/market_items/weapons.dm +++ b/code/modules/cargo/markets/market_items/weapons.dm @@ -63,44 +63,3 @@ price_max = CARGO_CRATE_VALUE * 2 stock_max = 2 availability_prob = 50 - -//monke edits -/datum/market_item/weapon/smoothbore_disabler_prime - name = "Elite Smoothbore Disabler" - desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." - item = /obj/item/gun/energy/disabler/smoothbore/prime - - price_min = CARGO_CRATE_VALUE * 3 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/pipegun_recipe - name = "Diary of a Dead Assistant" - desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." - item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 1 - availability_prob = 40 - -/datum/market_item/weapon/musket_recipe - name = "Journal of a Space Ranger" - desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." - item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/smoothbore_recipe - name = "Old Tome" - desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." - item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime - - price_min = CARGO_CRATE_VALUE * 6 - price_max = CARGO_CRATE_VALUE * 8 - stock_max = 1 - availability_prob = 20 diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 665485ac9aed..3cb1208bdd39 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -403,6 +403,21 @@ SSshuttle.shopping_list -= order var/distance = get_dist(spawning_turf, picked_point) new_atom.throw_at(picked_point, distance + 4, 2) + + if(prob(25)) + var/obj/structure/closet/crate/mail/economy/new_create + var/obj/effect/oshan_launch_point/cargo/picked_point = pick(GLOB.cargo_launch_points) + var/turf/open/spawning_turf = get_edge_target_turf(picked_point, picked_point.map_edge_direction) + if(!SSeconomy.mail_crate) + new_create = new /obj/structure/closet/crate/mail/economy(spawning_turf) + SSeconomy.mail_crate = new_create + if(SSeconomy.mail_crate) + SSeconomy.mail_crate.forceMove(spawning_turf) + new_create = SSeconomy.mail_crate + var/distance = get_dist(spawning_turf, picked_point) + new_create.throw_at(picked_point, distance + 4, 2) + SSeconomy.mail_crate = null + currently_sending = FALSE . = TRUE diff --git a/code/modules/client/preferences/operative_species.dm b/code/modules/client/preferences/operative_species.dm new file mode 100644 index 000000000000..0b55bc23b52f --- /dev/null +++ b/code/modules/client/preferences/operative_species.dm @@ -0,0 +1,23 @@ +/// When TRUE, will spawn you as a human when selected for an operative role +/// When FALSE, players will be placed into the game as their character's species +/datum/preference/toggle/nuke_ops_species + category = PREFERENCE_CATEGORY_NON_CONTEXTUAL + can_randomize = FALSE + default_value = TRUE + savefile_identifier = PREFERENCE_CHARACTER + savefile_key = "operative_species" + +/datum/preference/toggle/nuke_ops_species/is_accessible(datum/preferences/preferences) + . = ..() + if(!.) + return FALSE + + // If one of the roles is ticked in the antag prefs menu, this option will show. + var/static/list/ops_roles = list(ROLE_OPERATIVE, ROLE_LONE_OPERATIVE, ROLE_OPERATIVE_MIDROUND, ROLE_CLOWN_OPERATIVE) + if(length(ops_roles & preferences.be_special)) + return TRUE + + return FALSE + +/datum/preference/toggle/nuke_ops_species/apply_to_human(mob/living/carbon/human/target, value) + return diff --git a/code/modules/client/preferences/species.dm b/code/modules/client/preferences/species.dm index a590a3334b78..1aae0e58dbbc 100644 --- a/code/modules/client/preferences/species.dm +++ b/code/modules/client/preferences/species.dm @@ -41,7 +41,6 @@ data[species_id]["desc"] = species.get_species_description() data[species_id]["icon"] = sanitize_css_class_name(species.name) data[species_id]["use_skintones"] = species.use_skintones - data[species_id]["use_fur"] = species.use_fur data[species_id]["sexes"] = species.sexes data[species_id]["enabled_features"] = species.get_features() data[species_id]["perks"] = species.get_species_perks() diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index cd6bde9be846..b34f979d3fbf 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -380,6 +380,13 @@ icon_state = "intern_envirohelm" inhand_icon_state = null +/obj/item/clothing/head/helmet/space/plasmaman/syndie + name = "tacticool envirosuit helmet" + desc = "There's no doubt about it, this helmet puts you above ALL of the other plasmamen. If you see another plasmaman wearing a helmet like this, it's either because they're a fellow badass, \ + or they've murdered one of your fellow badasses and have taken it from them as a trophy. Either way, anyone wearing this deserves at least a cursory nod of respect." + icon_state = "syndie_envirohelm" + inhand_icon_state = null + /obj/item/clothing/head/helmet/space/plasmaman/bitrunner name = "bitrunner's plasma envirosuit helmet" desc = "An envirohelmet with extended blue light filters for bitrunning plasmamen." diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index ef1f0002c1b8..16ad9ba6e9eb 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -220,6 +220,7 @@ female_sprite_flags = NO_FEMALE_UNIFORM can_adjust = FALSE resistance_flags = NONE + alternative_screams = list('monkestation/sound/voice/screams/skeleton/scream_skeleton.ogg') /obj/item/clothing/under/costume/mech_suit name = "mech pilot's suit" diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index c70f80985ff0..403493216e76 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -168,3 +168,11 @@ bio = 50 fire = 50 acid = 40 + +/obj/item/clothing/under/plasmaman/syndicate + name = "tacticool envirosuit" + desc = "A sinister looking envirosuit, for the boniest of operatives." + icon_state = "syndie_envirosuit" + has_sensor = NO_SENSORS + resistance_flags = FIRE_PROOF + inhand_icon_state = null diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index a5a7b699bea4..54a10b81e224 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -42,6 +42,21 @@ /// Flags dictating whether this event should be run on certain kinds of map var/map_flags = NONE + //monkestation vars starts + var/roundstart = FALSE + var/cost = 1 + var/reoccurence_penalty_multiplier = 0.75 + var/shared_occurence_type + var/track = EVENT_TRACK_MODERATE + /// Last calculated weight that the storyteller assigned this event + var/calculated_weight = 0 + var/tags = list() /// Tags of the event + /// List of the shared occurence types. + var/static/list/shared_occurences = list() + /// Whether a roundstart event can happen post roundstart. Very important for events which override job assignments. + var/can_run_post_roundstart = TRUE + //monkestation vars end + /datum/round_event_control/New() if(config && !wizardevent) // Magic is unaffected by configs earliest_start = CEILING(earliest_start * CONFIG_GET(number/events_min_time_mul), 1) @@ -71,8 +86,10 @@ // Checks if the event can be spawned. Used by event controller and "false alarm" event. // Admin-created events override this. -/datum/round_event_control/proc/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/proc/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) SHOULD_CALL_PARENT(TRUE) + if(roundstart && (world.time-SSticker.round_start_time >= 2 MINUTES || (SSgamemode.ran_roundstart && !fake_check))) + return FALSE if(occurrences >= max_occurrences) return FALSE if(earliest_start >= world.time-SSticker.round_start_time) @@ -88,13 +105,21 @@ if(ispath(typepath, /datum/round_event/ghost_role) && !(GLOB.ghost_role_flags & GHOSTROLE_MIDROUND_EVENT)) return FALSE + //monkestation edit start - STORYTELLERS + if(checks_antag_cap) + if(!roundstart && !SSgamemode.can_inject_antags()) + return FALSE + if(!check_enemies()) + return FALSE + //monkestation edit end - STORYTELLERS + var/datum/game_mode/dynamic/dynamic = SSticker.mode if (istype(dynamic) && dynamic_should_hijack && dynamic.random_event_hijacked != HIJACKED_NOTHING) return FALSE return TRUE -/datum/round_event_control/proc/preRunEvent() +/datum/round_event_control/proc/preRunEvent(forced = FALSE) if(!ispath(typepath, /datum/round_event)) return EVENT_CANT_RUN @@ -106,11 +131,14 @@ // We sleep HERE, in pre-event setup (because there's no sense doing it in runEvent() since the event is already running!) for the given amount of time to make an admin has enough time to cancel an event un-fitting of the present round. if(alert_observers) message_admins("Random Event triggering in [DisplayTimeText(RANDOM_EVENT_ADMIN_INTERVENTION_TIME)]: [name]. (CANCEL)") - sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME) + if(!roundstart) + sleep(RANDOM_EVENT_ADMIN_INTERVENTION_TIME) var/players_amt = get_active_player_count(alive_check = TRUE, afk_check = TRUE, human_check = TRUE) - if(!can_spawn_event(players_amt)) + if(!can_spawn_event(players_amt, fake_check = TRUE) && !forced) message_admins("Second pre-condition check for [name] failed, skipping...") return EVENT_INTERRUPTED + if(!can_spawn_event(players_amt, fake_check = TRUE) && forced) + message_admins("Second pre-condition check for [name] failed, but event forced, running event regardless this may have issues...") if(!triggering) return EVENT_CANCELLED //admin cancelled @@ -203,8 +231,14 @@ Runs the event var/fakeable = TRUE /// Whether a admin wants this event to be cancelled var/cancel_event = FALSE + //monkestation vars starts ///canceled on oshan var/oshan_blocked = FALSE + /// Whether the event called its start() yet or not. + var/has_started = FALSE + ///have we finished setup? + var/setup = FALSE + //monkestation vars end //Called first before processing. //Allows you to setup your event, such as randomly @@ -215,6 +249,7 @@ Runs the event //This is really only for setting defaults which can be overridden later when New() finishes. /datum/round_event/proc/setup() SHOULD_CALL_PARENT(FALSE) + setup = TRUE return ///Annouces the event name to deadchat, override this if what an event should show to deadchat is different to its event name. @@ -228,6 +263,80 @@ Runs the event SHOULD_CALL_PARENT(FALSE) return +//monkestation addition starts - STORYTELLERS +/// This section of event processing is in a proc because roundstart events may get their start invoked. +/datum/round_event/proc/try_start() + if(has_started) + return + has_started = TRUE + processing = FALSE + start() + processing = TRUE + +/datum/round_event_control/roundstart + roundstart = TRUE + earliest_start = 0 + +///Adds an occurence. Has to use the setter to properly handle shared occurences +/datum/round_event_control/proc/add_occurence() + if(shared_occurence_type) + if(!shared_occurences[shared_occurence_type]) + shared_occurences[shared_occurence_type] = 0 + shared_occurences[shared_occurence_type]++ + occurrences++ + +///Subtracts an occurence. Has to use the setter to properly handle shared occurences +/datum/round_event_control/proc/subtract_occurence() + if(shared_occurence_type) + if(!shared_occurences[shared_occurence_type]) + shared_occurences[shared_occurence_type] = 0 + shared_occurences[shared_occurence_type]-- + occurrences-- + +///Gets occurences. Has to use the getter to properly handle shared occurences +/datum/round_event_control/proc/get_occurences() + if(shared_occurence_type) + if(!shared_occurences[shared_occurence_type]) + shared_occurences[shared_occurence_type] = 0 + return shared_occurences[shared_occurence_type] + return occurrences + +/// Prints the action buttons for this event. +/datum/round_event_control/proc/get_href_actions() + if(SSticker.HasRoundStarted()) + if(roundstart) + if(!can_run_post_roundstart) + return "Fire Schedule" + return "Fire Schedule" + else + return "Fire Schedule Force Next" + else + if(roundstart) + return "Add Roundstart Force Roundstart" + else + return "Fire Schedule Force Next" + + +/datum/round_event_control/Topic(href, href_list) + . = ..() + if(QDELETED(src)) + return + switch(href_list["action"]) + if("schedule") + message_admins("[key_name_admin(usr)] scheduled event [src.name].") + log_admin_private("[key_name(usr)] scheduled [src.name].") + SSgamemode.storyteller.buy_event(src, src.track) + if("force_next") + if(length(src.admin_setup)) + for(var/datum/event_admin_setup/admin_setup_datum in src.admin_setup) + if(admin_setup_datum.prompt_admins() == ADMIN_CANCEL_EVENT) + return + message_admins("[key_name_admin(usr)] force scheduled event [src.name].") + log_admin_private("[key_name(usr)] force scheduled event [src.name].") + SSgamemode.forced_next_events[src.track] += src + +//monkestation addition ends - STORYTELLERS + //Called after something followable has been spawned by an event //Provides ghosts a follow link to an atom if possible //Only called once. @@ -265,6 +374,8 @@ Runs the event //This proc will handle the calls to the appropiate procs. /datum/round_event/process() SHOULD_NOT_OVERRIDE(TRUE) + if(!setup) + return if(!processing) return diff --git a/code/modules/events/anomaly/_anomaly.dm b/code/modules/events/anomaly/_anomaly.dm index 13fedcde2768..eaa9f4122787 100644 --- a/code/modules/events/anomaly/_anomaly.dm +++ b/code/modules/events/anomaly/_anomaly.dm @@ -24,6 +24,7 @@ impact_area = get_area(spawn_location) else impact_area = placer.findValidArea() + setup = TRUE /datum/round_event/anomaly/announce(fake) priority_announce("Energetic flux wave detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name].", "Anomaly Alert") diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 8ce6fcdd89a3..83b3612b9b2a 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -6,8 +6,10 @@ earliest_start = 5 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A colourful display can be seen through select windows. And the kitchen." + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_POSITIVE, TAG_SPACE) -/datum/round_event_control/aurora_caelus/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/aurora_caelus/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) if(!SSmapping.empty_space) return FALSE return ..() diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm index 77d17ce5ecbb..40df052b1ecd 100644 --- a/code/modules/events/brain_trauma.dm +++ b/code/modules/events/brain_trauma.dm @@ -6,6 +6,8 @@ description = "A crewmember gains a random trauma." min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 6 + track = EVENT_TRACK_MUNDANE + tags = list(TAG_TARGETED) /datum/round_event/brain_trauma fakeable = FALSE diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index 813be9b3d8ba..689878896eeb 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -9,6 +9,8 @@ min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 6 admin_setup = list(/datum/event_admin_setup/listed_options/brand_intelligence) + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_COMMUNAL) /datum/round_event/brand_intelligence announce_when = 21 @@ -46,6 +48,7 @@ kill() return origin_machine = pick_n_take(vending_machines) + setup = TRUE /datum/round_event/brand_intelligence/announce(fake) priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please inspect any [origin_machine] brand vendors for aggressive marketing tactics, and reboot them if necessary.", "Machine Learning Alert") diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index 5f206134a921..6b9b62efd945 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -5,6 +5,8 @@ weight = 5 category = EVENT_CATEGORY_BUREAUCRATIC description = "Randomly opens and closes job slots, along with changing the overflow role." + track = EVENT_TRACK_MAJOR // if you've ever dealt with 10 mimes you understand why. + tags = list(TAG_COMMUNAL) /datum/round_event/bureaucratic_error announce_when = 1 @@ -22,10 +24,11 @@ var/datum/job/current = job if(!current.allow_bureaucratic_error) continue - current.total_positions = 0 + var/ran = rand(-2,4) + current.total_positions = max(current.total_positions + ran, 1) else // Adds/removes a random amount of job slots from all jobs. for(var/datum/job/current as anything in jobs) if(!current.allow_bureaucratic_error) continue var/ran = rand(-2,4) - current.total_positions = max(current.total_positions + ran, 0) + current.total_positions = max(current.total_positions + ran, 1) diff --git a/code/modules/events/camerafailure.dm b/code/modules/events/camerafailure.dm index 453b919c5b88..7459a575dc05 100644 --- a/code/modules/events/camerafailure.dm +++ b/code/modules/events/camerafailure.dm @@ -6,6 +6,8 @@ alert_observers = FALSE category = EVENT_CATEGORY_ENGINEERING description = "Turns off a random amount of cameras." + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/camera_failure fakeable = FALSE diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index e62d26598c23..17f083a97d4d 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -10,6 +10,8 @@ min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 admin_setup = list(/datum/event_admin_setup/carp_migration) + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event_control/carp_migration/New() . = ..() @@ -35,6 +37,7 @@ /datum/round_event/carp_migration/setup() start_when = rand(40, 60) + setup = TRUE /datum/round_event/carp_migration/announce(fake) priority_announce("[fluff_signal] have been detected near [station_name()], please stand-by.", "Lifesign Alert") diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 0747998e6744..f0e7c4694aa0 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -6,6 +6,8 @@ description = "Heavily emps all telecommunication machines, blocking all communication for a while." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/communications_blackout announce_when = 1 diff --git a/code/modules/events/creep_awakening.dm b/code/modules/events/creep_awakening.dm index 648c2cc9db04..a519ee9430bd 100644 --- a/code/modules/events/creep_awakening.dm +++ b/code/modules/events/creep_awakening.dm @@ -5,6 +5,8 @@ min_players = 20 category = EVENT_CATEGORY_HEALTH description = "A random crewmember becomes obsessed with another." + track = EVENT_TRACK_MODERATE + tags = list(TAG_CREW_ANTAG, TAG_TARGETED) /datum/round_event/obsessed fakeable = FALSE diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index f57ed1774d4c..7348875be007 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -32,8 +32,10 @@ admin_setup = list(/datum/event_admin_setup/minimum_candidate_requirement/disease_outbreak, /datum/event_admin_setup/listed_options/disease_outbreak) ///Disease recipient candidates var/list/disease_candidates = list() + track = EVENT_TRACK_MUNDANE + tags = list(TAG_TARGETED) -/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/disease_outbreak/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . @@ -100,6 +102,7 @@ /datum/round_event/disease_outbreak/setup() announce_when = ADV_ANNOUNCE_DELAY + setup = TRUE /datum/round_event/disease_outbreak/start() var/datum/round_event_control/disease_outbreak/disease_event = control @@ -255,6 +258,7 @@ /datum/round_event/disease_outbreak/advance/setup() announce_when = ADV_ANNOUNCE_DELAY + setup = TRUE /** * Generate advanced virus diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index c12b86d5803c..71f97a4e2fbc 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -1,13 +1,15 @@ /datum/round_event_control/space_dust name = "Space Dust: Minor" typepath = /datum/round_event/space_dust - weight = 200 - max_occurrences = 1000 + weight = 200 // why the hell was this so much + max_occurrences = 10 earliest_start = 0 MINUTES alert_observers = FALSE category = EVENT_CATEGORY_SPACE description = "A single space dust is hurled at the station." map_flags = EVENT_SPACE_ONLY + track = EVENT_TRACK_MUNDANE + tags = list(TAG_DESTRUCTIVE, TAG_SPACE) /datum/round_event/space_dust start_when = 1 diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 1309887d4b73..8ec4e485bcbc 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -8,6 +8,8 @@ description = "Destroys all lights in a large area." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 4 + track = EVENT_TRACK_MUNDANE + tags = list(TAG_SPOOKY) /datum/round_event/electrical_storm var/lightsoutAmount = 1 diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index fb6bfd5be975..36ce68dd61cf 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -4,6 +4,8 @@ weight = 20 category = EVENT_CATEGORY_HEALTH description = "Some crewmembers suffer from temporary hypochondria." + track = EVENT_TRACK_MUNDANE + tags = list(TAG_TARGETED) /datum/round_event/fake_virus/start() var/list/fake_virus_victims = list() diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index 6e5cfdc61a1f..ff0be53939f2 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -6,8 +6,10 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "Fakes an event announcement." admin_setup = list(/datum/event_admin_setup/listed_options/false_alarm) + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) -/datum/round_event_control/falsealarm/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/falsealarm/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/ghost_role/abductor.dm b/code/modules/events/ghost_role/abductor.dm index f6928222cfdc..5188f3ef6293 100644 --- a/code/modules/events/ghost_role/abductor.dm +++ b/code/modules/events/ghost_role/abductor.dm @@ -7,6 +7,9 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "One or more abductor teams spawns, and they plan to experiment on the crew." + track = EVENT_TRACK_MAJOR + tags = list(TAG_TARGETED, TAG_SPOOKY) + checks_antag_cap = TRUE /datum/round_event/ghost_role/abductor minimum_required = 2 diff --git a/code/modules/events/ghost_role/alien_infestation.dm b/code/modules/events/ghost_role/alien_infestation.dm index 72ef044229b4..e76e8c8ccb11 100644 --- a/code/modules/events/ghost_role/alien_infestation.dm +++ b/code/modules/events/ghost_role/alien_infestation.dm @@ -5,12 +5,15 @@ min_players = 35 //monkie edit: 10 to 35 (tg what the fuck) - earliest_start = 90 MINUTES //monkie edit: 20 to 90 + earliest_start = 60 MINUTES //monkie edit: 20 to 90 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A xenomorph larva spawns on a random vent." + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT) + checks_antag_cap = TRUE -/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/alien_infestation/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . @@ -34,7 +37,7 @@ announce_when = rand(announce_when, announce_when + 50) if(prob(50)) spawncount++ - + setup = TRUE /datum/round_event/ghost_role/alien_infestation/announce(fake) var/living_aliens = FALSE for(var/mob/living/carbon/alien/A in GLOB.player_list) diff --git a/code/modules/events/ghost_role/blob.dm b/code/modules/events/ghost_role/blob.dm index a07d9d1be594..2278ca8cca18 100644 --- a/code/modules/events/ghost_role/blob.dm +++ b/code/modules/events/ghost_role/blob.dm @@ -6,12 +6,15 @@ min_players = 35 //monkie edit: 20 to 35 - earliest_start = 90 MINUTES //monkie edit: 20 to 90 + earliest_start = 60 MINUTES //monkie edit: 20 to 90 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "Spawns a new blob overmind." + track = EVENT_TRACK_MAJOR + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT) + checks_antag_cap = TRUE -/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/blob/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) if(EMERGENCY_PAST_POINT_OF_NO_RETURN) // no blobs if the shuttle is past the point of no return return FALSE diff --git a/code/modules/events/ghost_role/changeling_event.dm b/code/modules/events/ghost_role/changeling_event.dm index 570a6166093d..3bd3770da4b7 100644 --- a/code/modules/events/ghost_role/changeling_event.dm +++ b/code/modules/events/ghost_role/changeling_event.dm @@ -14,6 +14,9 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A meteor containing a changeling is summoned and thrown at the exterior of the station." + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/changeling minimum_required = 1 diff --git a/code/modules/events/ghost_role/fugitive_event.dm b/code/modules/events/ghost_role/fugitive_event.dm index 24aa4798c79c..08f1390889aa 100644 --- a/code/modules/events/ghost_role/fugitive_event.dm +++ b/code/modules/events/ghost_role/fugitive_event.dm @@ -9,6 +9,9 @@ category = EVENT_CATEGORY_INVASION description = "Fugitives will hide on the station, followed by hunters." map_flags = EVENT_SPACE_ONLY + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/fugitives minimum_required = 1 diff --git a/code/modules/events/ghost_role/morph_event.dm b/code/modules/events/ghost_role/morph_event.dm index e0b75119c282..8ec6b9a0d72c 100644 --- a/code/modules/events/ghost_role/morph_event.dm +++ b/code/modules/events/ghost_role/morph_event.dm @@ -7,6 +7,9 @@ description = "Spawns a hungry shapeshifting blobby creature." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_SPOOKY) + checks_antag_cap = TRUE /datum/round_event/ghost_role/morph minimum_required = 1 diff --git a/code/modules/events/ghost_role/nightmare.dm b/code/modules/events/ghost_role/nightmare.dm index 57b942988cdb..20a70e542454 100644 --- a/code/modules/events/ghost_role/nightmare.dm +++ b/code/modules/events/ghost_role/nightmare.dm @@ -8,6 +8,9 @@ description = "Spawns a nightmare, aiming to darken the station." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT, TAG_SPOOKY) + checks_antag_cap = TRUE /datum/round_event/ghost_role/nightmare minimum_required = 1 diff --git a/code/modules/events/ghost_role/operative.dm b/code/modules/events/ghost_role/operative.dm index 33cd9e059f09..4a8d4d668fd9 100644 --- a/code/modules/events/ghost_role/operative.dm +++ b/code/modules/events/ghost_role/operative.dm @@ -5,6 +5,9 @@ max_occurrences = 1 category = EVENT_CATEGORY_INVASION description = "A single nuclear operative assaults the station." + track = EVENT_TRACK_MAJOR + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/operative minimum_required = 1 @@ -30,6 +33,10 @@ Mind.special_role = ROLE_LONE_OPERATIVE Mind.active = TRUE Mind.transfer_to(operative) + if(!operative.client?.prefs.read_preference(/datum/preference/toggle/nuke_ops_species)) + var/species_type = operative.client.prefs.read_preference(/datum/preference/choiced/species) + operative.set_species(species_type) //Apply the preferred species to our freshly-made body. + Mind.add_antag_datum(/datum/antagonist/nukeop/lone) message_admins("[ADMIN_LOOKUPFLW(operative)] has been made into lone operative by an event.") diff --git a/code/modules/events/ghost_role/revenant_event.dm b/code/modules/events/ghost_role/revenant_event.dm index 27f3597a7ad2..b15d6e9aa543 100644 --- a/code/modules/events/ghost_role/revenant_event.dm +++ b/code/modules/events/ghost_role/revenant_event.dm @@ -11,7 +11,9 @@ description = "Spawns an angry, soul sucking ghost." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 - + track = EVENT_TRACK_ROLESET + tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) + checks_antag_cap = TRUE /datum/round_event/ghost_role/revenant var/ignore_mobcheck = FALSE diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm index 646fcbe2e9c7..cc38f7202447 100644 --- a/code/modules/events/ghost_role/sentience.dm +++ b/code/modules/events/ghost_role/sentience.dm @@ -22,6 +22,8 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list( description = "An animal or robot becomes sentient!" min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/ghost_role/sentience diff --git a/code/modules/events/ghost_role/sentient_disease.dm b/code/modules/events/ghost_role/sentient_disease.dm index 662f6de22c8a..b8e769ab27fe 100644 --- a/code/modules/events/ghost_role/sentient_disease.dm +++ b/code/modules/events/ghost_role/sentient_disease.dm @@ -9,6 +9,9 @@ description = "Spawns a sentient disease, who wants to infect as many people as possible." min_wizard_trigger_potency = 4 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + checks_antag_cap = TRUE /datum/round_event/ghost_role/sentient_disease role_name = "sentient disease" diff --git a/code/modules/events/ghost_role/slaughter_event.dm b/code/modules/events/ghost_role/slaughter_event.dm index 8cb2b729aa4e..b9892fb5cecc 100644 --- a/code/modules/events/ghost_role/slaughter_event.dm +++ b/code/modules/events/ghost_role/slaughter_event.dm @@ -10,6 +10,9 @@ description = "Spawns a slaughter demon, to hunt by travelling through pools of blood." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT, TAG_SPOOKY) + checks_antag_cap = TRUE /datum/round_event/ghost_role/slaughter minimum_required = 1 diff --git a/code/modules/events/ghost_role/space_dragon.dm b/code/modules/events/ghost_role/space_dragon.dm index 735d6d1dcb8f..8b579abad17d 100644 --- a/code/modules/events/ghost_role/space_dragon.dm +++ b/code/modules/events/ghost_role/space_dragon.dm @@ -10,6 +10,9 @@ description = "Spawns a space dragon, which will try to take over the station." min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/space_dragon minimum_required = 1 diff --git a/code/modules/events/ghost_role/space_ninja.dm b/code/modules/events/ghost_role/space_ninja.dm index a14511b72779..894e092a1c21 100644 --- a/code/modules/events/ghost_role/space_ninja.dm +++ b/code/modules/events/ghost_role/space_ninja.dm @@ -8,6 +8,9 @@ dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION description = "A space ninja infiltrates the station." + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/space_ninja minimum_required = 1 diff --git a/code/modules/events/gravity_generator_blackout.dm b/code/modules/events/gravity_generator_blackout.dm index 89cc5a43367e..6384c8030656 100644 --- a/code/modules/events/gravity_generator_blackout.dm +++ b/code/modules/events/gravity_generator_blackout.dm @@ -6,8 +6,10 @@ description = "Turns off the gravity generator." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 4 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPACE) -/datum/round_event_control/gravity_generator_blackout/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/gravity_generator_blackout/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/grey_tide.dm b/code/modules/events/grey_tide.dm index 7c7e23950a96..d09f76ebe393 100644 --- a/code/modules/events/grey_tide.dm +++ b/code/modules/events/grey_tide.dm @@ -8,6 +8,8 @@ description = "Bolts open all doors in one or more departments." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_SPOOKY) /datum/round_event/grey_tide announce_when = 50 @@ -21,6 +23,7 @@ announce_when = rand(50, 60) end_when = rand(20, 30) severity = rand(1,3) + setup = TRUE var/list/potential_areas = list(/area/station/command, /area/station/engineering, diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index ecc70df98bcd..2743c4d839d9 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -10,6 +10,8 @@ /// Cooldown for the announement associated with this event. /// Necessary due to the fact that this event is player triggerable. COOLDOWN_DECLARE(announcement_spam_protection) + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL, TAG_SPOOKY) /datum/round_event/grid_check announce_when = 1 diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 8a8902d5724c..4980225e7836 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -11,8 +11,10 @@ admin_setup = list(/datum/event_admin_setup/minimum_candidate_requirement/heart_attack, /datum/event_admin_setup/input_number/heart_attack) ///Candidates for recieving a healthy dose of heart disease var/list/heart_attack_candidates = list() + track = EVENT_TRACK_MODERATE + tags = list(TAG_TARGETED) -/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/immovable_rod/immovable_rod_event.dm b/code/modules/events/immovable_rod/immovable_rod_event.dm index 63d2e79b3911..0b8437cf4f9d 100644 --- a/code/modules/events/immovable_rod/immovable_rod_event.dm +++ b/code/modules/events/immovable_rod/immovable_rod_event.dm @@ -11,6 +11,8 @@ min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/set_location/immovable_rod, /datum/event_admin_setup/question/immovable_rod) + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE) /datum/round_event/immovable_rod announce_when = 5 diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 772d1576cdc0..f2edeac485a6 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -7,6 +7,8 @@ description = "Gives the AI a new, randomized law." min_wizard_trigger_potency = 2 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_TARGETED) /datum/round_event/ion_storm var/replaceLawsetChance = 25 //chance the AI's lawset is completely replaced with something else per config weights diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 85b1ef024775..2e2baf9a85f7 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -9,6 +9,8 @@ min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 2 admin_setup = list(/datum/event_admin_setup/mass_hallucination) + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event/mass_hallucination fakeable = FALSE diff --git a/code/modules/events/meteors/meteor_wave_events.dm b/code/modules/events/meteors/meteor_wave_events.dm index e45c2b3fda97..475e3265b8c8 100644 --- a/code/modules/events/meteors/meteor_wave_events.dm +++ b/code/modules/events/meteors/meteor_wave_events.dm @@ -10,6 +10,8 @@ category = EVENT_CATEGORY_SPACE description = "A regular meteor wave." map_flags = EVENT_SPACE_ONLY + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMMUNAL, TAG_SPACE, TAG_DESTRUCTIVE) /datum/round_event/meteor_wave start_when = 6 diff --git a/code/modules/events/meteors/stray_meteor_event.dm b/code/modules/events/meteors/stray_meteor_event.dm index 53daff1ac8a1..849be38b6a09 100644 --- a/code/modules/events/meteors/stray_meteor_event.dm +++ b/code/modules/events/meteors/stray_meteor_event.dm @@ -11,6 +11,8 @@ max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/listed_options/stray_meteor) map_flags = EVENT_SPACE_ONLY + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE, TAG_SPACE) /datum/round_event/stray_meteor announce_when = 1 diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm index e7f31567f4c9..038ee8bcb193 100644 --- a/code/modules/events/mice_migration.dm +++ b/code/modules/events/mice_migration.dm @@ -4,6 +4,8 @@ weight = 10 category = EVENT_CATEGORY_ENTITIES description = "A horde of mice arrives, and perhaps even the Rat King themselves." + track = EVENT_TRACK_MUNDANE + tags = list(TAG_DESTRUCTIVE) /datum/round_event/mice_migration var/minimum_mice = 5 diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 5f2bca5071ba..b5771d5075a0 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -3,9 +3,12 @@ typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 min_players = 15 + max_occurrences = 5 earliest_start = 30 MINUTES category = EVENT_CATEGORY_ENTITIES description = "Syndicate troops pour out of portals." + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMBAT) /datum/round_event/portal_storm/syndicate_shocktroop boss_types = list(/mob/living/basic/syndicate/melee/space/stormtrooper = 2) @@ -65,6 +68,7 @@ hostiles_spawn += get_random_station_turf() next_boss_spawn = start_when + CEILING(2 * number_of_hostiles / number_of_bosses, 1) + setup = TRUE /datum/round_event/portal_storm/announce(fake) set waitfor = 0 diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index ebcbb27f2781..9a18da1bd3c9 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -5,6 +5,8 @@ min_players = 20 category = EVENT_CATEGORY_ENGINEERING description = "Emps the telecomm processors, scrambling radio speech. Might blow up a few." + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event/processor_overload announce_when = 1 diff --git a/code/modules/events/radiation_leak.dm b/code/modules/events/radiation_leak.dm index 0fbe29927666..a94c8fe03e1a 100644 --- a/code/modules/events/radiation_leak.dm +++ b/code/modules/events/radiation_leak.dm @@ -8,6 +8,8 @@ category = EVENT_CATEGORY_ENGINEERING min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event/radiation_leak start_when = 1 // 2 seconds in @@ -47,6 +49,7 @@ // We found something, we can just return now picked_machine_ref = WEAKREF(sick_device) return + setup = TRUE /datum/round_event/radiation_leak/announce(fake) var/obj/machinery/the_source_of_our_problems = picked_machine_ref?.resolve() diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 5b2b6b71ea1d..8d4be6c8299b 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -1,11 +1,13 @@ /datum/round_event_control/radiation_storm name = "Radiation Storm" typepath = /datum/round_event/radiation_storm - max_occurrences = 1 + max_occurrences = 2 //monkestation edit - STORYTELLERS category = EVENT_CATEGORY_SPACE description = "Radiation storm affects the station, forcing the crew to escape to maintenance." min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event/radiation_storm @@ -14,6 +16,7 @@ start_when = 3 end_when = start_when + 1 announce_when = 1 + setup = TRUE /datum/round_event/radiation_storm/announce(fake) priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", ANNOUNCER_RADIATION) diff --git a/code/modules/events/sandstorm.dm b/code/modules/events/sandstorm.dm index 0288b32ec207..fc141315bb4b 100644 --- a/code/modules/events/sandstorm.dm +++ b/code/modules/events/sandstorm.dm @@ -19,6 +19,8 @@ max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/listed_options/sandstorm) map_flags = EVENT_SPACE_ONLY + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE) /datum/round_event/sandstorm start_when = 60 @@ -30,6 +32,7 @@ /datum/round_event/sandstorm/setup() start_when = rand(70, 90) end_when = rand(110, 140) + setup = TRUE /datum/round_event/sandstorm/announce(fake) if(!start_side) diff --git a/code/modules/events/scrubber_clog.dm b/code/modules/events/scrubber_clog.dm index 0bbb0801182a..7a332e67cf5d 100644 --- a/code/modules/events/scrubber_clog.dm +++ b/code/modules/events/scrubber_clog.dm @@ -6,6 +6,8 @@ earliest_start = 5 MINUTES category = EVENT_CATEGORY_JANITORIAL description = "Harmless mobs climb out of a scrubber." + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) /datum/round_event/scrubber_clog announce_when = 10 @@ -40,6 +42,7 @@ end_when = rand(300, 600) maximum_spawns = rand(3, 5) spawn_delay = rand(10, 15) + setup = TRUE /datum/round_event/scrubber_clog/start() //Sets the scrubber up for unclogging/mob production. scrubber.clog() @@ -86,7 +89,7 @@ scrubber_list += scrubber return pick(scrubber_list) -/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/scrubber_clog/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return diff --git a/code/modules/events/scrubber_overflow.dm b/code/modules/events/scrubber_overflow.dm index 897d07110317..353293a6e3df 100644 --- a/code/modules/events/scrubber_overflow.dm +++ b/code/modules/events/scrubber_overflow.dm @@ -7,6 +7,8 @@ category = EVENT_CATEGORY_JANITORIAL description = "The scrubbers release a tide of mostly harmless froth." admin_setup = list(/datum/event_admin_setup/listed_options/scrubber_overflow) + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) /datum/round_event/scrubber_overflow announce_when = 1 @@ -84,8 +86,9 @@ if(!scrubbers.len) return kill() + setup = TRUE -/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/scrubber_overflow/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index ed64c52a836a..9c8332cadebe 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -6,8 +6,10 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "Replaces the emergency shuttle with a random one." admin_setup = list(/datum/event_admin_setup/warn_admin/shuttle_catastrophe, /datum/event_admin_setup/listed_options/shuttle_catastrophe) + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/shuttle_catastrophe/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . @@ -46,6 +48,7 @@ if(!isnull(template.who_can_purchase) && template.credit_cost < INFINITY) //if we could get it from the communications console, it's cool for us to get it here valid_shuttle_templates += template new_shuttle = pick(valid_shuttle_templates) + setup = TRUE /datum/round_event/shuttle_catastrophe/start() if(SSshuttle.shuttle_insurance) diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm index d1e39125e346..e3709f0308c5 100644 --- a/code/modules/events/shuttle_insurance.dm +++ b/code/modules/events/shuttle_insurance.dm @@ -6,8 +6,10 @@ max_occurrences = 1 category = EVENT_CATEGORY_BUREAUCRATIC description = "A sketchy but legit insurance offer." + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) -/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE) +/datum/round_event_control/shuttle_insurance/can_spawn_event(players, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . @@ -39,6 +41,7 @@ break if(!insurance_evaluation) insurance_evaluation = 5000 //gee i dunno + setup = TRUE /datum/round_event/shuttle_insurance/start() insurance_message = new("Shuttle Insurance", "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [insurance_evaluation] to cover for your shuttle in case of any disaster.", list("Purchase Insurance.","Reject Offer.")) diff --git a/code/modules/events/shuttle_loan/shuttle_loan_event.dm b/code/modules/events/shuttle_loan/shuttle_loan_event.dm index 96db32c044d6..ca593d3b8414 100644 --- a/code/modules/events/shuttle_loan/shuttle_loan_event.dm +++ b/code/modules/events/shuttle_loan/shuttle_loan_event.dm @@ -10,7 +10,7 @@ admin_setup = list(/datum/event_admin_setup/listed_options/shuttle_loan) var/list/run_situations = list() -/datum/round_event_control/shuttle_loan/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/shuttle_loan/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() for(var/datum/round_event/running_event in SSevents.running) if(istype(running_event, /datum/round_event/shuttle_loan)) //Make sure two of these don't happen at once. @@ -37,6 +37,7 @@ loan_control.run_situations.Add(situation) situation = new situation() + setup = TRUE /datum/round_event/shuttle_loan/announce(fake) priority_announce("Cargo: [situation.announcement_text]", situation.sender) diff --git a/code/modules/events/space_vines/vine_event.dm b/code/modules/events/space_vines/vine_event.dm index a668f036cac3..825244ad7f3b 100644 --- a/code/modules/events/space_vines/vine_event.dm +++ b/code/modules/events/space_vines/vine_event.dm @@ -14,6 +14,9 @@ /datum/event_admin_setup/input_number/spacevine_potency, /datum/event_admin_setup/input_number/spacevine_production, ) + track = EVENT_TRACK_MAJOR + tags = list(TAG_COMMUNAL, TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/spacevine fakeable = FALSE @@ -64,7 +67,7 @@ /datum/event_admin_setup/set_location/spacevine/apply_to_event(datum/round_event/spacevine/event) event.override_turf = chosen_turf - + /datum/event_admin_setup/multiple_choice/spacevine input_text = "Select starting mutations." min_choices = 0 @@ -88,7 +91,7 @@ type_choices += text2path(choice) event.mutations_overridden = TRUE event.override_mutations = type_choices - + /datum/event_admin_setup/input_number/spacevine_potency input_text = "Set vine's potency (effects mutation frequency + max severity)" max_value = 100 diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 52ad7474694d..8a600da626ea 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -10,6 +10,8 @@ description = "Spawns spider eggs, ready to hatch." min_wizard_trigger_potency = 5 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_ROLESET + tags = list(TAG_COMBAT) /datum/round_event/spider_infestation announce_when = 400 @@ -17,6 +19,7 @@ /datum/round_event/spider_infestation/setup() announce_when = rand(announce_when, announce_when + 50) + setup = TRUE /datum/round_event/spider_infestation/announce(fake) priority_announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", ANNOUNCER_ALIENS) diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index e783f18ec025..b2ec87736f3b 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -8,6 +8,8 @@ category = EVENT_CATEGORY_BUREAUCRATIC description = "A pod containing a random supply crate lands on the station." admin_setup = list(/datum/event_admin_setup/set_location/stray_cargo, /datum/event_admin_setup/listed_options/stray_cargo) + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL) /datum/event_admin_setup/set_location/stray_cargo input_text = "Aim pod at turf we're on?" @@ -66,6 +68,7 @@ var/datum/supply_pack/pack_type = pack if(initial(pack_type.special)) stray_spawnable_supply_packs -= pack + setup = TRUE ///Spawns a random supply pack, puts it in a pod, and spawns it on a random tile of the selected area /datum/round_event/stray_cargo/start() diff --git a/code/modules/events/tram_malfunction.dm b/code/modules/events/tram_malfunction.dm index b5130a8c6934..698b88171d69 100644 --- a/code/modules/events/tram_malfunction.dm +++ b/code/modules/events/tram_malfunction.dm @@ -11,9 +11,11 @@ description = "Tram crossing signals malfunction, tram collision damage is increased." min_wizard_trigger_potency = 0 max_wizard_trigger_potency = 3 + track = EVENT_TRACK_MODERATE + tags = list(TAG_DESTRUCTIVE) //Check if there's a tram we can cause to malfunction. -/datum/round_event_control/tram_malfunction/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/tram_malfunction/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if (!.) return FALSE @@ -33,6 +35,7 @@ /datum/round_event/tram_malfunction/setup() end_when = rand(TRAM_MALFUNCTION_TIME_LOWER, TRAM_MALFUNCTION_TIME_UPPER) + setup = TRUE /datum/round_event/tram_malfunction/announce() priority_announce("Our automated control system has lost contact with the tram's on board computer. Please take extra care while we diagnose and resolve the issue. Signals and emergency braking may not be available during this time.", "CentCom Engineering Division") diff --git a/code/modules/events/wisdomcow.dm b/code/modules/events/wisdomcow.dm index 1ecd43797e58..7aa24b45a27f 100644 --- a/code/modules/events/wisdomcow.dm +++ b/code/modules/events/wisdomcow.dm @@ -10,6 +10,8 @@ /datum/event_admin_setup/listed_options/wisdom_cow, /datum/event_admin_setup/input_number/wisdom_cow, ) + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_POSITIVE) /datum/round_event/wisdomcow ///Location override that, if set causes the cow to spawn in a pre-determined locaction instead of randomly. @@ -56,5 +58,5 @@ /datum/event_admin_setup/input_number/wisdom_cow/apply_to_event(datum/round_event/wisdomcow/event) event.selected_experience = chosen_value - - + + diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index ea8c5fd176bc..ee4f803699a6 100644 --- a/code/modules/events/wizard/embeddies.dm +++ b/code/modules/events/wizard/embeddies.dm @@ -9,7 +9,7 @@ max_wizard_trigger_potency = 7 ///behold... the only reason sticky is a subtype... -/datum/round_event_control/wizard/embedpocalypse/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/wizard/embedpocalypse/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/wizard/identity_spoof.dm b/code/modules/events/wizard/identity_spoof.dm index dcd923c2776a..bdad88e9ab84 100644 --- a/code/modules/events/wizard/identity_spoof.dm +++ b/code/modules/events/wizard/identity_spoof.dm @@ -5,7 +5,7 @@ max_occurrences = 1 description = "Makes everyone dressed up like a wizard." -/datum/round_event_control/wizard/identity_spoof/can_spawn_event(players_amt, allow_magic = FALSE) +/datum/round_event_control/wizard/identity_spoof/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) . = ..() if(!.) return . diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index f80d432c8920..ee96155468c4 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -10,6 +10,8 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to description = "Space time anomalies appear on the station, randomly teleporting people who walk into them." min_wizard_trigger_potency = 3 max_wizard_trigger_potency = 7 + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) /datum/round_event/wormholes announce_when = 10 @@ -23,6 +25,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to /datum/round_event/wormholes/setup() announce_when = rand(0, 20) end_when = rand(40, 80) + setup = TRUE /datum/round_event/wormholes/start() for(var/turf/open/floor/T in world) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 88468a7a7bc3..51c7ba004a50 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -175,9 +175,23 @@ copy_seed.desc = desc copy_seed.productdesc = productdesc - copy_seed.reagents_add = reagents_add.Copy() // Faster than grabbing the list from genes. + copy_seed.reagents_add = reagents_add.Copy() // Fastetr than grabbing the list from genes. copy_seed.harvest_age = harvest_age + copy_seed.species = species + copy_seed.icon_grow = icon_grow + copy_seed.icon_harvest = icon_harvest + copy_seed.icon_dead = icon_dead + copy_seed.growthstages = growthstages + copy_seed.growing_icon = growing_icon + copy_seed.seed_offset = seed_offset + copy_seed.traits_in_progress = traits_in_progress + + if(istype(src, /obj/item/seeds/spliced)) + var/obj/item/seeds/spliced/spliced_seed = src + var/obj/item/seeds/spliced/new_spliced_seed = copy_seed + new_spliced_seed.produce_list += spliced_seed.produce_list + return copy_seed /obj/item/seeds/proc/get_gene(typepath) diff --git a/code/modules/jobs/departments/departments.dm b/code/modules/jobs/departments/departments.dm index db45899b5c4a..de7053a447d6 100644 --- a/code/modules/jobs/departments/departments.dm +++ b/code/modules/jobs/departments/departments.dm @@ -131,6 +131,13 @@ label_class = "silicon" ui_color = "#5dbda0" +/datum/job_department/spooktober + department_name = DEPARTMENT_SPOOKTOBER + department_bitflags = DEPARTMENT_BITFLAG_SPOOKTOBER + display_order = 9 + label_class = "spooktober" + ui_color = "#f05e16" + /datum/job_department/silicon/generate_nation_name() return "United Nations" //For nations ruleset specifically, because all other sources of nation creation cannot choose silicons diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index efc4bca39e7a..482b4bf5a1c7 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -42,8 +42,8 @@ INITIALIZE_IMMEDIATE(/mob/dead) . += "Time To Start: SOON" . += "Players: [LAZYLEN(GLOB.clients)]" + . += "Players Ready: [SSticker.totalPlayersReady]" if(client.holder) - . += "Players Ready: [SSticker.totalPlayersReady]" . += "Admins Ready: [SSticker.total_admins_ready] / [length(GLOB.admins)]" /mob/dead/proc/server_hop() diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm index bc9384de23b6..76d0d6dc87fa 100644 --- a/code/modules/mob/living/carbon/emote.dm +++ b/code/modules/mob/living/carbon/emote.dm @@ -11,7 +11,36 @@ key_third_person = "blinks" message = "blinks." -/datum/emote/living/carbon/blink_r +/datum/emote/living/carbon/blink/run_emote(mob/living/carbon/human, params, type_override, intentional) + . = ..() + + var/obj/item/bodypart/head/head = human.get_bodypart(BODY_ZONE_HEAD) + + if(!head) + // This implies you have no neck to snap. You're making Peanut sad! + return + + if(prob(99)) + // Peanut has spared you--for the moment. + return + + // Don't blink. Not even for a second. + for(var/obj/structure/statue/peanut in view(8, get_turf(human))) + // Security guards go here to die. + if(do_teleport(peanut, human, channel = TELEPORT_CHANNEL_MAGIC)) + human.log_message("blinked and had their neck snapped by [peanut]!") + human.visible_message(span_danger("[human] blinks, and [peanut] snaps [human.p_their()] neck in a flash!"), \ + span_userdanger("The instant you close your eyes, [peanut] snaps your neck!")) + + playsound(peanut, 'sound/creatures/statue_horror_sting.ogg', 100, TRUE) + + head.receive_damage(brute=200) + + new /obj/effect/gibspawner/human/bodypartless(get_turf(human)) + + break + +/datum/emote/living/carbon/blink/blink_r key = "blink_r" message = "blinks rapidly." diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/_species.dm similarity index 99% rename from code/modules/mob/living/carbon/human/species.dm rename to code/modules/mob/living/carbon/human/_species.dm index 0551edf90cb6..9949cfccbc0a 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -163,7 +163,8 @@ GLOBAL_LIST_EMPTY(features_by_species) ///What gas does this species breathe? Used by suffocation screen alerts, most of actual gas breathing is handled by mutantlungs. See [life.dm][code/modules/mob/living/carbon/human/life.dm] var/breathid = "o2" - + ///are we a furry little guy? + var/uses_fur = FALSE ///What anim to use for dusting var/dust_anim = "dust-h" ///What anim to use for gibbing @@ -237,8 +238,10 @@ GLOBAL_LIST_EMPTY(features_by_species) /// Was on_species_gain ever actually called? /// Species code is really odd... var/properly_gained = FALSE - ///are we furry little creatures - var/use_fur = FALSE + + ///A list containing outfits that will be overridden in the species_equip_outfit proc. [Key = Typepath passed in] [Value = Typepath of outfit you want to equip for this specific species instead]. + var/list/outfit_override_registry = list() + ///health mod of a species var/maxhealthmod = 1 ///Path to BODYTYPE_CUSTOM species worn icons. An assoc list of ITEM_SLOT_X => /icon diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 1736ea531837..f893404cab6f 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -237,7 +237,7 @@ msg += "[t_He] look[p_s()] extremely disgusted.\n" var/apparent_blood_volume = blood_volume - if((dna.species.use_skintones || dna.species.use_fur)&& skin_tone == "albino") + if((dna.species.use_skintones)&& skin_tone == "albino") apparent_blood_volume -= 150 // enough to knock you down one tier switch(apparent_blood_volume) if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 467bf69a6171..8583a5beb56e 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -386,6 +386,22 @@ return O.equip(src, visualsOnly) +///A version of equipOutfit that overrides passed in outfits with their entry on the species' outfit override registry +/mob/living/carbon/human/proc/equip_species_outfit(outfit, visualsOnly = FALSE) + var/datum/outfit/outfit_to_equip + + var/override_outfit_path = dna?.species.outfit_override_registry[outfit] + if(override_outfit_path) + outfit_to_equip = new override_outfit_path + else + outfit_to_equip = new outfit + + if(isnull(outfit_to_equip)) + return FALSE + + return outfit_to_equip.equip(src, visualsOnly) + + //delete all equipment without dropping anything /mob/living/carbon/human/proc/delete_equipment() for(var/slot in get_all_worn_items())//order matters, dependant slots go first diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index 16cb62941e6a..2b83f8455e69 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -56,6 +56,13 @@ ass_image = 'icons/ass/assplasma.png' + outfit_override_registry = list( + /datum/outfit/syndicate = /datum/outfit/syndicate/plasmaman, + /datum/outfit/syndicate/full = /datum/outfit/syndicate/full/plasmaman, + /datum/outfit/syndicate/leader = /datum/outfit/syndicate/leader/plasmaman, + /datum/outfit/syndicate/reinforcement = /datum/outfit/syndicate/reinforcement/plasmaman, + ) + /// If the bones themselves are burning clothes won't help you much var/internal_fire = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 1ed9d778f918..51db8247b89f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -225,7 +225,7 @@ name ="death bolt" icon_state= "chronobolt" damage = 20 - armour_penetration = 50 + armour_penetration = 25 //was 50 changed because 50 was waay too much monkestation 20 edit speed = 2 eyeblur = 0 damage_type = BRUTE diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index 2e4901a2793d..9d0605948a2c 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -338,3 +338,7 @@ /datum/outfit/prey_pod_victim name = "Prey Pod Victim" uniform = /obj/item/clothing/under/rank/rnd/roboticist + +/obj/effect/mob_spawn/corpse/human/cyber_police + name = "Dead Cyber Police" + outfit = /datum/outfit/cyber_police diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index f0a5085f4ec7..e33472006c4b 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -241,6 +241,12 @@ /obj/item/mod/module/jetpack/advanced, ) +/obj/item/mod/control/pre_equipped/nuclear/plasmaman + +/obj/item/mod/control/pre_equipped/nuclear/plasmaman/Initialize(mapload, new_theme, new_skin, new_core) + applied_modules += /obj/item/mod/module/plasma_stabilizer + return ..() + /obj/item/mod/control/pre_equipped/elite theme = /datum/mod_theme/elite applied_cell = /obj/item/stock_parts/cell/bluespace diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index b56576099580..005afe473eb9 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -27,16 +27,10 @@ /obj/item/ammo_casing/energy/laser/musket projectile_type = /obj/projectile/beam/laser/musket e_cost = 1000 - fire_sound = 'sound/weapons/lasercannonfire.ogg' //monke edit: sounds cooler /obj/item/ammo_casing/energy/laser/musket/prime projectile_type = /obj/projectile/beam/laser/musket/prime -/obj/item/ammo_casing/energy/laser/musket/syndicate//monke edit: syndicate laser musket - projectile_type = /obj/projectile/beam/laser/musket/syndicate - e_cost = 125 - fire_sound = 'sound/weapons/laser2.ogg' - /obj/item/ammo_casing/energy/laser/practice projectile_type = /obj/projectile/beam/practice select_name = "practice" diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm index a455358dde65..70a726d81d2b 100644 --- a/code/modules/projectiles/guns/energy/crank_guns.dm +++ b/code/modules/projectiles/guns/energy/crank_guns.dm @@ -10,8 +10,9 @@ can_bayonet = TRUE knife_x_offset = 22 knife_y_offset = 11 - //monke edit:fully charges per crank because it was really confusing and unintuitive + //monke edit: fully charges per crank because it was really confusing and unintuitive //monke edit: increased cooldown time to compensate for increased charge + /obj/item/gun/energy/laser/musket/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_wielded = 10) @@ -43,26 +44,6 @@ charge_sound_cooldown_time = 1.8 SECONDS, \ ) -/obj/item/gun/energy/laser/musket/syndicate - name = "syndicate laser musket" - desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ - Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." - icon_state = "musket_syndie" - inhand_icon_state = "musket_syndie" - worn_icon_state = "las_musket_syndie" - ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) - w_class = WEIGHT_CLASS_NORMAL -/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging - . = ..() - AddComponent( \ - /datum/component/gun_crank, \ - charging_cell = get_cell(), \ - charge_amount = 250, \ - cooldown_time = 1.5 SECONDS, \ - charge_sound = 'sound/weapons/laser_crank.ogg', \ - charge_sound_cooldown_time = 1.3 SECONDS, \ - ) - /obj/item/gun/energy/disabler/smoothbore name = "smoothbore disabler" desc = "A hand-crafted disabler, using a hard knock on an energy cell to fire the stunner laser. A lack of proper focusing means it has little accuracy." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 0e79dfb0ba0f..a161c295f1d9 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -58,24 +58,16 @@ name = "low-power laser" icon_state = "laser_musket" impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser - damage = 30 //monke edit: damage changed from 25 to 30 - stamina = 45 //monke edit: brought to disabler level as is on tg + damage = 25 + stamina = 40 light_color = COLOR_STRONG_VIOLET weak_against_armour = TRUE /obj/projectile/beam/laser/musket/prime name = "mid-power laser" - damage = 35 //monke edit: damage changed from 30 to 35 - stamina = 60 //monke edit: damage changed from 45 to 60 - weak_against_armour = FALSE - -/obj/projectile/beam/laser/musket/syndicate //monke edit: syndicate laser musket - name = "resonant laser" damage = 30 - stamina = 65 + stamina = 45 weak_against_armour = FALSE - armour_penetration = 25 //less powerful than armor piercing rounds - wound_bonus = 10 /obj/projectile/beam/weak damage = 15 @@ -132,7 +124,7 @@ /obj/projectile/beam/disabler/smoothbore/prime name = "focused disabler beam" weak_against_armour = FALSE - stamina = 65 //monkie edit: changed from 35 to 65(Black market/ERT item only, even rarer is the book to make it) + stamina = 35 /obj/projectile/beam/pulse name = "pulse" diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 5d1671e75354..2fddba00e8b2 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -1415,6 +1415,7 @@ taste_description = "slime" penetrates_skin = NONE ph = 11 + restricted = TRUE //so they cant roll on maint pills, if this has other sides effects then this can be reworked to a global blacklist /datum/reagent/fungalspores/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() @@ -2609,11 +2610,12 @@ color = "#9A6750" //RGB: 154, 103, 80 taste_description = "inner peace" penetrates_skin = NONE + var/datum/disease/transformation/gondola_disease = /datum/disease/transformation/gondola /datum/reagent/gondola_mutation_toxin/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message = TRUE, touch_protection = 0) . = ..() if((methods & (PATCH|INGEST|INJECT)) || ((methods & VAPOR) && prob(min(reac_volume,100)*(1 - touch_protection)))) - exposed_mob.ForceContractDisease(new /datum/disease/transformation/gondola(), FALSE, TRUE) + exposed_mob.ForceContractDisease(new gondola_disease, FALSE, TRUE) /datum/reagent/spider_extract diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 8f1d6d37f293..d7a23cd193dd 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -126,40 +126,6 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE -/datum/design/mag_autorifle - name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" - desc = "A 20 round magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle" - build_type = PROTOLATHE | AWAY_LATHE - materials = list(/datum/material/iron = 4000) - build_path = /obj/item/ammo_box/magazine/wt550m9 - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - -/datum/design/mag_autorifle/ap_mag - name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" - desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle_ap" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600) - build_path = /obj/item/ammo_box/magazine/wt550m9/wtap - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - -/datum/design/mag_autorifle/ic_mag - name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" - desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." - id = "mag_autorifle_ic" - materials = list(/datum/material/iron = 6000, /datum/material/silver = 600, /datum/material/glass = 1000) - build_path = /obj/item/ammo_box/magazine/wt550m9/wtic - category = list( - RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO - ) - departmental_flags = DEPARTMENT_BITFLAG_SECURITY - /datum/design/pin_testing name = "Test-Range Firing Pin" desc = "This safety firing pin allows firearms to be operated within proximity to a firing range." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5de5ffa07f7c..d01099668af0 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1485,7 +1485,6 @@ "seclite", "zipties", "inspector", - "mag_autorifle", "rubber_c35", //monkestation edit: taco sec ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) @@ -1526,7 +1525,8 @@ design_ids = list( "pin_testing", "tele_shield", - "lethal_c35", //monkestation edit: taco sec + "lethal_c35", //monkestation edit: paco sec + "mag_autorifle_rub", //monkestation edit: autorifles ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) discount_experiments = list(/datum/experiment/ordnance/explosive/pressurebomb = 5000) @@ -1538,6 +1538,8 @@ prereq_ids = list("adv_engi", "weaponry") design_ids = list( "pin_loyalty", + "mag_autorifle", //monkestation edit: autorifles + "mag_autorifle_salt", //monkestation edit: autorifles ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) discount_experiments = list(/datum/experiment/scanning/points/machinery_tiered_scan/tier3_mechbay = 2500) @@ -1605,8 +1607,6 @@ "c38_hotshot", "c38_iceblox", "techshotshell", - "mag_autorifle_ap", - "mag_autorifle_ic", ) research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 70eccdc78828..a9f22d0eb2d9 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -181,9 +181,6 @@ /obj/machinery/computer/emergency_shuttle/proc/increase_hijack_stage() var/obj/docking_port/mobile/emergency/shuttle = SSshuttle.emergency - // Begin loading this early, prevents a delay when the shuttle goes to land - INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, lazy_load_template), LAZY_TEMPLATE_KEY_NUKIEBASE) - shuttle.hijack_status++ if(hijack_announce) announce_hijack_stage() @@ -548,7 +545,6 @@ var/destination_dock = "emergency_away" if(is_hijacked() || elimination_hijack()) // just double check - SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_NUKIEBASE) destination_dock = "emergency_syndicate" minor_announce("Corruption detected in \ shuttle navigation protocols. Please contact your \ diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index fd0a21fb53bb..85bcc9472474 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -265,7 +265,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( continue empty_turfs += shuttle_floor - new /obj/structure/closet/crate/mail/economy(pick(empty_turfs)) + var/obj/structure/closet/crate/mail/economy/new_create = new /obj/structure/closet/crate/mail/economy(pick(empty_turfs)) + + if(length(SSmapping.levels_by_trait(ZTRAIT_OSHAN))) + SSeconomy.mail_crate = new_create #undef GOODY_FREE_SHIPPING_MAX #undef CRATE_TAX diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 2eec7eb2285b..ca2cff40edb5 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -772,12 +772,12 @@ species_flags_list = owner_species.species_traits limb_gender = (human_owner.physique == MALE) ? "m" : "f" - if(owner_species.use_skintones || owner_species.use_fur) + if(owner_species.use_skintones) skin_tone = human_owner.skin_tone else skin_tone = "" - if(((MUTCOLORS in owner_species.species_traits) || (DYNCOLORS in owner_species.species_traits))) //Ethereal code. Motherfuckers. + if(((MUTCOLORS in owner_species.species_traits) || (DYNCOLORS in owner_species.species_traits) || (SPECIES_FUR in owner_species.species_traits))) //Ethereal code. Motherfuckers. if(owner_species.fixed_mut_color) species_color = owner_species.fixed_mut_color else diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 4143f1b8e5bc..6211f8dcc5d7 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -86,6 +86,7 @@ #include "baseturfs.dm" #include "bespoke_id.dm" #include "binary_insert.dm" +#include "bitrunning.dm" #include "blindness.dm" #include "bloody_footprints.dm" #include "breath.dm" diff --git a/code/modules/unit_tests/bitrunning.dm b/code/modules/unit_tests/bitrunning.dm new file mode 100644 index 000000000000..568eeeed8c13 --- /dev/null +++ b/code/modules/unit_tests/bitrunning.dm @@ -0,0 +1,15 @@ +/// Ensures settings on vdoms are correct +/datum/unit_test/bitrunner_vdom_settings + +/datum/unit_test/bitrunner_vdom_settings/Run() + var/obj/structure/closet/crate/secure/bitrunning/decrypted/cache = allocate(/obj/structure/closet/crate/secure/bitrunning/decrypted) + + for(var/path in subtypesof(/datum/lazy_template/virtual_domain)) + var/datum/lazy_template/virtual_domain/vdom = new path + TEST_ASSERT_NOTNULL(vdom.key, "[path] should have a key") + TEST_ASSERT_NOTNULL(vdom.map_name, "[path] should have a map name") + + if(!length(vdom.extra_loot)) + continue + + TEST_ASSERT_EQUAL(cache.spawn_loot(vdom.extra_loot), TRUE, "[path] didn't spawn loot. Extra loot should be an associative list") diff --git a/code/modules/unit_tests/breath.dm b/code/modules/unit_tests/breath.dm index faba1a08e22e..8bd6e3ce9b3d 100644 --- a/code/modules/unit_tests/breath.dm +++ b/code/modules/unit_tests/breath.dm @@ -86,6 +86,8 @@ /datum/unit_test/breath/breath_sanity_ashwalker /datum/unit_test/breath/breath_sanity_ashwalker/Run() + if(SSmapping.config.map_name == "Oshan Station") + return var/mob/living/carbon/human/species/lizard/ashwalker/lab_rat = allocate(/mob/living/carbon/human/species/lizard/ashwalker) lab_rat.forceMove(run_loc_floor_bottom_left) var/turf/open/to_fill = run_loc_floor_bottom_left diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 84cac3a57480..bcfebef4693e 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -119,6 +119,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) ///we also dont want weathers or weather events as they will hold refs to alot of stuff as they shouldn't be deleted ignore += typesof(/datum/weather_event) ignore += typesof(/datum/particle_weather) + ignore += typesof(/mob/living/basic/aquatic) var/list/cached_contents = spawn_at.contents.Copy() var/original_turf_type = spawn_at.type @@ -198,6 +199,8 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) //Alright, time to see if anything messed up var/list/cache_for_sonic_speed = SSgarbage.items for(var/path in cache_for_sonic_speed) + if(path in ignore) + continue var/datum/qdel_item/item = cache_for_sonic_speed[path] if(item.failures) TEST_FAIL("[item.name] hard deleted [item.failures] times out of a total del count of [item.qdels]") diff --git a/code/modules/unit_tests/lungs.dm b/code/modules/unit_tests/lungs.dm index 4f9b7ceb4429..3d9a800adc97 100644 --- a/code/modules/unit_tests/lungs.dm +++ b/code/modules/unit_tests/lungs.dm @@ -61,6 +61,8 @@ /datum/unit_test/lungs/lungs_sanity_ashwalker/Run() // Gas mix resembling one cell of lavaland's atmosphere. + if(SSmapping.config.map_name == "Oshan Station") + return var/datum/gas_mixture/lavaland_test_mix = create_lavaland_mix() var/obj/item/organ/internal/lungs/lavaland/test_lungs = allocate(/obj/item/organ/internal/lungs/lavaland) var/mob/living/carbon/human/lab_rat = allocate(/mob/living/carbon/human/consistent) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png index 079c292cb9bb..e7bea2e1bb64 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_simian.png differ diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index e3055211b824..0086c6e40940 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -98,14 +98,3 @@ cost = 13 surplus = 50 purchasable_from = ~UPLINK_CLOWN_OPS - -/datum/uplink_item/dangerous/laser_musket - name = "Syndicate Laser Musket" - desc = "An exprimental 'rifle' designed by Aethrofusion. This laser(probably) uses alien technology to fit 4 high energy capacitors \ - into a small rifle which can be stored safely(?) in any backpack. To charge, simply press down on the main control panel. \ - Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aethrofusion assures safety for up to 2 years of use." - item = /obj/item/gun/energy/laser/musket/syndicate - progression_minimum = 30 MINUTES - cost = 12 - surplus = 40 - purchasable_from = ~UPLINK_CLOWN_OPS diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 0dc1ef941f89..bd66052bc689 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -77,6 +77,7 @@ /obj/item/clothing/head/costume/shrine_wig = 1, /obj/item/clothing/suit/costume/shrine_maiden = 1, /obj/item/gohei = 1, + /obj/item/clothing/under/costume/skeleton = 1, ), ), list( @@ -107,6 +108,8 @@ /obj/item/clothing/under/suit/white_on_white = 1, /obj/item/clothing/head/tragic = 2, /obj/item/clothing/under/costume/tragic = 2, + /obj/item/clothing/mask/gas/clown_hat/yellow = 1, + /obj/item/clothing/shoes/clown_shoes/yellow = 1, /obj/item/clothing/head/knowingclown = 2, /obj/item/clothing/under/knowingclown = 2, ), @@ -124,6 +127,7 @@ /obj/item/clothing/under/dress/skirt = 1, /obj/item/clothing/neck/tie = 3, /obj/item/clothing/head/hats/tophat = 1, + /obj/item/clothing/head/wonka = 1, /obj/item/clothing/under/costume/kilt = 1, /obj/item/clothing/glasses/monocle =1, /obj/item/clothing/head/hats/bowler = 1, @@ -134,6 +138,7 @@ /obj/item/clothing/suit/costume/changshan_blue = 1, /obj/item/clothing/suit/costume/cheongsam_red = 1, /obj/item/clothing/suit/costume/cheongsam_blue = 1, + /obj/item/clothing/under/wonka = 1, ), ), list( @@ -147,6 +152,7 @@ /obj/item/clothing/suit/hooded/carp_costume = 1, /obj/item/clothing/suit/hooded/ian_costume = 1, /obj/item/clothing/suit/hooded/bee_costume = 1, + /obj/item/clothing/suit/hooded/dinojammies = 1, /obj/item/clothing/mask/animal/small/bat = 1, /obj/item/clothing/mask/animal/small/bee = 1, /obj/item/clothing/mask/animal/small/bear = 1, @@ -158,6 +164,7 @@ /obj/item/clothing/mask/animal/pig = 1, /obj/item/clothing/mask/animal/cowmask = 1, /obj/item/clothing/mask/animal/horsehead = 1, + /obj/item/clothing/head/lizard = 1, ), ), list( diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 5edda6de07fc..7d8a9477af0e 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -138,6 +138,7 @@ /obj/item/clothing/under/ethereal_tunic = 3, /obj/item/clothing/suit/costume/ianshirt = 1, + /obj/item/clothing/suit/hooded/dinojammies = 3, /obj/item/clothing/head/costume/irs = 20, /obj/item/clothing/head/costume/tmc = 20, /obj/item/clothing/head/costume/deckers = 20, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index f05b5f4e3a69..9441315dc6e8 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -169,6 +169,11 @@ /obj/item/clothing/head/costume/mailman = 1, /obj/item/clothing/under/misc/mailman = 1, ) + contraband = list( + /obj/item/clothing/under/wonka = 1, + /obj/item/clothing/head/wonka = 1, + /obj/item/cane = 1 + ) refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe payment_department = ACCOUNT_CAR diff --git a/config/events.json b/config/events.json new file mode 100644 index 000000000000..a30ccaf58ab5 --- /dev/null +++ b/config/events.json @@ -0,0 +1,13 @@ +{ + "/datum/round_event_control": + { + "weight" : 10, + "min_players" : 0, + "max_occurrences" : 100, + "earliest_start" : 20, + "track" : "Moderate", + "cost" : 1, + "reoccurence_penalty_multiplier" : 1, + "shared_occurence_type" : null + } +} diff --git a/config/game_options.txt b/config/game_options.txt index 3ae8297a30c6..94e6203385ca 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -425,6 +425,9 @@ OVERFLOW_JOB Assistant ## Overflow slot cap. Set to -1 for unlimited. If limited, it will still open up if every other job is full. OVERFLOW_CAP -1 +## Enables Spooktober jobs. +SPOOKTOBER_ENABLED + ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants. #GREY_ASSISTANTS @@ -537,3 +540,50 @@ MAXFINE 2000 METACURRENCY_NAME Metacoin TWITCH_KEY mrhouse + +## Gamemode configurations + +## Multipliers for points gained over time for event tracks. +MUNDANE_POINT_GAIN_MULTIPLIER 1 +MODERATE_POINT_GAIN_MULTIPLIER 1 +MAJOR_POINT_GAIN_MULTIPLIER 1 +ROLESET_POINT_GAIN_MULTIPLIER 1 +OBJECTIVES_POINT_GAIN_MULTIPLIER 1 + +## Multipliers for points to spend on roundstart events. +MUNDANE_ROUNDSTART_POINT_MULTIPLIER 1 +MODERATE_ROUNDSTART_POINT_MULTIPLIER 1 +MAJOR_ROUNDSTART_POINT_MULTIPLIER 1 +ROLESET_ROUNDSTART_POINT_MULTIPLIER 1 +OBJECTIVES_ROUNDSTART_POINT_MULTIPLIER 1 + +## Minimum population caps for event tracks to run their events. +MUNDANE_MIN_POP 0 +MODERATE_MIN_POP 0 +MAJOR_MIN_POP 0 +ROLESET_MIN_POP 0 +OBJECTIVES_MIN_POP 0 + +## Point thresholds for tracks to run events. The lesser the more frequent events will be. +MUNDANE_POINT_THRESHOLD 25 +MODERATE_POINT_THRESHOLD 50 +MAJOR_POINT_THRESHOLD 90 +ROLESET_POINT_THRESHOLD 120 +OBJECTIVES_POINT_THRESHOLD 130 + +## Allows the storyteller to scale event frequencies based on population +ALLOW_STORYTELLER_POP_SCALING + +## Thresholds that population frequency scalling penalize up to. +MUNDANE_POP_SCALE_THRESHOLD 10 +MODERATE_POP_SCALE_THRESHOLD 15 +MAJOR_POP_SCALE_THRESHOLD 40 +ROLESET_POP_SCALE_THRESHOLD 45 +OBJECTIVES_POP_SCALE_THRESHOLD 40 + +## The maximum penalties population scalling will apply to the tracks for having less pop than POP_SCALE_THRESHOLD. This is treated as percentages +MUNDANE_POP_SCALE_PENALTY 30 +MODERATE_POP_SCALE_PENALTY 30 +MAJOR_POP_SCALE_PENALTY 30 +ROLESET_POP_SCALE_PENALTY 30 +OBJECTIVES_POP_SCALE_PENALTY 30 diff --git a/config/interviews.txt b/config/interviews.txt index 2b234cc61905..1e845093085f 100644 --- a/config/interviews.txt +++ b/config/interviews.txt @@ -8,5 +8,5 @@ INTERVIEW_WELCOME_MSG Welcome to our server. As you have not played here before, INTERVIEW_QUESTIONS Why have you joined the server today? INTERVIEW_QUESTIONS Have you played space-station 13 before? If so, on what servers? INTERVIEW_QUESTIONS Do you know anybody on the server today? If so, who? -INTERVIEW_QUESTIONS Have you read and understood our [rules](https://tgstation13.org/wiki/Rules)? +INTERVIEW_QUESTIONS Have you read and understood our [rules](https://wiki.monkestation.com/)? INTERVIEW_QUESTIONS Do you have any additional comments or questions? diff --git a/goon/icons/obj/food.dmi b/goon/icons/obj/food.dmi new file mode 100644 index 000000000000..c8ca42d14f49 Binary files /dev/null and b/goon/icons/obj/food.dmi differ diff --git a/html/changelogs/archive/2023-10.yml b/html/changelogs/archive/2023-10.yml index 86b863a47d93..8216d98d0910 100644 --- a/html/changelogs/archive/2023-10.yml +++ b/html/changelogs/archive/2023-10.yml @@ -100,3 +100,185 @@ - rscadd: Cool Glerm Pet Beacon - rscadd: Ordinary Flash - rscadd: Ordinary Flash Pet Beacon +2023-10-15: + KoboldCommando: + - rscadd: 7 new latejoin spooktober jobs! + wraith-54321: + - bugfix: clockwork armaments now actually gives weapons again +2023-10-16: + TTNT789: + - balance: halves heralds armor pierce +2023-10-17: + NicoDeLuna: + - rscadd: 'New roundstart hair sprite: Monkey King' + Singul0, Melbert, Motho, jlsnow301, Rhials, Gboster: + - rscadd: Motho - Bitrunners can now have alternative job titles. FTU urges that + these titles are purely cosmetic and not representative of bitrunning ability. + - rscadd: Rhials - Two new psyker-oriented virtual domains -- Crate Chaos and Infected + Domain. + - rscadd: Rhials - Map helper for cyber-police corpse spawn. + - rscadd: Rhials - Map helper for swapping the encrypted crate in an area with a + random crate from that same area. + - rscadd: jlsnow301 - Quantum servers now look for a new machine called a byteforge + to spawn loot on- no longer on an invisible landmark. This should make the rooms + rebuildable after disasters. + - rscadd: jlsnow301 - Most bitrunning machinery is now researchable and buildable + via circuits in the engineering protolathe. + - bugfix: jlsnow301 - Added extra checks to bitrunning domain cleanup so avatars + are deleted properly. + - bugfix: Singul0 - Fixes missing baseturfs and clowns in mining planet VDOM. + - bugfix: Melbert - Virtual Drink Glasses now look correct. + - bugfix: Gboster - Makes the clown mining planet virtual plane actually able to + be solved solo. + lmenvs: + - rscadd: Adds loafing mechanic +2023-10-21: + CL0WNE: + - rscadd: A new fart line "_____ unleashes their animal spirit!" + - rscadd: Flashlights to kinetic crusher variants (machete,spear,hammer,etc.) + KittyNoodle: + - rscdel: Lots of weirdly placed powerful gear is gone now. + - qol: singularity engine cameras are now emp-proof + - bugfix: tramstation ai solars have been remodeled to function. + - bugfix: all bars now have the proper holosign emitters + KoboldCommando: + - rscadd: The botany infuser and splicer are merged into one machine +2023-10-23: + DexeeXI: + - rscadd: Readded missing water tank for Botany on Metastation + - rscadd: Readded a missing helper for the disposals system on Metastation + - rscadd: plantgenes machine in the seed vaults! + - rscdel: ALL SM gas filters for gas synthesis are removed, but the space is still + there if folk want to setup such filters for their operations. + - qol: moved the plantgenes machine and all the botany lexicons on Tram to a different + table so its not stacked. + - rscdel: reverted the "clown asteroid" on Tramstation down to 99% stock. It should + still play clown.wmv when over there, because you still are a clown if you wanna + use the place. + - rscadd: dinnerware, nanomed vendors added to Centcom + - rscadd: readded the missing tcomm server so syndie comms work again. it was on + centcom, its now back on centcom. + - qol: fixed some of the busted disposals. + - qol: zones for rooms in Oshan Medical are redone. Medbay Central is now a "common + sense" location so cargo crates can be opened properly. +2023-10-24: + Gboster-0: + - rscadd: Added a lot more SMES + - bugfix: Singularity to PTL connection on kilo was always broken, now its not so + much broken + - rscadd: Split the technology tab into gear and abilities tabs on the bitrunner + console + - qol: The bitrunning disks were split into their individual abilities, no more + wasting points on virtual toilets + - image: All the abilities and combat gear in bitrunner's stolen now has unique + sprites + KittyNoodle: + - bugfix: Syndicate laser muskets can now be worn on armor again + - rscadd: Non-lethal and less than lethal options for autorifles have been made + available. + - balance: Autorifles have been moved to imports and made more expensive. + - balance: Higher technologies are now needed to access autorifle ammo. + - refactor: Autorifle code has been modularized + OtieBoy: + - bugfix: fixed the Tramstation incinerator room atmospherics so that air supply + and scrubbing pipenets are connected properly from roundstart + SeeBeeSee: + - rscadd: Added new quirk that applies a permanent Extra-Sensory Paranoia - no lobotomies + for this one. + - rscadd: Added a new version of ESP that summons 10 stalkers by default, and can + be called by an admin for more. + lmenvs: + - rscadd: Adds donator items for Senri, Mjolnir, Random and Spinnermaster! Thank + you guys! +2023-10-25: + Dexee: + - qol: 75% audit of doors, areas done. A TON of door names will have changed to + make better sense. + - qol: NAVIGATE VERBS! THEY WORK NOW! It covers the bog standard stuff but people + will be able to actually use the damn thing. Still working on a solution for + the lesser known things like certain rooms in maints or things like that. + - qol: MEDBAY CENTRAL is now in the most common sense spot and not some bumfuck + hallway nobody cares about. + - qol: Psychologist now legally has an office. + - qol: The Genetics Lab doors should all now be accessible to both Geneticists and + Med Staff. + - qol: Botany now has weedkillers. Though this may be moot because it should be + blacklisted by this point, but you'll never know. + - qol: Added some lights here and there. Many to count. + - qol: Moved a ton of the flood mitigation drains to get them off things like vents, + scrubbers and lights in the central hallway. + - qol: Adjusted a TON of doors to not only reflect what departments they actually + are, but also their permissions where needed. + - rscadd: a single stethoscope is now in the operating theatre. What kind of doctors + are you if you don't have your old timey thing that proves you're a doctor! + - qol: Moved the ATMOS main APC because YOU CANT PUT THAT IN GLASS (it also causes + it to render under the glass so its difficult for those that dont know where + to look in order to fix it) + - qol: Redid wiring for the ATMOS Turbine Generator. + - qol: Redid the PIPING for the ATMOS Turbine Generator. You no longer have a broken + pipe in a window that prevents you from even starting it. There, you now have + an alternate power source. + - qol: 'Added a plumbing disposal unit connected to the drain system so that the + system can, hopefully at this point after multiple test attempts, function properly. + + Delta:' + - qol: 'Moved 2 tiles of pipes and wires to connect to maints by engineering due + to the SMES additions. + + Tram:' + - rscadd: 'a single piece of missing layer 1 wire that was preventing the AI sat + solars from charging correctly. + + Icebox Arcade Bar:' + - qol: moved APC, fixed wires. + dwasint: + - rscadd: votable story tellers +2023-10-26: + Dexee: + - qol: even more doors audited and names fixed. + - rscadd: Custodial Closet/Janitor now on NAVIGATE VERB + - qol: 'moved the prisoner spawners to the brig bridge next to the hole so they + can throw themselves in. (note: if an AI main is reading this, no, you are not + allowed to release the prisoners under Law 1 unless the HOS/Captain gives you + specific position. This is to help the prisoners that start on Oshan don''t + just fucking die)' + - qol: 'There are now patient rooms. Yay. + + Tram:' + - rscadd: a single missing disposal pipe in front of det's office so now trash doesn't + come flying out of the floor. + DexeeXI: + - qol: fixed some bad door perms (one v all) + - qol: fixed tiles in science being marked as AIRLESS tiles instead of... well, + not. + - qol: some lights replaced in maints with maints varients. offsets should be getting + adjusted so they look less like shit. + MomoBerri: + - bugfix: sprite ffix + scriptis: + - rscadd: don't blink. don't blink not even for a second +2023-10-27: + Dexee: + - rscadd: New navmakers for some lesser known places, as well as most station solar + platforms + - qol: 'Moved/replaced a ton of existing markers to better common sense spots. + + Tram:' + - qol: 'Aseembly lab door renamed to Assembly Lab. + + Ice Box Coggers Bar:' + - rscadd: added the missing Booze-O-Mat. (thanks Skell Bones II) +2023-10-28: + DexeeXI: + - rscadd: Centcom map now has nav support + - rscadd: Icebox now has cryo signs in spots to point towards the room, because + its on lower Z level. + - bugfix: Fixed railings on Delta, Meta, Icebox. + - rscdel: Lots of railings on Northstar + - rscadd: Icebox now has signs next to the stairs to the morgue to help indicate + where the Morgue is (z level problems and navigate) + - qol: updated interview link for da rulez. + Salted-Zen: + - balance: Machete now has 25 block instead of 50 + dwasint: + - bugfix: malf ai should roll again diff --git a/icons/mob/clothing/head/plasmaman_head.dmi b/icons/mob/clothing/head/plasmaman_head.dmi index 3a737ca3d03d..42a209676ccb 100644 Binary files a/icons/mob/clothing/head/plasmaman_head.dmi and b/icons/mob/clothing/head/plasmaman_head.dmi differ diff --git a/icons/mob/clothing/under/plasmaman.dmi b/icons/mob/clothing/under/plasmaman.dmi index 57643d4f7f58..3738989c8cb4 100644 Binary files a/icons/mob/clothing/under/plasmaman.dmi and b/icons/mob/clothing/under/plasmaman.dmi differ diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 7d753efe421b..4284c4b92f99 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 4fdf61b03eb9..fe336a4d5964 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/clothing/head/plasmaman_hats.dmi b/icons/obj/clothing/head/plasmaman_hats.dmi index 8c938d9e0b42..3ddd2da39cf4 100644 Binary files a/icons/obj/clothing/head/plasmaman_hats.dmi and b/icons/obj/clothing/head/plasmaman_hats.dmi differ diff --git a/icons/obj/clothing/under/plasmaman.dmi b/icons/obj/clothing/under/plasmaman.dmi index dd4941792df4..85c3999ddf59 100644 Binary files a/icons/obj/clothing/under/plasmaman.dmi and b/icons/obj/clothing/under/plasmaman.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 6b19eafc327f..680fcd279384 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/machines/bitrunning.dmi b/icons/obj/machines/bitrunning.dmi index a910a16b35cf..b3f8ad63a6c9 100644 Binary files a/icons/obj/machines/bitrunning.dmi and b/icons/obj/machines/bitrunning.dmi differ diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index 518624aab840..2421fbb208d3 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi index bdd5290eb0ae..2cdbc55ea122 100644 Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ diff --git a/monkestation/_maps/RandomBars/Icebox/BarSM.dmm b/monkestation/_maps/RandomBars/Icebox/BarSM.dmm index 8fd9770d46b5..c911052fec39 100644 --- a/monkestation/_maps/RandomBars/Icebox/BarSM.dmm +++ b/monkestation/_maps/RandomBars/Icebox/BarSM.dmm @@ -24,17 +24,6 @@ }, /turf/open/floor/pod/dark, /area/station/commons/lounge) -"aZ" = ( -/obj/structure/bed/dogbed{ - name = "pet bed"; - desc = "A comfy-looking pet bed. You can even strap your pet in, in case the gravity turns off." - }, -/mob/living/simple_animal/pet/cat/kitten{ - gender = "female"; - name = "Blu" - }, -/turf/open/floor/carpet/neon/simple/yellow/nodots, -/area/station/service/bar/backroom) "bo" = ( /obj/structure/cable, /obj/machinery/door/airlock/engineering/glass/critical{ @@ -591,8 +580,6 @@ /obj/item/reagent_containers/cup/beaker/large, /obj/item/vending_refill/cigarette, /obj/structure/table/reinforced, -/obj/item/storage/box/lethalshot, -/obj/item/storage/box/beanbag, /turf/open/floor/carpet/neon/simple/yellow/nodots, /area/station/service/bar/backroom) "uo" = ( @@ -905,18 +892,6 @@ "Ec" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/autolathe, -/obj/item/stack/sheet/iron/ten, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, -/obj/item/stack/sheet/glass, /turf/open/floor/pod/light, /area/station/service/bar) "Eu" = ( @@ -1212,11 +1187,9 @@ pixel_x = 4; pixel_y = -4 }, -/obj/item/clothing/gloves/color/yellow, /obj/item/stack/cable_coil, -/obj/item/mod/control/pre_equipped/engineering{ - name = "Barkeeper MODsuit" - }, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/mod/control/pre_equipped/empty, /turf/open/floor/carpet/neon/simple/yellow/nodots, /area/station/service/bar/backroom) "KG" = ( @@ -1233,6 +1206,7 @@ pixel_y = 6 }, /obj/item/reagent_containers/cup/rag, +/obj/item/holosign_creator/robot_seat/bar, /turf/open/floor/pod/light, /area/station/service/bar) "KL" = ( @@ -1873,7 +1847,7 @@ EK "} (17,1,1) = {" Kf -aZ +Ix Ix qu wG diff --git a/monkestation/_maps/RandomBars/Icebox/Drunkopsbar.dmm b/monkestation/_maps/RandomBars/Icebox/Drunkopsbar.dmm index e6c50a1fda6c..4d5d85804d58 100644 --- a/monkestation/_maps/RandomBars/Icebox/Drunkopsbar.dmm +++ b/monkestation/_maps/RandomBars/Icebox/Drunkopsbar.dmm @@ -592,7 +592,6 @@ /turf/open/floor/iron/dark, /area/station/service/bar) "Gc" = ( -/obj/structure/closet/gimmick/tacticool, /obj/structure/cable, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/tacticool/skirt, @@ -600,6 +599,9 @@ /obj/item/toy/sword, /obj/structure/extinguisher_cabinet/directional/north, /obj/item/clothing/head/collectable/swat, +/obj/structure/closet{ + icon_state = "syndicate" + }, /turf/open/floor/mineral/plastitanium, /area/station/service/bar) "Gv" = ( @@ -726,12 +728,14 @@ /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/stripes/red/line, /obj/structure/railing, -/obj/structure/closet/gimmick/tacticool, /obj/item/clothing/under/syndicate/tacticool, /obj/item/clothing/under/syndicate/tacticool/skirt, /obj/item/toy/gun, /obj/item/toy/sword, /obj/item/clothing/mask/gas, +/obj/structure/closet{ + icon_state = "syndicate" + }, /turf/open/floor/mineral/plastitanium, /area/station/service/bar) "Pk" = ( @@ -785,6 +789,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, /area/station/service/bar/backroom) "Qe" = ( @@ -849,7 +854,9 @@ /obj/item/toy/mecha/mauler, /obj/item/toy/sword, /obj/item/clothing/mask/gas, -/obj/structure/closet, +/obj/structure/closet{ + icon_state = "syndicate" + }, /turf/open/floor/mineral/plastitanium, /area/station/service/bar) "RX" = ( @@ -924,7 +931,9 @@ /obj/item/clothing/under/syndicate/tacticool/skirt, /obj/item/toy/gun, /obj/item/toy/sword, -/obj/structure/closet, +/obj/structure/closet{ + icon_state = "syndicate" + }, /turf/open/floor/mineral/plastitanium, /area/station/service/bar) "TO" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/MaidCafe.dmm b/monkestation/_maps/RandomBars/Icebox/MaidCafe.dmm index f5856550ceb3..a2a741c45fec 100644 --- a/monkestation/_maps/RandomBars/Icebox/MaidCafe.dmm +++ b/monkestation/_maps/RandomBars/Icebox/MaidCafe.dmm @@ -38,7 +38,7 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/pale/style_random, -/obj/structure/window/reinforced/fulltile, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/grass, /area/station/commons/lounge) "gO" = ( @@ -207,17 +207,14 @@ /area/station/service/bar/backroom) "tc" = ( /obj/machinery/duct, -/mob/living/basic/carp/pet/cayenne{ - desc = "It's Paprika! One of the Spider Clan's lovable Space Carp!"; - faction = list("neutral"); - name = "Paprika"; - real_name = "Paprika" - }, -/obj/structure/bed/dogbed/cayenne{ - name = "Paprika's bed" - }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, +/mob/living/basic/carp/pet{ + name = "Paprika" + }, +/obj/structure/bed/dogbed{ + name = "fish bed" + }, /turf/open/floor/carpet/black, /area/station/service/bar) "tg" = ( @@ -284,7 +281,7 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/pale/style_random, -/obj/structure/window/reinforced/fulltile, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/grass, /area/station/service/bar) "Ak" = ( @@ -568,9 +565,8 @@ /obj/item/reagent_containers/cup/beaker/large, /obj/item/reagent_containers/cup/beaker/large, /obj/item/vending_refill/cigarette, -/obj/item/storage/box/lethalshot, -/obj/item/storage/box/beanbag, -/obj/structure/table/wood, +/obj/item/holosign_creator/robot_seat/bar, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/wood/tile, /area/station/service/bar/backroom) "Ou" = ( @@ -690,13 +686,6 @@ /area/station/service/bar) "TT" = ( /obj/structure/rack, -/obj/item/melee/energy/sword/holographic/red, -/obj/item/melee/energy/sword/holographic/red, -/obj/item/melee/energy/sword/holographic/green, -/obj/item/melee/energy/sword/holographic/green, -/obj/item/melee/energy/sword/holographic, -/obj/item/melee/energy/sword/holographic, -/obj/item/melee/energy/sword/bananium, /obj/item/toy/katana{ desc = "As seen in your favourite Japanese cartoon."; name = "anime katana" @@ -710,6 +699,9 @@ name = "anime katana" }, /obj/machinery/light/directional/west, +/obj/item/toy/sword, +/obj/item/toy/sword, +/obj/item/toy/sword, /turf/open/floor/wood/large, /area/station/commons/lounge) "TY" = ( @@ -729,10 +721,10 @@ /obj/structure/flora/bush/ferny/style_random, /obj/structure/flora/bush/flowers_pp/style_random, /obj/structure/flora/bush/pale/style_random, -/obj/structure/window/reinforced/fulltile, /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/grass, /area/station/service/bar) "UN" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm b/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm index b780521dc727..7c23ea377a2a 100644 --- a/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm +++ b/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm @@ -163,6 +163,7 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/bronze/filled, /area/station/service/bar/backroom) "hS" = ( @@ -576,6 +577,10 @@ }, /turf/open/floor/bronze/filled, /area/station/service/bar) +"Fm" = ( +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/carpet/lone, +/area/station/service/theater) "FS" = ( /obj/machinery/restaurant_portal/bar, /turf/open/floor/bronze/filled, @@ -643,6 +648,10 @@ "IC" = ( /turf/closed/wall/mineral/bronze, /area/station/commons/lounge) +"IQ" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/bronze/filled, +/area/station/service/bar) "IT" = ( /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ @@ -654,6 +663,10 @@ /obj/structure/closet/secure_closet/bar, /turf/open/floor/bronze/filled, /area/station/service/bar/backroom) +"Ky" = ( +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/bronze, +/area/station/commons/lounge) "KP" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/bronze, @@ -966,7 +979,7 @@ EK "} (5,1,1) = {" nZ -YM +Fm SW OY Pz @@ -1016,7 +1029,7 @@ oC oC oC ux -ZP +Ky nl EK "} @@ -1101,7 +1114,7 @@ dJ uw Ag PC -zS +IQ EK "} (15,1,1) = {" diff --git a/monkestation/_maps/RandomBars/Icebox/cultbar_icebox.dmm b/monkestation/_maps/RandomBars/Icebox/cultbar_icebox.dmm index b2207d8af14d..9ee441ee8e9f 100644 --- a/monkestation/_maps/RandomBars/Icebox/cultbar_icebox.dmm +++ b/monkestation/_maps/RandomBars/Icebox/cultbar_icebox.dmm @@ -635,10 +635,6 @@ /obj/item/toy/toy_dagger, /turf/open/floor/cult, /area/station/commons/lounge) -"Ha" = ( -/obj/structure/constructshell, -/turf/open/floor/cult, -/area/station/service/bar/backroom) "HO" = ( /obj/structure/table/wood/fancy/red, /obj/item/food/pie/cream{ @@ -1297,7 +1293,7 @@ EK HZ QV rf -Ha +rf TV xc zG diff --git a/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm b/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm index b93b69374641..77cd09b67802 100644 --- a/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm +++ b/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm @@ -99,6 +99,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/eighties/red, /area/station/commons/lounge) "jI" = ( @@ -277,6 +278,7 @@ "BO" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/eighties, /area/station/commons/lounge) "BS" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm index 4522dcde5860..213c0dd1a3e1 100644 --- a/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm +++ b/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm @@ -91,6 +91,7 @@ /turf/open/floor/wood/large, /area/station/commons/lounge) "ec" = ( +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/orange, /area/station/service/bar) "eG" = ( @@ -100,6 +101,7 @@ name = "Bar Backroom" }, /obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/service/bar/backroom) "eS" = ( @@ -149,6 +151,7 @@ /area/station/service/bar) "hH" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/orange, /area/station/service/bar) "ip" = ( @@ -171,6 +174,7 @@ /area/station/commons/lounge) "jn" = ( /obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/service/bar/backroom) "jp" = ( @@ -205,6 +209,7 @@ /obj/effect/turf_decal/siding/purple{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/eighties, /area/station/service/theater) "kp" = ( @@ -276,6 +281,7 @@ dir = 4 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "pH" = ( @@ -348,6 +354,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/service/bar/backroom) "ut" = ( @@ -372,6 +379,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/commons/lounge) "vl" = ( @@ -447,10 +455,12 @@ "xW" = ( /obj/effect/landmark/event_spawn, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/orange, /area/station/service/bar) "xX" = ( /obj/structure/sink/kitchen/directional/east, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/service/bar/backroom) "ys" = ( @@ -612,6 +622,7 @@ name = "bar mixing area"; req_access = list("bar") }, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/service/bar) "FR" = ( @@ -629,6 +640,7 @@ /area/station/commons/lounge) "FS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/cable, /turf/open/floor/eighties/red, /area/station/service/bar/backroom) "FW" = ( @@ -722,6 +734,7 @@ /area/station/service/bar/backroom) "Jv" = ( /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/orange, /area/station/service/bar) "Kc" = ( @@ -866,7 +879,7 @@ /turf/open/floor/carpet/neon/simple/purple, /area/station/commons/lounge) "OO" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/service/bar) "OW" = ( @@ -896,6 +909,10 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/neon/simple/red, /area/station/commons/lounge) +"PL" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/turf/template_noop, +/area/template_noop) "PN" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -1119,7 +1136,7 @@ dn XN "} (4,1,1) = {" -Ow +PL Ow Ow eS diff --git a/monkestation/_maps/RandomBars/Icebox/junglebar.dmm b/monkestation/_maps/RandomBars/Icebox/junglebar.dmm index ec495ac3e99d..bf3174b6ca2d 100644 --- a/monkestation/_maps/RandomBars/Icebox/junglebar.dmm +++ b/monkestation/_maps/RandomBars/Icebox/junglebar.dmm @@ -6,6 +6,15 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) +"az" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/power/floodlight, +/obj/item/wrench, +/turf/open/floor/wood, +/area/station/commons/lounge) "bp" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, @@ -94,6 +103,7 @@ /area/station/commons/lounge) "hi" = ( /obj/machinery/firealarm/directional/east, +/obj/structure/chair/sofa/left/brown, /turf/open/misc/grass/jungle, /area/station/commons/lounge) "ho" = ( @@ -288,6 +298,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/dim/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "Es" = ( @@ -301,6 +312,7 @@ /area/template_noop) "Fz" = ( /obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood, /area/station/service/bar) "FY" = ( @@ -355,9 +367,6 @@ /area/station/commons/lounge) "Km" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, /obj/machinery/restaurant_portal/bar, /turf/open/floor/wood, /area/station/commons/lounge) @@ -415,7 +424,9 @@ /area/station/service/bar) "QV" = ( /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/wood, /area/station/commons/lounge) "Rp" = ( @@ -432,6 +443,12 @@ /obj/machinery/light/dim/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) +"Tg" = ( +/obj/machinery/holopad, +/turf/open/misc/dirt/jungle/wasteland{ + slowdown = 0 + }, +/area/station/commons/lounge) "TK" = ( /obj/machinery/status_display/evac/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -441,6 +458,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/commons/lounge) +"Vc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) "Vd" = ( /obj/machinery/atm, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -481,6 +506,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, /obj/structure/cable, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, /area/station/service/bar/backroom) @@ -491,7 +517,7 @@ EK tV xY OC -Ke +Vc TK YA pl @@ -530,7 +556,7 @@ de EK EK EK -ac +xY Xr Xr dB @@ -543,7 +569,7 @@ EK (5,1,1) = {" ac xY -VL +az VL Mt Df @@ -602,7 +628,7 @@ tx GX Mt qR -qR +Tg qR Xr Xr diff --git a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm index 2aac264c7682..ea81c388e03d 100644 --- a/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm +++ b/monkestation/_maps/RandomEngines/KiloStation/singularity.dmm @@ -38,7 +38,7 @@ /turf/open/floor/iron, /area/station/engineering/supermatter/room) "fx" = ( -/obj/structure/cable, +/obj/structure/cable/layer1, /turf/open/floor/plating, /area/station/engineering/supermatter/room) "fN" = ( @@ -195,6 +195,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"nB" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/supermatter/room) "ob" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -208,7 +215,7 @@ "oe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/window/plasma, -/obj/structure/cable, +/obj/structure/cable/multilayer/connected, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "or" = ( @@ -220,14 +227,13 @@ /turf/open/floor/iron, /area/station/engineering/supermatter/room) "oN" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Departures Lounge"; - name = "shuttle camera" - }, /obj/machinery/light/blacklight/directional/north, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/machinery/camera/emp_proof/directional/west{ + c_tag = "Singularity Engine #2" + }, /turf/open/floor/iron, /turf/open/floor/iron, /turf/open/floor/iron, @@ -298,9 +304,8 @@ /turf/open/floor/iron, /area/station/engineering/supermatter/room) "th" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Departures Lounge"; - name = "shuttle camera" +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #3" }, /turf/open/floor/plating, /area/station/engineering/supermatter/room) @@ -471,6 +476,15 @@ }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"Ga" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable/layer1, +/obj/structure/cable, +/obj/machinery/camera/emp_proof/directional/west{ + c_tag = "Singularity Engine #4" + }, +/turf/open/space/basic, +/area/station/engineering/supermatter/room) "Hs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -535,13 +549,12 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "LD" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Departures Lounge"; - name = "shuttle camera" - }, /obj/machinery/light/blacklight/directional/north, /obj/structure/cable, /obj/machinery/airalarm/directional/north, +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #1" + }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "LZ" = ( @@ -592,6 +605,7 @@ "NS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/sign/directions/ptl/directional/east, +/obj/machinery/light/blacklight/directional/east, /turf/open/floor/iron, /area/station/engineering/supermatter/room) "OT" = ( @@ -987,7 +1001,7 @@ IJ cY cY cY -vF +Ga vF XV cY @@ -1206,8 +1220,8 @@ LD oK xG xG +nB kI -re NS oe RN @@ -1229,9 +1243,9 @@ rW Qn nb dq +nb mS zs -zs fx Ar zs diff --git a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm index f18c49ac4ab4..8b2727b91ebf 100644 --- a/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/KiloStation/supermatter.dmm @@ -460,8 +460,9 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "re" = ( -/obj/structure/sign/warning/no_smoking{ - pixel_x = 30 +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 4 }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -488,10 +489,8 @@ /turf/open/floor/circuit/red, /area/station/engineering/supermatter/room) "sz" = ( -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "sF" = ( @@ -508,7 +507,6 @@ /area/station/engineering/supermatter/room) "sY" = ( /obj/effect/turf_decal/loading_area, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "th" = ( @@ -538,6 +536,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/warning/no_smoking{ + pixel_x = 30 + }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "uc" = ( @@ -606,6 +607,11 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"vz" = ( +/obj/structure/cable, +/obj/machinery/power/smes/engineering, +/turf/open/floor/circuit/red, +/area/station/engineering/supermatter/room) "vD" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -1446,10 +1452,6 @@ /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Wo" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, @@ -1493,10 +1495,6 @@ /turf/closed/wall/r_wall, /area/station/engineering/supermatter) "Yu" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/effect/turf_decal/box, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -2012,7 +2010,7 @@ LO rW Qn dq -Ar +vz Ee fx Ar diff --git a/monkestation/_maps/RandomEngines/MetaStation/singularity.dmm b/monkestation/_maps/RandomEngines/MetaStation/singularity.dmm index f5d3388cd14e..89885f867efa 100644 --- a/monkestation/_maps/RandomEngines/MetaStation/singularity.dmm +++ b/monkestation/_maps/RandomEngines/MetaStation/singularity.dmm @@ -376,9 +376,8 @@ /area/station/engineering/supermatter/room) "AZ" = ( /obj/item/kirbyplants/random, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room North-West"; - network = list("ss13","engine","engineering") +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #1" }, /turf/open/floor/carpet/black, /area/station/engineering/supermatter/room) @@ -611,6 +610,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"Rw" = ( +/obj/structure/grille, +/obj/machinery/camera/emp_proof/directional/west{ + c_tag = "Singularity Engine #4" + }, +/turf/open/space/basic, +/area/station/engineering/supermatter/room) "Sh" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -634,6 +640,12 @@ "SS" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"UU" = ( +/obj/machinery/camera/emp_proof/directional/east{ + c_tag = "Singularity Engine #3" + }, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "Vk" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -644,9 +656,8 @@ /turf/open/floor/plating, /area/station/engineering/supermatter/room) "Vn" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room North-West"; - network = list("ss13","engine","engineering") +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #2" }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) @@ -938,7 +949,7 @@ je je "} (10,1,1) = {" -zC +UU np gQ HO @@ -1108,7 +1119,7 @@ An An ol An -Bc +Rw nM KS KS diff --git a/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm b/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm index a69772f2a04a..de068cb2ac8a 100644 --- a/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/MetaStation/supermatter.dmm @@ -172,6 +172,10 @@ "je" = ( /turf/template_noop, /area/space) +"jw" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/engineering/supermatter/room) "kf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -227,10 +231,6 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "nM" = ( @@ -693,10 +693,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "HO" = ( @@ -1194,8 +1192,8 @@ eg ZC yT Qn -ck -ck +jw +jw UI Yf MT diff --git a/monkestation/_maps/RandomEngines/TramStation/singularity.dmm b/monkestation/_maps/RandomEngines/TramStation/singularity.dmm index 51f8cfccb601..6a41ab8ffb85 100644 --- a/monkestation/_maps/RandomEngines/TramStation/singularity.dmm +++ b/monkestation/_maps/RandomEngines/TramStation/singularity.dmm @@ -156,9 +156,8 @@ /area/station/engineering/supermatter/room) "qR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room North-West"; - network = list("ss13","engine","engineering") +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #2" }, /turf/open/floor/iron, /area/station/engineering/supermatter/room) @@ -355,11 +354,10 @@ /area/space/nearstation) "OY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/camera/directional/north{ - c_tag = "Engineering - Engine Room North-West"; - network = list("ss13","engine","engineering") - }, /obj/machinery/power/energy_accumulator/grounding_rod, +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #1" + }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) "Pi" = ( @@ -491,6 +489,12 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"ZX" = ( +/obj/machinery/camera/emp_proof/directional/north{ + c_tag = "Singularity Engine #3" + }, +/turf/open/space/basic, +/area/station/engineering/supermatter/room) (1,1,1) = {" TZ @@ -942,7 +946,7 @@ Gn Ho Ho Ho -Zh +ZX Zh jS zz diff --git a/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm b/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm index 386c03667bad..666694e1d186 100644 --- a/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm +++ b/monkestation/_maps/RandomEngines/TramStation/supermatter.dmm @@ -13,8 +13,6 @@ /area/station/engineering/supermatter) "bw" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "bG" = ( @@ -31,14 +29,12 @@ /area/station/engineering/supermatter/room) "cL" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 4 - }, /obj/effect/turf_decal/trimline/yellow/arrow_ccw, /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 1 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "dt" = ( @@ -309,12 +305,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter) -"ln" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "lr" = ( /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4; @@ -446,10 +436,6 @@ /area/station/engineering/supermatter) "oe" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/engineering/supermatter/room) @@ -825,10 +811,6 @@ /area/station/engineering/supermatter/room) "Fs" = ( /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister, /turf/open/floor/engine, /area/station/engineering/supermatter/room) "FF" = ( @@ -1591,7 +1573,7 @@ ft XW Rq ix -ln +TD oe Qg TU diff --git a/monkestation/code/__HELPERS/mobs.dm b/monkestation/code/__HELPERS/mobs.dm deleted file mode 100644 index cf7a6bba7065..000000000000 --- a/monkestation/code/__HELPERS/mobs.dm +++ /dev/null @@ -1,19 +0,0 @@ -GLOBAL_LIST_INIT(fur_tone_names, list( - "ffffff" = "Albino", - "ffb089" = "Chimp", - "aeafb3" = "Grey", - "bfd0ca" = "Snow", - "ce7d54" = "Orange", - "c47373" = "Red", - "f4e2d5" = "Cream" - )) - -GLOBAL_LIST_INIT(fur_tones, sort_list(list( - "ffffff", - "ffb089", - "aeafb3", - "bfd0ca", - "ce7d54", - "c47373", - "f4e2d5", - ))) diff --git a/monkestation/code/__HELPERS/turfs.dm b/monkestation/code/__HELPERS/turfs.dm new file mode 100644 index 000000000000..16b4c6c88758 --- /dev/null +++ b/monkestation/code/__HELPERS/turfs.dm @@ -0,0 +1,14 @@ +/**Shake() and then explode a turf based on the passed vars + * shake_duration: how long to shake the turf for before calling explosion() + * explosion_stats: a list of what stats to give the called explosion() + * sound: if passed then what sound to play at the start of the shaking, if a list is passed then it will pick() from that list +**/ +/turf/proc/structural_collapse(shake_duration = 1 SECONDS, explosion_stats = list(1, 2, 3), sound/played_sound) + if(QDELETED(src)) + return + + if(played_sound) + playsound(src, (islist(played_sound) ? pick(played_sound) : played_sound), 60) + visible_message(span_userdanger("\The [src] looks like its about to collapse!")) + Shake(0.2, 0.2, shake_duration) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), src, explosion_stats[1], explosion_stats[2], explosion_stats[3]), shake_duration) diff --git a/monkestation/code/datums/brain_damage/magic.dm b/monkestation/code/datums/brain_damage/magic.dm new file mode 100644 index 000000000000..01a451e8c53e --- /dev/null +++ b/monkestation/code/datums/brain_damage/magic.dm @@ -0,0 +1,65 @@ +/datum/brain_trauma/magic/stalker_multiple + name = "Stalking Phantoms" + desc = "Patient is stalked by multiple phantoms only they can see." + scan_desc = "extra-EXTRA-sensory paranoia" + gain_text = span_warning("You feel like the gods have released the hounds...") + lose_text = span_notice("You no longer feel the wrath of the gods watching you.") + + var/list/stalkers = list() + + var/close_stalker = FALSE //For heartbeat + +/datum/brain_trauma/magic/stalker_multiple/Destroy() + for (var/stalker in stalkers) + QDEL_NULL(stalker) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/on_gain() + create_stalker_multiple(10) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker() + var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner + var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner) + stalkers += stalker + +/datum/brain_trauma/magic/stalker_multiple/proc/create_stalker_multiple(count) + var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, -6, 0, 6, 12), owner.z) //random corner + + for (var/x = 0; x < count; x++) + var/obj/effect/client_image_holder/stalker_phantom/stalker = new(stalker_source, owner) + stalkers += stalker + +/datum/brain_trauma/magic/stalker_multiple/on_lose() + for (var/stalker in stalkers) + QDEL_NULL(stalker) + return ..() + +/datum/brain_trauma/magic/stalker_multiple/on_life(seconds_per_tick, times_fired) + // Dead and unconscious people are not interesting to the psychic stalker. + if(owner.stat != CONSCIOUS) + return + + // Not even nullspace will keep it at bay. + for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers) + if(!stalker || !stalker.loc || stalker.z != owner.z) + qdel(stalker) + create_stalker() + + for (var/obj/effect/client_image_holder/stalker_phantom/stalker in stalkers) + if(get_dist(owner, stalker) <= 1) + playsound(owner, 'sound/magic/demon_attack1.ogg', 10) + owner.visible_message(span_warning("[owner] is torn apart by invisible claws!"), span_userdanger("Ghostly claws tear your body apart!")) + owner.take_bodypart_damage(rand(20, 45), wound_bonus=CANT_WOUND) + else if(SPT_PROB(30, seconds_per_tick)) + stalker.forceMove(get_step_towards(stalker, owner)) + if(get_dist(owner, stalker) <= 8) + if(!close_stalker) + var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) + owner.playsound_local(owner, slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) + close_stalker = TRUE + else + if(close_stalker) + owner.stop_sound_channel(CHANNEL_HEARTBEAT) + close_stalker = FALSE + ..() diff --git a/monkestation/code/datums/patreon_data.dm b/monkestation/code/datums/patreon_data.dm index 41746daa702d..f64889c11f66 100644 --- a/monkestation/code/datums/patreon_data.dm +++ b/monkestation/code/datums/patreon_data.dm @@ -41,6 +41,8 @@ if(query_get_rank.NextRow()) if(query_get_rank.item[1]) owned_rank = query_get_rank.item[1] + if(owned_rank == "UNSUBBED2") + owned_rank = NO_RANK else owned_rank = NO_RANK qdel(query_get_rank) diff --git a/monkestation/code/datums/quirks/negative_quirks.dm b/monkestation/code/datums/quirks/negative_quirks.dm index e52ce25a73b2..84a9716adda7 100644 --- a/monkestation/code/datums/quirks/negative_quirks.dm +++ b/monkestation/code/datums/quirks/negative_quirks.dm @@ -202,3 +202,19 @@ /datum/quirk/item_quirk/allergic/post_add() if(isipc(quirk_holder)) //monkestation addition to_chat(quirk_holder, span_boldnotice("Your chassis feels frail.")) + +/datum/quirk/extra_sensory_paranoia + name = "Extra-Sensory Paranoia" + desc = "You feel like something wants to kill you..." + mob_trait = TRAIT_PARANOIA + value = -8 + icon = "fa-optin-monster" // "fa-ghost" + +/datum/quirk/extra_sensory_paranoia/add() + var/datum/brain_trauma/magic/stalker/T = new() + var/mob/living/carbon/human/H = quirk_holder + H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/extra_sensory_paranoia/remove() + var/mob/living/carbon/human/H = quirk_holder + H.cure_trauma_type(/datum/brain_trauma/magic/stalker, TRAUMA_RESILIENCE_ABSOLUTE) diff --git a/monkestation/code/game/objects/effects/landmark.dm b/monkestation/code/game/objects/effects/landmark.dm new file mode 100644 index 000000000000..508b4d82c6fc --- /dev/null +++ b/monkestation/code/game/objects/effects/landmark.dm @@ -0,0 +1,128 @@ +// Monkestation Additional Navigation Markers for the Navigate Verb -Dexee +// The code/markers here may be able to be used for a future expansion or completely new navigation/location system that both crew, antags, and pAIs alike will be able to use. + +// Non-station Specific Markers + +/obj/effect/landmark/navigate_destination/common/portbowsolar + location = "Port Bow Solar Array" + +/obj/effect/landmark/navigate_destination/common/portquartersolar + location = "Port Quarter Solar Array" + +/obj/effect/landmark/navigate_destination/common/starboardbowsolar + location = "Starboard Bow Solar Array" + +/obj/effect/landmark/navigate_destination/common/starboardquartersolar + location = "Starboard Quarter Solar Array" + +/obj/effect/landmark/navigate_destination/common/fitness + location = "Fitness" + +/obj/effect/landmark/navigate_destination/common/cryogenics + location = "Cryogenics" + +/obj/effect/landmark/navigate_destination/common/vaccommissary + location = "Vacant Commissary" + +/obj/effect/landmark/navigate_destination/common/artstorage + location = "Art Storage" + +/obj/effect/landmark/navigate_destination/common/barber + location = "Barber" + +/obj/effect/landmark/navigate_destination/common/auxbaseconst + location = "Aux Base Construction" + +/obj/effect/landmark/navigate_destination/common/holodeck + location = "Holodeck" + +/obj/effect/landmark/navigate_destination/common/construction + location = "Construction Site" + +/obj/effect/landmark/navigate_destination/common/shitter + location = "Toilet" + +/obj/effect/landmark/navigate_destination/common/bitrunner + location = "Bitrunner Den" + +/obj/effect/landmark/navigate_destination/common/theatrebackstage + location = "Theatre Backstage" + +/obj/effect/landmark/navigate_destination/common/dorms + location = "Dormitories" + +// Icebox Specific +/obj/effect/landmark/navigate_destination/icebox/maintsbar + location = "Maintenance Bar" + +// Tramstation Specific + +/obj/effect/landmark/navigate_destination/tram/bankofcargo + location = "Bank of Cargo" + +/obj/effect/landmark/navigate_destination/tram/abandonedmechbay + location = "Abandoned Mechbay" + +/obj/effect/landmark/navigate_destination/tram/radshelter + location = "Radiation Shelter" + +// Oshan Specific +/obj/effect/landmark/navigate_destination/oshan/miningelevator + location = "Miners' Elevator" + +// Metastation Specific + +// Deltastation specific + +/obj/effect/landmark/navigate_destination/delta/abandsci + location = "Abandoned Science Labs" + +/obj/effect/landmark/navigate_destination/delta/abandgambling + location = "Abandoned Gambling Den" + +/obj/effect/landmark/navigate_destination/delta/abandlibrary + location = "Abandoned Library" + +/obj/effect/landmark/navigate_destination/delta/evamaint + location = "EVA Maintenance" + +/obj/effect/landmark/navigate_destination/delta/pioffice + location = "Private Investigator's Office" + +/obj/effect/landmark/navigate_destination/delta/abandtheatre + location = "Abandoned Theatre" + +/obj/effect/landmark/navigate_destination/delta/abandkitchen + location = "Abandoned Kitchen" + +/obj/effect/landmark/navigate_destination/delta/abandgameroom + location = "Abandoned Game Den" + +/obj/effect/landmark/navigate_destination/delta/abandmedbay + location = "Abandoned Medbay" + +/obj/effect/landmark/navigate_destination/delta/abandmarketbay + location = "Abandoned Market Bay" + +// Centcom Areas +/obj/effect/landmark/navigate_destination/centcom/medical + location = "CentCom Medical" + +/obj/effect/landmark/navigate_destination/centcom/hydro + location = "CentCom Hydroponics" + +/obj/effect/landmark/navigate_destination/centcom/borbop + location = "Borbop's Bar" + +/obj/effect/landmark/navigate_destination/centcom/kitchen + location = "CentCom Kitchen" + +/obj/effect/landmark/navigate_destination/centcom/duelbutton + location = "Thunderdome" + +/obj/effect/landmark/navigate_destination/centcom/boxing + location = "Boxing Ring" + +/obj/effect/landmark/navigate_destination/centcom/dresser + location = "Dressing Room" + diff --git a/monkestation/code/game/objects/items/guns/crank_guns.dm b/monkestation/code/game/objects/items/guns/crank_guns.dm new file mode 100644 index 000000000000..5c96a49462cd --- /dev/null +++ b/monkestation/code/game/objects/items/guns/crank_guns.dm @@ -0,0 +1,49 @@ +/obj/item/gun/energy/laser/musket/syndicate + name = "syndicate laser musket" + desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ + Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." + icon = 'monkestation/icons/obj/guns/guns.dmi' + icon_state = "musket_syndie" + inhand_icon_state = "musket_syndie" + lefthand_file = 'monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/weapons/guns_righthand.dmi' + worn_icon_state = "las_musket_syndie" + ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) + w_class = WEIGHT_CLASS_NORMAL +/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging + . = ..() + AddComponent( \ + /datum/component/gun_crank, \ + charging_cell = get_cell(), \ + charge_amount = 250, \ + cooldown_time = 1.5 SECONDS, \ + charge_sound = 'sound/weapons/laser_crank.ogg', \ + charge_sound_cooldown_time = 1.3 SECONDS, \ + ) + +/obj/projectile/beam/laser/musket + damage = 30 + stamina = 45 + +/obj/projectile/beam/laser/musket/prime + damage = 35 + stamina = 60 + +/obj/projectile/beam/disabler/smoothbore/prime + stamina = 65 + +/obj/item/ammo_casing/energy/laser/musket + fire_sound = 'sound/weapons/lasercannonfire.ogg' + +/obj/item/ammo_casing/energy/laser/musket/syndicate + projectile_type = /obj/projectile/beam/laser/musket/syndicate + e_cost = 125 + fire_sound = 'sound/weapons/laser2.ogg' + +/obj/projectile/beam/laser/musket/syndicate + name = "resonant laser" + damage = 30 + stamina = 65 + weak_against_armour = FALSE + armour_penetration = 25 //less powerful than armor piercing rounds + wound_bonus = 10 diff --git a/monkestation/code/game/objects/items/guns/wt_ammo.dm b/monkestation/code/game/objects/items/guns/wt_ammo.dm new file mode 100644 index 000000000000..6da2a152b2f0 --- /dev/null +++ b/monkestation/code/game/objects/items/guns/wt_ammo.dm @@ -0,0 +1,48 @@ +/obj/item/ammo_box/magazine/wt550m9/wtrub + name = "wt550 magazine (Rubber 4.6x30mm)" + icon = 'monkestation/icons/obj/guns/ammo.dmi' + icon_state = "46x30mmtR-20" + base_icon_state = "46x30mmtR" + ammo_type = /obj/item/ammo_casing/c46x30mm/rub + +/obj/item/ammo_box/magazine/wt550m9/wtic/update_icon_state() + . = ..() + icon_state = "[base_icon_state]-[round(ammo_count(), 4)]" + +/obj/item/ammo_casing/c46x30mm/rub + name = "4.6x30mm rubber bullet casing" + desc = "A 4.6x30mm rubber bullet casing." + projectile_type = /obj/projectile/bullet/c46x30mm/rub + +/obj/projectile/bullet/c46x30mm/rub + name = "4.6x30mm rubber bullet" + damage = 4 + stamina = 35 + embedding = null + sharpness = NONE + +/obj/item/ammo_box/magazine/wt550m9/wtsalt + name = "wt550 magazine (Saltshot 4.6x30mm)" + icon = 'monkestation/icons/obj/guns/ammo.dmi' + icon_state = "46x30mmtS-20" + base_icon_state = "46x30mmtS" + ammo_type = /obj/item/ammo_casing/c46x30mm/salt + +/obj/item/ammo_box/magazine/wt550m9/wtic/update_icon_state() + . = ..() + icon_state = "[base_icon_state]-[round(ammo_count(), 4)]" + +/obj/item/ammo_casing/c46x30mm/salt + name = "4.6x30mm saltshot bullet casing" + desc = "A 4.6x30mm saltshot bullet casing." + projectile_type = /obj/projectile/bullet/c46x30mm/salt + +/obj/projectile/bullet/c46x30mm/salt + name = "4.6x30mm saltshot bullet" + damage = 0 + stamina = 30 + embedding = null + sharpness = NONE + +/obj/item/gun/ballistic/automatic/wt550/no_mag + spawnwithmagazine = FALSE diff --git a/monkestation/code/game/objects/items/miningweapons.dm b/monkestation/code/game/objects/items/miningweapons.dm index 13d1cfe3d1f7..4e687c135ecb 100644 --- a/monkestation/code/game/objects/items/miningweapons.dm +++ b/monkestation/code/game/objects/items/miningweapons.dm @@ -11,7 +11,7 @@ the same technology into a smaller more portable package. The machete design was chosen as to make a much easier to handle and less cumbersome frame. Of course \ the smaller package means that the power is not as high as the original crusher design, but the different shell makes it capable of blocking basic attacks." force = 15 - block_chance = 50 + block_chance = 25 w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BELT throwforce = 5 @@ -22,10 +22,10 @@ attack_verb_continuous = list("slashes", "cuts", "cleaves", "chops", "swipes") attack_verb_simple = list("cleave", "chop", "cut", "swipe", "slash") sharpness = SHARP_EDGED - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = NONE - light_system = NONE - light_outer_range = 0 + light_system = MOVABLE_LIGHT + light_outer_range = 5 light_on = FALSE charged = TRUE charge_time = 10 @@ -65,10 +65,10 @@ attack_verb_continuous = list("pierces", "stabs", "impales", "pokes", "jabs") attack_verb_simple = list("imaple", "stab", "pierce", "jab", "poke") sharpness = SHARP_EDGED - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME - light_system = NONE - light_outer_range = 0 + light_system = MOVABLE_LIGHT + light_outer_range = 8 light_on = FALSE charged = TRUE charge_time = 15 @@ -114,7 +114,7 @@ attack_verb_continuous = list("slams", "crushes", "smashes", "flattens", "pounds") attack_verb_simple = list("slam", "crush", "smash", "flatten", "pound") sharpness = NONE - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME light_system = MOVABLE_LIGHT light_outer_range = 5 @@ -167,10 +167,10 @@ attack_verb_continuous = list("swipes", "slashes", "cuts", "slaps") attack_verb_simple = list("swipe", "slash", "cut", "slap") sharpness = SHARP_POINTY - actions_types = NONE + actions_types = list(/datum/action/item_action/toggle_light) obj_flags = UNIQUE_RENAME light_system = MOVABLE_LIGHT - light_outer_range = 5 + light_outer_range = 4 light_on = FALSE charged = TRUE charge_time = 2 diff --git a/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm b/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm index 7ffded8b7c17..74b3888b62ed 100644 --- a/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm +++ b/monkestation/code/modules/antagonists/clock_cult/scriptures/preservation/clockwork_armaments.dm @@ -37,4 +37,4 @@ base_outfit.equip(invoker) - invoker.put_in_hands(new weapon_path, FALSE, forced = FALSE) + invoker.put_in_hands(new weapon_path, FALSE) diff --git a/monkestation/code/modules/antagonists/florida_man/florida_events.dm b/monkestation/code/modules/antagonists/florida_man/florida_events.dm index aa63c44d3cda..1055348961ea 100644 --- a/monkestation/code/modules/antagonists/florida_man/florida_events.dm +++ b/monkestation/code/modules/antagonists/florida_man/florida_events.dm @@ -3,6 +3,9 @@ typepath = /datum/round_event/ghost_role/florida_man weight = 14 max_occurrences = 3 + track = EVENT_TRACK_MUNDANE + tags = list(TAG_COMMUNAL, TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/florida_man minimum_required = 1 diff --git a/monkestation/code/modules/antagonists/traitor/objectives/final_objective/become_wizard.dm b/monkestation/code/modules/antagonists/traitor/objectives/final_objective/become_wizard.dm new file mode 100644 index 000000000000..ef29cab8c6d1 --- /dev/null +++ b/monkestation/code/modules/antagonists/traitor/objectives/final_objective/become_wizard.dm @@ -0,0 +1,132 @@ +/datum/traitor_objective/ultimate/wizard + name = "Go to %AREA% and invoke a rune of power." + description = "Go to %AREA% and draw a rune of power with the provided impliment. Then, invoke the rune to gain great magical power." + + ///Area where the rune must be drawn + var/area/area_of_power + ///Have we sent our spraycan yet + var/spraycan_sent = FALSE + +/datum/traitor_objective/ultimate/wizard/generate_objective(datum/mind/generating_for, list/possible_duplicates) + var/list/possible_areas = GLOB.the_station_areas.Copy() + var/list/extra_blacklisted_areas = list(/area/station/hallway, /area/station/security, /area/station/ai_monitored) + for(var/area/possible_area as anything in possible_areas) + if(is_type_in_list(possible_area, (TRAITOR_OBJECTIVE_BLACKLISTED_AREAS + extra_blacklisted_areas)) || initial(possible_area.outdoors)) + possible_areas -= possible_area + + if(!length(possible_areas)) + return FALSE + + area_of_power = pick(possible_areas) + replace_in_name("%AREA%", initial(area_of_power.name)) + return TRUE + +/datum/traitor_objective/ultimate/wizard/generate_ui_buttons(mob/user) + var/list/buttons = list() + if(!spraycan_sent) + buttons += add_ui_button("", "Pressing this will materialize an enchanted spraycan in your hand.", "wifi", "spraycan") + return buttons + +/datum/traitor_objective/ultimate/wizard/ui_perform_action(mob/living/user, action) + . = ..() + switch(action) + if("spraycan") + if(spraycan_sent) + return + + spraycan_sent = TRUE + var/obj/item/traitor_spraycan/enchanted/spray = new(user.drop_location()) + spray.owning_mind = WEAKREF(user.mind) + user.put_in_hands(spray) + spray.balloon_alert(user, "\The [spray] materializes in your hand.") + +//the spraycan + +/obj/item/traitor_spraycan + ///Is our rune multi stage + var/multi_stage = TRUE + +/obj/item/traitor_spraycan/enchanted + name = "enchanted seditious spraycan" + desc = "An enchanted spraycan able to draw a single rune of power." + multi_stage = FALSE + ///Weakref to the mind that owns this spraycan, used for transfer to the rune + var/datum/weakref/owning_mind + +/obj/item/traitor_spraycan/enchanted/try_draw_new_rune(mob/living/user, turf/target_turf) + for(var/turf/nearby_turf as anything in RANGE_TURFS(1, target_turf)) + if(isindestructiblewall(nearby_turf) || is_type_in_typecache(nearby_turf, no_draw_turfs)) + user.balloon_alert(user, "Invalid floor!") + return + + draw_rune(user, target_turf) + +/obj/item/traitor_spraycan/enchanted/draw_rune(mob/living/user, turf/target_turf) + drawing_rune = TRUE + target_turf.balloon_alert(user, "Drawing rune...") + var/obj/effect/temp_visual/wizard_rune/traitor_drawing/draw_effect = new(target_turf) + if(!do_after(user, 4 SECONDS, target_turf)) + target_turf.balloon_alert(user, "Interrupted!") + drawing_rune = FALSE + qdel(draw_effect) + new /obj/effect/temp_visual/wizard_rune/failed(target_turf) + return + + var/evaporated_obstacles = FALSE + for(var/atom/possible_obstacle in range(1, target_turf)) + if(!possible_obstacle.density) + continue + evaporated_obstacles = TRUE + new /obj/effect/temp_visual/emp/pulse(possible_obstacle) + + if(iswallturf(possible_obstacle)) + var/turf/closed/wall/wall = possible_obstacle + wall.dismantle_wall(devastated = TRUE) + continue + possible_obstacle.atom_destruction("magic") + + if(evaporated_obstacles) + playsound(target_turf, 'sound/magic/blind.ogg', 100, TRUE) + + target_turf.balloon_alert(user, "Rune created.") + var/obj/effect/grand_rune/traitor/new_rune = new(target_turf) + new_rune.owning_mind = WEAKREF(owning_mind?.resolve()) + expended = TRUE + desc = "A very suspicious looking spraycan, it's empty." + drawing_rune = FALSE +//the rune + +#define TRAITOR_RUNE_INVOKE_TIME 30 SECONDS //you just have to invoke it once but it takes a while to channel +#define TRAITOR_GRAND_RUNE_INVOKES_TO_COMPLETE 1 + +/obj/effect/grand_rune/traitor + name = "suspicious rune" + desc = "A flowing circle of shapes and runes is etched into the floor, it has an odd red tint." + icon = 'monkestation/icons/effects/96x96.dmi' + icon_state = "traitor_wizard_rune" + spell_colour = "#780000" + invoke_time = TRAITOR_RUNE_INVOKE_TIME + invokes_needed = TRAITOR_GRAND_RUNE_INVOKES_TO_COMPLETE + +/obj/effect/grand_rune/traitor/get_invoke_time() + return invoke_time + +/obj/effect/grand_rune/traitor/on_invocation_complete(mob/living/user) + is_in_use = FALSE + playsound(src,'sound/magic/staff_change.ogg', 75, TRUE) + user.mind?.make_wizard() + trigger_side_effects() + tear_reality() + icon = 'icons/effects/96x96.dmi' + flick("activate", src) + addtimer(CALLBACK(src, PROC_REF(remove_rune)), 6) + +#undef TRAITOR_RUNE_INVOKE_TIME +#undef TRAITOR_GRAND_RUNE_INVOKES_TO_COMPLETE + +//the temp visual for drawing the rune + +/obj/effect/temp_visual/wizard_rune/traitor_drawing + icon = 'monkestation/icons/effects/96x96.dmi' + icon_state = "traitor_wizard_rune_draw" + duration = 4 SECONDS diff --git a/monkestation/code/modules/antagonists/traitor/objectives/tide_bug_department.dm b/monkestation/code/modules/antagonists/traitor/objectives/tide_bug_department.dm new file mode 100644 index 000000000000..482219859cc7 --- /dev/null +++ b/monkestation/code/modules/antagonists/traitor/objectives/tide_bug_department.dm @@ -0,0 +1,166 @@ +/datum/traitor_objective_category/tide_bug_department + name = "Tide Bug Department" + objectives = list(/datum/traitor_objective/tide_bug_department = 1, + /datum/traitor_objective/tide_bug_department/high_risk_department = 1) + +/datum/traitor_objective/tide_bug_department + name = "Disrupt the operations of %DEPARTMENT% by placing a T1de virus bug in %AREA%." + description = "Use the button below to materialize the T1de virus bug within your hand, where you'll then be able to place it in %AREA%. \ + One minute after the bug is placed it will randomly open, bolt, and or electrify all airlocks in the department, \ + if the bug is destroyed before this, the objective will fail." + progression_minimum = 10 MINUTES + progression_reward = list(5 MINUTES, 10 MINUTES) + telecrystal_reward = list(2, 3) + + ///What departments can we pick from mapped to their base area type + var/list/valid_departments = list(/datum/job_department/cargo = /area/station/cargo, + /datum/job_department/medical = /area/station/medical, + /datum/job_department/science = /area/station/science, + /datum/job_department/engineering = /area/station/engineering) //service is too low security for them to be worth anything(sorry clown) + ///The department chosen for this objective to target + var/datum/job_department/targeted_department + ///The area chosen for this objective to target + var/area/targeted_area + ///Have we sent them the bug yet + var/bug_sent = FALSE + ///The areas affected by this bug + var/list/affected_areas + +/datum/traitor_objective/tide_bug_department/high_risk_department + progression_minimum = 30 MINUTES + progression_reward = list(15 MINUTES, 20 MINUTES) + telecrystal_reward = list(3, 4) + valid_departments = list(/datum/job_department/command = /area/station/command, + /datum/job_department/security = /area/station/security) + +/datum/traitor_objective/tide_bug_department/can_generate_objective(datum/mind/generating_for, list/possible_duplicates) + if(length(possible_duplicates)) + return FALSE + return TRUE + +/datum/traitor_objective/tide_bug_department/generate_objective(datum/mind/generating_for, list/possible_duplicates) + var/datum/job/role = generating_for.assigned_role + for(var/datum/traitor_objective/tide_bug_department/objective as anything in possible_duplicates) + valid_departments -= objective.targeted_department + for(var/datum/job_department/department as anything in role.departments_list) //breaking into your own department should not be an objective + valid_departments -= department + + if(!length(valid_departments)) + return FALSE + + targeted_department = SSjob.joinable_departments_by_type[pick(valid_departments)] + + var/list/valid_areas = typecacheof(valid_departments[targeted_department.type]) + var/list/blacklisted_areas = typecacheof(TRAITOR_OBJECTIVE_BLACKLISTED_AREAS + /area/station/security/checkpoint) //sec checkpoint is fine for weakpoints but not tide bugs + affected_areas = GLOB.the_station_areas.Copy() + for(var/area/possible_area as anything in affected_areas) + if(is_type_in_typecache(possible_area, blacklisted_areas) || !is_type_in_typecache(possible_area, valid_areas) || initial(possible_area.outdoors)) + affected_areas -= possible_area + + if(!length(affected_areas)) + return FALSE + + targeted_area = pick(affected_areas) + + replace_in_name("%DEPARTMENT%", targeted_department.department_name) + replace_in_name("%AREA%", initial(targeted_area.name)) + return TRUE + +/datum/traitor_objective/tide_bug_department/generate_ui_buttons(mob/user) + var/list/buttons = list() + if(!bug_sent) + buttons += add_ui_button("", "Pressing this will materialize a T1de virus bug in your hand.", "globe", "bug") + return buttons + +/datum/traitor_objective/tide_bug_department/ui_perform_action(mob/user, action) + . = ..() + if(action == "bug") + if(bug_sent) + return + bug_sent = TRUE + var/obj/item/traitor_bug/bug = new(user.drop_location(), src) + user.put_in_hands(bug) + bug.balloon_alert(user, "The Tide virus bug materializes in your hand.") + AddComponent(/datum/component/traitor_objective_register, bug, \ + succeed_signals = list(COMSIG_TRAITOR_BUG_ACTIVATED), \ + fail_signals = list(COMSIG_PARENT_QDELETING), \ + penalty = telecrystal_penalty) + bug.objective_weakref = WEAKREF(src) + +/obj/item/traitor_bug + ///Weakref to our objective + var/datum/weakref/objective_weakref + +/obj/item/traitor_bug/interact(mob/user) + . = ..() + var/datum/traitor_objective/tide_bug_department/resolved_objective = objective_weakref?.resolve() + if(!resolved_objective?.targeted_area) + return + + var/turf/location = drop_location() + if(!location) + return + + var/area/current_area = get_area(location) + if(!istype(current_area, resolved_objective.targeted_area)) + balloon_alert(user, "you can't deploy this here!") + return + + if(!do_after(user, deploy_time, src)) + return + + var/obj/structure/traitor_bug/new_bug = new(location) + new_bug.bug_item_ref = src + transfer_fingerprints_to(new_bug) + transfer_fibers_to(new_bug) + moveToNullspace() //this used to be handled by the objective completing as soon as this was planted, but due to needing to check for things after that its just easier to do it this way + +/obj/structure/traitor_bug + name = "suspicious device" + desc = "It looks dangerous. Best you leave this alone." + + anchored = TRUE + + icon = 'icons/obj/device_syndie.dmi' + icon_state = "bug-animated" + /// Ref to our bug item + var/obj/item/traitor_bug/bug_item_ref + +/obj/structure/traitor_bug/Initialize(mapload) + . = ..() + addtimer(CALLBACK(src, PROC_REF(tide_department)), 60 SECONDS) + +/obj/structure/traitor_bug/deconstruct(disassembled) + QDEL_NULL(bug_item_ref) + return ..() + +/obj/structure/traitor_bug/proc/tide_department() + if(!bug_item_ref) + return + + SEND_SIGNAL(bug_item_ref, COMSIG_TRAITOR_BUG_ACTIVATED) + + var/datum/traitor_objective/tide_bug_department/resolved_objective = bug_item_ref.objective_weakref?.resolve() + if(!resolved_objective?.affected_areas) + return + + SEND_GLOBAL_SIGNAL(COMSIG_GLOBAL_GREY_TIDE_TRAITOR, resolved_objective.affected_areas, TRUE) + +#define TIME_TO_UNBOLT 3 MINUTES +/obj/machinery/door/airlock/proc/traitor_bug_tide() + if(obj_flags & EMAGGED) + return + + unbolt() + open() + +//its random if it gets bolted or electrifried or not + if(prob(70)) + bolt() + + if(prob(30)) + set_electrified(MACHINE_ELECTRIFIED_PERMANENT) + + addtimer(CALLBACK(src, PROC_REF(unbolt)), TIME_TO_UNBOLT) //unbolt the airlocks in 3 minutes + +#undef TIME_TO_UNBOLT diff --git a/monkestation/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm b/monkestation/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm new file mode 100644 index 000000000000..c0da0a38941d --- /dev/null +++ b/monkestation/code/modules/antagonists/wizard/grand_ritual/grand_rune.dm @@ -0,0 +1,9 @@ +#define GRAND_RUNE_INVOKES_TO_COMPLETE 3 //moved from the upstream file to here as this is where its used now + +/obj/effect/grand_rune + ///Weakref to our owning mind + var/datum/weakref/owning_mind + ///How many times this rune needs to be invoked to complete + var/invokes_needed = GRAND_RUNE_INVOKES_TO_COMPLETE + +#undef GRAND_RUNE_INVOKES_TO_COMPLETE diff --git a/monkestation/code/modules/bitrunners/code/ability_disks.dm b/monkestation/code/modules/bitrunners/code/ability_disks.dm new file mode 100644 index 000000000000..08cd31f52fb6 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/ability_disks.dm @@ -0,0 +1,98 @@ +/datum/orderable_item/bitrunning_abilities + category_index = CATEGORY_BITRUNNING_ABILITIES + +/obj/item/bitrunning_disk/ability/monkestation_override + name = "bitrunning program: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/ability_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/ability/monkestation_override/Initialize(mapload) + granted_action = selectable_actions + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 abilities + */ + +/datum/orderable_item/bitrunning_abilities/conjure_cheese + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + +/obj/item/bitrunning_disk/ability/monkestation_override/conjure_cheese + name = "bitrunning program: conjure cheese" + icon_state = "cheese" + selectable_actions = /datum/action/cooldown/spell/conjure/cheese + + + +/datum/orderable_item/bitrunning_abilities/basic_heal + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + +/obj/item/bitrunning_disk/ability/monkestation_override/basic_heal + name = "bitrunning program: basic heal" + icon_state = "heal" + selectable_actions = /datum/action/cooldown/spell/basic_heal + +/** + * Tier 2 abilities + */ + +/datum/orderable_item/bitrunning_abilities/fireball + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/fireball + +/obj/item/bitrunning_disk/ability/monkestation_override/fireball + name = "bitrunning program: fireball" + icon_state = "fireball" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/fireball + + + +/datum/orderable_item/bitrunning_abilities/lightningbolt + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + +/obj/item/bitrunning_disk/ability/monkestation_override/lightningbolt + name = "bitrunning program: lightning bolt" + icon_state = "lightning" + selectable_actions = /datum/action/cooldown/spell/pointed/projectile/lightningbolt + + + +/datum/orderable_item/bitrunning_abilities/forcewall + cost_per_order = 1500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/forcewall + +/obj/item/bitrunning_disk/ability/monkestation_override/forcewall + name = "bitrunning program: forcewall" + icon_state = "forcewall" + selectable_actions = /datum/action/cooldown/spell/forcewall + + + +/** + * Tier 3 abilities + */ + +/datum/orderable_item/bitrunning_abilities/dragon + cost_per_order = 2500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/dragon + +/obj/item/bitrunning_disk/ability/monkestation_override/dragon + name = "bitrunning program: shapeshift, dragon" + icon_state = "dragon" + selectable_actions = /datum/action/cooldown/spell/shapeshift/dragon + + + +/datum/orderable_item/bitrunning_abilities/polar_bear + cost_per_order = 2500 + item_path = /obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + +/obj/item/bitrunning_disk/ability/monkestation_override/polar_bear + name = "bitrunning program: shapeshift, polar bear" + icon_state = "bear" + selectable_actions = /datum/action/cooldown/spell/shapeshift/polar_bear diff --git a/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm new file mode 100644 index 000000000000..58e78d8bf326 --- /dev/null +++ b/monkestation/code/modules/bitrunners/code/combat_gear_disks.dm @@ -0,0 +1,119 @@ +/datum/orderable_item/bitrunning_combat_gear + category_index = CATEGORY_BITRUNNING_COMBAT_GEAR + + +/obj/item/bitrunning_disk/item/monkestation_override + name = "bitrunning gear: someone forgot to give me a name, please help" + icon = 'monkestation/code/modules/bitrunners/icons/item_disks.dmi' + icon_state = "i_am_error" + monkeystation_override = TRUE + +/obj/item/bitrunning_disk/item/monkestation_override/Initialize(mapload) + granted_item = selectable_items + RegisterSignal(src, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + return ..() + +/** + * Tier 1 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/pizza + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pizza + +/obj/item/bitrunning_disk/item/monkestation_override/pizza + name = "bitrunning gear: infinite pizzabox" + icon_state = "pizza" + selectable_items = /obj/item/pizzabox/infinite + + + +/datum/orderable_item/bitrunning_combat_gear/medbeam + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/medbeam + +/obj/item/bitrunning_disk/item/monkestation_override/medbeam + name = "bitrunning gear: Medical Beamgun" + icon_state = "beamgun" + selectable_items = /obj/item/gun/medbeam + + + +/datum/orderable_item/bitrunning_combat_gear/c4 + cost_per_order = 1000 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/c4 + +/obj/item/bitrunning_disk/item/monkestation_override/c4 + name = "bitrunning gear: C4 explosive charge" + icon_state = "c4" + selectable_items = /obj/item/grenade/c4 + +/** + * Tier 2 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/chainsaw + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/chainsaw + +/obj/item/bitrunning_disk/item/monkestation_override/chainsaw + name = "bitrunning gear: chainsaw" + icon_state = "chainsaw" + selectable_items = /obj/item/chainsaw + + + +/datum/orderable_item/bitrunning_combat_gear/pistol + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/pistol + +/obj/item/bitrunning_disk/item/monkestation_override/pistol + name = "bitrunning gear: makarov pistol" + icon_state = "pistol" + selectable_items = /obj/item/gun/ballistic/automatic/pistol + + + +/datum/orderable_item/bitrunning_combat_gear/hardlight_blade + cost_per_order = 1800 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + +/obj/item/bitrunning_disk/item/monkestation_override/hardlight_blade + name = "bitrunning gear: hardlight blade" + icon_state = "hardlight_blade" + selectable_items = /obj/item/melee/energy/blade/hardlight + +/** + * Tier 3 combat gear + */ + +/datum/orderable_item/bitrunning_combat_gear/tesla_cannon + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + +/obj/item/bitrunning_disk/item/monkestation_override/tesla_cannon + name = "bitrunning gear: tesla cannon" + icon_state = "tesla" + selectable_items = /obj/item/gun/energy/tesla_cannon + + + +/datum/orderable_item/bitrunning_combat_gear/dualsaber + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/dualsaber + +/obj/item/bitrunning_disk/item/monkestation_override/dualsaber + name = "bitrunning gear: double-bladed energy sword" + icon_state = "energy_blade" + selectable_items = /obj/item/dualsaber/green + + + +/datum/orderable_item/bitrunning_combat_gear/beesword + cost_per_order = 3200 + item_path = /obj/item/bitrunning_disk/item/monkestation_override/beesword + +/obj/item/bitrunning_disk/item/monkestation_override/beesword + name = "bitrunning gear: the stinger blade" + icon_state = "bee" + selectable_items = /obj/item/melee/beesword diff --git a/monkestation/code/modules/bitrunners/icons/ability_disks.dmi b/monkestation/code/modules/bitrunners/icons/ability_disks.dmi new file mode 100644 index 000000000000..b02e9b77bd4b Binary files /dev/null and b/monkestation/code/modules/bitrunners/icons/ability_disks.dmi differ diff --git a/monkestation/code/modules/bitrunners/icons/item_disks.dmi b/monkestation/code/modules/bitrunners/icons/item_disks.dmi new file mode 100644 index 000000000000..a5f1b7fa284b Binary files /dev/null and b/monkestation/code/modules/bitrunners/icons/item_disks.dmi differ diff --git a/monkestation/code/modules/bitrunners/readme.md b/monkestation/code/modules/bitrunners/readme.md new file mode 100644 index 000000000000..f56bf5faa0f7 --- /dev/null +++ b/monkestation/code/modules/bitrunners/readme.md @@ -0,0 +1,33 @@ + +https://github.com/Monkestation/Monkestation2.0/pull/429 + +## \ + +- Module ID: ID: BIT_RUNNERS + +### Description: + +- This modular file is for all things related to bitrunners, the PR that it started with is the title + +### TG Proc/File Changes: + + +- code/modules/bitrunning/objects/bit_vendor.dm + +### Modular Overrides: + +- N/A + +### Defines: + + +- computers.dm +- #define CATEGORY_BITRUNNING_COMBAT_GEAR +- #define CATEGORY_BITRUNNING_ABILITIES +### Included files that are not contained in this module: + +- N/A + +### Credits: + +- Gboster-0 - Splitting the tech disks into their individual parts, Most of the disk icons diff --git a/monkestation/code/modules/cargo/crates/imports.dm b/monkestation/code/modules/cargo/crates/imports.dm index e18d5dc47355..3ff490e2b347 100644 --- a/monkestation/code/modules/cargo/crates/imports.dm +++ b/monkestation/code/modules/cargo/crates/imports.dm @@ -14,3 +14,43 @@ cost = CARGO_CRATE_VALUE * 4 contains = list(/obj/item/ammo_box/n762 = 6) crate_name = "Emergency Crate" + +/datum/supply_pack/imports/wt550 + name = "WT-550 Autorifle Crate" + desc = "A proper ballistic option for a proper ballistic officer." + cost = CARGO_CRATE_VALUE * 30 + contains = list( + /obj/item/gun/ballistic/automatic/wt550/no_mag = 2, + /obj/item/ammo_box/magazine/wt550m9/wtrub = 4, + ) + crate_name = "Autorifle Crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/imports/wt550ammo/nonlethal + name = "WT-550 Non-Lethal Ammo Crate" + desc = "A supply of non-lethal ammunition for the WT-550 autorifle." + cost = CARGO_CRATE_VALUE * 5 + contains = list( + /obj/item/ammo_box/magazine/wt550m9/wtrub = 3, + /obj/item/ammo_box/magazine/wt550m9/wtsalt = 3, + ) + crate_name = "wt-550 non-lethal ammo crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/imports/wt550ammo + name = "WT-550 Ammo Crate" + desc = "A supply of spare and exotic lethal ammunition for the WT-550 autorifle." + cost = CARGO_CRATE_VALUE * 6 + contains = list( + /obj/item/ammo_box/magazine/wt550m9 = 2, + /obj/item/ammo_box/magazine/wt550m9/wtap = 2, + /obj/item/ammo_box/magazine/wt550m9/wtic = 2, + ) + crate_name = "wt-550 ammo crate" + access = ACCESS_ARMORY + access_view = ACCESS_ARMORY + crate_type = /obj/structure/closet/crate/secure/weapon diff --git a/monkestation/code/modules/cargo/crates/security.dm b/monkestation/code/modules/cargo/crates/security.dm index 57e2a2fbeb8c..e6e5fc99bb39 100644 --- a/monkestation/code/modules/cargo/crates/security.dm +++ b/monkestation/code/modules/cargo/crates/security.dm @@ -8,27 +8,6 @@ crate_name = "secway crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/security/armory/wt550 - name = "WT-550 Autorifle Crate" - desc = "A proper ballistic option for a proper ballistic officer." - cost = CARGO_CRATE_VALUE * 7 - contains = list( - /obj/item/gun/ballistic/automatic/wt550 = 2, - /obj/item/ammo_box/magazine/wt550m9 = 2, - ) - crate_name = "Autorifle Crate" - -/datum/supply_pack/security/armory/wt550ammo - name = "WT-550 Ammo Crate" - desc = "A supply of spare and exotic ammunition for the WT-550 autorifle." - cost = CARGO_CRATE_VALUE * 4 - contains = list( - /obj/item/ammo_box/magazine/wt550m9 = 2, - /obj/item/ammo_box/magazine/wt550m9/wtap = 2, - /obj/item/ammo_box/magazine/wt550m9/wtic = 2, - ) - crate_name = "wt-550 ammo crate" - /datum/supply_pack/security/armory/combatknives name = "Combat Knives Crate" desc = "Three combat knives guaranteed to fit snugly inide any Nanotrasen standard boot. Warranty void if you stab your own ankle." diff --git a/monkestation/code/modules/cargo/markets/market_items.dm b/monkestation/code/modules/cargo/markets/market_items.dm new file mode 100644 index 000000000000..d744ef932ae1 --- /dev/null +++ b/monkestation/code/modules/cargo/markets/market_items.dm @@ -0,0 +1,39 @@ +/datum/market_item/weapon/smoothbore_disabler_prime + name = "Elite Smoothbore Disabler" + desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." + item = /obj/item/gun/energy/disabler/smoothbore/prime + + price_min = CARGO_CRATE_VALUE * 3 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/pipegun_recipe + name = "Diary of a Dead Assistant" + desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." + item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 1 + availability_prob = 40 + +/datum/market_item/weapon/musket_recipe + name = "Journal of a Space Ranger" + desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." + item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/smoothbore_recipe + name = "Old Tome" + desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." + item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime + + price_min = CARGO_CRATE_VALUE * 6 + price_max = CARGO_CRATE_VALUE * 8 + stock_max = 1 + availability_prob = 20 diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm index 010ffd9a90f7..81ad7e2d9f7d 100644 --- a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm +++ b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm @@ -47,6 +47,16 @@ "Barista", ) +/datum/job/bitrunner + alt_titles = list( + "Bitrunner", + "Bitdomain Technician", + "Data Retrieval Specialist", + "Netdiver", + "Pod Jockey", + "Union Bitrunner", + ) + /datum/job/botanist alt_titles = list( "Botanist", diff --git a/monkestation/code/modules/client/preferences/species_features/simians.dm b/monkestation/code/modules/client/preferences/species_features/simians.dm index 2c131cd44835..a4f27e181827 100644 --- a/monkestation/code/modules/client/preferences/species_features/simians.dm +++ b/monkestation/code/modules/client/preferences/species_features/simians.dm @@ -1,39 +1,14 @@ -/datum/preference/choiced/fur_color +/datum/preference/color/fur_color category = PREFERENCE_CATEGORY_SECONDARY_FEATURES savefile_identifier = PREFERENCE_CHARACTER savefile_key = "fur" + relevant_species_trait = SPECIES_FUR -/datum/preference/choiced/fur_color/init_possible_values() - return GLOB.fur_tones - -/datum/preference/choiced/fur_color/compile_constant_data() - var/list/data = ..() - - data[CHOICED_PREFERENCE_DISPLAY_NAMES] = GLOB.fur_tone_names - - var/list/to_hex = list() - for (var/choice in get_choices()) - var/list/hsl = rgb2num("#[choice]", COLORSPACE_HSL) - - to_hex[choice] = list( - "lightness" = hsl[3], - "value" = "#[choice]", - ) - - data["to_hex"] = to_hex - - return data - -/datum/preference/choiced/fur_color/apply_to_human(mob/living/carbon/human/target, value) - if(target.dna.species.use_fur) - target.skin_tone = value - -/datum/preference/choiced/fur_color/is_accessible(datum/preferences/preferences) - if (!..(preferences)) - return FALSE - - var/datum/species/species_type = preferences.read_preference(/datum/preference/choiced/species) - return initial(species_type.use_fur) +/datum/preference/color/fur_color/apply_to_human(mob/living/carbon/human/target, value) + var/mob/user = usr + var/datum/species/species_type = user?.client.prefs.read_preference(/datum/preference/choiced/species) + if(initial(species_type.uses_fur)) + target.dna.features["mcolor"] = value /datum/preference/choiced/simian_tail savefile_key = "feature_tail_monkey" diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm index 2f045c3ffae1..30373848e4b0 100644 --- a/monkestation/code/modules/clothing/head/costume.dm +++ b/monkestation/code/modules/clothing/head/costume.dm @@ -15,10 +15,26 @@ flags_inv = HIDEHAIR worn_y_offset = 2 +/obj/item/clothing/head/lizard + name = "novelty lizard head" + desc = "A giant sculpted foam lizard head. It doesn't quite look like the lizards from this sector..." + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head.dmi' + icon_state = "lizardhead" + flags_inv = HIDEHAIR + worn_y_offset = 1 + +/obj/item/clothing/head/wonka + name = "wonky hat" + desc = "Come with me, and you'll be, in a world of OSHA violations!" + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head.dmi' + icon_state = "wonka" + /obj/item/clothing/head/knowingclown name = "Small but Knowing Clown hat" desc = "The Cap of a Small but All Knowing Clown" icon = 'monkestation/icons/obj/clothing/hats.dmi' worn_icon = 'monkestation/icons/mob/clothing/head.dmi' icon_state = "knowingclownhat" - worn_y_offset = 6 \ No newline at end of file + worn_y_offset = 6 diff --git a/monkestation/code/modules/clothing/masks/gasmask.dm b/monkestation/code/modules/clothing/masks/gasmask.dm new file mode 100644 index 000000000000..651ffb2d6454 --- /dev/null +++ b/monkestation/code/modules/clothing/masks/gasmask.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/mask/gas/clown_hat/yellow + name = "yellow clown wig and mask" + desc = "A true prankster's facial attire. But yellow! A clown is incomplete without his wig and mask." + icon = 'monkestation/icons/obj/clothing/masks.dmi' + icon_state = "clown_yellow" + worn_icon = 'monkestation/icons/mob/clothing/mask.dmi' + worn_icon_state = "clown_yellow" diff --git a/monkestation/code/modules/clothing/shoes/clown.dm b/monkestation/code/modules/clothing/shoes/clown.dm new file mode 100644 index 000000000000..e9a2f8582632 --- /dev/null +++ b/monkestation/code/modules/clothing/shoes/clown.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/shoes/clown_shoes/yellow + desc = "The prankster's standard-issue clowning shoes. But Yellow! Ctrl-click to toggle waddle dampeners." + name = "yellow clown shoes" + icon = 'monkestation/icons/obj/clothing/shoes.dmi' + icon_state = "clown_yellow" + worn_icon = 'monkestation/icons/mob/clothing/feet.dmi' + worn_icon_state = "clown_yellow" diff --git a/monkestation/code/modules/clothing/suits/costume.dm b/monkestation/code/modules/clothing/suits/costume.dm new file mode 100644 index 000000000000..d6367480d871 --- /dev/null +++ b/monkestation/code/modules/clothing/suits/costume.dm @@ -0,0 +1,34 @@ +/obj/item/clothing/suit/hooded/dinojammies + name = "dinosaur pajamas" + desc = "The ultimate in reptile-pajama-costume fusion." + icon = 'monkestation/icons/obj/clothing/suits.dmi' + worn_icon = 'monkestation/icons/mob/clothing/suit.dmi' + icon_state = "dinojammies" + worn_icon_state = "dinojammies" + hoodtype = /obj/item/clothing/head/hooded/dinojammies + +/obj/item/clothing/head/hooded/dinojammies + desc = "A dinosaur head hood." + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head.dmi' + icon_state = "dinojammies_hood" + worn_icon_state = "dinojammies_hood" + flags_inv = HIDEHAIR + +/obj/item/clothing/suit/hooded/gorilla + name = "gorilla costume" + desc = "Ooga!" + icon = 'monkestation/icons/obj/clothing/suits.dmi' + worn_icon = 'monkestation/icons/mob/clothing/suit.dmi' + icon_state = "gorilla" + worn_icon_state = "gorilla" + hoodtype = /obj/item/clothing/head/hooded/gorilla + alternative_screams = list('sound/creatures/gorilla.ogg') + +/obj/item/clothing/head/hooded/gorilla + desc = "A gorilla costume hood." + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head.dmi' + icon_state = "gorilla" + worn_icon_state = "gorilla" + flags_inv = HIDEHAIR|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT diff --git a/monkestation/code/modules/clothing/under/undersuit.dm b/monkestation/code/modules/clothing/under/undersuit.dm index cb4304d6856d..59b81bdc13ed 100644 --- a/monkestation/code/modules/clothing/under/undersuit.dm +++ b/monkestation/code/modules/clothing/under/undersuit.dm @@ -67,3 +67,11 @@ /obj/item/clothing/under/rank/civilian/janitor/maid //heckin subtypes icon = 'icons/obj/clothing/under/civilian.dmi' worn_icon = 'icons/mob/clothing/under/civilian.dmi' + +/obj/item/clothing/under/wonka + name = "wonky suit" + desc = "Come with me, and you'll be, in a world of OSHA violations!" + icon = 'monkestation/icons/obj/clothing/uniforms.dmi' + icon_state = "wonka" + worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' + worn_icon_state = "wonka" diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm index 0622a8c615fa..21d42622b5a4 100644 --- a/monkestation/code/modules/donator/code/datum/loadout.dm +++ b/monkestation/code/modules/donator/code/datum/loadout.dm @@ -19,19 +19,18 @@ requires_purchase = FALSE ckeywhitelist = list("bidlink2") +/datum/loadout_item/effects/cirno + ckeywhitelist = list("bidlink2") + name = "Cirno Transformation" + item_path = /obj/item/effect_granter/donator/cirno + requires_purchase = FALSE + //ttnt /datum/loadout_item/head/pot name = "Dented Pot" item_path = /obj/item/clothing/head/costume/pot -/datum/loadout_item/pocket_items/donator/spycrab - name = "Pet Delivery Beacon - Spycrab" - item_path = /obj/item/choice_beacon/pet/donator/spycrab - donator_only = TRUE - requires_purchase = FALSE - ckeywhitelist = list("unknown") - //spinnermaster /datum/loadout_item/pocket_items/donator/void_mothroach @@ -41,12 +40,25 @@ requires_purchase = FALSE ckeywhitelist = list("spinnermaster") +/datum/loadout_item/effects/void_mothroach + ckeywhitelist = list("spinnermaster") + name = "Void Mothroach Transformation" + item_path = /obj/item/effect_granter/donator/void_mothroach + requires_purchase = FALSE + + /datum/loadout_item/suit/shark_costume name = "Blahaj Costume" item_path = /obj/item/clothing/suit/hooded/shark_costume donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/toys/hotdog_plush + name = "Hotdog Plush" + item_path = /obj/item/toy/plush/hotdog + donator_only = TRUE + requires_purchase = FALSE + //ruby_flamewing /datum/loadout_item/pocket_items/donator/blahaj @@ -56,12 +68,18 @@ requires_purchase = FALSE ckeywhitelist = list("ruby_flamewing") -/datum/loadout_item/under/syndie_pajamas +/datum/loadout_item/under/miscellaneous/syndie_pajamas name = "Syndicate Pajamas" item_path = /obj/item/clothing/under/costume/syndie_pajamas donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/effects/blahaj + ckeywhitelist = list("ruby_flamewing") + name = "Blahaj Transformation" + item_path = /obj/item/effect_granter/donator/blahaj + requires_purchase = FALSE + //happiestplane /datum/loadout_item/mask/zoro name = "Zoro Mask" @@ -70,7 +88,7 @@ requires_purchase = FALSE -/datum/loadout_item/under/navy_uniform +/datum/loadout_item/under/miscellaneous/navy_uniform name = "Naval Officer Uniform" item_path = /obj/item/clothing/under/costume/navy_uniform_gold donator_only = TRUE @@ -83,18 +101,32 @@ donator_only = TRUE requires_purchase = FALSE -/datum/loadout_item/head/cirno +/datum/loadout_item/head/dark_hos name = "Dark HoS Hat" item_path = /obj/item/clothing/head/costume/dark_hos donator_only = TRUE requires_purchase = FALSE /datum/loadout_item/toys/seam_plush - name = "Puck Plush" + name = "Seam Plush" item_path = /obj/item/toy/plush/seam donator_only = TRUE requires_purchase = FALSE +/datum/loadout_item/pocket_items/donator/germanshepherd + name = "Pet Delivery Beacon - German Shepherd" + item_path = /obj/item/choice_beacon/pet/donator/germanshepherd + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("mjolnir2") + + +/datum/loadout_item/effects/germanshepherd + ckeywhitelist = list("mjolnir2") + name = "German Shepherd Transformation" + item_path = /obj/item/effect_granter/donator/germanshepherd + requires_purchase = FALSE + //sammi /datum/loadout_item/toys/puck_plush name = "Puck Plush" @@ -118,3 +150,54 @@ item_path = /obj/item/toy/plush/spider donator_only = TRUE requires_purchase = FALSE + +/datum/loadout_item/pocket_items/donator/spider + name = "Pet Delivery Beacon - Dancing Spider" + item_path = /obj/item/choice_beacon/pet/donator/spider + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("Random516") + +/datum/loadout_item/neck/whitebeard + name = "Whitebeard's cloak" + item_path = /obj/item/clothing/neck/whitebeard + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/under/miscellaneous/whitebeard + name = "Whitebeard's attire" + item_path = /obj/item/clothing/under/costume/whitebeard + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/effects/spider + ckeywhitelist = list("Random516") + name = "Spider Transformation" + item_path = /obj/item/effect_granter/donator/spider + requires_purchase = FALSE + +//senri +/datum/loadout_item/pocket_items/donator/slime + name = "Pet Delivery Beacon - Slime" + item_path = /obj/item/choice_beacon/pet/donator/slime + donator_only = TRUE + requires_purchase = FALSE + ckeywhitelist = list("Senri08") + +/datum/loadout_item/suit/beegirl + name = "Bee's Outfit" + item_path = /obj/item/clothing/suit/costume/beegirl + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/toys/puppycat + name = "Puppycat Plush" + item_path = /obj/item/toy/plush/puppycat + donator_only = TRUE + requires_purchase = FALSE + +/datum/loadout_item/effects/slime + ckeywhitelist = list("Senri08") + name = "Slime Transformation" + item_path = /obj/item/effect_granter/donator/slime + requires_purchase = FALSE diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm index 2cb436d538f2..5f988e040f32 100644 --- a/monkestation/code/modules/donator/code/item/choice_beacon.dm +++ b/monkestation/code/modules/donator/code/item/choice_beacon.dm @@ -32,14 +32,7 @@ /obj/item/choice_beacon/pet/donator/void_mothroach name = "Secret Beacon of the Stars" default_name = "Moffles" - company_source = "*UNINTELLIGBLE BUZZING*" - company_message = "*LOUD MOFF NOISES*" - donator_pet = /mob/living/basic/mothroach/void - -/obj/item/choice_beacon/pet/donator/void_mothroach - name = "Secret Beacon of the Stars" - default_name = "Moffles" - company_source = "*UNINTELLIGBLE BUZZING*" + company_source = "*UNINTELLIGIBLE BUZZING*" company_message = "*LOUD MOFF NOISES*" donator_pet = /mob/living/basic/mothroach/void @@ -48,11 +41,27 @@ default_name = "Blahaj" company_source = "IKEA" company_message = "Please enjoy your new pet -- some assembly required." - donator_pet = /mob/living/basic/lizard/blahaj + donator_pet = /mob/living/basic/pet/blahaj /obj/item/choice_beacon/pet/donator/cirno name = "Cirno" default_name = "Cirno?" company_source = "Touhou" company_message = "Please handle with care!" - donator_pet = /mob/living/basic/lizard/cirno + donator_pet = /mob/living/basic/pet/cirno + +/obj/item/choice_beacon/pet/donator/slime + name = "Slime" + default_name = "Slime" + company_source = "*blorbling*" + donator_pet = /mob/living/basic/pet/slime/talkative + +/obj/item/choice_beacon/pet/donator/spider + name = "Spider" + default_name = "Spider" + donator_pet = /mob/living/basic/pet/spider/dancing + +/obj/item/choice_beacon/pet/donator/germanshepherd + name = "German Shepherd" + default_name = "German Shepherd" + donator_pet = /mob/living/basic/pet/dog/germanshepherd diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm index 78afaab3b3c5..940efbf239c4 100644 --- a/monkestation/code/modules/donator/code/item/clothing.dm +++ b/monkestation/code/modules/donator/code/item/clothing.dm @@ -84,6 +84,7 @@ icon_state = "dark_hos" inhand_icon_state = null body_parts_covered = CHEST|ARMS + /obj/item/clothing/head/costume/dark_hos name = "\improper Dark Head of Security Cap" desc = "Slip this on and you're gonna be cutting people with that edge." @@ -100,3 +101,29 @@ icon_state = "lemon_bandolier" body_parts_covered = CHEST inhand_icon_state = null + +/obj/item/clothing/under/costume/whitebeard + name = "\improper Whitebeard's Attire" + desc = "The garb of a world renowned pirate." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "wbunder" + worn_icon_state = "wbunder" + inhand_icon_state = null + body_parts_covered = LEGS + +/obj/item/clothing/neck/whitebeard + name = "Whitebeard's Jacket" + desc = "The jacket of a world renowned pirate." + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "wbcloak" + worn_icon_state = "wbcloak" + +/obj/item/clothing/suit/costume/beegirl + name = "Bee's Costume" + icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi' + worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi' + icon_state = "beegirl" + body_parts_covered = CHEST|ARMS + inhand_icon_state = null diff --git a/monkestation/code/modules/donator/code/item/effects.dm b/monkestation/code/modules/donator/code/item/effects.dm new file mode 100644 index 000000000000..d6962573f0a9 --- /dev/null +++ b/monkestation/code/modules/donator/code/item/effects.dm @@ -0,0 +1,53 @@ +/obj/item/effect_granter/donator + name = "Donator Transformation" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "void_mothroach" + var/mob/living/basic/animal_transformation = null + +/obj/item/effect_granter/donator/grant_effect(mob/living/carbon/granter) + var/mob/living/basic/animal = src.animal_transformation + animal = new animal(granter.loc) + animal.mind_initialize() + var/datum/mind/granters_mind = granter.mind + granters_mind.transfer_to(animal) + animal.adjust_hand_count(2) + qdel(granter) + . = ..() + +//Senri08 +/obj/item/effect_granter/donator/slime + name = "Slime transformation" + icon_state = "slime" + animal_transformation = /mob/living/basic/pet/slime/talkative + +//Random +/obj/item/effect_granter/donator/spider + name = "Spider transformation" + icon_state = "spider" + animal_transformation = /mob/living/basic/pet/spider/dancing + +//mjolnir +/obj/item/effect_granter/donator/germanshepherd + name = "German Shepherd transformation" + icon_state = "germanshepherd" + animal_transformation = /mob/living/basic/pet/dog/germanshepherd + +//bidlink2 +/obj/item/effect_granter/donator/cirno + name = "Cirno transformation" + icon = 'monkestation/icons/obj/plushes.dmi' + icon_state = "cirno-happy" + animal_transformation = /mob/living/basic/pet/cirno + +//Random +/obj/item/effect_granter/donator/void_mothroach + name = "Mothroach transformation" + icon_state = "void_mothroach" + animal_transformation = /mob/living/basic/mothroach/void + + +//Random +/obj/item/effect_granter/donator/blahaj + name = "Blahaj transformation" + icon_state = "blahaj" + animal_transformation = /mob/living/basic/pet/blahaj diff --git a/monkestation/code/modules/donator/code/item/plush.dm b/monkestation/code/modules/donator/code/item/plush.dm index 566c2062c1bc..20ac7dd4b2c7 100644 --- a/monkestation/code/modules/donator/code/item/plush.dm +++ b/monkestation/code/modules/donator/code/item/plush.dm @@ -37,3 +37,15 @@ icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' squeak_override = list('goon/sounds/babynoise.ogg'=1) icon_state = "spider" + +/obj/item/toy/plush/puppycat + name = "puppycat plush" + desc = "A plush of Puppycat. ~Handcrafted lovingly for Senri." + icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' + icon_state = "puppycat" + +/obj/item/toy/plush/hotdog + name = "hotdog plush" + desc = "A plush of a hotdog. ~Handcrafted lovingly for Spinnermaster." + icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi' + icon_state = "hotdog" diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm index 1e673bbfc3a7..590f35e01d68 100644 --- a/monkestation/code/modules/donator/code/mob/pets.dm +++ b/monkestation/code/modules/donator/code/mob/pets.dm @@ -27,7 +27,7 @@ icon_dead = "[random_icon]_dead" gold_core_spawnable = NO_SPAWN -/mob/living/basic/lizard/blahaj +/mob/living/basic/pet/blahaj name = "\improper Blåhaj" desc = "The blue shark can swim very far, dive really deep and hear noises from almost 250 meters away." icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' @@ -36,21 +36,69 @@ icon_dead = "blahaj_dead" icon_gib = null gold_core_spawnable = NO_SPAWN + ai_controller = /datum/ai_controller/basic_controller/ -/mob/living/basic/lizard/cirno //nobody needs to know she's a lizard +/mob/living/basic/pet/cirno //nobody needs to know she's a lizard name = "Cirno" desc = "She is the greatest." icon = 'monkestation/icons/obj/plushes.dmi' icon_state = "cirno-happy" icon_living = "cirno-happy" - icon_dead = "" + icon_dead = "cirno-happy" icon_gib = null gold_core_spawnable = NO_SPAWN - + ai_controller = /datum/ai_controller/basic_controller/ /mob/living/basic/lizard/snake name = "Three Headed Snake" desc = "This little fella looks familiar..." icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' icon_state = "triple_snake" - icon_dead = "" gold_core_spawnable = NO_SPAWN + +/mob/living/basic/pet/dog/germanshepherd + name = "German Shepherd" + desc = "He's so cool, he's got sunglasses!!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "germanshepherd" + icon_gib = null + can_be_held = FALSE // as funny as this would be, a german shepherd is way too big to carry with one hand + gold_core_spawnable = NO_SPAWN + +/mob/living/basic/pet/slime/talkative + name = "Extroverted Slime" + desc = "He's got a lot to say!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "slime" + gold_core_spawnable = NO_SPAWN + initial_language_holder = /datum/language_holder/slime + ai_controller = /datum/ai_controller/basic_controller/ + var/quips = list("Your fingers taste like Donk Pockets, get out more.", + "I've seen salad that dresses better than you.", + "I smell smoke, are you thinking too hard again?", + "This one's gene pool needs more chlorine...", + "I expected nothing and yet I'm still disappointed.", + "Why is this walking participation trophy touching me?", + "If I throw a stick, will you leave?",) + var/positive_quips = list("Hey there, slime pal!", + "Aw thanks buddy!",) + +/mob/living/basic/pet/slime/talkative/attack_hand(mob/living/carbon/human/user, list/modifiers) + . = ..() + if(src.stat != CONSCIOUS || (user.istate & ISTATE_HARM) || LAZYACCESS(modifiers, RIGHT_CLICK)) + return + + new /obj/effect/temp_visual/heart(src.loc) + if(prob(33)) + if(isslimeperson(user) || isoozeling(user)) + src.say(pick(positive_quips)) + else + src.say(pick(quips)) + + +/mob/living/basic/pet/spider/dancing + name = "Dancin' Spider" + desc = "Look at him go!" + icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi' + icon_state = "spider" + gold_core_spawnable = NO_SPAWN + ai_controller = /datum/ai_controller/basic_controller/ diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi index 690bc5cc1595..2729ef4824d6 100644 Binary files a/monkestation/code/modules/donator/icons/mob/clothing.dmi and b/monkestation/code/modules/donator/icons/mob/clothing.dmi differ diff --git a/monkestation/code/modules/donator/icons/mob/pets.dmi b/monkestation/code/modules/donator/icons/mob/pets.dmi index 68659aa72bb5..e564da2b2688 100644 Binary files a/monkestation/code/modules/donator/icons/mob/pets.dmi and b/monkestation/code/modules/donator/icons/mob/pets.dmi differ diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi index ec835c12a509..da8630be9bca 100644 Binary files a/monkestation/code/modules/donator/icons/obj/clothing.dmi and b/monkestation/code/modules/donator/icons/obj/clothing.dmi differ diff --git a/monkestation/code/modules/donator/icons/obj/plushes.dmi b/monkestation/code/modules/donator/icons/obj/plushes.dmi index 19920cb71405..423b5af4c6c2 100644 Binary files a/monkestation/code/modules/donator/icons/obj/plushes.dmi and b/monkestation/code/modules/donator/icons/obj/plushes.dmi differ diff --git a/monkestation/code/modules/hydroponics/machines/infuser.dm b/monkestation/code/modules/hydroponics/machines/infuser.dm deleted file mode 100644 index 02ecde6a389c..000000000000 --- a/monkestation/code/modules/hydroponics/machines/infuser.dm +++ /dev/null @@ -1,140 +0,0 @@ -/obj/machinery/infuser - name = "Infuser" - desc = "Infuses chemicals into seeds, potentially opening access to new mutations." - - icon_state = "splicer" - icon = 'monkestation/icons/obj/machines/hydroponics.dmi' - var/obj/item/seeds/seed - - var/obj/item/reagent_containers/cup/beaker/held_beaker - - var/working = FALSE - - var/work_timer = null - - var/potential_damage = 0 - - var/list/stats = list() - - -/obj/machinery/infuser/ui_interact(mob/user, datum/tgui/ui) - . = ..() - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "BotanyInfuser", name) - ui.open() - ui.set_autoupdate(TRUE) - -/obj/machinery/infuser/ui_data(mob/user) - . = ..() - if(!stats.len) - calculate_stats_for_infusion() - var/list/data = list() - if(seed) - data["seed"] = list(seed.return_all_data() + stats) - data["has_seed"] = TRUE - if(held_beaker) - data["has_beaker"] = TRUE - - data["working"] = working - - data["potential_damage"] = potential_damage - data["damage_taken"] = seed.infusion_damage - data["combined_damage"] = (potential_damage + seed.infusion_damage) - - return data - -/obj/machinery/infuser/ui_act(action, params) - . = ..() - if(.) - return - switch(action) - if("eject_beaker") - eject_beaker() - return TRUE - if("eject_seed") - eject_seed() - return TRUE - if("infuse") - infuse() - return TRUE - -/obj/machinery/infuser/proc/calculate_stats_for_infusion() - if(!held_beaker) - return - var/list/total_stats = list( - "potency_change" = 0, - "yield_change" = 0, - "endurance_change" = 0, - "lifespan_change" = 0, - "weed_chance_change" = 0, - "weed_rate_change" = 0, - "production_change" = 0, - "maturation_change" = 0, - "damage" = 0, - ) - for(var/reagent in held_beaker.reagents.reagent_list) - var/datum/reagent/listed_reagent = reagent - total_stats += listed_reagent.generate_infusion_values(held_beaker.reagents) - stats = total_stats - potential_damage = stats["damage"] - -/obj/machinery/infuser/proc/eject_seed() - if (seed) - if(Adjacent(usr) && !issiliconoradminghost(usr)) - if (!usr.put_in_hands(seed)) - seed.forceMove(drop_location()) - else - seed.forceMove(drop_location()) - seed = null - . = TRUE - -/obj/machinery/infuser/proc/eject_beaker() - if (held_beaker) - if(Adjacent(usr) && !issiliconoradminghost(usr)) - if (!usr.put_in_hands(held_beaker)) - held_beaker.forceMove(drop_location()) - else - held_beaker.forceMove(drop_location()) - held_beaker = null - stats = list() - potential_damage = 0 - . = TRUE - -/obj/machinery/infuser/attacked_by(obj/item/I, mob/living/user) - . = ..() - if(istype(I, /obj/item/seeds)) - if(!seed) - if(!user.transferItemToLoc(I, src)) - return - seed = I - return - if(istype(I, /obj/item/reagent_containers/cup/beaker)) - if(!held_beaker) - if(!user.transferItemToLoc(I, src)) - return - held_beaker = I - return - -/obj/machinery/infuser/proc/infuse() - if(!held_beaker) - return - seed.infusion_damage += potential_damage - if(seed.infusion_damage >= 100) - qdel(seed) - seed = null - return - - seed.adjust_potency(stats["potency_change"]) - seed.adjust_yield(stats["yield_change"]) - seed.adjust_endurance(stats["endurance_change"]) - seed.adjust_lifespan(stats["lifespan_change"]) - seed.adjust_production(stats["production_change"]) - seed.adjust_weed_chance(stats["weed_chance_change"]) - seed.adjust_weed_rate(stats["weed_rate_change"]) - seed.adjust_maturation(stats["maturation_change"]) - - seed.check_infusions(held_beaker.reagents.reagent_list) - held_beaker.reagents.remove_any(held_beaker.reagents.total_volume) - stats = list() - potential_damage = 0 diff --git a/monkestation/code/modules/hydroponics/machines/splicer.dm b/monkestation/code/modules/hydroponics/machines/splicer.dm index ca0800d05e8a..6c0879d60a5a 100644 --- a/monkestation/code/modules/hydroponics/machines/splicer.dm +++ b/monkestation/code/modules/hydroponics/machines/splicer.dm @@ -6,11 +6,16 @@ icon = 'monkestation/icons/obj/machines/hydroponics.dmi' var/obj/item/seeds/seed_1 var/obj/item/seeds/seed_2 + var/obj/item/reagent_containers/cup/beaker/held_beaker var/working = FALSE var/work_timer = null + var/potential_damage = 0 + + var/list/stats = list() + /obj/machinery/splicer/attacked_by(obj/item/I, mob/living/user) . = ..() @@ -24,22 +29,40 @@ if(!user.transferItemToLoc(I, src)) return seed_2 = I + if(istype(I, /obj/item/reagent_containers/cup/beaker)) + if(!held_beaker) + if(!user.transferItemToLoc(I, src)) + return + held_beaker = I + return /obj/machinery/splicer/ui_data(mob/user) . = ..() + if(!stats.len) + calculate_stats_for_infusion() + var/has_seed_one = FALSE var/has_seed_two = FALSE + var/has_beaker = FALSE var/list/data = list() + if(seed_1) - data["seed_1"] = list(seed_1.return_all_data()) + data["seed_1"] = list(seed_1.return_all_data() + stats) has_seed_one = TRUE + data["damage_taken"] = seed_1.infusion_damage + data["potential_damage"] = potential_damage + data["combined_damage"] = (potential_damage + seed_1.infusion_damage) if(seed_2) data["seed_2"] = list(seed_2.return_all_data()) has_seed_two = TRUE + if(held_beaker) + data["held_beaker"] = held_beaker.reagents + has_beaker = TRUE data["seedone"] = has_seed_one data["seedtwo"] = has_seed_two + data["held_beaker"] = has_beaker data["working"] = working @@ -69,9 +92,15 @@ eject_seed(seed_2) seed_2 = null return TRUE + if("eject_beaker") + eject_beaker(held_beaker) + return TRUE if("splice") splice(seed_1, seed_2) return TRUE + if("infuse") + infuse() + return TRUE /obj/machinery/splicer/proc/eject_seed(obj/item/seeds/ejected_seed) if (ejected_seed) @@ -82,6 +111,18 @@ ejected_seed.forceMove(drop_location()) . = TRUE +/obj/machinery/splicer/proc/eject_beaker() + if (held_beaker) + if(Adjacent(usr) && !issiliconoradminghost(usr)) + if (!usr.put_in_hands(held_beaker)) + held_beaker.forceMove(drop_location()) + else + held_beaker.forceMove(drop_location()) + held_beaker = null + stats = list() + potential_damage = 0 + . = TRUE + /obj/machinery/splicer/proc/splice(obj/item/seeds/first_seed, obj/item/seeds/second_seed) if(!first_seed || !second_seed) @@ -158,3 +199,46 @@ qdel(first_seed) qdel(second_seed) + +/obj/machinery/splicer/proc/calculate_stats_for_infusion() + if(!held_beaker) + return + var/list/total_stats = list( + "potency_change" = 0, + "yield_change" = 0, + "endurance_change" = 0, + "lifespan_change" = 0, + "weed_chance_change" = 0, + "weed_rate_change" = 0, + "production_change" = 0, + "maturation_change" = 0, + "damage" = 0, + ) + for(var/reagent in held_beaker.reagents.reagent_list) + var/datum/reagent/listed_reagent = reagent + total_stats += listed_reagent.generate_infusion_values(held_beaker.reagents) + stats = total_stats + potential_damage = stats["damage"] + +/obj/machinery/splicer/proc/infuse() + if(!held_beaker) + return + seed_1.infusion_damage += potential_damage + if(seed_1.infusion_damage >= 100) + qdel(seed_1) + seed_1 = null + return + + seed_1.adjust_potency(stats["potency_change"]) + seed_1.adjust_yield(stats["yield_change"]) + seed_1.adjust_endurance(stats["endurance_change"]) + seed_1.adjust_lifespan(stats["lifespan_change"]) + seed_1.adjust_production(stats["production_change"]) + seed_1.adjust_weed_chance(stats["weed_chance_change"]) + seed_1.adjust_weed_rate(stats["weed_rate_change"]) + seed_1.adjust_maturation(stats["maturation_change"]) + + seed_1.check_infusions(held_beaker.reagents.reagent_list) + held_beaker.reagents.remove_any(held_beaker.reagents.total_volume) + stats = list() + potential_damage = 0 diff --git a/monkestation/code/modules/jobs/job_types/candysalesman.dm b/monkestation/code/modules/jobs/job_types/candysalesman.dm new file mode 100644 index 000000000000..a4c508c93bab --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/candysalesman.dm @@ -0,0 +1,46 @@ +/datum/job/candysalesman + title = JOB_SPOOKTOBER_CANDYSALESMAN + description = "Sell candy to the crew. Get high on your own supply. Subject people to unsafe working conditions." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_HEAD_OF_PERSONNEL + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/candysalesman + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/cane) + + mail_goodies = list( + /obj/item/storage/spooky + ) + + rpg_title = "Purveyor of Sweets" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/candysalesman + name = "Candy Salesman" + jobtype = /datum/job/candysalesman + + head = /obj/item/clothing/head/wonka + uniform = /obj/item/clothing/under/wonka + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + + backpack_contents = list( + /obj/item/cane, + /obj/item/storage/pill_bottle/maintenance_pill/full, + /obj/item/storage/spooky, + /obj/item/storage/spooky, + /obj/item/storage/spooky + ) diff --git a/monkestation/code/modules/jobs/job_types/dietwizard.dm b/monkestation/code/modules/jobs/job_types/dietwizard.dm new file mode 100644 index 000000000000..34b290e7e644 --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/dietwizard.dm @@ -0,0 +1,44 @@ +/datum/job/dietwizard + title = JOB_SPOOKTOBER_WIZARD + description = "Amaze the crew! Get murdered because there are actual wizards out there. Have your costume confiscated as contraband." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_HEAD_OF_PERSONNEL + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/dietwizard + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/staff, /obj/item/clothing/head/wizard/fake) + + mail_goodies = list( + /obj/item/staff, + /obj/item/storage/box/snappops, + /obj/item/grenade/smokebomb + ) + + rpg_title = "Hedge Mage" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/dietwizard + name = "Diet Wizard" + jobtype = /datum/job/dietwizard + + head = /obj/item/clothing/head/wizard/fake + suit = /obj/item/clothing/suit/wizrobe/fake + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + shoes = /obj/item/clothing/shoes/sandal + l_hand = /obj/item/staff + + backpack_contents = list(/obj/item/storage/box/snappops, /obj/item/storage/box/snappops, /obj/item/grenade/smokebomb, /obj/item/grenade/smokebomb) diff --git a/monkestation/code/modules/jobs/job_types/ghost.dm b/monkestation/code/modules/jobs/job_types/ghost.dm new file mode 100644 index 000000000000..01984cd6e4d1 --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/ghost.dm @@ -0,0 +1,40 @@ +/datum/job/ghost + title = JOB_SPOOKTOBER_GHOST + description = "Spook the crew. Get your bedsheet stolen and run around the station naked." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_CHAPLAIN + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/ghost + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/clothing/suit/costume/ghost_sheet) + + mail_goodies = list( + /obj/item/clothing/suit/costume/ghost_sheet + ) + + rpg_title = "Spectre" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/ghost + name = "Ghost" + jobtype = /datum/job/ghost + + suit = /obj/item/clothing/suit/costume/ghost_sheet + shoes = null + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + + backpack_contents = list() diff --git a/monkestation/code/modules/jobs/job_types/godzilla.dm b/monkestation/code/modules/jobs/job_types/godzilla.dm new file mode 100644 index 000000000000..b63599fbbbb1 --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/godzilla.dm @@ -0,0 +1,44 @@ +/datum/job/godzilla + title = JOB_SPOOKTOBER_GODZILLA + description = "Film a monster movie. Blend in with the lizards. Get arrested for roaring at the crew." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_HEAD_OF_PERSONNEL + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/godzilla + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/megaphone, /obj/item/clothing/head/lizard, /obj/item/clothing/suit/hooded/dinojammies) + + mail_goodies = list( + /obj/item/megaphone, + /obj/item/food/fried_blood_sausage, + /obj/item/food/bread/root, + /obj/item/food/lizard_fries + ) + + rpg_title = "Lizardman" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/godzilla + name = "Discount Godzilla" + jobtype = /datum/job/godzilla + + head = /obj/item/clothing/head/lizard + r_pocket = /obj/item/megaphone + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + +/datum/outfit/job/godzilla/post_equip(mob/living/carbon/human/H, visualsOnly) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/dinojammies(H), ITEM_SLOT_OCLOTHING) diff --git a/monkestation/code/modules/jobs/job_types/gorilla.dm b/monkestation/code/modules/jobs/job_types/gorilla.dm new file mode 100644 index 000000000000..07ee74f5c0b1 --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/gorilla.dm @@ -0,0 +1,44 @@ +/datum/job/gorilla + title = JOB_SPOOKTOBER_GORILLA + description = "Film a monster movie. Battle godzilla. Get arrested for roaring at lizards." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_HEAD_OF_PERSONNEL + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/gorilla + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/clothing/suit/hooded/gorilla) + + mail_goodies = list( + /obj/item/food/grown/banana + ) + + rpg_title = "Dire Ape" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/gorilla + name = "Gorilla" + jobtype = /datum/job/gorilla + + suit = /obj/item/clothing/suit/hooded/gorilla + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + r_pocket = /obj/item/megaphone + + backpack_contents = list( + /obj/item/food/grown/banana, + /obj/item/food/grown/banana, + /obj/item/food/grown/banana + ) diff --git a/monkestation/code/modules/jobs/job_types/skeleton.dm b/monkestation/code/modules/jobs/job_types/skeleton.dm new file mode 100644 index 000000000000..96e7cc4dca6f --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/skeleton.dm @@ -0,0 +1,39 @@ +/datum/job/skeleton + title = JOB_SPOOKTOBER_SKELETON + description = "Rattle your bones! Rattle the crew! Encourage the skeletons deep within us all to awaken and join the skeleton war." + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 0 + supervisors = JOB_HEAD_OF_PERSONNEL + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/skeleton + plasmaman_outfit = /datum/outfit/plasmaman + + paycheck = PAYCHECK_LOWER + paycheck_department = ACCOUNT_CIV + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + + departments_list = list( + /datum/job_department/spooktober, + ) + + family_heirlooms = list(/obj/item/instrument/trombone) + + mail_goodies = list( + /obj/item/food/cookie/sugar/spookyskull + ) + + rpg_title = "Animated Bones" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + +/datum/outfit/job/skeleton + name = "Skeleton" + jobtype = /datum/job/skeleton + + uniform = /obj/item/clothing/under/costume/skeleton + head = /obj/item/clothing/head/helmet/skull + id_trim = /datum/id_trim/job/assistant + belt = /obj/item/modular_computer/pda/assistant + backpack_contents = list(/obj/item/instrument/trombone, /obj/item/food/cookie/sugar/spookyskull, /obj/item/food/cookie/sugar/spookyskull, /obj/item/food/cookie/sugar/spookyskull) diff --git a/monkestation/code/modules/jobs/job_types/yellowclown.dm b/monkestation/code/modules/jobs/job_types/yellowclown.dm new file mode 100644 index 000000000000..94d50b5856e2 --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/yellowclown.dm @@ -0,0 +1,115 @@ +/datum/job/yellowclown + title = JOB_SPOOKTOBER_YELLOWCLOWN + description = "Team up with the regular clown, or start a rivalry! Search for ways to become EVEN MORE YELLOW." + department_head = list(JOB_HEAD_OF_PERSONNEL) + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 1 + supervisors = SUPERVISOR_HOP + exp_granted_type = EXP_TYPE_CREW + + outfit = /datum/outfit/job/yellowclown + plasmaman_outfit = /datum/outfit/plasmaman/clown + + paycheck = PAYCHECK_CREW + paycheck_department = ACCOUNT_SRV + + mind_traits = list(TRAIT_NAIVE) + liver_traits = list(TRAIT_COMEDY_METABOLISM) + + display_order = JOB_DISPLAY_ORDER_ASSISTANT + departments_list = list( + /datum/job_department/spooktober, + ) + + mail_goodies = list( + /obj/item/food/grown/banana = 100, + /obj/item/food/pie/cream = 50, + /obj/item/clothing/shoes/clown_shoes/combat = 10, + /obj/item/reagent_containers/spray/waterflower/lube = 20, // lube + /obj/item/reagent_containers/spray/waterflower/superlube = 1 // Superlube, good lord. + ) + + family_heirlooms = list(/obj/item/bikehorn/golden) + rpg_title = "Tow-Colored Jester" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN | JOB_SPOOKTOBER + + job_tone = "honk" + + +/datum/job/yellowclown/after_spawn(mob/living/spawned, client/player_client) + . = ..() + if(!ishuman(spawned)) + return + spawned.apply_pref_name(/datum/preference/name/clown, player_client) + var/obj/item/organ/internal/butt/butt = spawned.get_organ_slot(ORGAN_SLOT_BUTT) + if(butt) + butt.Remove(spawned, 1) + QDEL_NULL(butt) + butt = new/obj/item/organ/internal/butt/clown + butt.Insert(spawned) + + var/obj/item/organ/internal/bladder/bladder = spawned.get_organ_slot(ORGAN_SLOT_BLADDER) + if(bladder) + bladder.Remove(spawned, 1) + QDEL_NULL(bladder) + bladder = new/obj/item/organ/internal/bladder/clown + bladder.Insert(spawned) + +/datum/outfit/job/yellowclown + name = "Yellow Clown" + jobtype = /datum/job/yellowclown + + id = /obj/item/card/id/advanced/rainbow + id_trim = /datum/id_trim/job/clown + uniform = /obj/item/clothing/under/rank/civilian/clown/yellow + backpack_contents = list( + /obj/item/stamp/clown = 1, + /obj/item/reagent_containers/spray/waterflower = 1, + /obj/item/food/grown/banana = 1, + /obj/item/instrument/bikehorn = 1, + ) + belt = /obj/item/modular_computer/pda/clown + ears = /obj/item/radio/headset/headset_srv + shoes = /obj/item/clothing/shoes/clown_shoes/yellow + mask = /obj/item/clothing/mask/gas/clown_hat/yellow + l_pocket = /obj/item/bikehorn + + backpack = /obj/item/storage/backpack/clown + satchel = /obj/item/storage/backpack/clown + duffelbag = /obj/item/storage/backpack/duffelbag/clown + + box = /obj/item/storage/box/survival/hug + chameleon_extras = /obj/item/stamp/clown + implants = list(/obj/item/implant/sad_trombone) + +/datum/outfit/job/yellowclown/mod + name = "Clown (MODsuit)" + + suit_store = /obj/item/tank/internals/oxygen + back = /obj/item/mod/control/pre_equipped/cosmohonk + internals_slot = ITEM_SLOT_SUITSTORE + +/datum/outfit/job/yellowclown/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(HAS_TRAIT(SSstation, STATION_TRAIT_BANANIUM_SHIPMENTS)) + backpack_contents[/obj/item/stack/sheet/mineral/bananium/five] = 1 + +/datum/outfit/job/yellowclown/get_types_to_preload() + . = ..() + if(HAS_TRAIT(SSstation, STATION_TRAIT_BANANIUM_SHIPMENTS)) + . += /obj/item/stack/sheet/mineral/bananium/five + +/datum/outfit/job/yellowclown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + ..() + if(visualsOnly) + return + + H.fully_replace_character_name(H.real_name, pick(GLOB.clown_names)) //rename the mob AFTER they're equipped so their ID gets updated properly. + H.dna.add_mutation(/datum/mutation/human/clumsy) + for(var/datum/mutation/human/clumsy/M in H.dna.mutations) + M.mutadone_proof = TRUE + var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN] + fan.show_to(H) + H.faction |= FACTION_CLOWN + diff --git a/monkestation/code/modules/loadouts/items/effects.dm b/monkestation/code/modules/loadouts/items/effects.dm index 10136fff2f2c..70f5293dab85 100644 --- a/monkestation/code/modules/loadouts/items/effects.dm +++ b/monkestation/code/modules/loadouts/items/effects.dm @@ -6,6 +6,7 @@ GLOBAL_LIST_INIT(loadout_effects, generate_loadout_items(/datum/loadout_item/eff /datum/loadout_item/effects/post_equip_item(datum/preferences/preference_source, mob/living/carbon/human/equipper, visuals_only) var/obj/item/effect_granter/new_item = new item_path(equipper.loc) addtimer(CALLBACK(new_item, TYPE_PROC_REF(/obj/item/effect_granter, grant_effect), equipper), 3 SECONDS) + /datum/loadout_item/effects/honk_platinum ckeywhitelist = list("madducks") name = "Honk Platinum Transformation" diff --git a/monkestation/code/modules/loadouts/items/under/under.dm b/monkestation/code/modules/loadouts/items/under/under.dm index e3cc7646ab7a..a8b52d2c1f44 100644 --- a/monkestation/code/modules/loadouts/items/under/under.dm +++ b/monkestation/code/modules/loadouts/items/under/under.dm @@ -477,3 +477,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ /datum/loadout_item/under/donator donator_only = TRUE requires_purchase = FALSE + +/datum/loadout_item/under/miscellaneous/shrine + name = "Shrine Priestess Kimono" + item_path = /obj/item/clothing/under/dress/shrine_priestess diff --git a/monkestation/code/modules/loafing/README.txt b/monkestation/code/modules/loafing/README.txt new file mode 100644 index 000000000000..cd5b1e842aae --- /dev/null +++ b/monkestation/code/modules/loafing/README.txt @@ -0,0 +1,41 @@ +## Title: + + +MODULE ID: LOAFING + +### Description: + +This module adds a loafing mechanic. + + + +### TG Proc/File Changes: + +changed /datum/component/edible/proc/TryToEat(mob/living/eater, mob/living/feeder) in edible.dm +changed _food.dm + + + + +### Defines: + + + + +### Master file additions + +- N/A + + +### Included files that are not contained in this module: + +- N/A + + +### Credits: + + + +Code and sprites done by Lmenvs. Concept from Goon. + + diff --git a/monkestation/code/modules/loafing/code/loaf.dm b/monkestation/code/modules/loafing/code/loaf.dm new file mode 100644 index 000000000000..fa6526876aaa --- /dev/null +++ b/monkestation/code/modules/loafing/code/loaf.dm @@ -0,0 +1,266 @@ +/obj/item/food/prison_loaf + name = "prison loaf" + desc = "A barely edible brick of nutrients, designed as a low-cost solution to malnourishment." + icon = 'monkestation/code/modules/loafing/icons/obj.dmi' + icon_state = "loaf" + food_reagents = list(/datum/reagent/consumable/nutraslop = 10) + var/loaf_density = 1 //base loaf density + var/can_condense = TRUE //for special loaves, make false + force_feed_on_aggression = TRUE + //vars for high level loafs + + var/critical = FALSE + var/atom/movable/warp_effect/warp + + + var/lifespan = ANOMALY_COUNTDOWN_TIMER //works similar to grav anomaly when hits critical + var/death_time + var/countdown_colour = COLOR_ASSEMBLY_LBLUE + var/obj/effect/countdown/loaf/countdown + var/boing = 0 + var/obj/singularity/singuloaf + +/obj/item/food/prison_loaf/process(seconds_per_tick) + anomalyEffect(seconds_per_tick) + if(death_time < world.time) + if(loc) + detonate() + qdel(src) + +/obj/item/food/prison_loaf/Destroy() + STOP_PROCESSING(SSobj, src) + QDEL_NULL(countdown) + vis_contents -= warp + warp = null + return ..() + +/obj/item/food/prison_loaf/proc/anomalyEffect(seconds_per_tick) + if(SPT_PROB(ANOMALY_MOVECHANCE, seconds_per_tick)) + step(src,pick(GLOB.alldirs)) + boing = 1 + for(var/obj/object in orange(4, src)) + if(!object.anchored) + step_towards(object,src) + for(var/mob/living/M in range(0, src)) + gravShock(M) + for(var/mob/living/M in orange(4, src)) + if(!M.mob_negates_gravity()) + step_towards(M,src) + for(var/obj/object in range(0,src)) + if(!object.anchored) + if(isturf(object.loc)) + var/turf/T = object.loc + if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE && HAS_TRAIT(object, TRAIT_T_RAY_VISIBLE)) + continue + var/mob/living/target = locate() in view(4,src) + if(target && !target.stat) + object.throw_at(target, 5, 10) + animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5)) + animate(time = seconds_per_tick*7, transform = matrix()) + +/obj/item/food/prison_loaf/proc/detonate() + var/turf/T = get_turf(src) + log_game("\A [src] critical loaf has ended its lifespan, turning into a singularity at [AREACOORD(T)].") + message_admins("A [src.name] critical loaf has ended its lifespan, turning into a singularity at [ADMIN_VERBOSEJMP(T)].") + + singuloaf = new /obj/singularity/(src) + singuloaf.loc = src.loc + return + +/obj/item/food/prison_loaf/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) + . = ..() + if(same_z_layer) + return + if(warp) + SET_PLANE(warp, PLANE_TO_TRUE(warp.plane), new_turf) + +/obj/item/food/prison_loaf/proc/on_entered(datum/source, atom/movable/AM) + SIGNAL_HANDLER + gravShock(AM) + +/obj/item/food/prison_loaf/Bump(atom/A) + if(critical) + gravShock(A) + else + return ..() + +/obj/item/food/prison_loaf/Bumped(atom/movable/AM) + if(critical) + gravShock(AM) + else + return ..() + +/obj/item/food/prison_loaf/proc/gravShock(mob/living/A) + if(boing && isliving(A) && !A.stat) + A.Paralyze(40) + var/atom/target = get_edge_target_turf(A, get_dir(src, get_step_away(A, src))) + A.throw_at(target, 5, 1) + boing = 0 + +/obj/item/food/prison_loaf/proc/critical() + src.critical = TRUE + var/turf/T = get_turf(src) + notify_ghosts("A [src] has been condensed to the point of criticality!", source=src, action=NOTIFY_ORBIT, header="Loaf Criticality!!") + log_game("\A [src] has been condensed to the point of criticality at [AREACOORD(T)].") + message_admins("A [src.name] has been condensed to the point of criticality at [ADMIN_VERBOSEJMP(T)].") + death_time = world.time + lifespan + warp = new(src) + vis_contents += warp + countdown = new(src) + if(countdown_colour) + countdown.color = countdown_colour + countdown.start() + can_condense = FALSE + START_PROCESSING(SSobj, src) + +/obj/effect/countdown/loaf + name = "singuloaf countdown" + +/obj/effect/countdown/loaf/get_value() + var/obj/item/food/prison_loaf/loaf = attached_to + if(!istype(loaf)) + return + else + var/time_left = max(0, (loaf.death_time - world.time) / 10) + return round(time_left) + +/obj/item/food/prison_loaf/rod + name = "rod loaf" + desc = "If you loaf something, set it free. If it comes back, it's yours." + icon_state = "rod_loaf" + can_condense = FALSE + +/obj/item/food/prison_loaf/rod/after_throw(datum/callback/callback) + . = ..() + var/startside = pick(GLOB.cardinals) + var/turf/end_turf = get_edge_target_turf(get_random_station_turf(), turn(startside, 180)) + var/turf/start_turf = get_turf(usr) + var/atom/rod = new /obj/effect/immovablerod/loaf(start_turf, end_turf) + notify_ghosts("[usr.name] has an object of interest: [rod]!", source=rod, action=NOTIFY_ORBIT, header="Something's Interesting!") + qdel(src) + +/obj/effect/immovablerod/loaf + name = "immovable loaf" + desc = "Oh no, the flavor is coming right for us!" + icon = 'monkestation/code/modules/loafing/icons/obj.dmi' + icon_state = "rod_loaf" + +/obj/machinery/power/supermatter_crystal/loaf + name = "suppermatter loaf" //you can't kill me for my bad puns. they make me immortal. + desc = "A prison loaf that has condensed and crystalized to the point where it can be used as a standard power source." + icon = 'monkestation/code/modules/loafing/icons/obj.dmi' + icon_state = "sm" + + + +/obj/item/food/prison_loaf/proc/condense() + if(!src.can_condense) + return + switch(src.loaf_density) + if(0 to 10) + src.name = initial(src.name) + src.desc = "A barely edible brick of nutrients, designed as a low-cost solution to malnourishment." + src.icon_state = initial(src.icon_state) + "0" + src.force = 0 + src.throwforce = 0 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 1) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 1) + if(11 to 100) + src.name = "dense " + initial(src.name) + src.desc = initial(src.desc) + "\n This loaf is noticeably heavier than usual." + src.icon_state = initial(src.icon_state) + "0" + src.force = 2 + src.throwforce = 2 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 3) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 3) + if(101 to 250) + src.name = "compacted " + initial(src.name) + src.desc = initial(src.desc) + "\n Hooh, this thing packs a punch. What are they putting into these?" + src.icon_state = initial(src.icon_state) + "0" + src.force = 4 + src.throwforce = 4 + src.throw_range = 6 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 5) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 5) + if(251 to 500) + src.name = "super-compressed " + initial(src.name) + src.desc = initial(src.desc) + "\n Hard enough to scratch a diamond, yet still somehow edible,\n this loaf seems to be emitting decay heat. Dear god." + src.icon_state = initial(src.icon_state) + "1" + src.force = 5 + src.throwforce = 5 + src.throw_range = 6 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 8) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 8) + if(501 to 2500) + src.name = "molecular " + initial(src.name) + src.desc = initial(src.desc) + "\n The loaf has become so dense that no food particulates are visible to the naked eye." + src.icon_state = initial(src.icon_state) + "2" + src.force = 10 + src.throwforce = 10 + src.throw_range = 5 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/consumable/corn_syrup, 5) + if(2501 to 10000) + src.name = "atomic " + initial(src.name) + src.desc = initial(src.desc) + "\n Forget food particulates, the loaf is now comprised of flavor atoms." + src.icon_state = initial(src.icon_state) + "3" + src.force = 20 + src.throwforce = 20 + src.throw_range = 4 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/growthserum, 5) + if(10001 to 25000) + src.name = "sub atomic " + initial(src.name) + src.desc = initial(src.desc) + "\n Oh good, the flavor atoms in this prison loaf have collapsed down to a a solid lump of neutrons. Eating this could prove dangerous." + src.icon_state = initial(src.icon_state) + "4" + src.force = 30 + src.throwforce = 30 + src.throw_range = 3 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/consumable/vitfro, 25) + if(25001 to 50000) + src.name = "quark " + initial(src.name) + src.desc = initial(src.desc) + "\n This nutritional loaf is collapsing into subatomic flavor particles. Consuption could convert your DNA into synthetic sludge." + src.icon_state = initial(src.icon_state) + "5" + src.force = 50 + src.throwforce = 50 + src.throw_range = 2 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/mulligan, 25) + if(50001 to 100000) + src.name = "strangelet " + initial(src.name) + src.desc = initial(src.desc) + "\n At this point you may be considering: has man gone too far? Are we meant to have food this powerful?" + src.icon_state = initial(src.icon_state) + "6" + src.force = 75 + src.throwforce = 75 + src.throw_range = 1 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/cyborg_mutation_nanomachines, 50) + if(100001 to 1000000) + src.name = "quantum " + initial(src.name) + src.desc = initial(src.desc) + "\n The mere existence of this nutritional masterpiece is causing reality to distort!" + src.icon_state = initial(src.icon_state) + "7" + src.force = 100 + src.throwforce = 100 + src.throw_range = 0 + src.reagents.add_reagent(/datum/reagent/consumable/salt, 10) + src.reagents.add_reagent(/datum/reagent/consumable/nutraslop, 10) + src.reagents.add_reagent(/datum/reagent/gravitum, 100) + critical() + + +/datum/export/food/loaf + cost = 10 + unit_name = "loaf" + message = "of Nutraloaf" + export_types = list(/obj/item/food/prison_loaf) + +/datum/export/food/loaf/get_cost(obj/O) + var/obj/item/food/prison_loaf/loaf = O + cost = max(10, loaf.loaf_density / 5) + return ..() diff --git a/monkestation/code/modules/loafing/code/loafer.dm b/monkestation/code/modules/loafing/code/loafer.dm new file mode 100644 index 000000000000..b74221e3dc5e --- /dev/null +++ b/monkestation/code/modules/loafing/code/loafer.dm @@ -0,0 +1,114 @@ +/obj/structure/disposalpipe/loafer + name = "loafing device" + desc = "A prisoner feeding device that condenses matter into an Ultra Delicious(tm) nutrition bar!" + icon = 'monkestation/code/modules/loafing/icons/obj.dmi' + icon_state = "loafer" + var/is_loafing = FALSE + var/list/loaf_blacklist = list(/obj/item/organ/internal/brain, /obj/item/bodypart/head) + +/obj/structure/disposalpipe/loafer/transfer(obj/structure/disposalholder/holder) + if(is_loafing) + return src + //check if there's anything in there + if (holder.contents.len) + //start playing sound + is_loafing = TRUE + src.icon_state = "loafer-on" + src.update_appearance() + playsound(src, 'monkestation/code/modules/loafing/sound/loafer.ogg', 100, 1, mixer_channel = CHANNEL_MACHINERY) + + //create new loaf + var/obj/item/food/prison_loaf/loaf = new /obj/item/food/prison_loaf(src) + + //add all the garbage to the loaf's contents + for (var/atom/movable/debris in holder) + if(debris.resistance_flags & INDESTRUCTIBLE || (debris.type in loaf_blacklist)) + if(holder.contents.len > 1) + continue + else + loaf = null + src.icon_state = "loafer" + is_loafing = FALSE + return transfer_to_dir(holder, nextdir(holder)) + if(debris.reagents)//the object has reagents + debris.reagents.trans_to(loaf, 1000) + if(istype(debris, /obj/item/food/prison_loaf))//the object is a loaf, compress somehow + var/obj/item/food/prison_loaf/loaf_to_grind = debris + loaf.loaf_density += loaf_to_grind.loaf_density * 1.05 + loaf_to_grind = null + else if(isliving(debris)) + var/mob/living/victim = debris + //different mobs add different reagents + if(issilicon(victim)) + loaf.reagents.add_reagent(/datum/reagent/fuel, 10) + loaf.reagents.add_reagent(/datum/reagent/iron, 10) + else + loaf.reagents.add_reagent(/datum/reagent/bone_dust, 3) + loaf.reagents.add_reagent(/datum/reagent/ammonia/urine, 2) + loaf.reagents.add_reagent(/datum/reagent/consumable/liquidgibs, 2) + loaf.reagents.add_reagent(/datum/reagent/consumable/nutriment/organ_tissue, 2) + //then we give the loaf more power + if(ishuman(victim)) + loaf.loaf_density += 25 + else + loaf.loaf_density += 10 + if(!isdead(victim)) + victim.emote("scream") + victim.gib() + if(victim.mind || victim.client) + victim.ghostize(FALSE) + else if (istype(debris, /obj/item))//everything else + var/obj/item/kitchen_sink = debris + var/weight = kitchen_sink.w_class + loaf.loaf_density += weight * 3 + holder.contents -= debris + qdel(debris) + + sleep(3 SECONDS) + + //condense the loaf + loaf.condense() + //place the loaf + loaf.forceMove(holder) + holder.contents += loaf + is_loafing = FALSE + src.icon_state = "loafer" + return transfer_to_dir(holder, nextdir(holder)) + +/obj/structure/disposalpipe/loafer/deconstruct(disassembled = TRUE) + if(!(flags_1 & NODECONSTRUCT_1)) + if(disassembled) + if(stored) + stored.forceMove(loc) + transfer_fingerprints_to(stored) + stored.setDir(dir) + stored = null + else + var/turf/T = get_turf(src) + for(var/D in GLOB.cardinals) + if(D & dpdir) + var/obj/structure/disposalpipe/broken/P = new(T) + P.setDir(D) + spew_forth() + qdel(src) + +/obj/structure/disposalconstruct/loafer + name = "loafing device" + desc = "A prisoner feeding device that condenses matter into an Ultra Delicious(tm) nutrition bar!" + icon = 'monkestation/code/modules/loafing/icons/obj.dmi' + icon_state = "conloafer" + pipe_type = /obj/structure/disposalpipe/loafer + + +//spawning + +/obj/effect/spawner/random/loafer + name = "loafer spawner" + spawn_scatter_radius = 5 + spawn_loot_chance = 20 + layer = DISPOSAL_PIPE_LAYER + +/obj/effect/spawner/random/loafer/Initialize(mapload) + loot = list( + /obj/structure/disposalpipe/loafer/) + return ..() diff --git a/monkestation/code/modules/loafing/icons/obj.dmi b/monkestation/code/modules/loafing/icons/obj.dmi new file mode 100644 index 000000000000..8fedcae132d5 Binary files /dev/null and b/monkestation/code/modules/loafing/icons/obj.dmi differ diff --git a/monkestation/code/modules/loafing/sound/loafer.ogg b/monkestation/code/modules/loafing/sound/loafer.ogg new file mode 100644 index 000000000000..4ce15e80e60b Binary files /dev/null and b/monkestation/code/modules/loafing/sound/loafer.ogg differ diff --git a/monkestation/code/modules/mech_comp/vending_machine.dm b/monkestation/code/modules/mech_comp/vending_machine.dm index 82fdecef5f66..35293de5ff7b 100644 --- a/monkestation/code/modules/mech_comp/vending_machine.dm +++ b/monkestation/code/modules/mech_comp/vending_machine.dm @@ -40,6 +40,7 @@ /obj/item/mcobject/messaging/storage = STANDARD_COMPONENT_SUPPLY, /obj/item/mcobject/messaging/type_sensor = STANDARD_COMPONENT_SUPPLY, /obj/item/mcobject/messaging/clock = STANDARD_COMPONENT_SUPPLY, + /obj/item/mcobject/messaging/repeater = LOW_COMPONENT_SUPPLY ) diff --git a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm index a1642c2f7ddf..c4cf884aa825 100644 --- a/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm +++ b/monkestation/code/modules/mob/dead/new_player/sprite_accessories/hair.dm @@ -89,3 +89,8 @@ icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' name = "Long and Messy" icon_state = "long_messy" + +/datum/sprite_accessory/hair/monkeyking + icon = 'monkestation/icons/mob/sprite_accessories/hair.dmi' + name = "Monkey king" + icon_state = "monkey_king" \ No newline at end of file diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm index ba6cfcff9ff4..8fd7d2370bb0 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/oozeling.dm @@ -20,6 +20,7 @@ hair_color = "mutcolor" hair_alpha = 150 mutantlungs = /obj/item/organ/internal/lungs/oozeling + mutanttongue = /obj/item/organ/internal/tongue/oozeling meat = /obj/item/food/meat/slab/human/mutant/slime exotic_blood = /datum/reagent/toxin/slimeooze var/datum/action/innate/regenerate_limbs/regenerate_limbs diff --git a/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm b/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm index 41a83238d5c8..5f4a06feda33 100644 --- a/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm +++ b/monkestation/code/modules/mob/living/carbon/human/species_type/simian.dm @@ -8,7 +8,8 @@ species_traits = list( EYECOLOR, LIPS, - NO_UNDERWEAR + NO_UNDERWEAR, + SPECIES_FUR, ) inherent_traits = list( TRAIT_VAULTING, @@ -17,7 +18,6 @@ ) use_skintones = FALSE - use_fur = TRUE inherent_biotypes = list( MOB_ORGANIC, @@ -30,6 +30,7 @@ skinned_type = /obj/item/stack/sheet/animalhide/monkey disliked_food = GROSS liked_food = FRUIT | MEAT + uses_fur = TRUE //deathsound = 'monkestation/sound/voice/simian/deathsound.ogg' species_language_holder = /datum/language_holder/monkey maxhealthmod = 0.85 //small = weak diff --git a/monkestation/code/modules/new_antagonists/slasher/ghost_role.dm b/monkestation/code/modules/new_antagonists/slasher/ghost_role.dm index 216e9d103eaf..a10fe8c00c5c 100644 --- a/monkestation/code/modules/new_antagonists/slasher/ghost_role.dm +++ b/monkestation/code/modules/new_antagonists/slasher/ghost_role.dm @@ -1,8 +1,11 @@ /datum/round_event_control/slasher name = "Slasher" typepath = /datum/round_event/ghost_role/slasher - weight = 0 // for now - max_occurrences = 3 + weight = 14 // for now + max_occurrences = 2 + track = EVENT_TRACK_MODERATE + tags = list(TAG_SPOOKY, TAG_COMBAT) + checks_antag_cap = TRUE /datum/round_event/ghost_role/slasher minimum_required = 1 diff --git a/monkestation/code/modules/new_antagonists/slasher/slasher_datum.dm b/monkestation/code/modules/new_antagonists/slasher/slasher_datum.dm index 103f96f82d2d..66f5d4a77a7d 100644 --- a/monkestation/code/modules/new_antagonists/slasher/slasher_datum.dm +++ b/monkestation/code/modules/new_antagonists/slasher/slasher_datum.dm @@ -154,9 +154,6 @@ if(linked_machette) linked_machette.force += 2.5 linked_machette.throwforce += 2.5 - if(owner.current.team_monitor.tracking[stalked_human.tracking_beacon]) - qdel(owner.current.team_monitor.tracking[stalked_human.tracking_beacon]) - qdel(stalked_human.tracking_beacon) stalked_human = null /datum/antagonist/slasher/proc/failed_stalking() @@ -164,7 +161,4 @@ if(linked_machette) linked_machette.force -= 5 linked_machette.throwforce -= 5 - if(owner.current.team_monitor.tracking[stalked_human.tracking_beacon]) - qdel(owner.current.team_monitor.tracking[stalked_human.tracking_beacon]) - qdel(stalked_human.tracking_beacon) stalked_human = null diff --git a/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm b/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm index 0ae75bb1b114..838b511fca8a 100644 --- a/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm +++ b/monkestation/code/modules/ocean_content/hotspot/hotspot_controller.dm @@ -27,7 +27,6 @@ SUBSYSTEM_DEF(hotspots) return SS_INIT_NO_NEED generate_hotspots() generate_map() - generate_finalized_map() return SS_INIT_SUCCESS /datum/controller/subsystem/hotspots/fire() @@ -38,7 +37,6 @@ SUBSYSTEM_DEF(hotspots) if(generated_hotspot.drift_count >= generated_hotspot.drift_speed) generated_hotspot.drift_count = 0 generated_hotspot.move_center(get_step(generated_hotspot.center.return_turf(), generated_hotspot.drift_direction)) - generate_finalized_map() /datum/controller/subsystem/hotspots/proc/generate_hotspots() var/datum/hotspot/new_hotspot @@ -129,7 +127,6 @@ SUBSYSTEM_DEF(hotspots) . = TRUE else listed_hotspot.can_drift = FALSE - generate_finalized_map() ///we handle movement and recentering here listed_hotspot.drift_direction = angle2dir(arctan(hotspot_center.x - stomped.x, hotspot_center.y - stomped.y)) diff --git a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm index 9fc187d4c901..143790362f37 100644 --- a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm +++ b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm @@ -22,91 +22,6 @@ ///draw the map with the color chosen map.DrawBox(colors[turf_color], x * 2, y * 2, x * 2 + 1, y * 2 + 1) - -/datum/controller/subsystem/hotspots/proc/generate_finalized_map() - if(!map) - return - - ///points on the map we than translate to colors and sqaures on the map - var/list/hotspots = list() - for (var/datum/hotspot/listed_spot in generated_hotspots) - if(listed_spot.can_drift) - hotspots += {"
"} - else - hotspots += {"
"} - ///using html because idk how to transport a generated icon into tgui. so this is the best i could come up with. - finished_map = {" - - - - Trench Map - - - - - - -
- - [hotspots.Join("")] -
-
- Trench Wall - Station - Unknown - Hotspot - Locked Hotspot -
- - - "} /obj/item/sea_map name = "Trench Map" icon = 'icons/obj/contractor_tablet.dmi' @@ -117,23 +32,30 @@ if(!user.client) return - if (!SShotspots.finished_map || !SShotspots.map) + if (!SShotspots.map) return - user.client << browse_rsc(SShotspots.map, "trenchmap.png") ui_interact(user) /obj/item/sea_map/ui_interact(mob/user, datum/tgui/ui) - user.client << browse_rsc(SShotspots.map, "trenchmap.png") - if(!SSassets.cache["trenchmap.png"]) - SSassets.transport.register_asset("trenchmap.png", SShotspots.finished_map) - SSassets.transport.send_assets(user, list("trenchmap.png" = SShotspots.finished_map)) - ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "TrenchMap", name) ui.open() -/obj/item/sea_map/ui_data() +/obj/item/sea_map/ui_data(mob/user) var/list/data = list() + var/list/hotspot_list = list() + for (var/datum/hotspot/listed_spot in SShotspots.generated_hotspots) + var/list/details = list() + details["center_y"] = listed_spot.center.y + details["center_x"] = listed_spot.center.x + details["radius"] = listed_spot.radius + details["locked"] = listed_spot.can_drift + hotspot_list += list(details) + data["hotspots"] = hotspot_list + if(!SSassets.cache["trenchmap.png"]) + SSassets.transport.register_asset("trenchmap.png", SShotspots.map) + SSassets.transport.send_assets(user, list("trenchmap.png" = SShotspots.map)) + data["map_image"] = SSassets.transport.get_asset_url("trenchmap.png") data["map"] = SShotspots.finished_map return data diff --git a/monkestation/code/modules/research/designs/security_designs.dm b/monkestation/code/modules/research/designs/security_designs.dm index 644d1025e345..ee94804102bd 100644 --- a/monkestation/code/modules/research/designs/security_designs.dm +++ b/monkestation/code/modules/research/designs/security_designs.dm @@ -19,3 +19,59 @@ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO, ) departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle + name = "WT-550 Autorifle Magazine (4.6x30mm) (Lethal)" + desc = "A 20 round magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron = 12000) + build_path = /obj/item/ammo_box/magazine/wt550m9 + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/ap_mag + name = "WT-550 Autorifle Armour Piercing Magazine (4.6x30mm AP) (Lethal)" + desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_ap" + materials = list(/datum/material/iron = 15000, /datum/material/silver = 600) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtap + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/ic_mag + name = "WT-550 Autorifle Incendiary Magazine (4.6x30mm IC) (Lethal/Highly Destructive)" + desc = "A 20 round armour piercing magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_ic" + materials = list(/datum/material/iron = 15000, /datum/material/silver = 600, /datum/material/glass = 1000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtic + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/rub_mag + name = "WT-550 Autorifle Rubber Magazine (4.6x30mm R) (Lethal)" + desc = "A 20 round rubber magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_rub" + materials = list(/datum/material/iron = 6000) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtrub + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY + +/datum/design/mag_autorifle/salt_mag + name = "WT-550 Autorifle Saltshot Magazine (4.6x30mm SALT) (Non-Lethal)" + desc = "A 20 round saltshot magazine for the out of date WT-550 Autorifle." + id = "mag_autorifle_salt" + materials = list(/datum/material/iron = 6000, /datum/material/plasma = 600) + build_path = /obj/item/ammo_box/magazine/wt550m9/wtsalt + category = list( + RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO + ) + departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/monkestation/code/modules/research/techweb/all_nodes.dm b/monkestation/code/modules/research/techweb/all_nodes.dm index fb910f3f7a6e..f8d664d8eb1c 100644 --- a/monkestation/code/modules/research/techweb/all_nodes.dm +++ b/monkestation/code/modules/research/techweb/all_nodes.dm @@ -187,3 +187,14 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000, TECHWEB_POINT_TYPE_NANITES = 2500) hidden = TRUE experimental = TRUE + +/datum/techweb_node/adv_ballistics + id = "adv_ballistics" + display_name = "Advanced Ballistics" + description = "The most sophisticated methods of shooting people." + prereq_ids = list("adv_weaponry") + design_ids = list( + "mag_autorifle_ap", + "mag_autorifle_ic", + ) + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) diff --git a/monkestation/code/modules/security/icons/paco_ammo.dmi b/monkestation/code/modules/security/icons/paco_ammo.dmi index 9ab5f9e7d866..1802db63be1e 100644 Binary files a/monkestation/code/modules/security/icons/paco_ammo.dmi and b/monkestation/code/modules/security/icons/paco_ammo.dmi differ diff --git a/monkestation/code/modules/storytellers/config.dm b/monkestation/code/modules/storytellers/config.dm new file mode 100644 index 000000000000..121a512099d1 --- /dev/null +++ b/monkestation/code/modules/storytellers/config.dm @@ -0,0 +1,149 @@ +///Gamemode related configs below +// Point Gain Multipliers +/datum/config_entry/number/mundane_point_gain_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/moderate_point_gain_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/major_point_gain_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/roleset_point_gain_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/objectives_point_gain_multiplier + config_entry_value = 1 + min_val = 0 + +// Roundstart points Multipliers +/datum/config_entry/number/mundane_roundstart_point_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/moderate_roundstart_point_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/major_roundstart_point_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/roleset_roundstart_point_multiplier + config_entry_value = 1 + min_val = 0 + +/datum/config_entry/number/objectives_roundstart_point_multiplier + config_entry_value = 1 + min_val = 0 + +// Minimum population +/datum/config_entry/number/mundane_min_pop + config_entry_value = MUNDANE_MIN_POP + integer = TRUE + min_val = 0 + +/datum/config_entry/number/moderate_min_pop + config_entry_value = MODERATE_MIN_POP + integer = TRUE + min_val = 0 + +/datum/config_entry/number/major_min_pop + config_entry_value = MAJOR_MIN_POP + integer = TRUE + min_val = 0 + +/datum/config_entry/number/roleset_min_pop + config_entry_value = ROLESET_MIN_POP + integer = TRUE + min_val = 0 + +/datum/config_entry/number/objectives_min_pop + config_entry_value = OBJECTIVES_MIN_POP + integer = TRUE + min_val = 0 + +// Point Thresholds +/datum/config_entry/number/mundane_point_threshold + config_entry_value = MUNDANE_POINT_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/moderate_point_threshold + config_entry_value = MODERATE_POINT_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/major_point_threshold + config_entry_value = MAJOR_POINT_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/roleset_point_threshold + config_entry_value = ROLESET_POINT_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/objectives_point_threshold + config_entry_value = OBJECTIVES_POINT_THRESHOLD + integer = TRUE + min_val = 0 + + +/datum/config_entry/flag/allow_storyteller_pop_scaling // Allows storyteller to scale down the event frequency by population + +// Pop scalling thresholds +/datum/config_entry/number/mundane_pop_scale_threshold + config_entry_value = MUNDANE_POP_SCALE_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/moderate_pop_scale_threshold + config_entry_value = MODERATE_POP_SCALE_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/major_pop_scale_threshold + config_entry_value = MAJOR_POP_SCALE_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/roleset_pop_scale_threshold + config_entry_value = ROLESET_POP_SCALE_THRESHOLD + integer = TRUE + min_val = 0 + +/datum/config_entry/number/objectives_pop_scale_threshold + config_entry_value = OBJECTIVES_POP_SCALE_THRESHOLD + integer = TRUE + min_val = 0 + +// Pop scalling penalties +/datum/config_entry/number/mundane_pop_scale_penalty + config_entry_value = MUNDANE_POP_SCALE_PENALTY + integer = TRUE + min_val = 0 + +/datum/config_entry/number/moderate_pop_scale_penalty + config_entry_value = MODERATE_POP_SCALE_PENALTY + integer = TRUE + min_val = 0 + +/datum/config_entry/number/major_pop_scale_penalty + config_entry_value = MAJOR_POP_SCALE_PENALTY + integer = TRUE + min_val = 0 + +/datum/config_entry/number/roleset_pop_scale_penalty + config_entry_value = ROLESET_POP_SCALE_PENALTY + integer = TRUE + min_val = 0 + +/datum/config_entry/number/objectives_pop_scale_penalty + config_entry_value = OBJECTIVES_POP_SCALE_PENALTY + integer = TRUE + min_val = 0 diff --git a/monkestation/code/modules/storytellers/converted_events/_base_event.dm b/monkestation/code/modules/storytellers/converted_events/_base_event.dm new file mode 100644 index 000000000000..0a4a88a2587c --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/_base_event.dm @@ -0,0 +1,250 @@ +/datum/round_event_control + ///do we check against the antag cap before attempting a spawn? + var/checks_antag_cap = FALSE + /// List of enemy roles, will check if x amount of these exist exist + var/list/enemy_roles + ///required number of enemies in roles to exist + var/required_enemies = 0 + +/datum/round_event_control/proc/return_failure_string(players_amt) + var/string + if(roundstart && (world.time-SSticker.round_start_time >= 2 MINUTES)) + string += "Roundstart" + if(occurrences >= max_occurrences) + if(string) + string += "," + string += "Cap Reached" + if(earliest_start >= world.time-SSticker.round_start_time) + if(string) + string += "," + string +="Too Soon" + if(players_amt < min_players) + if(string) + string += "," + string += "Lack of players" + if(holidayID && !check_holidays(holidayID)) + if(string) + string += "," + string += "Holiday Event" + if(EMERGENCY_ESCAPED_OR_ENDGAMED) + if(string) + string += "," + string += "Round End" + if(checks_antag_cap) + if(!roundstart && !SSgamemode.can_inject_antags()) + if(string) + string += "," + string += "Too Many Antags" + return string + +/datum/round_event_control/antagonist/return_failure_string(players_amt) + . =..() + if(!check_enemies()) + if(.) + . += ", " + . += "No Enemies" + if(!check_required()) + if(.) + . += ", " + . += "No Required" + return . + +/datum/round_event_control/antagonist/solo/return_failure_string(players_amt) + . =..() + + var/antag_amt = get_antag_amount() + var/list/candidates = get_candidates() + if(candidates.len < antag_amt) + if(.) + . += ", " + . += "Not Enough Candidates!" + + return . + +/datum/round_event_control/antagonist + checks_antag_cap = TRUE + track = EVENT_TRACK_ROLESET + ///list of required roles, needed for this to form + var/list/exclusive_roles + /// Protected roles from the antag roll. People will not get those roles if a config is enabled + var/list/protected_roles + /// Restricted roles from the antag roll + var/list/restricted_roles + +/datum/round_event_control/antagonist/proc/check_required() + if(!length(exclusive_roles)) + return TRUE + for (var/mob/M in GLOB.alive_player_list) + if (M.stat == DEAD) + continue // Dead players cannot count as passing requirements + if(M.mind && (M.mind.assigned_role.title in exclusive_roles)) + return TRUE + +/datum/round_event_control/antagonist/proc/trim_candidates(list/candidates) + return candidates + +/datum/round_event_control/proc/check_enemies() + if(!length(enemy_roles)) + return TRUE + var/job_check = 0 + for (var/mob/M in GLOB.alive_player_list) + if (M.stat == DEAD) + continue // Dead players cannot count as opponents + if (M.mind && (M.mind.assigned_role.title in enemy_roles)) + job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it + + if(job_check >= required_enemies) + return TRUE + return FALSE + +/datum/round_event_control/antagonist/New() + . = ..() + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_roles |= protected_roles + +/datum/round_event_control/antagonist/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) + . = ..() + if(!check_required()) + return FALSE + + if(!.) + return + +/datum/round_event_control/antagonist/solo + typepath = /datum/round_event/antagonist/solo + /// How many baseline antags do we spawn + var/base_antags = 1 + /// How many maximum antags can we spawn + var/maximum_antags = 3 + /// For this many players we'll add 1 up to the maximum antag amount + var/denominator = 20 + /// The antag flag to be used + var/antag_flag + /// The antag datum to be applied + var/antag_datum + /// Prompt players for consent to turn them into antags before doing so. Dont allow this for roundstart. + var/prompted_picking = FALSE + +/datum/round_event_control/antagonist/solo/from_ghosts/get_candidates() + var/round_started = SSticker.HasRoundStarted() + var/midround_antag_pref_arg = round_started ? FALSE : TRUE + + var/list/candidates = SSgamemode.get_candidates(antag_flag, antag_flag, observers = TRUE, midround_antag_pref = midround_antag_pref_arg, restricted_roles = restricted_roles) + candidates = trim_candidates(candidates) + return candidates + +/datum/round_event_control/antagonist/solo/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) + . = ..() + if(!.) + return + var/antag_amt = get_antag_amount() + var/list/candidates = get_candidates() + if(candidates.len < antag_amt) + return FALSE + +/datum/round_event_control/antagonist/solo/proc/get_antag_amount() + var/people = SSgamemode.get_correct_popcount() + var/amount = base_antags + FLOOR(people / denominator, 1) + return min(amount, maximum_antags) + +/datum/round_event_control/antagonist/solo/proc/get_candidates() + var/round_started = SSticker.HasRoundStarted() + var/new_players_arg = round_started ? FALSE : TRUE + var/living_players_arg = round_started ? TRUE : FALSE + var/midround_antag_pref_arg = round_started ? FALSE : TRUE + + var/list/candidates = SSgamemode.get_candidates(antag_flag, antag_flag, ready_newplayers = new_players_arg, living_players = living_players_arg, midround_antag_pref = midround_antag_pref_arg, restricted_roles = restricted_roles, required_roles = exclusive_roles) + candidates = trim_candidates(candidates) + return candidates + +/datum/round_event + var/excute_round_end_reports = FALSE + +/datum/round_event/proc/round_end_report() + return + +/datum/round_event/setup() + . = ..() + if(excute_round_end_reports) + SSgamemode.round_end_data |= src + +/datum/round_event/antagonist + fakeable = FALSE + end_when = 60 //This is so prompted picking events have time to run //TODO: refactor events so they can be the masters of themselves, instead of relying on some weirdly timed vars + +/datum/round_event/antagonist/solo + // ALL of those variables are internal. Check the control event to change them + /// The antag flag passed from control + var/antag_flag + /// The antag datum passed from control + var/antag_datum + /// The antag count passed from control + var/antag_count + /// The restricted roles (jobs) passed from control + var/list/restricted_roles + /// The minds we've setup in setup() and need to finalize in start() + var/list/setup_minds = list() + /// Whether we prompt the players before picking them. + var/prompted_picking = FALSE //TODO: Implement this + +/datum/round_event/antagonist/solo/setup() + var/datum/round_event_control/antagonist/solo/cast_control = control + antag_count = cast_control.get_antag_amount() + antag_flag = cast_control.antag_flag + antag_datum = cast_control.antag_datum + restricted_roles = cast_control.restricted_roles + prompted_picking = cast_control.prompted_picking + var/list/candidates = cast_control.get_candidates() + if(prompted_picking) + candidates = poll_candidates("Would you like to be a [cast_control.name]", antag_flag, antag_flag, 20 SECONDS, FALSE, FALSE, candidates) + + for(var/i in 1 to antag_count) + if(!candidates.len) + break + var/mob/candidate = pick_n_take(candidates) + if(!candidate.mind) + candidate.mind = new /datum/mind(candidate.key) + + setup_minds += candidate.mind + candidate.mind.special_role = antag_flag + candidate.mind.restricted_roles = restricted_roles + setup = TRUE + + +/datum/round_event/antagonist/solo/ghost/setup() + var/datum/round_event_control/antagonist/solo/cast_control = control + antag_count = cast_control.get_antag_amount() + antag_flag = cast_control.antag_flag + antag_datum = cast_control.antag_datum + restricted_roles = cast_control.restricted_roles + prompted_picking = cast_control.prompted_picking + var/list/candidates = cast_control.get_candidates() + if(prompted_picking) + candidates = poll_candidates("Would you like to be a [cast_control.name]", antag_flag, antag_flag, 20 SECONDS, FALSE, FALSE, candidates) + + for(var/i in 1 to antag_count) + if(!candidates.len) + break + var/mob/candidate = pick_n_take(candidates) + if(!candidate.mind) + candidate.mind = new /datum/mind(candidate.key) + + setup_minds += candidate.mind + var/mob/living/carbon/human/new_human = make_body(candidate) + candidate.mind.set_current(new_human) + candidate.mind.special_role = antag_flag + candidate.mind.restricted_roles = restricted_roles + setup = TRUE + + +/datum/round_event/antagonist/solo/start() + for(var/datum/mind/antag_mind as anything in setup_minds) + add_datum_to_mind(antag_mind, antag_mind.current) + +/datum/round_event/antagonist/solo/proc/add_datum_to_mind(datum/mind/antag_mind) + antag_mind.add_antag_datum(antag_datum) + +/datum/round_event/antagonist/solo/ghost/start() + for(var/datum/mind/antag_mind as anything in setup_minds) + add_datum_to_mind(antag_mind) + diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm new file mode 100644 index 000000000000..f76463ae9e06 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm @@ -0,0 +1,75 @@ +/datum/round_event_control/antagonist/solo/bloodcult + name = "Blood Cult" + tags = list(TAG_SPOOKY, TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_CULTIST + antag_datum = /datum/antagonist/cult + typepath = /datum/round_event/antagonist/solo/bloodcult + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHAPLAIN, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + maximum_antags = 3 + enemy_roles = list( + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 5 + base_antags = 2 + // I give up, just there should be enough heads with 35 players... + min_players = 30 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 4 + max_occurrences = 3 + +/datum/round_event/antagonist/solo/bloodcult + excute_round_end_reports = TRUE + end_when = 60000 + var/static/datum/team/cult/main_cult + +/datum/round_event/antagonist/solo/bloodcult/setup() + . = ..() + if(!main_cult) + main_cult = new() + +/datum/round_event/antagonist/solo/bloodcult/start() + . = ..() + main_cult.setup_objectives() + +/datum/round_event/antagonist/solo/bloodcult/add_datum_to_mind(datum/mind/antag_mind) + var/datum/antagonist/cult/new_cultist = new antag_datum() + new_cultist.cult_team = main_cult + new_cultist.give_equipment = TRUE + antag_mind.add_antag_datum(new_cultist) + +/datum/round_event/antagonist/solo/bloodcult/round_end_report() + if(main_cult.check_cult_victory()) + SSticker.mode_result = "win - cult win" + SSticker.news_report = CULT_SUMMON + return + + SSticker.mode_result = "loss - staff stopped the cult" + + if(main_cult.size_at_maximum == 0) + CRASH("Cult team existed with a size_at_maximum of 0 at round end!") + + // If more than a certain ratio of our cultists have escaped, give the "cult escape" resport. + // Otherwise, give the "cult failure" report. + var/ratio_to_be_considered_escaped = 0.5 + var/escaped_cultists = 0 + for(var/datum/mind/escapee as anything in main_cult.members) + if(considered_escaped(escapee)) + escaped_cultists++ + + SSticker.news_report = (escaped_cultists / main_cult.size_at_maximum) >= ratio_to_be_considered_escaped ? CULT_ESCAPE : CULT_FAILURE diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm new file mode 100644 index 000000000000..b1d19ed354f5 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm @@ -0,0 +1,39 @@ +/datum/round_event_control/antagonist/solo/bloodsucker + antag_flag = ROLE_BLOODSUCKER + tags = list(TAG_COMBAT) + antag_datum = /datum/antagonist/bloodsucker + protected_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_PERSONNEL, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_RESEARCH_DIRECTOR, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + restricted_roles = list( + JOB_AI, + JOB_CYBORG, + ) + min_players = 20 + weight = 5 + maximum_antags = 2 + +/datum/round_event_control/antagonist/solo/bloodsucker/roundstart + name = "Bloodsuckers" + roundstart = TRUE + earliest_start = 0 SECONDS + +/datum/round_event_control/antagonist/solo/bloodsucker/midround + typepath = /datum/round_event/antagonist/solo/bloodsucker + antag_flag = ROLE_VAMPIRICACCIDENT + name = "Vampiric Accident" + prompted_picking = TRUE + max_occurrences = 1 + +/datum/round_event/antagonist/solo/bloodsucker/add_datum_to_mind(datum/mind/antag_mind) + var/datum/antagonist/bloodsucker/bloodsuckerdatum = antag_mind.make_bloodsucker() + bloodsuckerdatum.bloodsucker_level_unspent = rand(2,3) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm new file mode 100644 index 000000000000..0171f36d42ae --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm @@ -0,0 +1,30 @@ +/datum/round_event_control/antagonist/solo/changeling + antag_flag = ROLE_CHANGELING + tags = list(TAG_COMBAT) + antag_datum = /datum/antagonist/changeling + protected_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_PERSONNEL, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_RESEARCH_DIRECTOR, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + restricted_roles = list( + JOB_AI, + JOB_CYBORG, + ) + min_players = 20 + +/datum/round_event_control/antagonist/solo/changeling/roundstart + name = "Changelings" + roundstart = TRUE + earliest_start = 0 + +/datum/round_event_control/antagonist/solo/changeling/midround + name = "Genome Awakening (Changelings)" + prompted_picking = TRUE diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm new file mode 100644 index 000000000000..e19bd8f800f3 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm @@ -0,0 +1,46 @@ +/datum/round_event_control/antagonist/solo/clockcult + name = "Clock Cult" + tags = list(TAG_SPOOKY, TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_CLOCK_CULTIST + antag_datum = /datum/antagonist/clock_cultist + typepath = /datum/round_event/antagonist/solo/clockcult + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHAPLAIN, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + maximum_antags = 3 + enemy_roles = list( + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 3 + base_antags = 4 + maximum_antags = 4 + // I give up, just there should be enough heads with 35 players... + min_players = 30 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 4 + max_occurrences = 3 + +/datum/round_event/antagonist/solo/clockcult + end_when = 60000 + +/datum/round_event/antagonist/solo/clockcult/setup() + . = ..() + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_reebe)) + +/datum/round_event/antagonist/solo/clockcult/add_datum_to_mind(datum/mind/antag_mind) + antag_mind.special_role = ROLE_CLOCK_CULTIST + antag_mind.add_antag_datum(antag_datum) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm new file mode 100644 index 000000000000..03d1866b32f4 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm @@ -0,0 +1,116 @@ +/datum/round_event_control/antagonist/solo/clown_operative + name = "Roundstart Clown Operative" + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_CLOWN_OPERATIVE + antag_datum = /datum/antagonist/nukeop/clownop + typepath = /datum/round_event/antagonist/solo/clown_operative + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_RESEARCH_DIRECTOR, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + base_antags = 3 + maximum_antags = 5 + enemy_roles = list( + JOB_AI, + JOB_CYBORG, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 5 + // I give up, just there should be enough heads with 35 players... + min_players = 35 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 4 + max_occurrences = 1 + +/datum/round_event/antagonist/solo/clown_operative + excute_round_end_reports = TRUE + end_when = 60000 /// we will end on our own when revs win + var/static/datum/team/nuclear/nuke_team + var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader + var/set_leader = FALSE + var/required_role = ROLE_CLOWN_OPERATIVE + +/datum/round_event/antagonist/solo/clown_operative/setup() + . = ..() + var/obj/machinery/nuclearbomb/syndicate/syndicate_nuke = locate() in GLOB.nuke_list + if(syndicate_nuke) + var/turf/nuke_turf = get_turf(syndicate_nuke) + if(nuke_turf) + new /obj/machinery/nuclearbomb/syndicate/bananium(nuke_turf) + qdel(syndicate_nuke) + +/datum/round_event/antagonist/solo/clown_operative/add_datum_to_mind(datum/mind/antag_mind) + var/mob/living/current_mob = antag_mind.current + SSjob.FreeRole(antag_mind.assigned_role.title) + var/list/items = current_mob.get_equipped_items(TRUE) + current_mob.unequip_everything() + for(var/obj/item/item as anything in items) + qdel(item) + + antag_mind.set_assigned_role(SSjob.GetJobType(/datum/job/clown_operative)) + antag_mind.special_role = ROLE_CLOWN_OPERATIVE + + var/datum/mind/most_experienced = get_most_experienced(setup_minds, required_role) + if(!most_experienced) + most_experienced = antag_mind + + if(!set_leader) + set_leader = TRUE + var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum) + nuke_team = leader.nuke_team + + if(antag_mind == most_experienced) + return + + var/datum/antagonist/nukeop/new_op = new antag_datum() + antag_mind.add_antag_datum(new_op) + + +/datum/round_event/antagonist/solo/clown_operative/round_end_report() + var/result = nuke_team.get_result() + switch(result) + if(NUKE_RESULT_FLUKE) + SSticker.mode_result = "loss - syndicate nuked - disk secured" + SSticker.news_report = NUKE_SYNDICATE_BASE + if(NUKE_RESULT_NUKE_WIN) + SSticker.mode_result = "win - syndicate nuke" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_NOSURVIVORS) + SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_WRONG_STATION) + SSticker.mode_result = "halfwin - blew wrong station" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_WRONG_STATION_DEAD) + SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD) + SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_CREW_WIN) + SSticker.mode_result = "loss - evacuation - disk secured" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_DISK_LOST) + SSticker.mode_result = "halfwin - evacuation - disk not secured" + SSticker.news_report = OPERATIVE_SKIRMISH + if(NUKE_RESULT_DISK_STOLEN) + SSticker.mode_result = "halfwin - detonation averted" + SSticker.news_report = OPERATIVE_SKIRMISH + else + SSticker.mode_result = "halfwin - interrupted" + SSticker.news_report = OPERATIVE_SKIRMISH diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm new file mode 100644 index 000000000000..90dfba4182be --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm @@ -0,0 +1,103 @@ +/datum/round_event_control/antagonist/solo/from_ghosts/nuclear_operative + name = "Nuclear Assault" + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_OPERATIVE_MIDROUND + antag_datum = /datum/antagonist/nukeop + typepath = /datum/round_event/antagonist/solo/ghost/nuclear_operative + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_RESEARCH_DIRECTOR, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + base_antags = 3 + maximum_antags = 4 + enemy_roles = list( + JOB_AI, + JOB_CYBORG, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 5 + // I give up, just there should be enough heads with 35 players... + min_players = 35 + roundstart = TRUE + earliest_start = 45 MINUTES + weight = 4 + max_occurrences = 1 + +/datum/round_event/antagonist/solo/ghost/nuclear_operative + excute_round_end_reports = TRUE + end_when = 60000 /// we will end on our own when revs win + var/static/datum/team/nuclear/nuke_team + var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader + var/set_leader = FALSE + var/required_role = ROLE_NUCLEAR_OPERATIVE + +/datum/round_event/antagonist/solo/ghost/nuclear_operative/add_datum_to_mind(datum/mind/antag_mind) + var/mob/living/current_mob = antag_mind.current + var/list/items = current_mob.get_equipped_items(TRUE) + current_mob.unequip_everything() + for(var/obj/item/item as anything in items) + qdel(item) + + var/datum/mind/most_experienced = get_most_experienced(setup_minds, required_role) + if(!most_experienced) + most_experienced = antag_mind + + if(!set_leader) + set_leader = TRUE + var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum) + nuke_team = leader.nuke_team + + if(antag_mind == most_experienced) + return + + var/datum/antagonist/nukeop/new_op = new antag_datum() + antag_mind.add_antag_datum(new_op) + + +/datum/round_event/antagonist/solo/ghost/nuclear_operative/round_end_report() + var/result = nuke_team.get_result() + switch(result) + if(NUKE_RESULT_FLUKE) + SSticker.mode_result = "loss - syndicate nuked - disk secured" + SSticker.news_report = NUKE_SYNDICATE_BASE + if(NUKE_RESULT_NUKE_WIN) + SSticker.mode_result = "win - syndicate nuke" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_NOSURVIVORS) + SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_WRONG_STATION) + SSticker.mode_result = "halfwin - blew wrong station" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_WRONG_STATION_DEAD) + SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD) + SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_CREW_WIN) + SSticker.mode_result = "loss - evacuation - disk secured" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_DISK_LOST) + SSticker.mode_result = "halfwin - evacuation - disk not secured" + SSticker.news_report = OPERATIVE_SKIRMISH + if(NUKE_RESULT_DISK_STOLEN) + SSticker.mode_result = "halfwin - detonation averted" + SSticker.news_report = OPERATIVE_SKIRMISH + else + SSticker.mode_result = "halfwin - interrupted" + SSticker.news_report = OPERATIVE_SKIRMISH diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm new file mode 100644 index 000000000000..a8720fcf90fa --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/wizard.dm @@ -0,0 +1,28 @@ +/datum/round_event_control/antagonist/solo/from_ghosts/wizard + name = "Ghost Wizard" + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + typepath = /datum/round_event/antagonist/solo/ghost/wizard + antag_flag = ROLE_WIZARD + antag_datum = /datum/antagonist/wizard + restricted_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_SECURITY, + ) // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted + maximum_antags = 1 + weight = 2 + min_players = 35 + max_occurrences = 1 + prompted_picking = TRUE + +/datum/round_event_control/antagonist/solo/ghost/wizard/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) + . = ..() + if(!.) + return + if(GLOB.wizardstart.len == 0) + return FALSE + +/datum/round_event/antagonist/solo/ghost/wizard + +/datum/round_event/antagonist/solo/ghost/wizard/add_datum_to_mind(datum/mind/antag_mind) + . = ..() + antag_mind.current.forceMove(pick(GLOB.wizardstart)) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm new file mode 100644 index 000000000000..cb0c244a83d7 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm @@ -0,0 +1,32 @@ +/datum/round_event_control/antagonist/solo/heretic + antag_flag = ROLE_HERETIC + tags = list(TAG_COMBAT, TAG_SPOOKY) + antag_datum = /datum/antagonist/heretic + protected_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_PERSONNEL, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_RESEARCH_DIRECTOR, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + restricted_roles = list( + JOB_AI, + JOB_CYBORG, + ) + weight = 4 + min_players = 20 + +/datum/round_event_control/antagonist/solo/heretic/roundstart + name = "Heretics" + roundstart = TRUE + earliest_start = 0 + +/datum/round_event_control/antagonist/solo/heretic/midround + name = "Midround Heretics" + prompted_picking = TRUE diff --git a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm new file mode 100644 index 000000000000..e6265aca5029 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm @@ -0,0 +1,43 @@ +/datum/round_event_control/antagonist/solo/malf + antag_datum = /datum/antagonist/malf_ai + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + antag_flag = ROLE_MALF + enemy_roles = list( + JOB_CHEMIST, + JOB_CHIEF_ENGINEER, + JOB_HEAD_OF_SECURITY, + JOB_RESEARCH_DIRECTOR, + JOB_SCIENTIST, + JOB_ROBOTICIST, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + maximum_antags = 1 + exclusive_roles = list(JOB_AI) + required_enemies = 4 + weight = 4 + max_occurrences = 1 + +/datum/round_event_control/antagonist/solo/malf/trim_candidates(list/candidates) + for(var/mob/living/player in candidates) + if(!isAI(player)) + candidates -= player + continue + + if(is_centcom_level(player.z)) + candidates -= player + continue + + if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0)) + candidates -= player + + return candidates + +/datum/round_event_control/antagonist/solo/malf/midround + name = "Malfunctioning AI Midround" + antag_flag = ROLE_MALF_MIDROUND + +/datum/round_event_control/antagonist/solo/malf/roundstart + name = "Roundstart Malf AI" + roundstart = TRUE + earliest_start = 0 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm new file mode 100644 index 000000000000..6646c502a4a7 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm @@ -0,0 +1,104 @@ +/datum/round_event_control/antagonist/solo/nuclear_operative + name = "Roundstart Nuclear Operative" + tags = list(TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_OPERATIVE + antag_datum = /datum/antagonist/nukeop + typepath = /datum/round_event/antagonist/solo/nuclear_operative + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_RESEARCH_DIRECTOR, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + base_antags = 3 + maximum_antags = 5 + enemy_roles = list( + JOB_AI, + JOB_CYBORG, + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 5 + // I give up, just there should be enough heads with 35 players... + min_players = 35 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 4 + max_occurrences = 3 + +/datum/round_event/antagonist/solo/nuclear_operative + excute_round_end_reports = TRUE + end_when = 60000 /// we will end on our own when revs win + var/static/datum/team/nuclear/nuke_team + var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader + var/set_leader = FALSE + var/required_role = ROLE_NUCLEAR_OPERATIVE + +/datum/round_event/antagonist/solo/nuclear_operative/add_datum_to_mind(datum/mind/antag_mind) + var/mob/living/current_mob = antag_mind.current + SSjob.FreeRole(antag_mind.assigned_role.title) + var/list/items = current_mob.get_equipped_items(TRUE) + current_mob.unequip_everything() + for(var/obj/item/item as anything in items) + qdel(item) + + var/datum/mind/most_experienced = get_most_experienced(setup_minds, required_role) + if(!most_experienced) + most_experienced = antag_mind + + if(!set_leader) + set_leader = TRUE + var/datum/antagonist/nukeop/leader/leader = most_experienced.add_antag_datum(antag_leader_datum) + nuke_team = leader.nuke_team + + if(antag_mind == most_experienced) + return + + var/datum/antagonist/nukeop/new_op = new antag_datum() + antag_mind.add_antag_datum(new_op) + + +/datum/round_event/antagonist/solo/nuclear_operative/round_end_report() + var/result = nuke_team.get_result() + switch(result) + if(NUKE_RESULT_FLUKE) + SSticker.mode_result = "loss - syndicate nuked - disk secured" + SSticker.news_report = NUKE_SYNDICATE_BASE + if(NUKE_RESULT_NUKE_WIN) + SSticker.mode_result = "win - syndicate nuke" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_NOSURVIVORS) + SSticker.mode_result = "halfwin - syndicate nuke - did not evacuate in time" + SSticker.news_report = STATION_DESTROYED_NUKE + if(NUKE_RESULT_WRONG_STATION) + SSticker.mode_result = "halfwin - blew wrong station" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_WRONG_STATION_DEAD) + SSticker.mode_result = "halfwin - blew wrong station - did not evacuate in time" + SSticker.news_report = NUKE_MISS + if(NUKE_RESULT_CREW_WIN_SYNDIES_DEAD) + SSticker.mode_result = "loss - evacuation - disk secured - syndi team dead" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_CREW_WIN) + SSticker.mode_result = "loss - evacuation - disk secured" + SSticker.news_report = OPERATIVES_KILLED + if(NUKE_RESULT_DISK_LOST) + SSticker.mode_result = "halfwin - evacuation - disk not secured" + SSticker.news_report = OPERATIVE_SKIRMISH + if(NUKE_RESULT_DISK_STOLEN) + SSticker.mode_result = "halfwin - detonation averted" + SSticker.news_report = OPERATIVE_SKIRMISH + else + SSticker.mode_result = "halfwin - interrupted" + SSticker.news_report = OPERATIVE_SKIRMISH diff --git a/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm b/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm new file mode 100644 index 000000000000..e14da489b1e4 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/obsessed.dm @@ -0,0 +1,24 @@ +/datum/round_event_control/antagonist/solo/obsessed + antag_flag = ROLE_TRAITOR + tags = list(TAG_COMBAT) + antag_datum = /datum/antagonist/obsessed + typepath = /datum/round_event/antagonist/solo/obsessed + restricted_roles = list( + JOB_AI, + JOB_CYBORG, + ROLE_POSITRONIC_BRAIN, + ) + weight = 4 + max_occurrences = 3 + +/datum/round_event_control/antagonist/solo/obsessed/midround + name = "Compulsive Obsession" + prompted_picking = TRUE + maximum_antags = 4 + +/datum/round_event/antagonist/solo/obsessed + +/datum/round_event/antagonist/solo/clockcult/add_datum_to_mind(datum/mind/antag_mind) + antag_mind.add_antag_datum(antag_datum) + var/mob/living/carbon/human/current = antag_mind.current + current.gain_trauma(/datum/brain_trauma/special/obsessed) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm new file mode 100644 index 000000000000..5bf9e1d81fcd --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm @@ -0,0 +1,65 @@ +/datum/round_event_control/antagonist/solo/revolutionary + name = "Roundstart Revolution" + tags = list(TAG_COMMUNAL, TAG_DESTRUCTIVE, TAG_COMBAT, TAG_TEAM_ANTAG) + antag_flag = ROLE_REV_HEAD + antag_datum = /datum/antagonist/rev/head/event_trigger + typepath = /datum/round_event/antagonist/solo/revolutionary + restricted_roles = list( + JOB_AI, + JOB_CAPTAIN, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_CYBORG, + JOB_DETECTIVE, + JOB_HEAD_OF_PERSONNEL, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_RESEARCH_DIRECTOR, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + base_antags = 2 + enemy_roles = list( + JOB_CAPTAIN, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + required_enemies = 6 + // I give up, just there should be enough heads with 35 players... + min_players = 35 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 4 + max_occurrences = 1 + +/datum/antagonist/rev/head/event_trigger + remove_clumsy = TRUE + give_flash = TRUE + +/datum/round_event/antagonist/solo/revolutionary + excute_round_end_reports = TRUE + end_when = 60000 /// we will end on our own when revs win + var/static/datum/team/revolution/revolution + var/static/finished = FALSE + +/datum/round_event/antagonist/solo/revolutionary/setup() + . = ..() + if(!revolution) + revolution = new() + +/datum/round_event/antagonist/solo/revolutionary/add_datum_to_mind(datum/mind/antag_mind) + antag_mind.add_antag_datum(antag_datum, revolution) + if(revolution.members.len) + revolution.update_objectives() + revolution.update_heads() + SSshuttle.registerHostileEnvironment(revolution) + + +/datum/round_event/antagonist/solo/revolutionary/round_end_report() + var/winner = revolution.process_victory() + if (isnull(winner)) + return + finished = TRUE + revolution.round_result(finished) diff --git a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm new file mode 100644 index 000000000000..3100c3a50250 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm @@ -0,0 +1,29 @@ +/datum/round_event_control/antagonist/solo/traitor + antag_flag = ROLE_TRAITOR + tags = list(TAG_COMBAT) + antag_datum = /datum/antagonist/traitor + protected_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_PERSONNEL, + JOB_CHIEF_ENGINEER, + JOB_CHIEF_MEDICAL_OFFICER, + JOB_RESEARCH_DIRECTOR, + JOB_DETECTIVE, + JOB_HEAD_OF_SECURITY, + JOB_PRISONER, + JOB_SECURITY_OFFICER, + JOB_WARDEN, + ) + restricted_roles = list( + JOB_AI, + JOB_CYBORG, + ) + +/datum/round_event_control/antagonist/solo/traitor/roundstart + name = "Traitors" + roundstart = TRUE + earliest_start = 0 SECONDS + +/datum/round_event_control/antagonist/solo/traitor/midround + name = "Sleeper Agents (Traitors)" + prompted_picking = TRUE diff --git a/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm new file mode 100644 index 000000000000..a0069ece6634 --- /dev/null +++ b/monkestation/code/modules/storytellers/converted_events/solo/wizard.dm @@ -0,0 +1,36 @@ +/datum/round_event_control/antagonist/solo/wizard + name = "Wizard" + tags = list(TAG_COMBAT, TAG_DESTRUCTIVE) + typepath = /datum/round_event/antagonist/solo/wizard + antag_flag = ROLE_WIZARD + antag_datum = /datum/antagonist/wizard + restricted_roles = list( + JOB_CAPTAIN, + JOB_HEAD_OF_SECURITY, + ) // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted + maximum_antags = 1 + roundstart = TRUE + earliest_start = 0 SECONDS + weight = 2 + min_players = 35 + max_occurrences = 1 + +/datum/round_event_control/antagonist/solo/wizard/can_spawn_event(players_amt, allow_magic = FALSE, fake_check = FALSE) + . = ..() + if(!.) + return + if(GLOB.wizardstart.len == 0) + return FALSE + +/datum/round_event/antagonist/solo/wizard + +/datum/round_event/antagonist/solo/wizard/add_datum_to_mind(datum/mind/antag_mind) + . = ..() + var/mob/living/current_mob = antag_mind.current + SSjob.FreeRole(antag_mind.assigned_role.title) + var/list/items = current_mob.get_equipped_items(TRUE) + current_mob.unequip_everything() + for(var/obj/item/item as anything in items) + qdel(item) + + antag_mind.current.forceMove(pick(GLOB.wizardstart)) diff --git a/monkestation/code/modules/storytellers/gamemode_subsystem.dm b/monkestation/code/modules/storytellers/gamemode_subsystem.dm new file mode 100644 index 000000000000..2aa4db750c88 --- /dev/null +++ b/monkestation/code/modules/storytellers/gamemode_subsystem.dm @@ -0,0 +1,1158 @@ +#define INIT_ORDER_GAMEMODE 70 + +SUBSYSTEM_DEF(gamemode) + name = "Gamemode" + init_order = INIT_ORDER_GAMEMODE + runlevels = RUNLEVEL_GAME + flags = SS_BACKGROUND | SS_KEEP_TIMING + wait = 2 SECONDS + + /// List of our event tracks for fast access during for loops. + var/list/event_tracks = EVENT_TRACKS + /// Our storyteller. He progresses our trackboards and picks out events + var/datum/storyteller/storyteller + /// Result of the storyteller vote. Defaults to the guide. + var/voted_storyteller = /datum/storyteller/guide + /// List of all the storytellers. Populated at init. Associative from type + var/list/storytellers = list() + /// Next process for our storyteller. The wait time is STORYTELLER_WAIT_TIME + var/next_storyteller_process = 0 + /// Associative list of even track points. + var/list/event_track_points = list( + EVENT_TRACK_MUNDANE = 0, + EVENT_TRACK_MODERATE = 0, + EVENT_TRACK_MAJOR = 0, + EVENT_TRACK_ROLESET = 0, + EVENT_TRACK_OBJECTIVES = 0 + ) + /// Last point amount gained of each track. Those are recorded for purposes of estimating how long until next event. + var/list/last_point_gains = list( + EVENT_TRACK_MUNDANE = 0, + EVENT_TRACK_MODERATE = 0, + EVENT_TRACK_MAJOR = 0, + EVENT_TRACK_ROLESET = 0, + EVENT_TRACK_OBJECTIVES = 0 + ) + /// Point thresholds at which the events are supposed to be rolled, it is also the base cost for events. + var/list/point_thresholds = list( + EVENT_TRACK_MUNDANE = MUNDANE_POINT_THRESHOLD, + EVENT_TRACK_MODERATE = MODERATE_POINT_THRESHOLD, + EVENT_TRACK_MAJOR = MAJOR_POINT_THRESHOLD, + EVENT_TRACK_ROLESET = ROLESET_POINT_THRESHOLD, + EVENT_TRACK_OBJECTIVES = OBJECTIVES_POINT_THRESHOLD + ) + + /// Minimum population thresholds for the tracks to fire off events. + var/list/min_pop_thresholds = list( + EVENT_TRACK_MUNDANE = MUNDANE_MIN_POP, + EVENT_TRACK_MODERATE = MODERATE_MIN_POP, + EVENT_TRACK_MAJOR = MAJOR_MIN_POP, + EVENT_TRACK_ROLESET = ROLESET_MIN_POP, + EVENT_TRACK_OBJECTIVES = OBJECTIVES_MIN_POP + ) + + /// Configurable multipliers for point gain over time. + var/list/point_gain_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1, + EVENT_TRACK_MAJOR = 1, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + /// Configurable multipliers for roundstart points. + var/list/roundstart_point_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1, + EVENT_TRACK_MAJOR = 1, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + /// Whether we allow pop scaling. This is configured by config, or the storyteller UI + var/allow_pop_scaling = TRUE + + /// Associative list of pop scale thresholds. + var/list/pop_scale_thresholds = list( + EVENT_TRACK_MUNDANE = MUNDANE_POP_SCALE_THRESHOLD, + EVENT_TRACK_MODERATE = MODERATE_POP_SCALE_THRESHOLD, + EVENT_TRACK_MAJOR = MAJOR_POP_SCALE_THRESHOLD, + EVENT_TRACK_ROLESET = ROLESET_POP_SCALE_THRESHOLD, + EVENT_TRACK_OBJECTIVES = OBJECTIVES_POP_SCALE_THRESHOLD + ) + + /// Associative list of pop scale penalties. + var/list/pop_scale_penalties = list( + EVENT_TRACK_MUNDANE = MUNDANE_POP_SCALE_PENALTY, + EVENT_TRACK_MODERATE = MODERATE_POP_SCALE_PENALTY, + EVENT_TRACK_MAJOR = MAJOR_POP_SCALE_PENALTY, + EVENT_TRACK_ROLESET = ROLESET_POP_SCALE_PENALTY, + EVENT_TRACK_OBJECTIVES = OBJECTIVES_POP_SCALE_PENALTY + ) + + /// Associative list of active multipliers from pop scale penalty. + var/list/current_pop_scale_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1, + EVENT_TRACK_MAJOR = 1, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1, + ) + + + + /// Associative list of control events by their track category. Compiled in Init + var/list/event_pools = list() + + /// Events that we have scheduled to run in the nearby future + var/list/scheduled_events = list() + + /// Associative list of tracks to forced event controls. For admins to force events (though they can still invoke them freely outside of the track system) + var/list/forced_next_events = list() + + var/list/control = list() //list of all datum/round_event_control. Used for selecting events based on weight and occurrences. + var/list/running = list() //list of all existing /datum/round_event + var/list/round_end_data = list() //list of all reports that need to add round end reports + var/list/currentrun = list() + + /// List of all uncategorized events, because they were wizard or holiday events + var/list/uncategorized = list() + + var/list/holidays //List of all holidays occuring today or null if no holidays + + /// Event frequency multiplier, it exists because wizard, eugh. + var/event_frequency_multiplier = 1 + + /// Current preview page for the statistics UI. + var/statistics_track_page = EVENT_TRACK_MUNDANE + /// Page of the UI panel. + var/panel_page = GAMEMODE_PANEL_MAIN + /// Whether we are viewing the roundstart events or not + var/roundstart_event_view = TRUE + + /// Whether the storyteller has been halted + var/halted_storyteller = FALSE + + /// Ready players for roundstart events. + var/ready_players = 0 + var/active_players = 0 + var/head_crew = 0 + var/eng_crew = 0 + var/sec_crew = 0 + var/med_crew = 0 + + var/wizardmode = FALSE + + var/datum/round_event_control/current_roundstart_event + var/list/last_round_events = list() + var/ran_roundstart = FALSE + var/list/triggered_round_events = list() + + var/total_valid_antags = 0 + +/datum/controller/subsystem/gamemode/Initialize(time, zlevel) + // Populate event pools + for(var/track in event_tracks) + event_pools[track] = list() + + // Populate storytellers + for(var/type in subtypesof(/datum/storyteller)) + storytellers[type] = new type() + + for(var/type in typesof(/datum/round_event_control)) + var/datum/round_event_control/event = new type() + if(!event.typepath || !event.name) + continue //don't want this one! leave it for the garbage collector + if(!event.valid_for_map()) + continue // event isn't good for this map no point in trying to add it to the list + control += event //add it to the list of all events (controls) + getHoliday() + + load_config_vars() + load_event_config_vars() + + ///Seeding events into track event pools needs to happen after event config vars are loaded + for(var/datum/round_event_control/event as anything in control) + if(event.holidayID || event.wizardevent) + uncategorized += event + continue + event_pools[event.track] += event //Add it to the categorized event pools + + load_roundstart_data() + +// return ..() + + +/datum/controller/subsystem/gamemode/fire(resumed = FALSE) + if(!resumed) + src.currentrun = running.Copy() + + ///Handle scheduled events + for(var/datum/scheduled_event/sch_event in scheduled_events) + if(world.time >= sch_event.start_time) + sch_event.try_fire() + else if(!sch_event.alerted_admins && world.time >= sch_event.start_time - 1 MINUTES) + ///Alert admins 1 minute before running and allow them to cancel or refund the event, once again. + sch_event.alerted_admins = TRUE + message_admins("Scheduled Event: [sch_event.event] will run in [(sch_event.start_time - world.time) / 10] seconds. (CANCEL) (REFUND)") + + if(!halted_storyteller && next_storyteller_process <= world.time && storyteller) + // We update crew information here to adjust population scalling and event thresholds for the storyteller. + update_crew_infos() + next_storyteller_process = world.time + STORYTELLER_WAIT_TIME + storyteller.process(STORYTELLER_WAIT_TIME * 0.1) + + //cache for sanic speed (lists are references anyways) + var/list/currentrun = src.currentrun + + while(currentrun.len) + var/datum/thing = currentrun[currentrun.len] + currentrun.len-- + if(thing) + thing.process(wait * 0.1) + else + running.Remove(thing) + if (MC_TICK_CHECK) + return + +/// Gets the number of antagonists the antagonist injection events will stop rolling after. +/datum/controller/subsystem/gamemode/proc/get_antag_cap() + var/total_number = get_correct_popcount() + (sec_crew * 2) + var/cap = FLOOR((total_number / ANTAG_CAP_DENOMINATOR), 1) + ANTAG_CAP_FLAT + return cap + +/// Whether events can inject more antagonists into the round +/datum/controller/subsystem/gamemode/proc/can_inject_antags() + total_valid_antags = 0 + for(var/mob/checked_mob in GLOB.mob_list) + if(!checked_mob.mind) + continue + if(!checked_mob.mind.special_role) + continue + if(checked_mob.stat == DEAD) + continue + total_valid_antags++ + + + return (get_antag_cap() > total_valid_antags) + +/// Gets candidates for antagonist roles. +/datum/controller/subsystem/gamemode/proc/get_candidates(be_special, job_ban, observers, ready_newplayers, living_players, required_time, inherit_required_time = TRUE, midround_antag_pref, no_antags = TRUE, list/restricted_roles, list/required_roles) + var/list/candidates = list() + var/list/candidate_candidates = list() //lol + + for(var/mob/player as anything in GLOB.player_list) + if(ready_newplayers && isnewplayer(player)) + var/mob/dead/new_player/new_player = player + if(new_player.ready == PLAYER_READY_TO_PLAY && new_player.mind && new_player.check_preferences()) + candidate_candidates += player + else if (observers && isobserver(player)) + candidate_candidates += player + else if (living_players && isliving(player)) + if(!ishuman(player) && !isAI(player)) + continue + if(!(player.z in SSmapping.levels_by_trait(ZTRAIT_STATION))) + continue + candidate_candidates += player + + for(var/mob/candidate as anything in candidate_candidates) + if(QDELETED(candidate) || !candidate.key || !candidate.client || (!observers && !candidate.mind)) + continue + if(!observers) + if(no_antags && candidate.mind.special_role) + continue + if(restricted_roles && (candidate.mind.assigned_role.title in restricted_roles)) + continue + if(length(required_roles) && !(candidate.mind.assigned_role.title in required_roles)) + continue + + if(be_special) + if(!(candidate.client.prefs) || !(be_special in candidate.client.prefs.be_special)) + continue + + var/time_to_check + if(required_time) + time_to_check = required_time + else if (inherit_required_time) + time_to_check = GLOB.special_roles[be_special] + + if(time_to_check && candidate.client.get_remaining_days(time_to_check) > 0) + continue + + //if(midround_antag_pref) + //continue + + if(job_ban && is_banned_from(candidate.ckey, list(job_ban, ROLE_SYNDICATE))) + continue + candidates += candidate + return candidates + +/// Gets the correct popcount, returning READY people if roundstart, and active people if not. +/datum/controller/subsystem/gamemode/proc/get_correct_popcount() + if(SSticker.HasRoundStarted()) + update_crew_infos() + return active_players + else + calculate_ready_players() + return ready_players + +/// Refunds and removes a scheduled event. +/datum/controller/subsystem/gamemode/proc/refund_scheduled_event(datum/scheduled_event/refunded) + if(refunded.cost) + var/track_type = refunded.event.track + event_track_points[track_type] += refunded.cost + remove_scheduled_event(refunded) + +/// Removes a scheduled event. +/datum/controller/subsystem/gamemode/proc/remove_scheduled_event(datum/scheduled_event/removed) + scheduled_events -= removed + qdel(removed) + +/// We need to calculate ready players for the sake of roundstart events becoming eligible. +/datum/controller/subsystem/gamemode/proc/calculate_ready_players() + ready_players = 0 + for(var/mob/dead/new_player/player as anything in GLOB.new_player_list) + if(player.ready == PLAYER_READY_TO_PLAY) + ready_players++ + +/// We roll points to be spent for roundstart events, including antagonists. +/datum/controller/subsystem/gamemode/proc/roll_pre_setup_points() + if(storyteller.disable_distribution || halted_storyteller) + return + /// Distribute points + for(var/track in event_track_points) + var/base_amt + var/gain_amt + switch(track) + if(EVENT_TRACK_MUNDANE) + base_amt = ROUNDSTART_MUNDANE_BASE + gain_amt = ROUNDSTART_MUNDANE_GAIN + if(EVENT_TRACK_MODERATE) + base_amt = ROUNDSTART_MODERATE_BASE + gain_amt = ROUNDSTART_MODERATE_GAIN + if(EVENT_TRACK_MAJOR) + base_amt = ROUNDSTART_MAJOR_BASE + gain_amt = ROUNDSTART_MAJOR_GAIN + if(EVENT_TRACK_ROLESET) + base_amt = ROUNDSTART_ROLESET_BASE + gain_amt = ROUNDSTART_ROLESET_GAIN + if(EVENT_TRACK_OBJECTIVES) + base_amt = ROUNDSTART_OBJECTIVES_BASE + gain_amt = ROUNDSTART_OBJECTIVES_GAIN + var/calc_value = base_amt + (gain_amt * ready_players) + calc_value *= roundstart_point_multipliers[track] + calc_value *= storyteller.starting_point_multipliers[track] + calc_value *= (rand(100 - storyteller.roundstart_points_variance,100 + storyteller.roundstart_points_variance)/100) + event_track_points[track] = round(calc_value) + + /// If the storyteller guarantees an antagonist roll, add points to make it so. + if(storyteller.guarantees_roundstart_roleset && event_track_points[EVENT_TRACK_ROLESET] < point_thresholds[EVENT_TRACK_ROLESET]) + event_track_points[EVENT_TRACK_ROLESET] = point_thresholds[EVENT_TRACK_ROLESET] + + /// If we have any forced events, ensure we get enough points for them + for(var/track in event_tracks) + if(forced_next_events[track] && event_track_points[track] < point_thresholds[track]) + event_track_points[track] = point_thresholds[track] + +/// At this point we've rolled roundstart events and antags and we handle leftover points here. +/datum/controller/subsystem/gamemode/proc/handle_post_setup_points() + for(var/track in event_track_points) //Just halve the points for now. + event_track_points[track] *= 0.5 + +/// Because roundstart events need 2 steps of firing for purposes of antags, here is the first step handled, happening before occupation division. +/datum/controller/subsystem/gamemode/proc/handle_pre_setup_roundstart_events() + if(storyteller.disable_distribution) + return + if(halted_storyteller) + message_admins("WARNING: Didn't roll roundstart events (including antagonists) due to the storyteller being halted.") + return + while(TRUE) + if(!storyteller.handle_tracks()) + break + +/// Second step of handlind roundstart events, happening after people spawn. +/datum/controller/subsystem/gamemode/proc/handle_post_setup_roundstart_events() + /// Start all roundstart events on post_setup immediately + for(var/datum/round_event/event as anything in running) + if(!event.control.roundstart) + continue + ASYNC + event.try_start() +// INVOKE_ASYNC(event, /datum/round_event.proc/try_start) + +/// Schedules an event to run later. +/datum/controller/subsystem/gamemode/proc/schedule_event(datum/round_event_control/passed_event, passed_time, passed_cost, passed_ignore, passed_announce, _forced = FALSE) + if(_forced) + passed_ignore = TRUE + var/datum/scheduled_event/scheduled = new (passed_event, world.time + passed_time, passed_cost, passed_ignore, passed_announce) + var/round_started = SSticker.HasRoundStarted() + if(round_started) + message_admins("Event: [passed_event] has been scheduled to run in [passed_time / 10] seconds. (CANCEL) (REFUND)") + else //Only roundstart events can be scheduled before round start + message_admins("Event: [passed_event] has been scheduled to run on roundstart. (CANCEL)") + scheduled_events += scheduled + +/datum/controller/subsystem/gamemode/proc/update_crew_infos() + // Very similar logic to `get_active_player_count()` + active_players = 0 + head_crew = 0 + eng_crew = 0 + med_crew = 0 + sec_crew = 0 + for(var/mob/player_mob as anything in GLOB.player_list) + if(!player_mob.client) + continue + if(player_mob.stat) //If they're alive + continue + if(player_mob.client.is_afk()) //If afk + continue + if(!ishuman(player_mob)) + continue + active_players++ + if(player_mob.mind?.assigned_role) + var/datum/job/player_role = player_mob.mind.assigned_role + if(player_role.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) + head_crew++ + if(player_role.departments_bitflags & DEPARTMENT_BITFLAG_ENGINEERING) + eng_crew++ + if(player_role.departments_bitflags & DEPARTMENT_BITFLAG_MEDICAL) + med_crew++ + if(player_role.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY) + sec_crew++ + update_pop_scaling() + +/datum/controller/subsystem/gamemode/proc/update_pop_scaling() + for(var/track in event_tracks) + var/low_pop_bound = min_pop_thresholds[track] + var/high_pop_bound = pop_scale_thresholds[track] + var/scale_penalty = pop_scale_penalties[track] + + var/perceived_pop = max(low_pop_bound, active_players) // after max pop we start generating even more threat + + var/divisor = high_pop_bound - low_pop_bound + /// If the bounds are equal, we'd be dividing by zero or worse, if upper is smaller than lower, we'd be increasing the factor, just make it 1 and continue. + /// this is only a problem for bad configs + if(divisor <= 0) + current_pop_scale_multipliers[track] = 1 + continue + var/scalar = (perceived_pop - low_pop_bound) / divisor + var/penalty = scale_penalty - (scale_penalty * scalar) + var/calculated_multiplier = 1 - (penalty / 100) + + current_pop_scale_multipliers[track] = calculated_multiplier + +/datum/controller/subsystem/gamemode/proc/TriggerEvent(datum/round_event_control/event, forced = FALSE) + . = event.preRunEvent(forced) + if(. == EVENT_CANT_RUN)//we couldn't run this event for some reason, set its max_occurrences to 0 + event.max_occurrences = 0 + else if(. == EVENT_READY) + event.runEvent(random = TRUE, admin_forced = forced) // fallback to dynamic + +///Resets frequency multiplier. +/datum/controller/subsystem/gamemode/proc/resetFrequency() + event_frequency_multiplier = 1 + +/client/proc/forceEvent() + set name = "Trigger Event" + set category = "Admin.Events" + if(!holder ||!check_rights(R_FUN)) + return + holder.forceEvent(usr) + +/datum/admins/proc/forceEvent(mob/user) + SSgamemode.event_panel(user) + +/client/proc/forceGamemode() + set name = "Open Gamemode Panel" + set category = "Admin.Events" + if(!holder ||!check_rights(R_FUN)) + return + holder.forceGamemode(usr) + +/datum/admins/proc/forceGamemode(mob/user) + SSgamemode.admin_panel(user) + + +////////////// +// HOLIDAYS // +////////////// +//Uncommenting ALLOW_HOLIDAYS in config.txt will enable holidays + +//It's easy to add stuff. Just add a holiday datum in code/modules/holiday/holidays.dm +//You can then check if it's a special day in any code in the game by doing if(SSgamemode.holidays["Groundhog Day"]) + +//You can also make holiday random events easily thanks to Pete/Gia's system. +//simply make a random event normally, then assign it a holidayID string which matches the holiday's name. +//Anything with a holidayID, which isn't in the holidays list, will never occur. + +//Please, Don't spam stuff up with stupid stuff (key example being april-fools Pooh/ERP/etc), +//And don't forget: CHECK YOUR CODE!!!! We don't want any zero-day bugs which happen only on holidays and never get found/fixed! + +////////////////////////////////////////////////////////////////////////////////////////////////////////// +//ALSO, MOST IMPORTANTLY: Don't add stupid stuff! Discuss bonus content with Project-Heads first please!// +////////////////////////////////////////////////////////////////////////////////////////////////////////// + + +//sets up the holidays and holidays list +/datum/controller/subsystem/gamemode/proc/getHoliday() + if(!CONFIG_GET(flag/allow_holidays)) + return // Holiday stuff was not enabled in the config! + for(var/H in subtypesof(/datum/holiday)) + var/datum/holiday/holiday = new H() + var/delete_holiday = TRUE + for(var/timezone in holiday.timezones) + var/time_in_timezone = world.realtime + timezone HOURS + + var/YYYY = text2num(time2text(time_in_timezone, "YYYY")) // get the current year + var/MM = text2num(time2text(time_in_timezone, "MM")) // get the current month + var/DD = text2num(time2text(time_in_timezone, "DD")) // get the current day + var/DDD = time2text(time_in_timezone, "DDD") // get the current weekday + + if(holiday.shouldCelebrate(DD, MM, YYYY, DDD)) + holiday.celebrate() + LAZYSET(holidays, holiday.name, holiday) + delete_holiday = FALSE + break + if(delete_holiday) + qdel(holiday) + + if(holidays) + holidays = shuffle(holidays) + // regenerate station name because holiday prefixes. + set_station_name(new_station_name()) + world.update_status() + +/datum/controller/subsystem/gamemode/proc/toggleWizardmode() + wizardmode = !wizardmode //TODO: decide what to do with wiz events + message_admins("Summon Events has been [wizardmode ? "enabled, events will occur [SSgamemode.event_frequency_multiplier] times as fast" : "disabled"]!") + log_game("Summon Events was [wizardmode ? "enabled" : "disabled"]!") + +///Attempts to select players for special roles the mode might have. +/datum/controller/subsystem/gamemode/proc/pre_setup() + calculate_ready_players() + roll_pre_setup_points() + //handle_pre_setup_roundstart_events() + return TRUE + +///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things +/datum/controller/subsystem/gamemode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. + if(!report) + report = !CONFIG_GET(flag/no_intercept_report) + addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) + + if(CONFIG_GET(flag/reopen_roundstart_suicide_roles)) + var/delay = CONFIG_GET(number/reopen_roundstart_suicide_roles_delay) + if(delay) + delay = (delay SECONDS) + else + delay = (4 MINUTES) //default to 4 minutes if the delay isn't defined. + addtimer(CALLBACK(GLOBAL_PROC, .proc/reopen_roundstart_suicide_roles), delay) + + if(SSdbcore.Connect()) + var/list/to_set = list() + var/arguments = list() + if(storyteller) + to_set += "game_mode = :game_mode" + arguments["game_mode"] = storyteller.name + if(GLOB.revdata.originmastercommit) + to_set += "commit_hash = :commit_hash" + arguments["commit_hash"] = GLOB.revdata.originmastercommit + if(to_set.len) + arguments["round_id"] = GLOB.round_id + var/datum/db_query/query_round_game_mode = SSdbcore.NewQuery( + "UPDATE [format_table_name("round")] SET [to_set.Join(", ")] WHERE id = :round_id", + arguments + ) + query_round_game_mode.Execute() + qdel(query_round_game_mode) + generate_station_goals() + handle_post_setup_roundstart_events() + handle_post_setup_points() + roundstart_event_view = FALSE + return TRUE + + +///Handles late-join antag assignments +/datum/controller/subsystem/gamemode/proc/make_antag_chance(mob/living/carbon/human/character) + return + +/datum/controller/subsystem/gamemode/proc/check_finished(force_ending) //to be called by SSticker + if(!SSticker.setup_done) + return FALSE + if(SSshuttle.emergency && (SSshuttle.emergency.mode == SHUTTLE_ENDGAME)) + return TRUE + if(GLOB.station_was_nuked) + return TRUE + if(force_ending) + return TRUE + +/* + * Generate a list of station goals available to purchase to report to the crew. + * + * Returns a formatted string all station goals that are available to the station. + */ +/datum/controller/subsystem/gamemode/proc/generate_station_goal_report() + if(!GLOB.station_goals.len) + return + . = "
Special Orders for [station_name()]:
" + for(var/datum/station_goal/station_goal as anything in GLOB.station_goals) + station_goal.on_report() + . += station_goal.get_report() + return + +/* + * Generate a list of active station traits to report to the crew. + * + * Returns a formatted string of all station traits (that are shown) affecting the station. + */ +/datum/controller/subsystem/gamemode/proc/generate_station_trait_report() + if(!SSstation.station_traits.len) + return + . = "
Identified shift divergencies:
" + for(var/datum/station_trait/station_trait as anything in SSstation.station_traits) + if(!station_trait.show_in_report) + continue + . += "[station_trait.get_report()]
" + return + +/* /proc/reopen_roundstart_suicide_roles() + var/include_command = CONFIG_GET(flag/reopen_roundstart_suicide_roles_command_positions) + var/list/reopened_jobs = list() + for(var/mob/living/quitter in GLOB.suicided_mob_list) + var/datum/job/job = SSjob.GetJob(quitter.job) + if(!job || !(job.job_flags & JOB_REOPEN_ON_ROUNDSTART_LOSS)) + continue + if(!include_command && job.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND) + continue + job.current_positions = max(job.current_positions - 1, 0) + reopened_jobs += quitter.job + if(CONFIG_GET(flag/reopen_roundstart_suicide_roles_command_report)) + if(reopened_jobs.len) + var/reopened_job_report_positions + for(var/dead_dudes_job in reopened_jobs) + reopened_job_report_positions = "[reopened_job_report_positions ? "[reopened_job_report_positions]\n":""][dead_dudes_job]" + var/suicide_command_report = "Central Command Human Resources Board
\ + Notice of Personnel Change

\ + To personnel management staff aboard [station_name()]:

\ + Our medical staff have detected a series of anomalies in the vital sensors \ + of some of the staff aboard your station.

\ + Further investigation into the situation on our end resulted in us discovering \ + a series of rather... unforturnate decisions that were made on the part of said staff.

\ + As such, we have taken the liberty to automatically reopen employment opportunities for the positions of the crew members \ + who have decided not to partake in our research. We will be forwarding their cases to our employment review board \ + to determine their eligibility for continued service with the company (and of course the \ + continued storage of cloning records within the central medical backup server.)

\ + The following positions have been reopened on our behalf:

\ + [reopened_job_report_positions]
" + print_command_report(suicide_command_report, "Central Command Personnel Update") */ + +////////////////////////// +//Reports player logouts// +////////////////////////// +/* /proc/display_roundstart_logout_report() + var/list/msg = list("[SPAN_BOLDNOTICE("Roundstart logout report")]\n\n") + for(var/i in GLOB.mob_living_list) + var/mob/living/L = i + var/mob/living/carbon/C = L + if (istype(C) && !C.last_mind) + continue // never had a client + if(L.ckey && !GLOB.directory[L.ckey]) + msg += "[L.name] ([L.key]), the [L.job] (Disconnected)\n" + if(L.ckey && L.client) + var/failed = FALSE + if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) + msg += "[L.name] ([L.key]), the [L.job] (Connected, Inactive)\n" + failed = TRUE //AFK client + if(!failed && L.stat) + if(L.suiciding) //Suicider + msg += "[L.name] ([L.key]), the [L.job] ([SPAN_BOLDANNOUNCE("Suicide")])\n" + failed = TRUE //Disconnected client + if(!failed && (L.stat == UNCONSCIOUS || L.stat == HARD_CRIT)) + msg += "[L.name] ([L.key]), the [L.job] (Dying)\n" + failed = TRUE //Unconscious + if(!failed && L.stat == DEAD) + msg += "[L.name] ([L.key]), the [L.job] (Dead)\n" + failed = TRUE //Dead + continue //Happy connected client + for(var/mob/dead/observer/D in GLOB.dead_mob_list) + if(D.mind && D.mind.current == L) + if(L.stat == DEAD) + if(L.suiciding) //Suicider + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([SPAN_BOLDANNOUNCE("Suicide")])\n" + continue //Disconnected client + else + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n" + continue //Dead mob, ghost abandoned + else + if(D.can_reenter_corpse) + continue //Adminghost, or cult/wizard ghost + else + msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([SPAN_BOLDANNOUNCE("Ghosted")])\n" + continue //Ghosted while alive + for (var/C in GLOB.admins) + to_chat(C, msg.Join()) */ + +/datum/controller/subsystem/gamemode/proc/generate_station_goals() + var/list/possible = subtypesof(/datum/station_goal) + var/goal_weights = 0 + while(possible.len && goal_weights < 1) // station goal budget is 1 + var/datum/station_goal/picked = pick_n_take(possible) + goal_weights += initial(picked.weight) + GLOB.station_goals += new picked + +//Set result and news report here +/datum/controller/subsystem/gamemode/proc/set_round_result() + SSticker.mode_result = "undefined" + if(GLOB.station_was_nuked) + SSticker.news_report = STATION_DESTROYED_NUKE + if(EMERGENCY_ESCAPED_OR_ENDGAMED) + SSticker.news_report = STATION_EVACUATED + if(SSshuttle.emergency.is_hijacked()) + SSticker.news_report = SHUTTLE_HIJACK + +/// Loads json event config values from events.txt +/datum/controller/subsystem/gamemode/proc/load_event_config_vars() + var/json_file = file("[global.config.directory]/events.json") + if(!fexists(json_file)) + return + var/list/decoded = json_decode(file2text(json_file)) + for(var/event_text_path in decoded) + var/event_path = text2path(event_text_path) + var/datum/round_event_control/event + for(var/datum/round_event_control/iterated_event as anything in control) + if(iterated_event.type == event_path) + event = iterated_event + break + if(!event) + continue + var/list/var_list = decoded[event_text_path] + for(var/variable in var_list) + var/value = var_list[variable] + switch(variable) + if("weight") + event.weight = value + if("min_players") + event.min_players = value + if("max_occurrences") + event.max_occurrences = value + if("earliest_start") + event.earliest_start = value * (1 MINUTES) + if("track") + if(value in event_tracks) + event.track = value + if("cost") + event.cost = value + if("reoccurence_penalty_multiplier") + event.reoccurence_penalty_multiplier = value + if("shared_occurence_type") + if(!isnull(value)) + value = text2path(value) + event.shared_occurence_type = value + +/// Loads config values from game_options.txt +/datum/controller/subsystem/gamemode/proc/load_config_vars() + point_gain_multipliers[EVENT_TRACK_MUNDANE] = CONFIG_GET(number/mundane_point_gain_multiplier) + point_gain_multipliers[EVENT_TRACK_MODERATE] = CONFIG_GET(number/moderate_point_gain_multiplier) + point_gain_multipliers[EVENT_TRACK_MAJOR] = CONFIG_GET(number/major_point_gain_multiplier) + point_gain_multipliers[EVENT_TRACK_ROLESET] = CONFIG_GET(number/roleset_point_gain_multiplier) + point_gain_multipliers[EVENT_TRACK_OBJECTIVES] = CONFIG_GET(number/objectives_point_gain_multiplier) + + roundstart_point_multipliers[EVENT_TRACK_MUNDANE] = CONFIG_GET(number/mundane_roundstart_point_multiplier) + roundstart_point_multipliers[EVENT_TRACK_MODERATE] = CONFIG_GET(number/moderate_roundstart_point_multiplier) + roundstart_point_multipliers[EVENT_TRACK_MAJOR] = CONFIG_GET(number/major_roundstart_point_multiplier) + roundstart_point_multipliers[EVENT_TRACK_ROLESET] = CONFIG_GET(number/roleset_roundstart_point_multiplier) + roundstart_point_multipliers[EVENT_TRACK_OBJECTIVES] = CONFIG_GET(number/objectives_roundstart_point_multiplier) + + min_pop_thresholds[EVENT_TRACK_MUNDANE] = CONFIG_GET(number/mundane_min_pop) + min_pop_thresholds[EVENT_TRACK_MODERATE] = CONFIG_GET(number/moderate_min_pop) + min_pop_thresholds[EVENT_TRACK_MAJOR] = CONFIG_GET(number/major_min_pop) + min_pop_thresholds[EVENT_TRACK_ROLESET] = CONFIG_GET(number/roleset_min_pop) + min_pop_thresholds[EVENT_TRACK_OBJECTIVES] = CONFIG_GET(number/objectives_min_pop) + + point_thresholds[EVENT_TRACK_MUNDANE] = CONFIG_GET(number/mundane_point_threshold) + point_thresholds[EVENT_TRACK_MODERATE] = CONFIG_GET(number/moderate_point_threshold) + point_thresholds[EVENT_TRACK_MAJOR] = CONFIG_GET(number/major_point_threshold) + point_thresholds[EVENT_TRACK_ROLESET] = CONFIG_GET(number/roleset_point_threshold) + point_thresholds[EVENT_TRACK_OBJECTIVES] = CONFIG_GET(number/objectives_point_threshold) + +/datum/controller/subsystem/gamemode/proc/storyteller_vote_choices() + var/client_amount = GLOB.clients.len + var/list/choices = list() + for(var/storyteller_type in storytellers) + var/datum/storyteller/storyboy = storytellers[storyteller_type] + if(!storyboy.votable) + continue + if((storyboy.population_min && storyboy.population_min > client_amount) || (storyboy.population_max && storyboy.population_max < client_amount)) + continue + choices += storyboy.name + choices[storyboy.name] = 0 + return choices + +/datum/controller/subsystem/gamemode/proc/storyteller_desc(storyteller_name) + for(var/storyteller_type in storytellers) + var/datum/storyteller/storyboy = storytellers[storyteller_type] + if(storyboy.name != storyteller_name) + continue + return storyboy.desc + + +/datum/controller/subsystem/gamemode/proc/storyteller_vote_result(winner_name) + for(var/storyteller_type in storytellers) + var/datum/storyteller/storyboy = storytellers[storyteller_type] + if(storyboy.name == winner_name) + voted_storyteller = storyteller_type + break + +/datum/controller/subsystem/gamemode/proc/init_storyteller() + set_storyteller(voted_storyteller) + +/datum/controller/subsystem/gamemode/proc/set_storyteller(passed_type) + if(!storytellers[passed_type]) + message_admins("Attempted to set an invalid storyteller type: [passed_type].") + CRASH("Attempted to set an invalid storyteller type: [passed_type].") + storyteller = storytellers[passed_type] + to_chat(world, span_notice("Storyteller is [storyteller.name]!")) + to_chat(world, span_notice("[storyteller.welcome_text]")) + +/// Panel containing information, variables and controls about the gamemode and scheduled event +/datum/controller/subsystem/gamemode/proc/admin_panel(mob/user) + update_crew_infos() + total_valid_antags = 0 + for(var/mob/checked_mob in GLOB.mob_list) + if(!checked_mob.mind) + continue + if(!checked_mob.mind.special_role) + continue + if(checked_mob.stat == DEAD) + continue + total_valid_antags++ + + var/round_started = SSticker.HasRoundStarted() + var/list/dat = list() + dat += "Storyteller: [storyteller ? "[storyteller.name]" : "None"] " + dat += " HALT Storyteller Event Panel Set Storyteller Refresh" + dat += "
Storyteller determines points gained, event chances, and is the entity responsible for rolling events." + dat += "
Active Players: [active_players] (Head: [head_crew], Sec: [sec_crew], Eng: [eng_crew], Med: [med_crew])" + dat += "
Antagonist Count vs Maximum: [total_valid_antags] / [get_antag_cap()]" + dat += "
" + dat += "Main" + dat += " Variables" + dat += "
" + switch(panel_page) + if(GAMEMODE_PANEL_VARIABLES) + dat += "Reload Config Vars Configs located in game_options.txt." + dat += "
Point Gains Multipliers (only over time):" + dat += "
This affects points gained over time towards scheduling new events of the tracks." + for(var/track in event_tracks) + dat += "
[track]: [point_gain_multipliers[track]]" + dat += "
" + + dat += "Roundstart Points Multipliers:" + dat += "
This affects points generated for roundstart events and antagonists." + for(var/track in event_tracks) + dat += "
[track]: [roundstart_point_multipliers[track]]" + dat += "
" + + dat += "Minimum Population for Tracks:" + dat += "
This are the minimum population caps for events to be able to run." + for(var/track in event_tracks) + dat += "
[track]: [min_pop_thresholds[track]]" + dat += "
" + + dat += "Point Thresholds:" + dat += "
Those are thresholds the tracks require to reach with points to make an event." + for(var/track in event_tracks) + dat += "
[track]: [point_thresholds[track]]" + + if(GAMEMODE_PANEL_MAIN) + var/even = TRUE + dat += "

Event Tracks:

" + dat += "Every track represents progression towards scheduling an event of it's severity" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + for(var/track in event_tracks) + even = !even + var/background_cl = even ? "#17191C" : "#23273C" + var/lower = event_track_points[track] + var/upper = point_thresholds[track] + var/percent = round((lower/upper)*100) + var/next = 0 + var/last_points = last_point_gains[track] + if(last_points) + next = round(((upper - lower) / last_points / STORYTELLER_WAIT_TIME)) + dat += "" + dat += "" //Track + dat += "" //Progress + dat += "" //Next + var/datum/round_event_control/forced_event = forced_next_events[track] + var/forced = forced_event ? "[forced_event.name] X" : "" + dat += "" //Forced + dat += "" //Actions + dat += "" + dat += "
TrackProgressNextForcedActions
[track] - [last_points] per process.[percent]% ([lower]/[upper])~[next] seconds[forced]Set Pts. Next Event
" + + dat += "

Scheduled Events:

" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + var/sorted_scheduled = list() + for(var/datum/scheduled_event/scheduled as anything in scheduled_events) + sorted_scheduled[scheduled] = scheduled.start_time + sortTim(sorted_scheduled, cmp=/proc/cmp_numeric_asc, associative = TRUE) + even = TRUE + for(var/datum/scheduled_event/scheduled as anything in sorted_scheduled) + even = !even + var/background_cl = even ? "#17191C" : "#23273C" + dat += "" + dat += "" //Name + dat += "" //Severity + var/time = (scheduled.event.roundstart && !round_started) ? "ROUNDSTART" : "[(scheduled.start_time - world.time) / (1 SECONDS)] s." + dat += "" //Time + dat += "" //Actions + dat += "" + dat += "
NameSeverityTimeActions
[scheduled.event.name][scheduled.event.track][time][scheduled.get_href_actions()]
" + + dat += "

Running Events:

" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + even = TRUE + for(var/datum/round_event/event as anything in running) + even = !even + var/background_cl = even ? "#17191C" : "#23273C" + dat += "" + dat += "" //Name + dat += "" //Actions + dat += "" + dat += "
NameActions
[event.control.name]-TBA-
" + + var/datum/browser/popup = new(user, "gamemode_admin_panel", "Gamemode Panel", 670, 650) + popup.set_content(dat.Join()) + popup.open() + + /// Panel containing information and actions regarding events +/datum/controller/subsystem/gamemode/proc/event_panel(mob/user) + var/list/dat = list() + if(storyteller) + dat += "Storyteller: [storyteller.name]" + dat += "
Repetition penalty multiplier: [storyteller.event_repetition_multiplier]" + dat += "
Cost variance: [storyteller.cost_variance]" + if(storyteller.tag_multipliers) + dat += "
Tag multipliers:" + for(var/tag in storyteller.tag_multipliers) + dat += "[tag]:[storyteller.tag_multipliers[tag]] | " + storyteller.calculate_weights(statistics_track_page) + else + dat += "Storyteller: None
Weight and chance statistics will be inaccurate due to the present lack of a storyteller." + dat += "
Roundstart Events Forced Roundstart events will use rolled points, and are guaranteed to trigger (even if the used points are not enough)" + dat += "
Avg. event intervals: " + for(var/track in event_tracks) + if(last_point_gains[track]) + var/est_time = round(point_thresholds[track] / last_point_gains[track] / STORYTELLER_WAIT_TIME * 40 / 6) / 10 + dat += "[track]: ~[est_time] m. | " + dat += "
" + for(var/track in EVENT_PANEL_TRACKS) + dat += "[track]" + dat += "
" + /// Create event info and stats table + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + dat += "" + var/even = TRUE + var/total_weight = 0 + var/list/event_lookup + switch(statistics_track_page) + if(ALL_EVENTS) + event_lookup = control + if(UNCATEGORIZED_EVENTS) + event_lookup = uncategorized + else + event_lookup = event_pools[statistics_track_page] + var/list/assoc_spawn_weight = list() + for(var/datum/round_event_control/event as anything in event_lookup) + var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) + if(event.roundstart != roundstart_event_view) + continue + if(event.can_spawn_event(players_amt)) + total_weight += event.calculated_weight + assoc_spawn_weight[event] = event.calculated_weight + else + assoc_spawn_weight[event] = 0 + sortTim(assoc_spawn_weight, cmp=/proc/cmp_numeric_dsc, associative = TRUE) + for(var/datum/round_event_control/event as anything in assoc_spawn_weight) + even = !even + var/background_cl = even ? "#17191C" : "#23273C" + dat += "" + dat += "" //Name + dat += "" + var/occurence_string = "[event.occurrences]" + if(event.shared_occurence_type) + occurence_string += " (shared: [event.get_occurences()])" + var/max_occurence_string = "[event.max_occurrences]" + dat += "" //Occurences + dat += "" //Max Occurences + dat += "" //Minimum pop + dat += "" //Minimum time + dat += "" //Can happen? + dat += "" //Why can't happen? + var/weight_string = "(new.[event.calculated_weight] /raw.[event.weight])" + if(assoc_spawn_weight[event]) + var/percent = round((event.calculated_weight / total_weight) * 100) + weight_string = "[percent]% - [weight_string]" + dat += "" //Weight + dat += "" //Actions + dat += "" + dat += "
NameTagsOccurencesMax OccurencesM.PopM.TimeCan OccurFailure ReasonWeightActions
[event.name]" //Tags + for(var/tag in event.tags) + dat += "[tag] " + dat += "[occurence_string][max_occurence_string][event.min_players][event.earliest_start / (1 MINUTES)] m.[assoc_spawn_weight[event] ? "Yes" : "No"][event.return_failure_string(active_players)][weight_string][event.get_href_actions()]
" + var/datum/browser/popup = new(user, "gamemode_event_panel", "Event Panel", 1100, 600) + popup.set_content(dat.Join()) + popup.open() + +/datum/controller/subsystem/gamemode/Topic(href, href_list) + . = ..() + var/mob/user = usr + if(!check_rights(R_ADMIN)) + return + switch(href_list["panel"]) + if("main") + switch(href_list["action"]) + if("set_storyteller") + message_admins("[key_name_admin(usr)] is picking a new Storyteller.") + var/list/name_list = list() + for(var/storyteller_type in storytellers) + var/datum/storyteller/storyboy = storytellers[storyteller_type] + name_list[storyboy.name] = storyboy.type + var/new_storyteller_name = input(usr, "Choose new storyteller (circumvents voted one):", "Storyteller") as null|anything in name_list + if(!new_storyteller_name) + message_admins("[key_name_admin(usr)] has cancelled picking a Storyteller.") + return + message_admins("[key_name_admin(usr)] has chosen [new_storyteller_name] as the new Storyteller.") + var/new_storyteller_type = name_list[new_storyteller_name] + set_storyteller(new_storyteller_type) + if("halt_storyteller") + halted_storyteller = !halted_storyteller + message_admins("[key_name_admin(usr)] has [halted_storyteller ? "HALTED" : "un-halted"] the Storyteller.") + if("vars") + var/track = href_list["track"] + switch(href_list["var"]) + if("pts_multiplier") + var/new_value = input(usr, "New value:", "Set new value") as num|null + if(isnull(new_value) || new_value < 0) + return + message_admins("[key_name_admin(usr)] set point gain multiplier for [track] track to [new_value].") + point_gain_multipliers[track] = new_value + if("roundstart_pts") + var/new_value = input(usr, "New value:", "Set new value") as num|null + if(isnull(new_value) || new_value < 0) + return + message_admins("[key_name_admin(usr)] set roundstart pts multiplier for [track] track to [new_value].") + roundstart_point_multipliers[track] = new_value + if("min_pop") + var/new_value = input(usr, "New value:", "Set new value") as num|null + if(isnull(new_value) || new_value < 0) + return + message_admins("[key_name_admin(usr)] set minimum population for [track] track to [new_value].") + min_pop_thresholds[track] = new_value + if("pts_threshold") + var/new_value = input(usr, "New value:", "Set new value") as num|null + if(isnull(new_value) || new_value < 0) + return + message_admins("[key_name_admin(usr)] set point threshold of [track] track to [new_value].") + point_thresholds[track] = new_value + if("reload_config_vars") + message_admins("[key_name_admin(usr)] reloaded gamemode config vars.") + load_config_vars() + if("tab") + var/tab = href_list["tab"] + panel_page = tab + if("open_stats") + event_panel(user) + return + if("track_action") + var/track = href_list["track"] + if(!(track in event_tracks)) + return + switch(href_list["track_action"]) + if("remove_forced") + if(forced_next_events[track]) + var/datum/round_event_control/event = forced_next_events[track] + message_admins("[key_name_admin(usr)] removed forced event [event.name] from track [track].") + forced_next_events -= track + if("set_pts") + var/set_pts = input(usr, "New point amount ([point_thresholds[track]]+ invokes event):", "Set points for [track]") as num|null + if(isnull(set_pts)) + return + event_track_points[track] = set_pts + message_admins("[key_name_admin(usr)] set points of [track] track to [set_pts].") + log_admin_private("[key_name(usr)] set points of [track] track to [set_pts].") + if("next_event") + message_admins("[key_name_admin(usr)] invoked next event for [track] track.") + log_admin_private("[key_name(usr)] invoked next event for [track] track.") + event_track_points[track] = point_thresholds[track] + if(storyteller) + storyteller.handle_tracks() + admin_panel(user) + if("stats") + switch(href_list["action"]) + if("set_roundstart") + roundstart_event_view = !roundstart_event_view + if("set_cat") + var/new_category = href_list["cat"] + if(new_category in EVENT_PANEL_TRACKS) + statistics_track_page = new_category + event_panel(user) + +/datum/controller/subsystem/gamemode/proc/round_end_report() + if(!length(round_end_data)) + return + for(var/datum/round_event/event as anything in round_end_data) + if(!istype(event)) + continue + event.round_end_report() + + +/datum/controller/subsystem/gamemode/proc/store_roundend_data() + var/congealed_string = "" + for(var/event_name as anything in triggered_round_events) + congealed_string += event_name + congealed_string += "," + text2file(congealed_string, "data/last_round_events.txt") + +/datum/controller/subsystem/gamemode/proc/load_roundstart_data() + var/massive_string = trim(file2text("data/last_round_events.txt")) + if(fexists("data/last_round_events.txt")) + fdel("data/last_round_events.txt") + if(!massive_string) + return + last_round_events = splittext(massive_string, ",") + + if(!length(last_round_events)) + return + for(var/event_name as anything in last_round_events) + for(var/datum/round_event_control/listed as anything in control) + if(listed.name != event_name) + continue + listed.occurrences++ + listed.occurrences++ diff --git a/monkestation/code/modules/storytellers/readme.md b/monkestation/code/modules/storytellers/readme.md new file mode 100644 index 000000000000..ace62b725afa --- /dev/null +++ b/monkestation/code/modules/storytellers/readme.md @@ -0,0 +1,44 @@ +## Title: + + +MODULE ID: STORYTELLERS + +### Description: + +This PR adds adds on to the current dynamic system by having events be guided by storytellers, this also caches the events ran last round and depending on severity cuts their weights by x % to make rounds not repeat as often. + + + + +### TG Proc/File Changes: + + + - N/A + +### Defines: + + + - code\__DEFINES\~monkestation\storytellers.dm + +### Master file additions + +- code\modules\events\_event.dm +- code\modules\admin\topic.dm +- code\controllers\subsystem\ticker.dm +- code\controllers\subsystem\statpanel.dm +- all event files + + + +### Included files that are not contained in this module: + +- N/A + + +### Credits: + + + +Made by Unknown Coders on Horizon (Horizon's Repo atleast as of 10/14/2023 no longer exists if this changes please let me know on discord #Borbop) + +Ported by Dwasint diff --git a/monkestation/code/modules/storytellers/scheduled_events.dm b/monkestation/code/modules/storytellers/scheduled_events.dm new file mode 100644 index 000000000000..cfb67a2dcf72 --- /dev/null +++ b/monkestation/code/modules/storytellers/scheduled_events.dm @@ -0,0 +1,94 @@ +///Scheduled event datum for SSgamemode to put events into. +/datum/scheduled_event + /// What event are scheduling. + var/datum/round_event_control/event + /// When do we start our event + var/start_time = 0 + /// If we were created by a storyteller, here's a cost to refund in case. + var/cost + /// Whether we alerted admins about this schedule when it's close to being invoked. + var/alerted_admins = FALSE + /// Whether we are faking an occurence or not + var/fakes_occurence = TRUE + /// Whether this ignores event can run checks. If bussed by an admin, you want to ignore checks + var/ignores_checks + /// Whether the scheduled event will override the announcement change. If null it won't. TRUE = force yes. FALSE = force no. + var/announce_change + +/datum/scheduled_event/New(datum/round_event_control/passed_event, passed_time, passed_cost, passed_ignore, passed_announce) + . = ..() + event = passed_event + start_time = passed_time + cost = passed_cost + ignores_checks = passed_ignore + announce_change = passed_announce + /// Add a fake occurence to make the weightings/checks properly respect the scheduled event. + event.add_occurence() + fakes_occurence = TRUE + +/datum/scheduled_event/proc/remove_occurence() + if(fakes_occurence) + /// Remove the fake occurence if we still have it + event.subtract_occurence() + fakes_occurence = FALSE + +/// For admins who want to reschedule the event. +/datum/scheduled_event/proc/reschedule(new_time) + start_time = new_time + alerted_admins = FALSE + +/datum/scheduled_event/proc/get_href_actions() + var/round_started = SSticker.HasRoundStarted() + if(round_started) + return "Fire Reschedule Cancel Refund" + else + return "Cancel" + +/// Try and fire off the scheduled event +/datum/scheduled_event/proc/try_fire() + /// Remove our fake occurence pre-emptively for the checks. + remove_occurence() + + ///If we can't spawn the scheduled event, refund it. + if(!ignores_checks && !event.can_spawn_event(1000)) //FALSE argument to ignore popchecks, to prevent scheduled events from failing from people dying/cryoing etc. + message_admins("Scheduled Event: [event] was unable to run and has been refunded.") + SSgamemode.refund_scheduled_event(src) + return + + ///Trigger the event and remove the scheduled datum + message_admins("Scheduled Event: [event] successfully triggered.") + SSgamemode.TriggerEvent(event, ignores_checks) + SSgamemode.remove_scheduled_event(src) + +/datum/scheduled_event/Destroy() + remove_occurence() + event = null + return ..() + +/datum/scheduled_event/Topic(href, href_list) + . = ..() + if(QDELETED(src)) + return + var/round_started = SSticker.HasRoundStarted() + switch(href_list["action"]) + if("cancel") + message_admins("[key_name_admin(usr)] cancelled scheduled event [event.name].") + log_admin_private("[key_name(usr)] cancelled scheduled event [event.name].") + SSgamemode.remove_scheduled_event(src) + if("refund") + message_admins("[key_name_admin(usr)] refunded scheduled event [event.name].") + log_admin_private("[key_name(usr)] refunded scheduled event [event.name].") + SSgamemode.refund_scheduled_event(src) + if("reschedule") + var/new_schedule = input(usr, "New schedule time (in seconds):", "Reschedule Event") as num|null + if(isnull(new_schedule) || QDELETED(src)) + return + start_time = world.time + new_schedule * 1 SECONDS + message_admins("[key_name_admin(usr)] rescheduled event [event.name] to [new_schedule] seconds.") + log_admin_private("[key_name(usr)] rescheduled event [event.name] to [new_schedule] seconds.") + if("fire") + if(!round_started) + return + message_admins("[key_name_admin(usr)] has fired scheduled event [event.name].") + log_admin_private("[key_name(usr)] has fired scheduled event [event.name].") + try_fire() diff --git a/monkestation/code/modules/storytellers/storytellers/_storyteller.dm b/monkestation/code/modules/storytellers/storytellers/_storyteller.dm new file mode 100644 index 000000000000..893089a255a1 --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/_storyteller.dm @@ -0,0 +1,179 @@ + +///The storyteller datum. He operates with the SSgamemode data to run events +/datum/storyteller + /// Name of our storyteller. + var/name = "Badly coded storyteller" + /// Description of our storyteller. + var/desc = "Report this to the coders." + /// Text that the players will be greeted with when this storyteller is chosen. + var/welcome_text = "Set your eyes on the horizon." + /// This is the multiplier for repetition penalty in event weight. The lower the harsher it is + var/event_repetition_multiplier = 0.6 + /// Multipliers for starting points. + var/list/starting_point_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1, + EVENT_TRACK_MAJOR = 1, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + /// Multipliers for point gains. + var/list/point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1, + EVENT_TRACK_MAJOR = 1, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + /// Multipliers of weight to apply for each tag of an event. + var/list/tag_multipliers + + /// Variance in cost of the purchased events. Effectively affects frequency of events + var/cost_variance = 15 + + /// Variance in the budget of roundstart points. + var/roundstart_points_variance = 15 + + /// Whether the storyteller guaranteed a roleset roll (antag) on roundstart. (Still needs to pass pop check) + var/guarantees_roundstart_roleset = TRUE + + /// Whether the storyteller has the distributions disabled. Important for ghost storytellers + var/disable_distribution = FALSE + + /// Whether people can vote for the storyteller + var/votable = TRUE + /// If defined, will need a minimum of population to be votable + var/population_min + /// If defined, it will not be votable if exceeding the population + var/population_max + /// has the round gotten to the point where jobs are pre-created? + var/round_started = FALSE + ///have we done roundstart checks? + var/roundstart_checks = FALSE + ///prob of roundstart antag + var/roundstart_prob = 25 + ///do we ignore ran_roundstart + var/ignores_roundstart = FALSE + +/datum/storyteller/process(delta_time) + if(!round_started) // we are differing roundstarted ones until base roundstart so we can get cooler stuff + return + if(disable_distribution) + return + if(!guarantees_roundstart_roleset && prob(roundstart_prob) && !roundstart_checks) + roundstart_checks = TRUE + if(!ignores_roundstart) + SSgamemode.ran_roundstart = TRUE + + add_points(delta_time) + handle_tracks() + +/// Add points to all tracks while respecting the multipliers. +/datum/storyteller/proc/add_points(delta_time) + var/datum/controller/subsystem/gamemode/mode = SSgamemode + var/base_point = EVENT_POINT_GAINED_PER_SECOND * delta_time * mode.event_frequency_multiplier + for(var/track in mode.event_track_points) + var/point_gain = base_point * point_gains_multipliers[track] * mode.point_gain_multipliers[track] + if(mode.allow_pop_scaling) + point_gain *= mode.current_pop_scale_multipliers[track] + mode.event_track_points[track] += point_gain + mode.last_point_gains[track] = point_gain + +/// Goes through every track of the gamemode and checks if it passes a threshold to buy an event, if does, buys one. +/datum/storyteller/proc/handle_tracks() + . = FALSE //Has return value for the roundstart loop + var/datum/controller/subsystem/gamemode/mode = SSgamemode + for(var/track in mode.event_track_points) + var/points = mode.event_track_points[track] + if(points >= mode.point_thresholds[track] && find_and_buy_event_from_track(track)) + . = TRUE + +/// Find and buy a valid event from a track. +/datum/storyteller/proc/find_and_buy_event_from_track(track) + . = FALSE + var/are_forced = FALSE + var/datum/controller/subsystem/gamemode/mode = SSgamemode + var/datum/round_event_control/picked_event + if(mode.forced_next_events[track]) //Forced event by admin + /// Dont check any prerequisites, it has been forced by an admin + picked_event = mode.forced_next_events[track] + mode.forced_next_events -= track + are_forced = TRUE + else + mode.update_crew_infos() + var/pop_required = mode.min_pop_thresholds[track] + if(mode.active_players < pop_required) + message_admins("Storyteller failed to pick an event for track of [track] due to insufficient population. (required: [pop_required] active pop for [track]. Current: [mode.active_players])") + mode.event_track_points[track] *= TRACK_FAIL_POINT_PENALTY_MULTIPLIER + return + calculate_weights(track) + var/list/valid_events = list() + // Determine which events are valid to pick + for(var/datum/round_event_control/event as anything in mode.event_pools[track]) + var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) + if(event.can_spawn_event(players_amt)) + if(QDELETED(event)) + message_admins("[event.name] was deleted!") + continue + valid_events[event] = round(event.calculated_weight * 10) //multiply weight by 10 to get first decimal value + ///If we didn't get any events, remove the points inform admins and dont do anything + if(!length(valid_events)) + message_admins("Storyteller failed to pick an event for track of [track].") + mode.event_track_points[track] *= TRACK_FAIL_POINT_PENALTY_MULTIPLIER + return + picked_event = pick_weight(valid_events) + if(!picked_event) + if(length(valid_events)) + var/added_string = "" + for(var/datum/round_event_control/item as anything in valid_events) + added_string += "[item.name]:[valid_events[item]]; " + stack_trace("WARNING: Storyteller picked a null from event pool, defaulting to option 1, look at weights:[added_string]") + shuffle_inplace(valid_events) + picked_event = valid_events[1] + else + message_admins("WARNING: Storyteller picked a null from event pool. Aborting event roll.") + stack_trace("WARNING: Storyteller picked a null from event pool.") + SSgamemode.event_track_points[track] = 0 + return + buy_event(picked_event, track, are_forced) + . = TRUE + +/// Find and buy a valid event from a track. +/datum/storyteller/proc/buy_event(datum/round_event_control/bought_event, track, forced = FALSE) + var/datum/controller/subsystem/gamemode/mode = SSgamemode + // Perhaps use some bell curve instead of a flat variance? + var/total_cost = bought_event.cost * mode.point_thresholds[track] + if(!bought_event.roundstart) + total_cost *= (1 + (rand(-cost_variance, cost_variance)/100)) //Apply cost variance if not roundstart event + mode.event_track_points[track] -= total_cost + message_admins("Storyteller purchased and triggered [bought_event] event, on [track] track, for [total_cost] cost.") + if(bought_event.roundstart) + if(!ignores_roundstart) + SSgamemode.ran_roundstart = TRUE + SSgamemode.current_roundstart_event = bought_event + mode.TriggerEvent(bought_event, forced) + else + mode.schedule_event(bought_event, 3 MINUTES, total_cost, _forced = forced) + SSgamemode.triggered_round_events |= bought_event.name + +/// Calculates the weights of the events from a passed track. +/datum/storyteller/proc/calculate_weights(track) + var/datum/controller/subsystem/gamemode/mode = SSgamemode + for(var/datum/round_event_control/event as anything in mode.event_pools[track]) + var/weight_total = event.weight + /// Apply tag multipliers if able + if(tag_multipliers) + for(var/tag in tag_multipliers) + if(tag in event.tags) + weight_total *= tag_multipliers[tag] + /// Apply occurence multipliers if able + var/occurences = event.get_occurences() + if(occurences) + ///If the event has occured already, apply a penalty multiplier based on amount of occurences + weight_total -= event.reoccurence_penalty_multiplier * weight_total * (1 - (event_repetition_multiplier ** occurences)) + /// Write it + event.calculated_weight = weight_total + +/datum/storyteller/guide + name = "The Guide" + desc = "The Guide will provide a balanced and varied experience. Consider this the default experience." diff --git a/monkestation/code/modules/storytellers/storytellers/ghost.dm b/monkestation/code/modules/storytellers/storytellers/ghost.dm new file mode 100644 index 000000000000..b5f697567ae7 --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/ghost.dm @@ -0,0 +1,6 @@ + +/datum/storyteller/ghost + name = "The Ghost" + desc = "The Ghost will not run a single event or create an antagonist." + disable_distribution = TRUE + population_max = 10 diff --git a/monkestation/code/modules/storytellers/storytellers/jester.dm b/monkestation/code/modules/storytellers/storytellers/jester.dm new file mode 100644 index 000000000000..de7ef07e901c --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/jester.dm @@ -0,0 +1,14 @@ + +/datum/storyteller/jester + name = "The Jester" + desc = "The Jester will create much more events, with higher possibilities of them repeating." + event_repetition_multiplier = 0.8 + point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1.2, + EVENT_TRACK_MODERATE = 1.4, + EVENT_TRACK_MAJOR = 1.4, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + population_min = 10 + ignores_roundstart = TRUE diff --git a/monkestation/code/modules/storytellers/storytellers/sleeper.dm b/monkestation/code/modules/storytellers/storytellers/sleeper.dm new file mode 100644 index 000000000000..f21c55cdfd73 --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/sleeper.dm @@ -0,0 +1,13 @@ + +/datum/storyteller/sleeper + name = "The Sleeper" + desc = "The Sleeper will create less impactful events, especially ones involving combat or destruction. The chill experience." + point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1.2, + EVENT_TRACK_MAJOR = 1.2, + EVENT_TRACK_ROLESET = 0.1, ///rolesets are entirely evil atm so crank this down + EVENT_TRACK_OBJECTIVES = 1 + ) + guarantees_roundstart_roleset = FALSE + tag_multipliers = list(TAG_COMBAT = 0.6, TAG_DESTRUCTIVE = 0.7) diff --git a/monkestation/code/modules/storytellers/storytellers/vote.dm b/monkestation/code/modules/storytellers/storytellers/vote.dm new file mode 100644 index 000000000000..705b9a5f733b --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/vote.dm @@ -0,0 +1,30 @@ +/datum/vote/var/has_desc = FALSE + +/datum/vote/proc/return_desc(vote_name) + return "" + +/datum/vote/storyteller + name = "Storyteller" + message = "Vote for the storyteller!" + has_desc = TRUE + + +/datum/vote/storyteller/New() + . = ..() + default_choices = list() + default_choices = SSgamemode.storyteller_vote_choices() + + +/datum/vote/storyteller/return_desc(vote_name) + return SSgamemode.storyteller_desc(vote_name) + +/datum/vote/storyteller/create_vote() + . = ..() + if((length(choices) == 1)) // Only one choice, no need to vote. Let's just auto-rotate it to the only remaining map because it would just happen anyways. + var/de_facto_winner = choices[1] + SSgamemode.storyteller_vote_result(de_facto_winner) + to_chat(world, span_boldannounce("The storyteller vote has been skipped because there is only one storyteller left to vote for. The map has been changed to [de_facto_winner].")) + return FALSE + +/datum/vote/storyteller/finalize_vote(winning_option) + SSgamemode.storyteller_vote_result(winning_option) diff --git a/monkestation/code/modules/storytellers/storytellers/warrior.dm b/monkestation/code/modules/storytellers/storytellers/warrior.dm new file mode 100644 index 000000000000..d1eb510aac66 --- /dev/null +++ b/monkestation/code/modules/storytellers/storytellers/warrior.dm @@ -0,0 +1,12 @@ +/datum/storyteller/warrior + name = "The Warrior" + desc = "The Warrior will create more impactful events, often focused on combat." + point_gains_multipliers = list( + EVENT_TRACK_MUNDANE = 1, + EVENT_TRACK_MODERATE = 1.3, + EVENT_TRACK_MAJOR = 1.3, + EVENT_TRACK_ROLESET = 1, + EVENT_TRACK_OBJECTIVES = 1 + ) + tag_multipliers = list(TAG_COMBAT = 1.5) + population_min = 10 diff --git a/monkestation/code/modules/surgery/organs/internal/tongue.dm b/monkestation/code/modules/surgery/organs/internal/tongue.dm index def8bffeb7cc..684fd10d6ddb 100644 --- a/monkestation/code/modules/surgery/organs/internal/tongue.dm +++ b/monkestation/code/modules/surgery/organs/internal/tongue.dm @@ -30,3 +30,15 @@ /obj/item/organ/internal/tongue/arachnid/get_possible_languages() return ..() + /datum/language/buzzwords + +/obj/item/organ/internal/tongue/oozeling + name = "oozeling tongue" + desc = "A goopy organ that mimics the tongues of other carbon beings." + icon = 'monkestation/icons/obj/medical/organs/organs.dmi' + icon_state = "tongue_oozeling" + say_mod = "blurbles" + alpha = 200 + +// Oozeling tongues can speak all default + slime +/obj/item/organ/internal/tongue/oozeling/get_possible_languages() + return ..() + /datum/language/slime diff --git a/monkestation/icons/effects/96x96.dmi b/monkestation/icons/effects/96x96.dmi new file mode 100644 index 000000000000..21b19d987a3b Binary files /dev/null and b/monkestation/icons/effects/96x96.dmi differ diff --git a/monkestation/icons/mob/clothing/feet.dmi b/monkestation/icons/mob/clothing/feet.dmi index 9e95d8f10182..135e5a43743e 100644 Binary files a/monkestation/icons/mob/clothing/feet.dmi and b/monkestation/icons/mob/clothing/feet.dmi differ diff --git a/monkestation/icons/mob/clothing/head.dmi b/monkestation/icons/mob/clothing/head.dmi index 1a409061aaee..d900f7ca1b74 100644 Binary files a/monkestation/icons/mob/clothing/head.dmi and b/monkestation/icons/mob/clothing/head.dmi differ diff --git a/monkestation/icons/mob/clothing/mask.dmi b/monkestation/icons/mob/clothing/mask.dmi index 41d13498159d..639493e982e5 100644 Binary files a/monkestation/icons/mob/clothing/mask.dmi and b/monkestation/icons/mob/clothing/mask.dmi differ diff --git a/monkestation/icons/mob/clothing/species/simian/suit.dmi b/monkestation/icons/mob/clothing/species/simian/suit.dmi index a5ff9e9bd510..92d02218f37f 100644 Binary files a/monkestation/icons/mob/clothing/species/simian/suit.dmi and b/monkestation/icons/mob/clothing/species/simian/suit.dmi differ diff --git a/monkestation/icons/mob/clothing/species/simian/uniform.dmi b/monkestation/icons/mob/clothing/species/simian/uniform.dmi index d9b0e3378669..398bc9d3dfb8 100644 Binary files a/monkestation/icons/mob/clothing/species/simian/uniform.dmi and b/monkestation/icons/mob/clothing/species/simian/uniform.dmi differ diff --git a/monkestation/icons/mob/clothing/suit.dmi b/monkestation/icons/mob/clothing/suit.dmi index 9a0700e62b0a..b205f37c5e4e 100644 Binary files a/monkestation/icons/mob/clothing/suit.dmi and b/monkestation/icons/mob/clothing/suit.dmi differ diff --git a/monkestation/icons/mob/clothing/uniform.dmi b/monkestation/icons/mob/clothing/uniform.dmi index f62c6c788363..ad0c552ff500 100644 Binary files a/monkestation/icons/mob/clothing/uniform.dmi and b/monkestation/icons/mob/clothing/uniform.dmi differ diff --git a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi index 5ab121f331c8..0311809edf11 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi index 3f85082af1dc..5bf25ffe8aad 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/monkestation/icons/mob/sprite_accessories/hair.dmi b/monkestation/icons/mob/sprite_accessories/hair.dmi index eecf3922d236..c4b5a07a6b28 100644 Binary files a/monkestation/icons/mob/sprite_accessories/hair.dmi and b/monkestation/icons/mob/sprite_accessories/hair.dmi differ diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi index c6990529ad70..abf2d81a471a 100644 Binary files a/monkestation/icons/obj/clothing/hats.dmi and b/monkestation/icons/obj/clothing/hats.dmi differ diff --git a/monkestation/icons/obj/clothing/masks.dmi b/monkestation/icons/obj/clothing/masks.dmi index 0b986bd05f8a..fd0bd387119f 100644 Binary files a/monkestation/icons/obj/clothing/masks.dmi and b/monkestation/icons/obj/clothing/masks.dmi differ diff --git a/monkestation/icons/obj/clothing/shoes.dmi b/monkestation/icons/obj/clothing/shoes.dmi index 4ee27b879a2c..756c14e98530 100644 Binary files a/monkestation/icons/obj/clothing/shoes.dmi and b/monkestation/icons/obj/clothing/shoes.dmi differ diff --git a/monkestation/icons/obj/clothing/suits.dmi b/monkestation/icons/obj/clothing/suits.dmi index 5942f79eb9c4..7881728374fe 100644 Binary files a/monkestation/icons/obj/clothing/suits.dmi and b/monkestation/icons/obj/clothing/suits.dmi differ diff --git a/monkestation/icons/obj/clothing/uniforms.dmi b/monkestation/icons/obj/clothing/uniforms.dmi index e63aba5eac3a..f175393dc57c 100644 Binary files a/monkestation/icons/obj/clothing/uniforms.dmi and b/monkestation/icons/obj/clothing/uniforms.dmi differ diff --git a/monkestation/icons/obj/guns/ammo.dmi b/monkestation/icons/obj/guns/ammo.dmi new file mode 100644 index 000000000000..f01bef56f409 Binary files /dev/null and b/monkestation/icons/obj/guns/ammo.dmi differ diff --git a/monkestation/icons/obj/guns/guns.dmi b/monkestation/icons/obj/guns/guns.dmi index f44ca1a7bf83..80436df8fdd2 100644 Binary files a/monkestation/icons/obj/guns/guns.dmi and b/monkestation/icons/obj/guns/guns.dmi differ diff --git a/monkestation/icons/obj/medical/organs/organs.dmi b/monkestation/icons/obj/medical/organs/organs.dmi index ba92913711a7..1555c1b3fc25 100644 Binary files a/monkestation/icons/obj/medical/organs/organs.dmi and b/monkestation/icons/obj/medical/organs/organs.dmi differ diff --git a/sound/attributions.txt b/sound/attributions.txt index 5fe6032500c4..b02d2fea2ab0 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -85,3 +85,6 @@ https://freesound.org/people/aboxinghelena/sounds/401139/ car_crash.ogg is adapted from squareal's "Car Crash" (CC 0) https://freesound.org/people/squareal/sounds/237375/ + +statue_horror_sting.ogg is from Kevin MacLeod: Right Behind You (CC BY 3.0) +https://www.youtube.com/watch?v=dRdpJq6nmWw diff --git a/sound/creatures/statue_horror_sting.ogg b/sound/creatures/statue_horror_sting.ogg new file mode 100644 index 000000000000..f420085b4525 Binary files /dev/null and b/sound/creatures/statue_horror_sting.ogg differ diff --git a/strings/farts.txt b/strings/farts.txt index 97e3bb7174b4..aabc7298ae20 100644 --- a/strings/farts.txt +++ b/strings/farts.txt @@ -40,3 +40,4 @@ repressurizes the room. farts and blames it on the dog. winces, must have been a spicy one. didn't fart, it must have been a ghost! +unleashes their animal spirit! diff --git a/strings/pill_names.json b/strings/pill_names.json index 4e5922f7221c..427d912083c6 100644 --- a/strings/pill_names.json +++ b/strings/pill_names.json @@ -120,6 +120,7 @@ "Lightning", "Liquid", "Lover", +"Lunchtime", "Macho", "Maid", "Man", @@ -142,6 +143,7 @@ "One", "Ook", "Organic", +"Patrick", "Pete", "Pineapple", "Piss", @@ -149,6 +151,7 @@ "Poor", "Power", "Pressure", +"Pretty", "prob(80)", "Psycho", "Quaalude", @@ -180,6 +183,7 @@ "South", "Space", "Spaceman", +"Special", "Speed", "Spess", "Spessman", diff --git a/tgstation.dme b/tgstation.dme index 80688be686a9..e1af3d9ae0be 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -390,9 +390,11 @@ #include "code\__DEFINES\~monkestation\smoothing.dm" #include "code\__DEFINES\~monkestation\span.dm" #include "code\__DEFINES\~monkestation\status_effects.dm" +#include "code\__DEFINES\~monkestation\storytellers.dm" #include "code\__DEFINES\~monkestation\traits.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_atom.dm" #include "code\__DEFINES\~monkestation\dcs\signals\signals_carbon.dm" +#include "code\__DEFINES\~monkestation\dcs\signals\signals_traitor.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_planes.dm" @@ -3014,15 +3016,16 @@ #include "code\modules\bitrunning\abilities.dm" #include "code\modules\bitrunning\alerts.dm" #include "code\modules\bitrunning\areas.dm" +#include "code\modules\bitrunning\designs.dm" #include "code\modules\bitrunning\event.dm" #include "code\modules\bitrunning\job.dm" +#include "code\modules\bitrunning\outfits.dm" #include "code\modules\bitrunning\turfs.dm" #include "code\modules\bitrunning\antagonists\cyber_police.dm" -#include "code\modules\bitrunning\antagonists\outfit.dm" #include "code\modules\bitrunning\components\avatar_connection.dm" #include "code\modules\bitrunning\components\bitrunning_points.dm" #include "code\modules\bitrunning\components\netpod_healing.dm" -#include "code\modules\bitrunning\objects\bit_vendor.dm" +#include "code\modules\bitrunning\objects\byteforge.dm" #include "code\modules\bitrunning\objects\clothing.dm" #include "code\modules\bitrunning\objects\disks.dm" #include "code\modules\bitrunning\objects\hololadder.dm" @@ -3031,6 +3034,7 @@ #include "code\modules\bitrunning\objects\loot_crate.dm" #include "code\modules\bitrunning\objects\netpod.dm" #include "code\modules\bitrunning\objects\quantum_console.dm" +#include "code\modules\bitrunning\objects\vendor.dm" #include "code\modules\bitrunning\orders\disks.dm" #include "code\modules\bitrunning\orders\flair.dm" #include "code\modules\bitrunning\orders\tech.dm" @@ -3053,6 +3057,8 @@ #include "code\modules\bitrunning\virtual_domain\domains\legion.dm" #include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm" #include "code\modules\bitrunning\virtual_domain\domains\pirates.dm" +#include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm" +#include "code\modules\bitrunning\virtual_domain\domains\psyker_zombies.dm" #include "code\modules\bitrunning\virtual_domain\domains\stairs_and_cliffs.dm" #include "code\modules\bitrunning\virtual_domain\domains\syndicate_assault.dm" #include "code\modules\bitrunning\virtual_domain\domains\test_only.dm" @@ -3198,6 +3204,7 @@ #include "code\modules\client\preferences\multiz_performance.dm" #include "code\modules\client\preferences\names.dm" #include "code\modules\client\preferences\ooc.dm" +#include "code\modules\client\preferences\operative_species.dm" #include "code\modules\client\preferences\paint_color.dm" #include "code\modules\client\preferences\parallax.dm" #include "code\modules\client\preferences\pda.dm" @@ -4249,6 +4256,7 @@ #include "code\modules\mob\living\carbon\alien\larva\powers.dm" #include "code\modules\mob\living\carbon\alien\special\alien_embryo.dm" #include "code\modules\mob\living\carbon\alien\special\facehugger.dm" +#include "code\modules\mob\living\carbon\human\_species.dm" #include "code\modules\mob\living\carbon\human\damage_procs.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\dummy.dm" @@ -4269,7 +4277,6 @@ #include "code\modules\mob\living\carbon\human\life.dm" #include "code\modules\mob\living\carbon\human\login.dm" #include "code\modules\mob\living\carbon\human\physiology.dm" -#include "code\modules\mob\living\carbon\human\species.dm" #include "code\modules\mob\living\carbon\human\status_procs.dm" #include "code\modules\mob\living\carbon\human\suicides.dm" #include "code\modules\mob\living\carbon\human\monkey\monkey.dm" @@ -5462,8 +5469,8 @@ #include "interface\skin.dmf" #include "monkestation\code\__DEFINES\projectile.dm" #include "monkestation\code\__HELPERS\_lists.dm" -#include "monkestation\code\__HELPERS\mobs.dm" #include "monkestation\code\__HELPERS\reagents.dm" +#include "monkestation\code\__HELPERS\turfs.dm" #include "monkestation\code\_onclick\hud\alert.dm" #include "monkestation\code\datums\action.dm" #include "monkestation\code\datums\antag_tokens.dm" @@ -5475,6 +5482,7 @@ #include "monkestation\code\datums\ai\monkey\dukeman_controller.dm" #include "monkestation\code\datums\ai_laws\laws_monke.dm" #include "monkestation\code\datums\announcers\duke.dm" +#include "monkestation\code\datums\brain_damage\magic.dm" #include "monkestation\code\datums\components\carbon_sprint.dm" #include "monkestation\code\datums\components\multi_hit.dm" #include "monkestation\code\datums\components\throw_bounce.dm" @@ -5503,6 +5511,7 @@ #include "monkestation\code\game\machinery\trains\train_head.dm" #include "monkestation\code\game\machinery\trains\train_network.dm" #include "monkestation\code\game\objects\effects\countdown.dm" +#include "monkestation\code\game\objects\effects\landmark.dm" #include "monkestation\code\game\objects\effects\sprint_dust.dm" #include "monkestation\code\game\objects\effects\anomalies\anomalies_dimensional_themes.dm" #include "monkestation\code\game\objects\effects\random\ai_module.dm" @@ -5530,8 +5539,10 @@ #include "monkestation\code\game\objects\items\effects\washing_machine.dm" #include "monkestation\code\game\objects\items\food\spaghetti.dm" #include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm" +#include "monkestation\code\game\objects\items\guns\crank_guns.dm" #include "monkestation\code\game\objects\items\guns\shotguns.dm" #include "monkestation\code\game\objects\items\guns\SRN.dm" +#include "monkestation\code\game\objects\items\guns\wt_ammo.dm" #include "monkestation\code\game\objects\items\implants\hardlight.dm" #include "monkestation\code\game\objects\items\objects\items\robot\robot_upgrades.dm" #include "monkestation\code\game\objects\items\storage\book.dm" @@ -5658,17 +5669,22 @@ #include "monkestation\code\modules\antagonists\florida_man\florida_events.dm" #include "monkestation\code\modules\antagonists\florida_man\florida_spells.dm" #include "monkestation\code\modules\antagonists\florida_man\supplypods.dm" +#include "monkestation\code\modules\antagonists\traitor\objectives\tide_bug_department.dm" +#include "monkestation\code\modules\antagonists\traitor\objectives\final_objective\become_wizard.dm" #include "monkestation\code\modules\antagonists\traitor\uplink_handler.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\artefact.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\defensive.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\mobility.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\offensive.dm" #include "monkestation\code\modules\antagonists\wizard\equipment\spellbook_entries\summons.dm" +#include "monkestation\code\modules\antagonists\wizard\grand_ritual\grand_rune.dm" #include "monkestation\code\modules\antimatter\code\containment_jar.dm" #include "monkestation\code\modules\antimatter\code\control.dm" #include "monkestation\code\modules\antimatter\code\shielding.dm" #include "monkestation\code\modules\ballpit\ballbit_sink.dm" #include "monkestation\code\modules\ballpit\ballpit.dm" +#include "monkestation\code\modules\bitrunners\code\ability_disks.dm" +#include "monkestation\code\modules\bitrunners\code\combat_gear_disks.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker_assets.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_conversion.dm" #include "monkestation\code\modules\bloodsuckers\bloodsucker\bloodsucker_datum.dm" @@ -5752,6 +5768,7 @@ #include "monkestation\code\modules\cargo\crates\science.dm" #include "monkestation\code\modules\cargo\crates\security.dm" #include "monkestation\code\modules\cargo\crates\service.dm" +#include "monkestation\code\modules\cargo\markets\market_items.dm" #include "monkestation\code\modules\cargoborg\code\cargo_module.dm" #include "monkestation\code\modules\cargoborg\code\cargo_teleporter.dm" #include "monkestation\code\modules\cargoborg\code\cargoborg_items.dm" @@ -5793,8 +5810,10 @@ #include "monkestation\code\modules\clothing\gloves\gloves.dm" #include "monkestation\code\modules\clothing\head\costume.dm" #include "monkestation\code\modules\clothing\head\misc.dm" +#include "monkestation\code\modules\clothing\masks\gasmask.dm" #include "monkestation\code\modules\clothing\masks\misc.dm" #include "monkestation\code\modules\clothing\neck\cloaks.dm" +#include "monkestation\code\modules\clothing\shoes\clown.dm" #include "monkestation\code\modules\clothing\shoes\shoe.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\_armor.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\_hardsuit.dm" @@ -5805,6 +5824,7 @@ #include "monkestation\code\modules\clothing\spacesuits\hardsuits\science.dm" #include "monkestation\code\modules\clothing\spacesuits\hardsuits\security.dm" #include "monkestation\code\modules\clothing\suits\coats.dm" +#include "monkestation\code\modules\clothing\suits\costume.dm" #include "monkestation\code\modules\clothing\suits\toggles.dm" #include "monkestation\code\modules\clothing\under\costume.dm" #include "monkestation\code\modules\clothing\under\undersuit.dm" @@ -5843,6 +5863,7 @@ #include "monkestation\code\modules\donator\code\datum\loadout.dm" #include "monkestation\code\modules\donator\code\item\choice_beacon.dm" #include "monkestation\code\modules\donator\code\item\clothing.dm" +#include "monkestation\code\modules\donator\code\item\effects.dm" #include "monkestation\code\modules\donator\code\item\plush.dm" #include "monkestation\code\modules\donator\code\mob\pets.dm" #include "monkestation\code\modules\events\wizard\summon_gifts.dm" @@ -5868,7 +5889,6 @@ #include "monkestation\code\modules\hydroponics\seeds.dm" #include "monkestation\code\modules\hydroponics\grown\coconut.dm" #include "monkestation\code\modules\hydroponics\machines\composter.dm" -#include "monkestation\code\modules\hydroponics\machines\infuser.dm" #include "monkestation\code\modules\hydroponics\machines\splicer.dm" #include "monkestation\code\modules\hydroponics\mutations\_mutations.dm" #include "monkestation\code\modules\hydroponics\mutations\base.dm" @@ -5879,6 +5899,13 @@ #include "monkestation\code\modules\job_xp\milestones\botany_milestones.dm" #include "monkestation\code\modules\job_xp\preferences\base_preferences.dm" #include "monkestation\code\modules\job_xp\preferences\xp_handlers.dm" +#include "monkestation\code\modules\jobs\job_types\candysalesman.dm" +#include "monkestation\code\modules\jobs\job_types\dietwizard.dm" +#include "monkestation\code\modules\jobs\job_types\ghost.dm" +#include "monkestation\code\modules\jobs\job_types\godzilla.dm" +#include "monkestation\code\modules\jobs\job_types\gorilla.dm" +#include "monkestation\code\modules\jobs\job_types\skeleton.dm" +#include "monkestation\code\modules\jobs\job_types\yellowclown.dm" #include "monkestation\code\modules\liquids\drains.dm" #include "monkestation\code\modules\liquids\height_floors.dm" #include "monkestation\code\modules\liquids\liquid_controller.dm" @@ -5915,6 +5942,8 @@ #include "monkestation\code\modules\loadouts\items\toys.dm" #include "monkestation\code\modules\loadouts\items\under\donator.dm" #include "monkestation\code\modules\loadouts\items\under\under.dm" +#include "monkestation\code\modules\loafing\code\loaf.dm" +#include "monkestation\code\modules\loafing\code\loafer.dm" #include "monkestation\code\modules\maptext\maptext_image_helper.dm" #include "monkestation\code\modules\mech_comp\_interface.dm" #include "monkestation\code\modules\mech_comp\_message.dm" @@ -6253,6 +6282,30 @@ #include "monkestation\code\modules\store\store_items\suits.dm" #include "monkestation\code\modules\store\store_items\toys.dm" #include "monkestation\code\modules\store\store_items\under.dm" +#include "monkestation\code\modules\storytellers\config.dm" +#include "monkestation\code\modules\storytellers\gamemode_subsystem.dm" +#include "monkestation\code\modules\storytellers\scheduled_events.dm" +#include "monkestation\code\modules\storytellers\converted_events\_base_event.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\bloodcult.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\bloodsuckers.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\changeling.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\clockwork_cult.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\clown_operative.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\heretic.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\malf.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\nuclear_operative.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\obsessed.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\revolutionary.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\traitor.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\wizard.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\nuclear_operative_ghost.dm" +#include "monkestation\code\modules\storytellers\converted_events\solo\ghosts\wizard.dm" +#include "monkestation\code\modules\storytellers\storytellers\_storyteller.dm" +#include "monkestation\code\modules\storytellers\storytellers\ghost.dm" +#include "monkestation\code\modules\storytellers\storytellers\jester.dm" +#include "monkestation\code\modules\storytellers\storytellers\sleeper.dm" +#include "monkestation\code\modules\storytellers\storytellers\vote.dm" +#include "monkestation\code\modules\storytellers\storytellers\warrior.dm" #include "monkestation\code\modules\surgery\bodyparts\arachnid_bodyparts.dm" #include "monkestation\code\modules\surgery\bodyparts\clockwork_bodyparts.dm" #include "monkestation\code\modules\surgery\bodyparts\ipc_bodyparts.dm" diff --git a/tgui/packages/tgui/interfaces/BotanyInfuser.js b/tgui/packages/tgui/interfaces/BotanyInfuser.js deleted file mode 100644 index bf89ebbf1808..000000000000 --- a/tgui/packages/tgui/interfaces/BotanyInfuser.js +++ /dev/null @@ -1,200 +0,0 @@ -import { toFixed } from 'common/math'; -import { useBackend } from '../backend'; -import { Box, Button, Flex, LabeledList, ProgressBar, Section, Table } from '../components'; -import { Window } from '../layouts'; - -export const TimeFormat = (props, context) => { - const { value } = props; - - const seconds = toFixed(Math.floor((value / 10) % 60)).padStart(2, '0'); - const minutes = toFixed(Math.floor((value / (10 * 60)) % 60)).padStart( - 2, - '0' - ); - const hours = toFixed(Math.floor((value / (10 * 60 * 60)) % 24)).padStart( - 2, - '0' - ); - const formattedValue = `${hours}:${minutes}:${seconds}`; - return formattedValue; -}; - -export const BotanyInfuser = (props, context) => { - const { data } = useBackend(context); - const { working, timeleft, error } = data; - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - ); -}; - -export const CurrentPlantStats = (props, context) => { - const { act, data } = useBackend(context); - const { seed, working } = data; - const seed_1 = data.seed || []; - return ( -
- - {seed_1.map((node) => ( - - - - - {node.potency} | {node.potency_change} - - - - - {node.yield} | {node.yield_change} - - - - - {node.production_speed} | {node.production_change} - - - - - {node.maturation_speed} | {node.maturation_change} - - - - - {node.endurance} | {node.endurance_change} - - - - - {node.lifespan} | {node.lifespan_change} - - - - - {node.weed_rate} | {node.weed_rate_change} - - - - - {node.weed_chance} | {node.weed_chance_change} - - - - - - ))} -
-
- ); -}; - -export const DamageBar = (props, context) => { - const { act, data } = useBackend(context); - const { combined_damage } = data; - return ( -
- = 60 ? 'bad' : 'good'} - value={data.combined_damage / 100} - align="center"> - {'Infusion Damage: ' + toFixed(data.combined_damage) + '/ 100'} - -
- ); -}; - -export const PlantVisuals = (props, context) => { - const { act, data } = useBackend(context); - const { seed } = data; - const seed_1 = data.seed || []; - - return ( -
- {seed_1.map((node) => ( - - - - - {node.name} - - {node.desc} - - - ))} -
- ); -}; - -export const UsableButtons = (props, context) => { - const { act, data } = useBackend(context); - const { has_seed, has_beaker } = data; - return ( - - -