From ee99bbee3ef1b168f96805a7f19fa4599f46e785 Mon Sep 17 00:00:00 2001 From: Cadyn Bombaci Date: Wed, 30 Jun 2021 05:03:54 -0700 Subject: [PATCH] Make Cit work on linux with and without TGS4 --- .gitignore | 4 + Build.sh | 4 + .../map_files/Deltastation/DeltaStation2.dmm | 4 +- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 678 ++++++++++++------ .../recipes/recipes_weapon_and_ammo.dm | 10 + code/game/objects/items/melee/misc.dm | 12 + code/game/objects/items/plushes.dm | 162 +++-- .../jobs/job_types/head_of_personnel.dm | 8 +- code/modules/jobs/job_types/quartermaster.dm | 2 +- code/modules/mining/equipment/survival_pod.dm | 5 + .../mining/lavaland/necropolis_chests.dm | 92 +-- code/modules/mining/machine_vending.dm | 1 + code/modules/mining/shelters.dm | 11 + .../hostile/megafauna/blood_drunk_miner.dm | 6 +- .../hostile/megafauna/demonic_frost_miner.dm | 6 +- dependencies.sh | 3 + html/changelog.html | 23 + html/changelogs/.all_changelog.yml | 20 + libauxmos.so | Bin 10443068 -> 0 bytes tools/build/binaries/README.md | 1 + tools/build/build | 71 ++ 22 files changed, 810 insertions(+), 315 deletions(-) create mode 100755 Build.sh delete mode 100644 libauxmos.so create mode 100644 tools/build/binaries/README.md diff --git a/.gitignore b/.gitignore index dd20fecd22..91a0ef08eb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,10 @@ #Ignore byond config folder. /cfg/**/* +#Ignore rust-g and auxmos libraries which are compiled with scripts +*.so +/tools/build/binaries/**/* + #Ignore compiled files and other files generated during compilation. *.mdme *.dmb diff --git a/Build.sh b/Build.sh new file mode 100755 index 0000000000..f36de6e9d0 --- /dev/null +++ b/Build.sh @@ -0,0 +1,4 @@ +#!/bin/bash +cd "$(dirname "$(readlink -f "$0")")" +cd ./tools/build +sudo bash ./build diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 819d104c41..2108c61d32 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -111598,7 +111598,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ +/obj/machinery/door/airlock/command{ name = "Quartermaster's Quarters"; req_access_txt = "41" }, @@ -127746,7 +127746,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ +/obj/machinery/door/airlock/command{ name = "Quartermaster's Office"; req_access_txt = "41" }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 63a36acfd0..0f41cd3b1a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -56562,7 +56562,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ +/obj/machinery/door/airlock/command{ name = "Quartermaster"; req_access_txt = "41" }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 2c13790db7..d749c51798 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -4,8 +4,8 @@ /area/space) "aab" = ( /obj/effect/landmark/start/cyborg, -/mob/living/simple_animal/bot/secbot/pingsky, /obj/machinery/holopad/secure, +/mob/living/simple_animal/bot/secbot/pingsky, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "aac" = ( @@ -23298,7 +23298,7 @@ /turf/open/floor/plating, /area/cargo/qm) "bbG" = ( -/obj/machinery/door/airlock/mining/glass{ +/obj/machinery/door/airlock/command{ name = "Quartermaster"; req_access_txt = "41" }, @@ -28881,6 +28881,7 @@ dir = 1 }, /obj/structure/disposalpipe/trunk, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bpt" = ( @@ -29492,6 +29493,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bqF" = ( @@ -29515,6 +29517,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bqH" = ( @@ -29545,6 +29548,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bqJ" = ( @@ -29557,6 +29561,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bqK" = ( @@ -29587,6 +29592,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bqO" = ( @@ -30149,23 +30155,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/sign/departments/xenobio{ - pixel_x = 32 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) -"brV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + dir = 9 }, -/turf/closed/wall/r_wall, +/turf/open/floor/plasteel/white, /area/science/xenobiology) "brW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -30180,13 +30179,15 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "brX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "bsa" = ( @@ -30200,6 +30201,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bsb" = ( @@ -30231,6 +30233,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bsd" = ( @@ -30262,6 +30265,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bsf" = ( @@ -30272,15 +30276,15 @@ /obj/structure/sign/departments/xenobio{ pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "bsl" = ( @@ -30828,7 +30832,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -30857,15 +30861,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "btA" = ( @@ -31421,6 +31423,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/structure/sign/departments/xenobio{ + pixel_x = 32 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "buL" = ( @@ -31442,8 +31447,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) @@ -31469,6 +31474,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "buQ" = ( @@ -32058,14 +32064,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) -"bwh" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "bwm" = ( @@ -32757,6 +32756,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bxN" = ( @@ -32789,6 +32789,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bxP" = ( @@ -32825,6 +32826,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "bxS" = ( @@ -32857,6 +32859,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "bxY" = ( @@ -33483,6 +33488,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bzl" = ( @@ -33512,6 +33518,7 @@ icon_state = "0-8" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bzn" = ( @@ -33524,6 +33531,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bzp" = ( @@ -33536,6 +33544,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bzq" = ( @@ -33548,6 +33557,7 @@ icon_state = "0-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bzr" = ( @@ -33577,8 +33587,15 @@ icon_state = "0-8" }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) +"bzv" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/tcommsat/computer) "bzy" = ( /obj/structure/grille, /turf/open/space, @@ -34131,6 +34148,7 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "bAI" = ( @@ -41095,6 +41113,12 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"bPa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "bPd" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 8 @@ -43902,13 +43926,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/plasteel, /area/engineering/atmos) -"bVh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/turf/open/floor/plating, -/area/engineering/atmos) "bVi" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible{ @@ -44900,7 +44917,7 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "bXx" = ( @@ -46687,6 +46704,12 @@ /obj/item/gps/engineering, /turf/open/floor/plating, /area/engineering/main) +"ccU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "ccW" = ( /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, @@ -47179,12 +47202,12 @@ "ceT" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/emcloset, -/turf/open/floor/plating, -/area/engineering/main) -"ceU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/turf/open/floor/plating, +/area/engineering/main) +"ceU" = ( /obj/machinery/computer/security/telescreen{ desc = "Used for watching telecomms."; layer = 4; @@ -47192,6 +47215,9 @@ network = list("tcomms"); pixel_y = 28 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/engineering/main) "ceV" = ( @@ -48798,6 +48824,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/tcommsat/computer) "clR" = ( @@ -48845,8 +48872,8 @@ /turf/open/floor/plating, /area/tcommsat/computer) "clX" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plasteel, /area/tcommsat/computer) @@ -50657,15 +50684,6 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"csu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) "csv" = ( /obj/machinery/light/small{ dir = 8 @@ -52853,6 +52871,7 @@ /area/engineering/main) "cBT" = ( /obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/floor/plating/airless, /area/maintenance/disposal/incinerator) "cBU" = ( @@ -53045,6 +53064,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, +/obj/item/wrench, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cSJ" = ( @@ -53104,6 +53124,12 @@ }, /turf/open/floor/plasteel/dark, /area/science/lab) +"cXP" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "cXW" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -53179,6 +53205,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "dgI" = ( @@ -53399,6 +53426,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "dye" = ( @@ -53441,6 +53469,19 @@ "dFJ" = ( /turf/open/floor/engine, /area/engineering/supermatter) +"dHo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "dHr" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/visible, /obj/machinery/button/door{ @@ -53476,9 +53517,7 @@ /area/medical/chemistry) "dJk" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engineering/atmos) "dJm" = ( @@ -53786,9 +53825,6 @@ "eAZ" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, /turf/open/space, /area/space/nearstation) "eCw" = ( @@ -53855,6 +53891,11 @@ /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "eLt" = ( @@ -53961,6 +54002,12 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"eUB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "eVy" = ( /obj/effect/turf_decal/arrows{ dir = 8 @@ -53968,6 +54015,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/engineering/main) "eWi" = ( @@ -53976,6 +54024,12 @@ }, /turf/open/floor/plating, /area/engineering/main) +"eWP" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "eXo" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -54045,6 +54099,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"ffr" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "ffJ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -54347,6 +54409,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"fLz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "fLG" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/plating, @@ -54375,6 +54443,13 @@ "fRs" = ( /turf/closed/wall, /area/command/heads_quarters/rd) +"fRT" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/space/basic, +/area/space/nearstation) "fTY" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -54452,6 +54527,16 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"geN" = ( +/obj/machinery/igniter{ + id = "xenoigniter"; + luminosity = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "geU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -54815,12 +54900,13 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "gIG" = ( @@ -54830,6 +54916,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "gKz" = ( @@ -54969,7 +55059,7 @@ "hbl" = ( /obj/machinery/door/poddoor/incinerator_atmos_main, /turf/open/floor/engine/vacuum, -/area/space) +/area/maintenance/disposal/incinerator) "heC" = ( /obj/machinery/power/apc/highcap/five_k{ dir = 8; @@ -54982,7 +55072,6 @@ }, /area/maintenance/department/science) "hfZ" = ( -/obj/structure/reagent_dispensers/watertank, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -54990,6 +55079,10 @@ pixel_x = 32; receive_ore_updates = 1 }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plasteel, /area/science/xenobiology) "hgD" = ( @@ -55113,6 +55206,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/engine, /area/science/xenobiology) "hwd" = ( @@ -55379,9 +55473,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "hVx" = ( @@ -55481,6 +55573,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "ihj" = ( @@ -55628,6 +55721,9 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ivO" = ( @@ -55883,8 +55979,8 @@ }, /area/maintenance/department/science) "iWV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -55976,6 +56072,10 @@ }, /turf/open/floor/wood, /area/service/lawoffice) +"jkv" = ( +/obj/machinery/atmospherics/components/binary/pump, +/turf/closed/wall/r_wall, +/area/tcommsat/computer) "jrG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -56053,6 +56153,10 @@ }, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hos) +"jvO" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/turf/closed/wall/r_wall, +/area/maintenance/disposal/incinerator) "jwe" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -56075,6 +56179,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "jxK" = ( @@ -56742,6 +56847,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/dark, /area/engineering/main) +"kUE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "kWG" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 @@ -56955,6 +57073,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"lCN" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/engine, +/area/science/xenobiology) "lEn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -57139,6 +57261,12 @@ /obj/item/clothing/head/beret, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"lXt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "lXJ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -57268,12 +57396,16 @@ /turf/closed/wall/r_wall, /area/engineering/main) "mlr" = ( -/obj/structure/lattice, /obj/structure/disposalpipe/junction{ dir = 4 }, -/turf/open/space/basic, -/area/space/nearstation) +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 1; + frequency = 1441; + id = "inc_in" + }, +/turf/open/floor/plating, +/area/science/xenobiology) "mmv" = ( /obj/machinery/door/airlock/engineering{ name = "Engineering Supplies"; @@ -57369,6 +57501,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "mvm" = ( @@ -57576,6 +57711,7 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "mVM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "mXq" = ( @@ -57594,6 +57730,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/engine, /area/science/xenobiology) "naS" = ( @@ -57603,7 +57742,7 @@ "nbu" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, -/area/space) +/area/maintenance/disposal/incinerator) "ncm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -57632,6 +57771,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"nfc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/engine, +/area/science/xenobiology) "nfi" = ( /obj/structure/sign/directions/evac{ dir = 1; @@ -57965,6 +58108,12 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) +"nNp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "nNJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -57984,15 +58133,15 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "nPA" = ( @@ -58098,6 +58247,7 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ofN" = ( @@ -58193,6 +58343,16 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/science/xenobiology) +"osC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "ous" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/button/door{ @@ -58278,7 +58438,6 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "oBb" = ( -/obj/structure/sign/warning/biohazard, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -58424,6 +58583,10 @@ /obj/effect/turf_decal/tile/green{ dir = 8 }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 3; + name = "Waste to Space" + }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "oPx" = ( @@ -58473,6 +58636,7 @@ id = "xenobio4"; name = "containment blast door" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine, /area/science/xenobiology) "oSL" = ( @@ -58485,9 +58649,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "oTl" = ( @@ -58669,6 +58831,8 @@ dir = 4; network = list("ss13","rd") }, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel, /area/science/xenobiology) "pgH" = ( @@ -58704,6 +58868,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "pkM" = ( @@ -58716,6 +58881,12 @@ /obj/structure/musician/piano, /turf/open/floor/plasteel/dark, /area/maintenance/department/crew_quarters/dorms) +"pmf" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) "pmB" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -58736,9 +58907,8 @@ /area/science/xenobiology) "poP" = ( /obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 }, /turf/open/space, /area/space/nearstation) @@ -58937,17 +59107,12 @@ /turf/open/floor/plating, /area/engineering/main) "pMG" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/effect/turf_decal/tile/green{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "pNy" = ( @@ -59016,6 +59181,9 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/science/xenobiology) "pWF" = ( @@ -59145,6 +59313,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/xenobiology) "qdj" = ( @@ -59253,6 +59422,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/department/engine) +"qAk" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "qAx" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -59269,6 +59444,11 @@ /obj/item/clothing/head/ushanka, /turf/open/floor/plating, /area/maintenance/department/engine) +"qCu" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/space, +/area/space/nearstation) "qDJ" = ( /obj/structure/table/reinforced, /obj/item/integrated_circuit_printer, @@ -59468,6 +59648,15 @@ /obj/structure/lattice/catwalk, /turf/open/space/basic, /area/maintenance/disposal/incinerator) +"qVn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "qVP" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -59564,6 +59753,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/treatment_center) +"rbe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "rdB" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 1 @@ -59676,6 +59872,7 @@ /area/space/nearstation) "roc" = ( /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "ros" = ( @@ -59862,6 +60059,12 @@ /obj/item/ammo_casing/shotgun/improvised, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"rMB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "rMV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -59982,6 +60185,13 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/exit/departure_lounge) +"sgt" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/space, +/area/space/nearstation) "shH" = ( /turf/closed/wall/r_wall, /area/space/nearstation) @@ -60196,6 +60406,13 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"sNk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "sNz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -60353,15 +60570,13 @@ /turf/open/floor/plasteel/white, /area/science/explab) "tdB" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker, -/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/tile/purple{ dir = 1 }, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/white, /area/science/xenobiology) "tdL" = ( @@ -60373,6 +60588,7 @@ icon_state = "0-2"; pixel_y = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "tfx" = ( @@ -60527,6 +60743,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "tuy" = ( @@ -60540,6 +60757,18 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"tuR" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "tvj" = ( /obj/structure/festivus{ anchored = 1; @@ -60580,6 +60809,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"tzj" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) "tzH" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters_2"; @@ -60632,6 +60865,12 @@ }, /turf/open/floor/plasteel, /area/science/lab) +"tJW" = ( +/obj/machinery/atmospherics/components/binary/pump/on{ + name = "Air Out" + }, +/turf/open/floor/plating, +/area/maintenance/department/cargo) "tLP" = ( /obj/machinery/status_display/supply, /turf/closed/wall, @@ -60671,6 +60910,12 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"tUO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/closed/wall/r_wall, +/area/science/xenobiology) "tXn" = ( /obj/structure/sink{ dir = 4; @@ -60686,6 +60931,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "Air to Distro" + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "uaC" = ( @@ -60720,14 +60969,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/mixing) -"udl" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/space, -/area/space/nearstation) "uek" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -60766,6 +61007,7 @@ /turf/open/floor/plasteel, /area/engineering/main) "ufa" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -60832,9 +61074,6 @@ /area/engineering/main) "ume" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 }, @@ -60844,6 +61083,15 @@ }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"uof" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) "uoj" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -60931,6 +61179,9 @@ id = "misclab"; name = "test chamber blast door" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plating, /area/science/xenobiology) "uvq" = ( @@ -60966,6 +61217,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"uyJ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/engine, +/area/science/xenobiology) "uzh" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/engineering/glass/critical{ @@ -60989,6 +61244,12 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) +"uzB" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/engine, +/area/science/xenobiology) "uAU" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -61021,6 +61282,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating/airless, /area/space/nearstation) "uIn" = ( @@ -61050,6 +61312,10 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"uLP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/engine, +/area/science/xenobiology) "uMe" = ( /obj/structure/cable{ icon_state = "0-2"; @@ -61487,9 +61753,6 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "vOw" = ( @@ -62042,6 +62305,9 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "wYu" = ( @@ -62195,6 +62461,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "xlg" = ( @@ -62326,6 +62593,11 @@ }, /turf/open/floor/engine, /area/engineering/main) +"xAy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plating, +/area/science/xenobiology) "xCV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -90746,10 +91018,10 @@ gnq bXk ceU eVy -bXk -bXk -bXk -bXk +ulY +ulY +ulY +ulY tue pjH pjH @@ -90774,9 +91046,9 @@ tfw pjH pjH uHG -clw -clw -clw +cme +cme +jkv clQ clX rsZ @@ -91544,7 +91816,7 @@ fon fon aht aht -ouv +bzv clw clw clw @@ -96904,15 +97176,15 @@ bJN bJN bJN bJN +bXk +bXk +bXk +bXk +bXk +bXk frj pYh pYh -pYh -pYh -pYh -pYh -pYh -pYh hUw nqu nsJ @@ -97161,13 +97433,13 @@ bUp bWI bXr bKQ -udl +acN bZK abI abI abI abI -aaa +pmf aaa aaa uaO @@ -97418,13 +97690,13 @@ bMf bWJ bXs bJN -cui -bJP -bJP -bJP -bJP -bJP abI +bJP +bJP +bJP +bJP +bJP +cui abI aht pBJ @@ -97681,7 +97953,7 @@ caz cbs cbs bJP -aaa +pmf aaa aaa uaO @@ -97932,13 +98204,13 @@ bMf bMf bXu bLW -cui +abI bMi caA cbt ccm bJP -aaa +pmf aaa aaa pBJ @@ -98188,14 +98460,14 @@ bMf bMf bWM bXv -bVh +bWc poP bZL caB cbs cbs bJP -aaa +pmf aaa aaa aht @@ -98446,13 +98718,13 @@ hjk pmB bXw dJk -cui +sgt bJP bJP bJP bJP bJP -aaa +pmf aaa aaa aht @@ -98709,7 +98981,7 @@ caC cbu cbu bJP -aht +fRT aht fon fon @@ -98960,13 +99232,13 @@ bVZ bOX bXx bVi -cui +abI bMi caD cbv ccn bJP -aaa +pmf aaa fon shH @@ -99217,13 +99489,13 @@ bVY bUs bVg bVm -poP +qCu bZL caE cbu cbu bJP -aht +fRT aht fon fon @@ -99474,13 +99746,13 @@ bVZ bOX kas bNm -cui +abI bJP bJP bJP bJP bJP -aaa +pmf aaa aaa aaa @@ -99731,13 +100003,13 @@ bVZ bWO bXA bQO -poP +qCu bZM caF cbw cby bJP -aaa +pmf aaa aaa fon @@ -99988,13 +100260,13 @@ bVZ bMf bXB bNm -cui +abI bMi caG cbx cco bJP -aht +fRT aht aht fon @@ -100245,13 +100517,13 @@ bVY bWP bXy bQO -poP +qCu bZN caH cby cby bJP -aaa +pmf aaa aaa fon @@ -100502,13 +100774,13 @@ bTR bUt bXC bYs -bVW -bYw -bYw +jvO +jvO +jvO cBT -bYw -bYw -bYw +jvO +jvO +bVW aht aht fon @@ -106121,8 +106393,8 @@ oTl vzP vzP iWV -aFi -bpq +tJW +rxa bnj brT bxF @@ -106375,14 +106647,14 @@ eCw aUC aUC qHI -aKq +bpq aEj wAI vzP vzP bqA brU -bxF +bPa buK dqw spz @@ -106638,7 +106910,7 @@ bkF bkF bkF bkF -brV +bkF ume bkF bkF @@ -106895,7 +107167,7 @@ lWH wfs pfP bqC -brW +qVn vMx ofN gdL @@ -107153,7 +107425,7 @@ hEX brO bzg brX -csu +buI xzp ugC gdJ @@ -107407,9 +107679,9 @@ bnd tdB bpn thW -bpn +tzj bqE -brW +kUE btu xpr ihk @@ -108433,17 +108705,17 @@ aKq gfi bkF blX -blX +uyJ bpr oSc bsa -btw -buI -bwe +dHo +sNk +ffr bxM bzk bAH -blX +eUB blX bkF kgR @@ -108947,8 +109219,8 @@ gfi aFi bkF bni -blX -blX +lCN +uLP hvW igE btx @@ -108956,8 +109228,8 @@ dxc bwf bxO bzm -blX -blX +uLP +uzB blX bkF hTl @@ -109461,17 +109733,17 @@ gfi ybX bkF blX -blX +uyJ bpr bqG bsa -btw +dHo buM -bwh +ffr bxM bzn bAH -blX +eUB blX bkF qIO @@ -109975,8 +110247,8 @@ gfi ybX bkF bni -blX -blX +lCN +uLP bqI bsc btx @@ -109984,8 +110256,8 @@ buO bwf bxR bzp -blX -blX +uLP +uzB blX bkF aaA @@ -110489,17 +110761,17 @@ gfi bfM bkF blX -blX +uyJ bpr bqJ bsa gIG -buN -bwe +osC +ffr bxM bzq bAH -blX +eUB blX bkF wfc @@ -110750,7 +111022,7 @@ blX blX bqK bsd -gIG +tuR buN bwe bxS @@ -111003,8 +111275,8 @@ ntj fNv bkF blX -blX -blX +lCN +uLP bqL bse xjT @@ -111012,8 +111284,8 @@ btE buW bxT bzs -blX -blX +uLP +uzB blX bkF ueV @@ -111264,10 +111536,10 @@ bkF bkF bkF bkF -bkF +tUO qdi -bkF -bkF +cXP +nNp bkF bkF bkF @@ -112550,11 +112822,11 @@ bnd kRK cPy dir -mTS +uof ufa oNE oep -bnd +xAy mlr sEB jEX @@ -112808,7 +113080,7 @@ qcD xxw lhA lFh -ufa +ccU taA qcH bnd @@ -113835,7 +114107,7 @@ bkF bkF bkF pbR -blX +rMB naq bkF bkF @@ -114090,11 +114362,11 @@ aed aht bkF blX -blX -blX -blX -blX -blX +lXt +nfc +eWP +rbe +fLz blX bkF aht @@ -114347,11 +114619,11 @@ aby aaa xKc blX -blX +qAk iPj tfP -iPj -blX +geN +qAk blX xKc aaa 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 95361c3da2..01ad269a8e 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -72,6 +72,16 @@ category = CAT_WEAPONRY subcategory = CAT_MELEE +/datum/crafting_recipe/newsbaton + name = "Newspaper Baton" + result = /obj/item/melee/classic_baton/telescopic/newspaper + reqs = list(/obj/item/melee/classic_baton/telescopic = 1, + /obj/item/newspaper = 1, + /obj/item/stack/sticky_tape = 2) + time = 40 + category = CAT_WEAPONRY + subcategory = CAT_MELEE + /datum/crafting_recipe/bokken name = "Training Bokken" result = /obj/item/melee/bokken diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 8a9b6a5235..a04bfb365b 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -453,6 +453,18 @@ playsound(src.loc, on_sound, 50, 1) add_fingerprint(user) +/obj/item/melee/classic_baton/telescopic/newspaper + name = "The Daily Whiplash" + desc = "A newspaper wrapped around a telescopic baton in such a way that it looks like you're beating people with a rolled up newspaper." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "newspaper" + lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' + on_sound = 'sound/weapons/batonextend.ogg' + on_icon_state = "newspaper2" + off_icon_state = "newspaper" + on_item_state = "newspaper" + /obj/item/melee/classic_baton/telescopic/contractor_baton name = "contractor baton" desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets." diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index c213fa34df..31481f58cf 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -612,6 +612,12 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) icon_state = "kobold" item_state = "kobold" +/obj/item/toy/plush/lizardplushie/kobold + name = "spacelizard plushie" + desc = "An adorable stuffed toy that resembles a lizard in a suit." + icon_state = "plushie_spacelizard" + item_state = "plushie_spacelizard" + /obj/item/toy/plush/nukeplushie name = "operative plushie" desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious." @@ -643,17 +649,17 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/beeplushie name = "bee plushie" desc = "A cute toy that resembles an even cuter bee." - icon_state = "plushie_h" - item_state = "plushie_h" + icon_state = "plushie_bee" + item_state = "plushie_bee" attack_verb = list("stung") gender = FEMALE squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1) /obj/item/toy/plush/mothplushie - name = "insect plushie" + name = "moth plushie" desc = "An adorable stuffed toy that resembles some kind of insect." - icon_state = "bumble" - item_state = "bumble" + icon_state = "moff" + item_state = "moff" squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1) can_random_spawn = FALSE @@ -665,6 +671,20 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) attack_verb = list("lit", "flickered", "flashed") squeak_override = list('sound/weapons/magout.ogg' = 1) +/obj/item/toy/plush/drake + name = "drake plushie" + desc = "A large beast from lavaland turned into a marketable plushie!" + icon_state = "drake" + item_state = "drake" + attack_verb = list("bit", "devoured", "burned") + +/obj/item/toy/plush/deer + name = "deer plushie" + desc = "Oh deer, a plushie!" + icon_state = "deer" + item_state = "deer" + attack_verb = list("bleated", "rammed", "kicked") + /obj/item/toy/plush/box name = "cardboard plushie" desc = "A toy box plushie, it holds cotten. Only a baddie would place a bomb through the postal system..." @@ -694,7 +714,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) attack_verb = list("scanned", "beeped", "stared") /obj/item/toy/plush/borgplushie - name = "robot plushie" + name = "K9 plushie" desc = "An adorable stuffed toy of a robot." icon_state = "securityk9" item_state = "securityk9" @@ -702,25 +722,28 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) squeak_override = list('sound/machines/beep.ogg' = 1) /obj/item/toy/plush/borgplushie/medihound + name = "medihound plushie" icon_state = "medihound" item_state = "medihound" /obj/item/toy/plush/borgplushie/scrubpuppy + name = "scrubpuppy plushie" icon_state = "scrubpuppy" item_state = "scrubpuppy" +/obj/item/toy/plush/borgplushie/pupdozer + name = "pupdozer plushie" + icon_state = "pupdozer" + item_state = "pupdozer" + /obj/item/toy/plush/aiplush name = "AI plushie" desc = "A little stuffed toy AI core... it appears to be malfunctioning." - icon_state = "exo" - item_state = "exo" + icon_state = "malfai" + item_state = "malfai" attack_verb = list("hacked", "detonated", "overloaded") squeak_override = list('sound/machines/beep.ogg' = 9, 'sound/machines/buzz-two.ogg' = 1) -/obj/item/toy/plush/mammal/fox - icon_state = "fox" - item_state = "fox" - /obj/item/toy/plush/snakeplushie name = "snake plushie" desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." @@ -732,6 +755,72 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) /obj/item/toy/plush/mammal name = "mammal plushie" desc = "An adorable stuffed toy resembling some sort of crew member." + icon_state = "ych" + item_state = "ych" + can_random_spawn = FALSE + +/obj/item/toy/plush/mammal/fox + name = "fox plushie" + desc = "An adorable stuffed toy resembling a fox." + icon_state = "fox" + item_state = "fox" + attack_verb = list("yipped", "geckered", "yapped") + +/obj/item/toy/plush/mammal/dog + name = "dog plushie" + icon_state = "corgi" + item_state = "corgi" + desc = "An adorable stuffed toy that resembles a dog." + attack_verb = list("barked", "boofed", "borked") + squeak_override = list( + 'modular_citadel/sound/voice/bark1.ogg' = 1, + 'modular_citadel/sound/voice/bark2.ogg' = 1 + ) + +/obj/item/toy/plush/mammal/dog/fcorgi + name = "corgi plushie" + icon_state = "girlycorgi" + item_state = "girlycorgi" + desc = "An adorable stuffed toy that resembles a dog. This one dons a pink ribbon." + +/obj/item/toy/plush/mammal/dog/borgi + name = "borgi plushie" + icon_state = "borgi" + item_state = "borgi" + desc = "An adorable stuffed toy that resembles a robot dog." + +/obj/item/toy/plush/xeno + name = "xenohybrid plushie" + desc = "An adorable stuffed toy that resembles a xenomorphic crewmember." + icon_state = "xeno" + item_state = "xeno" + squeak_override = list('sound/voice/hiss2.ogg' = 1) + can_random_spawn = FALSE + +/obj/item/toy/plush/bird + name = "bird plushie" + desc = "An adorable stuffed plushie that resembles an avian." + icon_state = "bird" + item_state = "bird" + attack_verb = list("peeped", "beeped", "poofed") + squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1) + can_random_spawn = FALSE + +/obj/item/toy/plush/sergal + name = "sergal plushie" + desc = "An adorable stuffed plushie that resembles a sagaru." + icon_state = "sergal" + item_state = "sergal" + squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1) + can_random_spawn = FALSE + +/obj/item/toy/plush/catgirl + name = "feline plushie" + desc = "An adorable stuffed toy that resembles a feline." + icon_state = "cat" + item_state = "cat" + attack_verb = list("headbutt", "scritched", "bit") + squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1) can_random_spawn = FALSE /obj/item/toy/plush/catgirl/fermis @@ -742,40 +831,25 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths()) attack_verb = list("cuddled", "petpatted", "wigglepurred") squeak_override = list('modular_citadel/sound/voice/merowr.ogg' = 1) -/obj/item/toy/plush/xeno - name = "xenohybrid plushie" - desc = "An adorable stuffed toy that resmembles a xenomorphic crewmember." - squeak_override = list('sound/voice/hiss2.ogg' = 1) - can_random_spawn = FALSE +/obj/item/toy/plush/teddybear + name = "teddy" + desc = "It's a teddy bear!" + icon_state = "teddy" + item_state = "teddy" -/obj/item/toy/plush/bird - name = "bird plushie" - desc = "An adorable stuffed plushie that resembles an avian." - attack_verb = list("peeped", "beeped", "poofed") - squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1) - can_random_spawn = FALSE - -/obj/item/toy/plush/sergal - name = "sergal plushie" - desc = "An adorable stuffed plushie that resembles a sagaru." - squeak_override = list('modular_citadel/sound/voice/merp.ogg' = 1) - can_random_spawn = FALSE - -/obj/item/toy/plush/mammal/dog - desc = "An adorable stuffed toy that resembles a canine." - attack_verb = list("barked", "boofed", "borked") - squeak_override = list( - 'modular_citadel/sound/voice/bark1.ogg' = 1, - 'modular_citadel/sound/voice/bark2.ogg' = 1 - ) - -/obj/item/toy/plush/catgirl - name = "feline plushie" - desc = "An adorable stuffed toy that resembles a feline." - attack_verb = list("headbutt", "scritched", "bit") - squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1) - can_random_spawn = FALSE +/obj/item/toy/plush/crab + name = "crab plushie" + desc = "Fewer pinches than a real one, but it still clicks." + icon_state = "crab" + item_state = "crab" + attack_verb = list("clicked", "clacked", "pinched") +/obj/item/toy/plush/gondola + name = "gondola plushie" + desc = "Just looking at it seems to calm you down. Please do not eat it though." + icon_state = "gondola" + item_state = "gondola" + attack_verb = list("calmed", "smiled", "peaced") /obj/item/toy/plush/hairball name = "Hairball" diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index f1b7d3e8c4..07c1a12ced 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -23,14 +23,14 @@ ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM) + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, - ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM) + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY) paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SRV diff --git a/code/modules/jobs/job_types/quartermaster.dm b/code/modules/jobs/job_types/quartermaster.dm index 301acff5c4..ff811d30d1 100644 --- a/code/modules/jobs/job_types/quartermaster.dm +++ b/code/modules/jobs/job_types/quartermaster.dm @@ -25,7 +25,7 @@ minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_SEC_DOORS, ACCESS_HEADS) - paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck. + paycheck = PAYCHECK_HARD //They can already buy stuff using cargo budget, don't give em a command-level paycheck. //alright i'll agree to that -qweq paycheck_department = ACCOUNT_CAR display_order = JOB_DISPLAY_ORDER_QUARTERMASTER diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 80dec5bc29..2452beb0e1 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -89,6 +89,11 @@ name = "large empty capsule" desc = "An extremly large capsule which requires power. Useful for projects all over." template_id = "shelter_delta" + +/obj/item/survivalcapsule/luxury/penthouse + name = "penthouse bluespace sheler capsule" + desc = "The absolute pinnacle of luxury in terms of survival capsules. While exuberantly expensive it has everything needed to make a small home in lavaland." + template_id = "shelter_epsilon" //Pod objects //Window diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index a915a89c73..e64505df7e 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -61,37 +61,32 @@ new /obj/item/guardiancreator(src) /obj/structure/closet/crate/necropolis/tendril/weapon_armor/PopulateContents() - var/loot = rand(1,11) + var/loot = rand(1,10) switch(loot) if(1) new /obj/item/clothing/suit/space/hardsuit/cult(src) if(2) new /obj/item/katana/lavaland(src) if(3) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) - else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) - if(4) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(5) + if(4) new /obj/item/nullrod/scythe/talking(src) - if(6) + if(5) new /obj/item/nullrod/armblade(src) - if(7) + if(6) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(8) + if(7) new /obj/item/grenade/clusterbuster/inferno(src) - if(9) + if(8) new /obj/item/gun/magic/wand/book/shock(src) - if(10) + if(9) new /obj/item/gun/magic/wand/book/page(src) - if(11) + if(10) new /obj/item/gun/magic/wand/book/spark(src) /obj/structure/closet/crate/necropolis/tendril/misc/PopulateContents() - var/loot = rand(1,14) + var/loot = rand(1,12) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -106,31 +101,21 @@ if(6) new /obj/item/jacobs_ladder(src) if(7) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) - else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) - if(8) new /obj/item/wisp_lantern(src) - if(9) + if(8) new /obj/item/pickaxe/rosegold(src) - if(10) + if(9) new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) - if(11) + if(10) new /obj/item/disk/tech_disk/illegal(src) - if(12) + if(11) new /obj/item/clothing/suit/space/hardsuit/cult(src) - if(13) + if(12) new /obj/item/katana/lavaland(src) - if(14) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/resonator_blast(src) - else - new /obj/item/disk/design_disk/modkit_disc/rapid_repeater(src) /obj/structure/closet/crate/necropolis/tendril/all/PopulateContents() - var/loot = rand(1,29) + var/loot = rand(1,28) switch(loot) if(1) new /obj/item/shared_storage/red(src) @@ -145,56 +130,51 @@ if(6) new /obj/item/jacobs_ladder(src) if(7) - if(prob(50)) - new /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) - else - new /obj/item/disk/design_disk/modkit_disc/bounty(src) - if(8) new /obj/item/wisp_lantern(src) - if(9) + if(8) new /obj/item/pickaxe/rosegold(src) - if(10) + if(9) new /obj/item/bedsheet/cosmos(src) new /obj/item/melee/skateboard/hoverboard(src) - if(11) + if(10) new /obj/item/disk/tech_disk/illegal(src) - if(12) + if(11) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker/old(src) - if(13) + if(12) new /obj/item/nullrod/scythe/talking(src) - if(14) + if(13) new /obj/item/nullrod/armblade(src) - if(15) + if(14) new /obj/item/reagent_containers/food/drinks/bottle/holywater/hell(src) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/old(src) - if(16) + if(15) new /obj/item/grenade/clusterbuster/inferno(src) - if(17) + if(16) new /obj/item/gun/magic/wand/book/shock(src) - if(18) + if(17) new /obj/item/gun/magic/wand/book/page(src) - if(19) + if(18) new /obj/item/gun/magic/wand/book/spark(src) - if(20) + if(19) new /obj/item/soulstone/anybody(src) - if(21) + if(20) new /obj/item/rod_of_asclepius(src) - if(22) + if(21) new /obj/item/organ/heart/cursed/wizard(src) - if(23) + if(22) new /obj/item/book/granter/spell/summonitem(src) - if(24) + if(23) new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/bedsheet/cult(src) - if(25) + if(24) new /obj/item/clothing/neck/necklace/memento_mori(src) - if(26) + if(25) new /obj/item/warp_cube/red(src) - if(27) + if(26) new /obj/item/immortality_talisman(src) - if(28) + if(27) new /obj/item/gun/magic/wand/book/healing(src) - if(29) + if(28) new /obj/item/guardiancreator(src) //KA modkit design discs diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 8a7c3a81bd..7a3cd9140b 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -57,6 +57,7 @@ new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxury/elitebar, 10000), new /datum/data/mining_equipment("Empty Capsule", /obj/item/survivalcapsule/luxury/empty, 5000), + new /datum/data/mining_equipment("Penthouse Capsule", /obj/item/survivalcapsule/luxury/penthouse, 15000), new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm index 6bd04ffd6d..83a8412ca8 100644 --- a/code/modules/mining/shelters.dm +++ b/code/modules/mining/shelters.dm @@ -85,3 +85,14 @@ . = ..() whitelisted_turfs = typecacheof(/turf/closed/mineral) banned_objects = typecacheof(/obj/structure/stone_tile) + +/datum/map_template/shelter/epsilon + name = "Shelter Epsilon" + shelter_id = "shelter_epsilon" + description = "A small apartment in the palm of your hand." + mappath = "_maps/templates/shelter_5.dmm" + +/datum/map_template/shelter/epsilon/New() + . = ..() + whitelisted_turfs = typecacheof(/turf/closed/mineral) + banned_objects = typecacheof(/obj/structure/stone_tile) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index a60c5504e6..e6c5e7c22b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -40,8 +40,10 @@ Difficulty: Medium ranged = 1 ranged_cooldown_time = 16 pixel_x = -16 - crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye) - loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka) + crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka, /obj/item/crusher_trophy/miner_eye, /obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) + loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator/premiumka,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) wander = FALSE del_on_death = TRUE blood_volume = BLOOD_VOLUME_NORMAL diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 2bcca74f30..64e1399e19 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -26,8 +26,10 @@ Difficulty: Extremely Hard speed = 20 move_to_delay = 20 ranged = TRUE - crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman) - loot = list(/obj/effect/decal/remains/plasma) + crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) + loot = list(/obj/effect/decal/remains/plasma, ,/obj/item/disk/design_disk/modkit_disc/mob_and_turf_aoe, + /obj/item/disk/design_disk/modkit_disc/bounty,/obj/item/disk/design_disk/modkit_disc/resonator_blast,/obj/item/disk/design_disk/modkit_disc/rapid_repeater) wander = FALSE del_on_death = TRUE blood_volume = BLOOD_VOLUME_NORMAL diff --git a/dependencies.sh b/dependencies.sh index a56ad31dd4..bc7c499540 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -10,6 +10,9 @@ export BYOND_MINOR=1536 #rust_g git tag export RUST_G_VERSION=0.4.8 +#auxmos git tag +export AUXMOS_VERSION=0.2.0 + #node version export NODE_VERSION=12 export NODE_VERSION_PRECISE=12.20.0 diff --git a/html/changelog.html b/html/changelog.html index 831d711e2d..5e00eea3ab 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,29 @@ -->
+

30 June 2021

+

WanderingFox95 updated:

+ +

bunny232 updated:

+ +

qweq12yt updated:

+ +

shellspeed1 updated:

+ +

28 June 2021

Putnam3145 updated: