diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml new file mode 100644 index 0000000000..6fe53f700c --- /dev/null +++ b/.github/workflows/update_tgs_dmapi.yml @@ -0,0 +1,45 @@ +name: Update TGS DMAPI + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + update-dmapi: + runs-on: ubuntu-latest + name: Update the TGS DMAPI + steps: + - name: Clone + uses: actions/checkout@v2 + + - name: Branch + run: | + git branch -f tgs-dmapi-update + git checkout tgs-dmapi-update + git reset --hard master + + - name: Apply DMAPI update + uses: tgstation/tgs-dmapi-updater@v2 + with: + header-path: 'code/__DEFINES/tgs.dm' + library-path: 'code/modules/tgs' + + - name: Commit and Push + run: | + git config user.name tgstation-server + git config user.email tgstation-server@users.noreply.github.com + git add . + git commit -m 'Update TGS DMAPI' + git push -f -u origin tgs-dmapi-update + + - name: Create Pull Request + uses: repo-sync/pull-request@v2 + with: + source_branch: "tgs-dmapi-update" + destination_branch: "master" + pr_title: "Automatic TGS DMAPI Update" + pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging." + pr_label: "Tools" + pr_allow_empty: false + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.vscode/extensions.json b/.vscode/extensions.json index ca0e6ad997..f79100f563 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,8 @@ "recommendations": [ "gbasood.byond-dm-language-support", "platymuus.dm-langclient", - "EditorConfig.EditorConfig" + "EditorConfig.EditorConfig", + "arcanis.vscode-zipfs", + "dbaeumer.vscode-eslint" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..f95b8f7cc6 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,18 @@ +{ + "eslint.nodePath": "tgui/.yarn/sdks", + "eslint.workingDirectories": [ + "./tgui" + ], + "search.exclude": { + "tgui/.yarn": true, + "tgui/.pnp.*": true + }, + "workbench.editorAssociations": [ + { + "filenamePattern": "*.dmi", + "viewType": "imagePreview.previewEditor" + } + ], + "files.eol": "\n", + "gitlens.advanced.blame.customArguments": ["-w"] +} diff --git a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm index c95e0c7539..268c907445 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehermit.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehermit.dmm @@ -17,10 +17,14 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered) "ag" = ( -/obj/structure/shuttle/engine/propulsion/right{ - dir = 4 +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" }, -/turf/closed/wall/mineral/titanium, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "ah" = ( /obj/structure/table/wood, @@ -70,20 +74,21 @@ /turf/open/floor/mineral/titanium, /area/ruin/powered) "ar" = ( -/obj/machinery/door/airlock/titanium{ - name = "Escape Pod Airlock" - }, -/turf/open/floor/mineral/titanium, +/turf/closed/wall/mineral/wood, /area/ruin/powered) "as" = ( /obj/machinery/light, /turf/open/floor/mineral/titanium, /area/ruin/powered) "at" = ( -/obj/structure/shuttle/engine/propulsion/left{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + pixel_x = 5; + pixel_y = -32 }, -/turf/closed/wall/mineral/titanium, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "au" = ( /obj/item/seeds/tower, @@ -93,11 +98,15 @@ /area/ruin/powered) "av" = ( /obj/structure/table/wood, -/obj/item/paper/crumpled{ - info = "

So this is it, I guess.. Always thought I'd go out doing something stupid, but.. not like this.
Should anyone find this note, tell Jeremy Clarke he can kiss my ass. Launching the pod unprepared like that..
Well. Now that I'm keeling over here, I guess I should write how I came to be the last one standing here.
Four of us took this pod.. only three of us woke up though.. fourth pod is locked from the inside, we couldn't figure out how to get it open.
Me and the clown set up a farm s'we can survive at least a while.. though, he didn't seem to understand that man cannot live on banana alone.
Had a bunch of circuits on him for some reason when he eventually passed, whispered to me something about a chem dispenser.. I.. don't know what he meant by that. I was never good with machinary. Maybe he wanted space lube?
The assistant that we gave the space suit to go out and find help never came back.. I'm betting he found salvation and left us behind.. never can trust those grubby greytiders." +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton{ + pixel_x = -5; + pixel_y = 6 }, -/obj/item/pen, -/obj/item/stock_parts/cell/hyper, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aw" = ( @@ -142,6 +151,17 @@ "aE" = ( /turf/open/floor/plating/asteroid/airless, /area/ruin/powered) +"aF" = ( +/obj/machinery/power/port_gen/pacman{ + active = 1; + anchored = 1; + sheets = 10 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "aG" = ( /obj/structure/sink/puddle, /turf/open/floor/plating/asteroid, @@ -187,9 +207,7 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "aQ" = ( -/obj/item/stack/ore/gold, -/obj/item/stack/ore/gold, -/obj/item/stack/ore/gold, +/obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aR" = ( @@ -205,8 +223,12 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "aU" = ( -/obj/item/flashlight/lamp, /obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/meat/slab/human{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/reagent_containers/food/snacks/meat/slab/human, /turf/open/floor/plating/asteroid, /area/ruin/powered) "aV" = ( @@ -238,20 +260,24 @@ /turf/closed/mineral/random/no_caves/earth_like, /area/ruin/powered) "bc" = ( -/obj/item/circuitboard/machine/circuit_imprinter, +/obj/structure/table/wood, +/obj/item/vending_refill/snack, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bd" = ( -/obj/item/grown/bananapeel, -/turf/open/floor/plating/asteroid, +/obj/structure/shuttle/engine/propulsion/right{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, /area/ruin/powered) "be" = ( -/obj/effect/mob_spawn/human/corpse/cargo_tech, -/obj/structure/fans/tiny/invisible, +/obj/structure/chair/wood/normal{ + dir = 1 + }, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bf" = ( -/obj/item/clothing/glasses/meson, +/obj/machinery/door/airlock/wood, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bg" = ( @@ -275,50 +301,43 @@ /turf/open/floor/plating/asteroid, /area/ruin/powered) "bl" = ( -/obj/machinery/power/floodlight, -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/door/airlock/titanium{ + name = "Escape Pod Airlock" }, -/turf/open/floor/plating/asteroid, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "bm" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, +/obj/item/flashlight/lamp, +/obj/structure/table/wood, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bn" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/table/wood, +/obj/item/paper/crumpled{ + info = "

So this is it, I guess.. Always thought I'd go out doing something stupid, but.. not like this.
Should anyone find this note, tell Jeremy Clarke he can kiss my ass. Launching the pod unprepared like that..
Well. Now that I'm keeling over here, I guess I should write how I came to be the last one standing here.
Four of us took this pod.. only three of us woke up though.. fourth pod is locked from the inside, we couldn't figure out how to get it open.
Me and the clown set up a farm s'we can survive at least a while.. though, he didn't seem to understand that man cannot live on banana alone.
Had a bunch of circuits on him for some reason when he eventually passed, whispered to me something about a chem dispenser.. I.. don't know what he meant by that. I was never good with machinary. Maybe he wanted space lube?
The assistant that we gave the space suit to go out and find help never came back.. I'm betting he found salvation and left us behind.. never can trust those grubby greytiders." }, +/obj/item/pen, +/obj/item/stock_parts/cell/hyper, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bo" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/item/grown/bananapeel, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bp" = ( -/obj/item/stack/ore/iron, -/obj/item/stack/ore/iron, -/obj/item/stack/ore/iron, +/obj/effect/mob_spawn/human/corpse/cargo_tech, +/obj/structure/fans/tiny/invisible, /turf/open/floor/plating/asteroid, /area/ruin/powered) "bq" = ( -/obj/structure/cable, -/obj/machinery/power/port_gen/pacman{ - active = 1; - anchored = 1; - sheets = 10 - }, +/obj/item/clothing/glasses/meson, /turf/open/floor/plating/asteroid, /area/ruin/powered) "br" = ( -/obj/item/stack/ore/iron, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/turf/open/floor/plating/asteroid, +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/turf/open/floor/mineral/titanium, /area/ruin/powered) "bs" = ( /obj/item/flashlight/lamp/bananalamp, @@ -328,18 +347,181 @@ /obj/item/pickaxe/titanium, /turf/open/floor/plating/asteroid, /area/ruin/powered) +"fc" = ( +/obj/item/stack/ore/iron, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) "fp" = ( /turf/closed/mineral/random/high_chance/earth_like, /area/ruin/powered) "jx" = ( /turf/closed/mineral/silver/earth_like, /area/ruin/powered) +"ma" = ( +/obj/item/stack/ore/iron, +/obj/item/stack/ore/iron, +/obj/item/stack/ore/iron, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"mr" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/mob_spawn/human/skeleton, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "nc" = ( /turf/closed/mineral/bscrystal/earth_like, /area/ruin/powered) +"nl" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"oR" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"wU" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"zs" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"CY" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"DH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/decal/cleanable/vomit/old, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"Ft" = ( +/obj/structure/reagent_dispensers/fueltank/high, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"HK" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"HP" = ( +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) +"Iy" = ( +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/clothing/suit/hazardvest{ + desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; + name = "emergency lifejacket" + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/tank/internals/emergency_oxygen/double{ + pixel_x = 3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/mask/breath{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/item/clothing/head/hardhat/orange{ + name = "protective hat"; + pixel_y = 9 + }, +/obj/structure/closet/crate/internals, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "JZ" = ( /turf/closed/mineral/titanium/earth_like, /area/ruin/powered) +"Kj" = ( +/obj/machinery/power/floodlight, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) "Lt" = ( /obj/structure/mirror, /turf/closed/wall/mineral/iron, @@ -347,6 +529,19 @@ "PG" = ( /turf/closed/mineral/gold/earth_like, /area/ruin/powered) +"Qi" = ( +/obj/structure/cable, +/obj/machinery/power/port_gen/pacman{ + active = 1; + anchored = 1; + sheets = 10 + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"Sv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/mineral/titanium, +/area/ruin/powered) "Ue" = ( /turf/closed/mineral/diamond/earth_like, /area/ruin/powered) @@ -358,6 +553,24 @@ /obj/item/circuitboard/machine/ore_redemption, /turf/open/floor/plating/asteroid, /area/ruin/powered) +"WP" = ( +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/obj/item/stack/ore/gold, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"Xh" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating/asteroid, +/area/ruin/powered) +"XQ" = ( +/obj/structure/shuttle/engine/propulsion/left{ + dir = 4 + }, +/turf/closed/wall/mineral/titanium, +/area/ruin/powered) (1,1,1) = {" aa @@ -1123,9 +1336,9 @@ bb bb af ak -ao -ao -ao +DH +an +mr ak af am @@ -1175,9 +1388,9 @@ bb aR ae ae -an -an -an +af +bl +af ae ae am @@ -1225,13 +1438,13 @@ ba ba bb aR +ae ag -ag -af -ar -af -at +nl +an +HP at +ae am bb fp @@ -1277,13 +1490,13 @@ aL bb bb aT -am -am -am -am -am -am -am +bl +br +an +an +an +an +bl aR bb bb @@ -1329,13 +1542,13 @@ am ba bb am -am -am -am -am -am -am -am +af +Ft +zs +Sv +CY +wU +af bg bb fp @@ -1381,13 +1594,13 @@ am ba bb bb -am -am -am -am -am -am -am +ae +Iy +aF +br +CY +CY +ae bb bb bb @@ -1432,14 +1645,14 @@ am bb bb bb -aU +am bd -am -am +bd +af bl -bm -am -am +af +XQ +XQ bb bb bb @@ -1484,15 +1697,15 @@ am bb bb ba -av -be am am am -bn -bo -bo -bq +am +am +am +am +am +am bb bb bb @@ -1525,10 +1738,10 @@ bb bb bb bb -ba -am -am -am +ar +ar +ar +ar am am am @@ -1536,15 +1749,15 @@ am bb bb bb -bc -bf am am am am am am -br +am +am +am bb bb bb @@ -1577,10 +1790,10 @@ bb bb bb bb -bb -bb -bb -bb +ar +av +am +ar am am am @@ -1629,10 +1842,10 @@ bb fp bb bb -bb -bb -bb -bb +ar +aU +be +bf am am am @@ -1645,8 +1858,8 @@ am am aR am -am -am +Kj +HK am bb bb @@ -1681,11 +1894,11 @@ bb bb bb bb -bb -bb -bb -bb -ba +ar +bc +am +ar +am am am am @@ -1698,10 +1911,10 @@ am am am am -am -am -am -am +oR +Xh +Xh +Qi ba ba ba @@ -1733,16 +1946,18 @@ bb bb bb bb -bb -bb -bb -bb +ar +ar +ar +ar ba ba ba aK ba ba +bm +bo am am am @@ -1750,9 +1965,7 @@ am am am am -bp -am -am +fc aR ba ba @@ -1795,16 +2008,16 @@ fp ba fp ba +bn +bp +am +am +am +am +am aP am am -am -am -am -am -am -am -am aR ba ba @@ -1848,14 +2061,14 @@ ba ba ba aQ -aP +bq am am aR am am -am -am +WP +aP bb am ba @@ -2009,7 +2222,7 @@ bg am am am -am +ma am aS bb diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 3e5c80253d..6e0c65f6aa 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1453,7 +1453,7 @@ /area/ruin/space/has_grav/hotel/guestroom/room_2) "eu" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/ruin/space/has_grav/hotel/guestroom/room_2) "ev" = ( diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index 5bc10b30f0..1aed2fdbb0 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -153,10 +153,6 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"cX" = ( -/obj/structure/closet/secure_closet/miner, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "dk" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -398,6 +394,13 @@ }, /turf/open/floor/plating, /area/mine/laborcamp/security) +"he" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "hf" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel, @@ -417,16 +420,6 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"hH" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "hP" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ @@ -503,6 +496,14 @@ }, /turf/open/floor/plasteel, /area/mine/production) +"ja" = ( +/obj/item/bikehorn{ + color = "#000"; + desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; + name = "charred bike horn" + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "jf" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -769,11 +770,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/mine/laborcamp/security) -"nH" = ( -/obj/machinery/light, -/obj/structure/closet/wardrobe/miner, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "nI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -841,6 +837,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/mine/production) +"nS" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "nX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -1275,8 +1277,12 @@ /turf/open/floor/plasteel, /area/mine/production) "uG" = ( -/obj/structure/ore_box, -/obj/effect/turf_decal/box, +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, /turf/open/floor/plasteel, /area/mine/living_quarters) "uI" = ( @@ -1439,6 +1445,15 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"wQ" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "wV" = ( /turf/closed/mineral/random/volcanic, /area/lavaland/surface/outdoors/explored) @@ -1536,6 +1551,18 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"yZ" = ( +/obj/docking_port/stationary{ + area_type = /area/lavaland/surface/outdoors; + dir = 8; + dwidth = 3; + height = 7; + id = "lavaland_common_away"; + name = "Lavaland Mining Public Wing"; + width = 7 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "zh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -1644,6 +1671,13 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/production) +"AC" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "AH" = ( /obj/machinery/cryopod{ dir = 4 @@ -1719,6 +1753,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/mine/living_quarters) +"By" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "BD" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Station Maintenance"; @@ -1843,6 +1883,7 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "Dr" = ( +/obj/structure/chair, /obj/structure/extinguisher_cabinet{ pixel_x = -5; pixel_y = 30 @@ -1850,9 +1891,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "Dv" = ( @@ -2695,17 +2733,12 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "Pp" = ( -/obj/machinery/camera{ - c_tag = "Public Shuttle Lobby"; - network = list("mine") - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/structure/table, +/obj/item/gps/mining{ + pixel_x = 3; + pixel_y = 5 }, +/obj/item/gps/mining, /turf/open/floor/plasteel, /area/mine/living_quarters) "Pq" = ( @@ -2750,6 +2783,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/mine/laborcamp) +"Qd" = ( +/obj/structure/displaycase, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "Qi" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -2825,9 +2862,13 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "Ru" = ( +/obj/structure/chair, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "Rv" = ( @@ -3019,13 +3060,13 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "Powered by the tears and sweat of laborers."; name = "Prison Ofitser" }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "Un" = ( @@ -3241,10 +3282,6 @@ }, /turf/open/floor/plating, /area/mine/living_quarters) -"XX" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/mine/living_quarters) "Ya" = ( /turf/closed/wall/r_wall, /area/mine/laborcamp) @@ -4211,9 +4248,9 @@ VT VT VT VT -VT -VT -VT +Lm +Lm +Lm VT VT VT @@ -4266,12 +4303,12 @@ VT VT VT VT -VT -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4322,15 +4359,15 @@ VT VT VT VT -VT -VT -VT -VT -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4379,16 +4416,16 @@ VT VT VT VT -VT -VT -VT -VT Lm Lm -VT -VT Lm -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4435,17 +4472,17 @@ wz wz VT VT -VT -VT Lm -VT -VT -VT Lm -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm Lm VT VT @@ -4492,18 +4529,18 @@ wz wz Lm VT -VT -VT Lm Lm Lm Lm Lm -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4549,7 +4586,6 @@ VT wz Lm VT -VT Lm Lm Lm @@ -4558,8 +4594,9 @@ Lm Lm Lm Lm -VT -VT +Lm +Lm +Lm VT VT VT @@ -4615,7 +4652,7 @@ Lm Lm Lm Lm -VT +Lm VT VT VT @@ -4662,11 +4699,11 @@ VT VT VT VT -VT Lm Lm -VT -VT +Lm +Lm +Lm Lm Lm Lm @@ -4722,10 +4759,10 @@ wz Lm Lm Lm -VT Lm Lm Lm +yZ Lm Lm Lm @@ -4772,18 +4809,18 @@ Gt Dv my VT +ja VT VT -VT +wz wz Lm Lm Lm -VT -Lm -Lm -Lm Lm +KV +he +KV Lm Lm Lm @@ -4833,14 +4870,14 @@ VT VT Lm Lm +wz +wz Lm Lm Lm -Lm -Lm -Lm -Lm -Lm +KV +Ag +KV Lm Lm VT @@ -4893,11 +4930,11 @@ Lm VN VN VN -XX -VN -VN -VN +KV VN +KV +AC +KV VT VT VT @@ -4949,12 +4986,12 @@ pu bn VN zy -Ag -Ag -Ag +By +nS +By Ag qZ -VN +KV VT VT VT @@ -5010,8 +5047,8 @@ Ag Ag Ag Ag -cX -VN +Ag +KV VT VT VT @@ -5067,8 +5104,8 @@ Ag uG uG Ag -cX -VN +eS +KV VT VT VT @@ -5124,8 +5161,8 @@ KO uG uG Ag -cX -VN +Ag +KV VT VT VT @@ -5181,7 +5218,7 @@ RP Ag Ag Ag -nH +oy VN VT VT @@ -5235,10 +5272,10 @@ oy VN Pp sx -eS -Ag -Ag -hH +Pp +wQ +Qd +Qd VN wz Lm diff --git a/_maps/RandomZLevels/away_mission/jungleresort.dmm b/_maps/RandomZLevels/away_mission/jungleresort.dmm new file mode 100644 index 0000000000..d4698fec9a --- /dev/null +++ b/_maps/RandomZLevels/away_mission/jungleresort.dmm @@ -0,0 +1,26564 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ab" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"af" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/toy/plush/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"ai" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/closet/crate/secure/loot, +/obj/item/clothing/head/collectable/paper, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"ak" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"an" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ap" = ( +/obj/structure/stone_tile/surrounding/burnt, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ar" = ( +/obj/structure/flora/ausbushes/fullgrass, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"as" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"at" = ( +/obj/machinery/jukebox, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"aA" = ( +/obj/machinery/light, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"aB" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"aG" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/rock, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"aI" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"aL" = ( +/obj/structure/stone_tile/slab/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"aP" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"aY" = ( +/obj/machinery/vending/autodrobe, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"bf" = ( +/obj/structure/sign/barsign, +/turf/closed/wall/mineral/wood, +/area/awaymission/jungleresort) +"bg" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"bn" = ( +/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"bp" = ( +/obj/structure/flora/tree/jungle, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"br" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/rock/pile/largejungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"bv" = ( +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"bw" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"by" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"bG" = ( +/turf/closed/indestructible/riveted, +/area/awaymission/jungleresort) +"bW" = ( +/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "ResortCabin2"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/item/poster/random_official, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"bZ" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"cg" = ( +/obj/structure/table/wood, +/obj/machinery/reagentgrinder, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/kitchen/knife, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"cn" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"cw" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"cA" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"cD" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"cH" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"cJ" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"cK" = ( +/obj/structure/closet/crate, +/obj/item/clothing/head/collectable/tophat, +/turf/open/floor/plating/rust, +/area/awaymission/jungleresort) +"cT" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"cV" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"cX" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"dm" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/clothing/head/hardhat/cakehat, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"dn" = ( +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"dt" = ( +/obj/structure/table/wood, +/mob/living/carbon/monkey/punpun/curiousgorge, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"du" = ( +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"dC" = ( +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"dF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"dW" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/cakeslice/vanilla_slice, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"dY" = ( +/obj/structure/flora/junglebush/large, +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ef" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/circuit, +/area/awaymission/jungleresort) +"ez" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/obj/structure/stone_tile/center/cracked, +/obj/item/ammo_casing/shotgun/buckshot, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"eB" = ( +/obj/structure/chair/comfy/black, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"eC" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"eD" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/machinery/button/door{ + id = "AbandonedCabinDorm"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"eI" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/awaymission/jungleresort) +"eJ" = ( +/obj/structure/flora/junglebush, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"eK" = ( +/obj/machinery/washing_machine, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"eN" = ( +/obj/item/clothing/suit/hooded/wintercoat/bar, +/obj/structure/table/wood, +/obj/item/clothing/head/that, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"eR" = ( +/obj/structure/bed, +/obj/item/bedsheet/captain, +/obj/machinery/button/door{ + id = "ResortManagerDorm"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"eT" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"fh" = ( +/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "ResortCabin3"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/item/storage/wallet/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"fm" = ( +/obj/structure/reagent_dispensers/keg/mead, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"fy" = ( +/obj/structure/stone_tile/surrounding_tile/burnt, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"fz" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"fH" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"fW" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"fX" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"gj" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"go" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"gv" = ( +/obj/structure/table/wood, +/obj/item/book/manual/chef_recipes, +/obj/item/toy/figure/chef, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"gK" = ( +/obj/structure/table/wood, +/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/riot, +/obj/item/ammo_box/magazine/toy/m762/riot, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"gL" = ( +/obj/structure/table/wood, +/obj/item/export/bottle/minikeg, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"gN" = ( +/obj/structure/table/wood/fancy, +/obj/item/candle/infinite, +/obj/item/toy/figure/chaplain, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"gU" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"gV" = ( +/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "ResortCabin1"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/item/lipstick/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"gZ" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/under/color/jumpskirt/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/random, +/obj/item/clothing/under/color/jumpskirt/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"hj" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"hk" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hl" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hp" = ( +/obj/structure/flora/tree/jungle/small, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ht" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hv" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hw" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hy" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"hC" = ( +/obj/structure/flora/rock, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hH" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"hN" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"hU" = ( +/obj/structure/curtain, +/obj/machinery/shower, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"hX" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ia" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ie" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ih" = ( +/obj/structure/stone_tile/surrounding/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ii" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/carneburrito, +/obj/item/reagent_containers/food/drinks/soda_cans/starkist, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"im" = ( +/obj/machinery/computer/security/wooden_tv, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"io" = ( +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"is" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/rock/pile, +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"iv" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"iE" = ( +/obj/structure/closet/secure_closet/bar, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/clothing/under/rank/civilian/bartender/skirt, +/obj/item/clothing/accessory/waistcoat, +/obj/item/clothing/under/rank/civilian/bartender, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"iG" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"iH" = ( +/obj/machinery/gibber, +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer, +/area/awaymission/jungleresort) +"iL" = ( +/obj/structure/bed, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/bedsheet/syndie, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"iR" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"iU" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"iZ" = ( +/obj/item/storage/toolbox/artistic, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"jb" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jh" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jj" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"js" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jy" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jB" = ( +/obj/structure/flora/junglebush/large, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jF" = ( +/obj/structure/flora/tree/jungle, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jH" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jJ" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jL" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"jO" = ( +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"jQ" = ( +/obj/structure/flora/junglebush/c, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"kf" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"kn" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"kq" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/syndicate, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"kr" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"kw" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"kz" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"kB" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/fullupgrade, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"kI" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"kJ" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"kQ" = ( +/obj/machinery/processor, +/turf/open/floor/plasteel/freezer, +/area/awaymission/jungleresort) +"kW" = ( +/turf/closed/wall/rust, +/area/awaymission/jungleresort) +"le" = ( +/obj/structure/chair/sofa/corner, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"lf" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ll" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"lr" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"lB" = ( +/obj/structure/chair/sofa/right{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"lJ" = ( +/obj/structure/flora/junglebush/c, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"lS" = ( +/obj/structure/toilet/secret/low_loot{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"lV" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "ResortManagerDorm"; + name = "Resort Manager's Dorm" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"mg" = ( +/obj/machinery/door/airlock/engineering{ + name = "Resort Power" + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"mh" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"mk" = ( +/obj/structure/flora/junglebush/c, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ml" = ( +/obj/structure/table/wood, +/obj/item/toy/figure/captain, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"mt" = ( +/obj/structure/flora/junglebush, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"mu" = ( +/obj/machinery/door/window{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"my" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/lightreplacer, +/obj/item/storage/box/lights/mixed, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"mE" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"mY" = ( +/obj/structure/flora/rock, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"mZ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ne" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nm" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"no" = ( +/obj/item/chair, +/obj/item/reagent_containers/food/drinks/beer, +/obj/machinery/light/floor, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"np" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nq" = ( +/turf/open/floor/mineral/titanium/yellow, +/area/awaymission/jungleresort) +"nt" = ( +/obj/structure/flora/rock/jungle, +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nv" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nw" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nD" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nJ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"nU" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"od" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"og" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"oj" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"op" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"ot" = ( +/obj/structure/table/wood, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/toy/crayon/spraycan, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ow" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"oW" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/head/collectable/petehat/gang, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"oX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"oZ" = ( +/turf/closed/indestructible/riveted/boss, +/area/awaymission/jungleresort) +"pm" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"pn" = ( +/obj/structure/toilet/secret/low_loot, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"po" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"px" = ( +/obj/machinery/light, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"pC" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"pK" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/rock, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"pN" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"pP" = ( +/obj/structure/sign/warning, +/turf/closed/mineral/random/labormineral/jungle, +/area/awaymission/jungleresort) +"pQ" = ( +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"pT" = ( +/obj/structure/table, +/turf/open/floor/mineral/titanium/white, +/area/awaymission/jungleresort) +"pU" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"qa" = ( +/turf/open/floor/plating/rust, +/area/awaymission/jungleresort) +"qg" = ( +/turf/closed/wall/mineral/titanium, +/area/awaymission/jungleresort) +"qi" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/closet/crate/secure/loot, +/obj/item/clothing/head/collectable/beret, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"qr" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"qs" = ( +/obj/item/storage/toolbox/syndicate, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"qz" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"qC" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"qG" = ( +/obj/item/storage/toolbox/emergency, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"rd" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rg" = ( +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"rm" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"ro" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"rt" = ( +/obj/structure/chair/sofa/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"rv" = ( +/obj/item/statuebust, +/obj/structure/table/wood/fancy, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"rx" = ( +/obj/structure/flora/junglebush, +/obj/structure/flora/junglebush/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rF" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rH" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rP" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rQ" = ( +/obj/structure/flora/tree/jungle/small, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"rS" = ( +/obj/structure/table/wood, +/obj/item/toy/plush/beeplushie, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"rT" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"se" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"sh" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"sn" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"so" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"sq" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"st" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"sD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/baguette, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"sQ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"sR" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/flashlight/lamp, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"sS" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, +/obj/item/clothing/mask/cigarette/robustgold, +/obj/item/lighter, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"td" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ti" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"tn" = ( +/obj/structure/flora/rock/pile, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"tu" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"tx" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Bar Backroom" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"tC" = ( +/obj/structure/table/wood, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/toxin, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"tH" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"tK" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"tS" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "ResortCabin1"; + name = "Resort Cabin 1" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"tT" = ( +/obj/structure/stone_tile/slab, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"tZ" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uc" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ue" = ( +/obj/machinery/light, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uh" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"uj" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "ResortCabin3"; + name = "Resort Cabin 3" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"ur" = ( +/obj/structure/flora/tree/jungle, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"us" = ( +/obj/structure/flora/rock, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uu" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uv" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"ux" = ( +/obj/item/stack/sheet/animalhide/monkey, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"uy" = ( +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"uC" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uG" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"uO" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uS" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uT" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"uW" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uX" = ( +/obj/structure/flora/junglebush/large, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"uZ" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"vc" = ( +/obj/structure/flora/grass/jungle/b, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"vl" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"vq" = ( +/obj/structure/barricade/wooden, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"vs" = ( +/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "ResortCabin4"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/spawner/lootdrop/glowstick, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"vw" = ( +/obj/machinery/door/airlock/wood{ + name = "Abandoned Cabin" + }, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"vx" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"vy" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"vK" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"vN" = ( +/obj/structure/chair/wood{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"vZ" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Bar" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"wj" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wm" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wo" = ( +/obj/structure/table/wood/fancy, +/obj/item/storage/toolbox/gold_fake, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"wq" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"ws" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wv" = ( +/obj/structure/bed, +/obj/effect/spawner/lootdrop/bedsheet, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"ww" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/suit/hooded/wintercoat/captain, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"wF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wG" = ( +/obj/structure/flora/rock/jungle, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wH" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wJ" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"wS" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/cracked, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"wV" = ( +/obj/structure/chair/wood, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"wZ" = ( +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"xr" = ( +/obj/structure/table/wood, +/obj/structure/bedsheetbin/color, +/obj/item/toy/figure/assistant, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"xD" = ( +/obj/structure/flora/rock/pile, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"xH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"xL" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"xQ" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"xS" = ( +/obj/structure/chair/wood, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"xU" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"xV" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yb" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"yi" = ( +/obj/item/grown/log/tree, +/obj/item/lighter, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yr" = ( +/obj/structure/statue/sandstone/venus, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"yu" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yx" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yy" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yz" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Manager's Office" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"yC" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"yF" = ( +/obj/machinery/vending/cola/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"yJ" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"yK" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"yL" = ( +/obj/machinery/vending/snack/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"yM" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"yQ" = ( +/obj/effect/spawner/lootdrop/cig_packs, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"yS" = ( +/obj/machinery/door/window, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"yW" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/jungleresort) +"yX" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/salad/validsalad, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"yY" = ( +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium, +/area/awaymission/jungleresort) +"zl" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"zr" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zx" = ( +/obj/structure/flora/junglebush/b, +/obj/structure/flora/rock, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zA" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zC" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zH" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/awaymission/jungleresort) +"zI" = ( +/obj/structure/dresser, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"zK" = ( +/obj/structure/flora/rock/jungle, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zP" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"zV" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"zY" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Aa" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ag" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Office" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ah" = ( +/obj/structure/table/wood/poker, +/obj/item/dice/d6, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ak" = ( +/obj/structure/flora/junglebush/large, +/obj/structure/flora/rock/jungle, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"An" = ( +/obj/effect/spawner/lootdrop/bedsheet, +/obj/structure/bed, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ar" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Az" = ( +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"AC" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"AF" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"AR" = ( +/turf/closed/mineral/random/labormineral/jungle, +/area/awaymission/jungleresort) +"AS" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"AT" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"AU" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/flora/rock, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"AV" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"Bh" = ( +/obj/machinery/light/floor, +/obj/structure/easel, +/obj/item/canvas/nineteenXnineteen, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Bn" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Bp" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Bq" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Br" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"BB" = ( +/obj/machinery/door/window, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"BM" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"BP" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"BQ" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 4 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"BY" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer/fullupgrade, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"BZ" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Cc" = ( +/obj/item/mop, +/obj/structure/mopbucket, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Co" = ( +/obj/structure/chair/wood/wings, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ct" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Cu" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Cv" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/port_gen/pacman/super, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"CA" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"CC" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"CH" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"CK" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"CN" = ( +/obj/structure/flora/tree/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"CR" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"CT" = ( +/obj/item/storage/toolbox/greyscale, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"CV" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"CY" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Db" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 6 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Di" = ( +/obj/item/storage/toolbox/drone, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Dj" = ( +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Dr" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Du" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "ResortCabin4"; + name = "Resort Cabin 4" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Dz" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/junglebush/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"DF" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"DL" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"DO" = ( +/obj/structure/flora/tree/jungle/small, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"DS" = ( +/obj/structure/flora/junglebush/large, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"DU" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/burger/plain, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ei" = ( +/obj/structure/table/wood, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/item/paper/crumpled/awaymissions/jungleresort/notice, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"El" = ( +/obj/structure/flora/grass/jungle/b, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Eq" = ( +/obj/structure/frame/computer, +/obj/effect/decal/cleanable/glass, +/obj/item/shard, +/turf/open/floor/mineral/titanium/yellow, +/area/awaymission/jungleresort) +"Et" = ( +/obj/structure/toilet/secret/low_loot{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Eu" = ( +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/toy/plush/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ex" = ( +/obj/structure/table/wood/fancy, +/obj/item/candle/infinite, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"Ey" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"EA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"EL" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/camera, +/obj/item/camera_film, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"EO" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"EP" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Cafe" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"EQ" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"EV" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Fd" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Fl" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Fq" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Fr" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Fz" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"FL" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"FN" = ( +/obj/structure/flora/tree/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"FO" = ( +/obj/machinery/door/airlock/wood, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"FP" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"FQ" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"FR" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"FT" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"FV" = ( +/obj/machinery/door/airlock/freezer{ + name = "Freezer" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"FX" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Gd" = ( +/obj/structure/chair/pew{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Gk" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Gl" = ( +/obj/structure/sign/poster/random, +/turf/closed/wall/mineral/wood, +/area/awaymission/jungleresort) +"Gn" = ( +/obj/machinery/light, +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Gu" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Gv" = ( +/obj/structure/table/wood, +/obj/item/toy/figure/bartender, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Gz" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"GA" = ( +/obj/structure/flora/tree/jungle/small, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"GD" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"GN" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"GU" = ( +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ha" = ( +/obj/structure/table/wood, +/obj/item/dualsaber/toy, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Hg" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"Hk" = ( +/obj/structure/flora/grass/jungle, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Hm" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Hs" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Hw" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Arrivals" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Hy" = ( +/obj/structure/flora/rock/pile, +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"HC" = ( +/obj/structure/bonfire/dense, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"HD" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"HI" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "ResortCabin2"; + name = "Resort Cabin 2" + }, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"HQ" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ih" = ( +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Ii" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ij" = ( +/obj/structure/chair/pew/left{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Ir" = ( +/obj/effect/decal/cleanable/blood/gibs/human/down, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Iw" = ( +/obj/structure/table/wood, +/obj/effect/spawner/lootdrop/space_cash, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"IC" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"IF" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"IK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"IO" = ( +/obj/structure/barricade/wooden, +/obj/machinery/door/airlock/wood{ + id_tag = "ResortCabin5"; + name = "Resort Cabin 5" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"IR" = ( +/obj/structure/flora/junglebush/large, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"IW" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jb" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jc" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jd" = ( +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Jf" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jh" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jj" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Jo" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Jq" = ( +/obj/structure/table/wood, +/obj/machinery/microwave, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Jt" = ( +/obj/structure/chair/wood/wings{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Jv" = ( +/obj/structure/filingcabinet, +/obj/structure/window/reinforced, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"Jz" = ( +/obj/effect/decal/cleanable/blood/splats, +/obj/structure/stone_tile/surrounding/cracked{ + dir = 4 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"JF" = ( +/turf/open/floor/plasteel/dark, +/area/awaymission/jungleresort) +"JG" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/gibs/human/up, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"JK" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"JQ" = ( +/obj/item/toy/plush/carpplushie, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"JU" = ( +/obj/structure/stone_tile/slab/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"JZ" = ( +/obj/structure/flora/tree/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ka" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Kk" = ( +/obj/machinery/light/floor, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"Kl" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ko" = ( +/turf/closed/wall/r_wall, +/area/awaymission/jungleresort) +"Kr" = ( +/obj/structure/flora/junglebush/b, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Kw" = ( +/obj/structure/closet/secure_closet/freezer/kitchen, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"KC" = ( +/obj/machinery/telecomms/relay/preset/mining, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/circuit, +/area/awaymission/jungleresort) +"KJ" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"KM" = ( +/mob/living/carbon/monkey, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"KO" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"KR" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"KX" = ( +/obj/structure/flora/rock, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"KY" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"KZ" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"La" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Ll" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Lp" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/asteroid, +/area/awaymission/jungleresort) +"Lr" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Lt" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Lu" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Lv" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"Ly" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/stone_tile/surrounding/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"LE" = ( +/obj/structure/reagent_dispensers/keg/gargle, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"LK" = ( +/obj/structure/chair/pew/right{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"LL" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/smes{ + charge = 1.5e+006; + input_level = 30000; + inputting = 0; + output_level = 7000 + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"LR" = ( +/mob/living/simple_animal/hostile/jungle/leaper/boss, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"LU" = ( +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"LW" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Mc" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"Mf" = ( +/obj/structure/flora/junglebush/large, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Mh" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/applejack/empty, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Mp" = ( +/turf/closed/wall/mineral/wood, +/area/awaymission/jungleresort) +"Mx" = ( +/obj/structure/chair/sofa/right, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"MD" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"MF" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"MJ" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"MP" = ( +/turf/open/floor/plasteel/freezer, +/area/awaymission/jungleresort) +"MS" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"MW" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"MX" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"MY" = ( +/obj/structure/barricade/wooden, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"Nd" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Nf" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Ni" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Nn" = ( +/obj/machinery/power/apc/auto_name/west, +/obj/structure/cable, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Nx" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/butteredtoast, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"NF" = ( +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"NU" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"Oe" = ( +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ol" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Or" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ou" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"Oz" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"OA" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"OB" = ( +/obj/item/storage/book/bible, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"OU" = ( +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Pb" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Pc" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Pd" = ( +/obj/structure/flora/ausbushes/fullgrass, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Pg" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Pp" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Pu" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Pv" = ( +/obj/structure/flora/junglebush/large, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PB" = ( +/obj/structure/flora/junglebush, +/obj/structure/flora/grass/jungle/b, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PD" = ( +/obj/structure/flora/rock/jungle, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PL" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PM" = ( +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PN" = ( +/turf/open/floor/mineral/titanium, +/area/awaymission/jungleresort) +"PP" = ( +/obj/structure/flora/rock, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PS" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PT" = ( +/obj/structure/flora/rock/pile, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"PW" = ( +/obj/structure/chair/sofa/left{ + dir = 1 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"PY" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Qa" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Qc" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor/plasteel/freezer, +/area/awaymission/jungleresort) +"Qp" = ( +/turf/open/floor/plating/asteroid, +/area/awaymission/jungleresort) +"Qr" = ( +/obj/structure/chair/sofa{ + dir = 8 + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Qt" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"Qz" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding/cracked, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"QA" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"QB" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"QC" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"QE" = ( +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"QI" = ( +/obj/machinery/nuclearbomb/beer, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"QO" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"QX" = ( +/obj/structure/flora/junglebush, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Rd" = ( +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/storage/toolbox/electrical, +/obj/item/wrench, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/stack/sheet/mineral/uranium, +/obj/item/clothing/glasses/meson/engine, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Rm" = ( +/obj/structure/flora/tree/jungle/small, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Rn" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/item/folder, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"Ro" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Rp" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"RD" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"RI" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/peppermill, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"RP" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/item/clothing/suit/curator, +/obj/item/clothing/under/rank/civilian/curator/treasure_hunter, +/obj/item/clothing/head/fedora/curator, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/melee/chainofcommand/jungle, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"RW" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"RX" = ( +/obj/structure/flora/junglebush/c, +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Sc" = ( +/obj/structure/flora/rock, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Se" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Sh" = ( +/obj/structure/flora/junglebush/large, +/obj/structure/flora/junglebush/c, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Si" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/structure/stone_tile/surrounding/burnt, +/obj/effect/decal/remains/human, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Sk" = ( +/obj/machinery/door/airlock/wood{ + name = "Resort Kitchen" + }, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Ss" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"St" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"SD" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"SF" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"SL" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"SO" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/stone_tile/surrounding/cracked, +/obj/item/gun/ballistic/shotgun/sc_pump, +/obj/item/clothing/suit/armor/vest, +/obj/item/clothing/head/helmet, +/obj/item/ammo_casing/shotgun/buckshot, +/obj/item/ammo_casing/shotgun/buckshot, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"SV" = ( +/obj/machinery/vending/wardrobe/bar_wardrobe, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"SW" = ( +/obj/structure/flora/rock/jungle, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"SZ" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Ta" = ( +/obj/machinery/shower, +/obj/structure/curtain, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Tm" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/lootdrop/space_cash, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Tv" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Tw" = ( +/obj/structure/flora/tree/jungle, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Tx" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ty" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"TC" = ( +/obj/machinery/deepfryer, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"TD" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"TG" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"TI" = ( +/obj/structure/barricade/wooden, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"TM" = ( +/obj/structure/table/wood/fancy, +/obj/item/candle/infinite, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"TR" = ( +/obj/structure/table/wood, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"TT" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"TU" = ( +/obj/item/stack/sheet/mineral/wood, +/turf/open/floor/plating/asteroid, +/area/awaymission/jungleresort) +"TX" = ( +/obj/structure/table/wood, +/obj/machinery/button/door{ + id = "ResortCabin5"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/item/poster/random_contraband, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Uc" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ud" = ( +/obj/machinery/light/floor, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Ue" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Uo" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/innards, +/obj/structure/stone_tile/surrounding/cracked, +/obj/item/fireaxe, +/obj/item/clothing/head/hardhat/red, +/obj/item/clothing/shoes/workboots, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Us" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Uv" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"UB" = ( +/obj/structure/flora/junglebush, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"UH" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Vb" = ( +/obj/structure/chair/stool, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Ve" = ( +/obj/structure/table/wood, +/obj/machinery/door/window{ + dir = 8 + }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"Vg" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Vh" = ( +/obj/item/storage/toolbox/electrical, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/table/wood/fancy, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Vm" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"VI" = ( +/obj/machinery/door/airlock/wood{ + id_tag = "AbandonedCabinDorm"; + name = "Abandoned Cabin Dorm" + }, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"VJ" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"VK" = ( +/obj/structure/table/wood, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/stamp, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"VL" = ( +/obj/structure/rack, +/obj/item/storage/backpack/satchel/explorer, +/obj/item/gps/mining, +/obj/item/radio, +/obj/item/flashlight, +/obj/item/flashlight/flare, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"VP" = ( +/obj/structure/flora/junglebush/b, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"VU" = ( +/obj/structure/flora/rock/pile/largejungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Wa" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 10 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Wd" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Wh" = ( +/obj/structure/flora/junglebush/large, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Wi" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Wj" = ( +/obj/structure/flora/grass/jungle, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Wl" = ( +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Wo" = ( +/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/grass/jungle, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"WD" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/head/collectable/slime, +/turf/open/floor/plating/rust, +/area/awaymission/jungleresort) +"WE" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/obj/effect/turf_decal/weather/dirt{ + dir = 1 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"WQ" = ( +/obj/effect/decal/remains/human, +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"WU" = ( +/obj/structure/flora/ausbushes/stalkybush, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Xa" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Xd" = ( +/obj/structure/flora/grass/jungle, +/obj/machinery/light, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Xh" = ( +/obj/structure/flora/rock/jungle, +/obj/structure/flora/junglebush, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Xj" = ( +/turf/closed/wall, +/area/awaymission/jungleresort) +"Xm" = ( +/obj/structure/closet/crate/bin, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"Xo" = ( +/obj/structure/flora/junglebush/c, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"Xq" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/circuit, +/area/awaymission/jungleresort) +"Xs" = ( +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Xz" = ( +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"XB" = ( +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"XC" = ( +/obj/item/grown/log/tree, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"XK" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"XM" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/salad/jungle, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"XR" = ( +/obj/structure/flora/tree/jungle/small, +/obj/effect/turf_decal/weather/dirt{ + dir = 8 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"XV" = ( +/obj/machinery/shower{ + dir = 1 + }, +/obj/structure/curtain, +/turf/open/floor/wood, +/area/awaymission/jungleresort) +"XY" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/item/toy/figure/ian, +/turf/open/floor/carpet/blue, +/area/awaymission/jungleresort) +"XZ" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/power/port_gen/pacman/super, +/turf/open/floor/plating, +/area/awaymission/jungleresort) +"Yb" = ( +/obj/structure/bonfire/dense, +/obj/item/melee/roastingstick, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Yd" = ( +/obj/item/storage/box/marshmallow, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Ye" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/toy/figure/syndie, +/turf/open/floor/carpet/red, +/area/awaymission/jungleresort) +"Yf" = ( +/obj/structure/flora/junglebush/c, +/obj/effect/turf_decal/weather/dirt, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Yg" = ( +/obj/effect/decal/cleanable/blood/gibs/limb, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Yh" = ( +/obj/item/clothing/under/color/grey/glorf, +/obj/item/clothing/gloves/color/fyellow/old, +/obj/item/clothing/shoes/sneakers/black, +/obj/item/clothing/mask/gas, +/obj/item/clothing/head/soft/grey, +/obj/effect/decal/remains/human, +/turf/open/floor/carpet, +/area/awaymission/jungleresort) +"Ym" = ( +/obj/structure/flora/grass/jungle/b, +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"Yp" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/center, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Yt" = ( +/obj/structure/kitchenspike, +/turf/open/floor/plasteel/freezer, +/area/awaymission/jungleresort) +"YE" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/dirt{ + dir = 9 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YF" = ( +/obj/machinery/gateway/away, +/turf/open/floor/plating/dirt/dark/jungle, +/area/awaymission/jungleresort) +"YJ" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 4 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YK" = ( +/obj/machinery/light/floor, +/turf/open/water/jungle, +/area/awaymission/jungleresort) +"YM" = ( +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YP" = ( +/obj/structure/flora/rock/jungle, +/obj/effect/turf_decal/weather/dirt{ + dir = 5 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YQ" = ( +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YU" = ( +/obj/structure/flora/grass/jungle/b, +/obj/effect/turf_decal/weather/dirt{ + dir = 6 + }, +/turf/open/floor/grass, +/area/awaymission/jungleresort) +"YW" = ( +/obj/effect/decal/cleanable/blood/gibs/human/core, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 6 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"Zn" = ( +/obj/item/stack/sheet/mineral/wood, +/obj/effect/decal/cleanable/blood/gibs/human/core, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ZE" = ( +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ZH" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 9 + }, +/obj/structure/stone_tile/center/burnt, +/turf/open/floor/plating/dirt/jungle, +/area/awaymission/jungleresort) +"ZV" = ( +/obj/structure/flora/rock/pile, +/turf/open/floor/grass, +/area/awaymission/jungleresort) + +(1,1,1) = {" +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +"} +(2,1,1) = {" +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +"} +(3,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(4,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(5,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(6,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(7,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(8,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(9,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +oZ +AR +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(10,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +bv +Ue +tT +oZ +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(11,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +oZ +oZ +tT +RP +BQ +aL +tT +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(12,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +aL +JU +Gk +DF +SL +po +Jz +JU +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(13,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +tT +Si +rg +uG +dF +an +hX +ih +aL +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(14,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +aL +tT +po +VJ +LR +FR +Lt +tT +tT +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(15,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +Lr +JU +Yg +jO +Lv +hj +tT +Nf +aL +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +rd +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(16,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +oZ +Uo +ZE +ZH +Fl +aL +ez +SO +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +YQ +YQ +ZV +YQ +wH +AR +AR +AR +AR +AR +YQ +YQ +wH +rd +cn +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(17,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +oZ +tT +ap +YW +Db +Ly +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +cn +YQ +rF +Pg +YQ +rd +YQ +YQ +YQ +CN +YQ +YQ +kr +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(18,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +aL +fy +Dr +JU +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +YQ +YQ +vl +YQ +AF +YQ +vK +YQ +YQ +rd +aP +mY +YQ +ZV +Pg +AF +YQ +YQ +Pg +rd +ZV +vK +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +AF +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(19,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AC +GD +oZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +CN +rF +aP +YQ +YQ +CN +YQ +YQ +aP +CN +YQ +YQ +AF +YQ +YQ +YQ +MW +br +YQ +YQ +YQ +YQ +CN +YQ +cn +YQ +YQ +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +rd +YQ +YQ +YQ +CN +YQ +kr +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(20,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +iv +Qz +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +Wl +YQ +YQ +YQ +Pg +ZV +YQ +cV +Pg +YQ +YQ +YM +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +YQ +MW +aP +YQ +YQ +YQ +AF +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +wH +YQ +rd +YQ +YQ +YM +YQ +YQ +YQ +rd +ZV +YQ +rd +MW +Pg +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(21,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +wS +SZ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +AF +YQ +YQ +YQ +CN +rd +AF +YQ +YQ +YQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Wl +cn +YQ +YQ +YM +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +Pg +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +wH +YQ +AF +ZV +cn +YQ +YQ +YQ +CN +YQ +AF +aP +ZV +rF +Pv +wH +YQ +YQ +YQ +CN +YQ +aP +Wl +YQ +rd +YQ +AF +YQ +YQ +YQ +Pg +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(22,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +yJ +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +wH +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +Wl +Pg +AF +YQ +YQ +YQ +CN +YQ +aP +YQ +YQ +Pg +Wl +YQ +YQ +ZV +aP +vK +VU +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +vK +wH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +rd +MW +aP +YM +YQ +XK +YQ +rd +MW +YQ +YQ +Pg +YQ +YQ +YQ +CN +YQ +cn +YQ +YQ +YQ +YQ +vK +YQ +mY +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +ZV +cn +YQ +YQ +vK +AF +ZV +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(23,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +Yp +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YM +cn +YQ +YQ +YM +aG +YQ +YQ +MW +rF +YQ +YQ +YQ +aP +rd +cn +YQ +YQ +wH +YQ +rd +YQ +YQ +YQ +CN +YQ +YQ +rd +YQ +YQ +YQ +YQ +rd +YQ +MW +YQ +YQ +ZV +ZV +YQ +YM +AF +YQ +aP +YQ +AR +AR +AR +AR +AR +AR +AR +rd +Pg +cn +YQ +YQ +YM +YQ +YQ +YQ +YQ +YQ +CN +YQ +Pg +ZV +rd +kr +YQ +YQ +rd +Pg +YQ +YQ +KJ +Pg +Xh +YQ +YQ +CN +AF +YQ +YQ +YQ +wH +YQ +YQ +YQ +YQ +rd +YQ +aP +YQ +Pg +YQ +YQ +cn +YQ +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(24,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +TD +oZ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +aP +Wl +rd +aP +Pg +YQ +YQ +Wl +YQ +rd +YQ +rd +YQ +YQ +YQ +YQ +YM +KM +Pg +ZV +AF +YQ +YQ +rd +YQ +YQ +YM +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +CN +Wl +rd +wH +YQ +MW +YQ +YQ +YQ +YM +ZV +cn +rd +aP +YQ +wH +AF +YQ +YQ +kr +aP +YQ +YQ +Wl +wH +YQ +YQ +YQ +YQ +YQ +CN +ar +YQ +cn +wH +YQ +YQ +YQ +AF +YQ +YQ +rd +YQ +YQ +Dz +ZV +YQ +rd +YQ +cn +Wl +Pg +YQ +kr +YQ +YQ +wH +YQ +YQ +YQ +YQ +CN +YQ +wH +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(25,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +aL +Xs +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +YQ +YQ +YQ +CN +kr +YQ +YQ +YQ +CN +YQ +YQ +KJ +YQ +YQ +YQ +CN +Pg +aP +YQ +YQ +CN +rd +kr +vK +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Pg +rd +aP +YQ +kr +YQ +cn +aP +YQ +YQ +YQ +CN +Pg +YQ +YQ +YQ +YQ +Wl +YQ +kr +cn +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +YQ +MW +YQ +MW +rd +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +vK +YQ +cn +YQ +YQ +YQ +CN +YQ +YQ +YM +MW +YQ +YQ +YQ +CN +rd +YQ +Wl +YQ +rd +Wl +aP +kr +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(26,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +oZ +tH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +ZV +YQ +YQ +YQ +YQ +YQ +cn +YQ +YQ +YQ +YQ +YQ +YQ +YQ +rd +YQ +YQ +YQ +YQ +YQ +cn +YQ +YQ +YQ +CN +cn +aP +wH +YQ +YQ +YQ +wH +YQ +AF +Pg +YQ +YQ +YQ +YQ +YQ +rd +rd +Wl +YQ +YQ +YQ +CN +YQ +YQ +vK +YQ +YQ +YQ +YQ +ZV +Wl +Pg +VU +YQ +kr +rd +YQ +wH +YQ +vK +YQ +YQ +YQ +MW +YQ +MW +YQ +rF +Dz +YQ +YQ +Wl +YQ +YQ +YM +YQ +YQ +YQ +rd +YQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +ZV +YQ +YQ +YQ +YQ +YQ +AF +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(27,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +ak +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +MW +YQ +YQ +YM +cn +rF +YQ +YQ +YQ +CN +Wl +kr +rd +YQ +AF +YQ +Wl +rd +MW +Pg +aP +YQ +YQ +YQ +YQ +kr +mY +YQ +YQ +YQ +CN +YQ +YQ +YM +YQ +Wl +YQ +CN +YQ +kr +cn +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Fz +Wl +YQ +YQ +YQ +CN +rd +YQ +YQ +aP +YQ +YQ +YQ +YQ +CN +YQ +AF +YQ +rd +Wl +YQ +AF +Pg +Wl +YQ +YQ +rd +YQ +aP +YQ +YQ +pN +YQ +Wl +aP +YQ +YQ +YQ +CN +YQ +AF +YQ +YQ +YM +kr +aP +YQ +YQ +CN +mY +Pg +aP +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(28,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +rd +AF +YQ +YQ +wH +Wl +YQ +wH +YQ +ZV +Pg +vK +YQ +MW +YQ +CN +YQ +YQ +YQ +YM +YQ +AF +YQ +aP +Pg +YQ +YQ +YQ +YQ +YQ +vK +YQ +YQ +YQ +YQ +YQ +YQ +aP +rd +YQ +YQ +YQ +CN +MW +YQ +kr +YQ +Wl +wH +YQ +YQ +YQ +YQ +YQ +rd +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +wH +YQ +YQ +YQ +YQ +aP +rd +Wl +YQ +Wl +rF +Pg +wH +YQ +YQ +vK +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(29,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Wl +vK +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +Pg +PB +YQ +cn +YQ +YQ +YQ +YQ +wH +Pg +cn +YQ +YQ +YQ +YQ +CN +YQ +rd +MW +YQ +YQ +CN +YQ +Wl +kr +YQ +YQ +YQ +CN +ZV +YQ +YM +YQ +YQ +wH +Pg +vK +YQ +YQ +AF +Wl +rd +YQ +YQ +YQ +CN +AF +cn +YQ +YQ +YQ +YQ +YQ +ZV +YQ +YM +Wl +YQ +YQ +rd +kr +YQ +YQ +AF +ZV +YQ +MW +YQ +MW +cn +rd +YQ +YQ +YQ +rd +YQ +YQ +YM +rd +AF +YQ +YQ +mY +YQ +cn +YQ +AF +YQ +VU +rd +cn +YQ +YQ +Wl +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(30,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +AT +io +JG +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +kr +YQ +YQ +YQ +aP +YQ +cn +YQ +aP +YQ +YM +YQ +YQ +YQ +CN +aP +YQ +rd +YQ +Wl +YQ +kr +YQ +YQ +YQ +Wl +YQ +YM +YQ +YQ +YQ +YQ +AF +YQ +aP +YQ +YQ +YQ +rd +Pg +YQ +YQ +YQ +AF +YQ +aP +YQ +YQ +YQ +CN +ZV +aP +YQ +YQ +cn +YQ +YQ +MW +CN +AF +Wl +YQ +YQ +CN +YQ +rd +YQ +YQ +AF +wH +YQ +aP +YQ +cn +YQ +YQ +YQ +CN +Pg +np +YQ +wH +rd +kr +YQ +AF +YQ +vK +YQ +kr +YQ +YQ +YQ +CN +vK +YQ +YQ +YQ +CN +YQ +MW +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(31,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +VJ +FR +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +cn +YQ +YQ +YQ +CN +Pg +rd +YQ +rd +Wl +YQ +kr +YQ +Wl +cn +wH +YQ +YQ +YM +Wl +YQ +YQ +rd +YQ +YQ +YM +Pg +cn +YQ +Wl +YQ +YQ +YQ +YQ +CN +YQ +cn +YQ +AF +YQ +MW +YQ +YQ +YQ +CN +YQ +kr +YQ +YQ +YQ +YQ +YQ +YM +Wl +YQ +rd +AF +YQ +YQ +YQ +YQ +rd +YQ +YQ +wH +aP +YQ +YQ +YQ +CN +vK +rd +YQ +YM +Pg +YQ +YQ +YQ +rd +YQ +YQ +YQ +YQ +CN +ZV +YQ +YQ +YQ +CN +rd +cn +wH +YQ +YQ +wH +rd +aP +YQ +rd +YQ +ZV +YQ +YQ +YQ +aP +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(32,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +io +Qa +io +FL +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rF +YQ +aP +Wl +rd +YQ +YQ +YM +AF +YQ +YQ +rd +YQ +AF +YQ +mY +mY +YQ +Pg +YQ +YQ +YQ +CN +YQ +aP +YQ +YQ +YQ +AF +YQ +kr +ZV +YQ +Pg +YQ +AF +YQ +YQ +YQ +CN +wH +YQ +YQ +YQ +YQ +cn +YQ +YQ +cn +rd +MW +YQ +YQ +YQ +YQ +YM +aP +ZV +YQ +YQ +YQ +CN +Pg +AF +rd +mY +YQ +YQ +YQ +rd +Wl +ZV +AF +YQ +rd +rd +YQ +Wl +Ka +kr +YQ +YQ +AF +cn +Wl +YQ +YQ +YQ +Pg +YQ +Wl +YQ +YQ +Hy +kr +YQ +YQ +YQ +YQ +AF +YQ +YQ +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(33,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +sq +io +io +LU +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +np +YQ +ZV +YQ +YQ +wH +YQ +YQ +YQ +CN +MW +aP +YQ +YQ +CN +rd +AF +YQ +YQ +ZV +YQ +cn +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +rd +YQ +Wl +rd +YQ +YQ +KM +YQ +aP +rd +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +YQ +wH +rd +Wl +YQ +YQ +rd +YQ +kr +YQ +YQ +Pg +YQ +YQ +YM +YQ +YQ +kr +YQ +YQ +YQ +CN +Ey +du +uO +YQ +mY +YQ +rd +YQ +Pg +cn +MW +YQ +YQ +aP +CN +YQ +YM +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +pU +PT +Fd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(34,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Zn +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +Mp +Mp +Mp +Mp +Mp +Mp +Mp +Mp +YQ +YQ +rd +YQ +YQ +YQ +CN +AF +YQ +MW +YQ +Wl +ZV +cn +YQ +Wl +YQ +YQ +rd +YQ +YQ +YQ +mY +YQ +kr +YQ +YQ +vK +YQ +YQ +YQ +CN +Pg +AF +YQ +YQ +CN +MW +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +MW +YQ +YQ +Lu +io +du +io +jy +YQ +MW +YQ +CN +AF +aP +YQ +YQ +YQ +YQ +YQ +YQ +rd +Pg +Wl +YQ +YQ +YQ +rd +IR +FX +du +Ou +cA +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(35,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +st +st +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +wH +YQ +YQ +YQ +VU +aP +Pg +cn +rd +YQ +rd +Pg +ZV +kr +aP +Mp +BP +Xz +eD +Mp +gK +Eu +Mp +aP +YQ +Wl +YQ +YQ +YQ +YQ +YQ +cn +YQ +YQ +YM +Pg +YQ +YQ +YQ +CN +YQ +YQ +YQ +Wl +aP +YQ +AF +Pg +cn +YQ +AF +YQ +YQ +YQ +wH +YQ +YQ +Wo +YQ +AF +YQ +YQ +YQ +YQ +wH +AF +YQ +YQ +YQ +YQ +YQ +YQ +hw +du +io +JQ +du +du +DL +YQ +YQ +YQ +rd +YQ +vK +AF +YQ +kr +ZV +cn +YQ +AF +YQ +cn +rd +YQ +mE +du +Xa +La +uG +QA +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(36,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +st +Ir +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +rd +MW +YQ +Pg +kr +YQ +YQ +rd +kr +YQ +YQ +YQ +Tw +YQ +AF +YQ +Mp +iL +Xz +Xz +VI +Jd +Jd +Mp +YQ +kr +YQ +AF +rd +kr +YQ +YQ +YQ +CN +YQ +YQ +AF +YQ +YQ +YQ +YQ +YQ +YQ +CN +ZV +YQ +wH +vK +Wl +YQ +Wl +YQ +CN +YQ +np +AF +rF +MW +YQ +cn +YQ +YQ +YQ +YM +cn +Xj +Xj +Xj +Xj +Xj +Xj +Xj +YQ +CN +js +du +Lv +io +KO +cn +wH +YQ +YM +YQ +YQ +YQ +CN +aP +Wl +YQ +YQ +aP +CN +vK +MW +Ka +XB +io +FN +uG +QA +pQ +pQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(37,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +LU +st +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +ZV +YQ +YQ +YQ +CN +YQ +cn +YQ +YQ +YQ +YQ +rd +Mp +Xz +Xz +Ye +Mp +Jd +Jd +Mp +cJ +Ka +YQ +Ka +CN +Wl +YQ +YQ +kr +YQ +YQ +YQ +YQ +CN +vK +cn +Wl +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +ZV +YQ +YQ +YQ +CN +YQ +kr +rd +YQ +YQ +YQ +CN +YQ +YQ +Xj +my +Nn +BM +Ih +CA +Xj +YQ +FT +du +io +du +io +se +YQ +YQ +YQ +Pg +YQ +YQ +wH +YQ +wH +cn +YQ +YQ +YQ +Pg +wH +XB +du +io +du +uG +pQ +pQ +AV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(38,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +AT +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +cn +rd +Wl +YQ +YQ +vK +YQ +AF +aP +rd +cn +YQ +YQ +CN +Mp +xQ +Gl +Mp +Mp +Jd +ux +vw +io +io +Fr +io +DL +Ka +AF +YQ +aP +cn +YQ +YQ +YQ +Wl +YQ +YQ +YM +YQ +YQ +YQ +CN +YQ +rF +cn +YQ +YQ +YQ +CN +rd +YQ +YQ +YQ +YQ +CN +Wl +YQ +YQ +YQ +YQ +Wl +rd +Xj +LL +Pc +Ih +Ih +Xq +Xj +YQ +YQ +uS +du +io +jh +YQ +YQ +YQ +CN +Wl +YQ +AF +Pg +rd +YQ +YQ +YQ +YM +AF +Ka +XB +io +bp +uG +QA +pQ +pQ +EA +bp +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(39,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +uG +pQ +dF +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +aP +YQ +YM +Pg +kr +YQ +YQ +YM +aP +YQ +YQ +Pg +Mp +Et +Mp +Jq +CH +Jd +Jd +Mp +zC +sQ +YQ +LW +Uv +io +DL +YM +Pg +YQ +Wl +YQ +rF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +kr +YQ +wH +rd +YQ +YQ +YQ +YQ +rF +Wl +YQ +YQ +YQ +Pg +YQ +YM +kr +YQ +Pg +YQ +rF +Xj +XZ +yb +Ih +Ih +KC +Xj +YQ +YQ +CN +eC +Uc +rd +YQ +YQ +YQ +MW +YQ +aP +YM +YQ +YQ +YQ +CN +YQ +Pg +mE +du +io +Pp +uG +pQ +pQ +AV +EA +kJ +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(40,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +uG +pQ +pQ +pQ +dF +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +rd +vK +YQ +Mp +Mp +Gl +TR +Dj +Dj +Jd +Mp +YQ +YQ +YQ +CN +Pg +wm +ZV +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +Wl +YQ +YQ +CN +YQ +YQ +YM +MW +YQ +wH +rd +AF +YQ +YQ +vK +YQ +YQ +YQ +CN +ZV +Xj +Cv +Ih +Ih +Ih +ef +Xj +YQ +YQ +YQ +YQ +YQ +CN +YQ +Wl +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Fd +TG +io +cX +uG +QA +pQ +pQ +EA +FQ +go +NF +jH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(41,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +uh +pQ +pQ +pQ +Hg +ll +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +AF +wH +YQ +YQ +Wl +hv +wH +vl +YQ +YQ +CN +MW +rd +Mp +Ct +Jd +Jd +Dj +Dj +Jd +IK +YQ +YQ +YQ +YQ +MW +YQ +YQ +YQ +Wl +YQ +mY +AF +cn +YQ +ZV +Wl +YQ +YQ +rd +Pg +AF +YQ +VU +YQ +YQ +YQ +rd +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +Wl +YQ +YQ +YQ +rd +Xj +Rd +Ih +Ih +Ih +Cc +Xj +Pg +YQ +YQ +YQ +kr +YQ +wH +Pg +YQ +YQ +YQ +CN +cn +wH +Wl +PT +zY +Xa +Ou +SW +uG +pQ +pQ +AV +EA +io +io +zP +fX +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(42,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +uG +pQ +pQ +pQ +pQ +Hg +WQ +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +rd +Pg +YQ +YQ +KM +YQ +Pg +YQ +YQ +YQ +ZV +cn +YQ +Mp +rS +Jd +PW +Dj +Dj +Jd +IK +wH +YQ +rd +kr +Wl +YQ +YQ +Tw +rd +wH +YQ +YQ +MW +kr +Pg +YQ +YQ +wH +vK +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +Wl +YQ +YQ +rd +KM +YQ +YQ +YQ +YQ +ZV +YQ +YQ +YM +YQ +Xj +Xj +Xj +mg +Xj +Xj +Xj +YQ +wH +Wl +YQ +YQ +YQ +YQ +YM +wH +YQ +YQ +YQ +YQ +Ka +FX +iG +du +Rp +uG +QA +pQ +pQ +EA +kJ +du +io +Jh +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(43,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +uh +pQ +pQ +pQ +pQ +pQ +dF +ak +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Fz +mY +aP +MW +cn +rd +YQ +YM +rF +AF +YQ +YQ +wH +Mp +im +Jd +lB +Dj +Dj +aA +Mp +YQ +YQ +YM +rd +AF +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +CN +kr +YQ +YQ +rF +YQ +YQ +YQ +YQ +YQ +Pg +is +YQ +cn +YQ +YM +kr +YQ +YQ +YQ +CN +YQ +YQ +Wl +rF +YQ +Kr +du +bw +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +cn +AF +vK +kr +YQ +Ka +io +bp +NU +uG +QA +pQ +pQ +AV +EA +io +io +zP +Gz +YQ +kr +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(44,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +uh +pQ +pQ +pQ +pQ +pQ +Hg +io +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +ZV +YQ +YQ +rd +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YM +Mp +Ct +Jd +Jd +Jd +Jd +Ha +Mp +vK +YQ +YQ +YQ +vK +rd +YQ +YM +Wl +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +Wl +YQ +AF +YQ +YQ +YQ +YM +rd +kr +YQ +YQ +YQ +CN +Pg +rd +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +rQ +du +DL +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +rF +MW +YQ +Wl +rT +XB +io +du +uG +QA +pQ +pQ +AV +EA +bp +du +io +RD +YQ +YQ +wH +aP +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(45,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +VJ +pQ +pQ +pQ +pQ +pQ +pQ +dF +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YM +YQ +YQ +YQ +CN +aP +YQ +YQ +YQ +CN +vK +YQ +aP +Mp +Mp +Mp +IK +IK +Mp +Mp +Mp +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +Pg +rF +kr +YQ +YQ +YQ +AF +rF +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +rF +wH +YQ +YQ +YQ +YQ +YQ +YQ +rF +YQ +YQ +YQ +CN +YQ +MW +YQ +YQ +YQ +YQ +OU +du +DL +YQ +CN +wH +Wl +YQ +YM +Pg +Wl +YQ +YQ +Ka +EQ +du +cw +Rp +uG +pQ +pQ +AV +EA +io +du +NF +ie +Pb +vK +rd +YQ +YQ +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(46,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +VJ +pQ +pQ +pQ +pQ +AV +AV +AS +dF +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rF +rd +YQ +YQ +YQ +vK +rd +YQ +YQ +YQ +Pg +YQ +cn +YQ +kr +YQ +rd +YQ +Pg +ZV +YQ +kr +aP +cn +YQ +Wl +rd +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YM +Wl +rd +YQ +YQ +YQ +Pg +YQ +Ka +Ka +Ka +cJ +Ka +Ka +YQ +CN +wH +YQ +YQ +YQ +CN +YQ +rd +YQ +cn +wH +YQ +YQ +YQ +CN +Uv +io +DL +YQ +MW +YQ +YQ +rF +YQ +YQ +YQ +Ka +XB +du +du +Az +uG +QA +pQ +AV +EA +du +mh +cH +RD +LW +YQ +YQ +wH +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(47,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +uh +pQ +pQ +EA +io +io +io +VJ +dF +io +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Pg +cn +AF +vK +ZV +YQ +YQ +rd +AF +YQ +YM +wH +YQ +YQ +MW +YQ +YM +AF +YQ +YQ +YQ +YQ +AF +kr +Pg +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +vK +kr +YQ +YQ +YM +zY +iG +io +du +io +bp +io +xH +Ka +Rm +Wl +YQ +YQ +YQ +Wl +ZV +Wl +Pg +YQ +rd +YQ +YQ +og +OU +du +zA +Pg +YQ +YQ +YQ +CN +YQ +Ka +XB +FN +du +mh +uG +QA +pQ +AV +EA +rm +io +io +yu +JZ +YQ +kr +YQ +YQ +YQ +CN +cn +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(48,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +VJ +AV +EA +io +io +AR +AR +io +VJ +dF +od +io +AR +AR +AR +AR +AR +AR +AR +AR +YQ +CN +rd +Wl +YQ +YQ +Fz +wH +YQ +YQ +YQ +VU +aP +YQ +YQ +CN +Pg +YQ +YQ +YQ +YQ +CN +YQ +YM +wH +YQ +YQ +YM +Wl +YQ +YQ +cn +YQ +YQ +YQ +YQ +CN +YQ +YQ +Ka +XB +Ss +cH +uG +QA +QA +dF +Rp +du +io +kJ +lf +YJ +Ka +Ka +YM +YQ +YQ +YQ +CN +YQ +YQ +Xd +Ko +zK +io +io +Mf +YQ +YQ +YQ +Ka +XB +io +du +go +uG +QA +pQ +pQ +EA +kJ +io +Xa +jH +sQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +wH +Wl +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(49,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +io +io +io +AR +AR +AR +AR +io +JK +GN +QA +dF +io +AR +AR +AR +AR +AR +AR +YQ +YQ +wH +YQ +YQ +Pg +YQ +YQ +YQ +YQ +CN +ZV +YQ +YQ +YQ +rd +vK +cn +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +AF +YQ +rd +wH +YQ +YQ +wH +mY +YQ +XB +io +FN +so +uG +pQ +pQ +pQ +pQ +QA +QA +dF +bp +so +mh +io +io +xH +Ka +Ka +Ka +YQ +YQ +YQ +CN +WU +zY +io +io +DL +CN +Ka +XB +Br +io +SW +uG +QA +pQ +pQ +AV +EA +io +io +zP +fX +YQ +YQ +YQ +rd +YQ +YQ +YQ +CN +kr +vK +aP +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(50,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +VJ +pQ +QA +dF +io +AR +AR +AR +AR +AR +YQ +YM +aP +Pv +rd +cn +YQ +YQ +YQ +rd +kr +vl +rd +YQ +AF +wH +YQ +YQ +YM +rd +aP +YQ +AF +Pg +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +ZV +cJ +Ka +rT +XB +io +FQ +uG +QA +pQ +pQ +AV +AV +AV +pQ +pQ +pQ +QA +QA +QA +dF +io +FN +cA +go +ro +Jc +Ka +Ka +Ka +OU +du +io +io +DL +mE +Xo +du +Rp +uG +QA +pQ +pQ +AV +EA +FQ +du +io +yu +kr +rF +YQ +YQ +YQ +CN +YQ +YQ +YQ +rd +MW +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(51,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +uh +pQ +pQ +QA +dF +io +io +AR +AR +YQ +PT +Fd +Ka +YQ +YQ +AF +cn +cn +rd +mY +MW +YQ +YQ +YQ +CN +rd +YQ +ZV +YQ +rd +YQ +CN +YQ +YQ +YQ +YQ +ZV +YQ +cn +YQ +Jf +mE +io +io +du +FN +du +uG +pQ +pQ +pQ +EA +ro +Ou +Az +VJ +AV +AV +AV +AV +pQ +pQ +QA +QA +QA +dF +FQ +TT +io +io +io +Jb +du +du +io +GA +cH +TT +uG +QA +pQ +pQ +pQ +EA +cw +kJ +cH +Jh +zC +YQ +YQ +YQ +Pg +YQ +YQ +aP +Wl +YQ +YQ +YQ +YQ +YQ +YQ +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(52,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +pQ +AV +QA +QA +AR +AR +pP +KZ +io +io +xH +aI +YQ +YQ +Wo +YQ +qC +YQ +YQ +YQ +YQ +rF +YQ +YQ +YQ +CN +YQ +Wl +YQ +YQ +YQ +Tw +kr +rT +Ka +Ka +YU +Xa +UB +du +uG +QA +QA +QA +pQ +pQ +EA +io +bp +Pp +sh +ro +io +du +FN +TT +Rp +VJ +AV +pQ +pQ +pQ +pQ +QA +QA +QA +dF +du +NF +Jd +Jd +Jd +Az +NU +uG +pQ +pQ +pQ +AV +EA +io +io +yu +JZ +MW +YQ +YQ +YQ +CN +wH +AF +vK +rd +mY +YQ +YQ +YQ +CN +YQ +YQ +wH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(53,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +VJ +AV +pQ +pQ +MY +QA +dF +du +Rp +Xa +xH +Ka +rT +YQ +YQ +YQ +CN +rd +Wl +kr +YQ +YQ +YQ +Pg +wH +YQ +YQ +YQ +Ka +Ka +XB +du +io +du +bp +mh +uG +QA +pQ +pQ +AV +AV +AV +EA +io +io +yu +sQ +CN +sQ +wm +sQ +sQ +Jo +io +Br +du +VJ +AV +AV +AV +pQ +pQ +pQ +pQ +QA +QA +Jd +Jd +Jd +QA +QA +pQ +pQ +AV +EA +io +Br +du +yu +YQ +rF +YQ +YQ +YQ +YQ +cn +AF +YQ +YQ +YQ +cn +MW +YQ +aP +YQ +Wl +cn +YQ +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(54,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +io +uh +MY +pQ +pQ +pQ +QA +dF +io +du +io +FN +YP +uW +Ka +YQ +cn +YQ +AF +YQ +wH +cn +rd +MW +YQ +YM +XB +io +du +bp +Rp +uG +QA +QA +QA +pQ +AV +AV +EA +Rp +Pp +du +Xo +Az +yu +YQ +YQ +YQ +kr +AF +YQ +YQ +YQ +JZ +nw +io +io +du +bp +io +VJ +AV +AV +AV +pQ +pQ +Jd +Jd +Jd +pQ +pQ +pQ +EA +io +io +FN +Jh +Pb +ZV +cn +YQ +YQ +YM +rF +Wl +VU +rd +YQ +YQ +YQ +CN +YQ +rd +AF +ZV +Pg +kr +rd +rF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(55,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +pP +pQ +AV +AV +pQ +QA +hN +dF +du +kJ +KZ +io +xH +Ka +aI +Ka +Ka +YQ +CN +YQ +ab +Ka +mE +du +io +uG +QA +QA +pQ +pQ +pQ +pQ +EA +KZ +kJ +Ou +NU +yu +sQ +sQ +JZ +Wl +cn +MW +YQ +YQ +CN +cn +YQ +YQ +AF +wH +sQ +sQ +sQ +uS +io +io +io +FN +FQ +zV +AV +Jd +Jd +Jd +AV +AV +EA +kJ +du +yu +fX +YQ +YQ +YQ +CN +YQ +YQ +kr +YQ +YQ +wH +YQ +YQ +YQ +YQ +wH +YQ +YQ +YQ +YM +YQ +aP +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(56,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +Xj +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +mh +aB +VJ +pQ +pQ +pQ +QA +QA +dF +io +du +du +Ss +mh +io +xH +Ka +Cu +io +FN +aB +Az +uG +pQ +pQ +pQ +AV +AV +EA +du +Br +io +yu +YQ +JZ +YQ +YQ +Pg +vK +kr +YQ +YQ +YQ +YQ +ZV +Pg +YQ +YQ +YM +YQ +YQ +YQ +CN +ZV +sQ +sQ +sQ +DS +px +Ko +yC +Jd +Jd +Jd +nU +FQ +cH +Az +PP +cn +rF +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +rd +CN +rF +Wl +AF +YQ +YQ +YQ +CN +YQ +aP +YQ +YQ +YQ +cn +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(57,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +JF +Ex +JF +Xj +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +io +cw +VJ +AV +pQ +pQ +pQ +pQ +QA +QA +QA +QA +dF +NF +Mc +du +io +FQ +uG +QA +QA +pQ +pQ +pQ +EA +mh +Ou +io +io +PY +wm +RX +YQ +wH +MW +Wl +AF +ZV +YQ +YQ +Vm +CN +MW +Wl +YQ +YQ +CN +YQ +cn +YQ +Pg +rF +YQ +YM +cn +Wl +YQ +Pb +tn +PS +du +io +xH +sQ +JZ +sQ +sQ +YQ +CN +YQ +kr +cn +AF +YQ +YQ +YQ +YQ +YQ +YQ +cn +YQ +YQ +YQ +YQ +YQ +YQ +aP +vK +rd +cn +Pg +kr +wH +Wl +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(58,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +qG +Di +JF +Ij +JF +Ex +JF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Jo +io +bp +mh +VJ +AV +AV +AV +AV +pQ +pQ +pQ +pQ +QA +QA +QA +QA +QA +pQ +pQ +pQ +AV +EA +io +io +FN +yu +sQ +sQ +CN +YQ +wJ +Wl +kr +YQ +YQ +YQ +CN +YQ +Oe +Ko +wj +YQ +YQ +YQ +YQ +rF +MW +YQ +YQ +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +OU +io +io +du +BZ +rF +Wl +YQ +YQ +YQ +YQ +YQ +CN +rF +MW +YQ +cn +YQ +YQ +YM +Pg +Wl +YQ +YQ +YQ +CN +YQ +kr +YQ +YQ +MW +YQ +YQ +YQ +YQ +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(59,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +CT +JF +JF +JF +Gd +Dj +Ij +JF +Ex +Xj +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +sQ +nw +ro +UB +Pp +TT +FQ +io +VJ +AV +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +AV +EA +FQ +Ss +io +PM +sQ +YQ +YQ +rF +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +wH +YQ +YM +nJ +YQ +YQ +YQ +CN +kr +wH +YQ +YQ +YQ +Ii +YQ +YQ +YQ +YQ +YQ +rF +YQ +YQ +Pg +Jo +du +io +kI +rd +YQ +kr +rF +YQ +YQ +wH +YQ +YQ +YQ +YQ +CN +rF +YQ +YQ +rd +YQ +YQ +YQ +YQ +YQ +YQ +YQ +cn +YQ +YQ +CN +YQ +YQ +YQ +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(60,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Ex +JF +JF +Dj +Dj +LK +Dj +LK +Dj +Ij +JF +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +wH +sQ +sQ +Wh +fX +Ni +io +Br +du +VJ +AV +AV +AV +AV +AV +AV +EA +io +io +io +zP +lr +MW +YQ +YQ +YQ +CN +YQ +YQ +vK +vK +YQ +YM +rF +AF +Pg +YQ +YQ +Wl +YQ +YQ +YQ +YQ +YQ +YQ +YQ +og +YQ +vK +AF +wH +YQ +YQ +YQ +CN +YQ +Wl +YQ +XB +du +yu +YQ +YQ +YQ +CN +YQ +YQ +YM +rd +Wl +YQ +YQ +YQ +YQ +rd +YQ +YQ +YQ +CN +rd +rF +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +AF +YQ +wH +YQ +rF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(61,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +cT +JF +Dj +Dj +Dj +Dj +TM +Dj +TM +Dj +LK +JF +op +AR +Xj +AR +AR +AR +AR +Qp +Qp +TU +Lp +AR +AR +AR +vq +Ka +Ka +aI +PT +Gz +Jo +NF +Pp +du +Az +io +SW +io +FN +Ss +cH +yu +us +Pg +kf +vK +rF +YQ +Wl +YQ +YQ +YQ +td +Wl +YQ +YQ +ZV +MW +YQ +YQ +YQ +YQ +AF +rd +YQ +YQ +vK +YQ +Xd +Ko +RW +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +OU +du +io +DL +CN +YQ +wH +Pg +AF +YQ +ZV +vK +YQ +YQ +pN +YQ +YQ +YM +Wl +YQ +YQ +YQ +YQ +cn +rd +YQ +Wl +jL +kr +YQ +YQ +Wl +ZV +YQ +MW +KM +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(62,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +yr +Dj +Yh +gN +Dj +Dj +Dj +Dj +Dj +Dj +Dj +Dj +JF +JF +Qp +JF +Qp +Qp +Qp +Qp +Qp +Lp +AR +AR +TU +Lp +dC +io +io +du +io +qz +Ka +CC +CC +fX +Wh +CC +CC +CC +CC +Wh +sQ +YQ +Rm +YQ +YQ +YQ +CN +wH +rd +YQ +YQ +rF +YQ +YQ +YQ +CN +YQ +rd +YQ +Wl +Jf +YQ +Ka +YQ +YQ +YQ +rd +YQ +YQ +nJ +YQ +YQ +YQ +YQ +YQ +YQ +Wl +YQ +rF +wH +OU +du +io +DL +YQ +Wl +rd +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +ZV +YQ +YQ +rF +YQ +YQ +YM +Wl +YQ +YQ +CN +oj +YQ +Pu +YQ +mY +KJ +YQ +YQ +YQ +CN +rd +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(63,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +rv +Dj +OB +wo +Dj +Dj +Dj +Dj +Dj +Dj +Dj +Dj +JF +JF +JF +Qp +JF +Qp +Qp +AR +AR +AR +AR +AR +Lp +TU +st +du +du +io +du +du +io +CY +io +xH +ow +io +du +xL +io +xH +CN +XB +du +DL +YQ +Ka +ZV +AF +YQ +YQ +YQ +CN +cn +MW +YQ +Hk +Pg +YQ +YQ +XB +du +WE +du +lf +YQ +YQ +YQ +YQ +rF +YQ +YQ +YQ +rF +YQ +MW +YQ +YQ +YQ +Ka +Ka +Ka +Jo +du +SD +YQ +YQ +CN +YQ +YQ +YQ +Pg +YQ +wH +YQ +YQ +YQ +YQ +CN +kr +YQ +YQ +MW +Pg +wH +YQ +jL +YQ +YQ +YQ +rd +YQ +YQ +rd +YQ +YQ +YQ +aP +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(64,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +cT +JF +Dj +Dj +Dj +Dj +TM +Dj +TM +Dj +Ij +JF +EO +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +TI +Gz +zC +sQ +sQ +sQ +JZ +hl +du +io +MF +du +xV +du +du +io +rP +du +yu +Wl +rH +io +DL +YM +wJ +YQ +ZV +wH +YQ +kr +Hs +Ko +wj +YQ +XB +du +io +io +io +io +Jc +Ka +Ka +Ka +Ka +YQ +Pg +Ka +Ka +AF +Ka +Ka +Ka +Ll +io +du +du +DL +ue +Ko +wj +YQ +YQ +kr +YQ +YQ +YM +Wl +YQ +cn +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +kr +YQ +AF +YQ +YQ +XC +YQ +YQ +CV +YQ +YQ +rF +AF +cn +kr +mY +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(65,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +Xj +Ex +JF +JF +Dj +Dj +Ij +Dj +Ij +Dj +LK +JF +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +YQ +cn +YQ +aP +YQ +YQ +YQ +KM +rd +bg +sQ +YQ +sQ +CN +sQ +sQ +XR +Pg +sQ +wH +rd +AF +sQ +kr +YQ +rF +YQ +Wl +YQ +YQ +YQ +CN +nJ +rF +OU +io +du +io +io +du +du +io +du +io +io +io +xH +XB +du +io +WE +du +io +io +io +du +io +du +DL +YQ +ur +rF +Wl +MW +YQ +YQ +YQ +rF +YQ +rd +MW +vK +Wl +rd +YQ +YQ +YQ +Wl +ZV +rd +YQ +CN +oj +XC +HC +XC +jL +cn +YQ +YQ +CN +wH +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(66,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +iZ +JF +JF +JF +Gd +Dj +LK +JF +Ex +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +vK +rd +YQ +YQ +CN +YQ +YQ +YM +wH +kr +Wl +YQ +aP +YQ +YQ +Wl +YQ +YQ +rd +rd +Wl +YQ +CN +YQ +Wj +vK +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +cn +YQ +OU +du +io +du +YF +io +io +io +io +ia +du +du +io +io +io +io +du +Ty +io +du +du +io +ie +sQ +YQ +YQ +YQ +rd +wH +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +kr +YQ +ZV +Pg +AF +rF +YQ +YQ +mY +YQ +vK +YQ +Yd +XC +YQ +wH +YQ +YQ +YQ +YQ +YQ +rd +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(67,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +Vh +qs +JF +LK +JF +Ex +JF +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Wl +YQ +YQ +vl +ZV +Pg +pK +YQ +YQ +MW +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +CN +YQ +YQ +vK +ZV +MW +YQ +YQ +CN +YQ +YQ +MW +Pg +cn +YQ +YQ +YQ +CN +YQ +IC +du +io +io +du +io +du +yu +YQ +sQ +Jo +du +yu +nD +sQ +sQ +YQ +sQ +sQ +sQ +sQ +YQ +Wl +rF +YQ +YQ +YQ +CN +YQ +YQ +kr +cn +rd +YQ +YQ +YQ +YQ +YQ +YQ +CN +vK +YQ +YQ +YQ +CN +YQ +YQ +MW +YQ +YQ +YQ +CV +YQ +aP +YQ +YQ +YQ +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(68,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Xj +Xj +Xj +JF +Ex +JF +Xj +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +wH +rd +YQ +Xh +YQ +YQ +YQ +YQ +CN +YQ +ZV +cn +wH +YQ +YQ +YQ +MW +YQ +cn +cn +rd +YQ +Wl +cn +YQ +kr +rF +YQ +YQ +YM +YQ +YQ +YQ +mY +YQ +YQ +Jo +io +io +io +io +yu +YQ +rF +Wl +YQ +IF +YQ +cn +Vm +YQ +YQ +CN +rF +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +YQ +rF +Wl +rd +vK +YQ +YQ +YQ +YM +YQ +YQ +rF +YQ +rd +YQ +YQ +Wl +wH +YQ +YQ +CN +CV +Pu +rd +YQ +YQ +YQ +YQ +YQ +YQ +Wl +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(69,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +YQ +rd +YQ +Wl +YQ +CN +wH +Wl +YQ +YQ +CN +YQ +YQ +YM +vK +YQ +Wl +Wl +YQ +YQ +CN +Wl +YQ +rd +YQ +Pg +rF +OU +du +io +du +yu +Pg +YQ +YQ +YQ +OU +io +xH +Oe +Ko +wj +YQ +YQ +cn +Pg +YQ +YQ +YQ +YQ +YM +Wl +vK +YQ +YM +AF +YQ +YQ +YQ +CN +vK +rd +Wl +rd +YQ +YQ +cn +ZV +MW +YQ +rd +aP +vK +YQ +ZV +rd +AF +cn +YQ +YQ +CN +YQ +cn +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(70,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +aP +vK +Pg +YQ +YQ +YQ +cn +Wl +YQ +AF +YQ +CN +YQ +AF +YQ +YQ +AF +YQ +YQ +YQ +Wl +AF +rF +YQ +YQ +YQ +YQ +CN +YQ +vK +rF +YQ +AF +vK +YQ +YQ +Wl +OU +io +io +io +DL +YQ +YQ +CN +YQ +Kr +io +du +bw +nJ +wH +YQ +YQ +YQ +Tw +wH +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +CN +cn +YQ +YQ +wH +cn +YQ +AF +YQ +YQ +YQ +CN +YQ +YQ +rF +Wl +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +vK +YQ +aP +YQ +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(71,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +AF +kr +YQ +rd +AF +rd +wH +kr +YQ +YQ +aP +YQ +YQ +YQ +vK +Pg +YQ +YQ +YQ +CN +rF +YQ +kr +YQ +YQ +MW +YQ +YQ +YQ +wH +YQ +cn +ZV +Mp +Mp +Jj +Jj +Mp +Mp +YQ +PS +du +io +DL +YQ +YQ +rd +YQ +YQ +Jo +io +KX +YQ +AF +YQ +YQ +YQ +YQ +YM +YQ +YQ +YQ +VP +Pg +YQ +YQ +YQ +YQ +YQ +ZV +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +AF +YQ +YQ +Pg +YQ +YQ +YM +Wl +YQ +YQ +wH +ZV +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(72,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YM +cn +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +Tw +wH +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +CN +Pg +YQ +YQ +YQ +CN +Pg +Wl +YQ +YQ +YQ +jF +Mp +gZ +Jd +Jd +tC +Mp +wj +XB +du +nv +YQ +rF +YQ +qg +qg +yK +yY +yY +qg +qg +Wd +ZV +YQ +YQ +YQ +YQ +Mp +Mp +Mp +Mp +Mp +Mp +Mp +YQ +YQ +YQ +CN +rd +KM +YQ +YQ +YQ +cn +YQ +YQ +YM +YQ +Wl +YQ +YQ +YQ +CN +aP +YQ +YQ +YQ +AF +YQ +YQ +YQ +CN +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(73,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +rd +YQ +MW +MW +YQ +YQ +YQ +cn +YQ +YQ +Pg +YQ +vK +Wl +YQ +Wl +YQ +Wl +vK +YQ +YQ +YQ +wH +Wl +YQ +YQ +YQ +wH +cn +YQ +YQ +YQ +YQ +YQ +Mp +gZ +Jd +Jd +xr +Mp +XB +io +Ty +io +DL +YM +YQ +qg +pT +nq +PN +zH +qg +zl +Wd +YQ +Wl +YQ +wH +Mp +Gl +TC +cg +RI +Mp +Qc +Mp +Mp +wj +YQ +YQ +YQ +MW +rd +YQ +YQ +YQ +CN +YQ +kr +rF +rd +YQ +YQ +YQ +cn +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +MW +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(74,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +aP +YQ +YQ +CN +AF +Wl +kr +aP +MW +rd +rd +kr +YQ +YM +rF +YQ +YQ +YQ +YQ +YQ +YM +rd +YQ +mY +YQ +YQ +YQ +YM +YQ +YQ +YQ +CN +Pg +rd +Mp +gZ +Jd +Jd +Jd +Hw +io +du +xH +sQ +YQ +YQ +vK +yK +Eq +eI +PN +yW +qg +zl +Wd +YQ +Oe +Mp +Mp +Mp +Jq +Jd +Jd +Jd +FV +MP +Yt +Mp +Wl +YQ +YQ +YQ +CN +AF +Wl +YQ +rd +rd +YQ +YQ +YQ +YQ +YM +ZV +rd +VU +YQ +YQ +MW +YQ +rF +kr +YQ +cn +YQ +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(75,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Wl +YQ +YQ +YQ +YQ +rd +YQ +YQ +AF +YQ +YQ +YM +YQ +rd +YQ +Wl +YQ +YQ +YQ +CN +rd +rF +YQ +YQ +YQ +CN +ZV +YQ +YQ +YQ +YQ +YQ +YQ +MW +YQ +Mp +eK +Jd +Jd +aY +Mp +ne +du +io +DL +YQ +YQ +YQ +qg +pT +nq +PN +zH +qg +zl +Wd +YQ +kr +Mp +Kl +Mp +gv +Jd +Jd +Kw +Mp +MP +iH +Mp +YQ +YQ +YQ +Pg +YQ +kr +YQ +YQ +rF +YQ +YQ +YQ +CN +rd +Pg +YQ +YQ +YQ +CN +YQ +rd +AF +rd +YQ +vK +YQ +Wl +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(76,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +rd +YQ +kr +Wl +YQ +YQ +YQ +CN +rd +YQ +YQ +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +AF +YQ +YQ +YQ +rF +YQ +Wl +YQ +YQ +YQ +CN +cn +YQ +YQ +wH +Mp +Gl +hy +Jd +Us +Mp +Ka +wF +du +DL +MW +YQ +kr +qg +qg +yK +yY +yY +qg +qg +Wd +wH +YQ +IK +Jd +Sk +Jd +Jd +Jd +sn +Mp +MP +kQ +Mp +rF +cn +AF +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +Wl +rF +YQ +YQ +YQ +YQ +aP +YQ +YM +YQ +YQ +YQ +CN +AF +rF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(77,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +YQ +YQ +aP +YQ +Wl +YQ +ZV +Wl +YQ +YQ +CN +YQ +VU +YQ +rd +YQ +ZV +MW +YQ +YQ +YQ +CN +YQ +AF +Pg +YQ +YQ +YQ +rF +YQ +YQ +YQ +CN +Mp +VL +Jd +Jd +Jd +Hw +io +du +io +xH +YQ +YQ +YQ +YQ +YQ +hw +du +io +zr +AF +YQ +YQ +Pg +Jj +Jd +Gl +Mp +sD +Nx +Mp +Gl +Mp +Mp +Mp +cn +vK +YQ +YQ +YQ +CN +YQ +YQ +YQ +kr +YQ +YQ +YM +YQ +YQ +YQ +CN +YQ +kr +YQ +YQ +YQ +YQ +aP +wH +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(78,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Tv +YQ +ZV +YQ +YQ +YQ +YQ +CN +cn +YQ +kr +YQ +YQ +YQ +YQ +YQ +ZV +vK +YQ +YQ +YM +Wl +YQ +YQ +YQ +YQ +YQ +YQ +CN +cn +MW +Pg +AF +Wl +YQ +YQ +YQ +Mp +VL +Jd +Jd +EL +Mp +Jo +io +du +xH +YM +rF +YQ +YQ +YQ +ow +io +du +DL +YQ +rd +YQ +rF +Mp +Jd +Jd +Jd +Wi +Wi +CH +Jd +dn +XM +Mp +YQ +YM +YQ +YQ +rd +YQ +YQ +YM +rd +MW +YQ +YQ +AF +cn +YQ +YQ +Wl +YQ +YQ +AF +rd +cn +Pg +Wl +YQ +cn +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(79,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +AF +kr +rd +YQ +YQ +YQ +YQ +MW +AF +YQ +YQ +rd +Pg +aP +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +KM +Wl +YQ +YQ +wH +YQ +YQ +YQ +YQ +CN +YQ +YQ +YM +mt +Mp +VL +Jd +Jd +Jq +Mp +QX +Jo +io +du +DL +YQ +YQ +YQ +kr +YQ +uc +io +FP +YQ +YQ +YQ +cn +Mp +Jd +Jd +Bn +Jd +Jd +Jd +Bn +Jd +iR +Mp +YQ +rF +Wl +wH +mY +YQ +YQ +Pg +YQ +YQ +YQ +CN +ZV +rd +vK +AF +YQ +YQ +YQ +YQ +CN +YQ +aP +YQ +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(80,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Wl +mY +YQ +YQ +YQ +cn +ZV +YQ +YM +rd +aP +YQ +YQ +CN +mY +AF +YQ +YQ +YQ +wH +YQ +YQ +Pg +YQ +YQ +YQ +AF +Wl +YQ +kr +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Mp +Mp +Jj +Jj +Mp +Mp +YQ +rF +Jo +io +DL +YQ +Wl +YQ +Vm +tZ +io +yu +YQ +YQ +YQ +CN +YQ +IK +Jd +dn +DU +fW +Jd +dn +ii +fW +Jd +IK +AF +YQ +YQ +kr +YQ +YQ +YQ +CN +YQ +YQ +rF +Wl +wH +YQ +aP +YQ +kr +YQ +cn +YQ +YQ +wH +vK +MW +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(81,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +aP +YQ +YQ +YQ +CN +YQ +Wl +YQ +kr +YQ +YQ +YQ +YQ +cn +YQ +YQ +YQ +MW +rd +YQ +YQ +kr +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +AF +YQ +YQ +YQ +CN +vK +YQ +wH +YQ +YQ +ZV +YQ +YQ +wH +XB +du +DL +Pg +YQ +gU +Ko +Ro +du +xH +YQ +aP +Pg +YQ +AF +IK +Bn +Jd +iR +Jd +Jd +Jd +iR +Jd +Jd +IK +YQ +YQ +YQ +CN +YQ +YQ +rF +YQ +rd +wH +AF +rd +YQ +YQ +YQ +CN +YQ +ZV +rd +Wl +YQ +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(82,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +MW +YQ +YQ +YQ +YQ +rd +aP +YQ +YQ +wH +Wl +YQ +Wo +ZV +YQ +YQ +YQ +CN +YQ +YQ +YQ +Tw +YQ +YQ +YQ +YQ +Wl +YQ +rF +YQ +YQ +Wl +CN +YQ +cn +YQ +YQ +YQ +YQ +YQ +YQ +YQ +aP +YQ +OU +io +UH +jj +Ka +Ka +Ka +nJ +YU +du +io +xH +ZV +YQ +YQ +YQ +Mp +yX +wZ +Jd +Jd +Ct +Xm +Mx +dW +PW +Jj +vK +YQ +kr +YQ +Wl +rd +YQ +YQ +YQ +CN +cn +YQ +YQ +YQ +YQ +YQ +YQ +bn +aP +YQ +YQ +YQ +Wl +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(83,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +YQ +YM +aP +rd +YQ +Wl +kr +YQ +YQ +YQ +CN +YQ +YQ +rd +vK +YQ +YQ +YQ +YQ +YQ +YQ +Wl +wH +YQ +YQ +YM +vK +YQ +rx +YQ +Wl +YQ +YQ +wH +rd +Pg +YQ +YQ +YQ +CN +YQ +YQ +YQ +rd +Sc +io +du +io +io +du +io +QB +io +io +du +du +xH +Wl +YQ +DO +Mp +IK +Gl +EP +Mp +Jj +Gl +le +Qr +rt +Mp +Pg +rF +YQ +YQ +cn +AF +YQ +YQ +YQ +YQ +YQ +YQ +CN +rF +AF +Pg +YQ +YQ +AF +YQ +YQ +rd +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(84,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YM +kr +YQ +YQ +YQ +wH +vK +Pg +YQ +YQ +YQ +aP +YQ +YQ +CN +wH +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +YQ +cn +YQ +YQ +CN +cn +YQ +YQ +YM +YQ +YQ +YQ +YQ +YQ +Vm +cn +YQ +YQ +vK +OU +du +io +du +du +hk +io +DL +Jo +du +io +du +du +xH +Ka +Ka +Ka +ZV +XB +io +St +YQ +Mp +Mp +IK +Mp +Mp +vc +YQ +YQ +Vm +CN +MW +YQ +cn +kr +YQ +kr +vK +Pg +YQ +YQ +YQ +Tw +wH +YQ +YQ +YQ +CN +cn +rF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(85,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +YQ +ZV +AF +YQ +YQ +YQ +CN +YQ +Wl +YM +AF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +kr +YQ +cn +YQ +YQ +YQ +YQ +YQ +CN +tu +YQ +YQ +MW +AF +YQ +YQ +Wl +CN +rF +ZV +YQ +IW +Ko +wj +YQ +kr +YQ +Fd +uc +io +yu +jb +YQ +sQ +wH +vK +sQ +Jo +io +io +du +du +io +io +WE +du +io +xH +uW +Ka +Ka +YQ +kr +YQ +YQ +wH +Oe +Ko +Gu +YQ +YQ +Tw +MW +MW +YQ +Wl +rd +MW +YQ +YQ +rd +YQ +cn +kr +YQ +AU +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(86,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Wl +wH +aP +YQ +YQ +cn +YQ +YQ +YQ +YQ +YQ +YQ +MW +kr +Pg +YQ +aP +YQ +CN +Wl +YQ +YQ +cn +rF +AF +Wl +YQ +YQ +YQ +YQ +rd +YQ +YQ +vK +YQ +YQ +YQ +YQ +YQ +YQ +wH +YQ +nJ +MW +YQ +YQ +OU +du +io +du +DL +YQ +YQ +Wl +YQ +YQ +rF +rd +CR +du +du +mZ +Wa +du +io +io +du +io +du +du +io +Nd +YJ +Ka +uW +YQ +YQ +lJ +YQ +YQ +YQ +wH +YQ +rd +YQ +CN +wH +cn +ZV +YQ +YQ +aP +Wl +YQ +rd +YQ +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(87,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +CN +YQ +YQ +Wl +aP +KM +Ym +cn +YQ +YQ +YM +rF +Wl +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +cn +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +wH +YQ +kr +YQ +YQ +YQ +YQ +YQ +YQ +aP +OU +du +io +yu +Vm +aP +YQ +YQ +YQ +MW +YQ +YQ +YQ +sQ +sQ +YQ +YQ +sQ +sQ +Jo +io +du +hk +io +du +io +du +du +io +lf +YQ +YQ +YQ +kr +aP +fz +YQ +YQ +YQ +YQ +YQ +rF +YQ +YQ +YQ +CN +YQ +YQ +YM +Wl +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(88,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +cn +kr +YQ +YQ +Wl +YQ +YM +wH +kr +YQ +YQ +YQ +CN +YQ +YQ +wH +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +YQ +rF +YQ +YQ +ZV +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +mY +AF +YQ +YQ +YM +YQ +YQ +OU +io +UH +Oe +Ko +wj +kr +YQ +YQ +CV +YQ +YQ +YM +MW +YQ +aP +YQ +YQ +YQ +YQ +sQ +LW +wH +Jo +io +io +io +du +io +io +DL +YM +rd +Mp +Mp +Mp +Mp +Mp +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(89,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +PB +YQ +YQ +Pg +YQ +Wl +YQ +YQ +YQ +AF +YQ +YQ +YQ +mY +AF +Wl +YQ +YQ +CN +YQ +ZV +wH +Pg +YQ +YQ +YQ +ZV +Wl +YQ +kr +YQ +wH +Wl +vK +Hk +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Vm +vK +Wl +YQ +YQ +kw +du +DL +hp +YQ +YQ +YQ +YQ +YQ +Ka +SF +Ka +Ar +YQ +vK +YQ +Vm +YQ +CN +YQ +YQ +YQ +YQ +sQ +sQ +sQ +Jo +du +QC +Ka +Ka +Ka +Mp +Ct +MJ +zI +Mp +cn +YQ +YQ +wH +YQ +kr +AF +YQ +YQ +YQ +CN +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(90,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +MW +aP +YQ +YQ +YQ +CN +YQ +YQ +YM +cn +ZV +pN +YQ +cn +YQ +YQ +YQ +YQ +Aa +YQ +YQ +YQ +YQ +CN +MW +YQ +YQ +YQ +CN +rF +Mp +Mp +Mp +Mp +Mp +IK +Gl +IK +Mp +bf +YQ +YQ +YQ +xU +io +du +DL +ZV +AF +cn +Ka +Ka +EQ +du +du +Ud +io +as +YQ +Oe +Ko +wj +YQ +YQ +YQ +YQ +YM +YQ +YQ +YQ +YM +Jo +du +du +io +du +uj +Jd +Jd +An +Mp +YQ +rd +aP +Wl +YQ +YQ +vK +Wl +YQ +YQ +wH +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(91,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +YQ +kr +Pg +YQ +YQ +YQ +Wl +MW +wH +aP +Wl +YQ +kr +YQ +YQ +MW +YQ +YQ +YQ +CN +YQ +YQ +YQ +vK +Pg +YQ +YQ +YQ +YQ +ZV +Mp +uZ +Jd +Iw +Wi +Jd +vx +Jd +yM +Mp +AF +YQ +Ol +io +du +io +DL +YQ +cD +ws +io +Kk +io +du +uG +dF +du +io +yy +rd +nJ +YQ +YQ +MW +YQ +YQ +Pg +ZV +YQ +YQ +YQ +OU +io +io +yu +JZ +Mp +fh +Jd +af +Mp +mk +vK +rd +YQ +YQ +YQ +td +YQ +Pg +Bp +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(92,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +rd +AF +YQ +YQ +YQ +cn +rd +YQ +aP +YQ +cn +YQ +YQ +YM +YQ +nm +YQ +CN +YQ +YQ +YQ +YQ +YQ +YM +zx +cn +YQ +YQ +YQ +YM +cn +Pg +Mp +BY +Jd +sS +Wi +Co +dm +tK +Jd +Jj +YQ +YQ +OU +du +io +yu +rd +OU +du +io +du +uG +QA +QA +pQ +pQ +dF +io +du +xH +AF +YQ +YQ +YQ +YQ +YQ +YQ +Vm +cn +YQ +wH +YQ +pm +io +DL +Oe +Mp +Mp +FO +Mp +Mp +YQ +YM +YQ +YQ +YQ +MW +YQ +YQ +YM +rF +Wl +AR +AR +AR +AR +AR +AR +AR +kW +Xj +Xj +AR +kW +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(93,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +YQ +YQ +YQ +CN +Wl +vK +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +aP +YQ +YQ +vK +MW +YQ +YQ +YQ +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +rd +Mp +kB +Jd +kz +Wi +Jd +Jt +Jd +Jd +Gl +Ka +Ka +mE +io +io +DL +YQ +hH +du +Ud +uG +pQ +pQ +pQ +pQ +pQ +pQ +dF +io +io +DL +YQ +YQ +YQ +Wl +Mp +Mp +Mp +Mp +Mp +rd +OU +io +du +DL +YQ +Mp +pn +Jd +XV +Mp +YQ +YQ +YQ +YQ +CN +YQ +kr +YQ +rd +ZV +cn +AR +AR +AR +AR +AR +AR +AR +Xj +qa +Ih +ti +qi +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(94,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +aP +YQ +YQ +YQ +YQ +YQ +YQ +aP +AF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YM +Wl +YQ +YQ +YQ +CN +AF +YQ +YQ +YQ +rd +YQ +Wl +YQ +CN +Mp +fm +Jd +dt +Wi +Jd +Jd +Jd +Jd +vZ +du +io +du +du +io +Mf +YQ +KR +io +uG +pQ +pQ +pQ +pQ +pQ +pQ +pQ +Hg +Kk +io +xH +YQ +YM +YQ +YQ +Mp +zI +MJ +Ct +Mp +Ka +OU +io +io +DL +AF +Mp +Mp +Mp +Mp +Mp +Pg +YQ +YQ +YQ +wH +Wl +YQ +aP +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +ti +Ih +oW +qa +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(95,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +vK +cn +YQ +Wl +kr +YQ +YQ +YM +YQ +dY +YQ +YQ +Wl +wH +YQ +Pg +vK +YQ +YQ +rF +Pg +cn +YQ +YQ +YQ +cn +YQ +wH +YQ +MW +Wl +YQ +YQ +Oe +Mp +Ct +Jd +Mh +Wi +Jd +Jd +Jd +Jd +Gl +oX +sQ +CR +du +io +DL +Kr +du +io +uh +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +dF +io +du +qr +YQ +rd +vK +Mp +wv +Jd +Jd +tS +io +QB +du +UH +YQ +YQ +YQ +YQ +Wl +YQ +MW +YQ +rd +AF +YQ +rF +rd +YQ +YQ +YQ +YQ +AF +AR +AR +AR +AR +AR +AR +AR +Xj +qa +qa +Ih +Ih +kW +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(96,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +mY +YQ +YM +YQ +aP +AF +YQ +rd +Pg +YQ +YQ +YQ +CN +vK +aP +YQ +cn +YQ +YQ +YQ +CN +YQ +YQ +YM +kr +Wl +YQ +YQ +CN +YQ +ZV +Pg +YQ +YM +Mp +Jd +Jd +BB +Jd +Jd +Jd +vx +Jd +IK +wH +YQ +OU +io +io +DL +OU +io +uG +pQ +pQ +pQ +pQ +pQ +YK +pQ +pQ +pQ +pQ +dF +du +xH +CV +YQ +jQ +Mp +af +Jd +gV +Mp +sQ +OU +du +du +YQ +YM +wH +YQ +YQ +YQ +rd +YQ +ZV +YQ +YQ +YQ +CN +YQ +YQ +YM +Wl +Pg +AR +AR +AR +AR +AR +AR +AR +Xj +ti +ai +qa +ti +kW +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(97,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +YQ +YQ +Wl +YQ +YQ +cn +YQ +Wl +YQ +YQ +rd +YQ +AF +Wl +YQ +rd +CN +YQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +YQ +Pg +YQ +YQ +YM +YQ +YQ +YQ +Mp +Jd +Jd +Se +Wi +Jd +Co +bZ +tK +Jj +YQ +MW +YQ +uC +du +DL +jJ +du +VJ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +Hg +ot +io +DL +YQ +ZV +Mp +Gl +FO +Mp +Mp +wj +OU +du +UH +YQ +YQ +cn +rd +ZV +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Pg +cn +YQ +YQ +YQ +vK +AR +AR +AR +AR +AR +AR +AR +AR +Ih +WD +Ih +Ih +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(98,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +wH +YQ +kr +YQ +YQ +MW +YQ +YQ +YQ +kr +YQ +YQ +YQ +YQ +CN +wH +rd +cn +YQ +YQ +YQ +YQ +CN +wH +Mp +Jd +Jd +Gv +at +Jd +Jd +gj +Gn +Mp +YQ +YQ +OU +du +io +MS +Sc +io +Kk +uh +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +Hg +Bh +Vb +DL +kr +YQ +Mp +Ta +Jd +lS +Mp +vK +YQ +uc +du +zr +YQ +Mp +Mp +Mp +Mp +Mp +YQ +YQ +CN +vK +kr +Wl +YQ +MW +YQ +hv +rd +AR +AR +AR +AR +AR +AR +AR +kW +ti +Ih +cK +ti +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(99,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +aP +YM +Wl +YQ +YQ +aP +CN +ZV +YQ +YM +YQ +MW +YQ +YQ +YQ +YQ +AF +YQ +YQ +YQ +CN +YQ +YQ +YQ +PD +Mp +tx +Gl +Mp +Gl +Mp +Jd +Jd +Gl +Mp +wj +aP +OU +du +io +DL +MD +io +io +uh +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +dF +du +HD +YQ +YQ +Mp +Mp +Mp +Mp +Mp +Wl +OU +io +io +xH +rT +Mp +Ct +MJ +zI +Mp +YQ +YQ +wH +YQ +aP +YQ +rd +YQ +YQ +VU +YQ +AR +AR +AR +AR +AR +AR +AR +Xj +Xj +kW +AR +Xj +Xj +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(100,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AF +rd +kr +cn +YQ +YQ +YM +kr +cn +YQ +rF +YQ +YQ +YQ +YQ +Wl +YQ +YQ +rF +YQ +YQ +XC +YQ +YQ +rF +ZV +YQ +YQ +YQ +YQ +kr +Wl +AF +YQ +Mp +Jd +Jd +eN +Mp +by +Jd +Jd +by +Mp +AF +YQ +OU +io +UH +YQ +ow +du +uG +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +EA +io +DL +YQ +YQ +YQ +YQ +aP +YQ +rd +wH +OU +du +io +io +du +Du +Jd +Jd +An +Mp +YQ +cn +rd +YQ +YQ +YQ +CN +YQ +kr +rd +wH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(101,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +aP +YQ +Wl +YQ +Wl +YQ +YQ +AF +YQ +YQ +YM +rd +AF +YQ +YQ +YQ +CN +rd +yi +HC +XC +YQ +YQ +YQ +CN +YQ +YQ +YM +YQ +YQ +YQ +pC +Mp +QI +Jd +LE +Mp +Jd +vx +vx +Jd +Jj +YQ +cn +OU +io +du +DL +OU +du +VJ +pQ +pQ +pQ +pQ +pQ +YK +pQ +pQ +pQ +pQ +Hg +du +io +bw +YQ +YQ +YQ +CN +YQ +MW +YQ +YQ +OU +io +io +yu +sQ +Mp +vs +Jd +af +Mp +Pd +YQ +YQ +YQ +YQ +YQ +KM +YQ +YQ +YQ +CN +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(102,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +Fz +rd +vK +YQ +YQ +YQ +CN +YQ +Wl +cn +aP +YQ +YQ +AF +Pg +YQ +yQ +XC +YQ +YQ +YQ +YQ +YQ +YQ +cn +mY +MW +YQ +YQ +YQ +Mp +SV +Jd +kn +Gl +xS +kq +Tm +tK +IK +ZV +YQ +OU +du +io +DL +hw +io +Ud +VJ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +EA +io +Hm +YQ +YQ +YQ +YQ +YQ +Pg +YQ +YQ +kr +OU +io +sQ +CN +Oe +Mp +Gl +FO +Mp +Mp +YQ +YQ +YQ +YQ +CN +ZV +kr +rF +YQ +YQ +YQ +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(103,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +Pg +YQ +YQ +YQ +YQ +aP +YQ +YQ +YQ +YQ +Pg +ZV +YQ +YQ +YQ +CN +YQ +YQ +CV +Ka +Ka +Ka +YQ +kr +YQ +YQ +YQ +CN +Wl +YQ +Wl +AF +rF +Mp +iE +eT +gL +Mp +wV +Ah +Tm +vN +Mp +YQ +YQ +Kr +io +io +DL +YQ +QO +du +io +uh +pQ +pQ +pQ +pQ +pQ +pQ +pQ +Hg +Kk +io +DL +rd +YQ +vK +Mp +Mp +Mp +Mp +Mp +YQ +OU +io +zA +YQ +YQ +Mp +pn +Jd +XV +Mp +Pg +YQ +YQ +MW +mY +YQ +rd +YQ +AF +YQ +cn +YQ +wH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(104,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Wl +YQ +kr +ZV +rd +wH +Wl +YQ +YQ +rd +MW +YQ +YQ +YQ +YQ +YQ +YQ +mE +io +du +io +PL +YQ +Pg +YQ +rd +YQ +YQ +YQ +YQ +CN +cn +Mp +Mp +Mp +Mp +Mp +Mp +Jj +IK +Mp +Mp +YQ +YM +YQ +uc +du +DL +VU +OU +io +du +VJ +pQ +pQ +pQ +pQ +pQ +pQ +pQ +Hg +du +io +DL +mY +Wl +YQ +Mp +zI +MJ +Ct +Mp +Ka +XB +io +du +DL +MW +Mp +Mp +Mp +Mp +Mp +rd +YQ +rF +cn +aP +YQ +YQ +CN +YQ +Wl +YQ +aP +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(105,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +AF +YQ +YQ +YQ +rd +AF +YQ +YQ +YQ +CN +YQ +mY +kr +rd +oj +YQ +ws +du +du +AT +du +du +yy +YQ +Wl +YQ +MW +YQ +YQ +YQ +YQ +YQ +nJ +vK +YQ +Wl +YQ +YQ +YQ +rd +YQ +nJ +YQ +YQ +OU +io +Vg +YQ +YQ +YQ +iU +du +Kk +uh +pQ +EA +no +VJ +pQ +pQ +EA +io +YE +AF +YQ +YQ +YQ +Mp +wv +Jd +Jd +HI +du +io +du +io +DL +YQ +YQ +YQ +AF +YQ +YQ +YQ +rd +YQ +Wl +YQ +YQ +YQ +YQ +YQ +YQ +CN +vK +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(106,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +CN +aP +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +Wl +vK +YQ +YQ +YQ +OU +io +io +uG +pQ +dF +io +io +HQ +YQ +kr +YQ +YQ +YQ +CN +Wl +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +YQ +kr +YQ +YQ +YQ +OU +io +du +DL +Pg +vK +MD +io +io +VJ +EA +du +io +du +VJ +EA +Ud +du +DL +YQ +YQ +YQ +El +Mp +af +Jd +bW +Mp +sQ +Jo +io +du +DL +YQ +aP +YQ +YM +YQ +YQ +YQ +YQ +CN +YQ +YQ +rd +Wl +YQ +YQ +YQ +YQ +YQ +cn +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(107,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +ZV +cn +rd +YQ +YQ +rd +YQ +cn +YQ +YQ +YQ +YQ +CN +YQ +YQ +YM +vy +du +uG +pQ +pQ +Hg +du +io +DL +rF +wH +YQ +YQ +YQ +wH +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YM +YQ +YQ +YQ +YQ +aP +OU +du +io +xH +YQ +YQ +jB +Fq +io +du +io +io +io +io +du +du +io +Hm +CV +YQ +YQ +wH +YQ +Mp +Mp +FO +Mp +Mp +wj +Pg +uc +io +MS +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +Pg +wH +rd +YQ +YQ +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(108,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +wH +YQ +YQ +YM +Pg +aP +YQ +YQ +YQ +YQ +YQ +AF +YQ +YQ +OU +io +uh +pQ +pQ +pQ +dF +du +uv +YQ +YQ +YQ +YQ +cn +YQ +YQ +YQ +CN +cn +YQ +kr +YQ +YQ +rF +YQ +AF +YQ +ZV +YQ +OU +du +io +du +DL +gU +Ko +wj +lr +sQ +nw +du +io +io +KO +sQ +sQ +YQ +CN +YQ +YQ +YQ +YQ +Mp +hU +Jd +lS +Mp +YQ +Yf +du +UH +YQ +rd +Mp +Mp +Mp +Mp +Mp +YQ +cn +YQ +YQ +ZV +YQ +cn +YQ +YM +YQ +YQ +YQ +YQ +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(109,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +hv +YQ +vK +YQ +Wl +YQ +YQ +YQ +CN +YQ +Wl +YQ +cn +aP +OU +du +VJ +pQ +pQ +pQ +EA +io +DL +YQ +YQ +YQ +CN +rd +ZV +YQ +YQ +YQ +YQ +YQ +YQ +YQ +wH +YQ +vK +YQ +Pg +YQ +Wl +YQ +Jo +io +yu +Ka +Ka +nJ +cn +YQ +CV +YQ +IC +io +yu +YQ +Wl +YQ +YQ +YQ +YQ +YQ +YM +YQ +Mp +Mp +Mp +Mp +Mp +YQ +OU +io +io +xH +wH +Mp +Ct +MJ +zI +Mp +wH +YQ +rF +YQ +rd +YQ +YQ +AF +ZV +kr +MW +YQ +Pg +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(110,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Wl +MW +YQ +cn +rd +YQ +VU +YQ +Pg +YQ +YQ +Dz +YQ +YQ +OU +du +io +VJ +pQ +Hg +io +du +DL +YQ +YQ +YQ +AF +Wl +YQ +YQ +kr +YQ +YQ +YQ +Tw +YQ +YQ +MW +Vm +cn +YQ +YQ +YQ +YQ +YQ +sQ +hw +io +du +xH +YQ +CN +YQ +MW +XB +io +yx +YQ +vK +YQ +kr +YQ +YQ +YQ +YQ +YQ +YQ +YQ +nJ +rd +ZV +YQ +OU +du +io +du +DL +IO +Jd +Jd +An +Mp +YQ +AF +YQ +YQ +YQ +Tw +cn +aP +YQ +YQ +YQ +YQ +CN +cn +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(111,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +YQ +YQ +YQ +CN +YQ +wH +YQ +rd +kr +Wl +YQ +YQ +CN +YQ +Wl +iU +du +io +VJ +EA +du +io +CK +YQ +YQ +YQ +AF +YQ +YQ +YQ +CN +YQ +Wl +YQ +wH +ZV +YQ +Oe +Ko +wj +YQ +YQ +YQ +kr +YQ +YQ +OU +du +io +du +DL +Ka +Ka +XB +du +io +io +xH +YQ +YQ +YQ +YQ +rd +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +rQ +du +io +yu +YQ +Mp +TX +Jd +af +Mp +wj +YQ +YQ +YQ +YQ +MW +YQ +YQ +YM +rd +YQ +YQ +YQ +Wl +mY +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(112,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +kr +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +MW +YQ +YQ +ZV +YQ +YQ +YQ +YQ +QO +du +du +io +io +Hm +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +MW +rd +Wl +YQ +YQ +YQ +CN +YQ +nJ +YQ +YQ +CN +YQ +YQ +Pg +rd +wH +Jo +io +du +WE +du +du +io +io +du +io +du +Nd +rd +wH +YQ +ZV +YQ +MW +YQ +aP +YQ +Ka +Ka +Ka +YQ +XB +io +io +DL +mt +Mp +Mp +FO +Mp +Mp +YQ +YQ +YQ +CN +YQ +kr +YQ +YQ +vK +kr +Wl +YQ +YQ +YQ +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(113,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +ZV +AF +YQ +rd +YQ +YQ +ZV +AF +YQ +YQ +vK +YQ +rd +kr +YQ +YM +wH +YQ +sQ +sQ +uu +sQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Wl +AF +vK +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +MW +YQ +Jo +io +io +hk +io +du +io +yu +CR +io +io +xH +Ka +cn +Ka +Ka +Ka +YQ +Ka +hC +du +io +io +MX +du +io +yu +YQ +YQ +Mp +pn +Jd +XV +Mp +YQ +YQ +YQ +YQ +wH +YQ +YQ +YQ +CN +YQ +YQ +YQ +aP +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(114,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +aP +YQ +kr +Pg +mY +YQ +YQ +YQ +CN +cn +Pg +YQ +YQ +YQ +kr +Pg +rd +rF +YQ +YQ +YQ +YQ +CN +MW +YQ +kr +Wl +YQ +YM +YQ +YQ +YQ +CN +YQ +YQ +YM +YQ +Wl +YQ +mY +rF +Mp +Mp +Mp +Mp +Mp +YQ +Wl +Jo +du +ht +Jo +io +yu +YQ +OU +du +du +io +du +WE +io +io +du +WE +io +io +io +du +io +du +hk +io +DL +YQ +Wl +Mp +Mp +Mp +Mp +Mp +wH +AF +YQ +MW +kf +YQ +YQ +YQ +Pg +cn +YQ +Wl +YQ +YQ +ZV +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(115,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +CN +YQ +YQ +YQ +Wl +YQ +rd +aP +YQ +Wl +rd +YQ +YQ +YQ +CN +Wl +YQ +YQ +AF +YQ +YQ +YQ +YQ +YQ +YM +ZV +YQ +YQ +rd +YQ +YQ +YQ +ZV +AF +YQ +YQ +wH +YQ +YQ +cn +El +Mp +ml +Qt +ww +Mp +ZV +YQ +Tx +io +DL +uX +du +eJ +Wl +YQ +Jo +io +io +io +du +hk +du +io +io +du +du +io +yu +sQ +sQ +YQ +sQ +YQ +YQ +YQ +mY +YQ +nJ +YQ +vK +rd +YQ +YQ +YQ +td +YQ +YQ +cn +rd +YQ +wH +rd +AF +YQ +cV +Pg +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(116,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Wl +YQ +YQ +YQ +CN +cn +ZV +YQ +YQ +YM +AF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +Pg +YQ +YM +cn +YQ +YQ +YQ +CN +vK +YQ +Pg +YQ +Mp +QE +QE +eR +Mp +Mp +Jj +Mp +Ag +IK +Jj +Ag +Gl +IK +Mp +wj +sQ +sQ +JZ +sQ +YQ +sQ +sQ +sQ +sQ +sQ +sQ +wH +YQ +rd +YQ +YQ +ZV +kr +YQ +wH +YQ +YQ +YQ +CN +cn +aP +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +MW +CN +YQ +YQ +YQ +CN +Wl +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(117,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AF +cn +YQ +YQ +YQ +YQ +YQ +kr +YQ +YQ +YQ +YQ +Wl +YQ +nt +ZV +YQ +YQ +YQ +Wl +YQ +YQ +YQ +YQ +YQ +cn +Pg +YQ +YQ +YQ +AF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +rF +MW +YQ +YQ +Mp +lV +Mp +Mp +Gl +Mp +Xm +CH +Jd +Jd +Jd +Jd +CH +Or +Mp +YQ +rd +YQ +YQ +YQ +og +YQ +rd +YQ +YQ +cn +YQ +Wl +YQ +YQ +YQ +Pg +YQ +YQ +aP +YQ +YQ +YQ +YQ +YQ +YQ +Pg +YQ +rd +YQ +YQ +YQ +YQ +aP +YQ +YQ +YQ +YQ +YQ +YQ +YQ +rF +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(118,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +vK +YQ +MW +AF +YQ +YQ +cn +Wl +YQ +kr +YQ +aP +YQ +YQ +CN +YQ +cn +YQ +YQ +YQ +YQ +CN +YQ +YQ +rd +YQ +YQ +YM +cn +Wl +YQ +YQ +CN +MW +YQ +YQ +YQ +YQ +Wl +wH +Mp +Jd +QE +OA +Ct +Mp +Jd +Jd +Jd +Jd +Jd +Jd +Jd +yF +Jj +AF +YQ +YQ +YM +Oe +Ko +wj +YQ +XC +aP +YQ +YQ +YQ +CN +MW +vK +YQ +rd +YQ +YQ +YQ +Wl +YQ +YQ +YQ +CN +Wl +YQ +YQ +CN +YQ +kr +rd +YQ +Wl +YQ +YQ +YM +wH +YQ +cn +YQ +ZV +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(119,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +hv +rd +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +rF +YQ +Pg +YQ +YQ +YM +rd +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +kr +YQ +YQ +YQ +Pg +YQ +YQ +YQ +CN +ZV +YQ +kr +Mp +hy +eB +uT +uy +yz +Jd +Jd +sR +Ei +Ve +Rn +Jd +yL +IK +YQ +YQ +YQ +YQ +Wl +nJ +YQ +kr +Yb +GU +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Vm +YQ +YQ +CN +wH +YQ +AF +YQ +rd +YQ +YQ +cn +wH +aP +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +aP +YQ +CN +YQ +kr +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(120,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Pg +YQ +YQ +YQ +YQ +YQ +Wl +YQ +YQ +YQ +rd +YQ +YQ +AF +YQ +Wl +YQ +YQ +YQ +CN +YQ +YM +aP +YQ +YQ +YQ +YQ +YQ +CN +MW +YQ +rd +kr +YQ +YQ +Wl +YQ +YQ +YQ +YQ +Mp +Jd +QE +wq +Jd +Gl +Jd +Jd +VK +XY +QE +Jv +Jd +Bq +IK +aP +YQ +wH +YQ +YQ +ZV +YQ +YQ +XC +YQ +YQ +YQ +Pg +YQ +rd +YQ +mt +Ko +wj +YQ +YQ +MW +YQ +YQ +cn +YQ +ZV +rd +YQ +YQ +mY +Wl +ZV +YQ +YQ +YQ +rF +kr +YQ +YQ +YQ +YQ +vK +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(121,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +rd +YQ +YQ +Wo +rd +MW +YQ +Wl +Pg +cn +YQ +YQ +YQ +CN +cn +cn +YQ +YQ +YQ +YQ +YQ +YQ +Pg +YQ +kr +YQ +YQ +YQ +YQ +vK +YQ +YQ +YQ +CN +YQ +cn +YQ +kr +YQ +jF +Mp +Mp +Jd +BB +Jd +Mp +KY +Jd +mu +QE +QE +yS +Jd +KY +Mp +YQ +Pg +mY +YQ +cn +YQ +rd +YQ +wH +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +nJ +rd +YQ +YQ +Wl +YQ +CN +YQ +YQ +YQ +CN +Wl +YQ +MW +CN +YQ +Pg +cn +rd +YQ +YQ +rd +YQ +YQ +Wl +rd +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(122,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +vK +YQ +YQ +YQ +YQ +CN +AF +ZV +YQ +YQ +Wl +YQ +YQ +YQ +CN +cn +YQ +kr +YQ +YQ +YQ +CN +KM +cn +YQ +YQ +YQ +CN +VU +YQ +YQ +YQ +YQ +fH +rF +YQ +MW +AF +YQ +Mp +Mp +Mp +Mp +Mp +Mp +IK +IK +Mp +Mp +IK +Jj +Mp +Mp +mk +rd +YQ +YQ +ZV +YQ +vK +YQ +YQ +cn +YQ +YQ +YQ +MW +YQ +YQ +YQ +YQ +YM +Wl +aP +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +aP +YM +vK +MW +YQ +YQ +CN +YQ +MW +YQ +CN +AF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(123,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +vK +YQ +YQ +cn +YQ +kr +YQ +YQ +YQ +YQ +YQ +YQ +YM +cn +vK +YQ +YQ +YQ +AF +vK +aP +YQ +VU +YQ +YQ +YQ +AF +mY +ZV +YQ +YQ +YQ +YQ +AF +aP +YQ +YQ +YQ +YQ +YQ +vK +cn +aP +YQ +nJ +YQ +CN +YQ +Pg +YQ +YQ +xD +YQ +cn +YQ +nJ +YQ +YQ +YQ +YQ +YQ +CN +YQ +kr +YQ +AF +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +CN +YQ +kr +YQ +cn +YQ +YQ +YM +wH +YQ +Sh +wH +wH +YQ +kr +YQ +Wl +YQ +YQ +YQ +cn +ZV +YQ +YQ +YQ +rF +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(124,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +Wl +ZV +YQ +YQ +AF +YQ +cn +rd +YQ +aP +YQ +AF +YQ +kr +MW +rd +Wl +YQ +YQ +cn +Wl +YQ +rd +YQ +YQ +YQ +cn +vK +YQ +wH +MW +ZV +YQ +rd +YQ +YQ +YQ +CN +rd +YQ +Pg +YQ +YQ +wH +YQ +AF +YQ +YQ +CN +YQ +kr +YQ +MW +YQ +YQ +CN +YQ +YQ +YQ +YQ +MW +YQ +rd +aP +YQ +YQ +YQ +YQ +wH +aP +YQ +YQ +YQ +wH +YQ +rd +vK +ZV +Wl +YQ +aP +vK +VU +rd +YQ +YM +YQ +YQ +rd +YQ +CN +YQ +rF +wH +rd +YQ +Pg +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(125,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rF +rd +EV +YQ +YQ +YQ +YQ +CN +Wl +YQ +YQ +YQ +YQ +YQ +Tw +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +YQ +YQ +hv +rd +YQ +YQ +YQ +CN +YQ +kr +YQ +YQ +cn +YQ +YQ +YQ +YM +cn +ZV +rd +cn +YQ +YQ +YQ +wH +aP +YQ +rd +AF +YQ +YQ +cn +vK +wH +rd +YQ +YQ +Wl +YQ +rd +YQ +YQ +Wl +rd +YQ +ZV +YQ +rd +Wl +YQ +YQ +YQ +CN +YQ +YQ +YQ +KM +Pg +AF +ZV +YQ +YQ +cn +YQ +YQ +YQ +Pg +Wl +kr +YQ +YQ +aP +CN +rd +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(126,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Wl +YQ +Pg +cn +YQ +YQ +YQ +YQ +YQ +CN +wH +YQ +YQ +aP +YQ +YQ +YQ +CN +YQ +YQ +YQ +wH +MW +YQ +YQ +YQ +YQ +YQ +Wl +Pg +YQ +YQ +YQ +YQ +cn +YQ +Pg +ZV +YQ +mY +wH +YQ +AF +YQ +kr +YQ +Wl +MW +YQ +kr +YQ +YQ +YQ +YQ +wH +YQ +Wl +rF +AF +kr +YQ +YQ +YQ +CN +YQ +YQ +YQ +CN +AF +YQ +YQ +YQ +CN +YQ +YM +Pg +YQ +YQ +YQ +YQ +YQ +YQ +Oz +YQ +YQ +MW +CN +rd +aP +YQ +YQ +AF +YQ +YQ +YM +YQ +YQ +cn +wH +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(127,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +CN +rd +KM +kr +YQ +YQ +YQ +YQ +YQ +YQ +mY +AF +YQ +YQ +YQ +ZV +YQ +kr +cn +YQ +Pg +Wl +YQ +kr +ZV +rd +YQ +AF +Wl +YQ +kr +YQ +PB +YQ +Wl +YQ +YQ +YQ +CN +aP +YQ +YQ +YQ +YQ +CN +YQ +YQ +ZV +AF +YQ +aP +YQ +CN +Pg +YQ +rd +YQ +cn +YQ +YQ +Pg +YQ +YQ +YQ +cn +ZV +YQ +aP +YQ +YQ +YQ +YQ +Pg +AF +MW +kr +wH +YQ +YQ +YQ +YQ +YQ +YQ +YQ +Wl +YQ +YQ +YQ +YQ +CN +YQ +wH +rd +YQ +YQ +YQ +Wl +vK +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(128,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +Wl +YQ +YQ +YQ +rd +YQ +YQ +YQ +YQ +CN +cn +YQ +Wl +YQ +kr +YQ +AF +YQ +YQ +YQ +YQ +CN +YQ +YQ +MW +YQ +YQ +YQ +CN +YQ +YQ +YQ +YQ +YQ +hv +YQ +MW +rF +YQ +vK +Wl +YQ +YQ +KM +YQ +YQ +YQ +CN +rF +YQ +YQ +YQ +YQ +YQ +YQ +YQ +CN +YQ +AF +rd +YQ +wH +kr +YQ +YQ +mY +vl +Pg +YQ +YQ +aP +CN +cn +YQ +YQ +YQ +CN +AF +YQ +YQ +YQ +CN +YQ +Pg +YQ +wH +YQ +AF +YQ +YQ +aP +cn +YQ +YQ +MW +CN +YQ +rF +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(129,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +wH +ZV +mY +YQ +YQ +YQ +CN +Wl +YQ +YQ +YQ +MW +vK +YQ +YQ +rd +YQ +wH +kf +rd +YQ +aP +Wl +YQ +YQ +YQ +CN +Wl +YQ +vK +YQ +YQ +YM +wH +YQ +YQ +YQ +AF +YQ +YQ +rd +YQ +YQ +Pg +AF +vK +rd +YQ +wH +Pg +rd +YQ +YQ +YM +AF +YQ +YQ +YQ +wH +YQ +YQ +YQ +CN +Wl +aP +YQ +YQ +CN +VU +dY +YQ +YQ +aP +YQ +Wl +YQ +YQ +YQ +YQ +rd +YQ +MW +YQ +Wl +YQ +YQ +YQ +Oz +YQ +YQ +vK +YQ +YQ +YM +Wl +YQ +YQ +rd +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(130,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +kr +MW +rd +YQ +vK +YQ +YQ +YM +Pg +kr +YQ +YQ +YQ +YQ +CN +Pg +YQ +YQ +YQ +CN +Pg +rd +YQ +YQ +cn +YQ +YQ +rd +YQ +YQ +YQ +MW +YQ +YQ +YQ +cn +YQ +YQ +YM +YQ +YQ +YQ +CN +YQ +aP +YQ +aP +cn +YQ +Wl +YQ +YQ +vK +YQ +kr +cn +aP +MW +YQ +YQ +YQ +rF +ZV +PB +YQ +YQ +YQ +vK +YQ +rd +wH +cn +kr +YQ +aP +YQ +rd +kf +YQ +Wl +YQ +cn +YQ +YQ +YQ +YQ +YQ +Wl +YQ +YQ +CN +YQ +YQ +AF +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(131,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +YQ +Xh +Pg +YQ +aP +YQ +YQ +YQ +YQ +ZV +rd +YQ +YQ +YQ +rd +YQ +YQ +YQ +vK +YQ +kr +YQ +AF +wH +YQ +kr +YQ +YQ +YQ +CN +rd +aP +YQ +YQ +CN +YQ +YQ +Pg +YQ +YQ +YQ +ZV +MW +YQ +YQ +YM +YQ +kr +YQ +YQ +YQ +CN +ZV +YQ +Wl +YQ +YQ +YQ +YM +cn +rd +YQ +vK +YQ +YQ +YM +aP +YQ +YQ +CN +ZV +YQ +YQ +YQ +CN +ZV +YQ +YQ +YQ +CN +YQ +YQ +YM +wH +YQ +Ak +YQ +cn +YQ +YQ +wH +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(132,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +YQ +YQ +CN +cn +wH +YQ +YQ +YQ +CN +wH +YQ +YQ +aP +YM +YQ +kr +AF +cn +YQ +YQ +YQ +YQ +YQ +CN +YQ +AF +YQ +YQ +YQ +YQ +YQ +kr +YQ +rd +wH +ZV +aP +vK +kr +wH +YQ +YQ +YQ +AF +Pg +YQ +YQ +YQ +YQ +rd +YQ +cn +YQ +YQ +YQ +CN +AF +YQ +YQ +kr +YQ +YQ +CN +wH +AF +YQ +YQ +YQ +YQ +Wl +wG +YQ +YQ +YQ +wH +YQ +YQ +YQ +YQ +kr +vK +aP +rd +YQ +YQ +YQ +rd +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(133,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +Pg +vl +YQ +YQ +YQ +YQ +YQ +rd +AF +YQ +YQ +YQ +YQ +kr +YQ +Wl +YQ +cn +MW +ZV +YQ +YQ +YQ +CN +YQ +YQ +MW +YQ +YQ +aP +YQ +YQ +YM +YQ +cn +Pg +YQ +Wl +YQ +AF +YQ +cn +YQ +YQ +YQ +CN +rd +YQ +YQ +YQ +CN +rF +wH +MW +Pg +YQ +YQ +YQ +YQ +Wl +mY +aP +YQ +YQ +YQ +YQ +YQ +cn +Pg +YQ +YQ +YM +YQ +AF +rd +AR +AR +AR +AR +AR +AR +Pg +YQ +mY +Wl +YQ +YQ +CN +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(134,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +CN +vK +YQ +YQ +YQ +CN +YQ +Pg +YQ +aP +AF +YQ +YQ +AR +AR +AR +AR +AR +YQ +Pg +YQ +YQ +EV +cn +YQ +YQ +YQ +CN +ZV +YQ +Wl +YQ +AF +YQ +AR +AR +AR +AR +AR +AR +rF +YQ +YQ +YQ +YQ +Wl +YQ +YQ +YQ +YQ +YQ +YQ +YM +YQ +aP +rd +YQ +YQ +YQ +CN +YQ +YQ +YM +MW +YQ +YQ +YQ +CN +wH +rd +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(135,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +cn +cn +Pv +YQ +YQ +Wl +YM +vK +cn +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +vK +YQ +kr +YQ +YQ +YQ +YQ +cn +rd +Pg +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +ZV +rF +wH +cn +mY +Pv +YQ +YQ +YQ +YQ +AF +vK +YQ +YQ +YQ +KM +AF +YQ +Pg +rd +YQ +YQ +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(136,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +wH +rd +YQ +AF +ZV +YQ +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +rd +Wl +YQ +wH +mY +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +YQ +CN +cn +YQ +kr +YQ +wH +Wl +YQ +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(137,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +YQ +YQ +YQ +ZV +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(138,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(139,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(140,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(141,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(142,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(143,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(144,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(145,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(146,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(147,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(148,1,1) = {" +bG +bG +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +AR +bG +bG +"} +(149,1,1) = {" +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +"} +(150,1,1) = {" +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +bG +"} diff --git a/_maps/RandomZLevels/away_mission/research.dmm b/_maps/RandomZLevels/away_mission/research.dmm index 4710d9829b..f1c0f989df 100644 --- a/_maps/RandomZLevels/away_mission/research.dmm +++ b/_maps/RandomZLevels/away_mission/research.dmm @@ -5371,7 +5371,7 @@ /area/awaymission/research/interior/dorm) "kS" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) "kT" = ( diff --git a/_maps/cogstation.dm b/_maps/cogstation.dm index 5c01aaec46..96ef15a5b8 100644 --- a/_maps/cogstation.dm +++ b/_maps/cogstation.dm @@ -1 +1 @@ -#define FORCE_MAP "_maps/cogstation.json" \ No newline at end of file +#define FORCE_MAP "_maps/cogstation.json" diff --git a/_maps/kilostation.dm b/_maps/kilostation.dm index d784be6e8f..5970c0d49e 100644 --- a/_maps/kilostation.dm +++ b/_maps/kilostation.dm @@ -1 +1 @@ -#define FORCE_MAP "_maps/kilostation.json" \ No newline at end of file +#define FORCE_MAP "_maps/kilostation.json" diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ce5539cee7..4eea726f74 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -350,7 +350,7 @@ /area/security/prison) "aaV" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/security/prison) "aaW" = ( @@ -1491,6 +1491,10 @@ /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard/fore) +"adu" = ( +/obj/effect/landmark/barthpot, +/turf/open/floor/wood, +/area/library) "adw" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -9502,6 +9506,9 @@ name = "Medbay"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "asV" = ( @@ -9529,6 +9536,9 @@ name = "Medbay"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "asY" = ( @@ -26752,7 +26762,6 @@ /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 }, -/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard) "blS" = ( @@ -28539,8 +28548,9 @@ /turf/open/floor/plasteel/white, /area/science/lab) "bqg" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bqh" = ( @@ -29181,18 +29191,16 @@ /turf/open/floor/plating, /area/maintenance/starboard) "brH" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, +/obj/item/cigbutt/cigarbutt, /turf/open/floor/plating, /area/maintenance/starboard) "brI" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "brJ" = ( @@ -29840,15 +29848,17 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "btp" = ( +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard) "btq" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Space Loop Out" + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" }, -/turf/open/floor/plating, /area/maintenance/starboard) "btr" = ( /obj/machinery/camera{ @@ -30971,15 +30981,13 @@ /turf/open/floor/plasteel/white, /area/science/explab) "bvQ" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/starboard) "bvR" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, +/obj/effect/decal/cleanable/oil, /turf/open/floor/plating, /area/maintenance/starboard) "bvS" = ( @@ -31632,11 +31640,12 @@ /turf/open/floor/plasteel/white, /area/science/explab) "bxt" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bxu" = ( @@ -38663,8 +38672,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bNC" = ( -/obj/structure/closet/wardrobe/grey, -/turf/open/floor/plating, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "bND" = ( /obj/structure/chair{ @@ -39605,8 +39614,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bPP" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "bPQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -42662,16 +42670,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bYr" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, /area/maintenance/starboard/aft) "bYs" = ( -/obj/structure/closet/crate, -/obj/item/clothing/under/color/lightpurple, -/obj/item/stack/spacecash/c200, +/obj/machinery/vending/boozeomat, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "bYt" = ( @@ -42935,6 +42947,9 @@ /area/science/circuit) "bZi" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bZj" = ( @@ -43304,13 +43319,23 @@ /turf/open/floor/plasteel, /area/science/misc_lab) "cac" = ( -/obj/structure/chair/stool, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "cad" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, /area/maintenance/starboard/aft) "cae" = ( /turf/open/floor/plating{ @@ -43743,18 +43768,12 @@ }, /area/maintenance/starboard/aft) "cbh" = ( -/obj/structure/table, -/obj/item/folder/white, -/obj/item/folder/white, -/obj/item/pen, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/turf/closed/wall/rust, +/area/science/mixing) "cbi" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 5 - }, +/obj/structure/barricade/wooden, +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cbj" = ( @@ -44476,14 +44495,17 @@ /turf/closed/wall, /area/maintenance/starboard/aft) "ccV" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ccW" = ( -/obj/structure/table, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/cleanable/blood/old, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ccX" = ( @@ -44647,9 +44669,7 @@ /area/engine/break_room) "cdu" = ( /obj/structure/closet/emcloset, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cdv" = ( @@ -44811,8 +44831,10 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "cdV" = ( -/obj/structure/table, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "2-4" + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "cdW" = ( /obj/machinery/power/apc{ @@ -45152,8 +45174,8 @@ /area/maintenance/starboard/aft) "ceT" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 +/obj/structure/sign/poster/ripped{ + pixel_y = 32 }, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -45372,11 +45394,8 @@ /turf/closed/wall/r_wall, /area/science/misc_lab) "cfv" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; - req_access_txt = "12" - }, -/turf/open/floor/plating, +/obj/structure/plasticflaps/opaque, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "cfw" = ( /turf/closed/wall/r_wall, @@ -45760,11 +45779,8 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cgy" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/chair/stool, -/turf/open/floor/plating, +/obj/machinery/light/floor, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "cgz" = ( /obj/structure/cable, @@ -46255,8 +46271,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "chH" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plating, +/turf/open/floor/light/colour_cycle/dancefloor_b, /area/maintenance/starboard/aft) "chI" = ( /obj/structure/cable{ @@ -51191,15 +51206,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"cyt" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 4" - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "cyu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -52756,6 +52762,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cNS" = ( @@ -52768,15 +52777,19 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cNT" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 8 + }, +/obj/machinery/meter, /turf/open/floor/plating, /area/maintenance/starboard) "cNU" = ( @@ -53332,6 +53345,14 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/bridge/meeting_room) +"cVw" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/tower, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "cVK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -53386,6 +53407,14 @@ /obj/machinery/meter, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"ddM" = ( +/obj/structure/sign/poster/official/the_owl{ + pixel_x = 32 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/starboard/aft) "dev" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53550,8 +53579,18 @@ /turf/open/floor/plasteel, /area/engine/atmos) "dBm" = ( -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plating, +/obj/machinery/light/floor, +/obj/structure/table, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -5; + pixel_y = 13 + }, +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ + pixel_x = 10; + pixel_y = 7 + }, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "dCr" = ( /obj/structure/pool/Rboard, @@ -53576,6 +53615,10 @@ }, /turf/open/floor/plasteel, /area/security/range) +"dEh" = ( +/obj/machinery/jukebox/disco/indestructible, +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/maintenance/starboard/aft) "dEX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/requests_console{ @@ -53589,6 +53632,10 @@ "dFX" = ( /turf/closed/wall, /area/crew_quarters/fitness/pool) +"dHp" = ( +/mob/living/simple_animal/bot/secbot/grievous/toy, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "dJL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53757,6 +53804,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/security/execution/transfer) +"eoD" = ( +/obj/structure/table/wood/poker, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "epD" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/machinery/light{ @@ -53835,6 +53886,15 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness) +"ewN" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/watermelon, +/obj/item/seeds/cannabis, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "exP" = ( /obj/item/kirbyplants{ icon_state = "plant-14" @@ -53914,6 +53974,14 @@ }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"eDz" = ( +/obj/structure/cable/white{ + icon_state = "2-8" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "eEe" = ( /obj/machinery/door/airlock{ name = "Theatre Backstage"; @@ -54024,6 +54092,13 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"eXL" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "fbp" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/bot, @@ -54097,6 +54172,16 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"fkW" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "flc" = ( /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, @@ -54112,6 +54197,14 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"flP" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/carrot, +/obj/item/seeds/cannabis/white, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "fne" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -54272,6 +54365,28 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"fxk" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/door/window/northright, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + 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/structure/cable/white{ + icon_state = "1-4" + }, +/obj/effect/decal/cleanable/blood/innards, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "fxx" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -54372,6 +54487,13 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/plasteel, /area/engine/atmos) +"fLN" = ( +/obj/machinery/chem_dispenser/drinks/beer{ + dir = 1 + }, +/obj/structure/table/wood/poker, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "fMp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, @@ -54657,6 +54779,14 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"gDZ" = ( +/obj/structure/chair/stool/bar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/maintenance/starboard/aft) +"gGK" = ( +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "gIU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -54667,6 +54797,16 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/space/nearstation) +"gKl" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "gLz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -54753,6 +54893,11 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) +"gRV" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/starboard/aft) "gRZ" = ( /obj/structure/bookcase{ name = "Forbidden Knowledge" @@ -54813,6 +54958,20 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"hbi" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/glowshroom, +/obj/item/seeds/cannabis/ultimate, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard/aft) "hcb" = ( /turf/open/floor/carpet, /area/crew_quarters/theatre) @@ -54835,7 +54994,7 @@ /area/engine/atmos) "hgO" = ( /obj/structure/table, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = 4; pixel_y = 4 }, @@ -54846,6 +55005,18 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/electrical) +"hke" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 1 + }, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "hlT" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock"; @@ -55020,6 +55191,21 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"hTt" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"hUJ" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/machinery/light/floor, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "hWd" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -55044,6 +55230,16 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, /area/security/range) +"ifJ" = ( +/obj/machinery/biogenerator, +/obj/structure/sign/poster/contraband/have_a_puff{ + pixel_y = -32 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "iiW" = ( /turf/open/floor/wood, /area/maintenance/bar) @@ -55076,6 +55272,14 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"iky" = ( +/obj/effect/turf_decal/weather/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "imk" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -55087,6 +55291,14 @@ /obj/structure/falsewall, /turf/open/floor/plating, /area/maintenance/bar) +"imZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/starboard/aft) "inq" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -55177,6 +55389,20 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"ixd" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/drinks/beer, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) +"iyG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + brightness = 3; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "izg" = ( /obj/item/cigbutt/cigarbutt, /turf/open/floor/plating, @@ -55213,6 +55439,20 @@ }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"iIs" = ( +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/blood/gibs/ipc/limb, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "iIS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -55259,6 +55499,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"iQc" = ( +/obj/structure/chair/stool/bar, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "iRj" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -55306,6 +55551,18 @@ /obj/item/coin/silver, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"iWK" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "iYE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -55425,6 +55682,15 @@ /obj/item/beacon, /turf/open/floor/plasteel/white, /area/science/circuit) +"jsO" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/glowshroom, +/obj/item/seeds/corn, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "jtj" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/stripes/line{ @@ -55558,6 +55824,14 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"jGw" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "jGI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -55594,6 +55868,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "jIj" = ( @@ -55608,6 +55885,13 @@ }, /turf/open/space, /area/solar/starboard/fore) +"jIy" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "jJF" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -55774,12 +56058,20 @@ }, /turf/open/floor/plating, /area/storage/tech) +"kfS" = ( +/turf/closed/wall/rust, +/area/maintenance/starboard/aft) "kfX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /turf/closed/wall/r_wall, /area/engine/engine_smes) +"kgk" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard) "kgr" = ( /obj/machinery/light/small{ brightness = 3; @@ -55812,11 +56104,15 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"kls" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) +"kiY" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "kmw" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -55953,7 +56249,10 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "kAJ" = ( -/obj/machinery/portable_atmospherics/pump, +/obj/structure/table/wood/poker, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/maintenance/starboard/aft) "kAO" = ( @@ -56036,6 +56335,14 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"kIN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/wood/normal, +/obj/machinery/light/small/broken{ + dir = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "kJE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -56076,6 +56383,15 @@ /obj/structure/disposalpipe/junction/flip, /turf/open/floor/plasteel, /area/hallway/primary/central) +"kQe" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "kQk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -56158,6 +56474,21 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/security/range) +"leE" = ( +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/human/body, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "lfV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -56229,6 +56560,14 @@ icon_state = "wood-broken6" }, /area/maintenance/bar) +"lre" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/syndicate{ + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lsk" = ( /obj/machinery/vending/kink, /turf/open/floor/plasteel, @@ -56280,6 +56619,15 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"lBd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "lBz" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -56369,12 +56717,25 @@ }, /turf/open/floor/carpet, /area/crew_quarters/theatre) +"lUP" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lUS" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"lXy" = ( +/obj/machinery/light, +/obj/item/light/tube/broken, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "lZl" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -56552,6 +56913,17 @@ icon_state = "wood-broken5" }, /area/maintenance/bar) +"mqo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "mqZ" = ( /obj/item/reagent_containers/glass/beaker, /turf/open/floor/plating, @@ -56560,6 +56932,13 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/wood, /area/maintenance/bar) +"mug" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/mob/living/simple_animal/bot/mulebot, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "mvt" = ( /obj/machinery/airalarm{ dir = 1; @@ -56596,6 +56975,21 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"mDZ" = ( +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/slime/limb, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "mGw" = ( /obj/machinery/door/airlock/security{ name = "Labor Shuttle"; @@ -56608,6 +57002,26 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/security/range) +"mHA" = ( +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, +/obj/structure/rack, +/obj/item/seeds/wheat, +/obj/item/seeds/watermelon, +/obj/item/seeds/watermelon, +/obj/item/seeds/grape, +/obj/item/seeds/glowshroom, +/obj/item/seeds/cannabis/rainbow, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "mHU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/light_construct{ @@ -56631,6 +57045,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre) +"mLS" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "mNi" = ( /obj/machinery/light_switch{ pixel_x = -20 @@ -56834,6 +57254,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"nnM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) +"noa" = ( +/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "noy" = ( /obj/structure/sign/poster/contraband/smoke{ desc = "This poster reminds us all that the Detective is a parasite. Year after year, they must get replacement lungs because of their addiction. "; @@ -56847,6 +57278,23 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) +"noT" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/maintenance/starboard/aft) +"nsf" = ( +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nss" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -56884,6 +57332,14 @@ }, /turf/open/floor/plating, /area/construction) +"nzB" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/grass, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "nzR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -56930,6 +57386,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"nJP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "nJQ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/dark/visible, @@ -56969,10 +57432,13 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "nRG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/structure/cable/white{ + icon_state = "4-8" }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "nSt" = ( /obj/effect/turf_decal/tile/neutral{ @@ -57027,6 +57493,16 @@ /obj/item/gun/ballistic/revolver/nagant, /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) +"nYK" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/table/wood/poker, +/obj/item/clothing/glasses/sunglasses/big, +/obj/item/stack/spacecash/c10{ + pixel_x = 8; + pixel_y = 8 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "nYT" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/yellow/visible{ @@ -57154,6 +57630,21 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"olh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/blood/gibs/human/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "olr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, @@ -57305,6 +57796,12 @@ }, /turf/open/floor/carpet, /area/crew_quarters/dorms) +"oBQ" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop In" + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "oDm" = ( /obj/machinery/gulag_teleporter, /turf/open/floor/plasteel, @@ -57363,12 +57860,20 @@ }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"oMT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "oNz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"oQP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "oSl" = ( /obj/machinery/door/airlock/security{ name = "Firing Range"; @@ -57413,6 +57918,11 @@ }, /turf/closed/wall/r_wall, /area/engine/atmos) +"oYQ" = ( +/obj/structure/chair/stool, +/mob/living/simple_animal/bot/medbot, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "oZl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/closet/wardrobe/pjs, @@ -57422,6 +57932,33 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"paJ" = ( +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"pcK" = ( +/mob/living/simple_animal/bot/cleanbot{ + name = "C.L.E.A.N." + }, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) +"pcQ" = ( +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/dirt, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "pem" = ( /obj/machinery/button/door{ desc = "Bolts the doors to the Private Study."; @@ -57456,6 +57993,21 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) +"pkS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/blood/gibs/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "plC" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -57614,6 +58166,21 @@ /obj/item/target/syndicate, /turf/open/floor/plating, /area/security/range) +"pDG" = ( +/obj/structure/closet, +/obj/item/clothing/glasses/science, +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"pFY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/kirbyplants{ + icon_state = "plant-06" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -57750,6 +58317,14 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"pYQ" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/obj/structure/sign/poster/official/hydro_ad{ + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qaY" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, @@ -57828,6 +58403,12 @@ }, /turf/closed/wall, /area/quartermaster/miningdock) +"qlY" = ( +/obj/item/kirbyplants/random, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard/aft) "qmn" = ( /obj/machinery/computer/libraryconsole/bookmanagement, /obj/structure/table, @@ -57842,6 +58423,23 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet) +"qtw" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"qtH" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "qus" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -57877,12 +58475,35 @@ /obj/structure/lattice, /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) +"qEB" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/berry, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"qFf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "qIw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/carpet, /area/crew_quarters/cryopod) +"qIO" = ( +/turf/open/floor/plating/rust, +/area/maintenance/starboard/aft) "qJr" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -57907,6 +58528,25 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/dorms) +"qMv" = ( +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/door/window/eastleft, +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "qOc" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -57927,6 +58567,13 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) +"qSF" = ( +/obj/item/seeds/bee_balm/honey_balm, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "qTG" = ( /obj/machinery/light{ dir = 8 @@ -57956,6 +58603,23 @@ /obj/structure/chair/sofa/left, /turf/open/floor/plasteel, /area/security/prison) +"qXJ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) +"rba" = ( +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/structure/cable/white, +/obj/effect/spawner/structure/window/hollow/reinforced/end{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rcD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -58019,6 +58683,16 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) +"rgW" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-2" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rhX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -58042,9 +58716,16 @@ /turf/open/floor/plasteel, /area/engine/atmos) "rmX" = ( -/obj/structure/table, -/obj/item/reagent_containers/food/drinks/beer, -/turf/open/floor/plating, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/item/light/bulb/broken, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, /area/maintenance/starboard/aft) "rnt" = ( /obj/structure/chair/comfy/black{ @@ -58115,6 +58796,12 @@ /obj/item/clothing/under/dress/sundress, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"rsp" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "rtl" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -58299,6 +58986,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/fore) +"rSf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/sign/poster/contraband/random{ + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "rTo" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -58321,6 +59022,21 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"rVy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "rVN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/orange/visible{ @@ -58344,6 +59060,18 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"rZQ" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -58443,6 +59171,9 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) +"srk" = ( +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "srG" = ( /obj/machinery/airalarm{ dir = 1; @@ -58512,6 +59243,21 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"sAH" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral{ + 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/item/storage/toolbox/emergency, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "sAM" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -58574,6 +59320,19 @@ }, /turf/open/floor/plasteel, /area/hydroponics) +"sJw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Bay Mining Dock"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -58626,6 +59385,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sMG" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) "sNK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable{ @@ -58638,6 +59405,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/abandoned, +/obj/structure/cable/white{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sOA" = ( @@ -58677,6 +59447,14 @@ /obj/structure/chair/office/light, /turf/open/floor/plasteel/white, /area/science/circuit) +"sVD" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/box/matches{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "sWR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -58787,6 +59565,18 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"tsq" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 9 + }, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ttL" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -58885,6 +59675,20 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"tHy" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/item/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "tJi" = ( /obj/machinery/airalarm{ dir = 4; @@ -58990,6 +59794,18 @@ }, /turf/open/space/basic, /area/space/nearstation) +"tTc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"tTw" = ( +/obj/structure/girder, +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "tWj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -59102,6 +59918,20 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"uhq" = ( +/obj/effect/turf_decal/tile/neutral{ + 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/decal/cleanable/blood/gibs/human/lizard/body, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "ujv" = ( /obj/structure/sign/departments/restroom, /turf/closed/wall, @@ -59156,6 +59986,14 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"uqu" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/cultivator, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "usE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, @@ -59191,6 +60029,11 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/maintenance/bar) +"uwN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "uxY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ @@ -59203,6 +60046,33 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"uys" = ( +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/structure/cable/white{ + icon_state = "0-8" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"uzm" = ( +/obj/effect/decal/cleanable/vomit/old, +/obj/effect/landmark/blobstart, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/maintenance/starboard/aft) "uzs" = ( /turf/open/floor/plasteel/yellowsiding{ dir = 4 @@ -59379,6 +60249,11 @@ /obj/machinery/power/terminal, /turf/closed/wall/r_wall, /area/engine/gravity_generator) +"uRn" = ( +/obj/structure/chair/stool, +/mob/living/simple_animal/opossum, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "uRS" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -59404,6 +60279,16 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) +"uUP" = ( +/obj/structure/cable/white, +/obj/structure/cable/white{ + icon_state = "0-4" + }, +/obj/effect/spawner/structure/window/hollow/reinforced/directional{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "uVS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59468,6 +60353,11 @@ }, /turf/open/floor/plating, /area/security/range) +"vdo" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "vdu" = ( /obj/structure/table/wood, /obj/machinery/airalarm{ @@ -59583,11 +60473,22 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) +"vsr" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/maintenance/starboard/aft) "vsM" = ( /obj/machinery/power/apc/auto_name/south, /obj/structure/cable, /turf/open/floor/carpet, /area/crew_quarters/cryopod) +"vsO" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood{ + icon_state = "wood-broken2" + }, +/area/maintenance/starboard/aft) "vsT" = ( /obj/structure/closet/crate, /obj/item/book/manual/wiki/telescience, @@ -59616,12 +60517,9 @@ /turf/open/floor/wood, /area/library) "vxh" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" +/turf/open/floor/plating{ + icon_state = "platingdmg1" }, -/turf/open/floor/plating, /area/maintenance/starboard/aft) "vxX" = ( /obj/machinery/door/airlock/external{ @@ -59972,6 +60870,14 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) +"wjd" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wje" = ( /obj/structure/rack, /obj/item/instrument/banjo, @@ -59980,9 +60886,26 @@ /obj/item/instrument/recorder, /turf/open/floor/plating, /area/maintenance/fore) +"wkc" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "wkN" = ( /turf/closed/wall, /area/science/circuit) +"wly" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 4; + name = "4maintenance loot spawner" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wlI" = ( /obj/machinery/holopad, /turf/open/floor/plasteel/showroomfloor, @@ -60041,6 +60964,14 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) +"wqW" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/maintenance/starboard) "wrp" = ( /obj/machinery/light{ dir = 8 @@ -60050,6 +60981,16 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"wuO" = ( +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 2; + name = "2maintenance loot spawner" + }, +/obj/structure/rack, +/obj/effect/spawner/lootdrop/costume, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wvg" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -60156,6 +61097,19 @@ /obj/item/hand_labeler, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"wVg" = ( +/obj/item/kirbyplants/random, +/obj/item/storage/firstaid/regular{ + pixel_y = 5 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/starboard/aft) +"wVN" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "wWi" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -60245,6 +61199,19 @@ }, /turf/open/space, /area/space/nearstation) +"xcz" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/onion, +/obj/structure/sign/poster/contraband/ambrosia_vulgaris{ + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "xgk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -60257,6 +61224,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xgs" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "xgC" = ( /obj/structure/cable{ icon_state = "0-4" @@ -60506,9 +61477,8 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "xIa" = ( -/obj/structure/table, -/obj/effect/spawner/lootdrop/grille_or_trash, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, /area/maintenance/starboard/aft) "xJC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -60658,6 +61628,13 @@ }, /turf/open/floor/plating, /area/security/processing) +"xWs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/wood/normal{ + dir = 1 + }, +/turf/open/floor/plasteel/grimy, +/area/maintenance/starboard/aft) "xXi" = ( /obj/machinery/vending/clothing, /turf/open/floor/plasteel, @@ -60683,6 +61660,13 @@ }, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) +"yaW" = ( +/obj/machinery/hydroponics/soil{ + pixel_y = 8 + }, +/obj/item/seeds/ambrosia, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "ycd" = ( /obj/structure/toilet/secret/low_loot{ dir = 4 @@ -67571,7 +68555,7 @@ aaa aaa aaa aaa -aaa +gDl aaa aaa aaa @@ -68080,10 +69064,10 @@ aaa aaa aaa aaa +rZQ aaa aaa -aaa -aae +aoV aaa aaa aaa @@ -68335,11 +69319,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +kiY +awW +aaf aaa aaa aaa @@ -68592,11 +69576,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +auP +awW +aaf aaa aaa aaa @@ -68849,11 +69833,11 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa +arB +awW +qtw +awW +arB aaa aaa aaa @@ -69106,12 +70090,12 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa -aoV +arB +tHy +ayl +sJw +arB +aaf aaa aaa aaa @@ -69363,12 +70347,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aoV +awW +lBd +ayl +rsp +awW +aaf aaa aaa aaa @@ -69620,15 +70604,15 @@ aaa aaa aaa aaa +awW +lBd +ayl +wjd +awW aaf aaa aaa aaa -aaf -kls -aaa -aaa -aaa aaa aaa aaa @@ -69878,9 +70862,9 @@ aaa aaa aaa arB -arB -arB -arB +mqo +ayn +pFY aAC aaf aaa @@ -70135,7 +71119,7 @@ aaa aaa aaa arB -awZ +iWK ayk awW aAD @@ -70396,7 +71380,7 @@ awZ ayl beK auP -cyt +cyu cyd aaa aaa @@ -93272,9 +94256,9 @@ aZV aZV aZV aZV -bmx -bmx -bmx +aZV +aZV +aZV bqH bqH btM @@ -104567,7 +105551,7 @@ aIt aPd aIt aPb -aIt +adu aXu aYW bat @@ -111301,9 +112285,9 @@ cNW cNW clt cNW +wVN cNW -cNW -cNW +cQw cjD cjD cjD @@ -111541,30 +112525,30 @@ bLk bEs bNC nRG -cbf -cbf -cbf -cbf -cbf -cbf -cbf +kIN +nYK +xWs +uwN +lre +oQP +oQP bYr -cbf -clr +fLN +cNW cad cbi -cNW +iyG ccW -cdV +cNW clt cNW -cgy -ccV +cfv cNW -aaa -aaa -aaf -aaf +mug +hUJ +ixd +cNW +ktS aaf aaf aaf @@ -111796,31 +112780,31 @@ bIU bKe bLj bEs -bNB +cdV cac bPP -cNW -cNW -cNW -cNW -cNW -cNW -cNW +cOe +gRV +gDZ +eoD +sVD +kQe +imZ kAJ -clt -cac -cbh cNW +rSf +cNW +wly ccV -cOe -clt -cfv -cBL -cOe +noa +clu +cNW +xgs +srk +srk +srk +oYQ cNW -aaf -aaa -aaa aaa aaf aaa @@ -112032,14 +113016,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +gXs +jIy +nJP +jIy +nJP +gXs bky -btp +kgk brH bvQ bxt @@ -112056,29 +113040,29 @@ bEs rmX xIa vxh -cNW -aaa -aaa -aaf -aaa -aaf -cNW +cOe +bPP +bPP +bPP +vsO +iQc +sMG bYs -nRG -ciJ -cbf -cbf -cbf -cbf +ccU +nnM +cNW +wuO +pDG +cNW ceT cNW -dBm +gGK chH +dEh +srk +gGK cNW -aaf -aaf -aaa -aaf +ktS aaf aaf aaf @@ -112290,15 +113274,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +qtH +eXL +qXJ +eXL +vdo bZi bqg -brG -brG +oBQ +wqW cNR brG brG @@ -112310,31 +113294,31 @@ rNc bEs bLm bEs -cOT -cOT -cOT -cNW -aaa -aaa -aaf -aaa -aaf +jGw +hke +fkW +fkW +fkW +fkW +uUP +noT cNW cNW -cOT -cOT -cOT +cNW +cNW +tTw +cNW cNW cNW cNW cPH cNW +gGK +pcK +srk +dHp +uRn cNW -cNW -cNW -aaf -aaf -aaa aaa aaf aaa @@ -112547,18 +113531,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +eXL +vdo +vdo +vdo +vdo bZi btq brI bvR cNS byx -brI +wkc bky bky bEs @@ -112566,32 +113550,32 @@ bGc bGc bEs bLl -bEs -aaf -aaa -aaa -aaf -aaa -aaa -aaf -aaa -aaa -aag -aaf -aaa -aaa -aaa -aaf -aaf +cbh +eDz +fxk +iIs +qFf +pcQ +leE +hTt +vsr +cNW +hbi +uqu +yaW +iky +cNW +mHA +ifJ cNW ceU cNW -aaa -aaa -aaa -aaf -aaa -aaa +cgy +gGK +gGK +uRn +dBm +cNW aaa aaf aaa @@ -112808,7 +113792,7 @@ aaa aaa aaa aaa -aaa +gXs bky bky bky @@ -112823,33 +113807,33 @@ gXs gXs aaf aaa -aaf -gXs -aaa -aaa -aaf -aaa -aaa -aaf -aaa -aaa -aag -aaf -aaa -aaa -aaa -aaa -aaf +cNW +bPP +tsq +pkS +olh +cOe +rVy +hTt +cOe +wVN +pYQ +mLS +qIO +qSF +lUP +tTc +vxh cNW cOe cNW -aaf -aaf -aaf -aaf -aaf -aaf -aaf +cNW +cNW +cNW +cNW +cNW +cNW +ktS aaf aaf aaf @@ -113080,30 +114064,30 @@ aaa aaa aaf aaa -aaf -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaa -aaa -aaa -aaf +cOT +bPP +uys +qFf +sAH +uzm +uhq +hTt +lXy +kfS +ewN +qEB +nzB +xcz +cVw +jsO +flP cNW cPI cNW -aaf +gXs aaa aaa -aaf +gXs aaa aaa aaa @@ -113337,24 +114321,24 @@ aaa aaa aaf aaa -aaf -aaa -aaa -aaa -aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaa -aaa -gXs -aag +cOT +bPP +uys +mDZ +oMT +qFf +qFf +hTt +qIO +cNW +cNW +cNW +cNW +cNW +cNW +cNW +cNW +cNW aag aag gXs @@ -113594,19 +114578,19 @@ aaa aaa aaf aaa -aaf +cNW +bPP +nsf +rgW +rgW +gKl +qMv +rba +cae +cOT aaa aaa aaa -aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa aaa aaa aaa @@ -113851,19 +114835,19 @@ aaa aaa aaf aaa -aaf +cNW +qlY +paJ +bPP +bPP +bPP +bPP +ddM +wVg +cOT aaa aaa aaa -aag -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa aaa aaa aaa @@ -114108,16 +115092,16 @@ aaa aaa aaf aaa -aaf -aaa -aaa -aaa -aag -aaa -aaa -aaa -aaa -aaa +cNW +cNW +cNW +cOT +cOT +cOT +cOT +cNW +cNW +cNW aaa aaa aaa @@ -114365,11 +115349,11 @@ aaa aaa aaf aaa -aaf +gXs aaa aaa aaa -aag +gXs aaa aaa aaa @@ -114626,7 +115610,7 @@ aaf aaa aaa aaa -aag +aaa aaa aaa aaa @@ -114883,7 +115867,7 @@ aaf aaa aaa aaa -aaf +aaa aaa aaa aaa diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 9b260f0133..be0c53aab4 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -3,11 +3,8 @@ /turf/open/space/basic, /area/space) "aab" = ( -/obj/structure/sign/poster/official/anniversary_vintage_reprint, -/turf/closed/wall/r_wall, -/area/science/research{ - name = "Research Sector" - }) +/turf/closed/wall, +/area/crew_quarters/abandoned_gambling_den) "aac" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 @@ -662,6 +659,10 @@ }, /turf/open/floor/plating/airless, /area/router/aux) +"abF" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/closed/wall, +/area/crew_quarters/abandoned_gambling_den) "abG" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -699,6 +700,10 @@ /obj/item/paper/fluff/cogstation/cluwne, /turf/open/floor/plating, /area/crew_quarters/theatre/clown) +"abJ" = ( +/obj/machinery/computer/arcade/orion_trail, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "abK" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -802,6 +807,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"abZ" = ( +/obj/machinery/computer/arcade/minesweeper, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aca" = ( /obj/machinery/conveyor/auto{ dir = 5; @@ -840,6 +849,10 @@ }, /turf/open/floor/plating/airless, /area/router/aux) +"acf" = ( +/obj/machinery/computer/arcade, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "acg" = ( /obj/machinery/light{ dir = 8; @@ -862,9 +875,7 @@ /area/hallway/secondary/entry) "aci" = ( /turf/closed/wall, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "acj" = ( /obj/machinery/conveyor/auto{ dir = 4; @@ -1020,6 +1031,21 @@ /obj/structure/rack, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) +"acz" = ( +/obj/structure/closet/crate, +/obj/item/gun/ballistic/shotgun/toy/unrestricted, +/obj/item/gun/ballistic/shotgun/toy/unrestricted, +/obj/item/toy/gun, +/obj/item/toy/sword, +/obj/item/toy/sword, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) +"acA" = ( +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "acB" = ( /obj/machinery/conveyor{ dir = 6; @@ -1103,9 +1129,7 @@ "acK" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "acL" = ( /obj/machinery/door/poddoor{ id = "executionspaceblast" @@ -1250,6 +1274,12 @@ }, /turf/closed/wall/r_wall, /area/security/brig) +"adc" = ( +/obj/structure/sign/poster/official/foam_force_ad{ + pixel_y = 32 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "add" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 @@ -1479,6 +1509,10 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/stairs/medium, /area/security/brig) +"adL" = ( +/obj/structure/chair/stool, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "adM" = ( /turf/closed/wall, /area/crew_quarters/observatory) @@ -1539,9 +1573,7 @@ }, /obj/item/stamp, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "adS" = ( /turf/closed/wall, /area/construction) @@ -1664,11 +1696,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aej" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on, -/turf/open/floor/plating/airless, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/chair/stool, +/obj/effect/landmark/start/assistant, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aek" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -1881,10 +1912,13 @@ /turf/open/floor/plating, /area/maintenance/fore) "aeI" = ( -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/chair/stool, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aeJ" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -2453,11 +2487,11 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/observatory) "agc" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "agd" = ( /obj/structure/fans/tiny/invisible, /obj/docking_port/stationary{ @@ -2641,11 +2675,9 @@ /turf/open/floor/plating, /area/maintenance/fore) "agC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "agD" = ( /obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, @@ -2761,15 +2793,11 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/observatory) "agT" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/suit_storage_unit/engine, -/obj/machinery/light/small{ +/obj/machinery/vr_sleeper{ dir = 8 }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "agU" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow{ @@ -4853,10 +4881,18 @@ /turf/open/floor/plating, /area/construction/secondary) "alZ" = ( -/turf/closed/wall/r_wall, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/vr_sleeper{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/structure/sign/poster/official/soft_cap_pop_art{ + pixel_x = -32 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "ama" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -5348,9 +5384,7 @@ /area/construction/secondary) "ang" = ( /turf/closed/wall/r_wall, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "anh" = ( /obj/structure/window/reinforced{ dir = 4 @@ -5374,9 +5408,7 @@ req_access_txt = "5" }, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "ani" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/red, @@ -5447,10 +5479,15 @@ }, /area/chapel/main) "anq" = ( -/turf/closed/wall, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/vr_sleeper{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anr" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ @@ -5571,13 +5608,11 @@ /turf/open/floor/plasteel/dark/corner, /area/hallway/secondary/entry) "anE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/chair/stool, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anF" = ( /obj/machinery/smartfridge, /turf/closed/wall, @@ -5603,11 +5638,15 @@ /turf/open/floor/plating, /area/security/checkpoint) "anI" = ( -/obj/machinery/computer/arcade/orion_trail, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/light_switch{ + pixel_x = -24 + }, +/obj/machinery/camera{ + c_tag = "Arcade"; + dir = 4 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anJ" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red, @@ -5648,11 +5687,9 @@ /turf/closed/wall/r_wall, /area/security/detectives_office) "anL" = ( -/obj/machinery/computer/arcade/minesweeper, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anM" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/tile/yellow{ @@ -5695,11 +5732,11 @@ /turf/open/floor/plasteel, /area/storage/tools) "anP" = ( -/obj/machinery/computer/arcade, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/structure/sign/poster/official/nanomichi_ad{ + pixel_x = 32 + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anQ" = ( /obj/structure/chair{ dir = 4 @@ -5744,10 +5781,9 @@ /turf/open/floor/plasteel, /area/storage/tools) "anT" = ( -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/vending/snack/random, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "anU" = ( /turf/closed/wall/r_wall, /area/security/brig) @@ -5829,18 +5865,13 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms/purple) "aof" = ( -/obj/structure/sign/poster/official/foam_force_ad{ - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/vending/games, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aog" = ( -/turf/open/floor/grass, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/abandoned_gambling_den) "aoh" = ( /obj/machinery/light_switch{ pixel_y = -24 @@ -6127,11 +6158,12 @@ /turf/closed/wall/r_wall, /area/router/service) "aoL" = ( -/obj/structure/chair/stool, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ name = "Arcade" - }) + }, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aoM" = ( /obj/structure/closet/crate, /obj/item/stock_parts/matter_bin, @@ -6233,12 +6265,13 @@ /turf/open/floor/plating, /area/router/service) "aoU" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/assistant, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ name = "Arcade" - }) + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/carpet/arcade, +/area/crew_quarters/abandoned_gambling_den) "aoV" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -6322,11 +6355,11 @@ /turf/open/floor/plasteel, /area/security/brig) "apd" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/closed/wall/r_wall, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "ape" = ( /obj/structure/grille, /turf/open/floor/plating, @@ -6376,13 +6409,8 @@ /turf/open/floor/wood, /area/crew_quarters/fitness) "apm" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, /turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/crew_quarters/fitness/pool) "apn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6463,35 +6491,28 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/fitness) "apy" = ( -/obj/machinery/vr_sleeper{ - dir = 4 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/closed/wall, +/area/crew_quarters/fitness/pool) "apz" = ( -/obj/machinery/vr_sleeper{ - dir = 8 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "apA" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall, /area/crew_quarters/dorms/purple) "apB" = ( -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/grass, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Pool" + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel/white/side, +/area/crew_quarters/fitness/pool) "apC" = ( /turf/closed/wall/r_wall, /area/hydroponics) @@ -6520,14 +6541,16 @@ /turf/open/floor/plasteel, /area/hydroponics) "apG" = ( -/mob/living/simple_animal/chicken{ - name = "Featherbottom"; - real_name = "Featherbottom" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Pool" }, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white/side, +/area/crew_quarters/fitness/pool) "apH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6709,11 +6732,15 @@ /turf/open/floor/plating, /area/construction/secondary) "aqc" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/r_wall, -/area/medical{ - name = "Medical Booth" - }) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/medical/glass{ + name = "Medical Booth"; + req_access_txt = "5" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/medical/medbay) "aqd" = ( /obj/structure/chair/sofa/right, /obj/machinery/camera{ @@ -6793,10 +6820,9 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aqn" = ( +/obj/structure/sign/departments/medbay/alt, /turf/closed/wall/r_wall, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aqo" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -6982,32 +7008,13 @@ /turf/open/floor/plating, /area/hallway/secondary/service) "aqO" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering EVA"; - req_access_txt = "11" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "aqP" = ( -/obj/structure/chair/stool, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/pool/controller, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "aqQ" = ( /turf/closed/wall/r_wall, /area/crew_quarters/kitchen/backroom) @@ -7020,29 +7027,22 @@ /turf/open/floor/plating, /area/crew_quarters/theatre/clown) "aqS" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/light_switch{ - pixel_x = -24 +/obj/structure/table, +/obj/item/toy/beach_ball{ + pixel_y = 12 }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "aqT" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/chair/comfy/teal, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "aqU" = ( /turf/closed/wall/r_wall, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/medical/medbay) "aqV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -7336,13 +7336,15 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/dorms/blue) "arB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 +/obj/structure/table, +/obj/item/clothing/glasses/sunglasses{ + pixel_y = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arC" = ( /obj/structure/sign/warning/fire{ desc = "A sign that states the labeled room's number."; @@ -7376,14 +7378,16 @@ /turf/closed/wall/r_wall, /area/maintenance/starboard/central) "arF" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "hot loop to space" +/obj/structure/chair/comfy/teal, +/obj/machinery/light{ + dir = 1; + light_color = "#cee5d2" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -7449,34 +7453,48 @@ /turf/open/floor/plating, /area/router/service) "arN" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "gas to sauna" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/item/kirbyplants{ + icon_state = "plant-02" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arO" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arP" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arQ" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arR" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7525,22 +7543,11 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms/purple) "arV" = ( -/obj/machinery/vr_sleeper{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/structure/sign/poster/official/soft_cap_pop_art{ - pixel_x = -32 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/closed/wall, +/area/crew_quarters/fitness/pool) "arW" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -7551,27 +7558,37 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "arX" = ( -/obj/machinery/computer/med_data{ +/obj/structure/table, +/obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) -"arY" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/item/stack/medical/gauze, +/obj/item/reagent_containers/blood, +/obj/item/stack/medical/suture, +/obj/item/stack/medical/mesh, +/obj/structure/extinguisher_cabinet{ + pixel_x = -26 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/plasteel/white, +/area/medical/medbay) +"arY" = ( +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "arZ" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -7580,13 +7597,9 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms/purple) "asa" = ( -/obj/machinery/computer/arcade, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asb" = ( /obj/machinery/airalarm{ dir = 1; @@ -7662,13 +7675,11 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/dorms/blue) "asi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asj" = ( /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/segment{ @@ -7795,16 +7806,17 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ast" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" +/obj/machinery/computer/med_data{ + dir = 4 }, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "asu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7812,31 +7824,30 @@ /turf/closed/wall/rust, /area/maintenance/disposal) "asv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asw" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"asx" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) +"asx" = ( +/obj/machinery/pool/filter{ + pixel_y = 16 + }, +/turf/open/pool, +/area/crew_quarters/fitness/pool) "asy" = ( /obj/effect/landmark/start/assistant, /obj/machinery/holopad, @@ -7861,31 +7872,21 @@ /turf/open/floor/plating, /area/router/service) "asB" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/pool, +/area/crew_quarters/fitness/pool) "asC" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 +/obj/structure/pool/ladder{ + dir = 2; + pixel_y = 24 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/pool, +/area/crew_quarters/fitness/pool) "asD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asE" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -7909,11 +7910,18 @@ /turf/open/floor/plasteel, /area/security/processing) "asG" = ( -/obj/structure/sign/warning/nosmoking/circle, -/turf/closed/wall/r_wall, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/structure/chair/office/light{ + dir = 1; + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "asH" = ( /obj/machinery/camera{ c_tag = "Port Bow Solar Maintenance"; @@ -7931,47 +7939,53 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "asI" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister/toxins, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "asJ" = ( /turf/closed/wall, /area/crew_quarters/toilet) "asK" = ( -/obj/machinery/vr_sleeper{ - dir = 8 +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 }, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asL" = ( /turf/closed/wall, /area/security/brig) "asM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/structure/bed/roller, +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "asN" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7998,16 +8012,15 @@ /turf/open/floor/plasteel, /area/router/service) "asR" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/light_switch{ + pixel_x = 24 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "asS" = ( -/turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/pool/drain, +/turf/open/pool, +/area/crew_quarters/fitness/pool) "asT" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -8019,16 +8032,9 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "asU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Router"; - req_access_txt = "11" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/pool/Lboard, +/turf/open/pool, +/area/crew_quarters/fitness/pool) "asV" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden, /turf/open/floor/plasteel, @@ -8079,14 +8085,12 @@ /turf/open/floor/plasteel, /area/security/main) "atb" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/pool/Rboard, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "atc" = ( /turf/closed/wall, /area/security/main) @@ -8535,7 +8539,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -8712,22 +8716,24 @@ /turf/open/floor/carpet/purple, /area/crew_quarters/dorms/purple) "auC" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "auD" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "auE" = ( /obj/structure/bed, /obj/item/clothing/glasses/sunglasses/blindfold, @@ -8795,16 +8801,16 @@ /turf/open/floor/plasteel, /area/crew_quarters/lounge) "auN" = ( -/obj/machinery/light_switch{ - pixel_y = 24 +/obj/machinery/door/airlock/maintenance{ + name = "Pool Maintenance"; + req_one_access_txt = "12" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "auO" = ( /obj/structure/closet/crate/freezer, /turf/open/floor/plating, @@ -8827,23 +8833,11 @@ /turf/open/floor/plasteel, /area/crew_quarters/lounge) "auR" = ( -/obj/structure/cable{ - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/apc{ - areastring = "/area/engine/secure_construction"; - dir = 1; - name = "Engineering Construction Area APC"; - pixel_y = 24 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay) "auS" = ( /obj/machinery/atmospherics/pipe/manifold4w/orange/hidden, /turf/open/floor/plasteel, @@ -8894,16 +8888,20 @@ /turf/open/floor/plasteel/stairs/right, /area/router/service) "auY" = ( -/obj/machinery/firealarm{ - pixel_y = 26 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "auZ" = ( /obj/structure/disposalpipe/junction/flip, /obj/structure/cable{ @@ -8926,14 +8924,20 @@ /turf/closed/wall, /area/hallway/secondary/civilian) "avc" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avd" = ( /obj/structure/sign/warning{ name = "\improper COLD TEMPERATURES"; @@ -9015,14 +9019,17 @@ /turf/open/floor/plasteel, /area/hydroponics) "avl" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avm" = ( /turf/closed/wall/r_wall, /area/hallway/secondary/civilian) @@ -9115,16 +9122,11 @@ /turf/open/floor/plating, /area/space/nearstation) "avw" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/structure/sign/poster/official/wtf_is_co2{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay) "avx" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -9160,14 +9162,17 @@ /turf/open/floor/plasteel, /area/router/service) "avA" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avB" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/stripes/line{ @@ -9176,13 +9181,14 @@ /turf/open/floor/plasteel, /area/router/service) "avC" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avD" = ( /obj/structure/rack, /obj/item/clothing/suit/space/fragile, @@ -9195,14 +9201,11 @@ /turf/open/floor/plasteel, /area/router/service) "avE" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "generator to hot loop" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -9217,23 +9220,20 @@ /turf/closed/wall, /area/security/prison) "avH" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"avI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) +"avI" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avJ" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -9243,16 +9243,18 @@ /turf/open/floor/plasteel, /area/security/main) "avK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avL" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -9292,10 +9294,14 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "avQ" = ( -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avR" = ( /obj/machinery/washing_machine, /obj/machinery/light/small{ @@ -9317,24 +9323,17 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "avU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 6 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 +/obj/item/kirbyplants{ + icon_state = "plant-14" }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "avW" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 5 @@ -9366,15 +9365,20 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) "awa" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/camera{ + c_tag = "Pool"; + dir = 1 + }, +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/item/toy/poolnoodle/red, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "awb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -9403,13 +9407,16 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "awe" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ +/obj/effect/turf_decal/tile/blue{ dir = 8 }, -/turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/closet/secure_closet/personal, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/item/toy/poolnoodle/blue, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) "awf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -9524,13 +9531,19 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "aws" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/turf/closed/wall/r_wall, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 28 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "awt" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red, @@ -9595,12 +9608,23 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/barbershop) "awA" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "awB" = ( /obj/machinery/microwave, /obj/effect/turf_decal/tile/bar{ @@ -9815,25 +9839,24 @@ /turf/open/floor/plasteel, /area/storage/tools) "awW" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "cold loop to space" - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"awX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/structure/closet/athletic_mixed, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/item/toy/poolnoodle/yellow, +/turf/open/floor/plasteel/white, +/area/crew_quarters/fitness/pool) +"awX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance{ + name = "Pool External Maintenance"; + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "awY" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -9930,17 +9953,8 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "axg" = ( -/obj/machinery/light_switch{ - pixel_x = -24 - }, -/obj/machinery/camera{ - c_tag = "Arcade"; - dir = 4 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/closed/wall/mineral/wood, +/area/crew_quarters/fitness/pool) "axh" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 @@ -10058,13 +10072,11 @@ /turf/open/floor/plasteel, /area/hydroponics) "axt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/mineral_door/woodrustic{ + name = "Sauna" }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "axu" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -10253,13 +10265,9 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "axM" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/sign/warning/fire, +/turf/closed/wall/mineral/wood, +/area/crew_quarters/fitness/pool) "axN" = ( /obj/machinery/light_switch{ pixel_y = 24 @@ -10300,21 +10308,11 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "axQ" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/closed/wall/r_wall, +/area/hydroponics/garden) "axR" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/crew_quarters/fitness/pool) "axS" = ( /obj/structure/closet/crate, /obj/item/storage/box/lights/mixed, @@ -10343,10 +10341,13 @@ /turf/open/floor/plasteel, /area/hydroponics/lobby) "axV" = ( -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "axW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -10388,16 +10389,12 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "ayb" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/space_heater, +/obj/structure/sign/poster/official/no_erp{ + pixel_y = 32 }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "ayc" = ( /obj/structure/kitchenspike, /turf/open/floor/plasteel/freezer, @@ -10466,21 +10463,16 @@ /turf/open/floor/plasteel, /area/security/prison) "ayn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "ayo" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/bedsheetbin/towel, +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "ayp" = ( /obj/machinery/firealarm{ dir = 4; @@ -10670,11 +10662,8 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/port) "ayK" = ( -/obj/structure/flora/tree/jungle/small, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/turf/open/floor/grass, +/area/hydroponics/garden) "ayL" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 @@ -10811,18 +10800,9 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "ayY" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass, +/area/hydroponics/garden) "ayZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ @@ -10899,24 +10879,28 @@ /turf/open/floor/plasteel, /area/security/brig) "azg" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"azh" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/radio/intercom{ + name = "Station Intercom (Common)"; + pixel_y = 26 + }, +/obj/machinery/sleep_console{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) +"azh" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/grass, +/area/hydroponics/garden) "azi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -10997,20 +10981,13 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "azo" = ( -/obj/structure/chair/office/light{ - dir = 1; - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, +/obj/vehicle/ridden/wheelchair, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "azp" = ( /obj/machinery/light_switch{ pixel_y = -24 @@ -11158,16 +11135,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "azE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "azF" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -11572,17 +11545,12 @@ /turf/open/floor/plating, /area/maintenance/fore) "aAy" = ( -/obj/machinery/atmospherics/components/binary/circulator{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/meter, +/turf/closed/wall/mineral/wood, +/area/crew_quarters/fitness/pool) "aAz" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -12485,11 +12453,12 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/fitness) "aCq" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/closed/wall, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "aCr" = ( /obj/structure/cable{ icon_state = "2-4" @@ -12854,12 +12823,12 @@ /turf/open/floor/plasteel, /area/hydroponics/lobby) "aCZ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/electricshock, -/turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "aDa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13083,19 +13052,17 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aDx" = ( -/obj/structure/closet/crate, -/obj/item/gun/ballistic/shotgun/toy/unrestricted, -/obj/item/gun/ballistic/shotgun/toy/unrestricted, -/obj/item/toy/gun, -/obj/item/toy/sword, -/obj/item/toy/sword, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/structure/chair/stool, +/obj/machinery/camera{ + c_tag = "Pool - Sauna"; + dir = 8; + pixel_y = -22 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, +/turf/open/floor/wood, +/area/crew_quarters/fitness/pool) "aDy" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -13867,14 +13834,11 @@ /turf/open/floor/plasteel, /area/storage/emergency/generic) "aFc" = ( -/obj/structure/table, -/obj/item/clothing/suit/toggle/owlwings, -/obj/item/clothing/under/costume/owl, -/obj/item/clothing/mask/gas/owl_mask, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/turf/closed/wall/mineral/wood, +/area/crew_quarters/fitness/pool) "aFd" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/bot, @@ -14226,11 +14190,12 @@ /turf/open/floor/plating, /area/crew_quarters/barbershop) "aFN" = ( -/obj/structure/flora/junglebush/b, +/mob/living/simple_animal/chicken{ + name = "Featherbottom"; + real_name = "Featherbottom" + }, /turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/area/hydroponics/garden) "aFO" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -14291,17 +14256,8 @@ /turf/open/floor/plasteel, /area/security/brig) "aFU" = ( -/obj/machinery/atmospherics/components/binary/circulator/cold{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aFV" = ( /obj/structure/window/reinforced, /obj/structure/disposaloutlet{ @@ -14498,11 +14454,9 @@ /turf/open/floor/plasteel, /area/security/brig) "aGp" = ( -/mob/living/simple_animal/mouse/brown, +/obj/structure/flora/tree/jungle/small, /turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/area/hydroponics/garden) "aGq" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -14658,17 +14612,11 @@ /turf/open/floor/plasteel, /area/security/brig) "aGH" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medical Booth"; - req_access_txt = "5" - }, -/obj/effect/turf_decal/delivery, +/obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/medical{ - name = "Medical Booth" - }) +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "aGI" = ( /obj/structure/table, /obj/effect/turf_decal/bot, @@ -15249,28 +15197,8 @@ }, /area/chapel/main) "aHL" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/stack/medical/gauze, -/obj/item/reagent_containers/blood, -/obj/item/stack/medical/suture, -/obj/item/stack/medical/mesh, -/obj/structure/extinguisher_cabinet{ - pixel_x = -26 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aHM" = ( /turf/open/floor/plasteel, /area/bridge) @@ -15342,20 +15270,27 @@ /turf/open/floor/plasteel, /area/security/prison) "aHU" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/mineral_door/woodrustic{ - name = "Nature Preserve" +/obj/structure/rack, +/obj/item/clothing/suit/space/fragile, +/obj/item/clothing/head/helmet/space/fragile, +/obj/item/tank/internals/air, +/obj/item/flashlight, +/obj/item/reagent_containers/spray/cleaner, +/obj/machinery/camera{ + c_tag = "Pool Maintenance"; + dir = 8; + pixel_y = -22 }, -/turf/open/floor/plasteel, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "aHV" = ( -/obj/structure/flora/junglebush/large, +/obj/structure/table, +/obj/item/clothing/suit/toggle/owlwings, +/obj/item/clothing/under/costume/owl, +/obj/item/clothing/mask/gas/owl_mask, /turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/area/hydroponics/garden) "aHW" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/head_of_security, @@ -15454,18 +15389,17 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "aIf" = ( +/obj/structure/table/optable, +/obj/machinery/light_switch{ + pixel_x = 24 + }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aIg" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -15792,19 +15726,14 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "aIN" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aIO" = ( /obj/structure/sign/directions/medical{ dir = 8; @@ -16248,42 +16177,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "aJD" = ( -/obj/structure/rack, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/item/storage/belt/medical, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/suit/space/eva/paramedic, -/obj/item/clothing/head/helmet/space/eva/paramedic, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/flora/junglebush/b, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aJE" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/mob/living/simple_animal/mouse/brown, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aJF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16443,28 +16343,9 @@ /turf/open/floor/plasteel, /area/security/main) "aJV" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/mob/living/simple_animal/butterfly, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aJW" = ( /obj/machinery/cryopod{ dir = 8 @@ -16593,13 +16474,9 @@ /turf/open/floor/plasteel, /area/security/main) "aKj" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aKk" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -16649,13 +16526,9 @@ /turf/open/floor/plasteel, /area/security/brig) "aKp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aKq" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -16727,7 +16600,7 @@ /area/bridge) "aKw" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /obj/structure/disposalpipe/segment{ dir = 4 @@ -16971,22 +16844,9 @@ /turf/open/floor/plasteel, /area/bridge) "aKZ" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/mob/living/simple_animal/kiwi, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aLa" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -17180,21 +17040,20 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aLs" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 28 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 +/obj/item/radio/intercom{ + name = "Station Intercom (Common)"; + pixel_x = 26 }, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aLt" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -17303,16 +17162,14 @@ /turf/open/floor/plasteel/dark, /area/bridge) "aLF" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/external{ + name = "Pool Exterior Access"; + req_access_txt = "13" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "aLG" = ( /obj/structure/cable{ icon_state = "2-8" @@ -17388,11 +17245,9 @@ /turf/open/floor/plasteel/dark, /area/chapel/main) "aLO" = ( -/obj/item/toy/talking/owl, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) "aLP" = ( /obj/structure/window/reinforced{ dir = 1; @@ -17506,16 +17361,8 @@ /turf/open/floor/carpet, /area/security/courtroom) "aMa" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plating/airless, +/area/crew_quarters/fitness/pool) "aMb" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -17628,21 +17475,12 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aMm" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/structure/mineral_door/woodrustic{ + name = "Nature Preserve" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel, +/area/hydroponics/garden) "aMn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -17757,13 +17595,16 @@ }, /area/crew_quarters/bar) "aMz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 +/obj/machinery/vending/medical, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "aMA" = ( /turf/closed/wall, /area/janitor) @@ -17851,15 +17692,16 @@ }, /area/chapel/main) "aMK" = ( -/obj/vehicle/ridden/wheelchair, +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 1 + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/gloves/color/latex, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aML" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall, @@ -18233,12 +18075,14 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "aNx" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/securearea, -/turf/open/floor/plating, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/structure/closet/secure_closet/medical2, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "aNy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -18306,10 +18150,25 @@ /turf/open/floor/plasteel, /area/tcommsat/server) "aND" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/surgical_drapes, +/obj/item/scalpel, +/obj/item/circular_saw{ + pixel_y = 16 + }, +/obj/item/hemostat, +/obj/item/retractor, +/obj/item/surgicaldrill, +/obj/item/cautery, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/area/medical/medbay) "aNE" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 9 @@ -18333,20 +18192,9 @@ /turf/open/floor/plasteel/dark, /area/security/brig) "aNH" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Exterior Engineering Access"; - req_access_txt = "11;13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aNI" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -18412,13 +18260,18 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aNQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/securearea, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/engine/storage{ - name = "Canister Storage" - }) +/obj/machinery/disposal/bin{ + name = "Corpse Delivery" + }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/plasteel/white, +/area/medical/medbay) "aNR" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hop) @@ -18511,20 +18364,28 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "aOc" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) -"aOd" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay) +"aOd" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/closed/wall, +/area/crew_quarters/fitness/pool) "aOe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -18571,22 +18432,27 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aOk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"aOl" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) +"aOl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) "aOm" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -18632,14 +18498,18 @@ /turf/open/floor/plasteel, /area/bridge) "aOq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/effect/turf_decal/delivery, -/obj/item/extinguisher, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/grille, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "aOr" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -18711,15 +18581,17 @@ /turf/open/floor/plasteel, /area/security/courtroom) "aOx" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 4 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/radio, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) "aOy" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -18749,13 +18621,17 @@ /turf/closed/wall/r_wall, /area/security/courtroom) "aOC" = ( -/obj/machinery/light/small{ +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless, +/area/crew_quarters/fitness/pool) "aOD" = ( /obj/machinery/door/airlock{ name = "Catering"; @@ -18767,29 +18643,18 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "aOE" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"aOF" = ( -/obj/structure/closet/crate/freezer/surplus_limbs, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plating/airless, +/area/crew_quarters/fitness/pool) +"aOF" = ( +/obj/item/toy/talking/owl, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aOG" = ( /obj/structure/chair/comfy/teal{ dir = 1 @@ -18820,8 +18685,9 @@ /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aOJ" = ( -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aOK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -18839,13 +18705,12 @@ /turf/closed/wall, /area/security/brig) "aOM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/mob/living/simple_animal/chicken{ + name = "Kentucky"; + real_name = "Kentucky" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aON" = ( /obj/machinery/light{ dir = 8 @@ -18872,22 +18737,15 @@ /turf/open/floor/engine, /area/engine/gravity_generator) "aOQ" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "cold loop to generator" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) "aOR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/structure/window/reinforced/spawner/east, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/crew_quarters/fitness/pool) "aOS" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -18896,20 +18754,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aOT" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/cogpool) -"aOU" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) -"aOV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 }, -/turf/open/floor/plasteel/stairs, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) +"aOU" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) +"aOV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/closed/wall/r_wall/rust, +/area/crew_quarters/fitness/pool) "aOW" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -18922,74 +18783,48 @@ /turf/open/floor/plasteel, /area/security/brig) "aOX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Pool" +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plasteel/white/side, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating/airless, +/area/crew_quarters/fitness/pool) "aOY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/structure/window/reinforced/spawner/west, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/external/glass{ + name = "Pool Exterior Access"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/space/basic, +/area/crew_quarters/fitness/pool) "aOZ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/bridge) "aPa" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Pool" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/side, -/area/crew_quarters/fitness/cogpool) +/obj/structure/lattice, +/turf/closed/wall/r_wall, +/area/crew_quarters/fitness/pool) "aPb" = ( /obj/structure/grille, /turf/open/floor/plating, /area/hallway/primary/central) "aPc" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/mob/living/simple_animal/crab/kreb, +/turf/open/floor/plating/asteroid, +/area/hydroponics/garden) "aPd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/hydroponics/garden) "aPe" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/closed/wall/r_wall/rust, +/area/hydroponics/garden) "aPf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -19008,17 +18843,11 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "aPh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/closed/wall/r_wall, +/area/hydroponics/garden) "aPi" = ( /obj/structure/sink{ dir = 4; @@ -19052,13 +18881,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aPm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/closed/wall/r_wall, +/area/hydroponics/garden) "aPn" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -19308,38 +19135,19 @@ }, /area/security/courtroom) "aPN" = ( -/obj/structure/grille, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall/rust, +/area/hydroponics/garden) "aPO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible{ - dir = 8 - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/atmospherics/components/unary/outlet_injector/on, +/turf/open/floor/plating/airless, +/area/engine/engineering) "aPP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 4 - }, -/obj/machinery/meter, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/engine/engineering) "aPQ" = ( /obj/machinery/light{ dir = 4; @@ -19356,21 +19164,22 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aPR" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/closed/wall/r_wall, +/area/engine/engineering) "aPS" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/door/airlock/external/glass{ + name = "Exterior Engineering Access"; + req_access_txt = "11;13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel, +/area/engine/engineering) "aPT" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -19457,37 +19266,30 @@ /turf/open/floor/plasteel, /area/security/brig) "aQc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/turf/closed/wall/r_wall, +/area/engine/engineering) +"aQd" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/suit_storage_unit/engine, /obj/machinery/light/small{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"aQd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel, +/area/engine/engineering) "aQe" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/sign/warning/vacuum/external{ + pixel_x = -32; + pixel_y = 32 }, -/turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQf" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -19529,16 +19331,15 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "aQk" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/space_heater{ + anchored = 1 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel, +/area/engine/engineering) "aQl" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 @@ -19578,17 +19379,24 @@ /turf/open/floor/plating, /area/security/courtroom) "aQp" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating/airless, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/r_wall, +/area/engine/engineering) "aQq" = ( -/turf/open/floor/plating/airless, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/suit_storage_unit/engine, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQr" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment{ @@ -19603,31 +19411,31 @@ /turf/open/floor/plating, /area/crew_quarters/lounge/jazz) "aQs" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/binary/valve/digital{ +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aQt" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"aQt" = ( -/obj/machinery/pool/controller, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel, +/area/engine/engineering) "aQu" = ( -/obj/structure/table, -/obj/item/toy/beach_ball{ - pixel_y = 12 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1 }, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/engine/engineering) "aQv" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -19642,16 +19450,20 @@ /turf/open/floor/plasteel, /area/security/main) "aQx" = ( -/obj/machinery/camera{ - c_tag = "Engine Room - Port Bow" +/obj/machinery/door/airlock/engineering{ + name = "Engineering EVA"; + req_access_txt = "11" }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19662,9 +19474,14 @@ /turf/closed/wall, /area/chapel/main) "aQz" = ( -/obj/structure/chair/comfy/teal, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Router"; + req_access_txt = "11" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQA" = ( /obj/structure/chair/stool, /obj/structure/disposalpipe/segment{ @@ -19674,24 +19491,21 @@ /turf/open/floor/plasteel, /area/security/prison) "aQB" = ( -/obj/structure/table, -/obj/item/clothing/glasses/sunglasses{ - pixel_y = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) -"aQC" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/door/airlock/engineering{ + name = "Engineering Router"; + req_access_txt = "11" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aQC" = ( +/turf/closed/wall/r_wall, +/area/engine/engineering) "aQD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -19726,16 +19540,14 @@ /turf/open/floor/plasteel, /area/security/brig) "aQI" = ( -/obj/structure/chair/comfy/teal, -/obj/machinery/light{ - dir = 1; - light_color = "#cee5d2" +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/light_switch{ + pixel_x = -24 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQJ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -19778,38 +19590,23 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aQP" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/kirbyplants{ - icon_state = "plant-02" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel, +/area/engine/engineering) "aQQ" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/meter, +/turf/open/floor/plasteel, +/area/engine/engineering) "aQR" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aQS" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -19822,22 +19619,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "aQT" = ( -/obj/machinery/door/airlock/engineering{ - name = "Thermo-Electric Generator"; - req_one_access_txt = "10;24" - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plasteel, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "aQU" = ( /obj/machinery/light_switch{ pixel_x = 24 @@ -19859,15 +19646,14 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "aQX" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/camera{ + c_tag = "Engine Room - Port Bow" }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aQY" = ( /obj/structure/window/plasma/reinforced{ dir = 4 @@ -19921,11 +19707,12 @@ }, /area/hallway/primary/central) "aRc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "gas to sauna" }, -/turf/closed/wall, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aRd" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -19989,26 +19776,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aRj" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (Common)"; - pixel_y = 26 - }, -/obj/machinery/sleep_console{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/turf/closed/wall, +/area/medical/medbay) "aRk" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/structure/cable{ @@ -20056,14 +19828,13 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "aRp" = ( -/obj/structure/sign/warning/fire, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 }, -/turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/meter, +/turf/open/floor/plating, +/area/engine/engineering) "aRq" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment, @@ -20075,14 +19846,10 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "aRr" = ( -/mob/living/simple_animal/chicken{ - name = "Kentucky"; - real_name = "Kentucky" - }, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, +/area/engine/engineering) "aRs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20127,11 +19894,9 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "aRx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/engine/secure_construction) "aRy" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload_foyer) @@ -20149,19 +19914,8 @@ /turf/open/floor/plasteel, /area/crew_quarters/lounge) "aRA" = ( -/obj/structure/table/optable, -/obj/machinery/light_switch{ - pixel_x = 24 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/reagent_containers/blood/random, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/turf/closed/wall/r_wall, +/area/engine/secure_construction) "aRB" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -20195,37 +19949,18 @@ /turf/closed/wall/r_wall/rust, /area/engine/gravity_generator) "aRE" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) -"aRF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/closed/wall/r_wall, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/secure_construction) +"aRF" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/engine/storage_shared) "aRG" = ( -/obj/machinery/power/generator, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/turf/open/floor/plasteel, +/area/engine/engineering) "aRH" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/blobstart, @@ -20243,11 +19978,9 @@ /turf/open/floor/plating, /area/maintenance/port/central) "aRJ" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/engine/engineering) "aRK" = ( /obj/structure/sign/departments/holy{ pixel_y = -32 @@ -20265,11 +19998,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aRL" = ( -/mob/living/simple_animal/crab/kreb, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering) "aRM" = ( /turf/open/floor/carpet, /area/crew_quarters/bar) @@ -20325,15 +20058,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aRR" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 }, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) "aRS" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -20372,20 +20105,11 @@ /turf/open/floor/plasteel, /area/security/main) "aRV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) "aRW" = ( /turf/open/floor/plating, /area/maintenance/port/central) @@ -20400,10 +20124,11 @@ /turf/open/space/basic, /area/space/nearstation) "aRY" = ( -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plating, +/area/engine/engineering) "aRZ" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -20419,16 +20144,12 @@ /turf/open/floor/plasteel, /area/bridge) "aSb" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aSc" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -20464,9 +20185,15 @@ /turf/open/floor/plasteel, /area/chapel/main) "aSf" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "aSg" = ( /obj/machinery/power/apc{ name = "Security Maintainance APC"; @@ -20544,10 +20271,11 @@ /turf/open/space/basic, /area/space/nearstation) "aSr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) "aSs" = ( /obj/machinery/light{ dir = 1; @@ -20602,22 +20330,28 @@ /turf/open/space/basic, /area/space/nearstation) "aSz" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 1 +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "hot loop to space" }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aSA" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/power/apc{ + areastring = "/area/engine/secure_construction"; + dir = 1; + name = "Engineering Construction Area APC"; + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "aSB" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -20649,50 +20383,35 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "aSE" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) -"aSF" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/surgical_drapes, -/obj/item/scalpel, -/obj/item/circular_saw{ - pixel_y = 16 - }, -/obj/item/hemostat, -/obj/item/retractor, -/obj/item/surgicaldrill, -/obj/item/cautery, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) -"aSG" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) -"aSH" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/closed/wall/r_wall, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/turf/open/floor/plating, +/area/engine/engineering) +"aSF" = ( +/turf/open/floor/engine, +/area/engine/secure_construction) +"aSG" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/engine/engineering) +"aSH" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel, +/area/engine/engineering) "aSI" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -20717,22 +20436,19 @@ /turf/open/floor/plasteel, /area/security/main) "aSK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"aSL" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) +"aSL" = ( +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "cold loop to space" + }, +/turf/open/floor/plating, +/area/engine/engineering) "aSM" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -20791,11 +20507,15 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aST" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/area/engine/engineering) "aSU" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/item/radio/intercom{ @@ -20827,18 +20547,12 @@ /turf/open/floor/plasteel, /area/security/prison) "aSY" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/light{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/engine, +/area/engine/secure_construction) "aSZ" = ( /obj/structure/chair/stool, /obj/machinery/light, @@ -20876,14 +20590,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aTc" = ( -/obj/machinery/firealarm{ - pixel_y = 26 +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/components/binary/valve/digital/on, /turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/area/engine/engineering) "aTd" = ( /obj/structure/sign/warning{ name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES" @@ -20922,23 +20634,22 @@ /turf/open/floor/plating, /area/tcommsat/computer) "aTi" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "aTj" = ( -/obj/machinery/pool/filter{ - pixel_y = 16 +/obj/machinery/light/small, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/pool, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/engineering) "aTk" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -20957,15 +20668,9 @@ /turf/open/space/basic, /area/space/nearstation) "aTm" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/supermatter) "aTn" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -21056,15 +20761,23 @@ /turf/open/floor/plasteel, /area/bridge) "aTv" = ( -/turf/open/pool, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/engine/supermatter) "aTw" = ( -/obj/structure/pool/ladder{ - dir = 2; - pixel_y = 24 +/obj/machinery/door/airlock/engineering{ + name = "Thermo-Electric Generator"; + req_one_access_txt = "10;24" }, -/turf/open/pool, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel, +/area/engine/supermatter) "aTx" = ( /obj/structure/lattice, /obj/structure/sign/warning{ @@ -21082,11 +20795,15 @@ /turf/open/space/basic, /area/space/nearstation) "aTz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "aTA" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -21105,12 +20822,16 @@ }, /area/chapel/main) "aTC" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 +/obj/machinery/portable_atmospherics/scrubber, +/obj/machinery/light/small, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/engineering) "aTD" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -21223,13 +20944,12 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Thermo-Electric Generator" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plating, +/area/engine/engineering) "aTR" = ( /obj/structure/table, /obj/item/paper_bin, @@ -21275,13 +20995,12 @@ /turf/closed/wall, /area/gateway) "aTW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) "aTX" = ( /obj/machinery/light{ dir = 1; @@ -21295,15 +21014,12 @@ /turf/open/floor/plasteel, /area/security/courtroom) "aTZ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "hot loop to space" +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "aUa" = ( /obj/machinery/light_switch{ pixel_x = 24 @@ -21313,14 +21029,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aUb" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "aUc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21334,35 +21047,32 @@ /turf/open/floor/plating, /area/maintenance/port/central) "aUd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) -"aUe" = ( /obj/machinery/light_switch{ - pixel_x = 24 + pixel_y = 24 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/engine, +/area/engine/supermatter) +"aUe" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "aUf" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/camera{ + c_tag = "Thermo-Electric Generator" }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "aUg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -21445,26 +21155,25 @@ /turf/closed/wall/r_wall, /area/crew_quarters/lounge/jazz) "aUr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 10 +/obj/machinery/firealarm{ + pixel_y = 26 }, -/obj/machinery/light_switch{ - pixel_y = -24 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "aUs" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/dark, /area/chapel/office) "aUt" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "aUu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -21694,9 +21403,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aUU" = ( -/obj/machinery/pool/drain, -/turf/open/pool, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "aUV" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 @@ -21704,9 +21416,14 @@ /turf/open/floor/plasteel, /area/security/courtroom) "aUW" = ( -/obj/structure/pool/Lboard, -/turf/open/pool, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/engine/engineering) "aUX" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, @@ -21735,12 +21452,11 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aVb" = ( -/obj/structure/pool/Rboard, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/components/binary/pump/on{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/engine/supermatter) "aVc" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -21770,8 +21486,12 @@ /turf/open/floor/plating, /area/maintenance/port/central) "aVf" = ( -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "generator to hot loop" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "aVg" = ( /obj/machinery/computer/cryopod{ pixel_y = 28 @@ -21927,13 +21647,12 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/lounge/jazz) "aVy" = ( -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/reagent_dispensers/foamtank, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "aVz" = ( /obj/structure/chair{ dir = 8 @@ -21957,13 +21676,13 @@ /turf/open/floor/circuit/green, /area/crew_quarters/cryopod) "aVB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible, +/obj/machinery/meter, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "aVC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22154,18 +21873,16 @@ /turf/open/floor/plasteel, /area/gateway) "aVX" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/gloves/color/latex, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "aVY" = ( /obj/structure/chair{ dir = 4 @@ -22333,21 +22050,14 @@ /turf/open/floor/plating, /area/hallway/primary/port/fore) "aWs" = ( -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 9 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aWt" = ( /obj/machinery/light/small{ dir = 4 @@ -22477,20 +22187,11 @@ /turf/open/floor/plasteel/checker, /area/ai_monitored/storage/eva) "aWH" = ( -/obj/machinery/disposal/bin{ - name = "Corpse Delivery" +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/delivery/red, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/turf/open/floor/engine, +/area/engine/secure_construction) "aWI" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/tile/yellow{ @@ -22502,21 +22203,11 @@ /turf/open/floor/plasteel/checker, /area/ai_monitored/storage/eva) "aWJ" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/transit_tube/station/reverse/flipped{ + dir = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/turf/open/floor/engine, +/area/engine/secure_construction) "aWK" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -22631,11 +22322,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, -/obj/structure/sign/warning/securearea, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aWW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22733,14 +22424,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aXh" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 6 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/sign/warning/securearea, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aXi" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/open/floor/plasteel, @@ -22804,13 +22492,12 @@ /area/ai_monitored/storage/eva) "aXp" = ( /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 1 }, -/obj/structure/reagent_dispensers/foamtank, +/obj/effect/turf_decal/stripes/line, +/obj/structure/transit_tube/horizontal, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/secure_construction) "aXq" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -22996,24 +22683,19 @@ /turf/open/floor/plasteel, /area/security/brig) "aXP" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Pool Maintenance"; - req_one_access_txt = "12" +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 6 }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aXQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/medical{ - name = "Medical Booth" - }) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/transit_tube/horizontal, +/turf/open/floor/plating, +/area/engine/secure_construction) "aXR" = ( /turf/closed/wall, /area/security/courtroom) @@ -23111,20 +22793,14 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "aYb" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "aYc" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/wood, @@ -23162,32 +22838,20 @@ /turf/open/floor/plasteel, /area/bridge) "aYi" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/supply/visible, +/obj/machinery/meter, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "aYj" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "cold loop to generator" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "aYk" = ( /turf/open/floor/circuit/green, /area/ai_monitored/nuke_storage) @@ -23446,30 +23110,17 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "aYL" = ( +/turf/closed/wall/r_wall, +/area/engine/storage) +"aYM" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"aYM" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aYN" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -23574,14 +23225,11 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "aZa" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "aZb" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -23592,11 +23240,8 @@ }, /area/maintenance/department/eva) "aZc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "aZd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -23626,11 +23271,11 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "aZg" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "aZh" = ( /obj/structure/closet/crate, /obj/machinery/light, @@ -23779,13 +23424,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "aZt" = ( +/obj/structure/window/reinforced/spawner/east, /obj/effect/turf_decal/stripes/line{ - dir = 10 + dir = 8 }, /turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/engine/supermatter) "aZu" = ( /obj/machinery/blackbox_recorder, /obj/effect/turf_decal/bot_white, @@ -24234,14 +23878,10 @@ /turf/open/space/basic, /area/space/nearstation) "ban" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plating, +/area/engine/supermatter) "bao" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/white/full, @@ -24249,27 +23889,14 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "bap" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/firealarm{ + pixel_y = 26 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/rack, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/hazardvest, +/obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/storage) "baq" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -24523,25 +24150,15 @@ }, /area/lawoffice) "baT" = ( -/obj/machinery/iv_drip, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/engine/supermatter) "baU" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/turf/open/floor/plating, +/area/engine/supermatter) "baV" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -24665,14 +24282,12 @@ /turf/closed/wall, /area/hallway/primary/aft) "bbi" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/structure/window/reinforced/spawner/west, +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "bbj" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall/r_wall, @@ -24750,10 +24365,14 @@ /turf/open/floor/plasteel/dark, /area/lawoffice) "bbt" = ( -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bbu" = ( /obj/structure/grille, /obj/structure/cable, @@ -24782,13 +24401,16 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bbx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/item/radio/intercom{ + dir = 8; + name = "Station Intercom (Common)"; + pixel_x = 28 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bby" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -24800,14 +24422,11 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bbz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/closed/wall/r_wall, +/area/engine/supermatter) "bbA" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -24821,23 +24440,21 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bbB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "bbC" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bbD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24847,14 +24464,15 @@ /turf/open/floor/plasteel/dark, /area/bridge) "bbE" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/window/reinforced/spawner/east, +/obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "bbF" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -24871,11 +24489,15 @@ /turf/open/floor/plasteel/dark, /area/bridge) "bbH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/components/binary/circulator{ + dir = 4 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engine/supermatter) "bbI" = ( /obj/machinery/light, /turf/open/floor/plasteel, @@ -25008,16 +24630,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bbZ" = ( +/obj/machinery/power/generator, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 1 }, -/obj/machinery/light{ - dir = 8 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "0-2" }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/engine, +/area/engine/supermatter) "bca" = ( /turf/open/floor/engine/vacuum, /area/engine/atmos) @@ -25035,11 +24657,15 @@ /turf/closed/wall/r_wall, /area/crew_quarters/lounge/jazz) "bcd" = ( -/obj/item/kirbyplants{ - icon_state = "plant-14" +/obj/machinery/atmospherics/components/binary/circulator/cold{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/engine/supermatter) "bce" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor/auto{ @@ -25176,20 +24802,24 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom/jury) "bcu" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/camera{ - c_tag = "Aft Maintenance - Air Hookup" +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/light{ + dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "bcv" = ( -/obj/machinery/atmospherics/components/binary/valve/digital/on, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bcw" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -25239,28 +24869,36 @@ /turf/open/floor/plasteel, /area/gateway) "bcD" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/table/reinforced, +/obj/item/analyzer, +/obj/item/t_scanner, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + areastring = "/area/engine/supermatter"; + dir = 4; + name = "Thermo-Electric Generator APC"; + pixel_x = 24 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bcE" = ( -/obj/machinery/atmospherics/components/binary/valve/digital/on{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) -"bcF" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/area/engine/engineering) +"bcF" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "bcG" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, @@ -25278,10 +24916,14 @@ /turf/open/floor/plasteel/dark/side, /area/security/courtroom) "bcI" = ( -/turf/closed/wall/r_wall, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/toxins, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" + }, +/turf/open/floor/plasteel, +/area/engine/storage) "bcJ" = ( /obj/machinery/button/door{ id = "HoPAft"; @@ -25329,17 +24971,11 @@ /turf/open/floor/plasteel, /area/security/courtroom) "bcO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/engine, +/area/engine/supermatter) "bcP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -25445,20 +25081,12 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "bdd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/camera{ - c_tag = "Pool"; - dir = 1 - }, -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/toy/poolnoodle/red, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bde" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -25474,16 +25102,12 @@ /turf/open/floor/plating, /area/hallway/primary/central) "bdh" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/closet/secure_closet/personal, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/item/toy/poolnoodle/blue, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/effect/turf_decal/delivery, +/obj/item/extinguisher, +/obj/structure/window/reinforced/spawner, +/turf/open/floor/engine, +/area/engine/supermatter) "bdi" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -25506,24 +25130,18 @@ }, /area/hallway/primary/central) "bdk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/storage) "bdl" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4 }, -/obj/structure/closet/athletic_mixed, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/toy/poolnoodle/yellow, -/turf/open/floor/plasteel/white, -/area/crew_quarters/fitness/cogpool) +/obj/item/radio, +/turf/open/floor/engine, +/area/engine/supermatter) "bdm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25687,11 +25305,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bdE" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/grass, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bdF" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -25763,13 +25381,23 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bdL" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/turretid{ + control_area = "/area/science/server"; + icon_state = "control_stun"; + name = "Computer Core turret control"; + pixel_x = -3; + pixel_y = -23; + req_access_txt = "65" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/server) "bdM" = ( /turf/open/floor/plasteel, /area/quartermaster/office) @@ -25779,16 +25407,22 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bdO" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - name = "Pool External Maintenance"; - req_access_txt = "12" +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/area/engine/engineering) "bdP" = ( -/turf/closed/wall/mineral/wood, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "bdQ" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; @@ -25833,11 +25467,11 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bdW" = ( -/obj/structure/mineral_door/woodrustic{ - name = "Sauna" - }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/structure/window/reinforced/spawner/east, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "bdX" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, @@ -25847,9 +25481,11 @@ }, /area/chapel/main) "bdY" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/mineral/wood, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/stairs, +/area/engine/supermatter) "bdZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25906,13 +25542,11 @@ /turf/open/floor/plating/airless, /area/science/test_area) "bei" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/structure/window/reinforced/spawner/west, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/engine/supermatter) "bej" = ( /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -25933,14 +25567,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bem" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "hot loop to generator" +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/turf/open/floor/plasteel/dark, +/area/engine/supermatter) "ben" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25970,25 +25601,23 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "beq" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "generator to cold loop" +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/engine/supermatter) "ber" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bes" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/area/engine/supermatter) "bet" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -26004,18 +25633,15 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "bev" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/radio/intercom{ +/obj/machinery/firealarm{ dir = 8; - name = "Station Intercom (Common)"; - pixel_x = 28 + pixel_x = 26 }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bew" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26033,11 +25659,8 @@ /turf/open/floor/plasteel, /area/security/courtroom) "bey" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/turf/closed/wall/r_wall/rust, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/science/server) "bez" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26106,25 +25729,28 @@ /turf/open/floor/plasteel/dark, /area/lawoffice) "beH" = ( -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/light{ - dir = 4 +/obj/structure/grille, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plating, +/area/science/server) "beI" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/door/airlock/command{ + name = "Computer Core"; + req_access_txt = "30" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/server) "beJ" = ( /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -26307,10 +25933,13 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom/jury) "bfh" = ( -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/server) "bfi" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 @@ -26318,17 +25947,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bfj" = ( -/mob/living/simple_animal/butterfly, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/structure/grille, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/server) "bfk" = ( -/mob/living/simple_animal/kiwi, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/closed/wall/r_wall, +/area/science/server) "bfl" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -26350,15 +25985,11 @@ /turf/open/floor/plating, /area/maintenance/department/security) "bfn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4; - name = "cold loop to space" +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/closed/wall/r_wall, +/area/engine/supermatter) "bfo" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -26438,8 +26069,12 @@ }, /area/gateway) "bfv" = ( -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "hot loop to generator" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bfw" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -26460,13 +26095,15 @@ /turf/open/floor/plasteel/white, /area/gateway) "bfy" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/machinery/atmospherics/components/unary/thermomachine/heater/on, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/meter, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bfz" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, @@ -26524,12 +26161,11 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "bfF" = ( -/obj/machinery/space_heater, -/obj/structure/sign/poster/official/no_erp{ - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bfG" = ( /obj/machinery/conveyor{ dir = 4; @@ -26552,23 +26188,17 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "bfI" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/highcap/fifteen_k{ - areastring = "/area/engine/storage_shared"; - dir = 1; - name = "Electrical Substation APC"; - pixel_y = 26 + icon_state = "1-4" }, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "bfJ" = ( -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bfK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ @@ -26601,13 +26231,11 @@ }, /area/chapel/office) "bfM" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/bedsheetbin/towel, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bfN" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -26927,10 +26555,24 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bgw" = ( -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Engineering Construction Area"; + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "bgx" = ( /obj/structure/table/glass, /turf/open/floor/plasteel, @@ -27062,12 +26704,11 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bgJ" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/manifold/supply/visible{ dir = 8 }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bgK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -27123,12 +26764,11 @@ /turf/closed/wall, /area/quartermaster/qm) "bgR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, -/obj/machinery/meter, -/turf/closed/wall/mineral/wood, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bgS" = ( /obj/machinery/computer/bounty, /obj/effect/turf_decal/tile/brown{ @@ -27180,12 +26820,15 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bha" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ +/obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 4 }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/meter, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bhb" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 1 @@ -27193,12 +26836,12 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bhc" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "generator to cold loop" }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/engine, +/area/engine/supermatter) "bhd" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -27228,17 +26871,12 @@ /turf/open/floor/plating, /area/quartermaster/office) "bhg" = ( -/obj/structure/chair/stool, -/obj/machinery/camera{ - c_tag = "Pool - Sauna"; - dir = 8; - pixel_y = -22 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 8 - }, -/turf/open/floor/wood, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plating, +/area/engine/engineering) "bhh" = ( /obj/machinery/status_display, /turf/closed/wall/r_wall, @@ -27265,19 +26903,15 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bhl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/closed/wall/mineral/wood, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/science/server) "bhm" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/engine/secure_construction) "bhn" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -27336,17 +26970,16 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bhs" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/secure_construction) "bht" = ( /obj/structure/grille, /obj/structure/cable, @@ -27640,16 +27273,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bhZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) +/turf/closed/wall/r_wall, +/area/science/server) "bia" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -27730,18 +27358,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bij" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/closed/wall/r_wall, +/area/science/server) "bik" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -27755,18 +27377,9 @@ /turf/open/floor/plating, /area/bridge) "bil" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 6; - id = "QMLoad" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/dark, +/area/science/server) "bim" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -27855,31 +27468,16 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "biw" = ( -/obj/machinery/computer/cargo{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/bot, -/obj/machinery/button/door{ - id = "QMLoadDoor"; - layer = 4; - name = "Cargo Loading Doors"; - pixel_x = 24; - pixel_y = 6 +/obj/structure/window/reinforced/spawner, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 }, -/obj/machinery/button/door{ - id = "QMUnloadDoor"; - layer = 4; - name = "Cargo Unloading Doors"; - pixel_x = 24; - pixel_y = -6 - }, -/obj/machinery/camera{ - c_tag = "Supply - Cargo Bay"; - dir = 8; - pixel_y = -22 - }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) +/turf/open/floor/plasteel/dark, +/area/science/server) "bix" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -27932,13 +27530,17 @@ /turf/open/floor/plasteel, /area/maintenance/disposal) "biE" = ( +/obj/machinery/light_switch{ + pixel_y = 24 + }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/dark, +/area/science/server) "biF" = ( /obj/structure/cable{ icon_state = "4-8" @@ -27973,13 +27575,11 @@ }, /area/crew_quarters/heads/hor) "biH" = ( -/obj/machinery/light/small, -/obj/machinery/space_heater, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/closed/wall/r_wall, +/area/science/server) "biI" = ( /obj/machinery/light{ dir = 4; @@ -28256,17 +27856,14 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "bjq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/conveyor{ - id = "QMLoad" +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plating, -/area/quartermaster/storage) +/area/engine/engineering) "bjr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/warning/vacuum/external, @@ -28325,14 +27922,12 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "bjx" = ( -/obj/structure/table/optable, -/obj/effect/turf_decal/bot, -/obj/item/defibrillator/loaded, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/engine/supermatter) "bjy" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -28475,20 +28070,14 @@ /turf/open/floor/plasteel, /area/storage/primary) "bjL" = ( -/obj/structure/rack, -/obj/item/clothing/suit/space/fragile, -/obj/item/clothing/head/helmet/space/fragile, -/obj/item/tank/internals/air, -/obj/item/flashlight, -/obj/item/reagent_containers/spray/cleaner, -/obj/machinery/camera{ - c_tag = "Pool Maintenance"; - dir = 8; - pixel_y = -22 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bjM" = ( /obj/machinery/door/airlock/public/glass{ name = "Atmospherics Storage"; @@ -28676,11 +28265,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bkf" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "bkg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/mineral/stacking_unit_console{ @@ -28753,65 +28342,56 @@ /turf/open/floor/plasteel, /area/science/circuit) "bkp" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "QMLoad" +/obj/machinery/light/small, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) +/turf/open/floor/engine, +/area/engine/supermatter) "bkq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/conveyor/inverted{ - dir = 9; - id = "QMLoad" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) -"bkr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" - }, -/obj/machinery/door/poddoor{ - id = "QMLoadDoor"; - name = "Cargo Loading Door" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) -"bks" = ( -/obj/structure/plasticflaps, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) -"bkt" = ( -/obj/effect/turf_decal/stripes/end{ +/obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4 }, -/obj/machinery/conveyor{ - dir = 4; - id = "QMLoad" +/turf/open/floor/engine, +/area/engine/supermatter) +"bkr" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, -/obj/machinery/door/poddoor{ - id = "QMLoadDoor"; - name = "Cargo Loading Door" +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/item/radio/intercom{ + name = "Station Intercom (Common)"; + pixel_y = -29 + }, +/turf/open/floor/engine, +/area/engine/supermatter) +"bks" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/plating, -/area/quartermaster/storage) +/area/engine/engineering) +"bkt" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/photocopier, +/turf/open/floor/plasteel, +/area/science/server) "bku" = ( /obj/structure/closet, /turf/open/floor/plasteel, @@ -28838,12 +28418,19 @@ }, /area/crew_quarters/heads/hor) "bkz" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel, +/area/science/server) "bkA" = ( /obj/machinery/light_switch{ pixel_y = -24 @@ -28950,23 +28537,11 @@ /turf/open/floor/plating, /area/storage/primary) "bkJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/airalarm{ + pixel_y = 24 }, /turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/science/server) "bkK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -29048,22 +28623,9 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bkT" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/radio/intercom{ - name = "Station Intercom (Common)"; - pixel_x = 26 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/structure/sign/warning/nosmoking/circle, +/turf/closed/wall/r_wall, +/area/engine/storage) "bkU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29086,14 +28648,8 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "bkW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external{ - name = "Pool Exterior Access"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel, +/area/science/server) "bkX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -29331,34 +28887,27 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "blv" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "blw" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/server) +"blx" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Computer Core APC"; + pixel_y = 24 }, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"blx" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "bly" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29414,9 +28963,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "blD" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" + }, +/turf/open/floor/plasteel, +/area/science/server) "blE" = ( /obj/machinery/light{ dir = 8 @@ -29616,12 +29172,22 @@ /turf/open/floor/plasteel, /area/security/brig) "blZ" = ( -/obj/machinery/conveyor_switch/oneway{ - dir = 8; - id = "QMUnload" +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/open/floor/plasteel, -/area/quartermaster/storage) +/area/science/server) "bma" = ( /obj/structure/chair{ dir = 8 @@ -29749,11 +29315,9 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bmm" = ( -/obj/machinery/portable_atmospherics/scrubber/huge, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/engine/storage) "bmn" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -29916,13 +29480,13 @@ /area/gateway) "bmF" = ( /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/turf/closed/wall, -/area/crew_quarters/fitness/cogpool) +/turf/closed/wall/r_wall, +/area/science/server) "bmG" = ( /turf/open/floor/engine, /area/gateway) @@ -29965,23 +29529,29 @@ dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) -"bmK" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" +/turf/open/floor/plating, +/area/engine/engineering) +"bmK" = ( +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 10 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bmL" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/open/floor/plasteel, @@ -30071,13 +29641,16 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bmT" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/machinery/door/airlock/engineering/glass{ + name = "Thermo-Electric Generator"; + req_one_access_txt = "10;24" }, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/plasteel, +/area/engine/supermatter) "bmU" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -30279,34 +29852,12 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bni" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/structure/sign/warning/fire, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/item/clipboard, -/obj/item/stamp, -/obj/item/stamp/denied{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/pen/red, -/obj/item/pen/blue{ - pixel_x = -5; - pixel_y = -3 - }, -/turf/open/floor/plasteel, -/area/quartermaster/sorting) +/turf/closed/wall/r_wall, +/area/engine/supermatter) "bnj" = ( /obj/structure/sign/warning/securearea{ desc = "A warning sign which reads 'BOMB RANGE"; @@ -30341,24 +29892,16 @@ /turf/closed/wall/r_wall, /area/science/mixing) "bnn" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/machinery/door/airlock/engineering/glass{ + name = "Thermo-Electric Generator"; + req_one_access_txt = "10;24" }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/machinery/door/window/southleft{ - name = "Cargo Desk"; - req_access_txt = "31" - }, -/obj/item/folder, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel, -/area/quartermaster/sorting) +/area/engine/supermatter) "bno" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -30406,14 +29949,17 @@ /turf/closed/wall/r_wall, /area/maintenance/department/eva) "bnt" = ( -/obj/machinery/camera{ - c_tag = "Electrical Substation"; - dir = 1 +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/smes{ + charge = 5e+006 }, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "bnu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -30444,25 +29990,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bny" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/item/paper_bin, -/obj/item/stack/packageWrap, -/obj/item/stack/packageWrap, -/obj/item/pen, -/obj/item/wirecutters, -/turf/open/floor/plasteel, -/area/quartermaster/sorting) +/turf/open/floor/plating, +/area/engine/engineering) "bnz" = ( /obj/effect/turf_decal/plaque{ icon_state = "L5" @@ -30595,11 +30129,18 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bnQ" = ( -/obj/machinery/atmospherics/components/binary/valve/digital/on, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bnR" = ( /obj/effect/turf_decal/plaque{ icon_state = "L13" @@ -30607,15 +30148,39 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bnS" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/table, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/turf/open/floor/plating, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/radio/off{ + pixel_x = -3; + pixel_y = 1 + }, +/turf/open/floor/plasteel, +/area/science/server) "bnT" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/server) "bnU" = ( /obj/structure/rack, /obj/item/clothing/suit/space/fragile, @@ -30728,18 +30293,14 @@ /turf/open/floor/plasteel, /area/ai_monitored/nuke_storage) "bof" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment, +/obj/machinery/porta_turret/ai{ + dir = 1; + req_access = list(16) }, -/obj/machinery/door/airlock/external/glass{ - name = "Pool Exterior Access"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/turf/open/space/basic, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel, +/area/science/server) "bog" = ( /obj/machinery/light{ dir = 1 @@ -30759,11 +30320,11 @@ /turf/open/floor/plating, /area/maintenance/disposal) "boi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/turf/open/floor/plasteel, +/area/science/server) "boj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30829,32 +30390,24 @@ }, /area/hallway/primary/central) "bop" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/door/window/eastleft{ - name = "Operating Theatre"; - req_access_txt = "45" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"boq" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/structure/cable{ - icon_state = "2-8" +/turf/open/floor/plasteel, +/area/science/server) +"boq" = ( +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "bor" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -30869,11 +30422,31 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "bot" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = 26 + }, +/obj/item/storage/box/disks_nanite, +/obj/item/book/manual/wiki/research_and_development{ + pixel_x = 4; + pixel_y = -8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "bou" = ( /obj/effect/turf_decal/plaque{ icon_state = "L2" @@ -30881,26 +30454,18 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bov" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "bow" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMUnload" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating, -/area/quartermaster/storage) +/area/engine/engineering) "box" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, @@ -30925,16 +30490,12 @@ /turf/closed/wall, /area/security/detectives_office) "boB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMUnload" +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plating, -/area/quartermaster/storage) +/area/engine/engineering) "boC" = ( /obj/machinery/light/small{ dir = 4 @@ -30950,46 +30511,40 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "boD" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMUnload" - }, -/obj/machinery/door/poddoor{ - id = "QMUnloadDoor"; - name = "Cargo Unloading Door" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) -"boE" = ( -/obj/structure/plasticflaps, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMUnload" - }, -/turf/open/floor/plating, -/area/quartermaster/storage) -"boF" = ( -/obj/effect/turf_decal/stripes/end{ +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/conveyor{ - dir = 8; - id = "QMUnload" +/turf/open/floor/plasteel, +/area/engine/engineering) +"boE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/door/poddoor{ - id = "QMUnloadDoor"; - name = "Cargo Unloading Door" +/obj/machinery/light/small{ + dir = 1; + light_color = "#ffc1c1" }, -/turf/open/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) +"boF" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/visible, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "boG" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/tile/blue{ @@ -31169,28 +30724,24 @@ }, /area/crew_quarters/lounge/jazz) "bpa" = ( -/obj/effect/turf_decal/tile/red{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/door/window/westleft{ - name = "Treatment Center"; - req_access_txt = "5" - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plating, +/area/engine/engineering) "bpb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bpc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -31213,40 +30764,52 @@ /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bpe" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/junction{ dir = 4 }, -/obj/machinery/door/window/eastright{ - name = "Operating Theatre"; - req_access_txt = "45" +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plating, +/area/engine/engineering) "bpf" = ( /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bpg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 9 }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/camera{ + c_tag = "Engine Room - Starboard Quarter"; + dir = 8; + pixel_y = -22 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bph" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/table, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/item/multitool{ + pixel_y = 4 + }, +/obj/item/book/manual/wiki/robotics_cyborgs, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "bpi" = ( /obj/structure/flora/junglebush/b, /turf/open/floor/grass, @@ -31464,33 +31027,40 @@ }, /area/crew_quarters/lounge/jazz) "bpK" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) -"bpL" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/chair/stool, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/server) +"bpL" = ( +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/server) "bpM" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel, /area/science/mixing) "bpN" = ( -/obj/structure/grille, -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/effect/turf_decal/tile/green, +/turf/open/floor/plasteel, +/area/science/server) "bpO" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -31536,18 +31106,13 @@ /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit) "bpV" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos{ - name = "Aft Air Hookup"; - req_access_txt = "12;24" +/obj/effect/turf_decal/tile/green{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/effect/turf_decal/tile/green, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/science/server) "bpW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -31730,22 +31295,15 @@ /turf/open/floor/plating, /area/maintenance/aft) "bqt" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/healthanalyzer, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/server) "bqu" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -31929,7 +31487,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/item/toy/cards/deck, /turf/open/floor/plasteel/white/corner{ dir = 1 @@ -31944,21 +31502,28 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bqO" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"bqP" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/structure/table, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/item/storage/box/disks, +/turf/open/floor/plasteel, +/area/science/server) +"bqP" = ( +/obj/machinery/camera{ + c_tag = "Engine Room - Port Quarter"; + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/engine/engineering) "bqQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -31969,27 +31534,12 @@ /turf/open/floor/plasteel/dark/corner, /area/hallway/secondary/entry) "bqR" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plating, +/area/engine/engineering) "bqS" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plating, +/area/engine/engineering) "bqT" = ( /obj/machinery/computer/crew, /obj/effect/turf_decal/tile/blue{ @@ -32075,11 +31625,11 @@ /turf/open/floor/plasteel, /area/maintenance/disposal) "brb" = ( -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plasteel/dark, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 6 + }, +/turf/open/floor/plating, +/area/engine/engineering) "brc" = ( /obj/structure/cable{ icon_state = "1-2" @@ -32245,16 +31795,13 @@ /turf/open/floor/plating, /area/chapel/office) "bru" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "hot loop to space" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plating, +/area/engine/engineering) "brv" = ( /obj/machinery/disposal/bin, /obj/machinery/light{ @@ -32296,26 +31843,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "brz" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 9 }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/machinery/power/apc{ - areastring = "/area/science/research"; - name = "Research Sector APC"; - pixel_y = -24 - }, -/obj/structure/cable, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engineering) "brA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32464,15 +31997,15 @@ }, /area/hallway/secondary/exit) "brO" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/effect/landmark/start/medical_doctor, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "brP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32835,9 +32368,12 @@ /turf/open/floor/plasteel/stairs/left, /area/hydroponics) "bsx" = ( -/obj/structure/lattice, -/turf/closed/wall/r_wall, -/area/crew_quarters/fitness/cogpool) +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/engine/engineering) "bsy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -33037,11 +32573,25 @@ }, /area/chapel/office) "bsX" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/rack, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/obj/item/clothing/suit/hazardvest, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "bsY" = ( /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, @@ -33124,13 +32674,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "btk" = ( -/obj/structure/sign/poster/official/nanomichi_ad{ - pixel_x = 32 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/components/binary/valve/digital{ + dir = 4; + name = "cold loop to space" }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/open/floor/plating, +/area/engine/engineering) "btl" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -33869,17 +33419,16 @@ "bvb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/obj/machinery/door/airlock/engineering{ - name = "Electrical Substation"; - req_access_txt = "10" +/obj/machinery/power/apc/highcap/fifteen_k{ + areastring = "/area/engine/storage_shared"; + dir = 1; + name = "Electrical Substation APC"; + pixel_y = 26 }, -/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "bvc" = ( /obj/machinery/computer/cargo/request, /obj/machinery/airalarm{ @@ -34050,10 +33599,14 @@ /turf/closed/wall/r_wall, /area/chapel/office) "bvv" = ( -/turf/closed/wall/r_wall/rust, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 10 + }, +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/turf/open/floor/plating, +/area/engine/engineering) "bvw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, @@ -34277,18 +33830,9 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bvY" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/engine/engineering) "bvZ" = ( /obj/item/folder, /obj/structure/table/wood/fancy, @@ -34623,17 +34167,15 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bwJ" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable, +/obj/machinery/power/apc{ + areastring = "/area/engine/engineering"; + dir = 4; + name = "Engine Room APC"; + pixel_x = 24 }, /turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/engine/engineering) "bwK" = ( /obj/machinery/camera{ c_tag = "Research - Gateway Chamber"; @@ -35340,21 +34882,15 @@ /turf/open/floor/carpet/green, /area/crew_quarters/heads/hop) "bye" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/computer/rdservercontrol{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/photocopier, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/dark, +/area/science/server) "byf" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Telecommunications Mainframe"; @@ -36046,10 +35582,9 @@ /turf/open/floor/plating, /area/router) "bzN" = ( -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/server) "bzO" = ( /obj/machinery/conveyor_switch/oneway{ id = "recycler"; @@ -36073,11 +35608,12 @@ /turf/open/floor/plasteel, /area/maintenance/department/chapel) "bzR" = ( -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/server) "bzS" = ( /obj/structure/table, /obj/machinery/light/small{ @@ -36390,18 +35926,13 @@ /area/maintenance/disposal) "bAy" = ( /obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/disposalpipe/junction/flip{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" + dir = 1 }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/holopad, /turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/science/server) "bAz" = ( /obj/structure/disposalpipe/junction/flip{ dir = 1 @@ -36507,15 +36038,14 @@ /turf/open/floor/plasteel, /area/science/mixing) "bAH" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/computer/nanite_cloud_controller, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/window/reinforced/spawner, +/turf/open/floor/plasteel/dark, +/area/science/server) "bAI" = ( /obj/machinery/photocopier, /obj/machinery/requests_console{ @@ -36560,14 +36090,9 @@ /turf/open/space/basic, /area/space) "bAM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/closed/wall/r_wall, +/area/engine/engineering) "bAN" = ( /obj/structure/rack, /obj/item/clothing/suit/space/fragile, @@ -36607,33 +36132,21 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bAR" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Thermo-Electric Generator Room"; - req_access_txt = "10" +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/closed/wall/r_wall, +/area/engine/engineering) "bAS" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/disposal) "bAT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/sign/warning/securearea, +/turf/closed/wall/r_wall, +/area/engine/engineering) "bAU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -36791,32 +36304,23 @@ }, /area/hallway/secondary/exit) "bBn" = ( -/obj/effect/turf_decal/tile/red{ +/obj/machinery/door/airlock/engineering/glass{ + name = "Thermo-Electric Generator Room"; + req_access_txt = "10" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"bBo" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/door/airlock/engineering/glass{ - name = "Thermo-Electric Generator"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/area/engine/engineering) +"bBo" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/closed/wall/r_wall, +/area/engine/engineering) "bBp" = ( /obj/machinery/conveyor/inverted{ dir = 9; @@ -36956,18 +36460,12 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bBE" = ( -/obj/structure/grille, -/obj/machinery/power/terminal, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/structure/sign/warning/securearea, +/turf/closed/wall/r_wall, +/area/engine/engineering) "bBF" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -37029,10 +36527,11 @@ /turf/open/floor/engine, /area/science/mixing) "bBO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 9 + }, /turf/closed/wall/r_wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/engine/engineering) "bBP" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -37054,31 +36553,14 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) "bBR" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "Computer Core APC"; - pixel_y = 24 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/disposalpipe/segment, +/turf/closed/wall/r_wall, +/area/engine/engineering) "bBS" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" - }, +/obj/effect/turf_decal/delivery, +/obj/machinery/rnd/server, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/server) "bBT" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -37144,26 +36626,21 @@ /turf/closed/wall, /area/hallway/secondary/exit) "bCa" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"bCb" = ( -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/light{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/door/poddoor{ + id = "RDServer"; + name = "RD Server Lockup" + }, +/turf/open/floor/plasteel, +/area/science/server) +"bCb" = ( +/turf/open/floor/circuit/green, +/area/science/server) "bCc" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -37532,18 +37009,9 @@ /turf/open/floor/plating/airless, /area/maintenance/disposal) "bCW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/door/airlock/engineering/glass{ - name = "Thermo-Electric Generator"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/plasteel, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/disposalpipe/segment, +/turf/open/floor/circuit/green, +/area/science/server) "bCX" = ( /obj/machinery/rnd/production/circuit_imprinter/department/science, /obj/item/reagent_containers/glass/beaker/sulphuric, @@ -38184,24 +37652,11 @@ /turf/open/floor/plasteel, /area/security/checkpoint) "bEo" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/closed/wall/r_wall, +/area/engine/engine_smes) "bEp" = ( /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) @@ -38223,20 +37678,13 @@ }, /area/crew_quarters/heads/captain) "bEr" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_x = -32; - pixel_y = 32 +/obj/structure/grille, +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plating, +/area/engine/engine_smes) "bEs" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/tile/yellow{ @@ -38312,13 +37760,16 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "bEz" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/structure/grille, +/obj/machinery/power/terminal, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/engine/engine_smes) "bEA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -38424,17 +37875,11 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bEK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/space_heater{ - anchored = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/closed/wall/r_wall, +/area/engine/engine_smes) "bEL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38534,11 +37979,25 @@ /turf/open/floor/carpet/green, /area/crew_quarters/bar) "bES" = ( +/obj/machinery/door/airlock/engineering{ + name = "Hot Loop"; + req_one_access_txt = "10;24" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/heavy, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bET" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/wood, @@ -38668,19 +38127,14 @@ /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bFg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/obj/machinery/suit_storage_unit/engine, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/closed/wall/r_wall, +/area/engine/engine_smes) "bFh" = ( /obj/effect/turf_decal/tile/brown, /obj/machinery/light, @@ -39330,15 +38784,9 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "bGv" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Arcade" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/item/caution, +/turf/open/floor/plasteel, +/area/science/server) "bGw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -39451,6 +38899,18 @@ /obj/item/clothing/gloves/color/grey, /turf/open/floor/plating, /area/maintenance/starboard/central) +"bGK" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "RDServer"; + layer = 3.6; + name = "RD Server Lockup Control"; + pixel_x = -24 + }, +/obj/item/circuitboard/machine/rdserver, +/obj/item/disk/tech_disk, +/turf/open/floor/circuit/green, +/area/science/server) "bGL" = ( /obj/structure/chair{ dir = 1 @@ -39492,6 +38952,14 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) +"bGP" = ( +/obj/machinery/computer/robotics{ + dir = 1 + }, +/obj/machinery/light, +/obj/structure/disposalpipe/segment, +/turf/open/floor/circuit/green, +/area/science/server) "bGQ" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment{ @@ -40056,20 +39524,15 @@ /area/medical/chemistry) "bIg" = ( /obj/structure/table, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/item/circuitboard/machine/cyborgrecharger, +/obj/item/disk/design_disk, +/obj/machinery/camera/motion{ + c_tag = "Computer Core"; + dir = 1; + network = list("minisat") }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/item/reagent_containers/food/snacks/chips, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/circuit/green, +/area/science/server) "bIh" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery/white, @@ -40122,26 +39585,12 @@ /turf/open/space/basic, /area/space/nearstation) "bIn" = ( -/obj/structure/chair{ - dir = 8 +/obj/machinery/power/smes/engineering, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#cee5d2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/engine/engine_smes) "bIo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/evac{ @@ -40361,27 +39810,31 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "bIN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/power/apc{ + areastring = "/area/engine/engine_smes"; + dir = 1; + name = "Power Monitoring APC"; + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/engine/engine_smes) +"bIO" = ( +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bIO" = ( -/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bIP" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -40394,41 +39847,35 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bIQ" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/structure/table/reinforced, +/obj/item/clothing/gloves/color/yellow, +/obj/item/multitool, +/obj/item/multitool{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/t_scanner{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/t_scanner{ + pixel_x = -4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bIR" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/machinery/computer/monitor, +/obj/machinery/airalarm{ + pixel_y = 24 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable/yellow, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bIS" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/modular_computer/console/preset/engineering, +/obj/structure/cable/yellow, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bIT" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ @@ -40570,25 +40017,10 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "bJg" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/storage/box/rxglasses{ - pixel_x = 2 - }, -/obj/item/pen, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating, +/area/engine/engine_smes) "bJh" = ( /obj/structure/sign/warning/biohazard, /obj/structure/disposalpipe/segment{ @@ -40636,23 +40068,11 @@ /turf/open/floor/plasteel/dark, /area/lawoffice) "bJn" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/mask/muzzle, -/obj/item/clothing/mask/muzzle, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/closed/wall/r_wall, +/area/science/server) "bJo" = ( /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit) @@ -40812,29 +40232,19 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bJF" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#cee5d2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-2" }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/science/server) "bJG" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -32 @@ -41168,82 +40578,38 @@ /turf/open/floor/plasteel, /area/router) "bKs" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/closed/wall/r_wall, +/area/science/server) "bKt" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1; - light_color = "#cee5d2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 +/turf/closed/wall/r_wall, +/area/engine/engine_smes) +"bKu" = ( +/obj/structure/cable{ + icon_state = "1-4" }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/turf/open/floor/plating, +/area/engine/engine_smes) +"bKv" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bKu" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bKv" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bKw" = ( /obj/structure/window/reinforced/spawner/west, /obj/structure/sign/poster/official/nanotrasen_logo{ @@ -41811,24 +41177,21 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "bLG" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/camera{ - c_tag = "Research Aft"; - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 + dir = 5 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bLH" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -41941,20 +41304,17 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bLU" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bLV" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 @@ -42627,6 +41987,19 @@ }, /turf/open/floor/plating, /area/router) +"bNo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bNp" = ( /obj/machinery/light{ dir = 1 @@ -43119,13 +42492,25 @@ /turf/open/space/basic, /area/space/nearstation) "bOx" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring"; + req_access_txt = "10" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/closed/wall/r_wall, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bOy" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -43143,15 +42528,14 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "bOz" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, +/obj/structure/grille, /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/science/server) "bOA" = ( /obj/effect/turf_decal/tile/green{ dir = 4 @@ -43467,24 +42851,8 @@ /turf/open/floor/engine, /area/science/xenobiology) "bPl" = ( -/obj/structure/chair/sofa/right, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/item/book/manual/wiki/research_and_development, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/closed/wall/r_wall, +/area/engine/engine_smes) "bPm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -43563,24 +42931,9 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bPv" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/yellow, -/obj/item/multitool, -/obj/item/multitool{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/t_scanner{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/t_scanner{ - pixel_x = -4 - }, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/recharge_station, +/turf/open/floor/plating, +/area/engine/engine_smes) "bPw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -43985,44 +43338,30 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bQl" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/power/port_gen/pacman, +/obj/machinery/light, +/obj/machinery/light_switch{ + pixel_y = -24 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/obj/item/stack/sheet/mineral/plasma, +/turf/open/floor/plating, +/area/engine/engine_smes) "bQm" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"bQn" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/camera{ + c_tag = "Engineering - Power Monitoring"; dir = 1 }, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel, +/area/engine/engine_smes) +"bQn" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bQo" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -44085,21 +43424,8 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bQv" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 24 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/engine/engine_smes) "bQw" = ( /obj/structure/cable{ icon_state = "4-8" @@ -44119,35 +43445,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bQy" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bQz" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bQA" = ( /obj/item/radio/intercom{ name = "Station Intercom (Common)"; @@ -44160,35 +43464,12 @@ /turf/open/floor/plasteel/dark, /area/lawoffice) "bQB" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/weldingtool, -/obj/item/wrench/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/closed/wall, +/area/engine/engine_smes) "bQC" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 6 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/west, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/sign/warning/electricshock, +/turf/closed/wall, +/area/engine/engine_smes) "bQD" = ( /obj/machinery/power/apc{ name = "Tech Storage APC"; @@ -44250,29 +43531,18 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bQJ" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Workshop"; + req_access_txt = "11" }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/power/apc{ - name = "Medbay Treatment Center APC"; - pixel_y = -24 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/engine/engine_smes) "bQK" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -44320,17 +43590,12 @@ /turf/open/space/basic, /area/space/nearstation) "bQP" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/storage) "bQQ" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -44428,23 +43693,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bQZ" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/start/scientist, -/obj/machinery/airalarm{ - pixel_y = 24 - }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/storage) "bRa" = ( /obj/item/cigbutt, /obj/structure/cable{ @@ -44475,22 +43729,11 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) "bRd" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - areastring = "/area/engine/storage"; - dir = 4; - name = "Canister Storage APC"; - pixel_x = 24 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/secure_construction) "bRe" = ( /obj/machinery/computer/security/wooden_tv, /obj/effect/turf_decal/bot, @@ -44664,18 +43907,14 @@ /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bRx" = ( -/obj/structure/table, -/obj/item/circuitboard/machine/cyborgrecharger, -/obj/item/disk/design_disk, -/obj/machinery/camera/motion{ - c_tag = "Computer Core"; - dir = 1; - network = list("minisat") +/obj/effect/turf_decal/loading_area{ + dir = 8 }, -/turf/open/floor/circuit/green, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/status_display/supply{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) "bRy" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -44695,14 +43934,13 @@ /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bRA" = ( -/obj/machinery/light{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/effect/landmark/start/atmospheric_technician, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "bRB" = ( /obj/item/radio/intercom{ name = "Station Intercom (Common)"; @@ -44823,35 +44061,39 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bRM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/stairs/left, -/area/science/research{ - name = "Research Sector" - }) -"bRN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/stairs/medium, -/area/science/research{ - name = "Research Sector" - }) -"bRO" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/conveyor/inverted{ + dir = 6; + icon_state = "conveyor_map_inverted"; + id = "cargounload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"bRN" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 1; + id = "cargounload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"bRO" = ( +/obj/machinery/conveyor_switch/oneway{ + dir = 8; + id = "cargounload" + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/storage) "bRP" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -44873,36 +44115,33 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "bRR" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/machinery/conveyor{ + dir = 9; + id = "cargounload" }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/quartermaster/storage) "bRS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/poddoor{ + id = "QMUnloadDoor"; + name = "Cargo Unloading Door" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/conveyor{ + dir = 8; + id = "cargounload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) "bRT" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -45088,52 +44327,72 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bSm" = ( -/obj/machinery/modular_computer/console/preset/engineering, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"bSn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/electricshock, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"bSo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"bSp" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"bSq" = ( +/obj/structure/plasticflaps, /obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/conveyor{ + dir = 8; + id = "cargounload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"bSn" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/door/poddoor{ + id = "QMUnloadDoor"; + name = "Cargo Unloading Door" + }, +/obj/machinery/conveyor{ + dir = 8; + id = "cargounload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"bSo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/server) +"bSp" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "cargoload" + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"bSq" = ( +/obj/machinery/computer/cargo{ dir = 8 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/bot, +/obj/machinery/camera{ + c_tag = "Supply - Cargo Bay"; + dir = 8; + pixel_y = -22 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/button/door{ + id = "QMLoadDoor"; + layer = 4; + name = "Cargo Loading Doors"; + pixel_x = 24; + pixel_y = -6 + }, +/obj/machinery/button/door{ + id = "QMUnloadDoor"; + layer = 4; + name = "Cargo Unloading Doors"; + pixel_x = 24; + pixel_y = 6 }, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/quartermaster/storage) "bSr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -45174,24 +44433,24 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) "bSv" = ( -/obj/machinery/recharge_station, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"bSw" = ( -/obj/machinery/power/port_gen/pacman, -/obj/machinery/light, -/obj/machinery/light_switch{ - pixel_y = -24 +/obj/effect/turf_decal/delivery, +/obj/structure/noticeboard/rd{ + pixel_y = 28 }, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/obj/item/stack/sheet/mineral/plasma, -/turf/open/floor/plating, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) +"bSw" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/research) "bSx" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible, /turf/open/floor/plasteel, @@ -46143,22 +45402,21 @@ /turf/open/floor/plating, /area/maintenance/solars/port) "bUB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/chair{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/engine/engine_smes"; - dir = 1; - name = "Power Monitoring APC"; +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/landmark/start/scientist, +/obj/machinery/airalarm{ pixel_y = 24 }, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/science/research) "bUC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46395,13 +45653,14 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bUX" = ( -/obj/structure/transit_tube/station/reverse/flipped{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "bUY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46432,15 +45691,15 @@ /turf/open/floor/plasteel, /area/router) "bVb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/transit_tube/horizontal, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/secure_construction) "bVc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46475,17 +45734,19 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "bVf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/table, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/camera{ - c_tag = "Engineering - Power Monitoring"; +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/item/reagent_containers/food/snacks/chips, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/science/research) "bVg" = ( /obj/machinery/power/emitter, /obj/effect/turf_decal/tile/blue{ @@ -46802,17 +46063,24 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "bVL" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/noticeboard/rd{ - pixel_y = 28 - }, -/obj/machinery/light{ +/obj/structure/chair{ dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1; + light_color = "#cee5d2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bVM" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -46820,10 +46088,12 @@ /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bVN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -46874,9 +46144,7 @@ pixel_y = 32 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bVS" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -46889,9 +46157,7 @@ light_color = "#cee5d2" }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bVT" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -46904,9 +46170,7 @@ pixel_y = 24 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bVU" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -46986,16 +46250,16 @@ /area/quartermaster/storage) "bWa" = ( /turf/closed/wall/r_wall, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWb" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/stripes/line, +/obj/machinery/camera{ + c_tag = "Research Entrance"; + network = list("ss13","rd") + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWc" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/stripes/line, @@ -47004,9 +46268,7 @@ light_color = "#cee5d2" }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWd" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/sign/poster/official/wtf_is_co2{ @@ -47129,26 +46391,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bWo" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWp" = ( /obj/machinery/atmospherics/miner/n2o, /obj/machinery/portable_atmospherics/canister/nitrous_oxide, @@ -47163,21 +46409,55 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWr" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera{ - c_tag = "Research Entrance"; - network = list("ss13","rd") +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/clipboard, +/obj/item/stamp, +/obj/item/stamp/denied{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/pen/red, +/obj/item/pen/blue{ + pixel_x = -5; + pixel_y = -3 + }, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/sorting) "bWs" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + name = "Cargo Desk"; + req_access_txt = "31" + }, +/obj/item/folder, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/sorting) "bWt" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -47208,72 +46488,82 @@ /turf/open/floor/plating, /area/lawoffice) "bWx" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/structure/table/reinforced, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bWy" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bWz" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bWA" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/item/paper_bin, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, +/obj/item/pen, +/obj/item/wirecutters, +/obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/sorting) +"bWy" = ( +/obj/machinery/status_display/supply, +/turf/closed/wall/r_wall, +/area/quartermaster/storage) +"bWz" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/storage/toolbox/electrical, +/obj/item/hand_labeler, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"bWA" = ( +/obj/effect/turf_decal/bot, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=1"; + dir = 1; + freq = 1400; + location = "Bridge" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bWB" = ( -/obj/structure/rack, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/obj/item/extinguisher, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWC" = ( -/obj/machinery/shower{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/effect/turf_decal/stripes/line{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 1 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWD" = ( /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ @@ -47343,17 +46633,18 @@ /turf/open/floor/plating, /area/engine/atmos) "bWL" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWM" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ @@ -47373,16 +46664,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bWN" = ( -/obj/structure/grille, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bWO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47391,21 +46683,18 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bWP" = ( -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/airlock/command{ - name = "Computer Core"; - req_access_txt = "30" +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "bWQ" = ( /obj/structure/grille, /obj/structure/cable, @@ -47416,11 +46705,20 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "bWR" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/science/research{ - name = "Research Sector" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bWS" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -47428,66 +46726,127 @@ /turf/closed/wall/r_wall, /area/science/mixing) "bWT" = ( -/obj/structure/chair/sofa/left, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/effect/landmark/start/scientist, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWU" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, +/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/structure/disposalpipe/trunk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWV" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bWW" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/research/glass{ + name = "Research Sector"; + req_one_access_txt = "29;47" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) +"bWW" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "bWX" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bWY" = ( -/obj/structure/sign/warning/nosmoking, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bWZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47495,25 +46854,35 @@ /turf/closed/wall, /area/hallway/primary/aft) "bXa" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/item/multitool{ - pixel_y = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/research/glass{ + name = "Research Sector"; + req_one_access_txt = "29;47" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/obj/item/book/manual/wiki/robotics_cyborgs, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "bXb" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -47577,13 +46946,16 @@ /turf/closed/wall/r_wall, /area/science/mixing) "bXh" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/light/small, +/obj/effect/turf_decal/loading_area{ dir = 4 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/quartermaster/storage) "bXi" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47602,29 +46974,26 @@ /turf/open/floor/plating, /area/maintenance/aft) "bXk" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/stripes/end{ dir = 8 }, -/obj/effect/turf_decal/tile/green{ - dir = 4 +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plating, +/area/quartermaster/storage) "bXl" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) "bXm" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -47646,24 +47015,20 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bXo" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/door/poddoor{ + id = "QMLoadDoor"; + name = "Cargo Loading Door" }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/quartermaster/storage) "bXp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/disposal/deliveryChute{ @@ -47688,20 +47053,17 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "bXr" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/plasticflaps, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" }, -/obj/machinery/camera{ - c_tag = "Research Fore"; - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/quartermaster/storage) "bXs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47748,37 +47110,32 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bXx" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "cargoload" + }, +/obj/machinery/door/poddoor{ + id = "QMLoadDoor"; + name = "Cargo Loading Door" + }, +/turf/open/floor/plating, +/area/quartermaster/storage) +"bXy" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bXy" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/light, -/obj/item/kirbyplants{ - icon_state = "plant-16" +/obj/machinery/camera{ + c_tag = "Research Fore"; + dir = 4 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXz" = ( /obj/machinery/power/apc{ name = "Medbay Lobby APC"; @@ -47790,28 +47147,12 @@ /turf/open/floor/plating, /area/maintenance/aft) "bXA" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXB" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/item/modular_computer/laptop/preset/civilian, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXC" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -47825,21 +47166,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/lobby) "bXD" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 10 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/east, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "bXE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -47892,32 +47225,17 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain) "bXJ" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXK" = ( +/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/light, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/stripes/white/full, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -47955,21 +47273,15 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bXQ" = ( -/obj/structure/closet/l3closet/scientist, /obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXR" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/miner/carbon_dioxide, @@ -47985,26 +47297,24 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bXT" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, +/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 8 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bXU" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "bXV" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8; @@ -48038,33 +47348,23 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bXZ" = ( -/obj/structure/table, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, /obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) +"bYa" = ( +/obj/structure/rack, +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/item/paper_bin, -/obj/item/radio/headset/headset_sci, -/obj/item/radio/headset/headset_sci, +/obj/item/extinguisher, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"bYa" = ( -/obj/effect/turf_decal/tile/purple, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48078,14 +47378,14 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bYc" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/shower{ + dir = 1 }, -/turf/open/floor/plating, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/research) "bYd" = ( /obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, /turf/open/floor/plasteel, @@ -48129,25 +47429,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bYi" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/recharger, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48161,12 +47451,9 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bYk" = ( -/obj/machinery/vending/wardrobe/science_wardrobe, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/science/research) "bYl" = ( /obj/structure/lattice, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -48207,23 +47494,11 @@ /turf/open/floor/circuit/green, /area/science/robotics/mechbay) "bYr" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/photocopier, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/closed/wall/r_wall, +/area/science/research) "bYs" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -48258,41 +47533,36 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bYu" = ( +/obj/structure/chair/sofa/right, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/item/book/manual/wiki/research_and_development, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYv" = ( /turf/closed/wall, /area/science/robotics/mechbay) "bYw" = ( +/obj/structure/chair/sofa/left, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 - }, +/obj/effect/landmark/start/scientist, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48321,21 +47591,16 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "bYA" = ( +/obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ - dir = 8 + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/disposalpipe/trunk, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48379,20 +47644,15 @@ /turf/open/floor/circuit/green, /area/science/robotics/mechbay) "bYG" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/sleeper{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel, +/area/science/research) "bYH" = ( /obj/structure/sign/poster/contraband/kss13{ pixel_y = -32 @@ -48429,17 +47689,10 @@ /area/medical/medbay/lobby) "bYL" = ( /obj/effect/turf_decal/tile/purple{ - dir = 4 + dir = 1 }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bYM" = ( /obj/machinery/vending/wardrobe/cargo_wardrobe, /obj/effect/turf_decal/delivery, @@ -48504,32 +47757,29 @@ /turf/open/space/basic, /area/solar/starboard/aft) "bYS" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bYT" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 4 }, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "bYU" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "bYV" = ( /obj/machinery/rnd/destructive_analyzer, /obj/machinery/airalarm{ @@ -48546,85 +47796,82 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bYX" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/sign/poster/official/anniversary_vintage_reprint, +/turf/closed/wall/r_wall, +/area/science/research) "bYY" = ( -/turf/open/floor/circuit/green, -/area/science/server{ - name = "Computer Core" - }) -"bYZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/circuit/green, -/area/science/server{ - name = "Computer Core" - }) -"bZa" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) +"bYZ" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/storage/box/disks, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) +"bZa" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bZb" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "RDServer"; - layer = 3.6; - name = "RD Server Lockup Control"; - pixel_x = -24 - }, -/obj/item/circuitboard/machine/rdserver, -/obj/item/disk/tech_disk, -/turf/open/floor/circuit/green, -/area/science/server{ - name = "Computer Core" - }) -"bZc" = ( -/obj/machinery/computer/robotics{ - dir = 1 - }, -/obj/machinery/light, /obj/structure/disposalpipe/segment, -/turf/open/floor/circuit/green, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) +"bZc" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) "bZd" = ( /obj/effect/landmark/blobstart, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) "bZe" = ( -/obj/structure/grille, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "bZf" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable{ @@ -48853,35 +48100,27 @@ /area/science/xenobiology) "bZE" = ( /obj/effect/turf_decal/tile/purple{ - dir = 4 + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/effect/turf_decal/tile/purple, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 8 + }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bZF" = ( /turf/open/floor/wood, /area/library) "bZG" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/obj/structure/sign/warning/fire{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/science/research) "bZH" = ( /turf/closed/wall, /area/library) @@ -49452,18 +48691,16 @@ /turf/open/floor/engine, /area/science/explab) "cbf" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/sleeper{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light, +/obj/item/kirbyplants{ + icon_state = "plant-16" + }, +/turf/open/floor/plasteel, +/area/science/research) "cbg" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/engine, @@ -49487,14 +48724,15 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain) "cbj" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/chair{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/science/research) "cbk" = ( /obj/structure/table, /obj/item/paper_bin, @@ -49646,11 +48884,14 @@ /turf/open/floor/plating, /area/ai_monitored/storage/eva) "cbB" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/table, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/item/modular_computer/laptop/preset/civilian, +/turf/open/floor/plasteel, +/area/science/research) "cbC" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/stripes/line{ @@ -49659,18 +48900,28 @@ /turf/open/floor/engine, /area/science/storage) "cbD" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/chair{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/turf/open/floor/plasteel, +/area/science/research) "cbE" = ( -/turf/closed/wall/r_wall, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/light, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/stripes/white/full, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "cbF" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 6 @@ -49721,22 +48972,19 @@ /turf/open/floor/plasteel, /area/engine/atmos) "cbJ" = ( -/obj/structure/table/reinforced, -/obj/item/analyzer, -/obj/item/t_scanner, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1; + sortType = 24 + }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, -/obj/machinery/power/apc{ - areastring = "/area/engine/supermatter"; - dir = 4; - name = "Thermo-Electric Generator APC"; - pixel_x = 24 - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "cbK" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -49828,6 +49076,20 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/central) +"cbS" = ( +/obj/structure/closet/l3closet/scientist, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "cbT" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 @@ -49859,18 +49121,24 @@ /turf/open/floor/plasteel/dark, /area/engine/atmos) "cbV" = ( -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "2-8" }, -/obj/structure/window/reinforced/spawner, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plasteel, +/area/science/research) "cbW" = ( /obj/machinery/disposal/deliveryChute{ dir = 8 @@ -49888,19 +49156,15 @@ /turf/open/floor/circuit, /area/bridge) "cbY" = ( -/obj/machinery/light_switch{ - pixel_y = 24 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 }, -/turf/open/floor/plasteel/dark, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plasteel, +/area/science/research) "cbZ" = ( /obj/machinery/computer/slot_machine, /obj/structure/window/reinforced/spawner/west, @@ -50264,6 +49528,10 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"ccJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/research) "ccK" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 9 @@ -50371,14 +49639,19 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "ccX" = ( -/obj/effect/turf_decal/loading_area{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/quartermaster/storage) +/area/science/research) "ccY" = ( /obj/structure/cable, /obj/effect/landmark/start/librarian, @@ -50441,21 +49714,22 @@ /turf/open/floor/mineral/titanium/blue, /area/hallway/primary/central) "cdf" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/structure/table, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/obj/item/paper_bin, +/obj/item/radio/headset/headset_sci, +/obj/item/radio/headset/headset_sci, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "cdg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -50463,13 +49737,8 @@ /turf/open/floor/plasteel, /area/engine/break_room) "cdh" = ( -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/closed/wall/r_wall, +/area/crew_quarters/toilet/restrooms) "cdi" = ( /obj/machinery/disposal/deliveryChute, /obj/structure/disposalpipe/trunk{ @@ -50529,14 +49798,11 @@ /turf/open/floor/plasteel, /area/engine/break_room) "cdn" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "cdo" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment{ @@ -51080,17 +50346,17 @@ /turf/closed/wall/r_wall, /area/engine/teg_hot) "ceu" = ( -/obj/machinery/vending/snack/random, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "cev" = ( -/obj/machinery/vending/games, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "cew" = ( /obj/structure/window/reinforced/spawner/east, /obj/machinery/conveyor/auto{ @@ -51101,92 +50367,57 @@ /turf/open/floor/plating, /area/router/eng) "cex" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "cey" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Arcade" +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) "cez" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 6 }, -/obj/item/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/storage/firstaid/brute, -/obj/item/clothing/glasses/hud/health, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "ceA" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/obj/item/storage/firstaid/o2, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"ceB" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ +/turf/open/floor/plating, +/area/science/research) +"ceB" = ( +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "ceC" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -51497,39 +50728,50 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "cfh" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/recharger, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/science/research) "cfi" = ( -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cfj" = ( -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/firealarm{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/components/binary/valve/digital/on, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cfk" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/camera{ + c_tag = "Aft Maintenance - Air Hookup" + }, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cfl" = ( -/turf/closed/wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/atmospherics/components/binary/valve/digital/on, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cfm" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/canister/air, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cfn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -51594,64 +50836,45 @@ /turf/closed/wall/r_wall, /area/engine/teg_hot) "cfv" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister/toxins, -/obj/machinery/firealarm{ - pixel_y = 26 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"cfw" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Engineering Construction Area"; - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"cfx" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 - }, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"cfy" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/turf/closed/wall/r_wall, +/area/engine/secure_construction) +"cfw" = ( +/obj/machinery/door/airlock/engineering{ + name = "Canister Storage"; + req_one_access_txt = "10;24" }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "4-8" }, -/obj/machinery/power/terminal{ +/obj/machinery/door/firedoor/heavy, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"cfx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"cfy" = ( +/obj/machinery/camera{ + c_tag = "Electrical Substation"; dir = 1 }, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "cfz" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -51744,30 +50967,21 @@ /turf/open/floor/plating, /area/engine/teg_hot) "cfL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable{ + icon_state = "2-4" + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos{ - name = "Atmospherics Access"; - req_access_txt = "24" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cfM" = ( /obj/structure/cable{ icon_state = "2-8" @@ -51897,14 +51111,14 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "cfZ" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/plasteel/stairs/right, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "cga" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -52216,125 +51430,107 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "cgF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/vending/wardrobe/science_wardrobe, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/science/research) "cgG" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/spawner/north, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/components/binary/valve/digital/on{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-4" +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) +"cgH" = ( +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 }, /turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) -"cgH" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) +/area/maintenance/aft/secondary) "cgI" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cgJ" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/landmark/event_spawn, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cgK" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) -"cgL" = ( -/obj/machinery/computer/rdservercontrol{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, /obj/machinery/light{ dir = 8 }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plasteel/dark, -/area/science/server{ - name = "Computer Core" - }) -"cgM" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/photocopier, +/turf/open/floor/plasteel, +/area/science/research) +"cgL" = ( +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) -"cgN" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/sign/warning/fire{ + pixel_x = -32; + pixel_y = 32 }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) -"cgO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) -"cgP" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/closed/wall/r_wall, -/area/science/server{ - name = "Computer Core" - }) -"cgQ" = ( -/obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) +"cgM" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) +"cgN" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/structure/cable{ icon_state = "0-4" }, +/obj/machinery/power/apc{ + areastring = "/area/maintenance/aft/secondary"; + dir = 8; + name = "Aft Air Hookup APC"; + pixel_x = -24 + }, /turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/area/maintenance/aft/secondary) +"cgO" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) +"cgP" = ( +/obj/machinery/light/small, +/obj/machinery/space_heater, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) +"cgQ" = ( +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cgR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 @@ -52365,20 +51561,10 @@ /turf/open/floor/plasteel/dark, /area/engine/teg_hot) "cgV" = ( -/obj/structure/reagent_dispensers/water_cooler, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "cgW" = ( /obj/docking_port/stationary{ dir = 4; @@ -52502,20 +51688,34 @@ /turf/closed/wall/r_wall, /area/engine/teg_hot) "chl" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"chm" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/closed/wall/r_wall/rust, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"chm" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "chn" = ( /obj/machinery/light{ dir = 8 @@ -53155,13 +52355,18 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "ciG" = ( -/obj/structure/cable/yellow{ +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ icon_state = "1-2" }, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "ciH" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 6 @@ -53463,16 +52668,16 @@ /turf/closed/wall/rust, /area/maintenance/port/central) "cjr" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "0-2" +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "cjs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -53878,21 +53083,9 @@ }, /area/science/robotics/lab) "ckc" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/aft/secondary"; - dir = 8; - name = "Aft Air Hookup APC"; - pixel_x = -24 - }, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/atmospherics/components/binary/valve/digital/on, +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "ckd" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/white, @@ -53905,17 +53098,16 @@ /turf/open/floor/wood, /area/library) "ckf" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos{ + name = "Aft Air Hookup"; + req_access_txt = "12;24" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plating, +/area/maintenance/aft/secondary) "ckg" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -53981,17 +53173,9 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "cko" = ( -/obj/structure/cable, -/obj/machinery/power/apc{ - areastring = "/area/engine/engineering"; - dir = 4; - name = "Engine Room APC"; - pixel_x = 24 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/sign/warning/nosmoking, +/turf/closed/wall/r_wall, +/area/maintenance/aft/secondary) "ckp" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -54021,22 +53205,23 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "cks" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel, +/area/science/research) "ckt" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/airalarm{ @@ -54072,20 +53257,22 @@ /turf/open/floor/plasteel, /area/engine/teg_hot) "ckx" = ( -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/structure/disposalpipe/segment{ - dir = 10 + dir = 5 }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/landmark/start/scientist, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 + dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel, +/area/science/research) "cky" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, @@ -54258,34 +53445,41 @@ /turf/open/floor/plasteel, /area/quartermaster/storage) "ckP" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "ckQ" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/light{ + dir = 1; + light_color = "#cee5d2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "ckR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54302,55 +53496,82 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ckT" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/purple{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) "ckU" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/science/research) "ckV" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + light_color = "#cee5d2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/research) +"ckW" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"ckW" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel, +/area/science/research) "ckX" = ( /obj/machinery/atmospherics/components/binary/valve, /obj/structure/cable{ @@ -54406,27 +53627,35 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cld" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cle" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/machinery/power/apc{ - areastring = "/area/science/misc_lab"; - dir = 1; - name = "Research Observatory APC"; - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel, +/area/science/research) +"cle" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) "clf" = ( /obj/machinery/light/small{ dir = 8 @@ -54438,22 +53667,36 @@ /turf/open/floor/engine, /area/science/xenobiology) "clg" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-8" +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/disposalpipe/segment, +/obj/item/radio/intercom{ + name = "Station Intercom (Common)"; + pixel_y = -29 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "clh" = ( -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "cli" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -54576,63 +53819,95 @@ }, /area/library) "clx" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ - dir = 8 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Access"; + req_access_txt = "24" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cly" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) "clz" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"clA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"clB" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/closed/wall/r_wall, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"clC" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/power/apc{ + areastring = "/area/science/research"; + name = "Research Sector APC"; + pixel_y = -24 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/science/research) +"clA" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Research Aft"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) +"clB" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/research) +"clC" = ( +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1; + sortType = 24 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/science/research) "clD" = ( /obj/machinery/telecomms/server/presets/medical, /turf/open/floor/circuit/telecomms/mainframe, @@ -54651,12 +53926,16 @@ /area/tcommsat/server) "clH" = ( /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 6 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/terminal{ + dir = 1 }, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "clI" = ( /obj/machinery/telecomms/bus/preset_four, /turf/open/floor/circuit/telecomms/mainframe, @@ -54954,11 +54233,17 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "cmt" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall/r_wall, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "cmu" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -55091,28 +54376,15 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "cmI" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/item/radio/off{ - pixel_x = -3; - pixel_y = 1 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 }, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "cmJ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/brown, @@ -55268,20 +54540,10 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "cmV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/structure/window/reinforced/spawner, +/obj/item/storage/backpack/snail, +/turf/open/floor/grass, +/area/hallway/secondary/exit) "cmW" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -55301,14 +54563,10 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "cmX" = ( -/obj/machinery/light/small, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/structure/window/reinforced/spawner, +/mob/living/simple_animal/kiwi, +/turf/open/floor/grass, +/area/hallway/secondary/exit) "cmY" = ( /obj/machinery/door/airlock/engineering{ name = "Hot Loop"; @@ -55328,37 +54586,18 @@ /turf/open/floor/plasteel, /area/engine/teg_hot) "cmZ" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/west, -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/stairs, +/area/science/research) "cna" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/structure/window/reinforced/spawner/east, -/obj/machinery/atmospherics/components/unary/cryo_cell{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/stairs/left, +/area/science/research) "cnb" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line, @@ -55425,18 +54664,13 @@ /turf/open/floor/plasteel, /area/engine/atmos) "cnj" = ( -/obj/machinery/camera{ - c_tag = "Research - Observatory"; - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = -28 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/stairs/medium, +/area/science/research) "cnk" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/yellow{ @@ -55569,20 +54803,12 @@ /turf/open/floor/plasteel, /area/engine/teg_hot) "cny" = ( -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" }, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plasteel/stairs/right, +/area/science/research) "cnz" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -55701,6 +54927,14 @@ /obj/item/target/clown, /turf/open/floor/plasteel, /area/science/mixing) +"cnM" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) "cnN" = ( /obj/structure/bookcase/random/fiction, /obj/effect/turf_decal/tile/neutral, @@ -55878,27 +55112,23 @@ /turf/open/floor/plasteel, /area/engine/teg_hot) "cog" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "coh" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/smes{ - charge = 5e+006 +/obj/machinery/door/airlock/engineering{ + name = "Electrical Substation"; + req_access_txt = "10" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/engine/storage_shared{ - name = "Electrical Substation" - }) +/area/engine/storage_shared) "coi" = ( /obj/machinery/light, /obj/structure/disposalpipe/segment{ @@ -55994,20 +55224,16 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "cos" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Workshop"; - req_access_txt = "11" +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/science/research) "cot" = ( /obj/machinery/computer/apc_control{ dir = 4 @@ -56358,42 +55584,27 @@ /turf/open/floor/plating, /area/storage/tech) "coX" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Medbay - Operating Theatre"; - dir = 8; - network = list("ss13","medbay"); - pixel_y = -22 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel, +/area/science/research) "coY" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/machinery/camera{ - c_tag = "Medbay - Cryogenics"; - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/obj/item/reagent_containers/glass/beaker/cryoxadone, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/research) "coZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -56450,13 +55661,21 @@ /turf/open/floor/engine, /area/science/explab) "cpf" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 +/obj/effect/turf_decal/tile/purple{ + dir = 8 }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/science/research) "cpg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -56467,40 +55686,52 @@ /turf/open/floor/plasteel/dark, /area/science/explab) "cph" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/area/science/research) "cpi" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supply/visible{ - dir = 5 - }, -/obj/machinery/light/small, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) -"cpj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/power/apc{ + areastring = "/area/science/robotics/lab"; + dir = 8; + name = "Robotics Lab APC"; + pixel_x = -25 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/science/research) +"cpj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/science/research) "cpk" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 8 @@ -56566,11 +55797,15 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "cpq" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/carpet/blue, -/area/crew_quarters/abandoned_gambling_den{ - name = "Arcade" - }) +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/research) "cpr" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -56950,13 +56185,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cqf" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/storage/box/rxglasses{ + pixel_x = 2 + }, +/obj/item/pen, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cqg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -56965,20 +56210,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cqh" = ( -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ +/obj/machinery/vending/medical, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/turf_decal/tile/green{ - dir = 8 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cqi" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -57018,33 +56259,16 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "cqm" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/green{ +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 26 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/item/storage/box/disks_nanite, -/obj/item/book/manual/wiki/research_and_development{ - pixel_x = 4; - pixel_y = -8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cqn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -57348,14 +56572,21 @@ /turf/open/floor/plasteel, /area/engine/teg_cold) "cqP" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/mask/muzzle, +/obj/item/clothing/mask/muzzle, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cqQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -57597,11 +56828,23 @@ /turf/open/floor/mineral/titanium/blue, /area/hallway/primary/central) "crl" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/rack, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/item/storage/belt/medical, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/suit/space/eva/paramedic, +/obj/item/clothing/head/helmet/space/eva/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "crm" = ( /obj/machinery/door/firedoor, /obj/structure/plasticflaps, @@ -57661,20 +56904,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "crs" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ +/obj/structure/closet/secure_closet/medical2, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/item/radio/intercom{ - name = "Station Intercom (Common)"; - pixel_y = -29 - }, -/turf/open/floor/engine, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) +/obj/effect/turf_decal/tile/red, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "crt" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -57708,34 +56951,48 @@ /turf/open/floor/plasteel, /area/engine/break_room) "crv" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"crw" = ( -/obj/structure/disposalpipe/junction{ +/obj/structure/closet/secure_closet/medical1, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"crx" = ( -/obj/machinery/camera{ - c_tag = "Engine Room - Port Quarter"; +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"crw" = ( +/obj/machinery/computer/med_data, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"crx" = ( +/obj/structure/closet/crate/freezer/blood, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cry" = ( /obj/structure/table, /obj/item/stack/sheet/plasteel{ @@ -58341,11 +57598,16 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "csC" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating/asteroid, -/area/hydroponics/garden{ - name = "Nature Preserve" - }) +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "csD" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/dark, @@ -58448,42 +57710,37 @@ }, /area/crew_quarters/heads/hor) "csO" = ( -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "csP" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"csQ" = ( +/obj/machinery/iv_drip, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"csQ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "csR" = ( /turf/open/floor/engine, /area/science/storage) "csS" = ( -/obj/machinery/atmospherics/pipe/manifold/general/visible{ +/obj/structure/bed/roller, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plating, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "csT" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, @@ -58509,17 +57766,18 @@ }, /area/science/robotics/lab) "csW" = ( -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "csX" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "csY" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/white, @@ -58543,18 +57801,12 @@ /turf/open/floor/engine, /area/science/explab) "ctc" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "ctd" = ( /obj/structure/cable{ icon_state = "1-2" @@ -58928,14 +58180,12 @@ /turf/open/floor/engine, /area/science/xenobiology) "ctN" = ( -/obj/machinery/light/small{ - dir = 4; - light_color = "#d8b1b1" +/obj/effect/turf_decal/stripes/line{ + dir = 5 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "ctO" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -58949,15 +58199,15 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "ctP" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ctQ" = ( /obj/structure/grille, /obj/structure/cable{ @@ -59047,13 +58297,12 @@ /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit) "ctW" = ( -/obj/machinery/airalarm{ - pixel_y = 24 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ctX" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -59068,63 +58317,45 @@ /turf/open/floor/plasteel, /area/engine/workshop) "ctY" = ( -/obj/structure/sign/departments/xenobio{ - pixel_x = -32; - pixel_y = 32 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/sleeper{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ctZ" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/east, +/obj/machinery/sleeper{ dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cua" = ( -/obj/structure/chair/comfy/black{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cub" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/table/optable, +/obj/effect/turf_decal/bot, +/obj/item/defibrillator/loaded, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cuc" = ( /obj/machinery/door/airlock/virology/glass{ name = "Monkey Pen"; @@ -59172,78 +58403,82 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "cuf" = ( -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/computer/operating, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cug" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cuh" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cui" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cuj" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cuk" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/item/paper/guides/cogstation/letter_med{ + pixel_y = 4 + }, +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cui" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/camera{ + c_tag = "Medbay - Operating Theatre"; + dir = 8; + network = list("ss13","medbay"); + pixel_y = -22 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cuj" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/door/window/westright{ + name = "Treatment Center"; + req_access_txt = "5" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cuk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cul" = ( -/obj/structure/chair/comfy/black, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cum" = ( /obj/structure/rack, /obj/item/storage/firstaid/regular{ @@ -59307,30 +58542,32 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cuq" = ( -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/door/window/eastleft{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cur" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cus" = ( -/obj/machinery/light/small, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cut" = ( /obj/docking_port/stationary{ dir = 2; @@ -59368,11 +58605,10 @@ /turf/open/floor/plasteel, /area/engine/workshop) "cux" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/crew_quarters/fitness/cogpool) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) "cuy" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -59873,41 +59109,22 @@ /area/medical/medbay/central) "cvx" = ( /obj/structure/table, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 4 +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/storage/toolbox/emergency, -/obj/item/hypospray/mkii/tricord, -/obj/item/radio/intercom{ - broadcasting = 1; - frequency = 1485; - listening = 0; - name = "Station Intercom (Medical)"; - pixel_y = -30 +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/healthanalyzer, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/area/medical/medbay/zone2) "cvy" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel/white, @@ -59932,76 +59149,53 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "cvA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/sign/warning/securearea{ - pixel_x = -32; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/machinery/door/window/westleft{ + name = "Treatment Center"; + req_access_txt = "5" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cvB" = ( -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, -/obj/machinery/porta_turret/ai{ - dir = 1; - req_access = list(16) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cvC" = ( -/obj/machinery/computer/nanite_cloud_controller, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/obj/structure/window/reinforced/spawner, -/turf/open/floor/plasteel/dark, -/area/science/server{ - name = "Computer Core" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cvD" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/rnd/server, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/door/window/eastright{ + name = "Operating Theatre"; + req_access_txt = "45" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cvE" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/poddoor{ - id = "RDServer"; - name = "RD Server Lockup" +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/medical/medbay/zone2) "cvF" = ( -/obj/item/caution, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/area/medical/medbay/zone2) "cvG" = ( /obj/machinery/door/airlock/research/glass{ name = "Xenobiology Lab Access"; @@ -60218,17 +59412,20 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "cvW" = ( -/obj/structure/chair/comfy/black, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/item/clothing/gloves/color/latex, +/obj/item/clothing/suit/apron/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/healthanalyzer, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cvX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ @@ -60328,16 +59525,13 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "cwd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cwe" = ( /obj/structure/closet/secure_closet/exile, /turf/open/floor/plasteel/white, @@ -60469,27 +59663,10 @@ /turf/open/floor/plating, /area/medical/virology) "cwq" = ( -/obj/machinery/door/airlock/engineering{ - name = "Hot Loop"; - req_one_access_txt = "10;24" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cwr" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -60551,12 +59728,11 @@ /turf/open/floor/plasteel, /area/engine/atmos) "cwy" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/transit_tube/horizontal, -/turf/open/floor/plating, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "cwz" = ( /obj/structure/transit_tube/curved{ dir = 8 @@ -60718,18 +59894,9 @@ /turf/open/floor/mineral/titanium/blue, /area/hallway/primary/central) "cwV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/misc_lab) "cwW" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -60789,15 +59956,18 @@ /turf/open/space/basic, /area/space/nearstation) "cxd" = ( -/obj/machinery/computer/monitor, -/obj/machinery/airalarm{ - pixel_y = 24 +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 }, -/obj/structure/cable/yellow, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cxe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60954,21 +60124,11 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cxs" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/item/storage/toolbox/electrical, -/obj/item/hand_labeler, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cxt" = ( /obj/effect/landmark/start/cargo_technician, /obj/structure/cable{ @@ -61472,28 +60632,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cyt" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/power/apc{ - areastring = "/area/science/robotics/lab"; - dir = 8; - name = "Robotics Lab APC"; - pixel_x = -25 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cyu" = ( /obj/structure/closet/wardrobe/chemistry_white{ anchored = 1 @@ -62186,12 +61329,17 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) "czK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "czL" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -62876,23 +62024,12 @@ /turf/open/floor/plating, /area/hallway/primary/aft) "cAU" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 +/obj/machinery/computer/operating{ + dir = 1 }, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/area/medical/medbay/zone2) "cAV" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 @@ -62964,19 +62101,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "cBd" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/item/storage/backpack/duffelbag/med/surgery, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cBe" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -63038,42 +62172,24 @@ /turf/open/floor/plasteel, /area/hallway/primary/port/fore) "cBk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"cBl" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring"; - req_access_txt = "10" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cBl" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cBm" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -63126,21 +62242,28 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "cBr" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cBs" = ( -/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 6 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/west, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cBt" = ( /obj/structure/closet/l3closet/scientist, /obj/structure/cable{ @@ -63241,13 +62364,14 @@ /turf/open/floor/plating, /area/engine/workshop) "cBC" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 }, -/turf/closed/wall/r_wall, -/area/maintenance/aft/secondary{ - name = "Aft Air Hookup" - }) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cBD" = ( /obj/effect/turf_decal/tile/green, /obj/machinery/atmospherics/pipe/simple/orange/hidden, @@ -63586,25 +62710,10 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "cCd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/plasteel/white, -/area/medical{ - name = "Medical Booth" - }) +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "cCe" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -64679,20 +63788,13 @@ }, /area/crew_quarters/heads/hor) "cDX" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/effect/landmark/start/medical_doctor, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cDY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -64753,242 +63855,143 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "cEc" = ( -/obj/effect/turf_decal/bot, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 10 }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=1"; - dir = 1; - freq = 1400; - location = "Bridge" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEd" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEe" = ( /obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/east, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cEd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) +"cEe" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) +"cEf" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/zone2) +"cEg" = ( +/obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEf" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/area/medical/medbay/zone2) "cEh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEi" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEj" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/closed/wall/r_wall, +/area/science/misc_lab) "cEk" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/door/airlock/research/glass{ - name = "Research Sector"; - req_one_access_txt = "29;47" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cEl" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cEm" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/window/reinforced/spawner/west, +/obj/machinery/atmospherics/components/unary/cryo_cell{ + dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEn" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/machinery/camera{ + c_tag = "Medbay - Cryogenics"; dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/door/airlock/research/glass{ - name = "Research Sector"; - req_one_access_txt = "29;47" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEo" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -65033,45 +64036,75 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEs" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEt" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/item/weldingtool, +/obj/item/wrench/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cEt" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner/east, +/obj/machinery/atmospherics/components/unary/cryo_cell{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "Medbay Treatment Center APC"; + pixel_y = -24 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEv" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light, +/obj/effect/turf_decal/stripes/red/full, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = -32 + }, +/obj/machinery/disposal/bin{ + name = "Corpse Disposal Unit" + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -65083,18 +64116,40 @@ /turf/open/floor/plasteel/white, /area/science/lab) "cEx" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/toolbox/emergency, +/obj/item/hypospray/mkii/tricord, +/obj/item/radio/intercom{ + broadcasting = 1; + frequency = 1485; + listening = 0; + name = "Station Intercom (Medical)"; + pixel_y = -30 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/white, @@ -65112,21 +64167,35 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEA" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 24 +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/item/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65213,21 +64282,31 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cEJ" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/item/storage/firstaid/toxin{ + pixel_x = 2; + pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/item/storage/firstaid/toxin{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "cEK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -65241,41 +64320,26 @@ /turf/open/floor/plasteel, /area/science/lab) "cEM" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cEN" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/red{ dir = 8 }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"cEN" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cEO" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -65565,34 +64629,29 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cFl" = ( -/obj/structure/closet/secure_closet/medical1, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"cFm" = ( -/obj/structure/closet/crate/freezer/blood, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cFm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFn" = ( /obj/structure/closet/l3closet, /obj/structure/disposalpipe/segment, @@ -65616,23 +64675,24 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cFp" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) -"cFq" = ( -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cFq" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/door/airlock/research{ + name = "Aft Observatory"; + req_access_txt = "47" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFr" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -65718,68 +64778,40 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cFw" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/door/airlock/research{ + name = "Aft Observatory"; + req_access_txt = "47" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/door/window/westright{ - name = "Treatment Center"; - req_access_txt = "5" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFx" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 +/obj/machinery/power/apc{ + areastring = "/area/science/misc_lab"; + dir = 1; + name = "Research Observatory APC"; + pixel_y = 24 }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFy" = ( /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFz" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/healthanalyzer, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cFA" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -66194,134 +65226,75 @@ /turf/open/floor/plating, /area/router/air) "cGi" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/airalarm{ + pixel_y = 24 }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cGj" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ +/obj/machinery/camera{ + c_tag = "Research - Observatory"; dir = 4 }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -28 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cGk" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cGl" = ( -/obj/effect/turf_decal/tile/purple{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cGm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cGn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cGo" = ( +/obj/machinery/light/small{ + dir = 4; + light_color = "#d8b1b1" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cGp" = ( +/obj/structure/sign/departments/xenobio{ + pixel_x = -32; + pixel_y = 32 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green{ dir = 8 }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cGm" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cGn" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/item/radio/intercom{ - name = "Station Intercom (Common)"; - pixel_y = -29 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) -"cGo" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/stairs, -/area/science/research{ - name = "Research Sector" - }) -"cGp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cGq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -66369,22 +65342,15 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "cGu" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/research{ - name = "Research Sector" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cGv" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable{ @@ -67024,41 +65990,37 @@ /turf/open/floor/engine, /area/science/explab) "cHK" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cHL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cHM" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cHN" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, /turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/area/science/misc_lab) +"cHL" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cHM" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cHN" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cHO" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -67908,24 +66870,17 @@ /turf/open/floor/plasteel, /area/engine/workshop) "cJl" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 +/obj/structure/chair/comfy/black{ + dir = 8 }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/camera{ - c_tag = "Engine Room - Starboard Quarter"; - dir = 8; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJm" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -67940,15 +66895,24 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"cJp" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ +"cJo" = ( +/obj/structure/chair/comfy/black{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cJp" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJq" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /obj/structure/cable{ @@ -67999,32 +66963,27 @@ /turf/open/floor/plasteel, /area/engine/atmos) "cJv" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Router"; - req_access_txt = "11" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJw" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/structure/sign/warning/securearea{ + pixel_x = -32; + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJx" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/manifold/supplymain/visible{ @@ -68050,28 +67009,29 @@ /area/quartermaster/warehouse) "cJA" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJB" = ( +/obj/machinery/light, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/visible, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ +/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/plasteel, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJC" = ( /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; @@ -68113,11 +67073,11 @@ /turf/open/floor/plasteel, /area/engine/gravity_generator) "cJF" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/closed/wall/r_wall, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "cJG" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -68154,163 +67114,100 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "cJJ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/machinery/portable_atmospherics/scrubber/huge, +/turf/open/floor/plasteel, +/area/engine/secure_construction) "cJK" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"cJL" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"cJM" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/landmark/start/atmospheric_technician, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cJL" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cJM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/closed/wall/r_wall, +/area/engine/storage) "cJN" = ( -/obj/machinery/light/small, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cJO" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cJP" = ( +/obj/structure/chair/comfy/black, /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) -"cJO" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 5 - }, -/turf/open/floor/plating, -/area/engine/supermatter{ - name = "Thermo-Electric Generator" - }) -"cJP" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/light/small, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJQ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) +/obj/structure/chair/comfy/black, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) "cJR" = ( -/obj/machinery/door/airlock/engineering{ - name = "Canister Storage"; - req_one_access_txt = "10;24" +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 8 }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/heavy, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cJS" = ( /obj/effect/turf_decal/stripes/line{ - dir = 1 + dir = 4 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cJT" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 1 +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/sign/poster/official/wtf_is_co2{ + pixel_x = 32 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cJU" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) "cJV" = ( /obj/structure/plasticflaps, /obj/machinery/door/poddoor{ @@ -68325,50 +67222,6 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "cJW" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"cJX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"cJY" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) -"cJZ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"cKa" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -68380,10 +67233,28 @@ }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"cKb" = ( +/area/engine/storage) +"cJX" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + areastring = "/area/engine/storage"; + dir = 4; + name = "Canister Storage APC"; + pixel_x = 24 + }, +/turf/open/floor/plasteel, +/area/engine/storage) +"cJY" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/engine/storage) +"cJZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -68392,27 +67263,24 @@ }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) -"cKc" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Canister Storage"; - req_access_txt = "10" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/area/engine/storage) +"cKa" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/engine/storage{ - name = "Canister Storage" - }) +/area/engine/storage) +"cKb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/visible{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/engine/storage) +"cKc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/securearea, +/turf/open/floor/plating, +/area/engine/storage) "cKd" = ( /obj/machinery/conveyor{ dir = 8; @@ -68546,57 +67414,46 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) "cKr" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cKs" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cKt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cKu" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cKv" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cKs" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) +/area/science/misc_lab) +"cKt" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cKu" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab) +"cKv" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Canister Storage"; + req_access_txt = "10" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/engine/storage) "cKw" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 4 @@ -69268,6 +68125,12 @@ }, /turf/open/floor/engine/vacuum, /area/engine/atmos) +"cLZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/sign/warning/securearea, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/engine/storage) "cMa" = ( /obj/machinery/light/small{ dir = 1; @@ -70864,26 +69727,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/space/basic, /area/space/nearstation) -"cPG" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/turretid{ - control_area = "/area/science/server"; - icon_state = "control_stun"; - name = "Computer Core turret control"; - pixel_x = -3; - pixel_y = -23; - req_access_txt = "65" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/server{ - name = "Computer Core" - }) "cPH" = ( /obj/machinery/conveyor_switch{ id = "EngiCargoConveyer" @@ -71738,31 +70581,6 @@ }, /turf/open/floor/plasteel, /area/medical/medbay/central) -"cRc" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/door/airlock/research{ - name = "Aft Observatory"; - req_access_txt = "47" - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) -"cRd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/machinery/door/airlock/research{ - name = "Aft Observatory"; - req_access_txt = "47" - }, -/turf/open/floor/plasteel/dark, -/area/science/misc_lab{ - name = "Research Observatory" - }) "cRe" = ( /obj/machinery/computer/upload/ai{ dir = 8 @@ -71863,32 +70681,6 @@ }, /turf/open/floor/plasteel/dark, /area/science/robotics/lab) -"cRm" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/light, -/obj/effect/turf_decal/stripes/red/full, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/sign/poster/official/cleanliness{ - pixel_y = -32 - }, -/obj/machinery/disposal/bin{ - name = "Corpse Disposal Unit" - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) "cRn" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable{ @@ -71973,23 +70765,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) -"cRw" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/item/paper/guides/cogstation/letter_med{ - pixel_y = 4 - }, -/obj/item/storage/backpack/duffelbag/med/surgery, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2{ - name = "Medbay Treatment Center" - }) "cVq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -72213,12 +70988,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"hXk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/engine/engineering{ - name = "Engine Room" - }) "ifC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/manifold/orange/visible, @@ -72249,14 +71018,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"jMO" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) "kzb" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 @@ -72286,15 +71047,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"mkx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) "mqB" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -72410,17 +71162,6 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) -"qGi" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) "qHL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/brown/visible{ @@ -72445,22 +71186,6 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/floor/plasteel, /area/engine/atmos) -"rke" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) -"rqk" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/closed/wall/r_wall, -/area/engine/engine_smes{ - name = "Power Monitoring" - }) "rOE" = ( /obj/structure/plasticflaps, /obj/structure/fans/tiny, @@ -72524,16 +71249,6 @@ }, /turf/open/floor/plating, /area/router) -"tjb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, -/obj/machinery/meter, -/turf/open/floor/plating, -/area/engine/engineering{ - name = "Engine Room" - }) "tpQ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/violet/visible, @@ -72580,17 +71295,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel/dark, /area/bridge) -"uwK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) "uAY" = ( /obj/structure/table, /obj/item/storage/belt/utility, @@ -92912,10 +91616,10 @@ aaa aaa aaa aaU -cbB -ctY -cvA -cbB +cwV +cGp +cJw +cwV aaU aaU aaU @@ -93169,10 +91873,10 @@ aaa aaa aaa aaU -cbB -cKr -cub -cbB +cwV +cGu +cJA +cwV aaU aaa aaU @@ -93426,10 +92130,10 @@ aaa aaa aaa aaU -cbB -cKr -cuf -cbB +cwV +cGu +cJB +cwV aaU aaa aaU @@ -93683,10 +92387,10 @@ aaa aaa aaa aaU -cbB -cKr -cub -cbB +cwV +cGu +cJA +cwV aaU aaa aaU @@ -93940,10 +92644,10 @@ aaa aaa aaa aaU -cbB -cKr -cub -cbB +cwV +cGu +cJA +cwV aaU aaa aaU @@ -94197,10 +92901,10 @@ aaa aaa aaa aaU -cbB -cKs -cug -cbB +cwV +cHK +cJK +cwV aaU aaa aaU @@ -94453,12 +93157,12 @@ cav aaa aaa aaU -cbB -cbE -cKt -cuh -cbE -cbB +cwV +cEj +cHL +cJL +cEj +cwV aaU aaU aaa @@ -94709,14 +93413,14 @@ cav aaU aaU aaU -cbB -cbB -cnj -cKu -cui -clh -cbB -cbB +cwV +cwV +cGj +cHM +cJN +cJv +cwV +cwV aaU aaa aaa @@ -94961,19 +93665,19 @@ cHA cHG cav cav -cbE -cbE -cbE -cbE -cbE -cbE -cle -csW -cKv -cuj -cuq -cus -cbE +cEj +cEj +cEj +cEj +cEj +cEj +cFx +cGk +cHN +cJO +cKr +cKu +cEj aaU aaa aaa @@ -95193,20 +93897,20 @@ cDU cDW cDY bgW -bOx +bYr bcy bcw bYs bcw bcy -bYr -cgV -cGi -cGl -cGo -cGp -cGu -cGp +cgK +chm +cks +cld +cmZ +cnM +coY +cnM cGx cGz cHp @@ -95216,21 +93920,21 @@ cHu cHw cHB cHH -cHK -cHM -ckP -ckT -ckT -ckT -ckV -cRc -clg -ctc -cua -cvW -cur -clh -cbB +cwd +cBl +cEk +cEN +cEN +cEN +cFm +cFq +cFy +cGl +cJl +cJP +cKs +cJv +cwV aaU aaa aaa @@ -95450,16 +94154,16 @@ biA csL cDj cDy -bPl -bXx -bXT bYu -bYA -bYA -bZG -cmV -cGj -cGm +bYY +bZE +cbV +cey +cey +cgL +ciG +ckx +cle bYv bYv cio @@ -95473,21 +94177,21 @@ cHv caG cHC cHI -cHL -cHN -ckQ -ckQ -ckU -ckQ -ckW -cRd -csX -ctP -cuk -cul -cur -clh -cbB +cwq +cBr +cEl +cEl +cFl +cEl +cFp +cFw +cFz +cGm +cJo +cJQ +cKs +cJv +cwV aaU aaa aaa @@ -95707,16 +94411,16 @@ biA biA cDj cDy -bWT -bXh -bYa bYw -bYL -bZE -bZE -csP -cGk -cGn +bYZ +bZG +cbY +cez +cfZ +cfZ +cjr +ckP +clg cct bYo ckk @@ -95730,21 +94434,21 @@ bsM cuY bIk bIk -cbB -cbB -cbB -cbB -cbB -cbB -cbB -cbE -ctW -cbD -ctZ -ctZ -cld -cus -cbE +cwV +cwV +cwV +cwV +cwV +cwV +cwV +cEj +cGi +cGn +cJp +cJp +cKt +cKu +cEj aaU aaa aaa @@ -95964,16 +94668,16 @@ cBt csx cDv bgW -bWU -bXl -bXy +bYA +bZa +cbf bWa -bYc -bXU -bXU +ceA +ccJ +ccJ bWa -bJF -bKv +ckQ +clh bYv bYp bYx @@ -95994,14 +94698,14 @@ aaU aaU aaU aaU -cbB -cbB -ctN -clh -clh -ctN -cbB -cbB +cwV +cwV +cGo +cJv +cJv +cGo +cwV +cwV aaU aaa aaa @@ -96221,16 +94925,16 @@ bgW bgW cEb bgW -bWV -bXh -bXA -bXU +bYG +bYZ +cbj +ccJ bpz aaa aaU -bXU -bKs -bKv +ccJ +ckT +clh bYv bYq cPv @@ -96252,12 +94956,12 @@ aaa aaa aaa aaU -cbB -cbE -cbB -cbB -cbE -cbB +cwV +cEj +cwV +cwV +cEj +cwV aaU aaU aaa @@ -96475,19 +95179,19 @@ aVW cDH bbS aUk -bVL -cEc -bXr -bWW -bXh -bXB -bXU +bSv +bWA +bXy +bYL +bYZ +cbB +ccJ bpz aaa aaU -bXU -aJV -brz +ccJ +ckU +clz bYv bTg bYy @@ -96732,19 +95436,19 @@ aWm cDH bcB aTV -bVM -cEd -bWs -bWs -bXh -bXJ -bXU +bSw +bWB +bXA +bXA +bYZ +cbD +ccJ bpz aaa aaU -bXU -bKs -bLG +ccJ +ckT +clA bYv bYv cwb @@ -96989,23 +95693,23 @@ cnu cDI cDT aTV -bQZ -cEd -csO -cEu -bXh -bXK +bUB +bWB +bXB +bYS +bYZ +cbE bWa -bYc -bXU -bXU +ceA +ccJ +ccJ bWa -bKt -bLU -bRM -bRO -bRR -cyt +ckV +clB +cna +cos +cpf +cpi bDT bKd bTi @@ -97246,23 +95950,23 @@ aWm cDH bOt aTV -bIg -cEe -cEs -cEv -cEx -cEA -cEJ -cEM -cEJ -cEJ -cEJ -bKu -bQv -bRN -cEs -bRS -cEN +bVf +bWC +bXD +bYT +bZb +cbJ +ccX +ceB +ccX +ccX +ccX +ckW +clC +cnj +bXD +cph +cpj cEO bIc bRX @@ -97503,23 +96207,23 @@ biP cDH bcC aTV -bIn -bIN -bIO -bIQ -bIR -bIQ -bIQ -bIR -bIQ -bIS -bIQ -bIQ -bQP -cfZ -bWX -bWX -ckf +bVL +bWL +bXJ +bYU +bZc +bYU +bYU +bZc +bYU +cgM +bYU +bYU +cmI +cny +coX +coX +cpq btn bIh bRY @@ -97760,22 +96464,22 @@ aTV bAc brw aTV -bVM -cEf -bWx -aab -bXo -bXQ -bXZ -bYi -bYk +bSw +bWN +bXK +bYX +bZe +cbS +cdf +cfh +cgF bWa bWa -bXU -bXU -bXU -bXU -bXU +ccJ +ccJ +ccJ +ccJ +ccJ bWa bIk bId @@ -98017,9 +96721,9 @@ bfu csu cAS cDV -cDX -cEg -bWx +bVM +bWP +bXK bSE ckR bSE @@ -98275,8 +96979,8 @@ cuQ cpP aTV bVR -cEh -bWy +bWR +bXQ buf bJu bSQ @@ -98531,9 +97235,9 @@ bzz cvM cts aTV -bVM -cEf -bWz +bSw +bWN +bXT bSE bSK bSR @@ -98789,8 +97493,8 @@ cuQ cwe aTV bVS -cEi -cEt +bWT +bXU cEw cEy cEB @@ -99046,8 +97750,8 @@ czf coI aTV bVT -cEj -bWA +bWU +bXZ bSG bSL bSS @@ -99303,7 +98007,7 @@ czz aUk aUk bWa -cEk +bWV bWa bSE bSM @@ -99559,9 +98263,9 @@ bmG cDN bmG aUk -bWr -cEl -bWB +bWb +bWW +bYa bSE bSN bSU @@ -99817,8 +98521,8 @@ cDN bmG aUk bWc -bWo -bWC +bWX +bYc bSE bYV cEC @@ -100073,9 +98777,9 @@ bmG cDN bmG aUk -bWb -cEm -bWL +bWo +bWY +bYi bSE bSP cED @@ -100331,8 +99035,8 @@ cDK aXt bwm bWa -cEn -bWR +bXa +bYk bSH bSG cij @@ -101379,14 +100083,14 @@ bPP bQa cEY cqW -bJg -bQl -bYG -cFw -bpa -bQn -bQC -cmZ +cqf +csO +ctY +cuj +cvA +cxd +cBs +cEm cpz cvs cwg @@ -101636,14 +100340,14 @@ buS bFX cEZ bAs -ayY -baT -baT -cFx -bpb -bqO -bru -coY +cqh +csP +csP +cuk +cvB +cxs +cBC +cEn cpz bMr cwh @@ -101893,14 +100597,14 @@ cPR bFJ cFa cFk -cFl -cFp -cFp -cFy -bbt -bqP -brO -bQB +cqm +csQ +csQ +cul +cvC +cyt +cDX +cEs ctD bMs bMA @@ -102150,14 +100854,14 @@ cPS czD cFb bEl -bJn -bQm -cbf -bop -bpe -bQz -bXD -cna +cqP +csS +ctZ +cuq +cvD +czK +cEc +cEt cvo cvO cwi @@ -102407,14 +101111,14 @@ cPT czE cFc bEl -aJD -bbx -bbZ -boq -bpg -bpg -bAy -bQJ +crl +csW +cua +cur +cvE +cvE +cEd +cEu cpz bMu bMC @@ -102664,14 +101368,14 @@ buS cFs cEX bIU -aJE -bbz -bjx -bot -bot -bjx -bAH -cRm +crs +csX +cub +cus +cus +cub +cEe +cEv cpz cvs cwj @@ -102921,14 +101625,14 @@ buS cnz cEZ bJa -aKZ -bbB -blv -czK -bph -bqR -bAM -cvx +crv +ctc +cuf +cux +cvF +cAU +cEf +cEx bMk bMw bMD @@ -103178,14 +101882,14 @@ crg cvR cFd bEl -aMm -bbC -blw -blw -blw -blw -bAT -cez +crw +ctN +cug +cug +cug +cug +cEg +cEA bMl bMv bMv @@ -103435,14 +102139,14 @@ bqz cKH cFe cFk -cFm -cFq -cRw -cFz -bqt -blx -bBn -ceA +crx +ctP +cuh +cvx +cvW +cBd +cEh +cEJ bMl bMw bMv @@ -103615,15 +102319,15 @@ aGe aDM aUK aGe -alZ -alZ -alZ -alZ -aHU -aHU -alZ -alZ -alZ +axQ +axQ +axQ +axQ +aMm +aMm +axQ +axQ +axQ aSt aSt aSt @@ -103657,14 +102361,14 @@ bqX bSt bqX aaU -cgI -cgN -cgN -cgN -cgN +bhl +biH +biH +biH +biH aPg aPg -cgP +bJn aaU aaU aaU @@ -103692,14 +102396,14 @@ crn cxf cFf bEl -aOF -bbE -coX -bbE -bbE -bqS -bQy -ceB +csC +ctW +cui +ctW +ctW +cBk +cEi +cEM bMn bMv bMv @@ -103872,16 +102576,16 @@ aWt aWz aWW aIc -alZ -alZ -aog -aog -axV -axV -aog -aog -alZ -bvv +axQ +axQ +ayK +ayK +aFU +aFU +ayK +ayK +axQ +aPe aUh cjM aVv @@ -103913,15 +102617,15 @@ ajO aRy bSO aRy -bfh -cgJ -bye -cmI -bXa -bfh -bfh -bfh -cgJ +bey +bhZ +bkt +bnS +bph +bey +bey +bey +bhZ aaU aaa aaa @@ -104129,16 +102833,16 @@ aDM aDM aXa bdb -alZ -aog -apB -aFc -bfj -axV -axV -apB -aog -alZ +axQ +ayK +ayY +aHV +aJV +aFU +aFU +ayY +ayK +axQ aUh aUP bCC @@ -104170,15 +102874,15 @@ beu beK bTX bWI -bWN -cbj -cdf -cny -bXk -cgL -cvD -cvF -cgJ +beH +bij +bkz +bnT +bpK +bye +bBS +bGv +bhZ aaU aaa aaa @@ -104386,16 +103090,16 @@ cCf aHG aXb aVC -alZ -aog -apG +axQ +ayK aFN -axV -aLO -axV -aRL -aog -alZ +aJD +aFU +aOF +aFU +aPc +ayK +axQ aUh aUQ aVM @@ -104427,16 +103131,16 @@ ajO aRy bUi aRy -bfh -bfh -cdh +bey +bey +bkJ +bkW +bpL bzN -bYT -bYS -cvE -bYS -cgJ -bfh +bCa +bzN +bhZ +bey aaU aaU aaU @@ -104643,16 +103347,16 @@ bbQ aWA aXd bre -alZ -apB -axV -aGp -axV -csC -axV -axV -apB -alZ +axQ +ayY +aFU +aJE +aFU +aOJ +aFU +aFU +ayY +axQ aSt aSt cho @@ -104684,20 +103388,20 @@ ajO bQb cnR cJt -bfh -brb -bzN -bzN -bYU -cgM -bYY -bZb -cgJ -bfh -bfh -bfh -bfh -bfh +bey +bil +bkW +bkW +bpN +bzR +bCb +bGK +bhZ +bey +bey +bey +bey +bey brs brs bcT @@ -104879,37 +103583,37 @@ auZ aBL bnH axh -anq -anq -anq -anq -anq -anq -anq -anq +aab +aab +aab +aab +aab +aab +aab +aab bID aHu aGr -aOJ -aOT -aOT -aOT -aOU -aOU -aOT -aXP -aOT -aOT -aOJ -aog -axV -bfj -axV -axV -axV -axV -aog -aSG +apm +apy +apy +apy +apz +apz +apy +auN +apy +apy +apm +ayK +aFU +aJV +aFU +aFU +aFU +aFU +ayK +aPh aRh aRq aRq @@ -104941,20 +103645,20 @@ bPU bQi bUU cNC -bWP -cbV -bzR -cvB +beI +biw +blv +bof +bpV +bAy +bCW +bGP +bJF bOz -cwd -bYZ -bZc -cgQ -bZe -bZe -bZe -bZe -cjr +bOz +bOz +bOz +bSo brL brL bVW @@ -105136,37 +103840,37 @@ axx ayN aAA aBM -aCq -aDx -apy -arV -apy -axg -ceu -anq +abF +acz +agc +alZ +agc +anI +anT +aab bID aHu aGr -aOT -aPS -aSb -aTi -aUd -aTi -aWs -aYb -ban -bdd -aOJ -aog +apy +aqO +arY +asw +asN +asw +auD +auY +avI +awa +apm ayK -bfk -axV -axV -bfj -axV -apB -aSH +aGp +aKZ +aFU +aFU +aJV +aFU +ayY +aPm aSt aSt aTs @@ -105197,21 +103901,21 @@ cRf bPV bQT bVq -cPG -bfh -cbY -cdn -cpf -bYU -cgM -bYY -bRx -cgJ -bfh -bfh -bfh -bfh -bfh +bdL +bey +biE +blw +boi +bpN +bzR +bCb +bIg +bhZ +bey +bey +bey +bey +bey brs brs bcT @@ -105393,37 +104097,37 @@ aeY aBN awN awN -anq -anT -anT -anT -anT -anT -anT -cex +aab +acA +acA +acA +acA +acA +acA +aog bNp aFC aFF -aOU -aQt -aSf -aTj -aTv -aTv -aTv -aYi -baU -bdh -aOJ -bdE -aog -axV -aHV -aRr -axV -aog -aog -aSH +apz +aqP +asa +asx +asB +asB +asB +avc +avK +awe +apm +azh +ayK +aFU +aNH +aOM +aFU +ayK +ayK +aPm aZz aaU aaU @@ -105455,16 +104159,16 @@ ajO aRy bVC cRh -bfh -bfh -bBR -cqf -bYX -bYS -cvE -bYS -cgJ -bfh +bey +bey +blx +bop +bqt +bzN +bCa +bzN +bhZ +bey aaU aaU aaU @@ -105650,37 +104354,37 @@ aeY aCk aeY aeY -anq -aof -cpq -asa +aab +adc +agC +acf +adL +acA +acA aoL -anT -anT -cey bRF aFC aFF -aOU -aQu -aSf -aTv -aTv -aTv -aTv -aYj -ban -bdl -aOJ -alZ -apB -aog -aog -aog -aog -apB -alZ -aSH +apz +aqS +asa +asB +asB +asB +asB +avl +avI +awW +apm +axQ +ayY +ayK +ayK +ayK +ayK +ayY +axQ +aPm aaa aaa aaa @@ -105712,15 +104416,15 @@ bht bcY cyd cRs -cgF bfh +bey +blD +boq +bpK +bAH bBS -cqh -bXk -cvC -cvD -cvF -cgJ +bGv +bhZ aaU aaa aaa @@ -105907,37 +104611,37 @@ akS aCo aor aeY -anI -aoL -anT -asa -bEz -bES -bES -bGv +abJ +adL +acA +acf +anE +anL +anL +aoU ccg aFC ago -aOT -aQz -aSf -aTw -aTv -aTv -aTv -aYM -bbi -aOT -aOT -aOJ -aOJ -aOJ -bmF -bnT -bnT -aRJ -aRJ -chm +apy +aqT +asa +asC +asB +asB +asB +avA +avQ +apy +apy +apm +apm +apm +aOd +aOQ +aOQ +aPd +aPd +aPN aaU aaU aaU @@ -105969,15 +104673,15 @@ bmM bcZ bVF bTS -cgG -bfh -bEo -cqm -bZa -bfh -bfh -bfh -cgJ +bfj +bey +blZ +bot +bqO +bey +bey +bey +bhZ aaU aaa aaa @@ -106164,34 +104868,34 @@ akU aCp aor aeY -anL -aoU -anT -anT -anT -anT -anT -cex +abZ +aej +acA +acA +acA +acA +acA +aog bRF aFC aFF -aOU -aQB -aSf -aTv -aTv -aUU -aTv -aYj -ban -bdO -bfv -bfv -bfv -bkW -bmJ -bnS -bof +apz +arB +asa +asB +asB +asS +asB +avl +avI +awX +axR +axR +axR +aLF +aOk +aOR +aOY aQJ aQJ aQJ @@ -106226,15 +104930,15 @@ ajO bdi bWm cjI -cgH -cgN -cgO -cgN -cgN -cgN +bfk +biH +bmF +biH +biH +biH aPg aPg -cgK +bKs aaU aTx ctG @@ -106421,34 +105125,34 @@ akV aqv aor aeY -anP -aqP -apz -asK -apz -btk -cev +acf +aeI +agT anq +agT +anP +aof +aab ccq aFC aFF -aOU -aQI -aSf -aTv -aTv -aTv -aTv -aZa -bbi +apz +arF +asa +asB +asB +asB +asB +avC +avQ +apy +axV +azE +aHU +aLO +aOl aOT -bfy -bgJ -bjL -blD -bmK -boi -bsx +aPa aaU aaU aaU @@ -106678,33 +105382,33 @@ aeY aeY aeY aeY -anq -anq -anq -anq -anq -anq -anq -anq +aab +aab +aab +aab +aab +aab +aab +aab ccz aHv aFF -aOT -aQP -aSf -aTv -aTv -aTv -aTv -aZc -bbH -bdP -bdP -bgR -bdP -aOJ -aPN -bes +apy +arN +asa +asB +asB +asB +asB +avE +avU +axg +axg +aAy +axg +apm +aOq +aOU aaU bQe aye @@ -106946,22 +105650,22 @@ aff cfe aIk aIU -aOX -aQQ -aSf -aTv -aTv -aUW -aTv -aZc -aVf -bdP -bfF -bha -bdP -aOJ -aPN -bes +apB +arO +asa +asB +asB +asU +asB +avE +auC +axg +ayb +aCq +axg +apm +aOq +aOU aaU aye aaU @@ -107003,11 +105707,11 @@ cdo aPg aPg cet -bpL -bpL -rqk -bBO -bBO +bEo +bEo +bKt +bPl +bPl ctG ctG cvr @@ -107203,22 +105907,22 @@ ahz bRF aEu aJc -aPa -aQR -aSz -aTz -aTz -aVb -aTz -aZg -aVf -bdW -bfJ -bhc -bdP -aOJ -aPN -bes +apG +arP +asi +asD +asD +atb +asD +avH +auC +axt +ayn +aCZ +axg +apm +aOq +aOU aaU aye aaU @@ -107260,11 +105964,11 @@ ckJ cdV cdV cdV -bpN -bCa -bSp -bSv -cfl +bEr +bIn +bKu +bPv +bQB ctX cuU cwr @@ -107460,22 +106164,22 @@ bGw chQ cAV aJc -aOT -aQX -aSE -aTC -aUe -aVf -aVf -aSE -bcd -bdY -bfM -bhg -bdP -aOJ -aPN -bey +apy +arQ +asv +asK +asR +auC +auC +asv +avV +axM +ayo +aDx +axg +apm +aOq +aOV aaU aye aaU @@ -107517,11 +106221,11 @@ clY cnx cpK cdV -bBE -bCa -bSp -bSw -cfl +bEz +bIn +bKu +bQl +bQB cuu cuV cwE @@ -107717,22 +106421,22 @@ ahz aAj cAW aJC -aOT -aRc -aOT -aOT -aOT +apy +arV +apy +apy +apy +apz +apz +apy +apy +axg +axg +aFc +axg +apm +aOq aOU -aOU -aOT -aOT -bdP -bdP -bhl -bdP -aOJ -aPN -bes aaU bQe aye @@ -107774,11 +106478,11 @@ cmf cnK cnK cdV -rke -bUB -bSq -bVf -cfm +bEK +bIN +bKv +bQm +bQC cuw cuV cuV @@ -107789,10 +106493,10 @@ bdH cIM coi bZh +cdh bZh -bZh -bZh -bZh +cdh +cdh bsZ bsZ bsZ @@ -107987,9 +106691,9 @@ aaU aaU cuA cuy -blD -bcO -bes +aLO +aOx +aOU aaU aaa aaa @@ -108031,11 +106735,11 @@ cmg cof cof cpY -cwq -cwV -cAU -cfh -cos +bES +bIO +bLG +bQn +bQJ cuF cva cyp @@ -108244,9 +106948,9 @@ aaa aaa aaa aaU -aQq -aPR -cux +aMa +aOC +aOX aaU aaa aaa @@ -108288,11 +106992,11 @@ cmE cok cok cdV -rke -bPv -cBd -cfi -cfm +bEK +bIQ +bLU +bQv +bQC cuH cvb cvd @@ -108501,9 +107205,9 @@ aaa aaa aaa aaU -aQq -aQp -cux +aMa +aOE +aOX aaU aaa aaa @@ -108545,11 +107249,11 @@ cmG coT cpL cpZ -qGi -cxd -cBd -cfj -cfl +bFg +bIR +bLU +bQy +bQB cuI cuV cyv @@ -108802,11 +107506,11 @@ cmY cdV cdV cdV -qGi -bSm -cBk -cfk -cfl +bFg +bIS +bNo +bQz +bQB cuJ cvc cyz @@ -109043,27 +107747,27 @@ cer cew ceM ceV -asU -arB -asw -atb -avl -aMa -crv -aOE -aQc -clz -aMa -aQd -cks -crv -crx -aeI -rke -bSn -cBl -bSn -cfl +aQz +aQR +aSb +aTi +aTW +aUW +aZa +bbC +bcF +bdO +aUW +bjq +bmJ +aZa +bqP +aQC +bEK +bJg +bOx +bJg +bQB cuK cuV cyz @@ -109300,22 +108004,22 @@ ces ces ceN ceW -cJv -mkx -cJw -cJN -asR -awe -asS -asS -asS -asS -avC -aQe -ckx -cqP -crl -csQ +aQB +aQT +aSf +aTj +aTm +aVb +aTv +aTv +aTv +aTv +bfn +bjx +bmK +bov +bqR +bAM cqs cqG crt @@ -109337,7 +108041,7 @@ aaU aaU bme bog -bpT +cmV bqM btL czm @@ -109557,22 +108261,22 @@ cdt cdt ceO ceX -aeI -aQx -asD -asR -asR -avE -avQ -avQ -avQ -avQ -bem -aQe -asR -aSK +aQC +aQX aSr -aeI +aTm +aTm +aVf +aZc +aZc +aZc +aZc +bfv +bjx +aTm +bow +bqS +aQC bxz bwP cBn @@ -109814,22 +108518,22 @@ aaU cdt ceP ceK -aeI -arN -arF -asS -auC -avH -axM -axM -axM -axM -aPh -aQk -asS -aSK -aTW +aQC +aRc +aSz +aTv +aTZ aVB +aZg +aZg +aZg +aZg +bfy +bjL +aTv +bow +brb +bAR cqu bwR cBx @@ -110067,26 +108771,26 @@ aTl qeq bPh guK -hXk -hXk -cJp -hXk -hXk -tjb -asx -asS -auD -awX -axQ -beH -axQ +aPP +aPP +aQp +aPP +aPP +aRp +aSE +aTv +aUb +aWs aZt -avI -beI -asS -aSL -aTZ -aWV +bbE +aZt +bdP +bfF +bkf +aTv +boB +bru +bAT cqv bwV cBy @@ -110304,9 +109008,9 @@ bka bnb boV bpt -aRF -cog -bnt +apd +bfI +cfy ang cuC cuD @@ -110323,27 +109027,27 @@ cuD cuG eUF bsz -aej -agc -agT -bFg -apm -aqS -arP -cph -asS -auN -avK -axR -aAy -aOk -aOR -aPm -aPm -bBo -aTm -aUb -bAR +aPO +aPR +aQd +aQq +aQu +aQI +aRr +aSG +aTv +aUd +aWV +ban +bbH +bcO +bdW +bfJ +bfJ +bmT +boD +brz +bBn bnf bwR cBx @@ -110562,9 +109266,9 @@ bnd boX bpH ang +bnt +clH coh -cfy -bvb aRu aSv aSy @@ -110581,26 +109285,26 @@ aVK cxa bPr sVC -aNH -bEr -cJA -aqO -anE -anE -anE -aQT -ayb -axt -aCZ -aRG -aOl -aOV -bSo -cmX -aRp -bkJ -aUf -ciG +aPS +aQe +aQs +aQx +aQP +aQP +aQP +aTw +aUe +aXh +baT +bbZ +bdd +bdY +bfM +bkp +bni +boE +brO +bBo bnp cmO cfU @@ -110818,9 +109522,9 @@ bka bno boZ bpJ -apd -bfI -clH +aRF +bvb +cog ang aRX aSw @@ -110837,27 +109541,27 @@ aSu aYU cxb bsz -aej -agC -bEK -cJB -apm -aqT -arQ -cpi -asS -aTQ -avU -ayn -aFU -aOq -aOY aPO -aPO -bCW -bvY -asB -bAR +aQc +aQk +aQt +aQu +aQQ +aRG +aSH +aTv +aUf +aXP +baU +bcd +bdh +bei +bgJ +bgJ +bnn +boF +bsx +bBn bnq bEW bQF @@ -111100,21 +109804,21 @@ atF cJC atF atF -arO -asC -asS -auY -azE -ayo -bCb -ayo -bei -avV -aQs -asS -bwJ -bfn -aXh +aRJ +aSK +aTv +aUr +aYb +bbi +bcu +bbi +bem +bgR +bkq +aTv +bpa +btk +bBE cqw bSx bQG @@ -111357,21 +110061,21 @@ ciT cJD cmu atF -arY -awW -asS -avc -awa -clA -aLF -axM -axM -aPP -crs -asS -cpj -aUr -bmT +aRL +aSL +aTv +aUt +aYi +bbt +bcv +aZg +aZg +bha +bkr +aTv +bpb +bvv +bBO cqx bwP bQH @@ -111576,11 +110280,11 @@ aRT cBS cBU cBY -aqn +aqU acK acK acK -aqn +aqU aaa aaa aVs @@ -111614,21 +110318,21 @@ ciU cJE cJG cJI -cJK -cJL -cJO -asR -aOQ -bev -cbJ -aOx -aPc +aRR +aST +aTz +aTm +aYj +bbx +bcD +bdl beq -aQe -asR -crw -aUt -bpK +bhc +bjx +aTm +bpe +bvY +bBR cqy bEW bQF @@ -111650,7 +110354,7 @@ cNL aaU bme bpi -bpT +cmX cza btL bPH @@ -111833,10 +110537,10 @@ aXn cBM bDY bEd -aqn -cCd -aRE -aSY +aqU +awA +aIN +aMz acK aaa aaa @@ -111871,21 +110575,21 @@ cmh cmp atF atF -asi -asi -cJP -asR -awe -clB -asS -asS -aPd -avC -aQe -aRR -cpj -aSr -aeI +aRV +aRV +aTC +aTm +aVb +bbz +aTv +aTv +bes +bfn +bjx +bny +bpb +bqS +aQC bQq cqI bQM @@ -112089,11 +110793,11 @@ aCe aYK aDr aci -aqn -aqn -aRj -aND -aVX +aqU +aqU +azg +aHL +aMK anK anK aHA @@ -112128,21 +110832,21 @@ aus aus cmw atF -asv -asN -cJQ -avA -azh -aOd -aOM -aOC -aPe -clC +aRY +aTc +aTQ +aUU +aYM +bbB +bcE +bdE +bev +bhg +bks +bnQ +bpg +bwJ aQC -aRV -cJl -cko -aeI bpv cqJ cdg @@ -112346,11 +111050,11 @@ aLU aNE aRd acK -aHL -aIN -aMK -aOc -aSA +arX +asM +azo +aKj +aNx aTo aTt aTJ @@ -112385,13 +111089,13 @@ cmi cmq aus atF -aqU -asG -cJR -aws -aqU -aqU -aMz +aYL +bkT +cfw +cJM +aYL +aYL +cKb chE cie cjK @@ -112603,11 +111307,11 @@ aMb aPl aRf adR -arX -aKj -aVy -aRx -aSF +ast +auR +aGH +aKp +aND aTr arH aVa @@ -112642,13 +111346,13 @@ cmj cmr cmx atF -cfv -asI -cJS -clx -awA -chl -aNx +bap +bdk +cfx +cJR +cJU +cJY +cKc chF cir cjL @@ -112860,11 +111564,11 @@ aMb aPx aLj anh -azo -aKp -aND -aND -aWH +asG +avw +aHL +aHL +aNQ aHx asc aWn @@ -112899,13 +111603,13 @@ cmk cms aus atF -ast -asI -cJT +bcI +bdk +cfL +cJS +cJW cJZ -cKa -cKb -cKc +cKv chG ciD cjU @@ -113116,12 +111820,12 @@ aKm aMc aPx aRg -aGH +aqc +asI +aws aIf aLs -aRA -bkT -aWJ +aOc aHz btb aWn @@ -113156,13 +111860,13 @@ aus aus aus atF -asI -asI -cJU -avw -bRd -azg -aNQ +bdk +bdk +chl +cJT +cJX +cKa +cLZ chI ciH cjX @@ -113373,12 +112077,12 @@ aKr aMf aPy aRi -aqc aqn +aqU aci aci aci -aXQ +aRj aHy bDc aWw @@ -113413,13 +112117,13 @@ atF atF atF atF -aqU -asM -cfL -aqU -aqU -aqU -aqU +aYL +bmm +clx +aYL +aYL +aYL +aYL chK chK ckm @@ -113667,13 +112371,13 @@ bRn qlJ qlJ bcG +aRx +aSA +aVX +bgw +bsX cmt -auR -aYL -cfw -bap -cJW -bcI +aRA bbF bbN bbN @@ -113700,11 +112404,11 @@ bie bZl cqQ bqD -cBr -aRY -bcE -aRY -aRY +cdn +cex +cgG +cex +cex btz cOe btB @@ -113924,13 +112628,13 @@ bsT bRo bRp anr -bcI -bgw -bgw -bgw -bdk -cJX -bcI +aRA +aSF +aSF +aSF +bRd +cwy +aRA bbJ bbF bbN @@ -113957,11 +112661,11 @@ bdH bWO cqR bqE -cBr -aST -bcF +cdn +cfi +cgH +cgN ckc -bnQ btA bMQ bta @@ -114181,13 +112885,13 @@ aaa aaa bsz cJx -cJF +aRE +aSY +aWH +bhm bRA -cJJ -bsX -cJM -cJY -bcI +cCd +aRA bbJ bbL bbN @@ -114214,11 +112918,11 @@ cvN bjm bXX bqD -cBs -aTc -bdL -biE -bpV +ceu +cfj +cgI +cgO +ckf bLZ bNt bta @@ -114438,13 +113142,13 @@ aaa aaa bsz anr -bcI -bgw +aRA +aSF +aWJ +aSF bUX -bgw -uwK -bhm -bcI +cJF +aRA bbL bbN bbN @@ -114471,11 +113175,11 @@ bdI cNx bXX bqD -cBr -bcu -csS -biH -bnQ +cdn +cfk +cgJ +cgP +ckc btB bNV bta @@ -114695,13 +113399,13 @@ aaa aaa bsz anr -bcI +aRA +aVy aXp -bVb -cfx bhs -bmm -bcI +bVb +cJJ +aRA aaU aaa aaa @@ -114728,11 +113432,11 @@ cIC bjm bXX bqD -cBC -bcv -bdL -bkf -bWY +cev +cfl +cgI +cgQ +cko btC bPm bta @@ -114952,13 +113656,13 @@ aaa aaa bsz anr -bcI -bcI -cwy -bcI -jMO -bcI -bcI +aRA +aRA +aXQ +aRA +cfv +aRA +aRA aaU aaa aaa @@ -114985,11 +113689,11 @@ bBU bnN crc buw -aRY -bcD -bcF -bkz -bnQ +cex +cfm +cgH +cgV +ckc btD bPm bxH @@ -115242,11 +113946,11 @@ bgf bez cxB bhf -aRY -aRY -aRY -aRY -aRY +cex +cex +cex +cex +cex btz bPn btE @@ -118577,7 +117281,7 @@ cgn cje blb blR -bni +bWr bcA bdM bdM @@ -118834,7 +117538,7 @@ chd cki ctt blS -bnn +bWs bcA bdM bdM @@ -119091,7 +117795,7 @@ bjo bkk ctx blV -bny +bWx bdK bma bfR @@ -119348,7 +118052,7 @@ bgT bgT ctA bgV -bgV +bWy bgT bgV boM @@ -119605,7 +118309,7 @@ cgE bkl ctB blW -cxs +bWz bos bgV boN @@ -120114,7 +118818,7 @@ bAv bPW cBz bUM -ccX +bQP chf ckO ckO @@ -120371,13 +119075,13 @@ bff bfC bff bfC -bij +bQZ bhK bkn cnw bkn bhK -bov +bXh bgV boI boW @@ -120628,13 +119332,13 @@ aaU aaa aaU bgT -bhZ +bkn bhK bkn bkn bkn bhK -bow +bXk bgT boP boY @@ -120885,13 +119589,13 @@ aaU aaU aaU bgV -bhZ +bRx bhK -bkp +bRO bhK -blZ +bSp bhK -boB +bXl bgV boI boI @@ -121142,13 +119846,13 @@ aaU aaa aaU bgT -bil -bjq -bkq +bRM +bRN +bRR bld -biw +bSq bld -boB +bXl bgV aaU boI @@ -121401,11 +120105,11 @@ aaU bgT bgT bjr -bkr +bRS ble xxP bnC -boD +bXo bgT aaa aaa @@ -121658,11 +120362,11 @@ aaU aaa aaa bgT -bks +bSm blg bgT cgm -boE +bXr bgT aaa aaa @@ -121915,11 +120619,11 @@ aaU aaa aaa bgT -bkt +bSn blh bgT blh -boF +bXx bgT aaa aaa diff --git a/_maps/map_files/CogStation/job_changes.dm b/_maps/map_files/CogStation/job_changes.dm index 8b1e3e9172..347f98a829 100644 --- a/_maps/map_files/CogStation/job_changes.dm +++ b/_maps/map_files/CogStation/job_changes.dm @@ -26,4 +26,4 @@ ..() MAP_JOB_CHECK access += ACCESS_MAINT_TUNNELS - minimal_access += ACCESS_MAINT_TUNNELS \ No newline at end of file + minimal_access += ACCESS_MAINT_TUNNELS diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 943aa85efd..0ac49d7328 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -660,6 +660,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abr" = ( @@ -1484,9 +1485,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/machinery/camera{ c_tag = "Arrivals Dock - Fore"; dir = 8; @@ -1495,6 +1493,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "acX" = ( @@ -20277,7 +20278,7 @@ /area/security/prison) "aND" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -20973,7 +20974,7 @@ /area/crew_quarters/bar/atrium) "aOJ" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -66630,6 +66631,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/library) +"chT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "chV" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -73299,7 +73307,7 @@ /area/library) "ctL" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, @@ -95302,7 +95310,7 @@ /area/medical/medbay/central) "deG" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/structure/sign/poster/official/help_others{ pixel_x = -32 }, @@ -110277,9 +110285,6 @@ /turf/open/floor/plasteel/airless/solarpanel, /area/solar/starboard/aft) "dFz" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, /obj/item/radio/intercom{ name = "Station Intercom"; pixel_x = -26; @@ -110288,12 +110293,19 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/computer/security/telescreen/toxins{ + dir = 4 + }, +/obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/science/mixing) "dFA" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/chair/office/dark{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/mixing) "dFB" = ( @@ -110311,25 +110323,28 @@ network = list("ss13","rd") }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dFC" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/science/mixing) -"dFD" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 5 }, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) +"dFD" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop Out"; + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "dFE" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -110337,9 +110352,10 @@ dir = 8; pixel_x = 24 }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dFF" = ( @@ -111237,20 +111253,16 @@ /turf/open/floor/plating, /area/science/test_area) "dGY" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/computer/security/telescreen/toxins{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 }, /turf/open/floor/plasteel, /area/science/mixing) "dGZ" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/science/mixing) "dHa" = ( @@ -111267,9 +111279,6 @@ }, /area/science/mixing) "dHb" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -111279,22 +111288,7 @@ }, /turf/open/floor/plasteel, /area/science/mixing) -"dHc" = ( -/obj/machinery/atmospherics/components/trinary/filter{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/mixing) "dHd" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 9 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -111995,16 +111989,12 @@ /turf/open/floor/plasteel, /area/science/mixing) "dIk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/science/mixing) "dIl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dIm" = ( @@ -112012,14 +112002,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dIn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dIo" = ( @@ -112030,7 +112018,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "dIp" = ( @@ -112918,6 +112905,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dJM" = ( @@ -112930,6 +112920,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dJN" = ( @@ -112938,6 +112931,9 @@ }, /obj/effect/turf_decal/bot, /obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dJO" = ( @@ -112950,6 +112946,9 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dJP" = ( @@ -116736,7 +116735,7 @@ /area/library/abandoned) "dQx" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/carpet, /area/library/abandoned) "dQy" = ( @@ -122966,7 +122965,7 @@ /area/hallway/secondary/exit/departure_lounge) "ecH" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -125274,6 +125273,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) +"esD" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "etO" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -125419,6 +125424,12 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"fer" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "fhE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -125531,6 +125542,12 @@ }, /turf/open/floor/engine, /area/science/mixing) +"gfJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gmj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -125692,6 +125709,14 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"hzR" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "hAf" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -125737,6 +125762,13 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"hLf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, +/turf/open/floor/plating, +/area/science/mixing) "hNZ" = ( /obj/structure/chair/office/light{ dir = 8 @@ -125843,6 +125875,21 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"iCO" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock - Public Mining"; + dir = 8; + name = "arrivals camera" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "iIl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -125939,6 +125986,13 @@ }, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) +"iUI" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "jdx" = ( /obj/structure/lattice, /obj/structure/grille, @@ -125956,6 +126010,12 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"jdR" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "jeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -126183,6 +126243,10 @@ }, /turf/open/space, /area/engine/atmos) +"kmz" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kqo" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -126547,6 +126611,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"mtj" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 + }, +/turf/open/floor/plating, +/area/science/mixing) "mvm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -126607,6 +126678,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"mVW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mWZ" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -126618,6 +126701,17 @@ }, /turf/open/floor/engine, /area/science/mixing) +"naC" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "nbi" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, @@ -126642,6 +126736,17 @@ /obj/machinery/vending/kink, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"nMo" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) +"nNN" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space, +/area/space/nearstation) "nOz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -126911,6 +127016,13 @@ }, /turf/open/floor/plating, /area/science/research/abandoned) +"pwx" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space, +/area/space/nearstation) "pxR" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -126927,6 +127039,14 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) +"pIl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pQm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -127026,6 +127146,13 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"qEF" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "qUn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -127233,6 +127360,13 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"tzM" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/space, +/area/space/nearstation) "tCh" = ( /turf/closed/wall, /area/science/misc_lab) @@ -127591,6 +127725,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/circuit) +"wlT" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wmL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -127612,6 +127755,15 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"wpx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wum" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -127696,6 +127848,15 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"xaL" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "xcU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -127712,6 +127873,13 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"xmL" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space, +/area/space/nearstation) "xok" = ( /obj/machinery/light{ dir = 1 @@ -155077,8 +155245,8 @@ dmy dAt djs dhQ -aad -aaa +atI +jdR aaa aaa aad @@ -155334,8 +155502,8 @@ dAt dBX dDl dhQ -aad -aad +pwx +pwx aad aad abj @@ -155591,8 +155759,8 @@ dhQ dhQ dhQ dhQ -aad -aaa +pwx +esD aaa aaa aad @@ -155846,10 +156014,10 @@ djw fRT dAu caE -aaa -aad -aad -aad +nMo +nNN +xmL +pwx aad aad abj @@ -156103,10 +156271,10 @@ drH dzn cLt caE -aad +pwx drP dEn -dEn +hLf drP dEn drP @@ -156360,7 +156528,7 @@ djA cJT cLx cOj -aaa +esD dEn dFz dGY @@ -156617,7 +156785,7 @@ djA cJS cLu cOj -aad +pwx dEn dFA dGZ @@ -156874,7 +157042,7 @@ djA dzo cLt caE -aaa +esD drP dFB dHa @@ -157131,8 +157299,8 @@ djA dzp cLy cOj -aad -dEn +tzM +mtj dFC dHb dIm @@ -157391,7 +157559,7 @@ cOj aaa dEn dFD -dHc +dHd dIn dJN dEn @@ -159553,13 +159721,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aaO +aaO +abf +aaO +aaO aad aad aad @@ -159810,13 +159978,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad +aaa +aaO +qEF +xaL +hzR +aaO aad aaa aaa @@ -160067,13 +160235,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa aaO aaO +aaO +abe +abC +gfJ +aaO abf aaO aaO @@ -160323,18 +160491,18 @@ hZh hZh hZh hZh -aaa -aaa -aaa -aaa -aaa -aaa -aaO -abe +naC +mVW +kmz +mVW +acb +fer +aiT +abZ abp abC abC -abZ +abC abC abC acV @@ -160581,19 +160749,19 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa +aaO +aaO aaO vcs +wpx +pIl +wlT abq -abD -abD -abZ -abD -abD +chT +chT +chT +chT +chT acW adr adr @@ -160838,12 +161006,12 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa +aad aaa aaO +agk +iCO +iUI aaO abf aaO @@ -161095,14 +161263,14 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad aad +aaO +aaO +abf +aaO +aaO +aad aaa aaa aad @@ -161353,12 +161521,12 @@ hZh hZh aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aad +aad +aad +aad aad aad aad diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 51bfe5038e..245f67833e 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -19127,7 +19127,7 @@ /area/maintenance/disposal/incinerator) "aFL" = ( /obj/machinery/atmospherics/pipe/layer_manifold, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "aFM" = ( /obj/structure/grille, @@ -19140,7 +19140,7 @@ /area/maintenance/disposal/incinerator) "aFO" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "aFP" = ( /obj/machinery/door/firedoor, @@ -19196,7 +19196,7 @@ "aFU" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/meter, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "aFV" = ( /obj/structure/cable{ @@ -20074,6 +20074,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/engine/atmos) "aHy" = ( @@ -20930,7 +20931,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "aIM" = ( /obj/effect/turf_decal/bot, @@ -20949,13 +20950,14 @@ /turf/closed/wall, /area/maintenance/central) "aIO" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall, /area/engine/atmos) "aIP" = ( @@ -21204,7 +21206,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "aJm" = ( /obj/effect/decal/cleanable/dirt, @@ -21443,6 +21445,7 @@ /area/engine/atmos) "aJI" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/engine/atmos) "aJJ" = ( @@ -21839,13 +21842,6 @@ dir = 1 }, /area/hallway/primary/fore) -"aKm" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/closed/wall, -/area/engine/atmos) "aKn" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -27414,10 +27410,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -27448,11 +27442,10 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/medbay/central) "aSZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -52343,6 +52336,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/engine/atmos) "bGp" = ( @@ -53445,6 +53439,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/engine/atmos) "bIc" = ( @@ -53458,10 +53453,11 @@ }, /area/engine/atmos) "bIe" = ( -/obj/machinery/atmospherics/pipe/simple/purple/visible, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/closed/wall, /area/engine/atmos) "bIf" = ( @@ -61570,10 +61566,11 @@ /turf/open/space/basic, /area/space/nearstation) "bUM" = ( -/obj/machinery/atmospherics/pipe/simple/yellow/visible{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/engine/atmos) "bUN" = ( @@ -63746,9 +63743,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bYf" = ( -/turf/closed/mineral/random/labormineral, -/area/maintenance/starboard/aft) "bYg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -67202,7 +67196,6 @@ /area/maintenance/port/aft) "cdS" = ( /obj/structure/sign/warning/securearea, -/obj/item/multitool, /turf/closed/wall/r_wall, /area/security/nuke_storage) "cdT" = ( @@ -73372,6 +73365,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/blobstart, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -75352,7 +75346,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/airalarm, +/obj/machinery/airalarm{ + pixel_y = 22 + }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -78585,6 +78581,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/spawner/structure/window/reinforced, /turf/closed/wall, /area/engine/atmos) "cxU" = ( @@ -80397,7 +80394,7 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/space, -/area/engine/atmos) +/area/space/nearstation) "cCY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -84288,7 +84285,9 @@ /area/maintenance/starboard) "cOo" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "cOx" = ( @@ -84748,6 +84747,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"gwE" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "gxY" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -84854,6 +84860,13 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"iPI" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "iSg" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -84863,6 +84876,13 @@ /mob/living/simple_animal/hostile/retaliate/ghost, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) +"iXU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) "iZo" = ( /turf/closed/wall/r_wall/rust, /area/medical/virology) @@ -84930,7 +84950,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "jOz" = ( /obj/structure/sign/warning/electricshock, @@ -85117,6 +85137,10 @@ /obj/structure/sign/nanotrasen, /turf/closed/wall, /area/maintenance/port/fore) +"kWO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall, +/area/maintenance/starboard) "kXo" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, @@ -85128,6 +85152,10 @@ icon_state = "wood-broken4" }, /area/maintenance/port/fore) +"lht" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "llm" = ( /obj/structure/sign/poster/ripped, /turf/closed/wall, @@ -85154,6 +85182,14 @@ /obj/machinery/status_display/evac, /turf/closed/wall, /area/security/warden) +"lVT" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "mbs" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple, /obj/item/pickaxe, @@ -85217,6 +85253,12 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/labormineral, /area/space/nearstation) +"nHl" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/space/basic, +/area/space/nearstation) "nJw" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -85274,6 +85316,12 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/security/vacantoffice) +"oXQ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "ppP" = ( /turf/open/floor/wood{ icon_state = "wood-broken7" @@ -85309,6 +85357,13 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/prison) +"qlK" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "qvS" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=W CPH"; @@ -85375,6 +85430,13 @@ /mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/virology) +"rnD" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "ruL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -85382,6 +85444,20 @@ }, /turf/open/floor/plating, /area/security/prison) +"rvN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard) +"rwy" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "rNm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -85416,12 +85492,28 @@ /obj/structure/sign/warning, /turf/closed/wall/rust, /area/space/nearstation) +"tog" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "tCi" = ( /obj/effect/decal/cleanable/glass, /turf/open/floor/wood{ icon_state = "wood-broken3" }, /area/maintenance/port/fore) +"tJC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop Out"; + dir = 8 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/starboard) "uda" = ( /turf/closed/wall/rust, /area/security/warden) @@ -85430,6 +85522,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plating, /area/maintenance/port/fore) +"uhv" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/space/basic, +/area/space/nearstation) "ukP" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/bot/cleanbot{ @@ -85478,6 +85577,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/security/vacantoffice) +"uOT" = ( +/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "uRM" = ( /turf/open/floor/wood, /area/security/vacantoffice) @@ -85595,6 +85701,14 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark, /area/security/prison) +"ygZ" = ( +/obj/structure/lattice, +/obj/structure/grille/broken, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "ykB" = ( /obj/structure/chair/stool, /turf/open/floor/wood, @@ -112779,9 +112893,9 @@ cvg aMP aFL aIL -aFI +aEh aFW -aFI +aEh cko cko aaa @@ -113038,9 +113152,9 @@ aFO cwc aFO cwA -aFI -aFI -aFI +aEh +aEh +aEh aaa aaa aaa @@ -113552,9 +113666,9 @@ aFU cwd jHJ cwH -aFI -aFI -aFI +aEh +aEh +aEh aaa aaa aaa @@ -113807,9 +113921,9 @@ cFF cFF cFF aJl -aFI -aFI -aFI +aEh +aEh +aEh cko cko aaa @@ -114062,7 +114176,7 @@ cBz aHd aMZ aFc -cFF +aFM acm aaa aaQ @@ -114576,7 +114690,7 @@ cBB aHf bDR aFc -cFF +aFM acm aaa cow @@ -115090,7 +115204,7 @@ cBz aHg aNa aFd -cFF +aFM acm aaa cow @@ -115604,7 +115718,7 @@ cBB aHi bFG aFd -cFF +aFM acm aaa acm @@ -116118,7 +116232,7 @@ cBz aHj aNb aVG -cFF +aFM acm aaa cow @@ -116626,13 +116740,13 @@ cpK cqL cph bwy -aKm +bIe clu cBB aHl bId aFe -cFF +aFM acm aaa aaQ @@ -124321,7 +124435,7 @@ koc dbY dlg bWx -bYf +bPJ ceU cgI cDp @@ -128901,9 +129015,9 @@ ava bkd bkd bkd -avA -avA -bkd +tJC +iXU +kWO bBX bkd cwC @@ -129157,10 +129271,10 @@ avA bkd aeu aeu -aeu -acm -aaa -acm +bkd +rvN +rvN +bkd aaa bkd cwD @@ -129415,8 +129529,8 @@ bkd aeu alm acm -aaQ -aeo +iPI +ygZ aeo acm bkd @@ -129672,9 +129786,9 @@ bkd aeu aeU aaa -acm -aaa -acm +iPI +rwy +uhv aaa acm acK @@ -129928,10 +130042,10 @@ aaa bhq aeu aUz -aaa -aaQ -aaa -acm +oXQ +lVT +rnD +gwE aaa acm aaa @@ -130185,10 +130299,10 @@ aaa akA aeu aeU -aaa +qlK aeo -aaa -acm +rwy +uhv aaa acm aaa @@ -130442,10 +130556,10 @@ aaa cko aeu aeu -aeU -acm -aaa -acK +nHl +tog +lht +uOT acm acK aaa diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index a0d54edb91..a219a333f1 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -391,8 +391,12 @@ /turf/open/space, /area/solar/port/fore) "abk" = ( -/turf/closed/wall/r_wall, -/area/asteroid/nearstation) +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "abl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/machinery/door/airlock/external{ @@ -720,9 +724,6 @@ /obj/machinery/doppler_array/research/science{ dir = 1 }, -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, /obj/item/radio/intercom{ dir = 8; pixel_x = -28 @@ -742,14 +743,17 @@ /turf/open/floor/plasteel, /area/science/mixing) "acf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, /obj/machinery/button/massdriver{ id = "toxinsdriver"; pixel_x = 24; pixel_y = 24 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "acg" = ( @@ -1137,13 +1141,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "adb" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/science/mixing) "adc" = ( @@ -1153,13 +1157,9 @@ "add" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/mixing) "ade" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, /obj/machinery/light, /turf/open/floor/plasteel, /area/science/mixing) @@ -4424,7 +4424,6 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "ajC" = ( -/obj/effect/turf_decal/stripes/line, /obj/machinery/camera/autoname{ dir = 1 }, @@ -10504,6 +10503,10 @@ "atH" = ( /turf/closed/wall/r_wall, /area/science/server) +"atI" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "atJ" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -63031,6 +63034,19 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plating, /area/storage/tech) +"cYI" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 3; + height = 5; + icon_state = "pinonfar"; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "dcB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -63631,10 +63647,26 @@ }, /turf/open/space/basic, /area/solar/starboard/aft) +"egV" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "ehl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/paramedic) +"ehs" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "eia" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -63755,6 +63787,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/cargo) +"etv" = ( +/obj/machinery/door/airlock/external/glass, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "euD" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -64004,6 +64044,12 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"eLb" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "eMH" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -64435,6 +64481,9 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"fvD" = ( +/turf/open/floor/plasteel, +/area/science/mixing) "fvI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/pump{ @@ -65459,6 +65508,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"hbf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "hbS" = ( /obj/machinery/button/door{ id = "engstorage"; @@ -66197,6 +66255,13 @@ icon_state = "platingdmg2" }, /area/maintenance/aft) +"iIs" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "iJd" = ( /obj/structure/table/reinforced, /obj/machinery/light_switch{ @@ -66614,6 +66679,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) +"jwN" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "jEf" = ( /obj/effect/landmark/carpspawn, /turf/open/space/basic, @@ -67109,6 +67180,11 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/chief) +"krP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "krZ" = ( /obj/structure/cable{ icon_state = "2-8" @@ -67214,6 +67290,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) +"kFO" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "kJN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/table, @@ -68138,6 +68223,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"mkV" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "mmA" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -68148,6 +68242,20 @@ /obj/machinery/power/grounding_rod, /turf/open/floor/plating/airless, /area/engine/engineering) +"mnL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock Public Mining"; + dir = 1; + name = "arrivals camera" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mqh" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -69025,16 +69133,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) -"ohk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "ojZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -69345,6 +69443,11 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"oTI" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "oUp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, @@ -69387,6 +69490,16 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) +"oVP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "oXg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -69832,6 +69945,14 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) +"pPG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pRv" = ( /obj/machinery/air_sensor{ id_tag = "tox_sensor" @@ -70166,6 +70287,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/electrical) +"qPP" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 1 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "qSJ" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable{ @@ -70410,6 +70538,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/cargo) +"rsU" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "rtC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -71613,6 +71748,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/maintenance/aft) +"ucV" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "ufs" = ( /obj/machinery/light/small{ dir = 8 @@ -72684,6 +72825,15 @@ }, /turf/open/space, /area/space/nearstation) +"wgn" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop In" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "wgU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output, /turf/open/floor/engine/vacuum, @@ -72988,6 +73138,15 @@ "wPh" = ( /turf/closed/wall, /area/hallway/secondary/entry) +"wPU" = ( +/obj/structure/chair/office/dark{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "wQP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -73270,6 +73429,11 @@ /obj/structure/lattice, /turf/open/space, /area/space/nearstation) +"xzG" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/turf/open/floor/plating, +/area/science/mixing) "xAN" = ( /turf/closed/wall, /area/maintenance/department/electrical) @@ -99141,7 +99305,7 @@ aaA aaA aaA abY -aUL +hbf afP afB acw @@ -100418,11 +100582,11 @@ aaA aaA aaA aaA -abk -abk -abk -abk -abk +aaQ +aaQ +aaQ +aaQ +aaQ aaA aaA abY @@ -103625,10 +103789,10 @@ nNI ngo bQW nNI -aav -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -103763,8 +103927,8 @@ aAY aAY aAY aAY -aAY -aAY +aaA +aaA abJ acb acF @@ -103880,15 +104044,15 @@ gLI ifC jEO uYv -ohk +uYv +uYv +jEO +jEO +cIu +nNI +xMt +xMt nNI -aab -aav -aab -aab -aab -aab -aab aab aab aab @@ -104009,20 +104173,20 @@ aab aab aab aab -aab -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY +aaa +aaa +aaa +abk +krP +krP +krP +qPP +atI +ucV aAY abK +abK +abJ acc acG adb @@ -104137,16 +104301,16 @@ rEw iiC jMW rEw +rEw +rEw +rEw +rEw cwD -xMt -aab -aav -aab -aab -aab -aab -aab -aab +oTI +cxe +cVf +etv +cYI aab aab aab @@ -104268,19 +104432,19 @@ aab aab aab aaa -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -abK -ace +aaa +rsU +krP +krP +krP +iIs +aac +jwN +atI +xzG +kFO +mkV +eLb acH ajC abJ @@ -104394,15 +104558,15 @@ cvp iqD jto jto -cvI +jto +jto +pPG +oVP +mnL +nNI xMt -aab -aav -aab -aab -aab -aab -aab +xMt +nNI aab aab aab @@ -104525,19 +104689,19 @@ aab aab aab aaa -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY +aac +abk +krP +krP +krP +egV +aac aAY aAY abK -ace +wPU +fvD +fvD acI add adv @@ -104653,10 +104817,10 @@ xMt cWd nNI nNI -aab -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -104781,19 +104945,19 @@ aab aab aab aab -aaa -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -aAY -abK +aac +aac +rsU +krP +krP +krP +qPP +atI +atI +atI +xzG +wgn +ehs acf adH ade @@ -104911,7 +105075,7 @@ cJk nNI aab aab -aav +aab aab aab aab @@ -105048,8 +105212,8 @@ aaA aaA aaA aaA -aaA -aaA +abJ +abJ abJ abK abK diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 218044c6c2..ce62317294 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -928,7 +928,7 @@ /area/security/prison) "acb" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/security/prison) "acc" = ( @@ -15807,7 +15807,7 @@ /area/crew_quarters/dorms) "aDZ" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aEa" = ( @@ -21386,7 +21386,7 @@ /area/crew_quarters/locker) "aPI" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPJ" = ( @@ -24164,12 +24164,12 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "aVt" = ( -/obj/item/kirbyplants{ - icon_state = "plant-13" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/item/kirbyplants{ + icon_state = "plant-20" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aVu" = ( @@ -24941,10 +24941,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWV" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 +/obj/effect/turf_decal/stripes/corner{ + dir = 2 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWW" = ( @@ -42546,7 +42545,7 @@ dir = 10 }, /obj/structure/table/wood/poker, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/wood, /area/crew_quarters/bar) "bFt" = ( @@ -76185,6 +76184,14 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"cYI" = ( +/obj/machinery/camera{ + c_tag = "Research Division Circuitry Lab"; + dir = 1; + network = list("ss13","rd") + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "cYJ" = ( /obj/docking_port/stationary{ dir = 2; @@ -79847,12 +79854,12 @@ /turf/open/floor/plating, /area/chapel/main) "dka" = ( -/obj/structure/noticeboard{ - dir = 1; - pixel_y = -32 +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 }, -/turf/open/floor/plasteel/white, -/area/science/circuit) +/turf/open/space, +/area/space/nearstation) "dlI" = ( /turf/closed/wall/r_wall, /area/engine/supermatter) @@ -81295,6 +81302,14 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"etb" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "etr" = ( /obj/machinery/vr_sleeper, /turf/open/floor/plasteel, @@ -81335,6 +81350,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"faU" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "fdr" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -81515,6 +81535,11 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"idz" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "ioI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -81532,6 +81557,12 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"izh" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "izu" = ( /obj/machinery/autolathe{ name = "public autolathe" @@ -81674,6 +81705,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"jDS" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "jKK" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -81780,6 +81818,16 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) +"kHw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table, +/obj/item/gps{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kJW" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -81837,6 +81885,15 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"lcv" = ( +/obj/machinery/door/airlock/external{ + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "llb" = ( /obj/structure/table/reinforced, /obj/item/integrated_circuit_printer, @@ -81856,6 +81913,13 @@ /obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/circuit) +"lvm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lws" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -81907,6 +81971,16 @@ /obj/effect/landmark/start/roboticist, /turf/open/floor/plasteel, /area/science/robotics/lab) +"lUv" = ( +/obj/structure/noticeboard{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "lWL" = ( /obj/machinery/smartfridge/organ/preloaded, /turf/closed/wall, @@ -81960,6 +82034,12 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) +"mdt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mjJ" = ( /obj/machinery/nuclearbomb/beer{ pixel_x = 2; @@ -82010,6 +82090,13 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"mIJ" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/space, +/area/space/nearstation) "mSd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -82105,6 +82192,13 @@ }, /turf/open/floor/plasteel, /area/construction/storage/wing) +"nKU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/science/circuit) "nLT" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82316,6 +82410,21 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"pAD" = ( +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"pBY" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space, +/area/space) "pCV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82325,6 +82434,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"pDn" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "pEv" = ( /obj/machinery/airalarm{ dir = 8; @@ -82397,6 +82513,12 @@ }, /turf/open/floor/wood, /area/security/vacantoffice) +"qaK" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "qhe" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82442,6 +82564,11 @@ "qBq" = ( /turf/closed/wall/mineral/plastitanium, /area/hallway/secondary/entry) +"qEc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/plating, +/area/science/circuit) "qJZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -82459,13 +82586,12 @@ /turf/open/floor/plating, /area/crew_quarters/cryopod) "qRM" = ( -/obj/machinery/camera{ - c_tag = "Research Division Circuitry Lab"; - dir = 1; - network = list("ss13","rd") +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 }, -/turf/open/floor/plasteel/white, -/area/science/circuit) +/turf/open/space, +/area/space/nearstation) "qVR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -82514,6 +82640,16 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"rta" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "rzX" = ( /obj/structure/chair/office/light{ dir = 1; @@ -82623,6 +82759,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"sqe" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "stP" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Port to Fuel Pipe" @@ -82708,6 +82848,13 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"tfs" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "tre" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -82756,6 +82903,13 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"tID" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop Out"; + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "tUa" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -82794,6 +82948,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"ulG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "upN" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -82871,6 +83031,13 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"vda" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space, +/area/space/nearstation) "vgd" = ( /obj/item/taperecorder, /obj/item/camera, @@ -82935,6 +83102,20 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) +"vMG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/kirbyplants{ + icon_state = "plant-05" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"vYs" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space, +/area/space/nearstation) "wdu" = ( /obj/structure/grille, /obj/structure/lattice, @@ -83006,6 +83187,13 @@ /obj/effect/turf_decal/stripes/line, /turf/closed/wall, /area/science/circuit) +"wNQ" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "wOE" = ( /obj/machinery/door/airlock/external{ name = "Atmospherics External Airlock"; @@ -83135,6 +83323,13 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"xHA" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop In"; + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/science/circuit) "xIi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83161,6 +83356,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/security/vacantoffice) +"xUO" = ( +/turf/open/space, +/area/space/nearstation) "xVl" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -83186,6 +83384,13 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"yfk" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "yfW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -83209,9 +83414,12 @@ /turf/open/floor/plasteel, /area/science/circuit) "ykE" = ( -/obj/machinery/light, -/turf/open/floor/plasteel/white, -/area/science/circuit) +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/turf/open/space, +/area/space/nearstation) (1,1,1) = {" oRp @@ -91542,13 +91750,13 @@ aaf aaf aaa aaa +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf +aaa +aaa +aaa +pBY aaa aaa aaa @@ -91799,16 +92007,16 @@ aaa aaa aaa aaa -aaa -aaa -aaf -aaa -aaa -aaa aaf aaf aaf aaf +aaf +aVs +rta +aVs +aaf +aaf aaa aaa aaa @@ -92058,12 +92266,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf aaa aaf +aVs +pAD +aVs aaa aaf aaa @@ -92319,7 +92527,7 @@ aRA aRA aRA aVs -aVs +lcv aVs aVs aaf @@ -92576,10 +92784,10 @@ wOY aSH aUb aVt -aWT +mdt +vMG aVs aaf -aaf aaa aaa aaa @@ -92833,9 +93041,9 @@ abu bsk aUc aVu -aWU -aYC -aaa +bvF +lvm +aVs aaf aaa aaa @@ -93090,10 +93298,10 @@ wOY aSI aRA aVv -aWU +bvF +ulG aVs aaf -aaf aaa aaa aaa @@ -93348,8 +93556,8 @@ aRA aRA cZf aWV -aRA -aaa +kHw +aVs aaa aaa aaa @@ -120387,11 +120595,11 @@ kOt gRS oUA cxO -qRM +cxO +cYI krD aaf aaf -aaf anS anS anS @@ -120644,9 +120852,9 @@ oLW gGT wPk dGH -dka +cxO +lUv krD -aaf aaa aaf aaf @@ -120901,12 +121109,12 @@ ocT xkG uTS cxO -ykE +cxO +tfs krD aaa aaa aaa -aaa aaf aaa aaf @@ -121159,9 +121367,9 @@ llb uTS cxO cxO -krD -aaa -aaa +tID +noG +lMJ aaa aaa aaf @@ -121415,13 +121623,13 @@ lsv txj eEe cxO -cxO -krD -aaa -aaa -aaa -aaf -aaf +izh +qaK +qEc +idz +idz +vYs +mIJ aaa anT aaf @@ -121672,13 +121880,13 @@ jyv ohj nnK cxO +xHA cxO krD aaa aaa aaa -aaa -aaf +qRM aaa anT aaf @@ -121929,13 +122137,13 @@ krD noG krD noG +nKU krD krD -aaa -aaa -aaa -aaa -aaf +yfk +idz +idz +vda aaa aqB aaa @@ -122181,18 +122389,18 @@ dvY dvY dvY aaf -aaf -aaf +dka +vYs +idz +idz +idz +jDS aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf +wNQ +idz +vYs +mIJ aaf anT aaa @@ -122438,18 +122646,18 @@ crc aaf ctl aaa -aaf -aaf +qRM +xUO anT anT anT -aaf -aaf -aaf -lMJ -lMJ -aaf -aaa +ake +ake +ake +pDn +faU +vYs +jDS aaf anT aaf @@ -122695,17 +122903,17 @@ crd ack ack aaf -aaf +ykE +idz +sqe +sqe +idz +idz +idz +idz +etb aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf +ake aaf aaf anT diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 5149033cb4..af94512e0f 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1741,7 +1741,7 @@ pixel_x = 12 }, /obj/machinery/shower{ - pixel_y = 26 + pixel_y = 16 }, /turf/open/floor/plasteel/freezer, /area/security/prison) @@ -22551,7 +22551,7 @@ /area/hallway/primary/starboard) "aJa" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/machinery/firealarm{ dir = 4; pixel_x = -24 @@ -22871,7 +22871,7 @@ /obj/machinery/requests_console{ department = "Genetics"; name = "Genetics RC"; - pixel_x = 28 + pixel_x = 28 }, /turf/open/floor/plasteel/white, /area/medical/genetics) @@ -28655,7 +28655,7 @@ "aTf" = ( /obj/structure/table/wood, /obj/item/clipboard, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -39574,10 +39574,21 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit) +"boE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "bpj" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/camera{ + c_tag = "Toxins Launch Room Access"; + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "bpn" = ( @@ -39586,6 +39597,12 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"bpo" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "bpB" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 @@ -40604,10 +40621,6 @@ }, /area/engine/atmos) "bOJ" = ( -/obj/machinery/camera{ - c_tag = "Toxins Launch Room Access"; - dir = 1 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -41121,6 +41134,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) +"eXV" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "eYe" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass{ @@ -41233,6 +41252,10 @@ /obj/item/wrench, /turf/open/space, /area/space/nearstation) +"foz" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plasteel, +/area/science/mixing) "fsl" = ( /obj/docking_port/stationary{ dir = 2; @@ -41526,6 +41549,12 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos) +"gZk" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "heQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/navbeacon{ @@ -41580,6 +41609,13 @@ }, /turf/closed/wall/r_wall/rust, /area/engine/atmos) +"hyX" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "hAy" = ( /obj/machinery/power/apc{ areastring = "/area/science/mixing"; @@ -41820,6 +41856,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"iOL" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "iUq" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -42031,6 +42074,13 @@ }, /turf/closed/wall/r_wall/rust, /area/engine/atmos) +"jEK" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "jFP" = ( /turf/open/space/basic, /area/space/station_ruins) @@ -42045,6 +42095,11 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/science/mixing) +"jIu" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/dark/visible, +/turf/open/floor/plasteel, +/area/science/mixing) "jLF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -42065,8 +42120,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/portable_atmospherics/canister, /turf/open/floor/plasteel, /area/science/mixing) +"jYq" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 10 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "kaA" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -42078,6 +42141,12 @@ }, /turf/open/floor/plasteel/cafeteria, /area/engine/atmos) +"kcN" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "kit" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/machinery/light/small{ @@ -42096,6 +42165,11 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"kpi" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "kqH" = ( /obj/machinery/atmospherics/components/binary/valve{ dir = 4; @@ -42107,6 +42181,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/mixing) +"kuK" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plasteel, +/area/science/mixing) "kwF" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 @@ -42209,7 +42287,7 @@ /turf/closed/wall/r_wall/rust, /area/science/storage) "lmq" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/plating, /area/science/storage) "low" = ( @@ -42379,6 +42457,13 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"mdx" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "meo" = ( /turf/closed/wall/r_wall/rust, /area/science/mixing) @@ -42513,10 +42598,27 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"nbT" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Space Loop Out" + }, +/turf/open/floor/plasteel, +/area/science/mixing) "ndg" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"nfS" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/open/floor/plating, +/area/science/storage) +"ngY" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "nhU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -42708,6 +42810,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"oys" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/open/floor/plasteel, +/area/science/mixing) "oyD" = ( /turf/closed/wall, /area/crew_quarters/toilet/restrooms) @@ -42785,6 +42891,12 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"oXz" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "pbT" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -42976,6 +43088,12 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"pMh" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "pNE" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -44007,6 +44125,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) +"sIm" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/science/mixing) "sIu" = ( /turf/closed/wall/r_wall/rust, /area/engine/gravity_generator) @@ -46249,6 +46374,9 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "ujg" = ( @@ -46377,6 +46505,19 @@ }, /turf/open/floor/plasteel/dark, /area/engine/gravity_generator) +"uDp" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 5 + }, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) +"uEu" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "uGq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/red{ @@ -46635,6 +46776,10 @@ dir = 1 }, /area/engine/atmos) +"vKE" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/plating/asteroid/airless, +/area/asteroid/nearstation) "vMb" = ( /turf/open/floor/engine/n2o, /area/engine/atmos) @@ -46779,6 +46924,13 @@ /obj/structure/table/reinforced, /turf/open/floor/plasteel, /area/science/mixing) +"wRY" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "wUF" = ( /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; @@ -97368,7 +97520,7 @@ meo sVt sVt sVt -aad +iio aad aad aad @@ -97620,13 +97772,13 @@ meo uiT bfq bpj +oys +oys +oys +oys +fjN iio aad -aad -aad -aad -aad -aad aaa aaa aaa @@ -97877,12 +98029,12 @@ sVt kQn lFm fjN -iio -aad -aad -aad -aad -aad +hVE +hVE +hVE +hVE +pMh +kuK aac aaa aaa @@ -98134,15 +98286,15 @@ ucd vZb iiW bOJ -iio -aad -aad -aad -aad -aad -aac -aaa -aaa +foz +nbT +ngY +oXz +bpo +jIu +vKE +kpi +mdx aaa aaa aaa @@ -98386,20 +98538,20 @@ aac aad eGm lmq -lmq +nfS sVt iio upN iio iio iio -aad -aad -aad +iio +sIm +boE +iio aac -aac -aaa -aaa +sdX +jEK aaa aaa aaa @@ -98651,12 +98803,12 @@ uTF gGq iio aad -aad -aad aac -aaa -aaa -aaa +gZk +uDp +uEu +hyX +jEK jFP jFP jFP @@ -98908,12 +99060,12 @@ msG ogL iio aad -aad -aad aac -aaa -aaa -aaa +aac +eXV +wRY +wRY +jEK jFP jFP jFP @@ -99165,12 +99317,12 @@ msG diQ iio aad -aad aac aac -aaa -aaa -aaa +kcN +wRY +wRY +jEK jFP jFP jFP @@ -99424,10 +99576,10 @@ iio aac aac aac -aaa -aaa -aaa -aaa +jEK +wRY +wRY +jEK jFP jFP jFP @@ -99681,10 +99833,10 @@ sdX aac aac aac -aaa -aaa -aaa -aaa +jEK +wRY +wRY +jEK jFP jFP jFP @@ -99938,10 +100090,10 @@ sdX aaa aac aaa -aaa -aaa -aaa -aaa +jEK +wRY +wRY +jEK jFP jFP jFP @@ -100195,10 +100347,10 @@ sdX aaa aaa aaa -aaa -aaa -aaa -aaa +jYq +iOL +jYq +iOL jFP jFP jFP diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 3e79030b78..056e27b982 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -2180,7 +2180,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "afp" = ( -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/structure/table, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -10645,7 +10645,7 @@ /area/crew_quarters/dorms) "ayo" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayq" = ( @@ -32021,23 +32021,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"bwq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bwr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "bws" = ( /obj/structure/closet, /obj/item/stack/cable_coil/random, @@ -32812,9 +32795,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bxY" = ( -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bxZ" = ( @@ -33559,6 +33539,9 @@ network = list("monastery"); pixel_x = 28 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bzC" = ( @@ -34077,9 +34060,13 @@ /turf/closed/wall, /area/science/mixing) "bAG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/science/mixing) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/department/science) "bAH" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -37242,12 +37229,15 @@ req_access_txt = "8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 + dir = 4 }, /turf/open/floor/plating, /area/science/mixing) "bGB" = ( /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/department/science) "bGD" = ( @@ -37753,13 +37743,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "bHD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "bHE" = ( @@ -38317,11 +38307,12 @@ /turf/open/floor/plasteel, /area/science/mixing) "bIP" = ( -/obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, /area/maintenance/department/science) "bIQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -38331,11 +38322,9 @@ /area/maintenance/department/science) "bIR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" + dir = 10 }, +/turf/open/floor/plating, /area/maintenance/department/science) "bIT" = ( /obj/structure/window/reinforced{ @@ -39403,7 +39392,7 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -40359,11 +40348,12 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "bNq" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 +/obj/machinery/door/airlock/maintenance{ + name = "Toxins Launch Maintenance"; + req_access_txt = "8" }, -/turf/open/floor/plating/airless, -/area/science/mixing) +/turf/open/floor/plating, +/area/maintenance/department/science) "bNr" = ( /obj/structure/window/reinforced{ dir = 4 @@ -40798,11 +40788,10 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "bOu" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 }, -/turf/open/space, +/turf/open/floor/plating/airless, /area/science/mixing) "bOv" = ( /obj/structure/window/reinforced{ @@ -53103,6 +53092,16 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"deJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "dgg" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -54165,11 +54164,10 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "fwr" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, -/turf/closed/wall, -/area/science/mixing) +/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/department/science) "fwI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ @@ -54258,6 +54256,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/mixing) "fBZ" = ( @@ -54461,6 +54460,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"gjv" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Space Loop In"; + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/department/science) "gjN" = ( /obj/item/weldingtool, /obj/effect/spawner/lootdrop/maintenance, @@ -54810,10 +54816,11 @@ /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) "gMm" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + dir = 5 }, -/turf/closed/wall, +/turf/open/floor/plating, /area/science/mixing) "gMO" = ( /obj/structure/plasticflaps/opaque, @@ -55085,6 +55092,13 @@ /obj/item/clothing/glasses/regular, /turf/open/floor/plating, /area/maintenance/department/science) +"hxI" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "hyh" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -55189,6 +55203,12 @@ /obj/machinery/power/rad_collector/anchored, /turf/open/floor/engine, /area/engine/supermatter) +"hMx" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/department/science) "hOx" = ( /obj/structure/cable{ icon_state = "2-4" @@ -55450,6 +55470,13 @@ /obj/machinery/processor/slime, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"ilE" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "imE" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -56500,12 +56527,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"kIc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, -/area/hallway/secondary/entry) "kIo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -57131,6 +57152,11 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"mhK" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/turf/open/space/basic, +/area/space/nearstation) "miw" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/structure/cable/yellow{ @@ -57383,6 +57409,13 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"mJp" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/space/basic, +/area/space/nearstation) "mKc" = ( /obj/structure/bookcase/random/nonfiction, /turf/open/floor/plasteel/dark, @@ -58304,6 +58337,18 @@ }, /turf/open/floor/plating, /area/quartermaster/miningdock) +"oQm" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "oRX" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -58599,6 +58644,15 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit/departure_lounge) +"pqP" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "prQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -58661,9 +58715,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/chemistry) -"pyw" = ( -/turf/open/space/basic, -/area/hallway/secondary/entry) "pzF" = ( /mob/living/simple_animal/opossum, /turf/open/floor/wood, @@ -58705,6 +58756,15 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"pEH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/chair/comfy{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pEL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -59235,6 +59295,15 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"qRm" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "qTV" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -59579,12 +59648,10 @@ /turf/open/floor/plating, /area/chapel/asteroid/monastery) "rBh" = ( -/obj/structure/mopbucket, -/obj/item/mop, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/turf/open/floor/plating{ + icon_state = "platingdmg1" }, -/turf/open/floor/plating, /area/maintenance/department/science) "rEh" = ( /obj/structure/table/glass, @@ -59953,6 +60020,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"sIK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJp" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line, @@ -60153,6 +60228,12 @@ }, /turf/open/floor/plating/airless, /area/space/nearstation) +"tfx" = ( +/obj/machinery/atmospherics/components/binary/valve{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/department/science) "tfP" = ( /obj/item/beacon, /turf/open/floor/engine, @@ -60207,6 +60288,13 @@ /obj/structure/table, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"tlp" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "tlw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -61436,6 +61524,18 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"wjQ" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wkZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -61929,6 +62029,11 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"xlg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/plating, +/area/maintenance/department/science) "xlA" = ( /obj/machinery/door/airlock/maintenance/abandoned, /turf/open/floor/plating, @@ -62181,6 +62286,13 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plasteel/freezer, /area/storage/emergency/port) +"xQk" = ( +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 6 + }, +/obj/structure/lattice/catwalk, +/turf/open/space, +/area/space/nearstation) "xSd" = ( /obj/machinery/light/small, /turf/open/floor/plating, @@ -80397,7 +80509,7 @@ aaa aaa aaa aaa -pyw +aaa bsl btL aZx @@ -80654,7 +80766,7 @@ aaa aaa aaa aaa -pyw +aaa aZx bcX aZx @@ -81690,7 +81802,7 @@ aaa aaa aaa aaa -aaa +oQm aaa aaa aaa @@ -81946,9 +82058,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +pqP +aZx aaa aaa aaa @@ -82203,9 +82315,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +bcX +aZx aaa aaa aaa @@ -82457,12 +82569,12 @@ aZx bno bon aZx -aaa -aaa -aaa -aaa -aaa -aaa +aZx +aZx +aZx +aZx +qRm +aZx aaa aaa aht @@ -82712,15 +82824,15 @@ bbQ bcX bdV bnp -bon +baK +pEH +deJ +sIK +wjQ +pEH +bbR aZx aaa -aaa -aaa -aaa -aaa -aaa -aaa aht bBV bDf @@ -82969,15 +83081,15 @@ jzz aZx jzz bnp -bon -aZx -aZx -aZx -aZx -aZx +baK +baK +baK +baK +baK +baK +baK aZx aaa -aht bAI abI abI @@ -83227,14 +83339,14 @@ bbR bbR bnp baK -bbR -bbR -bbR -bbR -bbR +baK +baK +baK +baK +baK +baK +aZx aZx -kIc -kIc bAJ bBX bBX @@ -83489,7 +83601,7 @@ baK baK baK baK -aZx +baK bxY bzz kGe @@ -83746,7 +83858,7 @@ bbT bbT bbT bbT -bwq +bbT bxZ bzA bAK @@ -84003,7 +84115,7 @@ bqS bsm btN bfY -bwr +bfY bya bzB bAL @@ -105349,7 +105461,7 @@ bHy bHy bHy bOs -aht +mZE aaa aaa aaa @@ -105606,7 +105718,7 @@ bCV bCV bCV bOu -bNq +aht aaa aaa aaa @@ -106115,7 +106227,7 @@ bFt bGy bHD fBz -bCV +gMm bCV bCV bCV @@ -106627,17 +106739,17 @@ bwm bAF bAF bGA -bAG -fwr -gMm bAF bAF -aht -aht -abI -abI -abI -abI +bAF +bAF +bAF +uaO +dsz +xQk +hxI +xQk +hxI abI abI abI @@ -106883,18 +106995,18 @@ cDB lWy tSL lWy -cDB +bAG bwm rBh -bwm -aht -aht -aht -aaa -aht -aaa -aaa -aaa +gjv +tfx +xlg +mJp +nqu +mJp +nqu +tlp +ilE aaa aaa aaa @@ -107140,18 +107252,18 @@ cDB hxn uvq bFx -tSL -bwm bIP -bwm -aht -aaa -aht -aaa -aht -aht -aht -aht +bNq +tSL +hMx +tfx +xlg +mhK +wIo +mhK +mhK +mhK +hyh aht aaa aaa @@ -107399,16 +107511,16 @@ obP bFy bGB bwm -bIQ bwm -aht +bwm +rNB bwm bwm rNB bwm rNB bwm -aaa +cdm aby aaa aaa @@ -107654,9 +107766,9 @@ rKL lWy lWy bFz -lWy -xlA bIR +fwr +eMC bwm aht bwm diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm index 5cf7c43a3e..69b0fd9981 100644 --- a/_maps/map_files/Snaxi/Snaxi.dmm +++ b/_maps/map_files/Snaxi/Snaxi.dmm @@ -4095,7 +4095,7 @@ /area/engine/supermatter) "aOP" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/dark, /area/security/prison) "aPw" = ( @@ -27914,7 +27914,7 @@ "nIM" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = 8 }, /obj/structure/sign/poster/contraband/random{ @@ -33380,7 +33380,7 @@ /area/bridge) "qMN" = ( /obj/structure/table, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/grimy, /area/crew_quarters/fitness/recreation) "qNB" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 020017c3fe..4582400c1a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -8429,7 +8429,7 @@ /area/centcom/ferry) "tx" = ( /obj/structure/table/wood, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "ty" = ( @@ -10217,7 +10217,7 @@ /area/wizard_station) "xy" = ( /obj/structure/table/wood/fancy, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ icon_state = "magicdicebag" }, /turf/open/floor/carpet, diff --git a/_maps/multiz_debug.dm b/_maps/multiz_debug.dm index 0521fef59d..ca286934b9 100644 --- a/_maps/multiz_debug.dm +++ b/_maps/multiz_debug.dm @@ -1 +1 @@ -#define FORCE_MAP "_maps/multiz_debug.json" \ No newline at end of file +#define FORCE_MAP "_maps/multiz_debug.json" diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index c7d331e368..da5205fe66 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -307,7 +307,7 @@ "D" = ( /obj/structure/table/reinforced, /obj/item/folder, -/obj/item/storage/box/dice, +/obj/item/storage/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm index 9285a4a716..47673e98b7 100644 --- a/_maps/shuttles/arrival_omega.dmm +++ b/_maps/shuttles/arrival_omega.dmm @@ -237,7 +237,7 @@ /area/shuttle/arrival) "C" = ( /obj/structure/table/reinforced, -/obj/item/storage/box/dice{ +/obj/item/storage/dice{ pixel_x = -2; pixel_y = 8 }, diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm new file mode 100644 index 0000000000..111944d08c --- /dev/null +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -0,0 +1,180 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"b" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/shuttle/mining) +"c" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"d" = ( +/obj/machinery/computer/shuttle/mining/common, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"e" = ( +/obj/structure/table, +/obj/item/radio, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"f" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"g" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"i" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"j" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"k" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"l" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"m" = ( +/obj/machinery/door/airlock/titanium{ + name = "Lavaland Shuttle Airlock" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining_shuttle_common"; + name = "lavaland shuttle"; + port_direction = 4; + width = 7 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"n" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"o" = ( +/obj/structure/closet/crate, +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"p" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/structure/shuttle/engine/heater, +/turf/open/floor/plating, +/area/shuttle/mining) +"q" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/delivery, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"r" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"s" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/open/floor/plating/airless, +/area/shuttle/mining) + +(1,1,1) = {" +a +a +b +i +b +a +a +"} +(2,1,1) = {" +a +c +f +j +n +o +r +"} +(3,1,1) = {" +b +d +g +k +n +p +s +"} +(4,1,1) = {" +a +e +h +l +n +q +r +"} +(5,1,1) = {" +a +a +b +m +b +a +a +"} diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm new file mode 100644 index 0000000000..c47d3b806f --- /dev/null +++ b/_maps/shuttles/mining_common_meta.dmm @@ -0,0 +1,124 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"b" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/shuttle/mining) +"c" = ( +/obj/structure/table, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"d" = ( +/obj/machinery/computer/shuttle/mining/common, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"e" = ( +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) +"f" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"g" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) +"h" = ( +/obj/machinery/door/airlock/titanium{ + name = "Lavaland Shuttle Airlock" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining_shuttle_common"; + name = "lavaland shuttle"; + port_direction = 4; + width = 7 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"i" = ( +/obj/structure/closet/crate, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"j" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"k" = ( +/obj/structure/ore_box, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"l" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/open/floor/plating/airless, +/area/shuttle/mining) +"Q" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) + +(1,1,1) = {" +a +a +b +a +b +a +a +"} +(2,1,1) = {" +a +c +e +g +f +i +a +"} +(3,1,1) = {" +b +d +Q +e +f +j +l +"} +(4,1,1) = {" +a +c +e +e +f +k +a +"} +(5,1,1) = {" +a +a +b +h +b +a +a +"} diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 62438ac7c1..a5f2c5d0f6 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -171,6 +171,7 @@ #define ORGAN_SLOT_HEART_AID "heartdrive" #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop" #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun" +#define ORGAN_SLOT_BRAIN_ROBOT_RADSHIELDING "brain_robot_radshielding" #define ORGAN_SLOT_TAIL "tail" #define ORGAN_SLOT_PENIS "penis" #define ORGAN_SLOT_WOMB "womb" diff --git a/code/__DEFINES/_flags/_flags.dm b/code/__DEFINES/_flags/_flags.dm index a1d8006dbd..6e018b1eeb 100644 --- a/code/__DEFINES/_flags/_flags.dm +++ b/code/__DEFINES/_flags/_flags.dm @@ -162,3 +162,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 REMOVE_TRAIT(x, TRAIT_KEEP_TOGETHER, KEEP_TOGETHER_ORIGINAL);\ else if(!HAS_TRAIT(x, TRAIT_KEEP_TOGETHER))\ x.appearance_flags &= ~KEEP_TOGETHER + +/// 33554431 (2^24 - 1) is the maximum value our bitflags can reach. +#define MAX_BITFLAG_DIGITS 8 diff --git a/code/__DEFINES/_protect.dm b/code/__DEFINES/_protect.dm index fd27d2fbe9..5dbbd2d513 100644 --- a/code/__DEFINES/_protect.dm +++ b/code/__DEFINES/_protect.dm @@ -7,4 +7,4 @@ }\ ##Path/CanProcCall(procname){\ return FALSE;\ -} \ No newline at end of file +} diff --git a/code/__DEFINES/_readme.dm b/code/__DEFINES/_readme.dm index 42ad52286f..8bf6ada647 100644 --- a/code/__DEFINES/_readme.dm +++ b/code/__DEFINES/_readme.dm @@ -11,4 +11,4 @@ and most importantly, how to undo your changes if you screw it up. - Sayu -*/ \ No newline at end of file +*/ diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm index aa19ffb4cf..6d85c45f1b 100644 --- a/code/__DEFINES/cinematics.dm +++ b/code/__DEFINES/cinematics.dm @@ -10,4 +10,4 @@ #define CINEMATIC_NUKE_NO_CORE 10 #define CINEMATIC_NUKE_FAR 11 #define CINEMATIC_NUKE_CLOWNOP 12 -#define CINEMATIC_CULT_NUKE 13 \ No newline at end of file +#define CINEMATIC_CULT_NUKE 13 diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 923355b340..541b50e9bd 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -114,3 +114,17 @@ //special species definitions #define MINIMUM_MUTANT_COLOR "#202020" //this is how dark players mutant parts and skin can be + +//defines for different matrix sections +#define MATRIX_RED "red" +#define MATRIX_GREEN "green" +#define MATRIX_BLUE "blue" +#define MATRIX_RED_GREEN "red_green" +#define MATRIX_RED_BLUE "red_blue" +#define MATRIX_GREEN_BLUE "green_blue" +#define MATRIX_ALL "red_green_blue" +#define MATRIX_NONE "none" + +//defines for the two colour schemes, advanced and old +#define OLD_CHARACTER_COLORING "old_color_system" +#define ADVANCED_CHARACTER_COLORING "advanced_color_system" diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index 5f4317060d..dbca36aab4 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -96,4 +96,4 @@ GLOBAL_LIST_EMPTY(all_clockwork_rites) //a list containing all clockwork rites. #define ARK_SCREAM_COOLDOWN 300 //This much time has to pass between instances of the Ark taking damage before it will "scream" again -#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes \ No newline at end of file +#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 5f5a76b58d..7eebada734 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -11,6 +11,12 @@ #define STAMINA "stamina" #define BRAIN "brain" +//Toxins damage 'typeflag' - is this normal toxins damage or does it have to do with systems corruption (ROBOTIC_ORGANISM species trait) + +#define TOX_DEFAULT 1 //For normal toxins damage / healing (toxins, etc), adjustToxLoss() defaults to this +#define TOX_SYSCORRUPT 2 //For toxins damage causing adverse effects to robotic organisms, up to and including fatal corruption, or healing that damage +#define TOX_OMNI 3 //For tox damage / healing that affects both organics and robotic organisms. Used by very few things, e.g. aheals / by default setToxLoss() + //bitflag damage defines used for suicide_act #define BRUTELOSS (1<<0) #define FIRELOSS (1<<1) diff --git a/code/__DEFINES/contracts.dm b/code/__DEFINES/contracts.dm index b600a5fdc0..c6e23394ba 100644 --- a/code/__DEFINES/contracts.dm +++ b/code/__DEFINES/contracts.dm @@ -41,4 +41,4 @@ #define BANISH_FUNERAL_GARB "funeral" #define LORE 1 -#define LAW 2 \ No newline at end of file +#define LAW 2 diff --git a/code/__DEFINES/cult.dm b/code/__DEFINES/cult.dm index 198291f0ae..9940391673 100644 --- a/code/__DEFINES/cult.dm +++ b/code/__DEFINES/cult.dm @@ -20,4 +20,4 @@ #define DEFAULT_TOOLTIP "6:-29,5:-2" //misc #define SOULS_TO_REVIVE 3 -#define BLOODCULT_EYE "f00" \ No newline at end of file +#define BLOODCULT_EYE "f00" diff --git a/code/__DEFINES/dcs/flags.dm b/code/__DEFINES/dcs/flags.dm index 2dbd4874d9..719a795824 100644 --- a/code/__DEFINES/dcs/flags.dm +++ b/code/__DEFINES/dcs/flags.dm @@ -82,4 +82,4 @@ /// combat mode is active. #define COMBAT_MODE_ACTIVE (1<<1) /// combat mode is not active -#define COMBAT_MODE_INACTIVE (1<<2) \ No newline at end of file +#define COMBAT_MODE_INACTIVE (1<<2) diff --git a/code/__DEFINES/dcs/helpers.dm b/code/__DEFINES/dcs/helpers.dm index b13530cdf7..182035db9b 100644 --- a/code/__DEFINES/dcs/helpers.dm +++ b/code/__DEFINES/dcs/helpers.dm @@ -13,4 +13,4 @@ #define RemoveElement(arguments...) _RemoveElement(list(##arguments)) /// A wrapper for _AddComponent that allows us to pretend we're using normal named arguments -#define AddComponent(arguments...) _AddComponent(list(##arguments)) \ No newline at end of file +#define AddComponent(arguments...) _AddComponent(list(##arguments)) diff --git a/code/__DEFINES/dynamic.dm b/code/__DEFINES/dynamic.dm index da8a76e71e..6a15834ed8 100644 --- a/code/__DEFINES/dynamic.dm +++ b/code/__DEFINES/dynamic.dm @@ -1,7 +1,7 @@ #define CURRENT_LIVING_PLAYERS 1 #define CURRENT_LIVING_ANTAGS 2 #define CURRENT_DEAD_PLAYERS 3 -#define CURRENT_OBSERVERS 4 +#define CURRENT_OBSERVERS 4 #define NO_ASSASSIN (1<<0) #define WAROPS_ALWAYS_ALLOWED (1<<1) @@ -9,9 +9,11 @@ #define FORCE_IF_WON (1<<3) #define USE_PREV_ROUND_WEIGHTS (1<<4) -#define ONLY_RULESET (1<<0) -#define HIGHLANDER_RULESET (1<<1) -#define TRAITOR_RULESET (1<<2) -#define MINOR_RULESET (1<<3) +#define ONLY_RULESET (1<<0) +#define HIGHLANDER_RULESET (1<<1) +#define TRAITOR_RULESET (1<<2) +#define MINOR_RULESET (1<<3) +#define FAKE_ANTAG_RULESET (1<<4) +#define ALWAYS_MAX_WEIGHT_RULESET (1<<5) #define RULESET_STOP_PROCESSING 1 diff --git a/code/__DEFINES/exports.dm b/code/__DEFINES/exports.dm index 9e0caf417f..6c8b00de52 100644 --- a/code/__DEFINES/exports.dm +++ b/code/__DEFINES/exports.dm @@ -1,4 +1,4 @@ #define EXPORT_CARGO 1 #define EXPORT_EMAG 2 #define EXPORT_CONTRABAND 4 -#define EXPORT_PIRATE 8 \ No newline at end of file +#define EXPORT_PIRATE 8 diff --git a/code/__DEFINES/fantasy_affixes.dm b/code/__DEFINES/fantasy_affixes.dm index 709d414d11..20db49bebe 100644 --- a/code/__DEFINES/fantasy_affixes.dm +++ b/code/__DEFINES/fantasy_affixes.dm @@ -2,4 +2,4 @@ #define AFFIX_SUFFIX (1 << 1) #define AFFIX_GOOD (1 << 0) -#define AFFIX_EVIL (1 << 1) \ No newline at end of file +#define AFFIX_EVIL (1 << 1) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 3407b3342b..ff68f18408 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -125,7 +125,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define isbot(A) (istype(A, /mob/living/simple_animal/bot)) -#define isshade(A) (istype(A, /mob/living/simple_animal/shade)) +#define isshade(A) (istype(A, /mob/living/simple_animal/hostile/construct/shade)) #define ismouse(A) (istype(A, /mob/living/simple_animal/mouse)) @@ -188,6 +188,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define islandmine(A) (istype(A, /obj/effect/mine)) +#define issupplypod(A) (istype(A, /obj/structure/closet/supplypod)) + #define isammocasing(A) (istype(A, /obj/item/ammo_casing)) #define isidcard(I) (istype(I, /obj/item/card/id)) diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 767894050d..6f1740cc9f 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -66,4 +66,4 @@ #define LOADOUT_LIMB_PROSTHETIC "Prosthetic" #define LOADOUT_LIMB_AMPUTATED "Amputated" -#define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though \ No newline at end of file +#define LOADOUT_LIMBS list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index df5b7d9f11..762df42472 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -120,4 +120,4 @@ #define CLONEPOD_GET_MIND 1 #define CLONEPOD_POLL_MIND 2 -#define CLONEPOD_NO_MIND 3 \ No newline at end of file +#define CLONEPOD_NO_MIND 3 diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index 72e827a7c8..a28bd6ebf8 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -12,4 +12,4 @@ #define MATERIAL_ADD_PREFIX (1<<1) #define MATERIAL_AFFECT_STATISTICS (1<<2) -#define MATERIAL_SOURCE(mat) "[mat.name]_material" \ No newline at end of file +#define MATERIAL_SOURCE(mat) "[mat.name]_material" diff --git a/code/__DEFINES/medal.dm b/code/__DEFINES/medal.dm index 89fc098e3d..e723c7504e 100644 --- a/code/__DEFINES/medal.dm +++ b/code/__DEFINES/medal.dm @@ -26,4 +26,4 @@ //Misc medals #define MEDAL_METEOR "Your Life Before Your Eyes" #define MEDAL_PULSE "Jackpot" -#define MEDAL_TIMEWASTE "Overextended The Joke" \ No newline at end of file +#define MEDAL_TIMEWASTE "Overextended The Joke" diff --git a/code/__DEFINES/melee.dm b/code/__DEFINES/melee.dm index b166b9d21a..71913cac5b 100644 --- a/code/__DEFINES/melee.dm +++ b/code/__DEFINES/melee.dm @@ -8,4 +8,4 @@ #define MARTIALART_KRAVMAGA "krav maga" #define MARTIALART_CQC "CQC" #define MARTIALART_PLASMAFIST "plasma fist" -#define MARTIALART_RISINGBASS "rising bass" \ No newline at end of file +#define MARTIALART_RISINGBASS "rising bass" diff --git a/code/__DEFINES/menu.dm b/code/__DEFINES/menu.dm index 2730adf87c..60a7a2379c 100644 --- a/code/__DEFINES/menu.dm +++ b/code/__DEFINES/menu.dm @@ -1,3 +1,3 @@ #define CHECKBOX_NONE 0 #define CHECKBOX_GROUP 1 -#define CHECKBOX_TOGGLE 2 \ No newline at end of file +#define CHECKBOX_TOGGLE 2 diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 0704947dda..30162594d6 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -159,6 +159,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define BLOOD_COLOR_LIZARD "#db004D" #define BLOOD_COLOR_UNIVERSAL "#db3300" #define BLOOD_COLOR_BUG "#a37c0f" +#define BLOOD_COLOR_PLANT "#3d610e" //suit sensors: sensor_mode defines diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index aef77e7b57..cd13510366 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -78,7 +78,9 @@ #define EXP_TYPE_ADMIN "Admin" //Flags in the players table in the db -#define DB_FLAG_EXEMPT 1 +#define DB_FLAG_EXEMPT (1<<0) +#define DB_FLAG_AGE_CONFIRMATION_INCOMPLETE (1<<1) +#define DB_FLAG_AGE_CONFIRMATION_COMPLETE (1<<2) #define DEFAULT_CYBORG_NAME "Default Cyborg Name" diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm index ece997a7fc..01612f2c05 100644 --- a/code/__DEFINES/radiation.dm +++ b/code/__DEFINES/radiation.dm @@ -18,6 +18,8 @@ Ask ninjanomnom if they're around #define RAD_BURN_THRESHOLD 1000 // Applied radiation must be over this to burn #define RAD_MOB_SAFE 500 // How much stored radiation in a mob with no ill effects +#define RAD_DEFAULT_ROBOT_SAFE 250 // Like above, except for robotic carbons. Far more susceptible to corruption from radiation. +#define RAD_UPGRADED_ROBOT_SAFE 750 // If the robot has been upgraded via an implant, their radiation threshold is raised to be somewhat above that of organics. #define RAD_MOB_HAIRLOSS 800 // How much stored radiation to check for hair loss diff --git a/code/__DEFINES/rockpaperscissors.dm b/code/__DEFINES/rockpaperscissors.dm index 77ba81938d..fa185063b4 100644 --- a/code/__DEFINES/rockpaperscissors.dm +++ b/code/__DEFINES/rockpaperscissors.dm @@ -4,4 +4,4 @@ #define ROCKPAPERSCISSORS_LOSE "lose" #define ROCKPAPERSCISSORS_WIN "win" #define ROCKPAPERSCISSORS_TIE "tie" -#define ROCKPAPERSCISSORS_NOT_DECIDED "not_decided" \ No newline at end of file +#define ROCKPAPERSCISSORS_NOT_DECIDED "not_decided" diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 5775e128f8..57484ae85b 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -76,8 +76,14 @@ #define LINGHIVE_LINK 3 //whether the emote is visible or audible. +// Requires sight #define EMOTE_VISIBLE 1 +// Requires hearing #define EMOTE_AUDIBLE 2 +// Requires sight or hearing +#define EMOTE_BOTH 3 +// Always able to be seen +#define EMOTE_OMNI 4 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam #define MAX_MESSAGE_LEN 2048 //Citadel edit: What's the WORST that could happen? @@ -89,4 +95,4 @@ // Audio/Visual Flags. Used to determine what sense are required to notice a message. #define MSG_VISUAL (1<<0) -#define MSG_AUDIBLE (1<<1) \ No newline at end of file +#define MSG_AUDIBLE (1<<1) diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm index 3b4c674079..efd715b85a 100644 --- a/code/__DEFINES/species.dm +++ b/code/__DEFINES/species.dm @@ -34,6 +34,7 @@ #define SPECIES_SYNTH "synth" #define SPECIES_SYNTH_MIL "military_synth" #define SPECIES_VAMPIRE "vampire" + #define SPECIES_VAMPIRE_WEAK "vampire_roundstart" #define SPECIES_XENOHYBRID "xeno" #define SPECIES_ZOMBIE "zombie" diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 7c0811ec59..e70955845c 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "5.2.1" +#define TGS_DMAPI_VERSION "5.2.8" // All functions and datums outside this document are subject to change with any version and should not be relied on. @@ -95,6 +95,8 @@ #define TGS_EVENT_WATCHDOG_SHUTDOWN 15 /// Before the watchdog detaches for a TGS update/restart. No parameters. #define TGS_EVENT_WATCHDOG_DETACH 16 +// We don't actually implement this value as the DMAPI can never receive it +// #define TGS_EVENT_WATCHDOG_LAUNCH 17 // OTHER ENUMS @@ -127,6 +129,7 @@ * Call this when your initializations are complete and your game is ready to play before any player interactions happen. * * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running. + * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184 * Before this point, note that any static files or directories may be in use by another server. Your code should account for this. * This function should not be called before ..() in [/world/proc/New]. */ diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm index 467058f27a..f594b735b6 100644 --- a/code/__DEFINES/tgui.dm +++ b/code/__DEFINES/tgui.dm @@ -32,4 +32,4 @@ url_encode(json_encode(list( \ "type" = type, \ "payload" = payload, \ - )))) \ No newline at end of file + )))) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 520f205381..1a3c926884 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -118,6 +118,8 @@ #define TRAIT_NOLIMBDISABLE "no_limb_disable" #define TRAIT_EASYLIMBDISABLE "easy_limb_disable" #define TRAIT_TOXINLOVER "toxinlover" +#define TRAIT_ROBOTIC_ORGANISM "robotic_organism" +#define TRAIT_ROBOT_RADSHIELDING "robot_radshielding" #define TRAIT_NOBREATH "no_breath" #define TRAIT_ANTIMAGIC "anti_magic" #define TRAIT_HOLY "holy" @@ -203,15 +205,14 @@ #define TRAIT_THERMAL_VISION "thermal_vision" #define TRAIT_NO_TELEPORT "no-teleport" //you just can't #define TRAIT_NO_INTERNALS "no-internals" -#define TRAIT_NO_ALCOHOL "alcohol_intolerance" +#define TRAIT_TOXIC_ALCOHOL "alcohol_intolerance" #define TRAIT_MUTATION_STASIS "mutation_stasis" //Prevents processed genetics mutations from processing. #define TRAIT_FAST_PUMP "fast_pump" #define TRAIT_NO_PROCESS_FOOD "no-process-food" // You don't get benefits from nutriment, nor nutrition from reagent consumables #define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good... -/// Prevents stamina buffer regeneration -#define TRAIT_NO_STAMINA_BUFFER_REGENERATION "block_stamina_buffer_regen" -/// Prevents stamina regeneration -#define TRAIT_NO_STAMINA_REGENERATION "block_stamina_regen" +#define TRAIT_NO_STAMINA_BUFFER_REGENERATION "block_stamina_buffer_regen" /// Prevents stamina buffer regeneration +#define TRAIT_NO_STAMINA_REGENERATION "block_stamina_regen" /// Prevents stamina regeneration +#define TRAIT_ARMOR_BROKEN "armor_broken" //acts as if you are wearing no clothing when taking damage, does not affect non-clothing sources of protection // mobility flag traits // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it) @@ -308,6 +309,7 @@ #define LOCKED_HELMET_TRAIT "locked-helmet" #define NINJA_SUIT_TRAIT "ninja-suit" #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant" +#define ROBOT_RADSHIELDING_IMPLANT_TRAIT "robot-radshielding-implant" #define MARTIAL_ARTIST_TRAIT "martial_artist" #define SLEEPING_CARP_TRAIT "sleeping_carp" #define RISING_BASS_TRAIT "rising_bass" @@ -319,8 +321,10 @@ #define MEGAFAUNA_TRAIT "megafauna" #define DEATHSQUAD_TRAIT "deathsquad" #define SLIMEPUDDLE_TRAIT "slimepuddle" +#define CORRUPTED_SYSTEM "corrupted-system" /// This trait is added by the active directional block system. #define ACTIVE_BLOCK_TRAIT "active_block" /// This trait is added by the parry system. #define ACTIVE_PARRY_TRAIT "active_parry" #define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name +#define TRAIT_SACRIFICED "sacrificed" //Makes sure that people cant be cult sacrificed twice. diff --git a/code/__DEFINES/turf_flags.dm b/code/__DEFINES/turf_flags.dm index 8604a92c01..881a535a40 100644 --- a/code/__DEFINES/turf_flags.dm +++ b/code/__DEFINES/turf_flags.dm @@ -3,4 +3,4 @@ #define CHANGETURF_FORCEOP 4 #define CHANGETURF_SKIP 8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE #define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR -#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing. \ No newline at end of file +#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing. diff --git a/code/__DEFINES/vehicles.dm b/code/__DEFINES/vehicles.dm index 0bcc14d0d7..48383546b9 100644 --- a/code/__DEFINES/vehicles.dm +++ b/code/__DEFINES/vehicles.dm @@ -6,4 +6,4 @@ //Car trait flags -#define CAN_KIDNAP 1 \ No newline at end of file +#define CAN_KIDNAP 1 diff --git a/code/__DEFINES/vote.dm b/code/__DEFINES/vote.dm index 175cce3dc4..a3617e21d0 100644 --- a/code/__DEFINES/vote.dm +++ b/code/__DEFINES/vote.dm @@ -1,9 +1,9 @@ -#define PLURALITY_VOTING 0 -#define APPROVAL_VOTING 1 -#define SCHULZE_VOTING 2 -#define SCORE_VOTING 3 -#define MAJORITY_JUDGEMENT_VOTING 4 -#define INSTANT_RUNOFF_VOTING 5 +#define PLURALITY_VOTING "PLURALITY" +#define APPROVAL_VOTING "APPROVAL" +#define SCHULZE_VOTING "SCHULZE" +#define SCORE_VOTING "SCORE" +#define MAJORITY_JUDGEMENT_VOTING "MAJORITY_JUDGEMENT" +#define INSTANT_RUNOFF_VOTING "IRV" #define SHOW_RESULTS (1<<0) #define SHOW_VOTES (1<<1) @@ -26,4 +26,4 @@ GLOBAL_LIST_INIT(display_vote_settings, list(\ "Ongoing Votes" = SHOW_VOTES, "Winner" = SHOW_WINNER, "Abstainers" = SHOW_ABSTENTION -)) \ No newline at end of file +)) diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index d96ec76a7c..af8efd425d 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -176,4 +176,4 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro offset = (y-1)*4 for(x in 1 to 4) output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001) - return output \ No newline at end of file + return output diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index 50c866b30b..de225b3b53 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -94,4 +94,4 @@ chosen_id = input(user, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent) if("I'm feeling lucky") chosen_id = pick(subtypesof(/datum/reagent)) - return chosen_id \ No newline at end of file + return chosen_id diff --git a/code/__HELPERS/sorts/InsertSort.dm b/code/__HELPERS/sorts/InsertSort.dm index 962709527e..4c8c207abe 100644 --- a/code/__HELPERS/sorts/InsertSort.dm +++ b/code/__HELPERS/sorts/InsertSort.dm @@ -16,4 +16,4 @@ SI.associative = associative SI.binarySort(fromIndex, toIndex, fromIndex) - return L \ No newline at end of file + return L diff --git a/code/__HELPERS/sorts/MergeSort.dm b/code/__HELPERS/sorts/MergeSort.dm index 39d3799725..9c85f37f7c 100644 --- a/code/__HELPERS/sorts/MergeSort.dm +++ b/code/__HELPERS/sorts/MergeSort.dm @@ -16,4 +16,4 @@ SI.associative = associative SI.mergeSort(fromIndex, toIndex) - return L \ No newline at end of file + return L diff --git a/code/__HELPERS/sorts/TimSort.dm b/code/__HELPERS/sorts/TimSort.dm index d709044dc0..7191d1ee55 100644 --- a/code/__HELPERS/sorts/TimSort.dm +++ b/code/__HELPERS/sorts/TimSort.dm @@ -17,4 +17,4 @@ SI.associative = associative SI.timSort(fromIndex, toIndex) - return L \ No newline at end of file + return L diff --git a/code/__HELPERS/text_vr.dm b/code/__HELPERS/text_vr.dm index 3c1e1eff12..cde9b1931f 100644 --- a/code/__HELPERS/text_vr.dm +++ b/code/__HELPERS/text_vr.dm @@ -29,4 +29,4 @@ GLOBAL_LIST_EMPTY(whitelisted_species_list) /proc/log_looc(text) if (CONFIG_GET(flag/log_ooc)) - WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]") \ No newline at end of file + WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]") diff --git a/code/__HELPERS/typelists.dm b/code/__HELPERS/typelists.dm index f271b9204d..3519eb60f3 100644 --- a/code/__HELPERS/typelists.dm +++ b/code/__HELPERS/typelists.dm @@ -40,4 +40,4 @@ GLOBAL_LIST_EMPTY(typelistkeys) for (var/saving in savings) to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items") -#endif \ No newline at end of file +#endif diff --git a/code/__HELPERS/vector.dm b/code/__HELPERS/vector.dm index 80295bde0e..9033868e6f 100644 --- a/code/__HELPERS/vector.dm +++ b/code/__HELPERS/vector.dm @@ -54,4 +54,4 @@ return locate(T.x + V.x, T.y + V.y, z) /proc/atoms2vector(var/atom/A, var/atom/B) - return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B \ No newline at end of file + return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 14a1924e76..694e913d53 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -131,4 +131,4 @@ GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spa /obj/item/coin/iron, /obj/item/coin/silver, /obj/item/coin/plastic, - /obj/item/coin/titanium)) \ No newline at end of file + /obj/item/coin/titanium)) diff --git a/code/_globalvars/lists/medals.dm b/code/_globalvars/lists/medals.dm index 0d7903ef7e..91521694ef 100755 --- a/code/_globalvars/lists/medals.dm +++ b/code/_globalvars/lists/medals.dm @@ -1 +1 @@ -GLOBAL_LIST_EMPTY(commendations) \ No newline at end of file +GLOBAL_LIST_EMPTY(commendations) diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 605b20a4f3..4e593ba904 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -13,6 +13,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT, "TRAIT_FAT" = TRAIT_FAT, "TRAIT_HUSK" = TRAIT_HUSK, + "TRAIT_SACRIFICED" = TRAIT_SACRIFICED, "TRAIT_NOCLONE" = TRAIT_NOCLONE, "TRAIT_CLUMSY" = TRAIT_CLUMSY, "TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS, @@ -51,6 +52,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE, "TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE, "TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER, + "TRAIT_ROBOTIC_ORGANISM" = TRAIT_ROBOTIC_ORGANISM, + "TRAIT_ROBOT_RADSHIELDING" = TRAIT_ROBOT_RADSHIELDING, "TRAIT_NOBREATH" = TRAIT_NOBREATH, "TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC, "TRAIT_HOLY" = TRAIT_HOLY, @@ -101,7 +104,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_AUTO_CATCH_ITEM" = TRAIT_AUTO_CATCH_ITEM, "TRAIT_FREESPRINT" = TRAIT_FREESPRINT, "TRAIT_NO_INTERNALS" = TRAIT_NO_INTERNALS, - "TRAIT_NO_ALCOHOL" = TRAIT_NO_ALCOHOL, + "TRAIT_TOXIC_ALCOHOL" = TRAIT_TOXIC_ALCOHOL, "TRAIT_MUTATION_STASIS" = TRAIT_MUTATION_STASIS, "TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER, "TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP, diff --git a/code/_js/menus.dm b/code/_js/menus.dm index da56850b07..fc7c3a4266 100644 --- a/code/_js/menus.dm +++ b/code/_js/menus.dm @@ -34,4 +34,4 @@ function dropdowns() { } } } -"} \ No newline at end of file +"} diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 2e52fa5bd7..935fbce301 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -24,7 +24,7 @@ * Common mob click code */ /mob/proc/CommonClickOn(atom/A, params) - SHOULD_NOT_SLEEP(TRUE) + //SHOULD_NOT_SLEEP(TRUE) if(mob_transforming) return if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON) @@ -34,7 +34,7 @@ FlushCurrentAction() else DiscardCurrentAction() - + /* Standard mob ClickOn() Handles exceptions: Buildmode, middle click, modified clicks, mech actions @@ -49,7 +49,6 @@ * mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed */ /mob/proc/ClickOn(atom/A, params) - SHOULD_NOT_SLEEP(TRUE) if(check_click_intercept(params,A)) return diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm index f71ced7a9d..ae11613885 100644 --- a/code/_onclick/hud/movable_screen_objects.dm +++ b/code/_onclick/hud/movable_screen_objects.dm @@ -87,4 +87,4 @@ S.screen_loc = screen_l - screen += S \ No newline at end of file + screen += S diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 975c6e62d4..073f50d8c5 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -36,7 +36,7 @@ return . | A.attack_hand(src, intent, .) /atom/proc/attack_hand(mob/user, act_intent = user.a_intent, attackchain_flags) - SHOULD_NOT_SLEEP(TRUE) + //SHOULD_NOT_SLEEP(TRUE) if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND)) add_fingerprint(user) if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_NO_ATTACK_HAND) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 3ea4d0a870..0fd09d297d 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -391,6 +391,8 @@ Example config: for(var/T in storyteller_cache) var/datum/dynamic_storyteller/S = T var/config_tag = initial(S.config_tag) + if(!config_tag) + continue var/probability = (config_tag in probabilities) ? probabilities[config_tag] : initial(S.weight) var/min_players = (config_tag in min_player_counts) ? min_player_counts[config_tag] : initial(S.min_players) if(probability <= 0) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index fdf7ffd663..67e4a97894 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -509,21 +509,21 @@ //Body size configs, the feature will be disabled if both min and max have the same value. /datum/config_entry/number/body_size_min - config_entry_value = RESIZE_DEFAULT_SIZE + config_entry_value = 0.9 min_val = 0.1 //to avoid issues with zeros and negative values. max_val = RESIZE_DEFAULT_SIZE integer = FALSE /datum/config_entry/number/body_size_max - config_entry_value = RESIZE_DEFAULT_SIZE + config_entry_value = 1.25 min_val = RESIZE_DEFAULT_SIZE integer = FALSE -//Pun-Pun movement slowdown given to characters with a body size smaller than this value, +//Penalties given to characters with a body size smaller than this value, //to compensate for their smaller hitbox. //To disable, just make sure the value is lower than 'body_size_min' -/datum/config_entry/number/threshold_body_size_slowdown - config_entry_value = RESIZE_DEFAULT_SIZE * 0.85 +/datum/config_entry/number/threshold_body_size_penalty + config_entry_value = RESIZE_DEFAULT_SIZE min_val = 0 max_val = RESIZE_DEFAULT_SIZE integer = FALSE @@ -531,8 +531,8 @@ //multiplicative slowdown multiplier. See 'dna.update_body_size' for the operation. //doesn't apply to floating or crawling mobs /datum/config_entry/number/body_size_slowdown_multiplier - config_entry_value = 0.25 - min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead. + config_entry_value = 0 + min_val = 0 integer = FALSE //Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones. diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index b3e00af458..90ec3bc289 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -290,7 +290,7 @@ /datum/config_entry/flag/tgstyle_maprotation /datum/config_entry/string/map_vote_type - config_entry_value = "SCORE" + config_entry_value = APPROVAL_VOTING /datum/config_entry/number/maprotatechancedelta config_entry_value = 0.75 @@ -327,6 +327,9 @@ /datum/config_entry/number/notify_new_player_account_age // how long do we notify admins of a new byond account min_val = 0 +/datum/config_entry/flag/age_verification //are we using the automated age verification which asks users if they're 18+? + config_entry_value = TRUE + /datum/config_entry/flag/irc_first_connection_alert // do we notify the irc channel when somebody is connecting for the first time? /datum/config_entry/flag/check_randomizer diff --git a/code/controllers/configuration_citadel.dm b/code/controllers/configuration_citadel.dm index a1e70c9e7e..1c4efebb42 100644 --- a/code/controllers/configuration_citadel.dm +++ b/code/controllers/configuration_citadel.dm @@ -5,4 +5,4 @@ var/discord_url = "hfdksjhfa.com" var/discord_password var/announce_watchlist = 0 - var/announce_adminhelps = 0 \ No newline at end of file + var/announce_adminhelps = 0 diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 22f047a297..fdce9a1287 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -97,4 +97,4 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) /datum/controller/failsafe/stat_entry(msg) msg = "Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])" - return msg \ No newline at end of file + return msg diff --git a/code/controllers/subsystem/adjacent_air.dm b/code/controllers/subsystem/adjacent_air.dm index ccbf8ffc65..e93db07775 100644 --- a/code/controllers/subsystem/adjacent_air.dm +++ b/code/controllers/subsystem/adjacent_air.dm @@ -33,4 +33,4 @@ SUBSYSTEM_DEF(adjacent_air) if(MC_TICK_CHECK) break else - CHECK_TICK \ No newline at end of file + CHECK_TICK diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index ece203abba..0afa07939e 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -37,4 +37,4 @@ SUBSYSTEM_DEF(autotransfer) else SSshuttle.autoEnd() -#undef NO_MAXVOTES_CAP \ No newline at end of file +#undef NO_MAXVOTES_CAP diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index bc3f6cf51b..8c4fba367d 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -6,6 +6,12 @@ SUBSYSTEM_DEF(input) priority = FIRE_PRIORITY_INPUT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY + /// KEEP THIS UP TO DATE! + var/static/list/all_macrosets = list( + SKIN_MACROSET_HOTKEYS, + SKIN_MACROSET_CLASSIC_HOTKEYS, + SKIN_MACROSET_CLASSIC_INPUT + ) /// Classic mode input focused macro set. Manually set because we can't define ANY or ANY+UP for classic. var/static/list/macroset_classic_input /// Classic mode map focused macro set. Manually set because it needs to be clientside and go to macroset_classic_input. @@ -51,11 +57,6 @@ SUBSYSTEM_DEF(input) // let's play the ascii game of A to Z (UPPERCASE) for(var/i in 65 to 90) classic_ctrl_override_keys += ascii2text(i) - // let's play the game of clientside bind overrides! - classic_ctrl_override_keys -= list("T", "O", "M", "L") - macroset_classic_input["Ctrl+T"] = "say" - macroset_classic_input["Ctrl+O"] = "ooc" - macroset_classic_input["Ctrl+L"] = "looc" // let's play the list iteration game x2 for(var/key in classic_ctrl_override_keys) // make sure to double double quote to ensure things are treated as a key combo instead of addition/semicolon logic. @@ -67,20 +68,6 @@ SUBSYSTEM_DEF(input) // FINALLY, WE CAN DO SOMETHING MORE NORMAL FOR THE SNOWFLAKE-BUT-LESS KEYSET. - // HAHA - SIKE. Because of BYOND weirdness (tl;dr not specifically binding this way results in potentially duplicate chatboxes when - // conflicts occur with something like say indicator vs say), we're going to snowflake this anyways - var/list/hard_binds = list( - "O" = "ooc", - "T" = "say", - "L" = "looc", - "M" = "me" - ) - var/list/hard_bind_anti_collision = list() - var/list/anti_collision_modifiers = list("Ctrl", "Alt", "Shift", "Ctrl+Alt", "Ctrl+Shift", "Alt+Shift", "Ctrl+Alt+Shift") - for(var/key in hard_binds) - for(var/modifier in anti_collision_modifiers) - hard_bind_anti_collision["[modifier]+[key]"] = ".NONSENSICAL_VERB_THAT_DOES_NOTHING" - macroset_classic_hotkey = list( "Any" = "\"KeyDown \[\[*\]\]\"", "Any+UP" = "\"KeyUp \[\[*\]\]\"", @@ -89,9 +76,6 @@ SUBSYSTEM_DEF(input) "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", ) - macroset_classic_hotkey |= hard_binds - macroset_classic_hotkey |= hard_bind_anti_collision - // And finally, the modern set. macroset_hotkey = list( "Any" = "\"KeyDown \[\[*\]\]\"", @@ -101,16 +85,12 @@ SUBSYSTEM_DEF(input) "Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", ) - macroset_hotkey |= hard_binds - macroset_hotkey |= hard_bind_anti_collision - // Badmins just wanna have fun ♪ /datum/controller/subsystem/input/proc/refresh_client_macro_sets() var/list/clients = GLOB.clients for(var/i in 1 to clients.len) var/client/user = clients[i] - user.set_macros() - user.update_movement_keys() + user.full_macro_assert() /datum/controller/subsystem/input/fire() var/list/clients = GLOB.clients // Let's sing the list cache song diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index 2160cae6e3..bd950e453e 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -35,4 +35,4 @@ SUBSYSTEM_DEF(minor_mapping) if(locate(/obj/structure/cable) in T) exposed_wires += T - return shuffle(exposed_wires) \ No newline at end of file + return shuffle(exposed_wires) diff --git a/code/controllers/subsystem/processing/circuit.dm b/code/controllers/subsystem/processing/circuit.dm index ac720a7fb4..880e7a16a8 100644 --- a/code/controllers/subsystem/processing/circuit.dm +++ b/code/controllers/subsystem/processing/circuit.dm @@ -50,17 +50,20 @@ PROCESSING_SUBSYSTEM_DEF(circuit) /obj/item/electronic_assembly/simple, /obj/item/electronic_assembly/hook, /obj/item/electronic_assembly/pda, + /obj/item/electronic_assembly/dildo, /obj/item/electronic_assembly/small/default, /obj/item/electronic_assembly/small/cylinder, /obj/item/electronic_assembly/small/scanner, /obj/item/electronic_assembly/small/hook, /obj/item/electronic_assembly/small/box, + /obj/item/electronic_assembly/small/dildo, /obj/item/electronic_assembly/medium/default, /obj/item/electronic_assembly/medium/box, /obj/item/electronic_assembly/medium/clam, /obj/item/electronic_assembly/medium/medical, /obj/item/electronic_assembly/medium/gun, /obj/item/electronic_assembly/medium/radio, + /obj/item/electronic_assembly/medium/dildo, /obj/item/electronic_assembly/large/default, /obj/item/electronic_assembly/large/scope, /obj/item/electronic_assembly/large/terminal, diff --git a/code/controllers/subsystem/processing/nanites.dm b/code/controllers/subsystem/processing/nanites.dm index 5b53f9f884..c34e7f7806 100644 --- a/code/controllers/subsystem/processing/nanites.dm +++ b/code/controllers/subsystem/processing/nanites.dm @@ -19,4 +19,4 @@ PROCESSING_SUBSYSTEM_DEF(nanites) if(!force && !check_hardware(backup)) return if(backup.cloud_id == cloud_id) - return backup \ No newline at end of file + return backup diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index a6cd658bf6..f29fe72e80 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -14,4 +14,4 @@ PROCESSING_SUBSYSTEM_DEF(radiation) var/atom/master = contamination.parent SSblackbox.record_feedback("tally", "contaminated", 1, master.type) var/msg = "has become contamintaed with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]" - master.investigate_log(msg, INVESTIGATE_RADIATION) \ No newline at end of file + master.investigate_log(msg, INVESTIGATE_RADIATION) diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 161fd92f77..13e9ff50a2 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -45,22 +45,29 @@ SUBSYSTEM_DEF(statpanels) var/list/vote_arry = list( list("Vote active!", "There is currently a vote running. Question: [SSvote.question]") ) //see the MC on how this works. - if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING))) + if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING, SCHULZE_VOTING, INSTANT_RUNOFF_VOTING))) vote_arry[++vote_arry.len] += list("STATPANEL VOTING DISABLED!", "The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link.", "disabled") //does not return. else - vote_arry[++vote_arry.len] += list("Time Left:", " [round(SSvote.end_time - world.time)] seconds") + vote_arry[++vote_arry.len] += list("Time Left:", " [DisplayTimeText(SSvote.end_time - world.time)] seconds") vote_arry[++vote_arry.len] += list("Choices:", "") for(var/choice in SSvote.choice_statclicks) var/choice_id = SSvote.choice_statclicks[choice] - var/ivotedforthis = FALSE if(target.ckey) switch(SSvote.vote_system) - if(APPROVAL_VOTING) - ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[usr.ckey]) - if(PLURALITY_VOTING) - ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id)) - vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") + if(PLURALITY_VOTING, APPROVAL_VOTING) + var/ivotedforthis = FALSE + if(SSvote.vote_system == APPROVAL_VOTING) + ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[target.ckey]) + else + ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id)) + vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") + if(SCHULZE_VOTING, INSTANT_RUNOFF_VOTING) + var/list/vote = SSvote.voted[target.ckey] + var/vote_position = " " + if(vote) + vote_position = vote.Find(text2num(choice_id)) + vote_arry[++vote_arry.len] += list("\[[vote_position]\]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1") var/vote_str = url_encode(json_encode(vote_arry)) target << output("[vote_str]", "statbrowser:update_voting") else diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 19f19f05ac..95d8928368 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -482,18 +482,7 @@ SUBSYSTEM_DEF(ticker) INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) else var/vote_type = CONFIG_GET(string/map_vote_type) - switch(vote_type) - if("PLURALITY") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS) - if("APPROVAL") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = APPROVAL_VOTING) - if("IRV") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = INSTANT_RUNOFF_VOTING) - if("SCORE") - SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = MAJORITY_JUDGEMENT_VOTING) - else - SSvote.initiate_vote("map","server", display = SHOW_RESULTS) - // fallback + SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type) /datum/controller/subsystem/ticker/proc/HasRoundStarted() return current_state >= GAME_STATE_PLAYING diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 1dea40a802..9a0665e91f 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -52,7 +52,7 @@ SUBSYSTEM_DEF(traumas) "doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)), "the supernatural" = typecacheof(list(/mob/living/simple_animal/hostile/construct, /mob/living/simple_animal/hostile/clockwork, /mob/living/simple_animal/drone/cogscarab, - /mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)), + /mob/living/simple_animal/revenant, /mob/living/simple_animal/hostile/construct/shade)), "aliens" = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)), "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone, /mob/living/simple_animal/pet/penguin)), @@ -158,8 +158,8 @@ SUBSYSTEM_DEF(traumas) /obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, /obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime, /obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime, - /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime, - /obj/item/clothing/under/rank/civilian/mime/sexy, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), + /obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, + /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)), "cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)), diff --git a/code/datums/accents.dm b/code/datums/accents.dm index ce32aa0884..d9e073b729 100644 --- a/code/datums/accents.dm +++ b/code/datums/accents.dm @@ -25,18 +25,15 @@ /datum/accent/abductor/modify_speech(list/speech_args, datum/source) var/message = speech_args[SPEECH_MESSAGE] - var/mob/living/carbon/human/user = source + var/mob/living/carbon/user = source + var/obj/item/organ/tongue/abductor/A = user.getorgan(/obj/item/organ/tongue/abductor) var/rendered = "[user.name]: [message]" user.log_talk(message, LOG_SAY, tag="abductor") - for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) - var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE) - if(!T || T.type != type) + for(var/mob/living/carbon/C in GLOB.alive_mob_list) + var/obj/item/organ/tongue/abductor/T = C.getorgan(/obj/item/organ/tongue/abductor) + if(!T || T.mothership != A.mothership) continue - if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor") - var/datum/antagonist/abductor/A = user.mind.has_antag_datum(/datum/antagonist/abductor) - if(!A || !(H.mind in A.team.members)) - continue - to_chat(H, rendered) + to_chat(C, rendered) for(var/mob/M in GLOB.dead_mob_list) var/link = FOLLOW_LINK(M, user) to_chat(M, "[link] [rendered]") diff --git a/code/datums/action.dm b/code/datums/action.dm index fbf7487e4d..284df6adda 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -174,7 +174,7 @@ M.ghostize(can_reenter_corpse = TRUE, voluntary = TRUE) /datum/action/proc/OnUpdatedIcon() - UpdateButtonIcon() + addtimer(CALLBACK(src, .proc/UpdateButtonIcon), 1) //Hopefully runs after new icon overlays have been compiled. //Presets for item actions /datum/action/item_action @@ -273,6 +273,13 @@ if(istype(H)) H.toggle_welding_screen(owner) +/datum/action/item_action/toggle_welding_screen/plasmaman + +/datum/action/item_action/toggle_welding_screen/plasmaman/Trigger() + var/obj/item/clothing/head/helmet/space/plasmaman/H = target + if(istype(H)) + H.toggle_welding_screen(owner) + /datum/action/item_action/toggle_headphones name = "Toggle Headphones" desc = "UNTZ UNTZ UNTZ" diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 6d3eedee1d..92c4e55699 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -263,4 +263,4 @@ popleft(speak_dejavu) //Remove the oldest speak_dejavu += speech_args[SPEECH_MESSAGE] else - speak_dejavu += speech_args[SPEECH_MESSAGE] \ No newline at end of file + speak_dejavu += speech_args[SPEECH_MESSAGE] diff --git a/code/datums/components/crafting/glassware/glassware.dm b/code/datums/components/crafting/glassware/glassware.dm index 6e1a3d47a0..88f52d6b01 100644 --- a/code/datums/components/crafting/glassware/glassware.dm +++ b/code/datums/components/crafting/glassware/glassware.dm @@ -451,4 +451,4 @@ if(istype(I, /obj/item/stack/sheet/glass)) if(do_after(user,10, target = src)) new next_step(user.loc, 1) - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/datums/components/crafting/glassware/lens_crafting.dm b/code/datums/components/crafting/glassware/lens_crafting.dm index 98fa242058..8907522946 100644 --- a/code/datums/components/crafting/glassware/lens_crafting.dm +++ b/code/datums/components/crafting/glassware/lens_crafting.dm @@ -95,4 +95,4 @@ name = "Handmade Glasses" desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits." icon = 'icons/obj/glass_ware.dmi' - icon_state = "frames_2" \ No newline at end of file + icon_state = "frames_2" diff --git a/code/datums/components/crafting/recipes/recipes_robot.dm b/code/datums/components/crafting/recipes/recipes_robot.dm index 2b8ee0fe3a..53606e64df 100644 --- a/code/datums/components/crafting/recipes/recipes_robot.dm +++ b/code/datums/components/crafting/recipes/recipes_robot.dm @@ -40,7 +40,7 @@ /datum/crafting_recipe/floorbot name = "Floorbot" result = /mob/living/simple_animal/bot/floorbot - reqs = list(/obj/item/storage/toolbox/mechanical = 1, + reqs = list(/obj/item/storage/toolbox = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/assembly/prox_sensor = 1, /obj/item/bodypart/r_arm/robot = 1) @@ -95,4 +95,4 @@ reqs = list(/obj/item/aicard = 1, /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1, /obj/item/stack/cable_coil = 5) - category = CAT_ROBOT \ No newline at end of file + category = CAT_ROBOT diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index ec8ea86d24..753adf7ff4 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -248,7 +248,7 @@ category = CAT_WEAPONRY subcategory = CAT_WEAPON -/datum/crafting_recipe/ishotgun // smaller and more versatile gun requires some better materials +/datum/crafting_recipe/ishotgun name = "Improvised Shotgun" result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised reqs = list(/obj/item/pipe = 2, // putting a large amount of meaningless timegates by forcing people to turn base resources into upgraded resources kinda sucks @@ -408,7 +408,7 @@ /datum/crafting_recipe/rifle_receiver name = "Improvised Rifle Receiver" result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver - reqs = list(/obj/item/stack/sheet/metal = 15) // you can carry multiple shotguns + reqs = list(/obj/item/stack/sheet/metal = 15) tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) time = 25 category = CAT_WEAPONRY @@ -417,10 +417,9 @@ /datum/crafting_recipe/shotgun_receiver name = "Improvised Shotgun Receiver" result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver - reqs = list(/obj/item/stack/sheet/metal = 15, - /obj/item/stack/sheet/plasteel = 1) // requires access or hacking since shotgun is better + reqs = list(/obj/item/stack/sheet/metal = 10) // shotgun does less damage than the rifle and can't 1shot but is more portable tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) - time = 25 + time = 20 category = CAT_WEAPONRY subcategory = CAT_PARTS @@ -432,6 +431,6 @@ reqs = list(/obj/item/stack/sheet/metal = 3, /obj/item/assembly/igniter = 1) tools = list(TOOL_SCREWDRIVER, TOOL_WELDER) - time = 25 + time = 20 category = CAT_WEAPONRY subcategory = CAT_PARTS diff --git a/code/datums/components/fantasy/prefixes.dm b/code/datums/components/fantasy/prefixes.dm index 0ada00a2e8..3dd965b185 100644 --- a/code/datums/components/fantasy/prefixes.dm +++ b/code/datums/components/fantasy/prefixes.dm @@ -67,4 +67,4 @@ /datum/fantasy_affix/vampiric/apply(datum/component/fantasy/comp, newName) var/obj/item/master = comp.parent comp.appliedComponents += master.AddComponent(/datum/component/lifesteal, comp.quality) - return "vampiric [newName]" \ No newline at end of file + return "vampiric [newName]" diff --git a/code/datums/components/igniter.dm b/code/datums/components/igniter.dm index 13944b1200..2f311db166 100644 --- a/code/datums/components/igniter.dm +++ b/code/datums/components/igniter.dm @@ -36,4 +36,4 @@ if(isliving(target)) var/mob/living/L = target L.adjust_fire_stacks(fire_stacks) - L.IgniteMob() \ No newline at end of file + L.IgniteMob() diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm index a36169e6df..7d399c7d26 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -41,4 +41,4 @@ RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE) /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M) - UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) \ No newline at end of file + UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) diff --git a/code/datums/components/magnetic_catch.dm b/code/datums/components/magnetic_catch.dm index 181b24260b..20cd8e1d78 100644 --- a/code/datums/components/magnetic_catch.dm +++ b/code/datums/components/magnetic_catch.dm @@ -31,4 +31,4 @@ UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW) /datum/component/magnetic_catch/proc/throw_react(datum/source, list/arguments) - return COMPONENT_CANCEL_THROW \ No newline at end of file + return COMPONENT_CANCEL_THROW diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 6a1028cc65..6404be94c4 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -55,7 +55,7 @@ var/mob/living/shooter /datum/component/pellet_cloud/Initialize(projectile_type=/obj/item/shrapnel, magnitude=5) - if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent)) + if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent) && !issupplypod(parent)) return COMPONENT_INCOMPATIBLE if(magnitude < 1) @@ -66,7 +66,7 @@ if(isammocasing(parent)) num_pellets = magnitude - else if(isgrenade(parent) || islandmine(parent)) + else if(isgrenade(parent) || islandmine(parent) || issupplypod(parent)) radius = magnitude /datum/component/pellet_cloud/Destroy(force, silent) @@ -86,9 +86,11 @@ RegisterSignal(parent, COMSIG_GRENADE_PRIME, .proc/create_blast_pellets) else if(islandmine(parent)) RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets) + else if(issupplypod(parent)) + RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets) /datum/component/pellet_cloud/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) + UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED, COMSIG_SUPPLYPOD_LANDED)) /** * create_casing_pellets() is for directed pellet clouds for ammo casings that have multiple pellets (buckshot and scatter lasers for instance) diff --git a/code/datums/components/shrink.dm b/code/datums/components/shrink.dm index 96807fe313..15f5c8f2b5 100644 --- a/code/datums/components/shrink.dm +++ b/code/datums/components/shrink.dm @@ -39,4 +39,4 @@ if(ishuman(L)) var/mob/living/carbon/human/H = L H.physiology.damage_resistance += 100 - ..() \ No newline at end of file + ..() diff --git a/code/datums/components/sizzle.dm b/code/datums/components/sizzle.dm index 5e56dd15cb..df0298b2aa 100644 --- a/code/datums/components/sizzle.dm +++ b/code/datums/components/sizzle.dm @@ -22,4 +22,4 @@ grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent sizzling = new(grill_marks) sizzling.alpha = sizzlealpha - food.add_overlay(sizzling) \ No newline at end of file + food.add_overlay(sizzling) diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 27bf4a5986..44fbf313cf 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -53,4 +53,4 @@ spawned_mobs += L L.nest = src L.faction = src.faction - P.visible_message("[L] [spawn_text] [P].") \ No newline at end of file + P.visible_message("[L] [spawn_text] [P].") diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index b8191a377b..0552a791ea 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -46,6 +46,21 @@ if(isnum(use_delay_override)) use_delay = use_delay_override +/datum/component/squeak/UnregisterFromParent() + if(!isatom(parent)) + return + UnregisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY)) + if(ismovable(parent)) + UnregisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, + COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED, COMSIG_MOVABLE_CROSS, + COMSIG_CROSS_SQUEAKED, COMSIG_MOVABLE_DISPOSING)) + if(isitem(parent)) + UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK_SELF, + COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) + if(istype(parent, /obj/item/clothing/shoes)) + UnregisterSignal(parent, COMSIG_SHOES_STEP_ACTION) + return ..() + /datum/component/squeak/proc/play_squeak() do_play_squeak() diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm index 1d66cf9307..ffb4309c1c 100644 --- a/code/datums/components/summoning.dm +++ b/code/datums/components/summoning.dm @@ -68,4 +68,4 @@ spawn_location.visible_message("[L] [spawn_text].") /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed) - spawned_mobs -= killed \ No newline at end of file + spawned_mobs -= killed diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm index e840788766..76179a82e8 100644 --- a/code/datums/components/swarming.dm +++ b/code/datums/components/swarming.dm @@ -52,4 +52,4 @@ var/atom/movable/owner = parent if(is_swarming) animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 2) - is_swarming = FALSE \ No newline at end of file + is_swarming = FALSE diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index 53323f1e3f..251272ac2e 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -78,4 +78,4 @@ /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params) if(thing.get_temperature()) - thermite_melt(user) \ No newline at end of file + thermite_melt(user) diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index 80570d0c3b..db5fa677f2 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -46,4 +46,4 @@ holder.update_action_buttons_icon() if(recharge_sound) playsound(dashing_item, recharge_sound, 50, 1) - to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.") \ No newline at end of file + to_chat(holder, "[src] now has [current_charges]/[max_charges] charges.") diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 216d82b4c8..b4e53a7425 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -151,4 +151,4 @@ flags_1 |= SHOCKED_1 /mob/living/proc/reset_shocked() - flags_1 &= ~ SHOCKED_1 \ No newline at end of file + flags_1 &= ~ SHOCKED_1 diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm index b12b657101..32e4b3807c 100644 --- a/code/datums/diseases/advance/presets.dm +++ b/code/datums/diseases/advance/presets.dm @@ -39,4 +39,4 @@ symptoms += S name = "Sample #[rand(1,10000)]" - ..() \ No newline at end of file + ..() diff --git a/code/datums/diseases/advance/symptoms/disfiguration.dm b/code/datums/diseases/advance/symptoms/disfiguration.dm index 4a4b704dc0..cdfc6370be 100644 --- a/code/datums/diseases/advance/symptoms/disfiguration.dm +++ b/code/datums/diseases/advance/symptoms/disfiguration.dm @@ -47,4 +47,4 @@ BONUS if(!.) return if(A.affected_mob) - REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT) \ No newline at end of file + REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT) diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index be444e3916..d4fbbe9aca 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -52,4 +52,4 @@ Bonus to_chat(M, "A wave of dizziness washes over you!") M.Dizzy(5) if(power >= 2) - M.set_drugginess(5) \ No newline at end of file + M.set_drugginess(5) diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 0fad819e8e..44030b0417 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -134,4 +134,4 @@ Bonus M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2)) if(zombie) M.reagents.add_reagent(/datum/reagent/romerol, 1) - return 1 \ No newline at end of file + return 1 diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index 944333d9cf..88ea57296d 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -59,4 +59,4 @@ BONUS M.adjustStaminaLoss(25) if(power >= 3 && A.stage >= 5) to_chat(M, "[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]") - M.Stun(35) \ No newline at end of file + M.Stun(35) diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 6835cb13d4..a68513685d 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -53,4 +53,4 @@ BONUS var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart) M.visible_message("[can_scratch ? "[M] scratches [M.p_their()] [bodypart.name]." : ""]", "Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") if(can_scratch) - bodypart.receive_damage(0.5) \ No newline at end of file + bodypart.receive_damage(0.5) diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 3821c0585e..24e01dbbaf 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -67,4 +67,4 @@ Bonus if(!..()) return if(A.stage >= 4) - REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT) \ No newline at end of file + REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT) diff --git a/code/datums/diseases/advance/symptoms/skin.dm b/code/datums/diseases/advance/symptoms/skin.dm index e35fe741fd..d7a457aec1 100644 --- a/code/datums/diseases/advance/symptoms/skin.dm +++ b/code/datums/diseases/advance/symptoms/skin.dm @@ -38,4 +38,4 @@ BONUS M.reagents.add_reagent(color, 5) else if (prob(50)) // spam - M.visible_message("[M] looks rather vibrant...", "The colors, man, the colors...") \ No newline at end of file + M.visible_message("[M] looks rather vibrant...", "The colors, man, the colors...") diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm index 439f391fe4..765abaaec5 100644 --- a/code/datums/diseases/advance/symptoms/sneeze.dm +++ b/code/datums/diseases/advance/symptoms/sneeze.dm @@ -51,4 +51,4 @@ Bonus else M.emote("sneeze") if(M.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth - A.spread(4 + power) \ No newline at end of file + A.spread(4 + power) diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index a6ea7de5a0..b3f2de8b11 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -79,4 +79,4 @@ return /datum/symptom/proc/OnRemove(datum/disease/advance/A) //But dont forget to remove them too. - return \ No newline at end of file + return diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index bb0d9bdcf9..06e1107316 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -50,4 +50,4 @@ Bonus else to_chat(M, "[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]") M.overeatduration = max(M.overeatduration - 100, 0) - M.adjust_nutrition(-100) \ No newline at end of file + M.adjust_nutrition(-100) diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index d2712a0146..a9f5261905 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -55,4 +55,4 @@ BONUS if(5) if(H.age > 21) H.age = 21 - to_chat(H, "You feel like you can take on the world!") \ No newline at end of file + to_chat(H, "You feel like you can take on the world!") diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 20ecceb224..cf810b9fdb 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -38,4 +38,4 @@ "You cough up butterflies!") new /mob/living/simple_animal/butterfly(affected_mob.loc) new /mob/living/simple_animal/butterfly(affected_mob.loc) - return \ No newline at end of file + return diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index ccae692b4b..53230711d9 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -36,4 +36,4 @@ affected_mob.visible_message("[affected_mob] coughs up a swarm of bees!", \ "You cough up a swarm of bees!") new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc) - return \ No newline at end of file + return diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index 660793ed83..649ecc537c 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -50,4 +50,4 @@ if(!affected_mob.disease_resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu() affected_mob.ForceContractDisease(Flu, FALSE, TRUE) - cure() \ No newline at end of file + cure() diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 47f391ecf7..58ed52e8b6 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -36,4 +36,4 @@ if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") if(prob(10)) - to_chat(affected_mob, "You feel stiff.") \ No newline at end of file + to_chat(affected_mob, "You feel stiff.") diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 5eda0e928f..aabb9ed144 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -62,4 +62,4 @@ cure() else - cure() \ No newline at end of file + cure() diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index 0bfb918ba0..a355a4bc01 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -65,4 +65,4 @@ var/iter = rand(1,3) for(i=0,i= penalty_threshold) + C.maxHealth -= 10 //reduce the maxhealth + var/slowdown = (1 - round(features["body_size"] / penalty_threshold, 0.1)) * CONFIG_GET(number/body_size_slowdown_multiplier) + holder.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/small_stride, TRUE, slowdown) + else + if(old_size < penalty_threshold && features["body_size"] >= penalty_threshold) + C.maxHealth += 10 //give the maxhealth back + holder.remove_movespeed_modifier(/datum/movespeed_modifier/small_stride) //remove the slowdown + + diff --git a/code/datums/elements/update_icon_blocker.dm b/code/datums/elements/update_icon_blocker.dm index c30dc9efad..f52a712ebb 100644 --- a/code/datums/elements/update_icon_blocker.dm +++ b/code/datums/elements/update_icon_blocker.dm @@ -7,4 +7,4 @@ RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon) /datum/element/update_icon_blocker/proc/block_update_icon() - return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS \ No newline at end of file + return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index e1147df225..14f3eae689 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -66,8 +66,12 @@ if(emote_type == EMOTE_AUDIBLE) user.audible_message(msg) - else + else if(emote_type == EMOTE_VISIBLE) user.visible_message(msg) + else if(emote_type == EMOTE_BOTH) + user.visible_message(msg, blind_message = msg) + else if(emote_type == EMOTE_OMNI) + user.visible_message(msg, omni = TRUE) /datum/emote/proc/replace_pronoun(mob/user, message) if(findtext(message, "their")) diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index f9a9e07aed..4f6996bfdd 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -51,4 +51,4 @@ mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1) volume = 10 -/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file +/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm index 06d07260ed..28ca852a43 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -66,4 +66,4 @@ if(atk_verb) log_combat(A, D, "[atk_verb] (Psychotic Brawling)") - return TRUE \ No newline at end of file + return TRUE diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 3bddfdaa63..b72874c329 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -150,7 +150,6 @@ overlays_standing[CM.layer_used] = mut_overlay apply_overlay(CM.layer_used) - /datum/mutation/human/proc/modify() //called when a genome is applied so we can properly update some stats without having to remove and reapply the mutation from someone if(modified || !power || !owner) return diff --git a/code/datums/mutations/radioactive.dm b/code/datums/mutations/radioactive.dm index df30aaa9d2..2e6aa50d46 100644 --- a/code/datums/mutations/radioactive.dm +++ b/code/datums/mutations/radioactive.dm @@ -16,4 +16,4 @@ visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation", -MUTATIONS_LAYER)) /datum/mutation/human/radioactive/get_visual_indicator() - return visual_indicators[type][1] \ No newline at end of file + return visual_indicators[type][1] diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index fbc194cc6f..c2e0d3c9d2 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -64,4 +64,4 @@ qdel(bar) . = ..() -#undef PROGRESSBAR_HEIGHT \ No newline at end of file +#undef PROGRESSBAR_HEIGHT diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index e92564a3b4..73813fd253 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -109,7 +109,7 @@ name = "Alcohol Intolerance" desc = "You take toxin damage from alcohol rather than getting drunk." value = 0 - mob_trait = TRAIT_NO_ALCOHOL + mob_trait = TRAIT_TOXIC_ALCOHOL medical_record_text = "Patient's body does not react properly to ethyl alcohol." /datum/quirk/alcohol_intolerance/add() diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index dae92d3c42..376512a375 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -72,4 +72,4 @@ var/area/AA = get_base_area(A) if(AA.atmosalert(2, holder)) A.post_alert(2) - A.update_icon() \ No newline at end of file + A.update_icon() diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index 19b2b8dda8..d167a11fd3 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -55,4 +55,4 @@ if(mend) A.aidisabled = FALSE else - A.aidisabled = TRUE \ No newline at end of file + A.aidisabled = TRUE diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 25493f2e30..6e3c5318bf 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -79,4 +79,4 @@ /datum/wires/explosive/gibtonite/explode() var/obj/item/gibtonite/P = holder - P.GibtoniteReaction(null, 2) \ No newline at end of file + P.GibtoniteReaction(null, 2) diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index 988487727b..90f229fc2c 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -29,4 +29,4 @@ if(WIRE_MOTOR1, WIRE_MOTOR2) holder.visible_message("[icon2html(M, viewers(holder))] The drive motor whines briefly.") else - holder.visible_message("[icon2html(M, viewers(holder))] You hear a radio crackle.") \ No newline at end of file + holder.visible_message("[icon2html(M, viewers(holder))] You hear a radio crackle.") diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index b782e589dd..97f518e434 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -47,4 +47,4 @@ C.remove_strength() /datum/wires/particle_accelerator/control_box/emp_pulse() // to prevent singulo from pulsing wires - return \ No newline at end of file + return diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 6c7e59c24c..e8fb883ecd 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -57,4 +57,4 @@ if(WIRE_IDSCAN) V.scan_id = mend if(WIRE_SPEAKER) - V.shut_up = mend \ No newline at end of file + V.shut_up = mend diff --git a/code/datums/wounds/_scars.dm b/code/datums/wounds/_scars.dm index 8cd0d8a047..3365fc359d 100644 --- a/code/datums/wounds/_scars.dm +++ b/code/datums/wounds/_scars.dm @@ -149,4 +149,4 @@ /// Used to format a scar to safe in preferences for persistent scars /datum/scar/proc/format_amputated(body_zone) description = pick(list("is several skintone shades paler than the rest of the body", "is a gruesome patchwork of artificial flesh", "has a large series of attachment scars at the articulation points")) - return "[SCAR_CURRENT_VERSION]|[body_zone]|[description]|amputated|[WOUND_SEVERITY_LOSS]" \ No newline at end of file + return "[SCAR_CURRENT_VERSION]|[body_zone]|[description]|amputated|[WOUND_SEVERITY_LOSS]" diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 29c87b32d4..02421b1e52 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -91,8 +91,6 @@ var/wound_flags = (FLESH_WOUND | BONE_WOUND | ACCEPTS_GAUZE) /datum/wound/Destroy() - if(attached_surgery) - QDEL_NULL(attached_surgery) if(limb?.wounds && (src in limb.wounds)) // destroy can call remove_wound() and remove_wound() calls qdel, so we check to make sure there's anything to remove first remove_wound() limb = null diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm index 87b44291f5..558a4b1026 100644 --- a/code/game/area/ai_monitored.dm +++ b/code/game/area/ai_monitored.dm @@ -28,4 +28,4 @@ for(var/X in motioncameras) var/obj/machinery/camera/cam = X cam.lostTargetRef(WEAKREF(O)) - return \ No newline at end of file + return diff --git a/code/game/area/areas/away_content.dm b/code/game/area/areas/away_content.dm index b724c92607..27a73ae5f1 100644 --- a/code/game/area/areas/away_content.dm +++ b/code/game/area/areas/away_content.dm @@ -25,4 +25,4 @@ Unused icons for new areas are "awaycontent1" ~ "awaycontent30" /area/awaymission/vr name = "Virtual Reality" - icon_state = "awaycontent1" \ No newline at end of file + icon_state = "awaycontent1" diff --git a/code/game/area/areas/ruins/lavaland.dm b/code/game/area/areas/ruins/lavaland.dm index 19a1fd503d..66c4f8542b 100644 --- a/code/game/area/areas/ruins/lavaland.dm +++ b/code/game/area/areas/ruins/lavaland.dm @@ -94,4 +94,4 @@ //ash walker nest /area/ruin/unpowered/ash_walkers - icon_state = "red" \ No newline at end of file + icon_state = "red" diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index fbc433a8a0..836b00250f 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -72,6 +72,8 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) var/list/threat_log_verbose = list() /// List of roundstart rules used for selecting the rules. var/list/roundstart_rules = list() + /// List of minor roundstart rules used for selecting the rules. + var/list/minor_rules = list() /// List of latejoin rules used for selecting the rules. var/list/latejoin_rules = list() /// List of midround rules used for selecting the rules. @@ -121,10 +123,12 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) var/pop_last_updated = 0 /// How many percent of the rounds are more peaceful. var/peaceful_percentage = 50 - /// If a highlander executed. + /// If a highlander executed. No other highlander rulesets will be run. var/highlander_executed = FALSE - /// If a only ruleset has been executed. + /// If a only ruleset has been executed. No other rulesets will be run. var/only_ruleset_executed = FALSE + /// If the first picked ruleset was a minor ruleset. Minor antagonists will be weighted higher. + var/minor_ruleset_start = FALSE /// Antags rolled by rules so far, to keep track of and discourage scaling past a certain ratio of crew/antags especially on lowpop. var/antags_rolled = 0 // Arbitrary threat addition, for fudging purposes. @@ -372,6 +376,8 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) if(ruleset.name == "") continue switch(ruleset.ruletype) + if("Minor") + minor_rules += ruleset if("Roundstart") roundstart_rules += ruleset if ("Latejoin") @@ -396,21 +402,47 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) rigged_roundstart() else roundstart() - - var/starting_rulesets = "" - for (var/datum/dynamic_ruleset/roundstart/DR in executed_rules) - starting_rulesets += "[DR.name], " - log_game("DYNAMIC: Picked the following roundstart rules: [starting_rulesets]") + if(minor_ruleset_start) + log_game("DYNAMIC: Starting a minor ruleset round.") + else + var/starting_rulesets = "" + for (var/datum/dynamic_ruleset/roundstart/DR in executed_rules) + starting_rulesets += "[DR.name], " + log_game("DYNAMIC: Picked the following roundstart rules: [starting_rulesets]") candidates.Cut() return TRUE /datum/game_mode/dynamic/post_setup(report) update_playercounts() - - for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) - addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) + if(minor_ruleset_start) + addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/minor_roundstart),rand(1 MINUTES,5 MINUTES)) + else + for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) + addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) ..() +/datum/game_mode/dynamic/proc/minor_roundstart() + message_admins("Dynamic beginning minor antag roundstart rolls.") + var/list/potential_minor_rulesets = storyteller.minor_rule_draft() + var/iterations = 0 + var/num_rulesets_executed = 0 + while(threat < threat_level && potential_minor_rulesets.len && (!CHECK_TICK || iterations < 100)) + var/datum/dynamic_ruleset/minor/rule = pickweight(potential_minor_rulesets) + rule.candidates = current_players[CURRENT_LIVING_PLAYERS].Copy() + rule.trim_candidates() + if(!check_blocking(rule.blocking_rules, executed_rules) && rule.ready()) + rule.execute() + executed_rules |= rule + log_threat("[rule.ruletype] - [rule.name] [rule.cost] threat", verbose = TRUE) + num_rulesets_executed++ + else + potential_minor_rulesets -= rule + update_playercounts() + iterations++ + message_admins("Minor antag roundstart rolls completed, with [num_rulesets_executed] antags or antag teams made.") + log_game("DYNAMIC: Minor antag roundstart made [num_rulesets_executed] antags or antag teams.") + + /// A simple roundstart proc used when dynamic_forced_roundstart_ruleset has rules in it. /datum/game_mode/dynamic/proc/rigged_roundstart() message_admins("[GLOB.dynamic_forced_roundstart_ruleset.len] rulesets being forced. Will now attempt to draft players for them.") @@ -429,12 +461,17 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) if (GLOB.dynamic_forced_extended) log_game("DYNAMIC: Starting a round of forced extended.") return TRUE + if(prob(storyteller.minor_start_chance())) + minor_ruleset_start = TRUE + message_admins("Dynamic has initialized a minor antag start. Antags will be assigned in 1-5 minutes.") + log_game("DYNAMIC: Minor start initialized.") + return TRUE var/list/drafted_rules = storyteller.roundstart_draft() if(!drafted_rules.len) - message_admins("Not enough threat level for roundstart antags!") - log_game("DYNAMIC: Not enough threat level for roundstart antags!") - midround_injection_cooldown = round((midround_injection_cooldown + world.time) / 2, 1) - latejoin_injection_cooldown = round((latejoin_injection_cooldown + world.time) / 2, 1) + message_admins("No roundstart antags drafted! Falling back to minor ruleset start.") + log_game("DYNAMIC: No roundstart antags drafted! Falling back to minor ruleset start.") + minor_ruleset_start = TRUE + return FALSE var/indice_pop = min(10,round(roundstart_pop_ready/pop_per_requirement)+1) extra_rulesets_amount = 0 if (GLOB.dynamic_classic_secret) @@ -468,8 +505,9 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) else if(threat_level >= 50) - message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this.") + message_admins("DYNAMIC: Picking first roundstart ruleset failed. You should report this. Falling back to minor antag start.") log_game("DYNAMIC: Picking first roundstart ruleset failed. drafted_rules.len = [drafted_rules.len] and threat = [threat]/[threat_level]") + minor_ruleset_start = TRUE return FALSE return TRUE @@ -513,7 +551,6 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null) drafted_rules -= starting_rule starting_rule.trim_candidates() - starting_rule.scale_up(extra_rulesets_amount, threat_level-added_threat) if (starting_rule.pre_execute()) log_threat("[starting_rule.ruletype] - [starting_rule.name] [starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE) if(starting_rule.flags & HIGHLANDER_RULESET) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index eb7da2144f..3e7e504130 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -50,8 +50,12 @@ /// Used for the roundend report var/total_cost = 0 /// A flag that determines how the ruleset is handled + /// ONLY_RULESET are rulesets that prevent ALL other rulesets from rolling. /// HIGHLANDER_RULESET are rulesets can end the round. - /// TRAITOR_RULESET and MINOR_RULESET can't end the round and have no difference right now. + /// TRAITOR_RULESET are the "default" ruleset--they should always be addable to a round, if the round type allows antags and dynamic thinks there should be another. + /// MINOR_RULESET is for rulesets whose antags can have multiple instances without causing too much issue. As roundstarts, they have their weights reduced based on the storyteller's minor-antag-round chance. + /// FAKE_ANTAG_RULESET is for rulesets whose antags aren't actually antagonistic--essentially just flavor meant to spice the round up. + /// ALWAYS_MAX_WEIGHT_RULESET means that the ruleset doesn't have its weight reduced based on recency. var/flags = 0 /// Pop range per requirement. If zero defaults to mode's pop_per_requirement. var/pop_per_requirement = 0 @@ -82,9 +86,6 @@ var/delay = 0 /// List of tags for use in storytellers. var/list/property_weights = list() - /// Whether or not recent-round weight values are taken into account for this ruleset. - /// Weight reduction uses the same values as secret's recent-round mode weight reduction. - var/always_max_weight = FALSE /// Weight reduction by recent-rounds. Saved on new. var/weight_mult = 1 @@ -100,7 +101,7 @@ var/high_population_requirements = CONFIG_GET(keyed_list/dynamic_high_population_requirement) var/list/repeated_mode_adjust = CONFIG_GET(number_list/repeated_mode_adjust) if(config_tag in weights) - if(!always_max_weight && SSpersistence.saved_dynamic_rules.len == 3 && repeated_mode_adjust.len == 3) + if(!(flags & ALWAYS_MAX_WEIGHT_RULESET) && SSpersistence.saved_dynamic_rules.len == 3 && repeated_mode_adjust.len == 3) var/saved_dynamic_rules = SSpersistence.saved_dynamic_rules for(var/i in 1 to 3) if(config_tag in saved_dynamic_rules[i]) @@ -119,6 +120,9 @@ /datum/dynamic_ruleset/roundstart // One or more of those drafted at roundstart ruletype = "Roundstart" +/datum/dynamic_ruleset/minor // drafted at roundstart in minor rounds, one antag at a time, for a "mixed" round + ruletype = "Minor" + // Can be drafted when a player joins the server /datum/dynamic_ruleset/latejoin ruletype = "Latejoin" @@ -175,7 +179,7 @@ /// This is called if persistent variable is true everytime SSTicker ticks. /datum/dynamic_ruleset/proc/rule_process() return TRUE - + /// Called on game mode pre_setup for roundstart rulesets. /// Do everything you need to do before job is assigned here. /// IMPORTANT: ASSIGN special_role HERE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index d2fa8bcc70..7842c6e0f7 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -70,9 +70,8 @@ requirements = list(40,30,20,15,15,15,15,15,15,15) high_population_requirement = 15 repeatable = TRUE - flags = TRAITOR_RULESET + flags = TRAITOR_RULESET | MINOR_RULESET | ALWAYS_MAX_WEIGHT_RULESET property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1) - always_max_weight = TRUE ////////////////////////////////////////////// // // @@ -207,6 +206,7 @@ weight = 4 cost = 25 requirements = list(60,60,60,55,50,50,50,50,50,50) + flags = MINOR_RULESET high_population_requirement = 50 property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2) repeatable = TRUE @@ -229,6 +229,7 @@ cost = 10 property_weights = list("story_potential" = 2, "extended" = 2, "trust" = -2, "valid" = 1) requirements = list(70,65,60,55,50,45,40,35,30,30) + flags = MINOR_RULESET high_population_requirement = 30 repeatable = TRUE @@ -258,6 +259,7 @@ required_candidates = 1 weight = 3 cost = 15 + flags = MINOR_RULESET requirements = list(101,101,101,101,101,101,101,101,101,101) property_weights = list("trust" = -2, "valid" = 2) high_population_requirement = 101 @@ -281,5 +283,5 @@ requirements = list(10,10,10,10,10,10,10,10,10,10) high_population_requirement = 10 repeatable = TRUE - flags = TRAITOR_RULESET | MINOR_RULESET - property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 2) + flags = TRAITOR_RULESET | MINOR_RULESET | FAKE_ANTAG_RULESET + property_weights = list("story_potential" = 1, "trust" = -1, "extended" = 2) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index b29584aa58..416721702b 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -207,9 +207,8 @@ requirements = list(30,25,20,15,15,15,15,15,15,15) repeatable = TRUE high_population_requirement = 15 - flags = TRAITOR_RULESET + flags = TRAITOR_RULESET | MINOR_RULESET | ALWAYS_MAX_WEIGHT_RULESET property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1) - always_max_weight = TRUE /datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0) var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len @@ -494,6 +493,7 @@ required_candidates = 1 weight = 3 cost = 10 + flags = MINOR_RULESET requirements = list(101,101,101,70,50,40,20,15,15,15) high_population_requirement = 50 repeatable_weight_decrease = 2 @@ -630,6 +630,7 @@ required_candidates = 1 weight = 4 cost = 15 + flags = MINOR_RULESET requirements = list(101,101,101,90,80,70,60,50,40,30) high_population_requirement = 30 property_weights = list("story_potential" = 1, "extended" = -2, "valid" = 2) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_minor.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_minor.dm new file mode 100644 index 0000000000..618befbaa7 --- /dev/null +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_minor.dm @@ -0,0 +1,212 @@ + +////////////////////////////////////////////// +// // +// SYNDICATE TRAITORS // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/traitor + name = "Traitors" + config_tag = "traitor" // these having identical config tags to the roundstart modes is 100% intentional, so that config edits are simpler + persistent = TRUE + antag_flag = ROLE_TRAITOR + antag_datum = /datum/antagonist/traitor/ + minimum_required_age = 0 + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Cyborg") + restricted_roles = list("Cyborg", "AI") + required_candidates = 1 + weight = 5 + flags = TRAITOR_RULESET | ALWAYS_MAX_WEIGHT_RULESET + cost = 10 // Avoid raising traitor threat above 10, as it is the default low cost ruleset. + requirements = list(50,50,50,50,50,50,50,50,50,50) + high_population_requirement = 40 + property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1, "valid" = 1) + +/datum/dynamic_ruleset/minor/traitor/execute() + var/mob/M = pick_n_take(candidates) + assigned += M + var/datum/antagonist/traitor/newTraitor = new + M.mind.add_antag_datum(newTraitor) + log_admin("[M] was made into a traitor by dynamic.") + message_admins("[M] was made into a traitor by dynamic.") + return TRUE + +////////////////////////////////////////// +// // +// BLOOD BROTHERS // +// // +////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/traitorbro + name = "Blood Brothers" + config_tag = "traitorbro" + antag_flag = ROLE_BROTHER + antag_datum = /datum/antagonist/brother + restricted_roles = list("AI", "Cyborg") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + required_candidates = 2 + weight = 4 + cost = 10 + requirements = list(101,101,101,101,101,101,101,101,101,101) + high_population_requirement = 101 + antag_cap = list(2,2,2,2,2,2,2,2,2,2) // Can pick 3 per team, but rare enough it doesn't matter. + property_weights = list("story_potential" = 1, "trust" = -1, "extended" = 1, "valid" = 1) + var/list/datum/team/brother_team/pre_brother_teams = list() + var/const/min_team_size = 2 + +/datum/dynamic_ruleset/minor/traitorbro/execute() + if(candidates.len < min_team_size || candidates.len < required_candidates) + return FALSE + var/datum/team/brother_team/team = new + var/team_size = prob(10) ? min(3, candidates.len) : 2 + for(var/k = 1 to team_size) + var/mob/bro = pick_n_take(candidates) + assigned += bro.mind + team.add_member(bro.mind) + bro.mind.special_role = "brother" + bro.mind.restricted_roles = restricted_roles + team.pick_meeting_area() + team.forge_brother_objectives() + for(var/datum/mind/M in team.members) + M.add_antag_datum(/datum/antagonist/brother, team) + team.update_name() + mode.brother_teams += team + +////////////////////////////////////////////// +// // +// CHANGELINGS // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/changeling + name = "Changelings" + config_tag = "changeling" + antag_flag = ROLE_CHANGELING + antag_datum = /datum/antagonist/changeling + restricted_roles = list("AI", "Cyborg") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + required_candidates = 1 + weight = 3 + cost = 15 + scaling_cost = 15 + requirements = list(101,101,101,101,101,101,101,101,101,101) + property_weights = list("trust" = -2, "valid" = 2) + high_population_requirement = 10 + antag_cap = list(1,1,1,1,1,2,2,2,2,3) + var/team_mode_probability = 30 + +/datum/dynamic_ruleset/minor/changeling/execute() + var/mob/M = pick_n_take(candidates) + assigned += M.mind + M.mind.restricted_roles = restricted_roles + M.mind.special_role = ROLE_CHANGELING + var/datum/antagonist/changeling/new_antag = new antag_datum() + M.mind.add_antag_datum(new_antag) + return TRUE + +////////////////////////////////////////////// +// // +// ELDRITCH CULT // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/heretics + name = "Heretic" + antag_flag = "heretic" + antag_datum = /datum/antagonist/heretic + protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") + restricted_roles = list("AI", "Cyborg") + required_candidates = 1 + weight = 3 + cost = 25 + scaling_cost = 15 + requirements = list(60,60,60,55,50,50,50,50,50,50) + property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2) + antag_cap = list(1,1,1,1,2,2,2,2,3,3) + high_population_requirement = 50 + + +/datum/dynamic_ruleset/minor/heretics/pre_execute() + var/mob/picked_candidate = pick_n_take(candidates) + assigned += picked_candidate.mind + picked_candidate.mind.restricted_roles = restricted_roles + picked_candidate.mind.special_role = ROLE_HERETIC + var/datum/antagonist/heretic/new_antag = new antag_datum() + picked_candidate.mind.add_antag_datum(new_antag) + return TRUE + +////////////////////////////////////////////// +// // +// DEVIL // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/devil + name = "Devil" + config_tag = "devil" + antag_flag = ROLE_DEVIL + antag_datum = /datum/antagonist/devil + restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI") + required_candidates = 1 + weight = 3 + cost = 0 + requirements = list(101,101,101,101,101,101,101,101,101,101) + high_population_requirement = 101 + antag_cap = list(1,1,1,2,2,2,3,3,3,4) + property_weights = list("extended" = 1) + +/datum/dynamic_ruleset/minor/devil/pre_execute() + var/mob/devil = pick_n_take(candidates) + assigned += devil.mind + devil.mind.special_role = ROLE_DEVIL + devil.mind.restricted_roles = restricted_roles + + log_game("[key_name(devil)] has been selected as a devil") + add_devil(devil, ascendable = TRUE) + add_devil_objectives(devil.mind,2) + return TRUE + +/datum/dynamic_ruleset/minor/devil/proc/add_devil_objectives(datum/mind/devil_mind, quantity) + var/list/validtypes = list(/datum/objective/devil/soulquantity, /datum/objective/devil/soulquality, /datum/objective/devil/sintouch, /datum/objective/devil/buy_target) + var/datum/antagonist/devil/D = devil_mind.has_antag_datum(/datum/antagonist/devil) + for(var/i = 1 to quantity) + var/type = pick(validtypes) + var/datum/objective/devil/objective = new type(null) + objective.owner = devil_mind + D.objectives += objective + if(!istype(objective, /datum/objective/devil/buy_target)) + validtypes -= type + else + objective.find_target() + +////////////////////////////////////////////// +// // +// BLOODSUCKERS // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/minor/bloodsucker + name = "Bloodsuckers" + config_tag = "bloodsucker" + antag_flag = ROLE_BLOODSUCKER + antag_datum = ANTAG_DATUM_BLOODSUCKER + minimum_required_age = 0 + protected_roles = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + restricted_roles = list("Cyborg", "AI") + required_candidates = 1 + weight = 2 + cost = 15 + scaling_cost = 10 + property_weights = list("story_potential" = 1, "extended" = 1, "trust" = -2, "valid" = 1) + requirements = list(70,65,60,55,50,50,50,50,50,50) + high_population_requirement = 50 + +/datum/dynamic_ruleset/minor/bloodsucker/execute() + var/mob/M = pick_n_take(candidates) + assigned += M.mind + M.mind.special_role = ROLE_BLOODSUCKER + M.mind.restricted_roles = restricted_roles + mode.check_start_sunlight() + if(mode.make_bloodsucker(M.mind)) + mode.bloodsuckers += M.mind + return TRUE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index db4ec99558..c5e0857461 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -15,6 +15,7 @@ protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Cyborg") restricted_roles = list("Cyborg", "AI") required_candidates = 1 + flags = TRAITOR_RULESET | MINOR_RULESET | ALWAYS_MAX_WEIGHT_RULESET weight = 5 cost = 10 // Avoid raising traitor threat above 10, as it is the default low cost ruleset. scaling_cost = 10 @@ -22,7 +23,6 @@ high_population_requirement = 40 antag_cap = list(1,1,1,1,2,2,2,2,3,3) property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 1, "valid" = 1) - always_max_weight = TRUE var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) /datum/dynamic_ruleset/roundstart/traitor/pre_execute() @@ -57,6 +57,7 @@ restricted_roles = list("AI", "Cyborg") protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 2 + flags = MINOR_RULESET weight = 4 cost = 10 requirements = list(101,101,101,101,101,101,101,101,101,101) @@ -106,6 +107,7 @@ restricted_roles = list("AI", "Cyborg") protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_candidates = 1 + flags = MINOR_RULESET weight = 3 cost = 15 scaling_cost = 15 @@ -156,6 +158,7 @@ protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain") restricted_roles = list("AI", "Cyborg") required_candidates = 1 + flags = MINOR_RULESET weight = 3 cost = 25 scaling_cost = 15 @@ -694,6 +697,7 @@ antag_datum = /datum/antagonist/devil restricted_roles = list("Lawyer", "Curator", "Chaplain", "Head of Security", "Captain", "AI") required_candidates = 1 + flags = MINOR_RULESET weight = 3 cost = 0 requirements = list(101,101,101,101,101,101,101,101,101,101) @@ -850,6 +854,7 @@ protected_roles = list("Chaplain", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") restricted_roles = list("Cyborg", "AI") required_candidates = 1 + flags = MINOR_RULESET weight = 2 cost = 15 scaling_cost = 10 diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm index 04e295356a..d5766b287e 100644 --- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm +++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm @@ -32,6 +32,9 @@ Property weights are added to the config weight of the ruleset. They are: "conversion" -- Basically a bool. Conversion antags, well, convert. It's in its own class 'cause people kinda hate conversion. */ +/datum/dynamic_storyteller/proc/minor_start_chance() + return clamp(60 - mode.threat_level,0,100) // by default higher threat = lower chance of minor round + /datum/dynamic_storyteller/proc/start_injection_cooldowns() var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_first_latejoin_delay_max + GLOB.dynamic_first_latejoin_delay_min) mode.latejoin_injection_cooldown = round(clamp(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_first_latejoin_delay_min, GLOB.dynamic_first_latejoin_delay_max)) + world.time @@ -104,8 +107,27 @@ Property weights are added to the config weight of the ruleset. They are: /datum/dynamic_storyteller/proc/roundstart_draft() var/list/drafted_rules = list() + var/minor_round_weight_mult = (100-minor_start_chance()) / 100 for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules) if (rule.acceptable(mode.roundstart_pop_ready, mode.threat_level)) // If we got the population and threat required + rule.candidates = mode.candidates.Copy() + rule.trim_candidates() + if (rule.ready() && rule.candidates.len > 0) + var/property_weight = 0 + for(var/property in property_weights) + if(property in rule.property_weights) // just treat it as 0 if it's not in there + property_weight += rule.property_weights[property] * property_weights[property] + var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult + if(CHECK_BITFIELD(rule.flags, MINOR_RULESET)) + calced_weight *= minor_round_weight_mult + if(calced_weight > 0) // negatives in the list might cause problems + drafted_rules[rule] = calced_weight + return drafted_rules + +/datum/dynamic_storyteller/proc/minor_rule_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/minor/rule in mode.minor_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) rule.candidates = mode.candidates.Copy() rule.trim_candidates() if (rule.ready() && rule.candidates.len > 0) @@ -124,7 +146,7 @@ Property weights are added to the config weight of the ruleset. They are: // if there are antags OR the rule is an antag rule, antag_acceptable will be true. if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET))) continue rule.trim_candidates() if (rule.ready()) @@ -133,7 +155,7 @@ Property weights are added to the config weight of the ruleset. They are: if(property in rule.property_weights) // just treat it as 0 if it's not in there property_weight += rule.property_weights[property] * property_weights[property] var/threat_weight = 1 - if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway + if(!(rule.flags & TRAITOR_RULESET)) // makes the traitor rulesets always possible anyway var/cost_difference = rule.cost-(mode.threat_level-mode.threat) /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to pick this particular ruleset. @@ -157,7 +179,7 @@ Property weights are added to the config weight of the ruleset. They are: for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level - mode.threat)) // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET))) continue // No stacking : only one round-ender, unless threat level > stacking_limit. if (mode.threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) @@ -172,7 +194,7 @@ Property weights are added to the config weight of the ruleset. They are: if(property in rule.property_weights) property_weight += rule.property_weights[property] * property_weights[property] var/threat_weight = 1 - if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) + if(!(rule.flags & TRAITOR_RULESET)) var/cost_difference = rule.cost-(mode.threat_level-mode.threat) threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0))) if(cost_difference > 0) @@ -195,6 +217,9 @@ Property weights are added to the config weight of the ruleset. They are: min_players = 30 var/refund_cooldown = 0 +/datum/dynamic_storyteller/chaotic/minor_start_chance() + return 0 + /datum/dynamic_storyteller/chaotic/do_process() if(refund_cooldown < world.time) mode.create_threat(20) @@ -215,6 +240,9 @@ Property weights are added to the config weight of the ruleset. They are: flags = WAROPS_ALWAYS_ALLOWED | USE_PREV_ROUND_WEIGHTS property_weights = list("valid" = 3, "trust" = 5) +/datum/dynamic_storyteller/chaotic/minor_start_chance() + return 0 + /datum/dynamic_storyteller/team/should_inject_antag(dry_run = FALSE) return (mode.current_players[CURRENT_LIVING_ANTAGS].len ? FALSE : ..()) @@ -228,6 +256,9 @@ Property weights are added to the config weight of the ruleset. They are: flags = WAROPS_ALWAYS_ALLOWED property_weights = list("valid" = 1, "conversion" = 20) +/datum/dynamic_storyteller/chaotic/minor_start_chance() + return 0 + /datum/dynamic_storyteller/random name = "Random" config_tag = "random" @@ -244,6 +275,9 @@ Property weights are added to the config weight of the ruleset. They are: /datum/dynamic_storyteller/random/should_inject_antag() return prob(50) +/datum/dynamic_storyteller/chaotic/minor_start_chance() + return 20 + /datum/dynamic_storyteller/random/roundstart_draft() var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/roundstart/rule in mode.roundstart_rules) @@ -254,12 +288,22 @@ Property weights are added to the config weight of the ruleset. They are: drafted_rules[rule] = 1 return drafted_rules +/datum/dynamic_storyteller/random/minor_rule_draft() + var/list/drafted_rules = list() + for (var/datum/dynamic_ruleset/minor/rule in mode.minor_rules) + if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) + rule.candidates = mode.candidates.Copy() + rule.trim_candidates() + if (rule.ready() && rule.candidates.len > 0) + drafted_rules[rule] = 1 + return drafted_rules + /datum/dynamic_storyteller/random/midround_draft() var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/midround/rule in mode.midround_rules) if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET))) continue rule.trim_candidates() if (rule.ready()) @@ -271,7 +315,7 @@ Property weights are added to the config weight of the ruleset. They are: for (var/datum/dynamic_ruleset/latejoin/rule in mode.latejoin_rules) if (rule.acceptable(mode.current_players[CURRENT_LIVING_PLAYERS].len, mode.threat_level)) // Classic secret : only autotraitor/minor roles - if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))) + if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET))) continue // No stacking : only one round-ender, unless threat level > stacking_limit. if (mode.threat_level > GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking) @@ -286,7 +330,7 @@ Property weights are added to the config weight of the ruleset. They are: /datum/dynamic_storyteller/story name = "Story" config_tag = "story" - desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies. Has a buildup-climax-falling action threat curve." + desc = "Antags with options for loadouts and gimmicks. Traitor, wizard, nukies." weight = 2 curve_width = 2 flags = USE_PREV_ROUND_WEIGHTS @@ -308,6 +352,19 @@ Property weights are added to the config weight of the ruleset. They are: flags = USE_PREV_ROUND_WEIGHTS property_weights = list("trust" = -2) +/datum/dynamic_storyteller/intrigue/minor_start_chance() + return 100 - mode.threat_level + +/datum/dynamic_storyteller/grabbag + name = "Grab Bag" + config_tag = "grabbag" + desc = "Crew antags (e.g. traitor, changeling, bloodsucker, heretic) only, all mixed together." + weight = 2 + flags = USE_PREF_WEIGHTS | USE_PREV_ROUND_WEIGHTS + +/datum/dynamic_storyteller/grabbag/minor_start_chance() + return 100 + /datum/dynamic_storyteller/liteextended name = "Calm" config_tag = "calm" @@ -319,6 +376,9 @@ Property weights are added to the config weight of the ruleset. They are: dead_player_weight = 5 property_weights = list("extended" = 2, "chaos" = -1, "valid" = -1, "conversion" = -10) +/datum/dynamic_storyteller/liteextended/minor_start_chance() + return 100 + /datum/dynamic_storyteller/no_antag name = "Extended" config_tag = "semiextended" diff --git a/code/game/gamemodes/gangs/dominator_countdown.dm b/code/game/gamemodes/gangs/dominator_countdown.dm index c6ae610e37..3b61a07829 100644 --- a/code/game/gamemodes/gangs/dominator_countdown.dm +++ b/code/game/gamemodes/gangs/dominator_countdown.dm @@ -10,4 +10,4 @@ else if(D.gang && D.gang.domination_time != NOT_DOMINATING) return D.gang.domination_time_remaining() else - return "OFFLINE" \ No newline at end of file + return "OFFLINE" diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index a766dda57c..a4483ca3b8 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -197,7 +197,7 @@ if(gangtool)//Here is where all of the text occurs when a gang boss first spawns in. var/obj/item/device/gangtool/G = new() - var/where = H.equip_in_one_of_slots(G, slots) + var/where = H.equip_in_one_of_slots(G, slots, critical = TRUE) if (!where) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a Gangtool.") else @@ -207,7 +207,7 @@ if(pen) var/obj/item/pen/gang/T = new() - var/where2 = H.equip_in_one_of_slots(T, slots) + var/where2 = H.equip_in_one_of_slots(T, slots, critical = TRUE) if (!where2) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a recruitment pen to start.") else @@ -215,7 +215,7 @@ if(spraycan) var/obj/item/toy/crayon/spraycan/gang/SC = new(null,gang) - var/where3 = H.equip_in_one_of_slots(SC, slots) + var/where3 = H.equip_in_one_of_slots(SC, slots, critical = TRUE) if (!where3) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a territory spraycan to start.") else @@ -223,7 +223,7 @@ if(hud) var/obj/item/clothing/glasses/hud/security/chameleon/C = new(null,gang) - var/where4 = H.equip_in_one_of_slots(C, slots) + var/where4 = H.equip_in_one_of_slots(C, slots, critical = TRUE) if (!where4) to_chat(H, "Your Syndicate benefactors were unfortunately unable to get you a chameleon security HUD.") else diff --git a/code/game/gamemodes/gangs/gang_decals.dm b/code/game/gamemodes/gangs/gang_decals.dm index a37b4cb63b..75d8d459ef 100644 --- a/code/game/gamemodes/gangs/gang_decals.dm +++ b/code/game/gamemodes/gangs/gang_decals.dm @@ -35,4 +35,4 @@ return ..() /obj/effect/decal/cleanable/crayon/NeverShouldHaveComeHere(turf/T) - return isspaceturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T) \ No newline at end of file + return isspaceturf(T) || islava(T) || istype(T, /turf/open/water) || ischasm(T) diff --git a/code/game/gamemodes/gangs/gang_hud.dm b/code/game/gamemodes/gangs/gang_hud.dm index 3fde6d4123..825d361ab0 100644 --- a/code/game/gamemodes/gangs/gang_hud.dm +++ b/code/game/gamemodes/gangs/gang_hud.dm @@ -31,4 +31,4 @@ var/image/holder = M.hud_list[ANTAG_HUD] if(holder) holder.color = null - ..() \ No newline at end of file + ..() diff --git a/code/game/gamemodes/gangs/gang_pen.dm b/code/game/gamemodes/gangs/gang_pen.dm index b7bd6cca5e..09cea5cecb 100644 --- a/code/game/gamemodes/gangs/gang_pen.dm +++ b/code/game/gamemodes/gangs/gang_pen.dm @@ -56,4 +56,4 @@ H.silent = max(H.silent, 5) H.DefaultCombatKnockdown(100) gangster_mind.add_antag_datum(/datum/antagonist/gang, gang) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/gamemodes/gangs/gangtool.dm b/code/game/gamemodes/gangs/gangtool.dm index e99455bcd5..32272ae51a 100644 --- a/code/game/gamemodes/gangs/gangtool.dm +++ b/code/game/gamemodes/gangs/gangtool.dm @@ -256,4 +256,4 @@ outfits = TRUE /obj/item/device/gangtool/spare/lt - promotable = TRUE \ No newline at end of file + promotable = TRUE diff --git a/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm index ee91928845..cad54d4fc1 100644 --- a/code/game/gamemodes/gangs/implant_gang.dm +++ b/code/game/gamemodes/gangs/implant_gang.dm @@ -58,4 +58,4 @@ qdel(src) return imp = new /obj/item/implant/gang(src,gang) - .=..() \ No newline at end of file + .=..() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a8ed4611eb..d8617e0b48 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -166,7 +166,7 @@ If not set, defaults to check_completion instead. Set it. It's used by cryo. var/list/slots = list("backpack" = SLOT_IN_BACKPACK) for(var/eq_path in special_equipment) var/obj/O = new eq_path - H.equip_in_one_of_slots(O, slots) + H.equip_in_one_of_slots(O, slots, critical = TRUE) /datum/objective/assassinate name = "assasinate" @@ -1152,7 +1152,7 @@ GLOBAL_LIST_EMPTY(cult_contraband) I.forceMove(get_turf(owner)) if(ishuman(owner)) var/mob/living/carbon/human/H = owner - H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK)) + H.equip_in_one_of_slots(I, list("backpack" = SLOT_IN_BACKPACK), critical = TRUE) hoarded_item = I diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index bced9db61f..06e1635656 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -145,8 +145,8 @@ /obj/machinery/sleeper/ui_state(mob/user) if(controls_inside) - return GLOB.contained_state - return GLOB.default_state + return GLOB.default_state + return GLOB.notcontained_state /obj/machinery/sleeper/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) @@ -209,6 +209,7 @@ data["occupant"]["fireLoss"] = mob_occupant.getFireLoss() data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss() data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN) + data["occupant"]["is_robotic_organism"] = HAS_TRAIT(mob_occupant, TRAIT_ROBOTIC_ORGANISM) data["occupant"]["reagents"] = list() if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len) for(var/datum/reagent/R in mob_occupant.reagents.reagent_list) diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index da82b0afc7..f46169f72e 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -114,7 +114,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) . = ..() if(.) return - if(!usr.canUseTopic(src, !issilicon(usr))) + if(!usr.canUseTopic(src, !hasSiliconAccessInArea(usr))) return if(stat & BROKEN) visible_message("[src] buzzes.", "You hear a faint buzz.") @@ -147,7 +147,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) . = attack_ai(user) /obj/machinery/announcement_system/attack_ai(mob/user) - if(!user.canUseTopic(src, !issilicon(user))) + if(!user.canUseTopic(src, !hasSiliconAccessInArea(user))) return if(stat & BROKEN) to_chat(user, "[src]'s firmware appears to be malfunctioning!") @@ -167,7 +167,9 @@ GLOBAL_LIST_EMPTY(announcement_systems) act_up() /obj/machinery/announcement_system/emag_act() + . = ..() if(obj_flags & EMAGGED) return obj_flags |= EMAGGED act_up() + return TRUE diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index a2fdc2336f..b837553b38 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -88,6 +88,7 @@ data["patient"]["fireLoss"] = patient.getFireLoss() data["patient"]["toxLoss"] = patient.getToxLoss() data["patient"]["oxyLoss"] = patient.getOxyLoss() + data["patient"]["is_robotic_organism"] = HAS_TRAIT(patient, TRAIT_ROBOTIC_ORGANISM) if(patient.surgeries.len) data["procedures"] = list() for(var/datum/surgery/procedure in patient.surgeries) diff --git a/code/game/machinery/computer/arcade/battle.dm b/code/game/machinery/computer/arcade/battle.dm index a6c98c6c9c..5a0f0e9acf 100644 --- a/code/game/machinery/computer/arcade/battle.dm +++ b/code/game/machinery/computer/arcade/battle.dm @@ -212,4 +212,4 @@ name = "Outbomb Cuban Pete" updateUsrDialog() - return TRUE \ No newline at end of file + return TRUE diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index fa6d4327a4..fc7bec7134 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -69,4 +69,4 @@ return 0 if(B.scrambledcodes || B.emagged) return 0 - return ..() \ No newline at end of file + return ..() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 401d05da12..9b911e9c15 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -21,6 +21,9 @@ return if(R.scrambledcodes) return + if(hasSiliconAccessInArea(user) && !issilicon(user)) + if(!Adjacent(user)) + return return TRUE /obj/machinery/computer/robotics/ui_interact(mob/user, datum/tgui/ui) @@ -40,6 +43,10 @@ else if(IsAdminGhost(user)) data["can_hack"] = TRUE + data["can_convert"] = FALSE + if(isAI(user) && is_servant_of_ratvar(user)) + data["can_convert"] = TRUE + data["cyborgs"] = list() for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs) if(!can_control(user, R)) @@ -54,6 +61,7 @@ module = R.module ? "[R.module.name] Module" : "No Module Detected", synchronization = R.connected_ai, emagged = R.emagged, + servant = is_servant_of_ratvar(R), ref = REF(R) ) data["cyborgs"] += list(cyborg_data) @@ -110,6 +118,13 @@ log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!") message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!") R.SetEmagged(TRUE) + if("convert") + if(isAI(usr) && is_servant_of_ratvar(usr)) + var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs + if(istype(R) && !is_servant_of_ratvar(R) && R.connected_ai == usr) + log_game("[key_name(usr)] converted [key_name(R)] using robotic console!") + message_admins("[ADMIN_LOOKUPFLW(usr)] converted cyborg [key_name_admin(R)] using robotic console!") + add_servant_of_ratvar(R) if("killdrone") if(allowed(usr)) var/mob/living/simple_animal/drone/D = locate(params["ref"]) in GLOB.mob_list diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index e721e986d2..0dcb0e7235 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -32,6 +32,8 @@ . = ..() if(in_range(user, src) || isobserver(user)) . += "The status display reads: Radiation pulse accuracy increased by factor [precision_coeff**2].
Radiation pulse damage decreased by factor [damage_coeff**2]." + if(scan_level >= 3) + . += "Scanner has been upgraded to support autoprocessing." /obj/machinery/dna_scannernew/update_icon_state() //no power or maintenance @@ -94,6 +96,13 @@ ..(user) +// search for ghosts, if the corpse is empty and the scanner is connected to a cloner + var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) + if(istype(mob_occupant)) + if(locate_computer(/obj/machinery/computer/cloning)) + if(!mob_occupant.suiciding && !(HAS_TRAIT(mob_occupant, TRAIT_NOCLONE)) && !mob_occupant.hellbound) + mob_occupant.notify_ghost_cloning("Your corpse has been placed into a cloning scanner. Re-enter your corpse if you want to be cloned!", source = src) + // DNA manipulators cannot operate on severed heads or brains if(iscarbon(occupant)) if(linked_console) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 515a4672a5..9ef34390f6 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1457,6 +1457,16 @@ ui.open() return TRUE +/obj/machinery/door/airlock/ui_status(mob/user) + . = ..() + if (!issilicon(user) && hasSiliconAccessInArea(user)) + . = UI_INTERACTIVE + +/obj/machinery/door/airlock/can_interact(mob/user) + . = ..() + if (!issilicon(user) && hasSiliconAccessInArea(user)) + return TRUE + /obj/machinery/door/airlock/ui_data() var/list/data = list() diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index fe2bdf90b1..8941c540ae 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -508,7 +508,7 @@ /obj/machinery/door/airlock/cult/allowed(mob/living/L) if(!density) return 1 - if(friendly || iscultist(L) || istype(L, /mob/living/simple_animal/shade) || isconstruct(L)) + if(friendly || iscultist(L) || isshade(L) || isconstruct(L)) if(!stealthy) new openingoverlaytype(loc) return 1 diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 42649a9ff2..a563200575 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -40,4 +40,4 @@ close() if("minor", "clear") autoclose = FALSE - open() \ No newline at end of file + open() diff --git a/code/game/machinery/doors/checkForMultipleDoors.dm b/code/game/machinery/doors/checkForMultipleDoors.dm index 35a944c965..73a9edde6f 100644 --- a/code/game/machinery/doors/checkForMultipleDoors.dm +++ b/code/game/machinery/doors/checkForMultipleDoors.dm @@ -13,4 +13,4 @@ if(!istype(D, /obj/machinery/door/window) && D.density) return 0 //There are no false wall checks because that would be fucking - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/doors/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm index 60652981cf..1ec5b3c373 100644 --- a/code/game/machinery/doors/passworddoor.dm +++ b/code/game/machinery/doors/passworddoor.dm @@ -70,4 +70,4 @@ return /obj/machinery/door/password/ex_act(severity, target) - return \ No newline at end of file + return diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm index 828624adb4..6e9d7f9561 100644 --- a/code/game/machinery/doors/unpowered.dm +++ b/code/game/machinery/doors/unpowered.dm @@ -19,4 +19,4 @@ icon_state = "door1" opacity = 1 density = TRUE - explosion_block = 1 \ No newline at end of file + explosion_block = 1 diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 3cd2011334..bed006d0b5 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -55,6 +55,7 @@ icon_state = "[src.base_state]open" /obj/machinery/door/window/update_atom_colour() + . = ..() if((color && (color_hex2num(color) < 255))) visible = TRUE if(density) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index a9c411c634..4f27e38a14 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -187,4 +187,4 @@ GLOBAL_LIST_EMPTY(doppler_arrays) /obj/machinery/doppler_array/research/science/Initialize() . = ..() - linked_techweb = SSresearch.science_tech \ No newline at end of file + linked_techweb = SSresearch.science_tech diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index ea39133112..125c6692f3 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -312,4 +312,4 @@ [state_options]"} - return output \ No newline at end of file + return output diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 0b89b117c4..b39c6d350f 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -48,4 +48,4 @@ if(isliving(O)) var/mob/living/L = O to_chat(L, "You feel something click beneath you!") - addtimer(CALLBACK(src, .proc/drive), drive_delay) \ No newline at end of file + addtimer(CALLBACK(src, .proc/drive), drive_delay) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 04fd5f6af5..a0440001c3 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -28,10 +28,10 @@ if(!do_after(user, 30 SECONDS, TRUE, src)) to_chat(user, "Your fingers slip as you fail to pry the [stored] from the [src], clicking it right back into the slot!") return - if(user.put_in_hands(stored)) - stored.forceMove(user.drop_location()) + user.put_in_hands(stored) + to_chat(user, "You successfully pry the [stored] from the [src]\ + [user.is_holding(stored) ? "" : ", and send its overwhelming weight tumbling onto the ground"]! The tapes on the [src] stop spinning...") stored = null - to_chat(user, "You successfully pry the [stored] from the [src], and send its overwhelming weight tumbling onto the ground! The tapes on the [src] stop spinning...") update_icon() return else @@ -41,7 +41,7 @@ /obj/machinery/blackbox_recorder/attackby(obj/item/I, mob/living/user, params) . = ..() if(istype(I, /obj/item/blackbox)) - if(HAS_TRAIT(I, TRAIT_NODROP) || !user.transferItemToLoc(I, src)) + if(!user.transferItemToLoc(I, src)) to_chat(user, "[I] is stuck to your hand!") return user.visible_message("[user] clicks the [I] into the [src]!", \ diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 8a4a2fdd9b..f9a86066ff 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -8,4 +8,4 @@ for(var/obj/item/I in equipment) if(istype(I, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/)) var/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gun = I - gun.projectiles_cache = gun.projectiles_cache_max \ No newline at end of file + gun.projectiles_cache = gun.projectiles_cache_max diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index 7c7c6be2bc..06e4208d71 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -172,4 +172,4 @@ mineral_scan_pulse(get_turf(src)) #undef DRILL_BASIC -#undef DRILL_HARDENED \ No newline at end of file +#undef DRILL_HARDENED diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index 5df90d65c7..6db28b3700 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -24,4 +24,4 @@ /obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination) if(channel == TELEPORT_CHANNEL_CULT) - return COMPONENT_BLOCK_TELEPORT \ No newline at end of file + return COMPONENT_BLOCK_TELEPORT diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index fa4bfe7e67..875f23434b 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -74,4 +74,4 @@ /obj/effect/decal/cleanable/blood/xtracks/Initialize() add_blood_DNA(list("UNKNOWN DNA" = "X*")) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 85c2c78abb..7b5b4d9b4e 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -235,4 +235,4 @@ icon_state = "trimline_corner_fill" /obj/effect/turf_decal/trimline/neutral/filled/end - icon_state = "trimline_end_fill" \ No newline at end of file + icon_state = "trimline_end_fill" diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index b75df644eb..4304fc3c9c 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -160,13 +160,13 @@ /obj/effect/spawner/bundle/costume/sexyclown name = "sexy clown costume spawner" items = list( - /obj/item/clothing/mask/gas/sexyclown, + /obj/item/clothing/mask/gas/clown_hat/sexy, /obj/item/clothing/under/rank/civilian/clown/sexy) /obj/effect/spawner/bundle/costume/sexymime name = "sexy mime costume spawner" items = list( - /obj/item/clothing/mask/gas/sexymime, + /obj/item/clothing/mask/gas/mime/sexy, /obj/item/clothing/under/rank/civilian/mime/sexy) /obj/effect/spawner/bundle/crate/Initialize(mapload) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 6564a83729..bacbf3c388 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -464,7 +464,7 @@ /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 2, /obj/effect/spawner/lootdrop/space_cash/no_turf = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/box/dice = 5, + /obj/item/storage/dice = 5, /obj/item/toy/cards/deck = 5, /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5 ) @@ -483,7 +483,7 @@ /obj/effect/spawner/lootdrop/cig_packs/no_turf = 10, /obj/effect/spawner/lootdrop/cigars_cases/no_turf = 5, /obj/item/reagent_containers/food/snacks/grown/cannabis = 5, - /obj/item/storage/box/dice = 5, + /obj/item/storage/dice = 5, /obj/item/toy/cards/deck = 5, /obj/effect/spawner/lootdrop/druggie_pill/no_turf = 5, /obj/item/kitchen/knife = 5, diff --git a/code/game/objects/effects/spawners/traps.dm b/code/game/objects/effects/spawners/traps.dm index 82cfe89662..731b4efc1d 100644 --- a/code/game/objects/effects/spawners/traps.dm +++ b/code/game/objects/effects/spawners/traps.dm @@ -7,4 +7,4 @@ ..() var/new_type = pick(subtypesof(/obj/structure/trap) - typesof(/obj/structure/trap/ctf)) new new_type(get_turf(src)) - return INITIALIZE_HINT_QDEL \ No newline at end of file + return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 8fd2ed2377..da5ab1a5a5 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -93,7 +93,7 @@ RSF use_matter(50, user) if(4) to_chat(user, "Dispensing Dice Pack...") - new /obj/item/storage/box/dice(T) + new /obj/item/storage/dice(T) use_matter(200, user) if(5) to_chat(user, "Dispensing Cigarette...") diff --git a/code/game/objects/items/chromosome.dm b/code/game/objects/items/chromosome.dm index 8330a8e202..3acf3cfe5c 100644 --- a/code/game/objects/items/chromosome.dm +++ b/code/game/objects/items/chromosome.dm @@ -89,4 +89,4 @@ /obj/item/chromosome/reinforcer/apply(datum/mutation/human/HM) HM.mutadone_proof = TRUE - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 2fa48582f7..9a1c770417 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -297,6 +297,10 @@ name = "Mining Shuttle (Computer Board)" build_path = /obj/machinery/computer/shuttle/mining +/obj/item/circuitboard/computer/mining_shuttle/common + name = "Lavaland Shuttle (Computer Board)" + build_path = /obj/machinery/computer/shuttle/mining/common + /obj/item/circuitboard/computer/snow_taxi name = "Snow Taxi (Computer Board)" build_path = /obj/machinery/computer/shuttle/snow_taxi diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index c98484b81e..be39bb6973 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -100,4 +100,4 @@ #undef WAND_OPEN #undef WAND_BOLT -#undef WAND_EMERGENCY \ No newline at end of file +#undef WAND_EMERGENCY diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 4777796331..ecc8f9187a 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -616,7 +616,7 @@ if(defib.healdisk) H.heal_overall_damage(25, 25) var/list/policies = CONFIG_GET(keyed_list/policyconfig) - var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) + var/timelimit = CONFIG_GET(number/defib_cmd_time_limit) * 10 //the config is in seconds, not deciseconds var/late = timelimit && (tplus > timelimit) var/policy = late? policies[POLICYCONFIG_ON_DEFIB_LATE] : policies[POLICYCONFIG_ON_DEFIB_INTACT] if(policy) diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index e3385dc13f..2cb4922f36 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -91,4 +91,4 @@ return ..() /obj/effect/abstract/sync_holder/AllowDrop() - return TRUE //no dropping spaghetti out of your spacetime pocket \ No newline at end of file + return TRUE //no dropping spaghetti out of your spacetime pocket diff --git a/code/game/objects/items/devices/glue.dm b/code/game/objects/items/devices/glue.dm index 2c57ede706..42fbecc780 100644 --- a/code/game/objects/items/devices/glue.dm +++ b/code/game/objects/items/devices/glue.dm @@ -29,4 +29,4 @@ if(uses == 0) icon_state = "glue_used" name = "empty bottle of super glue" - return \ No newline at end of file + return diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 915fcac504..365446bad9 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -62,4 +62,4 @@ name = "clown's megaphone" desc = "Something that should not exist." icon_state = "megaphone-clown" - voicespan = list(SPAN_CLOWN) \ No newline at end of file + voicespan = list(SPAN_CLOWN) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 7a8a523a18..c02eb4a051 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -21,13 +21,13 @@ force = 5 w_class = WEIGHT_CLASS_SMALL tool_behaviour = TOOL_MULTITOOL + item_flags = SURGICAL_TOOL throwforce = 0 throw_range = 7 throw_speed = 3 custom_materials = list(/datum/material/iron=50, /datum/material/glass=20) var/obj/machinery/buffer // simple machine buffer for device linkage toolspeed = 1 - tool_behaviour = TOOL_MULTITOOL usesound = 'sound/weapons/empty.ogg' var/datum/integrated_io/selected_io = null //functional for integrated circuits. var/mode = 0 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index db29614f20..d9bfa4b00e 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -155,7 +155,7 @@ GENETICS SCANNER if(oxy_loss > 10) msg += "\n\t[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected." if(tox_loss > 10) - msg += "\n\t[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected." + msg += "\n\t[tox_loss > 50 ? "Severe" : "Minor"] amount of [HAS_TRAIT(M, TRAIT_ROBOTIC_ORGANISM) ? "system corruption" : "toxin damage"] detected." if(M.getStaminaLoss()) msg += "\n\tSubject appears to be suffering from fatigue." if(advanced) @@ -182,7 +182,7 @@ GENETICS SCANNER Damage:\ Brute\ Burn\ - Toxin\ + [HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) ? "Corruption" :"Toxin"]\ Suffocation\ Overall:\ [brute_loss]\ @@ -628,9 +628,9 @@ GENETICS SCANNER var/turf/location = get_turf(user) if(!istype(location)) return - + scan_turf(user, location) - + /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens . = ..() diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 2fe4c67362..bbc493672f 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -1,39 +1,38 @@ -/obj/item/storage/box/dice +/*****************************Dice Bags********************************/ + +/obj/item/storage/dice name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' icon_state = "dicebag" + w_class = WEIGHT_CLASS_SMALL + var/list/special_die = list( + /obj/item/dice/d1, + /obj/item/dice/d2, + /obj/item/dice/fudge, + /obj/item/dice/d6/space, + /obj/item/dice/d00, + /obj/item/dice/eightbd20, + /obj/item/dice/fourdd6, + /obj/item/dice/d100 + ) -/obj/item/storage/box/dice/Initialize() - . = ..() - var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100") - if(special_die == "1") - new /obj/item/dice/d1(src) - if(special_die == "2") - new /obj/item/dice/d2(src) +/obj/item/storage/dice/PopulateContents() new /obj/item/dice/d4(src) new /obj/item/dice/d6(src) - if(special_die == "fudge") - new /obj/item/dice/fudge(src) - if(special_die == "space") - new /obj/item/dice/d6/space(src) new /obj/item/dice/d8(src) new /obj/item/dice/d10(src) - if(special_die == "00") - new /obj/item/dice/d00(src) new /obj/item/dice/d12(src) new /obj/item/dice/d20(src) - if(special_die == "8bd20") - new /obj/item/dice/eightbd20(src) - if(special_die == "4dd6") - new /obj/item/dice/fourdd6(src) - if(special_die == "100") - new /obj/item/dice/d100(src) + var/picked = pick(special_die) + new picked(src) -/obj/item/storage/box/dice/suicide_act(mob/user) +/obj/item/storage/dice/suicide_act(mob/user) user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) +/*****************************Dice********************************/ + /obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 name = "die" desc = "A die with six sides. Basic and serviceable." diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 8054d8c6a4..a9ed94aae9 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -8,6 +8,15 @@ * Gifts */ +GLOBAL_LIST_INIT(gift_item_blacklist, typecacheof(list( + /obj/effect, + /obj/belly, + /obj/mafia_game_board, + /obj/docking_port, + /obj/shapeshift_holder, + /obj/screen + ))) + GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/a_gift @@ -95,7 +104,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/list/gift_types_list = subtypesof(/obj/item) for(var/V in gift_types_list) var/obj/item/I = V - if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT)) + if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, GLOB.gift_item_blacklist))) gift_types_list -= V GLOB.possible_gifts = gift_types_list var/gift_type = pick(GLOB.possible_gifts) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 58146be20f..a15e1368d8 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -492,7 +492,7 @@ var/possessed = FALSE /obj/item/nullrod/scythe/talking/process() - for(var/mob/living/simple_animal/shade/S in contents) + for(var/mob/living/simple_animal/hostile/construct/shade/S in contents) if(S.mind) return else @@ -516,7 +516,7 @@ if(LAZYLEN(candidates)) var/mob/C = pick(candidates) - var/mob/living/simple_animal/shade/S = new(src) + var/mob/living/simple_animal/hostile/construct/shade/S = new(src) S.real_name = name S.name = name S.ckey = C.ckey @@ -537,7 +537,7 @@ possessed = FALSE /obj/item/nullrod/scythe/talking/Destroy() - for(var/mob/living/simple_animal/shade/S in contents) + for(var/mob/living/simple_animal/hostile/construct/shade/S in contents) to_chat(S, "You were destroyed!") qdel(S) return ..() diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index 8da1d1e472..d148cbbb3c 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -96,4 +96,4 @@ if(implant?.imp_in) qdel(implant) else - return ..() \ No newline at end of file + return ..() diff --git a/code/game/objects/items/implants/implant_hijack.dm b/code/game/objects/items/implants/implant_hijack.dm index 36e58d8887..06d2df9272 100644 --- a/code/game/objects/items/implants/implant_hijack.dm +++ b/code/game/objects/items/implants/implant_hijack.dm @@ -92,10 +92,17 @@ /obj/item/implant/hijack/proc/hijack_remotely(obj/machinery/power/apc/apc) if (apc.hijacker || hijacking) return FALSE //can't remotely hijack an already hijacked APC + + if(apc.being_hijacked) + to_chat(imp_in, "This APC is already being hijacked!") + return FALSE + + apc.being_hijacked = TRUE hijacking = TRUE to_chat(imp_in, "Establishing remote connection with APC.") if (!do_after(imp_in, 4 SECONDS,target=apc)) to_chat(imp_in, "Aborting.") + apc.being_hijacked = FALSE hijacking = FALSE return TRUE if (LAZYLEN(imp_in.siliconaccessareas) >= HIJACK_APC_MAX_AMOUNT) @@ -118,6 +125,7 @@ toggle_eyes() else to_chat(imp_in, "Aborting.") + apc.being_hijacked = FALSE hijacking = FALSE imp_in.light_power = 0 imp_in.light_range = 0 diff --git a/code/game/objects/items/implants/implant_radio.dm b/code/game/objects/items/implants/implant_radio.dm index 6f42547004..f3e7027c37 100644 --- a/code/game/objects/items/implants/implant_radio.dm +++ b/code/game/objects/items/implants/implant_radio.dm @@ -66,4 +66,4 @@ /obj/item/implanter/radio/syndicate name = "implanter (internal syndicate radio)" - imp_type = /obj/item/implant/radio/syndicate \ No newline at end of file + imp_type = /obj/item/implant/radio/syndicate diff --git a/code/game/objects/items/implants/implant_track.dm b/code/game/objects/items/implants/implant_track.dm index 4f81432a39..2fa0244831 100644 --- a/code/game/objects/items/implants/implant_track.dm +++ b/code/game/objects/items/implants/implant_track.dm @@ -73,4 +73,4 @@ /obj/item/implantcase/track name = "implant case - 'Tracking'" desc = "A glass case containing a tracking implant." - imp_type = /obj/item/implant/tracking \ No newline at end of file + imp_type = /obj/item/implant/tracking diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm index b57ffa27c0..578d8595dd 100644 --- a/code/game/objects/items/implants/implanter.dm +++ b/code/game/objects/items/implants/implanter.dm @@ -77,4 +77,4 @@ /obj/item/implanter/hijack name = "implanter (hijack)" - imp_type = /obj/item/implant/hijack \ No newline at end of file + imp_type = /obj/item/implant/hijack diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index e2e0779b53..f15a4d00e1 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -150,8 +150,8 @@ item_state = "knife" desc = "A military combat utility survival knife." embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) - force = 20 - throwforce = 20 + force = 16 + throwforce = 16 attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut") bayonet = TRUE diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 2d2c0f31b6..913d73bdad 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -52,7 +52,8 @@ /obj/item/choice_beacon/proc/spawn_option(atom/choice,mob/living/M) var/obj/new_item = create_choice_atom(choice, M) - var/obj/structure/closet/supplypod/bluespacepod/pod = new() + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/bluespacepod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets just have it in the pod storage zone for a really short time because we don't want it in nullspace pod.explosionSize = list(0,0,0,0) new_item.forceMove(pod) var/msg = "After making your selection, you notice a strange target on the ground. It might be best to step back!" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 61a05aacd8..b8f0d161dc 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -321,4 +321,4 @@ desc = "A rusted claymore, once at the heart of a powerful scottish clan struck down and oppressed by tyrants, it has been passed down the ages as a symbol of defiance." force = 15 block_chance = 30 - armour_penetration = 5 \ No newline at end of file + armour_penetration = 5 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 9f098bc16c..291fc30aa2 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -80,6 +80,7 @@ as performing this in action() will cause the upgrade to end up in the borg inst desc = "Used to kick in a cyborg's VTEC systems, increasing their speed." icon_state = "cyborg_upgrade2" require_module = 1 + var/obj/effect/proc_holder/silicon/cyborg/vtecControl/VC /obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R, user = usr) . = ..() @@ -91,12 +92,14 @@ as performing this in action() will cause the upgrade to end up in the borg inst //R.speed = -2 // Gotta go fast. //Citadel change - makes vtecs give an ability rather than reducing the borg's speed instantly - R.AddAbility(new/obj/effect/proc_holder/silicon/cyborg/vtecControl) + VC = new /obj/effect/proc_holder/silicon/cyborg/vtecControl + R.AddAbility(VC) R.cansprint = 0 /obj/item/borg/upgrade/vtec/deactivate(mob/living/silicon/robot/R, user = usr) . = ..() if (.) + R.RemoveAbility(VC) R.speed = initial(R.speed) R.cansprint = 1 diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 29b4dea6d8..de2e3b89fe 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -388,4 +388,4 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( /obj/item/shard/plasma/alien name = "alien shard" - desc = "A nasty looking shard of advanced alloy glass." \ No newline at end of file + desc = "A nasty looking shard of advanced alloy glass." diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 32d65041bc..8526727464 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -388,6 +388,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("mining satchel", /obj/item/storage/bag/ore, 4), \ new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \ new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \ + new/datum/stack_recipe("material bag", /obj/item/storage/bag/material, 4), \ + new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \ null, \ new/datum/stack_recipe("string", /obj/item/weaponcrafting/string, 1, time = 10), \ new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \ diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index ab1aab32a0..3dd48237d6 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -457,6 +457,9 @@ STR.display_numerical_stacking = FALSE STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing)) +/* +Bag for holding materials +*/ /obj/item/storage/bag/material name = "material pouch" desc = "A pouch for sheets and RCD ammunition that manages to hang where you would normally put things in your pocket." @@ -474,3 +477,24 @@ STR.max_items = 2 STR.display_numerical_stacking = TRUE STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet)) + +/* + * Construction bag (for engineering, holds stock parts and electronics) + */ + +/obj/item/storage/bag/construction + name = "construction bag" + icon = 'icons/obj/tools.dmi' + icon_state = "construction_bag" + desc = "A bag for storing small construction components." + w_class = WEIGHT_CLASS_TINY + resistance_flags = FLAMMABLE + +/obj/item/storage/bag/construction/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_combined_w_class = 100 + STR.max_items = 50 + STR.max_w_class = WEIGHT_CLASS_SMALL + STR.insert_preposition = "in" + STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics,/obj/item/wallframe/camera)) diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 244b8c804b..476f35fe4c 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -198,7 +198,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", if(istype(A, /obj/item/cult_bastard)) for(var/obj/item/soulstone/SS in A.contents) SS.usability = TRUE - for(var/mob/living/simple_animal/shade/EX in SS) + for(var/mob/living/simple_animal/hostile/construct/shade/EX in SS) SSticker.mode.remove_cultist(EX.mind, 1, 0) EX.icon_state = "ghost1" EX.name = "Purified [EX.name]" @@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible", if(do_after(user, 40, target = SS)) playsound(src,'sound/effects/pray_chaplain.ogg',60,1) SS.usability = TRUE - for(var/mob/living/simple_animal/shade/EX in SS) + for(var/mob/living/simple_animal/hostile/construct/shade/EX in SS) SSticker.mode.remove_cultist(EX.mind, 1, 0) EX.icon_state = "ghost1" EX.name = "Purified [EX.name]" diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index d16d1b29f1..325e49dd7a 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -198,4 +198,4 @@ /obj/item/tank/internals/methyl_bromide/populate_gas() air_contents.set_moles(/datum/gas/methyl_bromide, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) - return \ No newline at end of file + return diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 0dd9885c29..36f89e57f2 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -8,6 +8,7 @@ usesound = 'sound/items/crowbar.ogg' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + item_flags = SURGICAL_TOOL force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL @@ -107,4 +108,4 @@ icon = 'icons/obj/advancedtools.dmi' usesound = 'sound/weapons/sonic_jackhammer.ogg' icon_state = "crowbar" - toolspeed = 0.2 \ No newline at end of file + toolspeed = 0.2 diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index bf767af2ed..920afb8d14 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -8,6 +8,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + item_flags = SURGICAL_TOOL force = 5 w_class = WEIGHT_CLASS_TINY throwforce = 5 diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index d35dad9f08..c8eb96005c 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -9,6 +9,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + item_flags = SURGICAL_TOOL force = 3 throwforce = 5 hitsound = "swing_hit" @@ -21,6 +22,9 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30) resistance_flags = FIRE_PROOF + var/self_fueling = FALSE //Do we refill ourselves or not + var/nextrefueltick = 0 // How long it takes before we get a new fuel unit + custom_materials = list(/datum/material/iron=70, /datum/material/glass=30) var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) @@ -82,12 +86,18 @@ //This is to start fires. process() is only called if the welder is on. open_flame() + //This handles refueling. Its looking at how much fuel the tool has and comparing that to how much it holds + //This then looks if the refuel tick has come based on world time. + //Then looks if we refuel ourselves or not. + + if(get_fuel() < max_fuel && nextrefueltick < world.time && self_fueling) + nextrefueltick = world.time + 10 + reagents.add_reagent(/datum/reagent/fuel, 1) /obj/item/weldingtool/suicide_act(mob/user) user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") return (FIRELOSS) - /obj/item/weldingtool/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) flamethrower_screwdriver(I, user) @@ -318,7 +328,6 @@ /obj/item/weldingtool/largetank/flamethrower_screwdriver() return - /obj/item/weldingtool/mini name = "emergency welding tool" desc = "A miniature welder used during emergencies." @@ -331,20 +340,6 @@ /obj/item/weldingtool/mini/flamethrower_screwdriver() return -/obj/item/weldingtool/abductor - name = "alien welding tool" - desc = "An alien welding tool. Whatever fuel it uses, it never runs out." - icon = 'icons/obj/abductor.dmi' - icon_state = "welder" - toolspeed = 0.1 - light_intensity = 0 - change_icons = 0 - -/obj/item/weldingtool/abductor/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent(/datum/reagent/fuel, 1) - ..() - /obj/item/weldingtool/hugetank name = "upgraded industrial welding tool" desc = "An upgraded welder based of the industrial welder." @@ -353,27 +348,6 @@ max_fuel = 80 custom_materials = list(/datum/material/iron=70, /datum/material/glass=120) -/obj/item/weldingtool/experimental - name = "experimental welding tool" - desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." - icon_state = "exwelder" - item_state = "exwelder" - max_fuel = 40 - custom_materials = list(/datum/material/iron=70, /datum/material/glass=120) - var/last_gen = 0 - change_icons = 0 - can_off_process = 1 - light_intensity = 1 - toolspeed = 0.5 - var/nextrefueltick = 0 - -/obj/item/weldingtool/experimental/brass - name = "brass welding tool" - desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "clockwelder" - item_state = "brasswelder" - /obj/item/weldingtool/bronze name = "bronze plated welding tool" desc = "A bronze plated welder." @@ -382,24 +356,46 @@ icon_state = "brasswelder" item_state = "brasswelder" -/obj/item/weldingtool/experimental/process() - ..() - if(get_fuel() < max_fuel && nextrefueltick < world.time) - nextrefueltick = world.time + 10 - reagents.add_reagent(/datum/reagent/fuel, 1) +//Self filling welders below + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + custom_materials = list(/datum/material/iron=70, /datum/material/glass=120) + change_icons = 0 + self_fueling = TRUE + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "clockwelder" + item_state = "brasswelder" + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + self_fueling = TRUE + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 /obj/item/weldingtool/advanced name = "advanced welding tool" desc = "A modern welding tool combined with an alien welding tool, it never runs out of fuel and works almost as fast." icon = 'icons/obj/advancedtools.dmi' icon_state = "welder" + self_fueling = TRUE toolspeed = 0.2 light_intensity = 0 change_icons = 0 -/obj/item/weldingtool/advanced/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent(/datum/reagent/fuel, 1) - ..() - #undef WELDER_FUEL_BURN_INTERVAL diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 000b816d70..ee72c7fed2 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -8,6 +8,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + item_flags = SURGICAL_TOOL force = 6 throw_speed = 3 throw_range = 7 @@ -148,4 +149,4 @@ icon = 'icons/obj/advancedtools.dmi' icon_state = "cutters" toolspeed = 0.2 - random_color = FALSE \ No newline at end of file + random_color = FALSE diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index e8b77199d7..6199e7fc76 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -7,6 +7,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + item_flags = SURGICAL_TOOL force = 5 throwforce = 7 w_class = WEIGHT_CLASS_SMALL @@ -128,4 +129,4 @@ icon = 'icons/obj/advancedtools.dmi' icon_state = "wrench" usesound = 'sound/effects/empulse.ogg' - toolspeed = 0.2 \ No newline at end of file + toolspeed = 0.2 diff --git a/code/game/objects/structures/chess.dm b/code/game/objects/structures/chess.dm index 8254405fee..ec882f34f8 100644 --- a/code/game/objects/structures/chess.dm +++ b/code/game/objects/structures/chess.dm @@ -73,4 +73,4 @@ /obj/structure/chess/blackking name = "\improper Black King" desc = "A black king chess piece. It can move one tile in any direction." - icon_state = "black_king" \ No newline at end of file + icon_state = "black_king" diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index e51aeafdc1..2df57e1d68 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -108,4 +108,4 @@ icon_state = "radbodybag" mob_storage_capacity = 1 foldedbag_path = /obj/item/bodybag/containment - rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE \ No newline at end of file + rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 05798df953..3cbeae1ce8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -30,6 +30,8 @@ new /obj/item/construction/rcd/loaded/upgraded(src) new /obj/item/clothing/suit/hooded/wintercoat/ce(src) new /obj/item/clothing/head/beret/ce/white(src) + new /obj/item/storage/bag/construction(src) + new /obj/item/storage/bag/material(src) /obj/structure/closet/secure_closet/engineering_electrical name = "electrical supplies locker" @@ -78,6 +80,8 @@ new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/storage/box/emptysandbags(src) new /obj/item/cartridge/engineering(src) + new /obj/item/storage/bag/construction(src) + new /obj/item/storage/bag/material(src) /obj/structure/closet/secure_closet/atmospherics name = "\proper atmospheric technician's locker" @@ -99,6 +103,8 @@ new /obj/item/clothing/glasses/meson/engine/tray(src) new /obj/item/extinguisher/advanced(src) new /obj/item/cartridge/atmos(src) + new /obj/item/storage/bag/construction(src) + new /obj/item/storage/bag/material(src) /* * Empty lockers diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index a9e6243060..c554cad034 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -10,4 +10,4 @@ new /obj/item/radio/headset/headset_srv(src) new /obj/item/cultivator(src) new /obj/item/hatchet(src) - new /obj/item/storage/box/disks_plantgene(src) \ No newline at end of file + new /obj/item/storage/box/disks_plantgene(src) diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm index 09d176783a..6c8d3066ee 100644 --- a/code/game/objects/structures/crates_lockers/crates/wooden.dm +++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm @@ -15,4 +15,4 @@ new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src) new /obj/item/pneumatic_cannon/pie(src) new /obj/item/reagent_containers/food/snacks/pie/cream(src) - new /obj/item/storage/crayons(src) \ No newline at end of file + new /obj/item/storage/crayons(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 19c0f0aed1..2eda9f126a 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -553,4 +553,4 @@ /obj/structure/displaycase/forsale/kitchen desc = "A display case with an ID-card swiper. Use your ID to purchase the contents. Meant for the bartender and chef." req_one_access = list(ACCESS_KITCHEN, ACCESS_BAR) -*/ \ No newline at end of file +*/ diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm index 164e597117..28ff5a8de7 100644 --- a/code/game/objects/structures/loom.dm +++ b/code/game/objects/structures/loom.dm @@ -38,4 +38,4 @@ user.show_message("You weave \the [W.name] into a workable fabric.", MSG_VISUAL) return TRUE -#undef FABRIC_PER_SHEET \ No newline at end of file +#undef FABRIC_PER_SHEET diff --git a/code/game/objects/structures/memorial.dm b/code/game/objects/structures/memorial.dm index 243a7e3cba..d359cfc54a 100644 --- a/code/game/objects/structures/memorial.dm +++ b/code/game/objects/structures/memorial.dm @@ -18,4 +18,4 @@ This memorial has been designed for him and any future coders to perish. icon = 'icons/obj/tomb.dmi' icon_state = "memorial" density = TRUE - anchored = TRUE \ No newline at end of file + anchored = TRUE diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index fa6bab0fcc..32040b8573 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -94,7 +94,7 @@ name = "magic mirror" desc = "Turn and face the strange... face." icon_state = "magic_mirror" - var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie") + var/list/races_blacklist = list("skeleton", "agent", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie") var/list/choosable_races = list() /obj/structure/mirror/magic/New() diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index e1bb143fef..3eb88ad12d 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -26,4 +26,4 @@ /obj/structure/mopbucket/update_overlays() . = ..() if(reagents.total_volume > 0) - . += "mopbucket_water" \ No newline at end of file + . += "mopbucket_water" diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index e67ef7af60..9032a80d91 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -72,4 +72,4 @@ /obj/structure/spawner/mining/wumborian name = "wumborian fugu den" desc = "A den housing a nest of wumborian fugus, how do they all even fit in there?" - mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu) \ No newline at end of file + mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 10c79bb658..d4b2d03428 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -783,7 +783,8 @@ if(ispath(chosen, /turf)) T.ChangeTurf(chosen) else - var/obj/structure/closet/supplypod/centcompod/pod = new() + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets just have it in the pod bay for a moment instead of runtiming var/atom/A = new chosen(pod) A.flags_1 |= ADMIN_SPAWNED_1 new /obj/effect/pod_landingzone(T, pod) diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm index c5861b95e1..532a11a532 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -212,4 +212,4 @@ dat += build_antag_listing() dat += "" - usr << browse(dat.Join(), "window=roundstatus;size=500x500") \ No newline at end of file + usr << browse(dat.Join(), "window=roundstatus;size=500x500") diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 6aab698a4a..0679d9ffac 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -33,7 +33,9 @@ H.saved_socks = H.socks // Mutant randomizing, doesn't affect the mob appearance unless it's the specific mutant. - H.dna.features["mcolor"] = random_short_color() + H.dna.features["mcolor"] = sanitize_hexcolor(random_short_color(), 6) + H.dna.features["mcolor2"] = sanitize_hexcolor(random_short_color(), 6) + H.dna.features["mcolor3"] = sanitize_hexcolor(random_short_color(), 6) H.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard) H.dna.features["snout"] = pick(GLOB.snouts_list) H.dna.features["horns"] = pick(GLOB.horns_list) diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index 346f0e9790..05f7465b03 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -287,7 +287,7 @@ R = rank_names[new_rank] if(!R) //rank with that name doesn't exist yet - make it if(D) - R = new(new_rank, D.rank.rights) //duplicate our previous admin_rank but with a new name + R = new(new_rank, D.rank.rights, D.rank.exclude_rights, D.rank.can_edit_rights) //duplicate our previous admin_rank but with a new name else R = new(new_rank) //blank new admin_rank GLOB.admin_ranks += R diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 03376df905..ad8dd168eb 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -508,7 +508,7 @@ if("constructwraith") M.change_mob_type( /mob/living/simple_animal/hostile/construct/wraith , null, null, delmob ) if("shade") - M.change_mob_type( /mob/living/simple_animal/shade , null, null, delmob ) + M.change_mob_type( /mob/living/simple_animal/hostile/construct/shade , null, null, delmob ) /////////////////////////////////////new ban stuff diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 123e9877f7..b23cd0af0b 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -8,4 +8,4 @@ var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic) if(choice) - Cinematic(initial(choice.id),world,null) \ No newline at end of file + Cinematic(initial(choice.id),world,null) diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm index 7fe4c070d2..9ad07ac1b2 100644 --- a/code/modules/admin/verbs/individual_logging.dm +++ b/code/modules/admin/verbs/individual_logging.dm @@ -5,7 +5,7 @@ var/ntype = text2num(type) //Add client links - var/dat = "" + var/list/dat = list() if(M.client) dat += "

Client

" dat += "
" @@ -46,22 +46,27 @@ var/log_source = M.logging; if(source == LOGSRC_CLIENT && M.client) //if client doesn't exist just fall back to the mob log log_source = M.client.player_details.logging //should exist, if it doesn't that's a bug, don't check for it not existing - + var/list/concatenated_logs = list() for(var/log_type in log_source) var/nlog_type = text2num(log_type) if(nlog_type & ntype) - var/list/reversed = log_source[log_type] - if(islist(reversed)) - reversed = reverseRange(reversed.Copy()) - for(var/entry in reversed) - dat += "[entry]
[reversed[entry]]
" - dat += "
" + var/list/all_the_entrys = log_source[log_type] + for(var/entry in all_the_entrys) + concatenated_logs += "[entry]
[all_the_entrys[entry]]" + if(length(concatenated_logs)) + sortTim(concatenated_logs, cmp = /proc/cmp_text_dsc) //Sort by timestamp. + dat += "" + dat += concatenated_logs.Join("
") + dat += "" - usr << browse(dat, "window=invidual_logging_[key_name(M)];size=600x480") + var/datum/browser/popup = new(usr, "invidual_logging_[key_name(M)]", "Individual Logs", 600, 600) + popup.set_content(dat.Join()) + popup.open() /proc/individual_logging_panel_link(mob/M, log_type, log_src, label, selected_src, selected_type) var/slabel = label if(selected_type == log_type && selected_src == log_src) slabel = "\[[label]\]" - - return "[slabel]" \ No newline at end of file + //This is necessary because num2text drops digits and rounds on big numbers. If more defines get added in the future it could break again. + log_type = num2text(log_type, MAX_BITFLAG_DIGITS) + return "[slabel]" diff --git a/code/modules/admin/verbs/maprotation.dm b/code/modules/admin/verbs/maprotation.dm index ed9d23a84d..af8bd6e9fb 100644 --- a/code/modules/admin/verbs/maprotation.dm +++ b/code/modules/admin/verbs/maprotation.dm @@ -41,4 +41,4 @@ message_admins("[key_name_admin(usr)] is changing the map to [VM.map_name]") log_admin("[key_name(usr)] is changing the map to [VM.map_name]") if (SSmapping.changemap(VM) == 0) - message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]") \ No newline at end of file + message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]") diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index f59d776a93..3860706538 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -28,4 +28,4 @@ GLOBAL_VAR_INIT(highlander, FALSE) addtimer(CALLBACK(src, .proc/only_one), 420) /mob/living/carbon/human/proc/make_scottish() - mind.add_antag_datum(/datum/antagonist/highlander) \ No newline at end of file + mind.add_antag_datum(/datum/antagonist/highlander) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d1f6d18e09..84702898ec 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1347,7 +1347,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits new /obj/effect/immovablerod(startT, endT,target) if(ADMIN_PUNISHMENT_SUPPLYPOD_QUICK) var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text - var/obj/structure/closet/supplypod/centcompod/pod = new() + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime pod.damage = 40 pod.explosionSize = list(0,0,0,2) pod.effectStun = TRUE diff --git a/code/modules/admin/verbs/reestablish_db_connection.dm b/code/modules/admin/verbs/reestablish_db_connection.dm index b00f0e2ccb..2090902ebc 100644 --- a/code/modules/admin/verbs/reestablish_db_connection.dm +++ b/code/modules/admin/verbs/reestablish_db_connection.dm @@ -27,4 +27,4 @@ if(!SSdbcore.Connect()) message_admins("Database connection failed: " + SSdbcore.ErrorMsg()) else - message_admins("Database connection re-established") \ No newline at end of file + message_admins("Database connection re-established") diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index ab9f4a534c..a7c191de58 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -93,4 +93,4 @@ return "[header][item]" -#undef VV_HTML_ENCODE \ No newline at end of file +#undef VV_HTML_ENCODE diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 9f61781f01..af412a6caa 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -98,7 +98,7 @@ L.adjustFireLoss(amount) newamt = L.getFireLoss() if("toxin") - L.adjustToxLoss(amount) + L.adjustToxLoss(amount, toxins_type = TOX_OMNI) newamt = L.getToxLoss() if("oxygen") L.adjustOxyLoss(amount) diff --git a/code/modules/antagonists/_common/antag_helpers.dm b/code/modules/antagonists/_common/antag_helpers.dm index d99920b9e2..b10df46348 100644 --- a/code/modules/antagonists/_common/antag_helpers.dm +++ b/code/modules/antagonists/_common/antag_helpers.dm @@ -16,4 +16,4 @@ continue var/datum/team/T = A.get_team() if(!team_type || istype(T,team_type)) - . |= T \ No newline at end of file + . |= T diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm index de6d0a4f81..d87824f9a5 100644 --- a/code/modules/antagonists/_common/antag_hud.dm +++ b/code/modules/antagonists/_common/antag_hud.dm @@ -50,4 +50,4 @@ /datum/mind/proc/leave_all_antag_huds() for(var/datum/atom_hud/antag/hud in GLOB.huds) if(hud.hudusers[current]) - hud.leave_hud(current) \ No newline at end of file + hud.leave_hud(current) diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm index 971051588e..a99e9eee67 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm @@ -52,4 +52,4 @@ user.temporarilyRemoveItemFromInventory(tool, TRUE) var/obj/item/organ/heart/gland/gland = tool gland.Insert(target, 2) - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index d9ae678bb9..aed096e9df 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -110,4 +110,4 @@ active = 0 /obj/item/organ/heart/gland/proc/activate() - return \ No newline at end of file + return diff --git a/code/modules/antagonists/abductor/equipment/glands/access.dm b/code/modules/antagonists/abductor/equipment/glands/access.dm index c795233dc9..ccef04b091 100644 --- a/code/modules/antagonists/abductor/equipment/glands/access.dm +++ b/code/modules/antagonists/abductor/equipment/glands/access.dm @@ -17,4 +17,4 @@ /obj/item/organ/heart/gland/access/Remove(special = FALSE) if(!QDELETED(owner)) UnregisterSignal(owner, COMSIG_MOB_ALLOWED) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/antagonists/abductor/equipment/glands/blood.dm b/code/modules/antagonists/abductor/equipment/glands/blood.dm index 06b8249484..2e4803e0e9 100644 --- a/code/modules/antagonists/abductor/equipment/glands/blood.dm +++ b/code/modules/antagonists/abductor/equipment/glands/blood.dm @@ -15,4 +15,4 @@ var/mob/living/carbon/human/H = owner var/datum/species/species = H.dna.species to_chat(H, "You feel your blood heat up for a moment.") - species.exotic_blood = get_random_reagent_id() \ No newline at end of file + species.exotic_blood = get_random_reagent_id() diff --git a/code/modules/antagonists/abductor/equipment/glands/chem.dm b/code/modules/antagonists/abductor/equipment/glands/chem.dm index e7b6fda85f..b651b45f6d 100644 --- a/code/modules/antagonists/abductor/equipment/glands/chem.dm +++ b/code/modules/antagonists/abductor/equipment/glands/chem.dm @@ -17,4 +17,4 @@ var/chem_to_add = pick(possible_reagents) owner.reagents.add_reagent(chem_to_add, 2) owner.adjustToxLoss(-5, TRUE, TRUE) - ..() \ No newline at end of file + ..() diff --git a/code/modules/antagonists/abductor/equipment/glands/egg.dm b/code/modules/antagonists/abductor/equipment/glands/egg.dm index 429a24b19c..e3b0c835f2 100644 --- a/code/modules/antagonists/abductor/equipment/glands/egg.dm +++ b/code/modules/antagonists/abductor/equipment/glands/egg.dm @@ -12,4 +12,4 @@ /obj/item/organ/heart/gland/egg/activate() owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") var/turf/T = owner.drop_location() - new /obj/item/reagent_containers/food/snacks/egg/gland(T) \ No newline at end of file + new /obj/item/reagent_containers/food/snacks/egg/gland(T) diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index 7e52f6fcb6..9de0b96930 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -24,4 +24,4 @@ /obj/item/organ/heart/gland/electric/proc/zap() tesla_zap(owner, 4, 8000, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN) - playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE) \ No newline at end of file + playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE) diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm index 0fcd1169d8..5ea8f77d6c 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -175,4 +175,4 @@ var/obj/item/bodypart/chest/new_chest = new(null) new_chest.replace_limb(owner, TRUE) - qdel(chest) \ No newline at end of file + qdel(chest) diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm index f8b91343f2..fa63e2c82a 100644 --- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm +++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm @@ -61,4 +61,4 @@ to_chat(H, "You feel the compulsion fade, and you completely forget about your previous orders.") H.clear_alert("mind_control") active_mind_control = FALSE - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm index 4a30d99d44..fe8b06ac77 100644 --- a/code/modules/antagonists/abductor/equipment/glands/plasma.dm +++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm @@ -19,4 +19,4 @@ var/turf/open/T = get_turf(owner) if(istype(T)) T.atmos_spawn_air("plasma=50;TEMP=[T20C]") - owner.vomit() \ No newline at end of file + owner.vomit() diff --git a/code/modules/antagonists/abductor/equipment/glands/quantum.dm b/code/modules/antagonists/abductor/equipment/glands/quantum.dm index a5b8815437..fc1ddae030 100644 --- a/code/modules/antagonists/abductor/equipment/glands/quantum.dm +++ b/code/modules/antagonists/abductor/equipment/glands/quantum.dm @@ -44,4 +44,4 @@ if(active_mind_control) to_chat(entangled_mob, "You feel the compulsion fade, and you completely forget about your previous orders.") entangled_mob.clear_alert("mind_control") - ..() \ No newline at end of file + ..() diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm index 2df4a1fab9..36732d5fe0 100644 --- a/code/modules/antagonists/abductor/equipment/glands/slime.dm +++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm @@ -23,4 +23,4 @@ var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey") Slime.Friends = list(owner) - Slime.Leader = owner \ No newline at end of file + Slime.Leader = owner diff --git a/code/modules/antagonists/abductor/equipment/glands/spider.dm b/code/modules/antagonists/abductor/equipment/glands/spider.dm index f0421b23b2..7c3c60eb4d 100644 --- a/code/modules/antagonists/abductor/equipment/glands/spider.dm +++ b/code/modules/antagonists/abductor/equipment/glands/spider.dm @@ -11,4 +11,4 @@ to_chat(owner, "You feel something crawling in your skin.") owner.faction |= "spiders" var/obj/structure/spider/spiderling/S = new(owner.drop_location()) - S.directive = "Protect your nest inside [owner.real_name]." \ No newline at end of file + S.directive = "Protect your nest inside [owner.real_name]." diff --git a/code/modules/antagonists/abductor/equipment/glands/transform.dm b/code/modules/antagonists/abductor/equipment/glands/transform.dm index 05c4760d37..1823ee5fed 100644 --- a/code/modules/antagonists/abductor/equipment/glands/transform.dm +++ b/code/modules/antagonists/abductor/equipment/glands/transform.dm @@ -12,4 +12,4 @@ to_chat(owner, "You feel unlike yourself.") randomize_human(owner) var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly)) - owner.set_species(species) \ No newline at end of file + owner.set_species(species) diff --git a/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm index d1ea135497..8ac083f68b 100644 --- a/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm +++ b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm @@ -9,4 +9,4 @@ /obj/item/organ/heart/gland/ventcrawling/activate() to_chat(owner, "You feel very stretchy.") - owner.ventcrawler = VENTCRAWLER_ALWAYS \ No newline at end of file + owner.ventcrawler = VENTCRAWLER_ALWAYS diff --git a/code/modules/antagonists/abductor/equipment/glands/viral.dm b/code/modules/antagonists/abductor/equipment/glands/viral.dm index 4d4f865a7c..1b6781b578 100644 --- a/code/modules/antagonists/abductor/equipment/glands/viral.dm +++ b/code/modules/antagonists/abductor/equipment/glands/viral.dm @@ -31,4 +31,4 @@ var/datum/symptom/S = new chosen_symptom A.symptoms += S A.Refresh() //just in case someone already made and named the same disease - return A \ No newline at end of file + return A diff --git a/code/modules/antagonists/abductor/ice_abductor.dm b/code/modules/antagonists/abductor/ice_abductor.dm index 426e4057eb..2132e6c574 100644 --- a/code/modules/antagonists/abductor/ice_abductor.dm +++ b/code/modules/antagonists/abductor/ice_abductor.dm @@ -9,4 +9,4 @@ /obj/structure/fluff/iced_abductor/Destroy() var/turf/T = get_turf(src) new /obj/effect/mob_spawn/human/abductor(T) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm b/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm index 77169efd61..2c06f42ed9 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm @@ -81,4 +81,4 @@ /datum/antagonist/bloodsucker/proc/AssignRandomBane() - return \ No newline at end of file + return diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm index b922af6066..486ae51117 100644 --- a/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm +++ b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm @@ -113,4 +113,4 @@ popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) popup.open() -*/ \ No newline at end of file +*/ diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 8f4e7ef3d6..dacd568993 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -18,7 +18,6 @@ var/list/stored_profiles = list() //list of datum/changelingprofile var/datum/changelingprofile/first_prof = null - var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation. var/absorbedcount = 0 /// did we get succed by another changeling var/hostile_absorbed = FALSE @@ -252,12 +251,6 @@ var/mob/living/carbon/user = owner.current if(!istype(user)) return - if(stored_profiles.len) - var/datum/changelingprofile/prof = stored_profiles[1] - if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it. - if(verbose) - to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") - return if(!target) return if(NO_DNA_COPY in target.dna.species.species_traits) @@ -317,9 +310,6 @@ return prof /datum/antagonist/changeling/proc/add_profile(datum/changelingprofile/prof) - if(stored_profiles.len > dna_max) - if(!push_out_profile()) - return if(!first_prof) first_prof = prof @@ -340,19 +330,6 @@ stored_profiles -= prof qdel(prof) -/datum/antagonist/changeling/proc/get_profile_to_remove() - for(var/datum/changelingprofile/prof in stored_profiles) - if(!prof.protected) - return prof - -/datum/antagonist/changeling/proc/push_out_profile() - var/datum/changelingprofile/removeprofile = get_profile_to_remove() - if(removeprofile) - stored_profiles -= removeprofile - return 1 - return 0 - - /datum/antagonist/changeling/proc/create_initial_profile() var/mob/living/carbon/C = owner.current //only carbons have dna now, so we have to typecaste if(ishuman(C)) diff --git a/code/modules/antagonists/changeling/powers/digitalcamo.dm b/code/modules/antagonists/changeling/powers/digitalcamo.dm index 6a0f78b532..e44a7c0aa5 100644 --- a/code/modules/antagonists/changeling/powers/digitalcamo.dm +++ b/code/modules/antagonists/changeling/powers/digitalcamo.dm @@ -24,4 +24,4 @@ /obj/effect/proc_holder/changeling/digitalcamo/on_refund(mob/user) action.Remove(user) user.digitalcamo = 0 - user.digitalinvis = 0 \ No newline at end of file + user.digitalinvis = 0 diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index 05c265bc15..90eaeb57ac 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -679,25 +679,26 @@ item_state = "ling_gauntlets" desc = "Rough bone and chitin, pulsing with an abomination barely called \"life\". Good for punching people, not so much for firearms." transfer_prints = TRUE + item_flags = DROPDEL // whoops body_parts_covered = ARMS|HANDS cold_protection = ARMS|HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 35, "bio" = 35, "rad" = 35, "fire" = 0, "acid" = 0) - enhancement = 9 // first, do harm. all of it. all of the harm. just fuck em up. - wound_enhancement = 9 - var/fast_enhancement = 9 - var/fast_wound_enhancement = 9 + enhancement = 6 // first, do harm. all of it. all of the harm. just fuck em up. + wound_enhancement = 6 + var/fast_enhancement = 6 + var/fast_wound_enhancement = 6 var/slow_enhancement = 20 var/slow_wound_enhancement = 20 silent = TRUE - inherited_trait = TRAIT_CHUNKYFINGERS // dummy thicc bone hands - secondary_trait = TRAIT_MAULER // its only violence from here, bucko + inherited_trait = TRAIT_CHUNKYFINGERS // how do you expect to shoot anyone with bone covered hands + secondary_trait = TRAIT_MAULER // just punch them idiot var/fasthands = TRUE /obj/item/clothing/gloves/fingerless/pugilist/cling/examine(mob/user) . = ..() - . += "[src] are formed to allow for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"]." + . += "[src] are shaped for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"]." . += "Alt-click them to change between rapid strikes and strong blows." /obj/item/clothing/gloves/fingerless/pugilist/cling/AltClick(mob/user) diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm index 4995b27807..3d54c19350 100644 --- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm +++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm @@ -57,4 +57,4 @@ /obj/screen/alert/status_effect/agent_pinpointer/changeling name = "Pheromone Scent" - desc = "The nose always knows." \ No newline at end of file + desc = "The nose always knows." diff --git a/code/modules/antagonists/clockcult/clock_effect.dm b/code/modules/antagonists/clockcult/clock_effect.dm index 5fbfa03290..8e3a8f4ceb 100644 --- a/code/modules/antagonists/clockcult/clock_effect.dm +++ b/code/modules/antagonists/clockcult/clock_effect.dm @@ -22,4 +22,4 @@ if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc) desc = clockwork_desc . = ..() - desc = initial(desc) \ No newline at end of file + desc = initial(desc) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm index c18e46790e..97d2935a86 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm @@ -48,4 +48,4 @@ plane = FLOOR_PLANE /obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path... - icon_state = "cult" \ No newline at end of file + icon_state = "cult" diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 454870d1e1..db498f0975 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -216,6 +216,14 @@ else if(get_clockwork_power()) to_chat(L, "You feel a slight, static shock.") +/obj/effect/clockwork/sigil/transmission/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/effect/clockwork/sigil/transmission/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + /obj/effect/clockwork/sigil/transmission/process() var/power_drained = 0 var/power_mod = 0.005 @@ -408,7 +416,7 @@ /obj/effect/clockwork/sigil/rite name = "radiant sigil" - desc = "A glowing sigil glowing with barely-contained power." + desc = "A sigil glowing with barely-contained power." clockwork_desc = "A sigil that will allow you to perform certain rites on it, provided you have access to sufficient power and materials." icon_state = "sigiltransmission" //am big lazy - recolored transmission sigil sigil_name = "Sigil of Rites" @@ -432,7 +440,8 @@ return var/list/possible_rites = list() for(var/datum/clockwork_rite/R in GLOB.all_clockwork_rites) - possible_rites[R] = R + if(is_servant_of_ratvar(user, require_full_power = TRUE) || !R.requires_full_power) + possible_rites[R] = R var/input_key = input(user, "Choose a rite", "Choosing a rite") as null|anything in possible_rites if(!input_key) return diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm index 00c52e4a59..ab8c7abd0a 100644 --- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm +++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm @@ -287,4 +287,4 @@ linked_gateway.visible_message("[linked_gateway] begins to destabilise!") /obj/effect/clockwork/spatial_gateway/stable/pass_through_gateway(atom/movable/A, no_cost = TRUE) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm index 1d65cf9209..76738ab1de 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_powerdrain.dm @@ -1,41 +1,57 @@ -//horrifying power drain proc made for clockcult's power drain in lieu of six istypes or six for(x in view) loops -/atom/movable/proc/power_drain(clockcult_user, drain_weapons = FALSE) //This proc as of now is only in use for void volt +/* +horrifying power drain proc made for clockcult's power drain in lieu of six istypes or six for(x in view) loops +args: +clockcult_user: If the user / source has to do with clockcult stuff +drain_weapons: If this drains weaponry, such as batons and guns +recursive: If this recurses through mob / storage contents. ONLY USE THIS IF IT'S NOT CALLED TOO FREQUENTLY, or I'm not liable for any lag / functional issues caused +drain_amount: How much is drained by default; Influenced by a multiplier on most things depending on how much power they usually hold. +*/ +/atom/movable/proc/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) //This proc as of now is only in use for void volt and transmission sigils + if(recursive) + var/succ = 0 + for(var/V in contents) + var/atom/movable/target = V + succ += target.power_drain(clockcult_user, drain_weapons, recursive, drain_amount) + return succ var/obj/item/stock_parts/cell/cell = get_cell() if(cell) - return cell.power_drain(clockcult_user) + return cell.power_drain(clockcult_user, drain_weapons, recursive, drain_amount) return 0 //Returns 0 instead of FALSE to symbolise it returning the power amount in other cases, not TRUE aka 1 -/obj/item/melee/baton/power_drain(clockcult_user, drain_weapons = FALSE) //balance memes +/obj/item/melee/baton/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) //balance memes if(!drain_weapons) return 0 - return ..() + var/obj/item/stock_parts/cell/cell = get_cell() + if(cell) + return cell.power_drain(clockcult_user, drain_weapons, recursive, drain_amount) + return 0 //No need to recurse further in batons -/obj/item/gun/power_drain(clockcult_user, drain_weapons = FALSE) //balance memes +/obj/item/gun/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) //balance memes if(!drain_weapons) return 0 var/obj/item/stock_parts/cell/cell = get_cell() if(!cell) return 0 if(cell.charge) - . = min(cell.charge, MIN_CLOCKCULT_POWER*4) //Done snowflakey because guns have far smaller cells than batons / other equipment + . = min(cell.charge, drain_amount*4) //Done snowflakey because guns have far smaller cells than batons / other equipment, also no need to recurse further in guns cell.use(.) update_icon() -/obj/machinery/power/apc/power_drain(clockcult_user, drain_weapons = FALSE) +/obj/machinery/power/apc/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) if(cell && cell.charge) playsound(src, "sparks", 50, 1) flick("apc-spark", src) - . = min(cell.charge, MIN_CLOCKCULT_POWER*4) - cell.use(.) //Better than a power sink! + . = min(cell.charge, drain_amount*4) + cell.use(min(cell.charge, . * 4)) //Better than a power sink! if(!cell.charge && !shorted) shorted = 1 visible_message("The [name]'s screen blurs with static.") update() update_icon() -/obj/machinery/power/smes/power_drain(clockcult_user, drain_weapons = FALSE) +/obj/machinery/power/smes/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) if(charge) - . = min(charge, MIN_CLOCKCULT_POWER*4) + . = min(charge, drain_amount*4) charge -= . * 50 if(!charge && !panel_open) panel_open = TRUE @@ -44,20 +60,26 @@ visible_message("[src]'s panel flies open with a flurry of sparks!") update_icon() -/obj/item/stock_parts/cell/power_drain(clockcult_user, drain_weapons = FALSE) +/obj/item/stock_parts/cell/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) if(charge) - . = min(charge, MIN_CLOCKCULT_POWER * 4) //Done like this because normal cells are usually quite a bit bigger than the ones used in guns / APCs + . = min(charge, drain_amount * 4) //Done like this because normal cells are usually quite a bit bigger than the ones used in guns / APCs use(min(charge, . * 10)) //Usually cell-powered equipment that is not a gun has at least ten times the capacity of a gun / 5 times the amount of an APC. This adjusts the drain to account for that. update_icon() -/mob/living/silicon/robot/power_drain(clockcult_user, drain_weapons = FALSE) +/mob/living/silicon/robot/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) if((!clockcult_user || !is_servant_of_ratvar(src)) && cell && cell.charge) - . = min(cell.charge, MIN_CLOCKCULT_POWER*4) + . = min(cell.charge, drain_amount*8) //Silicons are very susceptible to Ratvar's might cell.use(.) spark_system.start() -/obj/mecha/power_drain(clockcult_user, drain_weapons = FALSE) - if((!clockcult_user || (occupant && !is_servant_of_ratvar(occupant))) && cell && cell.charge) - . = min(cell.charge, MIN_CLOCKCULT_POWER*4) - cell.use(.) - spark_system.start() +/obj/mecha/power_drain(clockcult_user, drain_weapons = FALSE, recursive = FALSE, drain_amount = MIN_CLOCKCULT_POWER) + if(!clockcult_user || (occupant && !is_servant_of_ratvar(occupant))) + if(recursive) + var/succ = 0 + for(var/atom/movable/target in contents) //Hiding in your mech won't save you. + succ += target.power_drain(clockcult_user, drain_weapons, recursive, drain_amount) + . = succ + else if(cell && cell.charge) + . = min(cell.charge, drain_amount*4) + cell.use(.) + spark_system.start() diff --git a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm index 7dabb18f03..59a86ffa34 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm @@ -6,12 +6,13 @@ //The base clockwork rite. This should never be visible /datum/clockwork_rite var/name = "Rite of THE frog" //The name of the rite - var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to cultists if they choose 'Show Info' after selecting the rite. + var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to servants if they choose 'Show Info' after selecting the rite. var/list/required_ingredients = list(/obj/item/clockwork) //What does this rite require? var/power_cost = 0 //How much power does this rite cost.. or does it even add power? - var/requires_human = FALSE //Does the rite require a ../carbon/human on the rune? + var/requires_human = FALSE //Does the rite require a ../carbon/human on the sigil? var/must_be_servant = TRUE //If the above is true, does the human need to be a servant? var/target_can_be_invoker = TRUE //Does this rite work if the invoker is also the target? + var/requires_full_power = FALSE //Does the invoker need to be an actual full-on servant, or is this available to neutered ones aswell? var/cast_time = 0 //How long does the rite take to cast? var/limit = INFINITE //How often can this rite be used per round? Set this to INFINITE for unlimited, 0 for disallowed, anything above 0 for a limit var/times_used = 0 //How often has the rite already been used this shift? diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 0bae7d3539..571a817024 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -99,7 +99,7 @@ else ..() -/obj/item/clockwork/slab/cyborg/ratvar_act() +/obj/item/clockwork/slab/cyborg/ui_act() ..() if(!GLOB.ratvar_awakens) SStgui.close_uis(src) diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm index a85245e9d0..aa0f7f03fa 100644 --- a/code/modules/antagonists/clockcult/clock_scripture.dm +++ b/code/modules/antagonists/clockcult/clock_scripture.dm @@ -167,7 +167,7 @@ Judgement 5 converts set waitfor = FALSE chanting = TRUE for(var/invocation in invocations) - sleep(channel_time / invocations.len) + sleep(channel_time / (invocations.len + 1)) //So it always finishes the invocation if(QDELETED(src) || QDELETED(slab) || !chanting) return if(multiple_invokers_used) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm index b7c94d56df..0a59656e31 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm @@ -349,4 +349,4 @@ if(GLOB.ratvar_awakens) portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned duration = max(duration, 100) - return slab.procure_gateway(invoker, duration, portal_uses) \ No newline at end of file + return slab.procure_gateway(invoker, duration, portal_uses) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm index eaec652f68..b559b34d5e 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm @@ -393,45 +393,49 @@ Left-click a target to fire, quickly!" timeout_time = 20 -/datum/clockwork_scripture/channeled/void_volt - descname = "Channeled, Power Drain" +/datum/clockwork_scripture/void_volt + descname = "Pulse, Power Drain" name = "Void Volt" - desc = "A channeled spell that quickly drains any powercells in a radius of eight tiles, but burns the invoker. \ - Can be channeled with more cultists to increase range and split the caused damage evenly over all invokers. \ + desc = "A spell that releases a pulse which drains the power of anything in a radius of eight tiles, but burns the invoker. \ + Can be used with more servants to increase range and split the caused damage evenly among all invokers. \ Also charges clockwork power by a small percentage of the drained power amount, which can help offset this scriptures powercost." - invocations = list("Channel their energy through my body... ", "... so it may fuel Engine!") - chant_invocations = list("Make their lights fall dark!", "They shall be powerless!", "Rob them of their power!") - chant_amount = 20 - chant_interval = 10 //100KW drain per pulse for guns / APCs / 1MW for other cells = 10 chants / 100ds / 10s to drain a charged weapon or a baton with a nonupgraded cell - channel_time = 50 - power_cost = 300 + invocations = list("Take the energy...", "...of their inventions...", "...and grant it to Engine...", "...for they already live in utter darkness!") + channel_time = 130 //You need alot of time, but it pays off. - ten times as powerful as a regular drain (done by transmission sigils) and recurses + affects weapons - incredibly useful if you can pull this off before a big fight. + power_cost = 500 //Relatively medium powercost, but can be offset due to it adding a part of drained power to the power pool. multiple_invokers_used = TRUE multiple_invokers_optional = TRUE - usage_tip = "It may be useful to end channelling early if the burning becomes too much to handle.." + usage_tip = "Be sure to not be injured when using this, or the power channeled through you may overwhelm your body." tier = SCRIPTURE_SCRIPT primary_component = GEIS_CAPACITOR sort_priority = 11 quickbind = TRUE - quickbind_desc = "Quickly drains power in an area around the invoker, causing burns proportional to the amount of energy drained.
Maximum of 20 chants." + quickbind_desc = "Quickly drains power in an area around the invoker, causing burns proportional to the amount of energy drained." -/datum/clockwork_scripture/channeled/void_volt/scripture_effects() +/datum/clockwork_scripture/void_volt/chant() invoker.visible_message("[invoker] glows in a brilliant golden light!") invoker.add_atom_colour("#FFD700", ADMIN_COLOUR_PRIORITY) invoker.light_power = 2 invoker.light_range = 4 invoker.light_color = LIGHT_COLOR_FIRE invoker.update_light() - return ..() + addtimer(CALLBACK(invoker, /mob.proc/stop_void_volt_glow), channel_time) + ..()//Do the timer & Chant +/mob/proc/stop_void_volt_glow() //Needed so the scripture being qdel()d doesn't prevent it. + visible_message("[src] stops glowing...") + remove_atom_colour(ADMIN_COLOUR_PRIORITY) + light_power = 0 + light_range = 0 + update_light() -/datum/clockwork_scripture/channeled/void_volt/chant_effects(chant_number) +/datum/clockwork_scripture/void_volt/scripture_effects() var/power_drained = 0 var/power_mod = 0.005 //Amount of power drained (generally) is multiplied with this, and subsequently dealt in damage to the invoker, then 15 times that is added to the clockwork cult's power reserves. - var/drain_range = 8 + var/drain_range = 12 var/additional_chanters = 0 var/list/chanters = list() chanters += invoker - for(var/mob/living/L in range(1, invoker)) + for(var/mob/living/L in orange(1, invoker)) if(!L.stat && is_servant_of_ratvar(L)) additional_chanters++ chanters += L @@ -440,22 +444,14 @@ var/turf/T = t for(var/M in T) var/atom/movable/A = M - power_drained += A.power_drain(TRUE, TRUE) //Yes, this absolutely does drain weaponry. 10 pulses to drain guns / batons, though of course they can just be recharged. + power_drained += A.power_drain(TRUE, TRUE, TRUE, MIN_CLOCKCULT_POWER * 10) //Yes, this absolutely does drain weaponry, aswell as recurse through objects. No more hiding in lockers / mechs to avoid it. new /obj/effect/temp_visual/ratvar/sigil/transgression(invoker.loc, 1 + (power_drained * power_mod)) var/datum/effect_system/spark_spread/S = new S.set_up(round(1 + (power_drained * power_mod), 1), 0, get_turf(invoker)) S.start() adjust_clockwork_power(power_drained * power_mod * 15) for(var/mob/living/L in chanters) - L.adjustFireLoss(round(clamp(power_drained * power_mod / (1 + additional_chanters), 0, 20), 0.1)) //No you won't just immediately melt if you do this in a very power-rich area + L.adjustFireLoss(round(clamp(power_drained * power_mod / (1 + additional_chanters), 0, 70), 0.1)) //No you won't just immediately melt if you do this in a very power-rich area, but it'll be close. return TRUE - -/datum/clockwork_scripture/channeled/void_volt/chant_end_effects() - invoker.visible_message("[invoker] stops glowing...") - invoker.remove_atom_colour(ADMIN_COLOUR_PRIORITY) - invoker.light_power = 0 - invoker.light_range = 0 - invoker.update_light() - return ..() diff --git a/code/modules/antagonists/clockcult/clock_structures/reflector.dm b/code/modules/antagonists/clockcult/clock_structures/reflector.dm index 364409d39e..c91e9dd918 100644 --- a/code/modules/antagonists/clockcult/clock_structures/reflector.dm +++ b/code/modules/antagonists/clockcult/clock_structures/reflector.dm @@ -83,4 +83,4 @@ anchored = !anchored to_chat(user, "You [anchored ? "secure" : "unsecure"] \the [src].") I.play_tool_sound(src) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor_mech.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor_mech.dm index 3eac1b9fef..10a5b7787f 100644 --- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor_mech.dm +++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor_mech.dm @@ -17,4 +17,4 @@ return audible_message("*click*") playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE) - activate() \ No newline at end of file + activate() diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 61f6ec9998..a2ec4a47a4 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -100,7 +100,7 @@ var/T = new item_path(mob) var/item_name = initial(item_path.name) - var/where = mob.equip_in_one_of_slots(T, slots) + var/where = mob.equip_in_one_of_slots(T, slots, critical = TRUE) if(!where) to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return 0 @@ -295,6 +295,8 @@ ++cultplayers else ++alive + if(!alive) + return var/ratio = cultplayers/alive if(ratio > CULT_RISEN && !cult_risen) for(var/datum/mind/B in members) diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm index b164246060..2dfbf722bf 100644 --- a/code/modules/antagonists/cult/rune_spawn_action.dm +++ b/code/modules/antagonists/cult/rune_spawn_action.dm @@ -115,4 +115,4 @@ rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune1 rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/inner rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/center - rune_color = RUNE_COLOR_MEDIUMRED \ No newline at end of file + rune_color = RUNE_COLOR_MEDIUMRED diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 6cc2fb94b8..276729b359 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -82,7 +82,7 @@ Runes can either be invoked by one's self or with many different cultists. Each fail_invoke() /obj/effect/rune/attack_animal(mob/living/simple_animal/M) - if(istype(M, /mob/living/simple_animal/shade) || istype(M, /mob/living/simple_animal/hostile/construct)) + if(isshade(M) || istype(M, /mob/living/simple_animal/hostile/construct)) if(construct_invoke || !iscultist(M)) //if you're not a cult construct we want the normal fail message attack_hand(M) else @@ -191,7 +191,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/convert/do_invoke_glow() return -/obj/effect/rune/convert/invoke(var/list/invokers) +/obj/effect/rune/convert/invoke(list/invokers) if(rune_in_use) return var/list/myriad_targets = list() @@ -203,11 +203,16 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Offer rune failed - no eligible targets") return + var/mob/living/L = pick(myriad_targets) + if(HAS_TRAIT(L, TRAIT_SACRIFICED)) + fail_invoke() + log_game("Offer rune failed - target has already been sacrificed") + to_chat(invokers, "[L] has already been sacrificed!") + return rune_in_use = TRUE visible_message("[src] pulses blood red!") var/oldcolor = color color = RUNE_COLOR_DARKRED - var/mob/living/L = pick(myriad_targets) var/is_clock = is_servant_of_ratvar(L) var/mob/living/F = invokers[1] @@ -264,7 +269,7 @@ structure_check() searches for nearby cultist structures required for the invoca H.uncuff() H.stuttering = 0 H.cultslurring = 0 - return 1 + return TRUE /obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers) var/mob/living/first_invoker = invokers[1] @@ -308,12 +313,16 @@ structure_check() searches for nearby cultist structures required for the invoca stone.invisibility = 0 if(sacrificial) + ADD_TRAIT(sacrificial, TRAIT_SACRIFICED, "sacrificed") if(iscyborg(sacrificial)) - playsound(sacrificial, 'sound/magic/disable_tech.ogg', 100, 1) - sacrificial.dust() //To prevent the MMI from remaining - else - playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, 1) - sacrificial.gib() + var/mob/living/silicon/robot/bot = sacrificial + playsound(sacrificial, 'sound/magic/disable_tech.ogg', 100, TRUE) + bot.deconstruct() + + else if(ishuman(sacrificial)) + playsound(sacrificial, 'sound/magic/disintegrate.ogg', 100, TRUE) + var/mob/living/carbon/human/H = sacrificial + H.spew_organ(2, 6) return TRUE /obj/effect/rune/empower diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm index 51d480e64e..1fcbbf91d0 100644 --- a/code/modules/antagonists/devil/devil_helpers.dm +++ b/code/modules/antagonists/devil/devil_helpers.dm @@ -35,4 +35,4 @@ DefaultCombatKnockdown(40) qdel(weapon) return 2 - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/antagonists/devil/sintouched/objectives.dm b/code/modules/antagonists/devil/sintouched/objectives.dm index fae6120f9c..fcbb8dcbb5 100644 --- a/code/modules/antagonists/devil/sintouched/objectives.dm +++ b/code/modules/antagonists/devil/sintouched/objectives.dm @@ -20,4 +20,4 @@ explanation_text = "You are the BEST thing on the station. Make sure everyone knows it." /datum/objective/sintouched/acedia - explanation_text = "Angels, devils, good, evil... who cares? Just ignore any hellish threats and do your job." \ No newline at end of file + explanation_text = "Angels, devils, good, evil... who cares? Just ignore any hellish threats and do your job." diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index 272b154828..293b1de3dc 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -105,7 +105,7 @@ /mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) return 666 -/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) +/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash, override_protection = 0) if(mind && has_bane(BANE_LIGHT)) mind.disrupt_spells(-500) return ..() //flashes don't stop devils UNLESS it's their bane. diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm index 81bc090460..25602c8588 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm @@ -75,7 +75,7 @@ var/T = new item_path(H) var/item_name = initial(item_path.name) - var/where = H.equip_in_one_of_slots(T, slots) + var/where = H.equip_in_one_of_slots(T, slots, critical = TRUE) if(!where) to_chat(H, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return FALSE diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index 2052a2fbb3..739304e822 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -136,6 +136,7 @@ hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/eldritch // slightly better than normal cult robes armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 35, "bio" = 20, "rad" = 0, "fire" = 20, "acid" = 20) + mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON /obj/item/reagent_containers/glass/beaker/eldritch name = "flask of eldritch essence" diff --git a/code/modules/antagonists/magic_servant/magic_servant.dm b/code/modules/antagonists/magic_servant/magic_servant.dm index 31b51f59f6..de6ab06202 100644 --- a/code/modules/antagonists/magic_servant/magic_servant.dm +++ b/code/modules/antagonists/magic_servant/magic_servant.dm @@ -6,4 +6,4 @@ /datum/antagonist/magic_servant/proc/setup_master(mob/M) var/datum/objective/O = new("Serve [M.real_name].") O.owner = owner - objectives |= O \ No newline at end of file + objectives |= O diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index e25e0cd164..b3c31152a5 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -178,4 +178,4 @@ /obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/user) if(active) to_chat(user, "Your chameleon field deactivates.") - deactivate(user) \ No newline at end of file + deactivate(user) diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index 0e8c4a35e0..8fa5517b4f 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -131,14 +131,14 @@ "left pocket" = SLOT_L_STORE, "right pocket" = SLOT_R_STORE ) - var/where = H.equip_in_one_of_slots(O, slots) + var/where = H.equip_in_one_of_slots(O, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you the AI module.") else to_chat(H, "Use the AI board in your [where] to take control of the AI, as requested by the Syndicate.") // Give the implant converter var/obj/item/overthrow_converter/I = new(H) - where = H.equip_in_one_of_slots(I, slots) + where = H.equip_in_one_of_slots(I, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you a converter implant.") else diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 4f308cc4c0..c23523cc6b 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -251,7 +251,7 @@ "left pocket" = SLOT_L_STORE, "right pocket" = SLOT_R_STORE ) - var/where = H.equip_in_one_of_slots(T, slots) + var/where = H.equip_in_one_of_slots(T, slots, critical = TRUE) if (!where) to_chat(H, "The Syndicate were unfortunately unable to get you a flash.") else diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm index ff7dae98f6..ade8f09ce1 100644 --- a/code/modules/antagonists/santa/santa.dm +++ b/code/modules/antagonists/santa/santa.dm @@ -28,4 +28,4 @@ santa_objective.explanation_text = "Bring joy and presents to the station!" santa_objective.completed = 1 //lets cut our santas some slack. santa_objective.owner = owner - objectives |= santa_objective \ No newline at end of file + objectives |= santa_objective diff --git a/code/modules/antagonists/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm index cb7e0bf28e..20a6d84bde 100644 --- a/code/modules/antagonists/separatist/separatist.dm +++ b/code/modules/antagonists/separatist/separatist.dm @@ -16,4 +16,4 @@ return nation /datum/antagonist/separatist/greet() - to_chat(owner, "You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!") \ No newline at end of file + to_chat(owner, "You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!") diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 0309b7e826..47a9c59274 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -212,7 +212,7 @@ ) var/where = "At your feet" - var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) + var/equipped_slot = mob.equip_in_one_of_slots(folder, slots, critical = TRUE) if (equipped_slot) where = "In your [equipped_slot]" to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index e5ff546b1b..28298f4983 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -187,8 +187,8 @@ partner_outfit.equip(partner) - var/obj/structure/closet/supplypod/arrival_pod = new() - + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/arrival_pod = new(pick(get_area_turfs(pod_storage_area))) arrival_pod.style = STYLE_SYNDICATE arrival_pod.explosionSize = list(0,0,0,1) arrival_pod.bluespace = TRUE diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index 5f998bd0dd..945823e95c 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -59,7 +59,8 @@ // Launch the pod to collect our victim. /datum/syndicate_contract/proc/launch_extraction_pod(turf/empty_pod_turf) - var/obj/structure/closet/supplypod/extractionpod/empty_pod = new() + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/extractionpod/empty_pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, .proc/enter_check) @@ -180,8 +181,8 @@ if(possible_drop_loc.len > 0) var/pod_rand_loc = rand(1, possible_drop_loc.len) - - var/obj/structure/closet/supplypod/return_pod = new() + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas + var/obj/structure/closet/supplypod/return_pod = new(pick(get_area_turfs(pod_storage_area))) return_pod.bluespace = TRUE return_pod.explosionSize = list(0,0,0,0) return_pod.style = STYLE_SYNDICATE diff --git a/code/modules/antagonists/valentines/heartbreaker.dm b/code/modules/antagonists/valentines/heartbreaker.dm index b78e8d574f..526646d975 100644 --- a/code/modules/antagonists/valentines/heartbreaker.dm +++ b/code/modules/antagonists/valentines/heartbreaker.dm @@ -16,4 +16,4 @@ /datum/antagonist/heartbreaker/greet() to_chat(owner, "You didn't get a date! They're all having fun without you! you'll show them though...") - owner.announce_objectives() \ No newline at end of file + owner.announce_objectives() diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 46961c0caf..8303de60cc 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -36,7 +36,7 @@ /obj/item/soulstone/examine(mob/user) . = ..() - if(usability || iscultist(user, TRUE) || iswizard(user) || isobserver(user)) + if(usability || iscultist(user) || iswizard(user) || isobserver(user)) if (old_shard) . += "A soulstone, used to capture a soul, either from dead humans or from freed shades." else @@ -46,7 +46,7 @@ . += "This shard is spent; it is now just a creepy rock." /obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle. - for(var/mob/living/simple_animal/shade/A in src) + for(var/mob/living/simple_animal/hostile/construct/shade/A in src) A.death() return ..() @@ -58,7 +58,7 @@ to_chat(user, "Your body is wracked with debilitating pain!") return if(spent) - to_chat(user, "There is no power left in the shard.") + to_chat(user, "There is no power left in [src].") return if(!ishuman(M))//If target is not a human. return ..() @@ -81,7 +81,7 @@ release_shades(user) /obj/item/soulstone/proc/release_shades(mob/user) - for(var/mob/living/simple_animal/shade/A in src) + for(var/mob/living/simple_animal/hostile/construct/shade/A in src) A.status_flags &= ~GODMODE A.forceMove(get_turf(user)) A.mobility_flags = MOBILITY_FLAGS_DEFAULT @@ -103,12 +103,12 @@ /obj/structure/constructshell/examine(mob/user) . = ..() - if(iscultist(user, TRUE) || iswizard(user) || user.stat == DEAD) - . += "A construct shell, used to house bound souls from a soulstone." - . += "Placing a soulstone with a soul into this shell allows you to produce your choice of the following:" - . += "An Artificer, which can produce more shells and soulstones, as well as fortifications." - . += "A Wraith, which does high damage and can jaunt through walls, though it is quite fragile." - . += "A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow." + if(iscultist(user) || iswizard(user) || user.stat == DEAD) + . += {"A construct shell, used to house bound souls from a soulstone.\n + Placing a soulstone with a soul into this shell allows you to produce your choice of the following:\n + An Artificer, which can produce more shells and soulstones, as well as fortifications.\n + A Wraith, which does high damage and can jaunt through walls, though it is quite fragile.\n + A Juggernaut, which is very hard to kill and can produce temporary walls, but is slow."} /obj/structure/constructshell/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/soulstone)) @@ -145,14 +145,14 @@ if("VICTIM") var/mob/living/carbon/human/T = target var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE) - if(C && C.cult_team?.is_sacrifice_target(T.mind)) + if(C?.cult_team.is_sacrifice_target(T.mind)) if(iscultist(user)) to_chat(user, "\"This soul is mine. SACRIFICE THEM!\"") else - to_chat(user, "The soulstone seems to reject this soul.") + to_chat(user, "[src] seems to reject this soul.") return FALSE if(contents.len) - to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") + to_chat(user, "Capture failed!: [src] is full! Free an existing soul to make room.") else if((!old_shard && T.stat != CONSCIOUS) || (old_shard && T.stat == DEAD)) if(T.client == null) @@ -167,7 +167,7 @@ to_chat(user, "Capture failed!: Kill or maim the victim first!") if("SHADE") - var/mob/living/simple_animal/shade/T = target + var/mob/living/simple_animal/hostile/construct/shade/T = target if(contents.len) to_chat(user, "Capture failed!: The soulstone is full! Free an existing soul to make room.") else @@ -177,13 +177,13 @@ T.health = T.maxHealth icon_state = "soulstone2" name = "soulstone: Shade of [T.real_name]" - to_chat(T, "Your soul has been captured by the soulstone. Its arcane energies are reknitting your ethereal form.") + to_chat(T, "Your soul has been captured by [src]. Its arcane energies are reknitting your ethereal form.") if(user != T) - to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within the soulstone.") + to_chat(user, "Capture successful!: [T.real_name]'s soul has been captured and stored within [src].") if("CONSTRUCT") var/obj/structure/constructshell/T = target - var/mob/living/simple_animal/shade/A = locate() in src + var/mob/living/simple_animal/hostile/construct/shade/A = locate() in src if(A) var/construct_class = alert(user, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") if(!T || !T.loc) @@ -199,8 +199,8 @@ if(iscultist(user) || iswizard(user)) makeNewConstruct(/mob/living/simple_animal/hostile/construct/builder, A, user, 0, T.loc) - else - makeNewConstruct(/mob/living/simple_animal/hostile/construct/builder/noncult, A, user, 0, T.loc) + else + return for(var/datum/mind/B in SSticker.mode.cult) if(B == A.mind) SSticker.mode.cult -= A.mind @@ -208,19 +208,24 @@ qdel(T) qdel(src) else - to_chat(user, "Creation failed!: The soul stone is empty! Go kill someone!") + to_chat(user, "Creation failed!: [src] is empty! Go kill someone!") /proc/makeNewConstruct(mob/living/simple_animal/hostile/construct/ctype, mob/target, mob/stoner = null, cultoverride = 0, loc_override = null) + if(QDELETED(target)) + return var/mob/living/simple_animal/hostile/construct/newstruct = new ctype((loc_override) ? (loc_override) : (get_turf(target))) if(stoner) newstruct.faction |= "[REF(stoner)]" newstruct.master = stoner var/datum/action/innate/seek_master/SM = new() SM.Grant(newstruct) - target.transfer_ckey(newstruct) + newstruct.key = target.key + if(target.type == /mob/living/simple_animal/hostile/construct/shade) //Make sure we remember which body belonged to the shade + var/mob/living/simple_animal/hostile/construct/shade/shade = target + newstruct.original_mind = shade.original_mind var/obj/screen/alert/bloodsense/BS - if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode) + if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker?.mode) SSticker.mode.add_cultist(newstruct.mind, 0) if(iscultist(stoner) || cultoverride) to_chat(newstruct, "You are still bound to serve the cult[stoner ? " and [stoner]":""], follow [stoner ? stoner.p_their() : "their"] orders and help [stoner ? stoner.p_them() : "them"] complete [stoner ? stoner.p_their() : "their"] goals at all costs.") @@ -234,19 +239,18 @@ /obj/item/soulstone/proc/init_shade(mob/living/carbon/human/T, mob/user, vic = 0) - new /obj/effect/decal/remains/human(T.loc) //Spawns a skeleton + if(HAS_TRAIT_FROM(T, TRAIT_SACRIFICED, "sacrificed")) + if(user) + to_chat(user, "This body has already been harvested!") + return + ADD_TRAIT(T, TRAIT_SACRIFICED, "sacrificed") T.stop_sound_channel(CHANNEL_HEARTBEAT) - T.invisibility = INVISIBILITY_ABSTRACT - T.dust_animation() - QDEL_IN(T, 5) - var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade(src) - S.status_flags |= GODMODE //So they won't die inside the stone somehow - S.mobility_flags = NONE //Can't move out of the soul stone + var/mob/living/simple_animal/hostile/construct/shade/S = new /mob/living/simple_animal/hostile/construct/shade(src) S.name = "Shade of [T.real_name]" S.real_name = "Shade of [T.real_name]" T.transfer_ckey(S) + S.original_mind = T.mind S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder. - S.copy_languages(user, LANGUAGE_MASTER) S.update_atom_languages() grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue if(user) @@ -264,7 +268,7 @@ to_chat(user, "Capture successful!: [T.real_name]'s soul has been ripped from [T.p_their()] body and stored within the soul stone.") -/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/U) +/obj/item/soulstone/proc/getCultGhost(mob/living/carbon/human/T, mob/user) var/mob/dead/observer/chosen_ghost for(var/mob/dead/observer/ghost in GLOB.player_list) //We put them back in their body @@ -279,13 +283,12 @@ if(!T) return FALSE if(!chosen_ghost) - to_chat(U, "There were no spirits willing to become a shade.") + to_chat(user, "There were no spirits willing to become a shade.") return FALSE if(contents.len) //If they used the soulstone on someone else in the meantime return FALSE T.ckey = chosen_ghost.ckey for(var/obj/item/W in T) T.dropItemToGround(W) - init_shade(T, U) - qdel(T) + init_shade(T, user) return TRUE diff --git a/code/modules/arousal/organs/breasts.dm b/code/modules/arousal/organs/breasts.dm index 0989966638..9e30530ad3 100644 --- a/code/modules/arousal/organs/breasts.dm +++ b/code/modules/arousal/organs/breasts.dm @@ -134,4 +134,4 @@ toggle_visibility(D.features["breasts_visibility"], FALSE) #undef BREASTS_ICON_MIN_SIZE -#undef BREASTS_ICON_MAX_SIZE \ No newline at end of file +#undef BREASTS_ICON_MAX_SIZE diff --git a/code/modules/arousal/organs/penis.dm b/code/modules/arousal/organs/penis.dm index 7b20c0e7ce..5a451359f3 100644 --- a/code/modules/arousal/organs/penis.dm +++ b/code/modules/arousal/organs/penis.dm @@ -106,4 +106,4 @@ diameter_ratio = D.features["cock_diameter_ratio"] shape = D.features["cock_shape"] prev_length = length - toggle_visibility(D.features["cock_visibility"], FALSE) \ No newline at end of file + toggle_visibility(D.features["cock_visibility"], FALSE) diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 3066b14851..2c39751a8b 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -13,4 +13,4 @@ Name: IsAssemblyHolder Desc: If true is an object that can hold an assemblyholder object */ /obj/proc/IsAssemblyHolder() - return FALSE \ No newline at end of file + return FALSE diff --git a/code/modules/assembly/playback.dm b/code/modules/assembly/playback.dm index 14ad8c96c9..b3aea12cdc 100644 --- a/code/modules/assembly/playback.dm +++ b/code/modules/assembly/playback.dm @@ -48,4 +48,4 @@ /obj/item/assembly/playback/toggle_secure() . = ..() - listening = FALSE \ No newline at end of file + listening = FALSE diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index a2a55ee6b1..6049ee965e 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -237,12 +237,21 @@ . += "Alt-click to [locked ? "unlock" : "lock"] the interface." /obj/machinery/airalarm/ui_status(mob/user) - if(hasSiliconAccessInArea(user) && aidisabled) - to_chat(user, "AI control has been disabled.") - else if(!shorted) + if(hasSiliconAccessInArea(user)) + if(aidisabled) + to_chat(user, "AI control has been disabled") + return UI_CLOSE + else if(!issilicon(user)) //True sillycones use ..() + return UI_INTERACTIVE + if(!shorted) return ..() return UI_CLOSE +/obj/machinery/airalarm/can_interact(mob/user) + . = ..() + if (!issilicon(user) && hasSiliconAccessInArea(user)) + return TRUE + /obj/machinery/airalarm/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 97389848ba..25e4084524 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -336,4 +336,4 @@ return TRUE /obj/machinery/atmospherics/proc/update_layer() - layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE \ No newline at end of file + layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 43cb658210..35eb178771 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -106,4 +106,4 @@ It's like a regular ol' straight pipe, but you can turn it on and off. /obj/machinery/atmospherics/components/binary/valve/digital/on/layer3 piping_layer = 3 - icon_state = "dvalve_map-3" \ No newline at end of file + icon_state = "dvalve_map-3" diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index a8d9586fc4..b6911a1709 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -170,4 +170,4 @@ /obj/machinery/atmospherics/components/analyzer_act(mob/living/user, obj/item/I) atmosanalyzer_scan(airs, user, src) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index a07f131d62..9aa3c8c16d 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -196,8 +196,8 @@ icon_state = "inje_map-1" /obj/machinery/atmospherics/components/unary/outlet_injector/layer3 - piping_layer = 2 - icon_state = "inje_map-2" + piping_layer = 3 + icon_state = "inje_map-3" /obj/machinery/atmospherics/components/unary/outlet_injector/on on = TRUE @@ -207,8 +207,8 @@ icon_state = "inje_map-1" /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3 - piping_layer = 2 - icon_state = "inje_map-2" + piping_layer = 3 + icon_state = "inje_map-3" /obj/machinery/atmospherics/components/unary/outlet_injector/atmos frequency = FREQ_ATMOS_STORAGE diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm index 695cb61f51..ad5f65f9d3 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm @@ -42,4 +42,4 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer3 piping_layer = 3 - icon_state = "pipe11-3" \ No newline at end of file + icon_state = "pipe11-3" diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm index 3397e75314..bc46c1f831 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm @@ -35,4 +35,4 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer3 piping_layer = 3 - icon_state = "pipe11-3" \ No newline at end of file + icon_state = "pipe11-3" diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index aa8ee65bd8..3f061e3779 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -38,4 +38,4 @@ if(nodes[i]) add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) update_layer() - update_alpha() \ No newline at end of file + update_alpha() diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm index 56c0408d18..bbceff56da 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm @@ -36,4 +36,4 @@ if(nodes[i]) add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) ) update_layer() - update_alpha() \ No newline at end of file + update_alpha() diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm index c3f62f16cb..40afb39ec1 100644 --- a/code/modules/atmospherics/machinery/pipes/simple.dm +++ b/code/modules/atmospherics/machinery/pipes/simple.dm @@ -30,4 +30,4 @@ /obj/machinery/atmospherics/pipe/simple/update_icon() icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]" update_layer() - update_alpha() \ No newline at end of file + update_alpha() diff --git a/code/modules/atmospherics/multiz.dm b/code/modules/atmospherics/multiz.dm index 2b3a9af1c7..79a5c2cf14 100644 --- a/code/modules/atmospherics/multiz.dm +++ b/code/modules/atmospherics/multiz.dm @@ -26,4 +26,4 @@ obj/machinery/atmospherics/pipe/simple/multiz ///This is an atmospherics pipe wh above.nodes += src //Two way travel :) return ..() else - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index 2081077b90..36ed9b6ba3 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -27,4 +27,4 @@ /obj/effect/wind/process() var/turf/open/T = get_turf(src) if(istype(T)) - T.consider_pressure_difference(get_step(T,dir),strength) \ No newline at end of file + T.consider_pressure_difference(get_step(T,dir),strength) diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm index 86610a36b8..b45afea312 100644 --- a/code/modules/awaymissions/exile.dm +++ b/code/modules/awaymissions/exile.dm @@ -10,4 +10,4 @@ new /obj/item/implantcase/exile(src) new /obj/item/implantcase/exile(src) new /obj/item/implantcase/exile(src) - new /obj/item/implantcase/exile(src) \ No newline at end of file + new /obj/item/implantcase/exile(src) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index 1b099a22db..3ad7c7cb50 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -155,4 +155,4 @@ endTurfX = 159 endTurfY = 157 startTurfX = 37 - startTurfY = 35 \ No newline at end of file + startTurfY = 35 diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm index 3a112a5d91..5b8a66b7fd 100644 --- a/code/modules/awaymissions/mission_code/centcomAway.dm +++ b/code/modules/awaymissions/mission_code/centcomAway.dm @@ -60,4 +60,4 @@ teams never did figure out what happened that last time... and I can't wrap my head \ around it myself. Why would a shuttle full of evacuees all snap and beat each other \ to death the moment they reached safety?
\ - - D. Cereza" \ No newline at end of file + - D. Cereza" diff --git a/code/modules/awaymissions/mission_code/jungleresort.dm b/code/modules/awaymissions/mission_code/jungleresort.dm new file mode 100644 index 0000000000..6c78a81da2 --- /dev/null +++ b/code/modules/awaymissions/mission_code/jungleresort.dm @@ -0,0 +1,44 @@ +// welcome to the jungle, we got fun and games + +//areas + +/area/awaymission/jungleresort + name = "Jungle Resort" + icon_state = "awaycontent30" + +//objects + +/obj/item/paper/crumpled/awaymissions/jungleresort/notice + name = "Resort Notice" + info = "Due to unforeseen circumstances and the disappearance of several resort employees and visitors, the resort shall be closed to the public until further notice. - Resort Manager Joe Lawrence" + +/obj/item/melee/chainofcommand/jungle + name = "treasure hunter's whip" + desc = "The tool of a fallen treasure hunter, old and outdated, it still stings like hell to be hit by." + hitsound = 'sound/weapons/whip.ogg' + icon_state = "whip" + +//turfs + +/turf/open/water/jungle + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + +/turf/open/floor/plating/dirt/jungle + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + +/turf/open/floor/plating/dirt/dark/jungle + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + +/turf/closed/mineral/random/labormineral/jungle + baseturfs = /turf/open/floor/plating/asteroid + turf_type = /turf/open/floor/plating/asteroid + +//mobs + +/mob/living/carbon/monkey/punpun/curiousgorge + name = "Curious Gorge" + pet_monkey_names = list("Curious Gorge", "Jungle Gorge", "Jungah Joe", "Mr. Monke") + rare_pet_monkey_names = list("Sun Mukong", "Monkey Kong") + +/mob/living/simple_animal/hostile/jungle/leaper/boss + health = 450 diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 232ffe5754..434dc673f7 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -150,4 +150,4 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") mezzer() /obj/singularity/narsie/mini/ex_act() - return \ No newline at end of file + return diff --git a/code/modules/bsql/core/connection.dm b/code/modules/bsql/core/connection.dm index 0e0b891f65..fb8f729390 100644 --- a/code/modules/bsql/core/connection.dm +++ b/code/modules/bsql/core/connection.dm @@ -65,4 +65,4 @@ BSQL_DEL_PROC(/datum/BSQL_Connection) return null; . = world._BSQL_Internal_Call("QuoteString", id, "[str]") if(!.) - BSQL_ERROR("Library failed to provide quote for [str]!") \ No newline at end of file + BSQL_ERROR("Library failed to provide quote for [str]!") diff --git a/code/modules/buildmode/bm_mode.dm b/code/modules/buildmode/bm_mode.dm index 0c7d640fc0..5bd5f079fa 100644 --- a/code/modules/buildmode/bm_mode.dm +++ b/code/modules/buildmode/bm_mode.dm @@ -88,4 +88,4 @@ deselect_region() return -/datum/buildmode_mode/proc/handle_selected_area(client/c, params) \ No newline at end of file +/datum/buildmode_mode/proc/handle_selected_area(client/c, params) diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index b232bd212c..4a56257882 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -158,4 +158,4 @@ #undef BM_SWITCHSTATE_NONE #undef BM_SWITCHSTATE_MODE -#undef BM_SWITCHSTATE_DIR \ No newline at end of file +#undef BM_SWITCHSTATE_DIR diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm index c219f18cec..6901a0e42e 100644 --- a/code/modules/buildmode/buttons.dm +++ b/code/modules/buildmode/buttons.dm @@ -86,4 +86,4 @@ /obj/screen/buildmode/quit/Click() bd.quit() - return 1 \ No newline at end of file + return 1 diff --git a/code/modules/buildmode/effects/line.dm b/code/modules/buildmode/effects/line.dm index 8bba27ac88..d21c0787fa 100644 --- a/code/modules/buildmode/effects/line.dm +++ b/code/modules/buildmode/effects/line.dm @@ -25,4 +25,4 @@ cl.images -= I cl = null QDEL_NULL(I) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/buildmode/submodes/fill.dm b/code/modules/buildmode/submodes/fill.dm index 58320cff7b..b7d87edef2 100644 --- a/code/modules/buildmode/submodes/fill.dm +++ b/code/modules/buildmode/submodes/fill.dm @@ -59,4 +59,4 @@ else var/obj/A = new objholder(T) A.setDir(BM.build_dir) - log_admin("Build Mode: [key_name(c)] with path [objholder], filled the region from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]") \ No newline at end of file + log_admin("Build Mode: [key_name(c)] with path [objholder], filled the region from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]") diff --git a/code/modules/buildmode/submodes/mapgen.dm b/code/modules/buildmode/submodes/mapgen.dm index 2b57ec1180..7ed99afd50 100644 --- a/code/modules/buildmode/submodes/mapgen.dm +++ b/code/modules/buildmode/submodes/mapgen.dm @@ -45,4 +45,4 @@ var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No") if(confirm == "Yes") G.generate() - log_admin("Build Mode: [key_name(c)] ran the map generator '[G.buildmode_name]' in the region from [AREACOORD(cornerA)] to [AREACOORD(cornerB)]") \ No newline at end of file + log_admin("Build Mode: [key_name(c)] ran the map generator '[G.buildmode_name]' in the region from [AREACOORD(cornerA)] to [AREACOORD(cornerB)]") diff --git a/code/modules/cargo/bounties/botany.dm b/code/modules/cargo/bounties/botany.dm index 654bcfe74b..31e13e9a9b 100644 --- a/code/modules/cargo/bounties/botany.dm +++ b/code/modules/cargo/bounties/botany.dm @@ -227,4 +227,4 @@ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate) multiplier = 6 bonus_desc = "Under no circumstances mention this shipment to security." - foodtype = "\"meal\"" \ No newline at end of file + foodtype = "\"meal\"" diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 7f7f0b86e2..c83fa116d6 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -136,4 +136,4 @@ description = "There's a debate around command as to weather or not ribs should be considered finger food, and we need a few delicious racks to process." reward = 2250 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/bbqribs) \ No newline at end of file + wanted_types = list(/obj/item/reagent_containers/food/snacks/bbqribs) diff --git a/code/modules/cargo/bounties/gardencook.dm b/code/modules/cargo/bounties/gardencook.dm index 6fdd9b2a3f..39ebdceada 100644 --- a/code/modules/cargo/bounties/gardencook.dm +++ b/code/modules/cargo/bounties/gardencook.dm @@ -62,4 +62,4 @@ description = "Apparently people are putting vegetables on kebabs now. Central Command has taken an interest in this turn of events and would like to know more." reward = 2600 required_count = 3 - wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab/fiesta) \ No newline at end of file + wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab/fiesta) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 500e6d8ffe..77fbd6c6bd 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -72,7 +72,7 @@ holder = user_mob.client //if its a mob, assign the mob's client to holder bay = locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //Locate the default bay (one) from the centcom map bayNumber = bay.loading_id //Used as quick reference to what bay we're taking items from - var/area/pod_storage_area = locate(/area/centcom/supplypod/pod_storage) in GLOB.sortedAreas + var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas temp_pod = new(pick(get_area_turfs(pod_storage_area))) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed) orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1) selector = new(null, holder.mob) @@ -638,7 +638,7 @@ refreshView() /area/centcom/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area - . = ..() + . = ..() var/obj/imgbound = locate() in locate(200,SUPPLYPOD_X_OFFSET*-4.5, 1) call(GLOB.podlauncher, "RegisterSignal")(imgbound, "ct[GLOB.podstyles[14][9]]", "[GLOB.podstyles[14][10]]dlauncher") @@ -702,10 +702,11 @@ /datum/centcom_podlauncher/proc/launch(turf/target_turf) //Game time started if (isnull(target_turf)) return - var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result + var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod, sameloc = TRUE) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result toLaunch.update_icon()//we update_icon() here so that the door doesnt "flicker on" right after it lands - var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding] - toLaunch.forceMove(shippingLane) + //We don't have this area, lets just have it where we had the temp pod + //var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding] + //toLaunch.forceMove(shippingLane) if (launchClone) //We arent launching the actual items from the bay, rather we are creating clones and launching those if(launchRandomItem) var/launch_candidate = pick_n_take(launchList) diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index 675cbb2be0..e84d36d5dc 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/code/modules/cargo/exports/materials.dm @@ -100,4 +100,4 @@ /datum/export/material/runite cost = 300 message = "cm3 of runite" - material_id = /datum/material/runite \ No newline at end of file + material_id = /datum/material/runite diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 2a233b9116..efac62c930 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -11,7 +11,7 @@ allow_dense = TRUE delivery_icon = null can_weld_shut = FALSE - armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 100, BIO = 0, RAD = 0, FIRE = 100, ACID = 80) + armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80) anchored = TRUE //So it cant slide around after landing anchorable = FALSE flags_1 = PREVENT_CONTENTS_EXPLOSION_1 @@ -167,7 +167,7 @@ . += decal return else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking - . += door + . += door else var/icon/masked_door = new(icon, door) //The door we want to apply var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 53ab7f7abb..b71521121b 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -89,6 +89,8 @@ var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen. + /// Last time they used fix macros + var/last_macro_fix = 0 /// Keys currently held var/list/keys_held = list() /// These next two vars are to apply movement for keypresses and releases made while move delayed. diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 7d33a87111..267ee3a5e1 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -268,8 +268,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else prefs = new /datum/preferences(src) GLOB.preferences_datums[ckey] = prefs - - addtimer(CALLBACK(src, .proc/ensure_keys_set), 10) //prevents possible race conditions + + addtimer(CALLBACK(src, .proc/ensure_keys_set, prefs), 10) //prevents possible race conditions prefs.last_ip = address //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning @@ -443,7 +443,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") - //This is down here because of the browse() calls in tooltip/New() if(!tooltips) tooltips = new /datum/tooltip(src) @@ -475,11 +474,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( fit_viewport() Master.UpdateTickRate() -/client/proc/ensure_keys_set() - if(SSinput.initialized) - set_macros() - update_movement_keys(prefs) - ////////////// //DISCONNECT// ////////////// @@ -561,36 +555,49 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!query_client_in_db.Execute()) qdel(query_client_in_db) return - if(!query_client_in_db.NextRow()) - if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough)) - log_access("Failed Login: [key] - New account attempting to connect during panic bunker") - message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") - to_chat(src, "You must first join the Discord to verify your account before joining this server.
To do so, read the rules and post a request in the #station-access-requests channel under the \"Main server\" category in the Discord server linked here: https://discord.gg/E6SQuhz
If you have already done so, wait a few minutes then try again; sometimes the server needs to fully load before you can join.") //CIT CHANGE - makes the panic bunker disconnect message point to the discord - var/list/connectiontopic_a = params2list(connectiontopic) - var/list/panic_addr = CONFIG_GET(string/panic_server_address) - if(panic_addr && !connectiontopic_a["redirect"]) - var/panic_name = CONFIG_GET(string/panic_server_name) - to_chat(src, "Sending you to [panic_name ? panic_name : panic_addr].") - winset(src, null, "command=.options") - src << link("[panic_addr]?redirect=1") - qdel(query_client_in_db) - qdel(src) - return + if(!query_client_in_db.NextRow()) //new user detected + if(!holder && !GLOB.deadmins[ckey]) + if(CONFIG_GET(flag/panic_bunker) && !(ckey in GLOB.bunker_passthrough)) + log_access("Failed Login: [key] - New account attempting to connect during panic bunker") + message_admins("Failed Login: [key] - New account attempting to connect during panic bunker") + to_chat(src, "You must first join the Discord to verify your account before joining this server.
To do so, read the rules and post a request in the #station-access-requests channel under the \"Main server\" category in the Discord server linked here: https://discord.gg/E6SQuhz
If you have already done so, wait a few minutes then try again; sometimes the server needs to fully load before you can join.") //CIT CHANGE - makes the panic bunker disconnect message point to the discord + var/list/connectiontopic_a = params2list(connectiontopic) + var/list/panic_addr = CONFIG_GET(string/panic_server_address) + if(panic_addr && !connectiontopic_a["redirect"]) + var/panic_name = CONFIG_GET(string/panic_server_name) + to_chat(src, "Sending you to [panic_name ? panic_name : panic_addr].") + winset(src, null, "command=.options") + src << link("[panic_addr]?redirect=1") + qdel(query_client_in_db) + qdel(src) + return - new_player = 1 - account_join_date = sanitizeSQL(findJoinDate()) - var/sql_key = sanitizeSQL(key) - var/datum/DBQuery/query_add_player = SSdbcore.NewQuery("INSERT INTO [format_table_name("player")] (`ckey`, `byond_key`, `firstseen`, `firstseen_round_id`, `lastseen`, `lastseen_round_id`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`) VALUES ('[sql_ckey]', '[sql_key]', Now(), '[GLOB.round_id]', Now(), '[GLOB.round_id]', INET_ATON('[sql_ip]'), '[sql_computerid]', '[sql_admin_rank]', [account_join_date ? "'[account_join_date]'" : "NULL"])") - if(!query_add_player.Execute()) - qdel(query_client_in_db) + new_player = 1 + account_join_date = sanitizeSQL(findJoinDate()) + var/sql_key = sanitizeSQL(key) + var/datum/DBQuery/query_add_player = SSdbcore.NewQuery("INSERT INTO [format_table_name("player")] (`ckey`, `byond_key`, `firstseen`, `firstseen_round_id`, `lastseen`, `lastseen_round_id`, `ip`, `computerid`, `lastadminrank`, `accountjoindate`) VALUES ('[sql_ckey]', '[sql_key]', Now(), '[GLOB.round_id]', Now(), '[GLOB.round_id]', INET_ATON('[sql_ip]'), '[sql_computerid]', '[sql_admin_rank]', [account_join_date ? "'[account_join_date]'" : "NULL"])") + if(!query_add_player.Execute()) + qdel(query_client_in_db) + qdel(query_add_player) + return qdel(query_add_player) - return - qdel(query_add_player) - if(!account_join_date) - account_join_date = "Error" - account_age = -1 - else if(ckey in GLOB.bunker_passthrough) - GLOB.bunker_passthrough -= ckey + if(!account_join_date) + account_join_date = "Error" + account_age = -1 + else if(ckey in GLOB.bunker_passthrough) + GLOB.bunker_passthrough -= ckey + if(CONFIG_GET(flag/age_verification)) //setup age verification + if(!set_db_player_flags()) + message_admins(usr, "ERROR: Unable to read player flags from database. Please check logs.") + return + else + var/dbflags = prefs.db_flags + if(!(dbflags & DB_FLAG_AGE_CONFIRMATION_COMPLETE)) //they have not completed age verification + if((ckey in GLOB.bunker_passthrough)) //they're verified in the panic bunker though + update_flag_db(DB_FLAG_AGE_CONFIRMATION_COMPLETE, TRUE) + else + update_flag_db(DB_FLAG_AGE_CONFIRMATION_INCOMPLETE, TRUE) + qdel(query_client_in_db) var/datum/DBQuery/query_get_client_age = SSdbcore.NewQuery("SELECT firstseen, DATEDIFF(Now(),firstseen), accountjoindate, DATEDIFF(Now(),accountjoindate) FROM [format_table_name("player")] WHERE ckey = '[sql_ckey]'") if(!query_get_client_age.Execute()) @@ -924,23 +931,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( y = clamp(y+change, min,max) view_size.setDefault("[x]x[y]") -/client/proc/update_movement_keys(datum/preferences/direct_prefs) - var/datum/preferences/D = prefs || direct_prefs - if(!D?.key_bindings) - return - movement_keys = list() - for(var/key in D.key_bindings) - for(var/kb_name in D.key_bindings[key]) - switch(kb_name) - if("North") - movement_keys[key] = NORTH - if("East") - movement_keys[key] = EAST - if("West") - movement_keys[key] = WEST - if("South") - movement_keys[key] = SOUTH - /client/proc/change_view(new_size) if (isnull(new_size)) CRASH("change_view called without argument.") diff --git a/code/modules/client/message.dm b/code/modules/client/message.dm index 6904fa8973..1bb9d03dd8 100644 --- a/code/modules/client/message.dm +++ b/code/modules/client/message.dm @@ -7,4 +7,4 @@ GLOBAL_LIST_EMPTY(clientmessages) var/list/L = GLOB.clientmessages[ckey] if(!L) GLOB.clientmessages[ckey] = L = list() - L += message \ No newline at end of file + L += message diff --git a/code/modules/client/player_details.dm b/code/modules/client/player_details.dm index 814000ce48..6b2a936533 100644 --- a/code/modules/client/player_details.dm +++ b/code/modules/client/player_details.dm @@ -3,4 +3,4 @@ var/list/logging = list() var/list/post_login_callbacks = list() var/list/post_logout_callbacks = list() - var/byond_version = "Unknown" \ No newline at end of file + var/byond_version = "Unknown" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d817cc3a53..16d6ca351d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/path var/vr_path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used - var/max_save_slots = 16 + var/max_save_slots = 24 //non-preference stuff var/muted = 0 @@ -53,7 +53,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// List with a key string associated to a list of keybindings. Unlike key_bindings, this one operates on raw key, allowing for binding a key that triggers regardless of if a modifier is depressed as long as the raw key is sent. var/list/modless_key_bindings = list() - var/tgui_fancy = TRUE var/tgui_lock = TRUE var/windowflashing = TRUE @@ -101,73 +100,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/eye_type = DEFAULT_EYES_TYPE //Eye type var/split_eye_colors = FALSE var/datum/species/pref_species = new /datum/species/human() //Mutant race - var/list/features = list("mcolor" = "FFFFFF", - "mcolor2" = "FFFFFF", - "mcolor3" = "FFFFFF", - "tail_lizard" = "Smooth", - "tail_human" = "None", - "snout" = "Round", - "horns" = "None", - "horns_color" = "85615a", - "ears" = "None", - "wings" = "None", - "wings_color" = "FFF", - "frills" = "None", - "deco_wings" = "None", - "spines" = "None", - "body_markings" = "None", - "legs" = "Plantigrade", - "insect_wings" = "Plain", - "insect_fluff" = "None", - "insect_markings" = "None", - "arachnid_legs" = "Plain", - "arachnid_spinneret" = "Plain", - "arachnid_mandibles" = "Plain", - "mam_body_markings" = "Plain", - "mam_ears" = "None", - "mam_snouts" = "None", - "mam_tail" = "None", - "mam_tail_animated" = "None", - "xenodorsal" = "Standard", - "xenohead" = "Standard", - "xenotail" = "Xenomorph Tail", - "taur" = "None", - "genitals_use_skintone" = FALSE, - "has_cock" = FALSE, - "cock_shape" = DEF_COCK_SHAPE, - "cock_length" = COCK_SIZE_DEF, - "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, - "cock_color" = "ffffff", - "cock_taur" = FALSE, - "has_balls" = FALSE, - "balls_color" = "ffffff", - "balls_shape" = DEF_BALLS_SHAPE, - "balls_size" = BALLS_SIZE_DEF, - "balls_cum_rate" = CUM_RATE, - "balls_cum_mult" = CUM_RATE_MULT, - "balls_efficiency" = CUM_EFFICIENCY, - "has_breasts" = FALSE, - "breasts_color" = "ffffff", - "breasts_size" = BREASTS_SIZE_DEF, - "breasts_shape" = DEF_BREASTS_SHAPE, - "breasts_producing" = FALSE, - "has_vag" = FALSE, - "vag_shape" = DEF_VAGINA_SHAPE, - "vag_color" = "ffffff", - "has_womb" = FALSE, - "balls_visibility" = GEN_VISIBLE_NO_UNDIES, - "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, - "cock_visibility" = GEN_VISIBLE_NO_UNDIES, - "vag_visibility" = GEN_VISIBLE_NO_UNDIES, - "ipc_screen" = "Sunburst", - "ipc_antenna" = "None", - "flavor_text" = "", - "silicon_flavor_text" = "", - "ooc_notes" = "", - "meat_type" = "Mammalian", - "body_model" = MALE, - "body_size" = RESIZE_DEFAULT_SIZE - ) + var/list/features = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF", "mcolor3" = "FFFFFF", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "horns_color" = "85615a", "ears" = "None", "wings" = "None", "wings_color" = "FFF", "frills" = "None", "deco_wings" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", "insect_markings" = "None", "arachnid_legs" = "Plain", "arachnid_spinneret" = "Plain", "arachnid_mandibles" = "Plain", "mam_body_markings" = "Plain", "mam_ears" = "None", "mam_snouts" = "None", "mam_tail" = "None", "mam_tail_animated" = "None", "xenodorsal" = "Standard", "xenohead" = "Standard", "xenotail" = "Xenomorph Tail", "taur" = "None", "genitals_use_skintone" = FALSE, "has_cock" = FALSE, "cock_shape" = DEF_COCK_SHAPE, "cock_length" = COCK_SIZE_DEF, "cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF, "cock_color" = "ffffff", "cock_taur" = FALSE, "has_balls" = FALSE, "balls_color" = "ffffff", "balls_shape" = DEF_BALLS_SHAPE, "balls_size" = BALLS_SIZE_DEF, "balls_cum_rate" = CUM_RATE, "balls_cum_mult" = CUM_RATE_MULT, "balls_efficiency" = CUM_EFFICIENCY, "has_breasts" = FALSE, "breasts_color" = "ffffff", "breasts_size" = BREASTS_SIZE_DEF, "breasts_shape" = DEF_BREASTS_SHAPE, "breasts_producing" = FALSE, "has_vag" = FALSE, "vag_shape" = DEF_VAGINA_SHAPE, "vag_color" = "ffffff", "has_womb" = FALSE, "balls_visibility" = GEN_VISIBLE_NO_UNDIES, "breasts_visibility"= GEN_VISIBLE_NO_UNDIES, "cock_visibility" = GEN_VISIBLE_NO_UNDIES, "vag_visibility" = GEN_VISIBLE_NO_UNDIES, "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, "body_size" = RESIZE_DEFAULT_SIZE, "color_scheme" = OLD_CHARACTER_COLORING) + var/custom_speech_verb = "default" //if your say_mod is to be something other than your races var/custom_tongue = "default" //if your tongue is to be something other than your races var/modified_limbs = list() //prosthetic/amputated limbs @@ -276,7 +210,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) load_path(C.ckey) unlock_content = C.IsByondMember() if(unlock_content) - max_save_slots = 24 + max_save_slots = 32 var/loaded_preferences_successfully = load_preferences() if(loaded_preferences_successfully) if(load_character()) @@ -284,7 +218,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //we couldn't load character data so just randomize the character appearance + name random_character() //let's create a random character then - rather than a fat, bald and naked man. key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys - C?.update_movement_keys(src) + C?.ensure_keys_set(src) real_name = pref_species.random_name(gender,1) if(!loaded_preferences_successfully) save_preferences() @@ -470,6 +404,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(!use_skintones) dat += APPEARANCE_CATEGORY_COLUMN + dat += "

Advanced Coloring

" + dat += "[(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) ? "Enabled" : "Disabled"]" + dat += "

Body Colors

" dat += "Primary Color:
" @@ -482,7 +419,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "    Change
" mutant_colors = TRUE - if (CONFIG_GET(number/body_size_min) != CONFIG_GET(number/body_size_max)) dat += "Sprite Size: [features["body_size"]*100]%
" if(!(NOEYES in pref_species.species_traits)) @@ -552,6 +488,52 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/color_type = GLOB.colored_mutant_parts[mutant_part] //if it can be coloured, show the appropriate button if(color_type) dat += "    Change
" + else + if(features["color_scheme"] == ADVANCED_CHARACTER_COLORING) //advanced individual part colouring system + //is it matrixed or does it have extra parts to be coloured? + var/find_part = features[mutant_part] || pref_species.mutant_bodyparts[mutant_part] + var/find_part_list = GLOB.mutant_reference_list[mutant_part] + if(find_part && find_part != "None" && find_part_list) + var/datum/sprite_accessory/accessory = find_part_list[find_part] + if(accessory) + if(accessory.color_src == MATRIXED || accessory.color_src == MUTCOLORS || accessory.color_src == MUTCOLORS2 || accessory.color_src == MUTCOLORS3) //mutcolors1-3 are deprecated now, please don't rely on these in the future + var/mutant_string = accessory.mutant_part_string + if(istype(accessory, /datum/sprite_accessory/mam_body_markings) || istype(accessory, /datum/sprite_accessory/body_markings)) + continue + var/primary_feature = "[mutant_string]_primary" + var/secondary_feature = "[mutant_string]_secondary" + var/tertiary_feature = "[mutant_string]_tertiary" + if(!features[primary_feature]) + features[primary_feature] = features["mcolor"] + if(!features[secondary_feature]) + features[secondary_feature] = features["mcolor2"] + if(!features[tertiary_feature]) + features[tertiary_feature] = features["mcolor3"] + + var/matrixed_sections = accessory.matrixed_sections + if(accessory.color_src == MATRIXED && !matrixed_sections) + message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") + continue + else if(accessory.color_src == MATRIXED) + switch(matrixed_sections) + if(MATRIX_GREEN) //only composed of a green section + primary_feature = secondary_feature //swap primary for secondary, so it properly assigns the second colour, reserved for the green section + if(MATRIX_BLUE) + primary_feature = tertiary_feature //same as above, but the tertiary feature is for the blue section + if(MATRIX_RED_BLUE) //composed of a red and blue section + secondary_feature = tertiary_feature //swap secondary for tertiary, as blue should always be tertiary + if(MATRIX_GREEN_BLUE) //composed of a green and blue section + primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary + secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary + dat += "Primary Color
" + dat += "    Change
" + if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) + dat += "Secondary Color
" + dat += "    Change
" + if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) + dat += "Tertiary Color
" + dat += "    Change
" + mutant_category++ if(mutant_category >= MAX_MUTANT_ROWS) dat += "" @@ -969,7 +951,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/default_keys = hotkeys ? kb.hotkey_keys : kb.classic_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" - dat += "Independent Binding: [current_independent_binding]" + dat += "" + if(!kb.special && !kb.clientside) + dat += "Independent Binding: [current_independent_binding]" dat += "
" else var/bound_key = user_binds[kb.name][1] @@ -982,7 +966,9 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/default_keys = hotkeys ? kb.classic_keys : kb.hotkey_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" - dat += "Independent Binding: [current_independent_binding]" + dat += "" + if(!kb.special && !kb.clientside) + dat += "Independent Binding: [current_independent_binding]" dat += "
" dat += "

" @@ -1008,7 +994,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) #undef APPEARANCE_CATEGORY_COLUMN #undef MAX_MUTANT_ROWS -/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE) +/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE, special = FALSE) var/HTML = {"
Keybinding: [kb.full_name]
[kb.description]

Press any key to change
Press ESC to clear
\n" + inline_assets_str += "Byond.loadJs('[url]', true);\n" asset.send(client) - html = replacetextEx(html, "\n", inline_styles) - html = replacetextEx(html, "\n", inline_scripts) + if(length(inline_assets_str)) + inline_assets_str = "\n" + html = replacetextEx(html, "\n", inline_assets_str) // Inject custom HTML html = replacetextEx(html, "\n", inline_html) // Open the window diff --git a/code/modules/unit_tests/timer_sanity.dm b/code/modules/unit_tests/timer_sanity.dm index 1e5b022b19..d92323a525 100644 --- a/code/modules/unit_tests/timer_sanity.dm +++ b/code/modules/unit_tests/timer_sanity.dm @@ -1,3 +1,3 @@ /datum/unit_test/timer_sanity/Run() if(SStimer.bucket_count < 0) - Fail("SStimer is going into negative bucket count from something") \ No newline at end of file + Fail("SStimer is going into negative bucket count from something") diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 14cdd30931..b4490f715b 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -74,9 +74,9 @@ /obj/item/staff = 3, /obj/item/clothing/under/rank/civilian/mime/skirt = 1, /obj/item/clothing/under/rank/captain/suit/skirt = 1, - /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/mask/gas/clown_hat/sexy = 1, /obj/item/clothing/under/rank/civilian/clown/sexy = 1, - /obj/item/clothing/mask/gas/sexymime = 1, + /obj/item/clothing/mask/gas/mime/sexy = 1, /obj/item/clothing/under/rank/civilian/mime/sexy = 1, /obj/item/clothing/mask/rat/bat = 1, /obj/item/clothing/mask/rat/bee = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index bd821d80e3..462d4b5cb5 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -181,6 +181,7 @@ /obj/item/clothing/under/pants/mustangjeans = 3, /obj/item/clothing/neck/necklace/dope = 5, /obj/item/clothing/suit/jacket/letterman_nanotrasen = 5, + /obj/item/clothing/under/misc/corporateuniform = 5, /obj/item/clothing/suit/hooded/wintercoat/polychromic = 5) refill_canister = /obj/item/vending_refill/clothing default_price = PRICE_CHEAP diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index 7fd8246dd6..6c29b412e7 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -4,7 +4,7 @@ product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initiative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!" icon_state = "games" products = list(/obj/item/toy/cards/deck = 5, - /obj/item/storage/box/dice = 10, + /obj/item/storage/dice = 10, /obj/item/toy/cards/deck/cas = 3, /obj/item/toy/cards/deck/cas/black = 3, /obj/item/toy/cards/deck/unum = 3) diff --git a/code/modules/vore/hook-defs.dm b/code/modules/vore/hook-defs.dm index 629b1ba8f3..5c3c3d01c8 100644 --- a/code/modules/vore/hook-defs.dm +++ b/code/modules/vore/hook-defs.dm @@ -34,4 +34,4 @@ result = 0 //Return 1 to superhook - return result \ No newline at end of file + return result diff --git a/code/modules/vore/persistence.dm b/code/modules/vore/persistence.dm index f45a759fa3..0fcbdc9bb0 100644 --- a/code/modules/vore/persistence.dm +++ b/code/modules/vore/persistence.dm @@ -87,4 +87,4 @@ in their list var/atom/movable/thing = new path(loc) thing.deserialize(data) - return thing \ No newline at end of file + return thing diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm index 2cb3a83257..f208cafe4e 100644 --- a/code/modules/zombie/items.dm +++ b/code/modules/zombie/items.dm @@ -91,4 +91,4 @@
  • Optionally: Inject chemical into foods and drinks to further spread possible infection
    • \
  • ???
    • \
  • Complete assigned objectives amidst the chaos
    • \ - " \ No newline at end of file + " diff --git a/config/awaymissionconfig.txt b/config/awaymissionconfig.txt index 768942c434..2663a206da 100644 --- a/config/awaymissionconfig.txt +++ b/config/awaymissionconfig.txt @@ -11,6 +11,7 @@ #_maps/RandomZLevels/away_mission/Academy.dmm #_maps/RandomZLevels/away_mission/wildwest.dmm #_maps/RandomZLevels/away_mission/challenge.dmm +_maps/RandomZLevels/away_mission/jungleresort.dmm #_maps/RandomZLevels/away_mission/moonoutpost19.dmm #_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm #_maps/RandomZLevels/away_mission/caves.dmm diff --git a/config/config.txt b/config/config.txt index a550e6bf8a..5be76972ab 100644 --- a/config/config.txt +++ b/config/config.txt @@ -375,6 +375,9 @@ NOTIFY_NEW_PLAYER_ACCOUNT_AGE 1 ##Name of the place to send people rejected by the bunker #PANIC_SERVER_NAME [Put the name here] +##Automated age verification, comment this out to not ask new users if they are 18+ +AGE_VERIFICATION + ## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog #AGGRESSIVE_CHANGELOG @@ -408,7 +411,7 @@ ALLOW_MAP_VOTING 1 ## APPROVAL (can vote for as many as you want), I ## IRV (vote by ranked choice, winner determined by instant runoff algorithm) ## SCORE (give individual rankings of each choice, winner determined by majority judgement algorithm) -MAP_VOTE_TYPE SCORE +MAP_VOTE_TYPE APPROVAL ## Map rotate chance delta ## This is the chance of map rotation factored to the round length. @@ -519,7 +522,7 @@ DEFAULT_VIEW 21x15 ### NOTE FOR LINUX HOSTS: This requires manual setup of iptables. Beware that improper configuration of this can and will irreversibly fuck up a server, so please don't tinker with it if you don't know what you're doing. ## Enabled #FAIL2TOPIC_ENABLED -## Minimum wait time in deciseconds between valid requests +## Minimum wait time in deciseconds between valid requests FAIL2TOPIC_RATE_LIMIT 10 ## Number of requests after breaching rate limit that triggers a ban FAIL2TOPIC_MAX_FAILS 5 diff --git a/config/game_options.txt b/config/game_options.txt index bb6c5d8f01..bc5fdf940e 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -651,17 +651,17 @@ PENIS_MIN_INCHES_PREFS 1 PENIS_MAX_INCHES_PREFS 20 ## Body size configs, the feature will be disabled if both min and max have the same value. -BODY_SIZE_MIN 1 -BODY_SIZE_MAX 1 +BODY_SIZE_MIN 0.9 +BODY_SIZE_MAX 1.25 ## Pun-Pun movement slowdown given to characters with a body size smaller than this value, ## to compensate for their smaller hitbox. ## To disable, just make sure the value is lower than 'body_size_min' -THRESHOLD_BODY_SIZE_SLOWDOWN 0.85 +THRESHOLD_BODY_SIZE_PENALTY 1 ## Multiplier used in the smaller strides slowdown calculation. ## Doesn't apply to floating or crawling mobs. -BODY_SIZE_SLOWDOWN_MULTIPLIER 0.25 +BODY_SIZE_SLOWDOWN_MULTIPLIER 0 ## Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones. ALLOW_CUSTOM_SKINTONES diff --git a/html/changelogs/AutoChangeLog-pr-13521.yml b/html/changelogs/AutoChangeLog-pr-13521.yml new file mode 100644 index 0000000000..77aca8c363 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13521.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "zeolites are now actual fermichems instead of being incredibly easy to make." + - bugfix: "Using syringes / droppers on chem heaters with beakers in them works again." diff --git a/html/changelogs/AutoChangeLog-pr-13567.yml b/html/changelogs/AutoChangeLog-pr-13567.yml new file mode 100644 index 0000000000..d51db8e3b8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13567.yml @@ -0,0 +1,8 @@ +author: "timothyteakettle" +delete-after: True +changes: + - tweak: "changeling stings retract upon turning into a slime puddle" + - tweak: "you cannot transform into a slime puddle with a no drop item in your hands" + - tweak: "slime puddles are now transparent and their colour looks more natural in comparison to the user" + - tweak: "slime puddles are now even slower" + - tweak: "slime puddles now get no protection from worn clothing" diff --git a/html/changelogs/AutoChangeLog-pr-13576.yml b/html/changelogs/AutoChangeLog-pr-13576.yml new file mode 100644 index 0000000000..9443b13dcb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13576.yml @@ -0,0 +1,5 @@ +author: "Sonic121x" +delete-after: True +changes: + - rscadd: "digi sprite uniform" + - bugfix: "digi leg suit" diff --git a/html/changelogs/AutoChangeLog-pr-13581.yml b/html/changelogs/AutoChangeLog-pr-13581.yml new file mode 100644 index 0000000000..42db54450b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13581.yml @@ -0,0 +1,6 @@ +author: "Ghommie, porting PRs by MMMiracles and pireamaineach, credits to BlueWildrose too." +delete-after: True +changes: + - rscadd: "You can now draw on plasmaman helmets with a crayon to turn their frown upside-down." + - balance: "Plasmaman helmets no longer hide your identity when worn by themselves." + - balance: "Plasmaman helmets now have welding visors, which can't stack with their torches in the helmet and are visible." diff --git a/html/changelogs/AutoChangeLog-pr-13582.yml b/html/changelogs/AutoChangeLog-pr-13582.yml new file mode 100644 index 0000000000..78f8be1cd0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13582.yml @@ -0,0 +1,5 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "a tonne of fixes to colourisation of parts, too many to name, including some sprite fixes" + - rscadd: "things now have their own individual primary/(secondary)/(tertiary) colours as required, and these can be modified by you" diff --git a/html/changelogs/AutoChangeLog-pr-13586.yml b/html/changelogs/AutoChangeLog-pr-13586.yml new file mode 100644 index 0000000000..5f61b1dc54 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13586.yml @@ -0,0 +1,4 @@ +author: "KeRSedChaplain" +delete-after: True +changes: + - imageadd: "Resprited the brass claw" diff --git a/html/changelogs/AutoChangeLog-pr-13588.yml b/html/changelogs/AutoChangeLog-pr-13588.yml new file mode 100644 index 0000000000..7ab9d67bab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13588.yml @@ -0,0 +1,5 @@ +author: "Delams-The-SM" +delete-after: True +changes: + - rscadd: "Added 3 new emotes *hiss *purr *meow" + - soundadd: "ported sounds from Citadel RP for *purr and *meow" diff --git a/html/changelogs/AutoChangeLog-pr-13592.yml b/html/changelogs/AutoChangeLog-pr-13592.yml new file mode 100644 index 0000000000..76e12e8c89 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13592.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Stat panel UI for ranked choice votes" diff --git a/html/changelogs/AutoChangeLog-pr-13593.yml b/html/changelogs/AutoChangeLog-pr-13593.yml new file mode 100644 index 0000000000..08310f6013 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13593.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - code_imp: "Vote system #defines are now strings" diff --git a/html/changelogs/AutoChangeLog-pr-13598.yml b/html/changelogs/AutoChangeLog-pr-13598.yml new file mode 100644 index 0000000000..7bef81fa1a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13598.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - bugfix: "Fixes hijack implant APC UI, again" diff --git a/html/changelogs/AutoChangeLog-pr-13599.yml b/html/changelogs/AutoChangeLog-pr-13599.yml new file mode 100644 index 0000000000..3deea2b2be --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13599.yml @@ -0,0 +1,4 @@ +author: "Delams-The-SM" +delete-after: True +changes: + - bugfix: "fixed randomization of colors for things like mulligan and Stabilized green slime extract for matrixed body parts" diff --git a/html/changelogs/AutoChangeLog-pr-13601.yml b/html/changelogs/AutoChangeLog-pr-13601.yml new file mode 100644 index 0000000000..0cfb64b48b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13601.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - tweak: "antag items are now of critical importance and wont fail to be placed on the character" diff --git a/html/changelogs/AutoChangeLog-pr-13602.yml b/html/changelogs/AutoChangeLog-pr-13602.yml new file mode 100644 index 0000000000..24185b1792 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13602.yml @@ -0,0 +1,5 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "A fallback for dynamic antag rolling that allows for it to just try between traitor, blood brothers, heretics, changeling, bloodsucker and devil until there are enough roundstart antags. This can also happen randomly anyway. Blood brothers and devil are disabled for now, but the code is there to enable them." + - rscadd: "A new storyteller, \"Grab Bag\", that forces the above round type." diff --git a/html/changelogs/AutoChangeLog-pr-13603.yml b/html/changelogs/AutoChangeLog-pr-13603.yml new file mode 100644 index 0000000000..4fcff30da0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13603.yml @@ -0,0 +1,5 @@ +author: "kappa-sama" +delete-after: True +changes: + - tweak: "ishotgun crafting recipe no longer requires plasteel and is slightly more convenient" + - balance: "ishotgun does 45 damage now instead of 40.5" diff --git a/html/changelogs/AutoChangeLog-pr-13604.yml b/html/changelogs/AutoChangeLog-pr-13604.yml new file mode 100644 index 0000000000..2ac141215b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13604.yml @@ -0,0 +1,5 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - balance: "Brass welders are 50% faster at refueling" + - code_imp: "redoes self fueling welders in the code to be less speggie" diff --git a/html/changelogs/AutoChangeLog-pr-13605.yml b/html/changelogs/AutoChangeLog-pr-13605.yml new file mode 100644 index 0000000000..707de17870 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13605.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - rscadd: "the corporate unifoms can now be gotton in the clothing mate vender" diff --git a/html/changelogs/AutoChangeLog-pr-13606.yml b/html/changelogs/AutoChangeLog-pr-13606.yml new file mode 100644 index 0000000000..568f8cf7e6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13606.yml @@ -0,0 +1,5 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "adminhelping no longer removes entire admin tab" + - bugfix: "end of round no longer removes entire admin tab" diff --git a/html/changelogs/AutoChangeLog-pr-13607.yml b/html/changelogs/AutoChangeLog-pr-13607.yml new file mode 100644 index 0000000000..0ed47b1d44 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13607.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "polychromic maid outfit" diff --git a/html/changelogs/AutoChangeLog-pr-13608.yml b/html/changelogs/AutoChangeLog-pr-13608.yml new file mode 100644 index 0000000000..b7c0201cab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13608.yml @@ -0,0 +1,4 @@ +author: "SpaceManiac" +delete-after: True +changes: + - bugfix: "Fixed the maphook" diff --git a/html/changelogs/AutoChangeLog-pr-13611.yml b/html/changelogs/AutoChangeLog-pr-13611.yml new file mode 100644 index 0000000000..d7e6e8f9a1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13611.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - rscadd: "Adds a space loop to every map in toxins" diff --git a/html/changelogs/AutoChangeLog-pr-13612.yml b/html/changelogs/AutoChangeLog-pr-13612.yml new file mode 100644 index 0000000000..9a67ec5aa3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13612.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - rscadd: "Expanded space hermit base" diff --git a/html/changelogs/AutoChangeLog-pr-13616.yml b/html/changelogs/AutoChangeLog-pr-13616.yml new file mode 100644 index 0000000000..3032d0331f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13616.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "You can access the mime / clown mask skins radial menu once again." diff --git a/html/changelogs/AutoChangeLog-pr-13618.yml b/html/changelogs/AutoChangeLog-pr-13618.yml new file mode 100644 index 0000000000..b301c39e6b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13618.yml @@ -0,0 +1,5 @@ +author: "Vynzill" +delete-after: True +changes: + - rscadd: "new gateway mission +mapadd: jungleresort map" diff --git a/html/changelogs/AutoChangeLog-pr-13626.yml b/html/changelogs/AutoChangeLog-pr-13626.yml new file mode 100644 index 0000000000..fa5331e005 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13626.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - balance: "MEGAFAUNA DROPS ARE LAVAPROOF" diff --git a/html/changelogs/AutoChangeLog-pr-13627.yml b/html/changelogs/AutoChangeLog-pr-13627.yml new file mode 100644 index 0000000000..087cbde3ae --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13627.yml @@ -0,0 +1,8 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Dice bags no longer act like cardboard boxes." + - bugfix: "Abductors should be no longer mute." + - bugfix: "Item action buttons should now properly show the item current overlays, most times." + - bugfix: "The blackbox should now go into your hand slot when pried out, rather than tumbling on the ground everytime." + - tweak: "The Quick Equip hotkey is now usable by all living mobs (so long they have hands and equipment slots)" diff --git a/html/changelogs/AutoChangeLog-pr-13629.yml b/html/changelogs/AutoChangeLog-pr-13629.yml new file mode 100644 index 0000000000..954f6972ec --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13629.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscdel: "anomalies no longer spawn in walls" diff --git a/html/changelogs/AutoChangeLog-pr-13630.yml b/html/changelogs/AutoChangeLog-pr-13630.yml new file mode 100644 index 0000000000..f7e80aaf9e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13630.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "you can now customize your size from 90% to 130%, going below 100% makes you have 10 less max health" diff --git a/html/changelogs/AutoChangeLog-pr-13632.yml b/html/changelogs/AutoChangeLog-pr-13632.yml new file mode 100644 index 0000000000..bf478ec97c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13632.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "time for memory loss message to show up when being revived is now correctly 300 seconds, instead of 30" diff --git a/html/changelogs/AutoChangeLog-pr-13633.yml b/html/changelogs/AutoChangeLog-pr-13633.yml new file mode 100644 index 0000000000..d9246cfff6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13633.yml @@ -0,0 +1,4 @@ +author: "ArchieBeepBoop" +delete-after: True +changes: + - bugfix: "Outlet Injector Mapping Asset Layer Fix" diff --git a/html/changelogs/AutoChangeLog-pr-13635.yml b/html/changelogs/AutoChangeLog-pr-13635.yml new file mode 100644 index 0000000000..21730d4cf5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13635.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - balance: "The bone gauntlets should be slightly less murderously punchy on the fast punches mode." diff --git a/html/changelogs/AutoChangeLog-pr-13636.yml b/html/changelogs/AutoChangeLog-pr-13636.yml new file mode 100644 index 0000000000..75124f759f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13636.yml @@ -0,0 +1,4 @@ +author: "SiliconMain" +delete-after: True +changes: + - tweak: "Engi department has gas masks in loadout" diff --git a/html/changelogs/AutoChangeLog-pr-13639.yml b/html/changelogs/AutoChangeLog-pr-13639.yml new file mode 100644 index 0000000000..a511d0a909 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13639.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - tweak: "ASP 9mm and M1911 can now have suppressers added" diff --git a/html/changelogs/AutoChangeLog-pr-13641.yml b/html/changelogs/AutoChangeLog-pr-13641.yml new file mode 100644 index 0000000000..b0c429da75 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13641.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - balance: "Nerf combat knife damage" diff --git a/html/changelogs/AutoChangeLog-pr-13644.yml b/html/changelogs/AutoChangeLog-pr-13644.yml new file mode 100644 index 0000000000..71417788a7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13644.yml @@ -0,0 +1,8 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "Biomechanical (hybrid) bodyparts now have access to wound-fixing surgeries." + - tweak: "A wound being fixed no longer just qdel()s surgeries connected to it." + - tweak: "Some robotic surgery steps are now a bit more clear." + - bugfix: "Organs no longer get fed to people after successfully being inserted into them." + - tweak: "Not completing the do_after of a surgery no longer causes you to attack the target with whatever you were holding." diff --git a/html/changelogs/AutoChangeLog-pr-13647.yml b/html/changelogs/AutoChangeLog-pr-13647.yml new file mode 100644 index 0000000000..b3211ee759 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13647.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - bugfix: "jacqueline spawns on boxstation" diff --git a/html/changelogs/AutoChangeLog-pr-13648.yml b/html/changelogs/AutoChangeLog-pr-13648.yml new file mode 100644 index 0000000000..4148230385 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13648.yml @@ -0,0 +1,13 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "The 'Your body is in a cloner' notification works again" + - bugfix: "Hijack implants should work properly again (or, at least better)" + - bugfix: "Liches are now good skeletons again instead of weak ones" + - bugfix: "The piratepad control cannot be destroyed again." + - bugfix: "Pirates have received new supplies of jetpacks instead of useless oxygen tanks" + - bugfix: "Ratvarian AIs are once again able to show their linked borgs Ratvar's light" + - bugfix: "Hijackers are once again unable to detonate borgs without being adjacent to the console" + - bugfix: "Automated annoucement systems and gulag ore consoles no longer waste emag charges" + - bugfix: "Automated announcement systems once again can be remote controlled by non-AIs with silicon access" + - bugfix: "APCs being hijacked multiple times at once is no longer possible, preventing some issues" diff --git a/html/changelogs/AutoChangeLog-pr-13653.yml b/html/changelogs/AutoChangeLog-pr-13653.yml new file mode 100644 index 0000000000..2f920da353 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13653.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - tweak: "Minor fixes to kilo" diff --git a/html/changelogs/AutoChangeLog-pr-13654.yml b/html/changelogs/AutoChangeLog-pr-13654.yml new file mode 100644 index 0000000000..cb67c6e6be --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13654.yml @@ -0,0 +1,4 @@ +author: "ArchieBeepBoop" +delete-after: True +changes: + - bugfix: "Jacqueen and the Christmas tree should no longer spawn abstract things that can cause shittons of runtimes." diff --git a/html/changelogs/AutoChangeLog-pr-13655.yml b/html/changelogs/AutoChangeLog-pr-13655.yml new file mode 100644 index 0000000000..6e48c84054 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13655.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "fixes held items proccing crossed when passing someone" diff --git a/html/changelogs/AutoChangeLog-pr-13656.yml b/html/changelogs/AutoChangeLog-pr-13656.yml new file mode 100644 index 0000000000..017f0d99c2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13656.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - admin: "Canceling events gives more time to stop from 10 to 30" diff --git a/html/changelogs/AutoChangeLog-pr-13657.yml b/html/changelogs/AutoChangeLog-pr-13657.yml new file mode 100644 index 0000000000..6f445f6b71 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13657.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "The transmission sigil power drain works now" diff --git a/html/changelogs/AutoChangeLog-pr-13658.yml b/html/changelogs/AutoChangeLog-pr-13658.yml new file mode 100644 index 0000000000..09b22d38ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13658.yml @@ -0,0 +1,6 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Scripture no longer sometimes eats part of its invocation." + - balance: "APCs and silicons are now more susceptible to powerdrains (by the power_drain() proc, which is rare)" + - balance: "Void Volt has been modified from a chant to a singular pulse." diff --git a/html/changelogs/AutoChangeLog-pr-13659.yml b/html/changelogs/AutoChangeLog-pr-13659.yml new file mode 100644 index 0000000000..85eee3b78d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13659.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "the load away mission verb won't crash the server now" diff --git a/html/changelogs/AutoChangeLog-pr-13661.yml b/html/changelogs/AutoChangeLog-pr-13661.yml new file mode 100644 index 0000000000..81b5a735dc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13661.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "added in-game age verification as an alternative to access requests" diff --git a/html/changelogs/AutoChangeLog-pr-13662.yml b/html/changelogs/AutoChangeLog-pr-13662.yml new file mode 100644 index 0000000000..6ac16937d8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13662.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "you can now be an angel using a magic mirror again" diff --git a/html/changelogs/AutoChangeLog-pr-13669.yml b/html/changelogs/AutoChangeLog-pr-13669.yml new file mode 100644 index 0000000000..c682500501 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13669.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - tweak: "Being sacrificed by the cult no longer removes all hope of rescue." diff --git a/html/changelogs/AutoChangeLog-pr-13670.yml b/html/changelogs/AutoChangeLog-pr-13670.yml new file mode 100644 index 0000000000..594e459d5a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13670.yml @@ -0,0 +1,4 @@ +author: "shellspeed1" +delete-after: True +changes: + - tweak: "Floor bots are now buildable with all toolboxes." diff --git a/html/changelogs/AutoChangeLog-pr-13671.yml b/html/changelogs/AutoChangeLog-pr-13671.yml new file mode 100644 index 0000000000..855028d9ed --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13671.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - code_imp: "Clockwork rites now support hiding specific rites from neutered servants." diff --git a/html/changelogs/AutoChangeLog-pr-13673.yml b/html/changelogs/AutoChangeLog-pr-13673.yml new file mode 100644 index 0000000000..40b45d80f4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13673.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - bugfix: "Makes construct mind returning more robust" diff --git a/html/changelogs/AutoChangeLog-pr-13674.yml b/html/changelogs/AutoChangeLog-pr-13674.yml new file mode 100644 index 0000000000..ccbd96aeb4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13674.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "The borg VTEC ability now actually gets removed when the upgrade is removed." diff --git a/html/changelogs/AutoChangeLog-pr-13675.yml b/html/changelogs/AutoChangeLog-pr-13675.yml new file mode 100644 index 0000000000..d46d4490d3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13675.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Sleeper UI interactiveness now behaves correctly." diff --git a/html/changelogs/AutoChangeLog-pr-13676.yml b/html/changelogs/AutoChangeLog-pr-13676.yml new file mode 100644 index 0000000000..d584af38dc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13676.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Fixes a minor incorrectness in ratvarian borg slabs (ratvar_act -> ui_act)" diff --git a/html/changelogs/AutoChangeLog-pr-13678.yml b/html/changelogs/AutoChangeLog-pr-13678.yml new file mode 100644 index 0000000000..261ecc3475 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13678.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - code_imp: "Comments out spaceman dmm do not sleeps for mob/proc/CommonClickOn, atom/proc/attack_hand, datum/proc/keyLoop and mob/living/proc/Life" diff --git a/html/changelogs/AutoChangeLog-pr-13679.yml b/html/changelogs/AutoChangeLog-pr-13679.yml new file mode 100644 index 0000000000..37b9d287b0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13679.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - rscadd: "Robots (anyone with the robotic_organism trait) have toxins damage replaced with system corruption. See the PR for details." diff --git a/html/changelogs/AutoChangeLog-pr-13680.yml b/html/changelogs/AutoChangeLog-pr-13680.yml new file mode 100644 index 0000000000..a1e58ac3a5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13680.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "A runtime caused by hallucinations is gone." diff --git a/html/changelogs/AutoChangeLog-pr-13681.yml b/html/changelogs/AutoChangeLog-pr-13681.yml new file mode 100644 index 0000000000..c51a7b51b0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13681.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Supplypods shouldn't cause runtimes anymore, and shrapnel (pelletclouds) should work for them." diff --git a/html/changelogs/AutoChangeLog-pr-13682.yml b/html/changelogs/AutoChangeLog-pr-13682.yml new file mode 100644 index 0000000000..e5fececf4e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13682.yml @@ -0,0 +1,7 @@ +author: "EmeraldSundisk" +delete-after: True +changes: + - bugfix: "Changes the area designations to be not varedited since the code didn't like that anymore" + - bugfix: "The cargo bay conveyor belts not only work with the shuttle now but go in the right direction to boot" + - tweak: "Slight visual adjustments to cargo in light of this" + - rscadd: "The arcade's got RAD carpet now" diff --git a/html/changelogs/AutoChangeLog-pr-13683.yml b/html/changelogs/AutoChangeLog-pr-13683.yml new file mode 100644 index 0000000000..da7ecab5c6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13683.yml @@ -0,0 +1,4 @@ +author: "SandPoot" +delete-after: True +changes: + - code_imp: "Swaps the gift static blacklist with a global list one." diff --git a/html/changelogs/AutoChangeLog-pr-13685.yml b/html/changelogs/AutoChangeLog-pr-13685.yml new file mode 100644 index 0000000000..10d53c9065 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13685.yml @@ -0,0 +1,6 @@ +author: "uomo91" +delete-after: True +changes: + - bugfix: "Fixed \"Show All\" tab in player panel logs being broken." + - bugfix: "Whispers, OOC, and various other things display differently in logs, visually distinguishing them from say logs." + - refactor: "Player panel logs will now show all logs chronologically, so you'll see commingled say and attack logs if you're on the \"Show All\" tab, etc..." diff --git a/html/changelogs/AutoChangeLog-pr-13686.yml b/html/changelogs/AutoChangeLog-pr-13686.yml new file mode 100644 index 0000000000..72f9a2bd54 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13686.yml @@ -0,0 +1,4 @@ +author: "Arturlang" +delete-after: True +changes: + - bugfix: "Hopefully fixes whitescreen issues for TGUI UI's by giving assets more time to get to the client" diff --git a/html/changelogs/AutoChangeLog-pr-13687.yml b/html/changelogs/AutoChangeLog-pr-13687.yml new file mode 100644 index 0000000000..e2baddbd2a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13687.yml @@ -0,0 +1,4 @@ +author: "silicons" +delete-after: True +changes: + - rscadd: "tailed individuals can now target groin to intertwine tails on grab intent." diff --git a/html/changelogs/AutoChangeLog-pr-13688.yml b/html/changelogs/AutoChangeLog-pr-13688.yml new file mode 100644 index 0000000000..4013705549 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13688.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Repeatable surgery steps can no longer cause an infinite loop if not completing the do_after" diff --git a/html/changelogs/AutoChangeLog-pr-13689.yml b/html/changelogs/AutoChangeLog-pr-13689.yml new file mode 100644 index 0000000000..eb476895e7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13689.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Recharging APCs no longer use 0.2% of the power they should be using." + - bugfix: "APCs no longer always use as much power as they can for their cell, even if it is full." diff --git a/html/changelogs/AutoChangeLog-pr-13694.yml b/html/changelogs/AutoChangeLog-pr-13694.yml new file mode 100644 index 0000000000..75a4bbb549 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13694.yml @@ -0,0 +1,5 @@ +author: "Acer202, with minor help from The0bserver" +delete-after: True +changes: + - rscadd: "After internal deliberation, CentCom has decided to run a limited reinstatement of public mining shuttles for use in more tried and true station classes. CentCom would like to remind you that this privilege is easily revoked, and that abuse may result in immediate detonation." + - rscadd: "Restores the mining shuttle on Pubby, Box, Delta, Meta, and Lambda Station." diff --git a/html/changelogs/AutoChangeLog-pr-13695.yml b/html/changelogs/AutoChangeLog-pr-13695.yml new file mode 100644 index 0000000000..551d1f4df5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13695.yml @@ -0,0 +1,4 @@ +author: "shellspeed1" +delete-after: True +changes: + - balance: "Lings now have infinite space for DNA." diff --git a/html/changelogs/AutoChangeLog-pr-13697.yml b/html/changelogs/AutoChangeLog-pr-13697.yml new file mode 100644 index 0000000000..329a621c48 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13697.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Spontaneous brain trauma now requires minimum 5 players" diff --git a/html/changelogs/AutoChangeLog-pr-13698.yml b/html/changelogs/AutoChangeLog-pr-13698.yml new file mode 100644 index 0000000000..10072ba948 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13698.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "you can rebind communication hotkeys and they're the default now" diff --git a/html/changelogs/AutoChangeLog-pr-13702.yml b/html/changelogs/AutoChangeLog-pr-13702.yml new file mode 100644 index 0000000000..24f79c7cda --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13702.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - tweak: "gear harness no longer magically covers up the body mechanically despite covering up nothing visually" diff --git a/html/changelogs/AutoChangeLog-pr-13703.yml b/html/changelogs/AutoChangeLog-pr-13703.yml new file mode 100644 index 0000000000..fd3ba2198f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13703.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Dynamic vote no longer shows the none-storyteller." diff --git a/html/changelogs/AutoChangeLog-pr-13705.yml b/html/changelogs/AutoChangeLog-pr-13705.yml new file mode 100644 index 0000000000..c1b366aeb7 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13705.yml @@ -0,0 +1,6 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Rad collectors now get 1.25x as much energy from radiation" + - balance: "Rad collectors now put out 1.25x as much stored energy per tick" + - balance: "Above two rad collector changes give a total 56.25% power output increase" diff --git a/html/changelogs/AutoChangeLog-pr-13707.yml b/html/changelogs/AutoChangeLog-pr-13707.yml new file mode 100644 index 0000000000..a7dd977cca --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13707.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "Robotpeople are now fully immune to the effects of alcohol (drunkness etc.)" + - tweak: "Renames the alcohol intolerance trait in the code to make what it does more clear." diff --git a/html/changelogs/AutoChangeLog-pr-13711.yml b/html/changelogs/AutoChangeLog-pr-13711.yml new file mode 100644 index 0000000000..e6fde23e8c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13711.yml @@ -0,0 +1,5 @@ +author: "DeltaFire15" +delete-after: True +changes: + - tweak: "Medibots now ignore people they cannot help due to their biology." + - bugfix: "get_damaged_bodyparts() is no longer broken." diff --git a/html/changelogs/AutoChangeLog-pr-13715.yml b/html/changelogs/AutoChangeLog-pr-13715.yml new file mode 100644 index 0000000000..70b22a9bc9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13715.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - tweak: "Removes an opposum from the wall" diff --git a/html/changelogs/AutoChangeLog-pr-13717.yml b/html/changelogs/AutoChangeLog-pr-13717.yml new file mode 100644 index 0000000000..268730c58e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13717.yml @@ -0,0 +1,4 @@ +author: "Acer202" +delete-after: True +changes: + - bugfix: "Main mining shuttle should no longer look at the public mining shuttle and attempt to dock ontop of it. Monastery shuttle should now function again." diff --git a/html/changelogs/AutoChangeLog-pr-13719.yml b/html/changelogs/AutoChangeLog-pr-13719.yml new file mode 100644 index 0000000000..c676072a35 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13719.yml @@ -0,0 +1,6 @@ +author: "shellspeed1" +delete-after: True +changes: + - rscadd: "Construction bags have been added, use them to carry all sorts of construction bits." + - rscadd: "A recipe has been added to cloth stacks to make material and construction bags." + - balance: "Material bags and construction bags are now available in engineering lockers." diff --git a/html/changelogs/AutoChangeLog-pr-13721.yml b/html/changelogs/AutoChangeLog-pr-13721.yml new file mode 100644 index 0000000000..44b3c7283c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13721.yml @@ -0,0 +1,4 @@ +author: "MrJWhit" +delete-after: True +changes: + - tweak: "Increased christmas event from 22th to 27th to 10th to 27th" diff --git a/html/changelogs/AutoChangeLog-pr-13733.yml b/html/changelogs/AutoChangeLog-pr-13733.yml new file mode 100644 index 0000000000..a10719fdc6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13733.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Fixes the tail entwine messages displaying incorrectly." diff --git a/html/statbrowser.html b/html/statbrowser.html index 0920081fd2..346a198746 100644 --- a/html/statbrowser.html +++ b/html/statbrowser.html @@ -412,8 +412,8 @@ function verbs_cat_check(cat) { } for(var v = 0; v < verbs.length; v++){ var part = verbs[v]; - verbcat = part[0].indexOf(".") != -1 ? part[0].split(".") : part[0]; - if(verbcat != cat || verbcat.trim() == ""){ + verbcat = part[0].indexOf(".") != -1 ? part[0].split(".")[0] : part[0]; + if(verbcat != tabCat || verbcat.trim() == ""){ continue; } else{ @@ -446,9 +446,9 @@ function add_verb_list(v) { to_add.sort(); // sort what we're adding for(var i = 0; i < to_add.length; i++) { var part = to_add[i]; - if (!part[0]) + if(!part[0]) continue; - var category = part[0].indexOf(".") == -1 ? part[0] : part[0].split(".")[0] + var category = part[0].indexOf(".") == -1 ? part[0] : part[0].split(".")[0]; if(findVerbindex(part[1], verbs)) continue; if(verb_tabs.includes(category)){ diff --git a/icons/mob/clothing/custom_w.dmi b/icons/mob/clothing/custom_w.dmi index 18e07f41ed..10f7c5080a 100644 Binary files a/icons/mob/clothing/custom_w.dmi and b/icons/mob/clothing/custom_w.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 16571a4aa1..889888ef0a 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi index 8f3c48396a..9f6e3ffb84 100644 Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index ffbb8b8b5b..7bd7de82c7 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi index 43b73f03d0..61c464ef1d 100644 Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index fb864385c7..3b97c3b38b 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/mob/inhands/antag/clockwork_lefthand.dmi b/icons/mob/inhands/antag/clockwork_lefthand.dmi index 080d7fdc83..8945a573a0 100644 Binary files a/icons/mob/inhands/antag/clockwork_lefthand.dmi and b/icons/mob/inhands/antag/clockwork_lefthand.dmi differ diff --git a/icons/mob/inhands/antag/clockwork_righthand.dmi b/icons/mob/inhands/antag/clockwork_righthand.dmi index 42715d6e92..64ee6199a7 100644 Binary files a/icons/mob/inhands/antag/clockwork_righthand.dmi and b/icons/mob/inhands/antag/clockwork_righthand.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 10b733bae4..3d1cbfa273 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index 1334ce9e0e..8d34fb8dc3 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi index 156d4fa0c6..52d9b88dcc 100644 Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 4f650f8561..95a31f8b9f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a566a05591..17e52b60c9 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi index 50f536d1d3..77b2d114b9 100644 Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 939ee0e009..d697c4619d 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 0a457777c2..8414c8b95c 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/modular_citadel/code/modules/admin/holder2.dm b/modular_citadel/code/modules/admin/holder2.dm index 143000a0d6..e4806781d9 100644 --- a/modular_citadel/code/modules/admin/holder2.dm +++ b/modular_citadel/code/modules/admin/holder2.dm @@ -10,4 +10,4 @@ if(owner) owner.remove_mentor_verbs() owner.mentor_datum = null - ..() \ No newline at end of file + ..() diff --git a/modular_citadel/code/modules/admin/secrets.dm b/modular_citadel/code/modules/admin/secrets.dm index 9fbc8501dd..56a6d316f8 100644 --- a/modular_citadel/code/modules/admin/secrets.dm +++ b/modular_citadel/code/modules/admin/secrets.dm @@ -5,4 +5,4 @@ if(!GLOB.mentorlog.len) dat += "No mentors have done anything this round!" - usr << browse(dat, "window=mentor_log") \ No newline at end of file + usr << browse(dat, "window=mentor_log") diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index bb9162789e..4a21fb41fd 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -522,3 +522,17 @@ slot = SLOT_HEAD path = /obj/item/clothing/head/halo ckeywhitelist = list("hisakaki") + +/datum/gear/donator/vest + name = "vest and shirt" + slot = SLOT_W_UNIFORM + path = /obj/item/clothing/under/custom/vest + ckeywhitelist = list("maylowfox") + +/datum/gear/donator/exo + name = "exo frame" + slot = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/custom/exo + ckeywhitelist = list("jesterz7") + + diff --git a/modular_citadel/code/modules/client/loadout/hands.dm b/modular_citadel/code/modules/client/loadout/hands.dm index db57fb466b..eb496ed78c 100644 --- a/modular_citadel/code/modules/client/loadout/hands.dm +++ b/modular_citadel/code/modules/client/loadout/hands.dm @@ -12,7 +12,7 @@ /datum/gear/hands/dice name = "Dice bag" - path = /obj/item/storage/box/dice + path = /obj/item/storage/dice /datum/gear/hands/eightball name = "Magic eightball" diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm index 0d7e32552e..9468c9303d 100644 --- a/modular_citadel/code/modules/client/loadout/mask.dm +++ b/modular_citadel/code/modules/client/loadout/mask.dm @@ -14,3 +14,9 @@ name = "Joy mask" path = /obj/item/clothing/mask/joy cost = 3 + +/datum/gear/mask/gas + name = "Gas Mask" + path = /obj/item/clothing/mask/gas + cost = 2 + restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") //*shrug diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 45d8fc1ef1..76389e2015 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -44,6 +44,10 @@ name = "Maid costume" path = /obj/item/clothing/under/costume/maid +/datum/gear/uniform/maidcostume/polychromic + name = "Polychromic maid costume" + path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic + /datum/gear/uniform/mailmanuniform name = "Mailman's jumpsuit" path = /obj/item/clothing/under/misc/mailman diff --git a/modular_citadel/code/modules/clothing/suits/suits.dm b/modular_citadel/code/modules/clothing/suits/suits.dm index 25b0c120e5..579476db04 100644 --- a/modular_citadel/code/modules/clothing/suits/suits.dm +++ b/modular_citadel/code/modules/clothing/suits/suits.dm @@ -11,7 +11,7 @@ mob_overlay_icon = 'modular_citadel/icons/mob/citadel/suit.dmi' icon_state = "hostrench" item_state = "hostrench" - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE body_parts_covered = CHEST|ARMS|LEGS /obj/item/clothing/suit/hooded/cloak/david @@ -20,7 +20,7 @@ desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids" hoodtype = /obj/item/clothing/head/hooded/cloakhood/david body_parts_covered = CHEST|GROIN|ARMS - mutantrace_variation = NONE + mutantrace_variation = STYLE_DIGITIGRADE /obj/item/clothing/head/hooded/cloakhood/david name = "red cloak hood" diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index bc9f8bce49..4ef5a91a92 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -567,4 +567,21 @@ icon = 'icons/mob/clothing/custom_w.dmi' mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' dynamic_hair_suffix = "" - + +/obj/item/clothing/under/custom/vest + name = "vest" + desc = "A vest with a shirt underlining it." + icon_state = "vest" + item_state = "vest" + icon = 'icons/obj/custom.dmi' + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' + mutantrace_variation = STYLE_DIGITIGRADE + +/obj/item/clothing/suit/custom/exo + name = "Full ExoFrame" + desc = "A suit specially designed for those who live and breath hardware with custom tooled robotic manipulators for working with precision even on the most hazardous of jobs." + icon_state = "frame" + item_state = "frame" + icon = 'icons/obj/custom.dmi' + mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi' + mutantrace_variation = NONE diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 28c3f7ea99..f7911def84 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -132,6 +132,54 @@ user.nextsoundemote = world.time + 7 playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1) +/datum/emote/living/hiss + key = "hiss" + key_third_person = "hisses" + message = "hisses!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/hiss/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_citadel/sound/voice/hiss.ogg', 50, 1, -1) + +/datum/emote/living/meow + key = "meow" + key_third_person = "mrowls" + message = "mrowls!" + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/meow/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_citadel/sound/voice/meow1.ogg', 50, 1, -1) + +/datum/emote/living/purr + key = "purr" + key_third_person = "purrs softly" + message = "purrs softly." + emote_type = EMOTE_AUDIBLE + muzzle_ignore = FALSE + restraint_check = FALSE + +/datum/emote/living/purr/run_emote(mob/living/user, params) + if(!(. = ..())) + return + if(user.nextsoundemote >= world.time) + return + user.nextsoundemote = world.time + 7 + playsound(user, 'modular_citadel/sound/voice/purr.ogg', 50, 1, -1) + /datum/emote/living/nya key = "nya" key_third_person = "lets out a nya" diff --git a/modular_citadel/code/modules/mob/living/carbon/reindex_screams.dm b/modular_citadel/code/modules/mob/living/carbon/reindex_screams.dm index 7f5d625f62..a2083a28ee 100644 --- a/modular_citadel/code/modules/mob/living/carbon/reindex_screams.dm +++ b/modular_citadel/code/modules/mob/living/carbon/reindex_screams.dm @@ -42,4 +42,4 @@ /mob/living/proc/clear_screams() LAZYINITLIST(alternate_screams) - LAZYCLEARLIST(alternate_screams) \ No newline at end of file + LAZYCLEARLIST(alternate_screams) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm index fb385234bd..1633c3690f 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/smg/smg.dm @@ -1,3 +1,3 @@ /obj/item/ammo_box/magazine/wt550m9/wttx name = "wt550 magazine (Toxin Tipped 4.6x30mm)" - ammo_type = /obj/item/ammo_casing/c46x30mm/tx \ No newline at end of file + ammo_type = /obj/item/ammo_casing/c46x30mm/tx diff --git a/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm index 75151417d7..3618052704 100644 --- a/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm +++ b/modular_citadel/code/modules/projectiles/bullets/bullets/smg.dm @@ -1,4 +1,4 @@ /obj/item/projectile/bullet/c46x30mm_tx name = "toxin tipped 4.6x30mm bullet" damage = 10 - damage_type = TOX \ No newline at end of file + damage_type = TOX diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm index c4cf8fc00f..cf37674278 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm @@ -64,4 +64,4 @@ icon_state = "spinfusorbox" ammo_type = /obj/item/ammo_casing/caseless/spinfusor w_class = WEIGHT_CLASS_NORMAL - max_ammo = 4 \ No newline at end of file + max_ammo = 4 diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index 3ad24ba399..ffd16faca7 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -210,6 +210,8 @@ var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites) if(isnull(N)) return ..() + if(HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM)) + C.adjustToxLoss(1, toxins_type = TOX_SYSCORRUPT) //Interferes with robots. Rare chem, so, pretty good at that too. N.nanite_volume += -cached_purity*5//0.5 seems to be the default to me, so it'll neuter them. ..() diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm index a6a9d7a85f..de27723508 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm @@ -200,22 +200,23 @@ /datum/reagent/fermi/zeolites name = "Artificial Zeolites" - description = "Lab made Zeolite, used to clear radiation from people and items alike! Splashing just a small amount(5u) onto any item can clear away large amounts of contamination." + description = "Lab made Zeolite, used to clear radiation from people and items alike! Splashing just a small amount(5u) onto any item can clear away large amounts of contamination, as long as its purity is at least 0.7." pH = 8 color = "#FFDADA" - metabolization_rate = 8 * REAGENTS_METABOLISM //Metabolizes fast but heals a lot! - value = REAGENT_VALUE_COMMON + metabolization_rate = 8 * REAGENTS_METABOLISM //Metabolizes fast but heals a lot! Lasts far longer if more pure. + value = REAGENT_VALUE_RARE //Relatively hard to make now, might be fine with VERY_RARE instead depending on feedback. /datum/reagent/fermi/zeolites/on_mob_life(mob/living/carbon/M) + metabolization_rate = (4 / purity) * REAGENTS_METABOLISM //Metab rate directly influenced by purity. Linear. var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive) - if(M.radiation > 0) - M.radiation -= min(M.radiation, 60) + if(M.radiation > 0) //hey so apparently pentetic literally purges 1/50 (2%) of the rad amount on someone per tick no matter the 'true' amount, sooo uhh time to tweak this some more.. + M.radiation -= clamp(round((M.radiation / 150) * (25 ** purity), 0.1), 0, M.radiation) //Purges between ~3% and ~16% of total rad amount, per tick, depending on purity. Exponential. if(contamination && contamination.strength > 0) - contamination.strength -= min(contamination.strength, 100) + contamination.strength -= min(contamination.strength, round(25 ** (0.5 + purity), 0.1)) //25 per tick at minimum purity; Tops out at ~125 per tick if purity is 1. Exponential. ..() /datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume) var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive) - if(contamination && reac_volume >= 5) + if(contamination && reac_volume >= 5 && purity >= 0.7) //you need at least 0.7 purity to instantly purge all contam on an object. qdel(contamination) return diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm index da9fd34cd6..f4b8850f55 100644 --- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm +++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm @@ -591,19 +591,21 @@ /datum/chemical_reaction/fermi/zeolites name = "Zeolites" id = /datum/reagent/fermi/zeolites - results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! + results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! - But it's now somewhat dangerous, and needs a bit of uranium to catalyze the reaction required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1) + required_catalysts = list(/datum/reagent/uranium = 5) //FermiChem vars: - OptimalTempMin = 300 - OptimalTempMax = 900 - ExplodeTemp = 1000 //check to see overflow doesn't happen! - OptimalpHMin = 4.0 - OptimalpHMax = 6.0 + OptimalTempMin = 500 + OptimalTempMax = 750 + ExplodeTemp = 850 + OptimalpHMin = 2.8 + OptimalpHMax = 5 //2.2 ph levels of optimal ph zone - centered at 3.9 - ph of ingredients mixed at equal values is 9.55; ph of result is 8. ReactpHLim = 4 //CatalystFact = 0 - CurveSharpT = 4 - CurveSharppH = 0 - ThermicConstant = 0 - HIonRelease = 0.01 - RateUpLim = 15 + CurveSharpT = 1.5 + CurveSharppH = 3 + ThermicConstant = 7 + HIonRelease = -0.15 + RateUpLim = 4 + PurityMin = 0.5 //Good luck. FermiChem = TRUE diff --git a/modular_citadel/sound/voice/hiss.ogg b/modular_citadel/sound/voice/hiss.ogg index cd9fa22c37..3508f47f13 100644 Binary files a/modular_citadel/sound/voice/hiss.ogg and b/modular_citadel/sound/voice/hiss.ogg differ diff --git a/modular_citadel/sound/voice/meow1.ogg b/modular_citadel/sound/voice/meow1.ogg new file mode 100644 index 0000000000..be9393d7d6 Binary files /dev/null and b/modular_citadel/sound/voice/meow1.ogg differ diff --git a/modular_citadel/sound/voice/purr.ogg b/modular_citadel/sound/voice/purr.ogg new file mode 100644 index 0000000000..d0ea06d9a0 Binary files /dev/null and b/modular_citadel/sound/voice/purr.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 14a6a7cd10..1387748839 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -751,6 +751,7 @@ #include "code\game\gamemodes\dynamic\dynamic_rulesets.dm" #include "code\game\gamemodes\dynamic\dynamic_rulesets_latejoin.dm" #include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm" +#include "code\game\gamemodes\dynamic\dynamic_rulesets_minor.dm" #include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm" #include "code\game\gamemodes\dynamic\dynamic_storytellers.dm" #include "code\game\gamemodes\eldritch_cult\eldritch_cult.dm" @@ -1804,6 +1805,7 @@ #include "code\modules\awaymissions\mission_code\caves.dm" #include "code\modules\awaymissions\mission_code\centcomAway.dm" #include "code\modules\awaymissions\mission_code\challenge.dm" +#include "code\modules\awaymissions\mission_code\jungleresort.dm" #include "code\modules\awaymissions\mission_code\moonoutpost19.dm" #include "code\modules\awaymissions\mission_code\murderdome.dm" #include "code\modules\awaymissions\mission_code\research.dm" @@ -2296,6 +2298,7 @@ #include "code\modules\keybindings\keybind\carbon.dm" #include "code\modules\keybindings\keybind\client.dm" #include "code\modules\keybindings\keybind\combat.dm" +#include "code\modules\keybindings\keybind\communication.dm" #include "code\modules\keybindings\keybind\emote.dm" #include "code\modules\keybindings\keybind\human.dm" #include "code\modules\keybindings\keybind\living.dm" @@ -2493,6 +2496,7 @@ #include "code\modules\mob\living\carbon\death.dm" #include "code\modules\mob\living\carbon\emote.dm" #include "code\modules\mob\living\carbon\examine.dm" +#include "code\modules\mob\living\carbon\handle_corruption.dm" #include "code\modules\mob\living\carbon\inventory.dm" #include "code\modules\mob\living\carbon\life.dm" #include "code\modules\mob\living\carbon\say.dm" @@ -3416,6 +3420,7 @@ #include "code\modules\surgery\organic_steps.dm" #include "code\modules\surgery\plastic_surgery.dm" #include "code\modules\surgery\prosthetic_replacement.dm" +#include "code\modules\surgery\purge_corruption.dm" #include "code\modules\surgery\remove_embedded_object.dm" #include "code\modules\surgery\repair_puncture.dm" #include "code\modules\surgery\robot_brain_surgery.dm" diff --git a/tgui/.yarn/sdks/eslint/bin/eslint.js b/tgui/.yarn/sdks/eslint/bin/eslint.js new file mode 100644 index 0000000000..c5d4c64928 --- /dev/null +++ b/tgui/.yarn/sdks/eslint/bin/eslint.js @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire, createRequireFromPath} = require(`module`); +const {resolve, dirname} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.js"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require eslint/bin/eslint.js + require(absPnpApiPath).setup(); + } +} + +// Defer to the real eslint/bin/eslint.js your application uses +module.exports = absRequire(`eslint/bin/eslint.js`); diff --git a/tgui/.yarn/sdks/eslint/package.json b/tgui/.yarn/sdks/eslint/package.json new file mode 100644 index 0000000000..620b0a937a --- /dev/null +++ b/tgui/.yarn/sdks/eslint/package.json @@ -0,0 +1,6 @@ +{ + "name": "eslint", + "version": "7.4.0-pnpify", + "main": "./lib/api.js", + "type": "commonjs" +} diff --git a/tgui/.yarn/sdks/integrations.yml b/tgui/.yarn/sdks/integrations.yml new file mode 100644 index 0000000000..76ed42ba94 --- /dev/null +++ b/tgui/.yarn/sdks/integrations.yml @@ -0,0 +1,5 @@ +# This file is automatically generated by PnPify. +# Manual changes will be lost! + +integrations: + - vscode diff --git a/tgui/global.d.ts b/tgui/global.d.ts index 31fc6a1057..594ce7f9d4 100644 --- a/tgui/global.d.ts +++ b/tgui/global.d.ts @@ -97,11 +97,21 @@ interface ByondType { winset(id: string, propName: string, propValue: any): void; /** - * Parses BYOND JSON + * Parses BYOND JSON. * * Uses a special encoding to preverse Infinity and NaN. */ parseJson(text: string): any; + + /** + * Loads a stylesheet into the document. + */ + loadCss(url: string): void; + + /** + * Loads a script into the document. + */ + loadJs(url: string): void; } declare const Byond: ByondType; diff --git a/tgui/packages/tgui-panel/styles/main.scss b/tgui/packages/tgui-panel/styles/main.scss index 86a2986920..6f090392ab 100644 --- a/tgui/packages/tgui-panel/styles/main.scss +++ b/tgui/packages/tgui-panel/styles/main.scss @@ -30,7 +30,6 @@ @include meta.load-css('~tgui/styles/components/Dimmer.scss'); @include meta.load-css('~tgui/styles/components/Divider.scss'); @include meta.load-css('~tgui/styles/components/Dropdown.scss'); -@include meta.load-css('~tgui/styles/components/FatalError.scss'); @include meta.load-css('~tgui/styles/components/Flex.scss'); @include meta.load-css('~tgui/styles/components/Input.scss'); @include meta.load-css('~tgui/styles/components/Knob.scss'); diff --git a/tgui/packages/tgui/assets.js b/tgui/packages/tgui/assets.js index 2f2e2ba543..db6dd635c0 100644 --- a/tgui/packages/tgui/assets.js +++ b/tgui/packages/tgui/assets.js @@ -4,68 +4,9 @@ * @license MIT */ -import { loadCSS as fgLoadCss } from 'fg-loadcss'; -import { createLogger } from './logging'; - -const logger = createLogger('assets'); - const EXCLUDED_PATTERNS = [/v4shim/i]; -const RETRY_ATTEMPTS = 5; -const RETRY_INTERVAL = 3000; - -const loadedStyleSheetByUrl = {}; const loadedMappings = {}; -export const loadStyleSheet = (url, attempt = 1) => { - if (loadedStyleSheetByUrl[url]) { - return; - } - loadedStyleSheetByUrl[url] = true; - logger.log(`loading stylesheet '${url}'`); - /** @type {HTMLLinkElement} */ - let node = fgLoadCss(url); - node.addEventListener('load', () => { - if (!isStyleSheetReallyLoaded(node, url)) { - node.parentNode.removeChild(node); - node = null; - loadedStyleSheetByUrl[url] = null; - if (attempt >= RETRY_ATTEMPTS) { - logger.error(`Error: Failed to load the stylesheet ` - + `'${url}' after ${RETRY_ATTEMPTS} attempts.\nIt was either ` - + `not found, or you're trying to load an empty stylesheet ` - + `that has no CSS rules in it.`); - return; - } - setTimeout(() => loadStyleSheet(url, attempt + 1), RETRY_INTERVAL); - return; - } - }); -}; - -/** - * Checks whether the stylesheet was registered in the DOM - * and is not empty. - */ -const isStyleSheetReallyLoaded = (node, url) => { - // Method #1 (works on IE10+) - const styleSheet = node.sheet; - if (styleSheet) { - return styleSheet.rules.length > 0; - } - // Method #2 - const styleSheets = document.styleSheets; - const len = styleSheets.length; - for (let i = 0; i < len; i++) { - const styleSheet = styleSheets[i]; - if (styleSheet.href.includes(url)) { - return styleSheet.rules.length > 0; - } - } - // All methods failed - logger.warn(`Warning: stylesheet '${url}' was not found in the DOM`); - return false; -}; - export const resolveAsset = name => ( loadedMappings[name] || name ); @@ -73,7 +14,7 @@ export const resolveAsset = name => ( export const assetMiddleware = store => next => action => { const { type, payload } = action; if (type === 'asset/stylesheet') { - loadStyleSheet(payload); + Byond.loadCss(payload); return; } if (type === 'asset/mappings') { @@ -86,7 +27,10 @@ export const assetMiddleware = store => next => action => { const ext = name.split('.').pop(); loadedMappings[name] = url; if (ext === 'css') { - loadStyleSheet(url); + Byond.loadCss(url); + } + if (ext === 'js') { + Byond.loadJs(url); } } return; diff --git a/tgui/packages/tgui/backend.js b/tgui/packages/tgui/backend.js index 1cfd4294f6..06f45ad55e 100644 --- a/tgui/packages/tgui/backend.js +++ b/tgui/packages/tgui/backend.js @@ -189,6 +189,9 @@ export const backendMiddleware = store => { // Resume on incoming update if (type === 'backend/update' && suspended) { + // Show the payload + logger.log('backend/update', payload); + // Signal renderer that we have resumed resumeRenderer(); // Setup drag setupDrag(); diff --git a/tgui/packages/tgui/debug/middleware.js b/tgui/packages/tgui/debug/middleware.js index 2fa3ed42e6..6c11d32e0f 100644 --- a/tgui/packages/tgui/debug/middleware.js +++ b/tgui/packages/tgui/debug/middleware.js @@ -24,7 +24,7 @@ export const debugMiddleware = store => { if (key.code === KEY_F12) { store.dispatch(toggleKitchenSink()); } - if (key.ctrl && key.shift && key.code === KEY_BACKSPACE) { + if (key.ctrl && key.alt && key.code === KEY_BACKSPACE) { // NOTE: We need to call this in a timeout, because we need a clean // stack in order for this to be a fatal error. setTimeout(() => { diff --git a/tgui/packages/tgui/interfaces/Apc.js b/tgui/packages/tgui/interfaces/Apc.js index 60a11789bc..face676282 100644 --- a/tgui/packages/tgui/interfaces/Apc.js +++ b/tgui/packages/tgui/interfaces/Apc.js @@ -211,6 +211,29 @@ const ApcContent = (props, context) => { content={data.nightshiftLights ? 'Enabled' : 'Disabled'} onClick={() => act('toggle_nightshift')} /> )} /> + {data.hijackable === 1 && ( + +