From 93d6e4914452f1518af3a7aae0184a69e4525810 Mon Sep 17 00:00:00 2001 From: Captain277 Date: Sun, 10 Sep 2023 15:30:07 -0700 Subject: [PATCH] Refinements to Violet Protocol (#5933) ## About The Pull Request 1. **Tweaks/Nerfs Chlorine Gas.** 2. **Tweaks Virology Atmospherics Layout.** ## Why It's Good For The Game 1. _The gas was a little **too** good at killing everyone._ 2. _Makes the scrubber loop a little more secure and puts it on a fresh network, thanks to Kevin._ ## Changelog :cl: tweak: Tweaks Chlorine gas. tweak: Adjusts Virology layout and scrubber net. /:cl: --- .../atmospherics/machinery/scrubber.dm | 1 + code/controllers/subsystem/air.dm | 1 + .../gasmixtures/gas_types_hardcoded.dm | 7 +- .../reagents/Chemistry-Reagents-Toxins.dm | 11 +++ maps/rift/levels/rift-04-surface1.dmm | 85 ++++++++++--------- 5 files changed, 63 insertions(+), 42 deletions(-) diff --git a/code/__DEFINES/atmospherics/machinery/scrubber.dm b/code/__DEFINES/atmospherics/machinery/scrubber.dm index de83d9a536a..a74be3298e3 100644 --- a/code/__DEFINES/atmospherics/machinery/scrubber.dm +++ b/code/__DEFINES/atmospherics/machinery/scrubber.dm @@ -1,5 +1,6 @@ //* Scrubber default enums - these must be on SSair! #define SCRUBBER_DEFAULT_STATION "station" +#define SCRUBBER_DEFAULT_ATLAS_VIROLOGY "atlasviro" /// max ids scrubbers can scrub at once #define SCRUBBER_MAX_GAS_IDS 10 diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 871fb553600..f971da5f53b 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -22,6 +22,7 @@ SUBSYSTEM_DEF(air) /// scrubber defaults var/list/scrubber_defaults = list( SCRUBBER_DEFAULT_STATION = list(/datum/gas/carbon_dioxide, /datum/gas/phoron), + SCRUBBER_DEFAULT_ATLAS_VIROLOGY = list(/datum/gas/carbon_dioxide, /datum/gas/phoron, /datum/gas/chlorine), ) var/cost_turfs = 0 diff --git a/code/modules/atmospherics/gasmixtures/gas_types_hardcoded.dm b/code/modules/atmospherics/gasmixtures/gas_types_hardcoded.dm index 18bf2fa4614..01e59979459 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types_hardcoded.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types_hardcoded.dm @@ -142,10 +142,9 @@ visual_overlay = "chlorine" visual_threshold = 1 - gas_reagent_id = "sacid" - gas_reagent_amount = 10 - gas_reagent_threshold = 5 - + gas_reagent_id = "chlorinegas" + gas_reagent_amount = 1 + gas_reagent_threshold = 0.5 /datum/gas/sulfur_dioxide id = GAS_ID_SULFUR_DIOXIDE diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm index 465d2bbff39..dbf231710c1 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm @@ -474,6 +474,17 @@ power = 2 meltdose = 30 +//Solid Chlorine is alkaline, but gaseous Chlorine is acidic. +/datum/reagent/acid/chlorine_gas + name = "Chlorine gas" + id = "chlorinegas" + description = "A pungent yellow-green acidic gas." + taste_description = "bleach" + reagent_state = REAGENT_GAS + color = "#c5f72d" + power = 5 + meltdose = 10 + /datum/reagent/thermite/venom name = "Pyrotoxin" id = "thermite_v" diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index 571bd8c97f0..6793659d219 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -1454,9 +1454,8 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4; - power_rating = 45000 +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1 }, /turf/simulated/floor/tiled, /area/medical/virologypurge) @@ -7691,6 +7690,16 @@ /obj/structure/fitness/weightlifter, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"eXs" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/medical/virologyisolation) "eXK" = ( /obj/effect/debris/cleanable/liquid_fuel, /turf/simulated/floor/plating, @@ -14293,14 +14302,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_one) -"jak" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/medical/virologyaccess) "jaP" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -18839,12 +18840,6 @@ }, /turf/simulated/floor/plating, /area/medical/virologymaint) -"lRl" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/medical/virologypurge) "lRy" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -23377,8 +23372,9 @@ /turf/simulated/floor/tiled/monotile, /area/rnd/xenobiology/xenoflora) "ouJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1; + power_rating = 45000 }, /turf/simulated/floor/tiled, /area/medical/virologypurge) @@ -24873,7 +24869,6 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) "pmV" = ( @@ -27380,9 +27375,6 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) "qTT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -27391,6 +27383,9 @@ /obj/structure/cable/green{ icon_state = "0-8" }, +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/medical/virologypurge) "qTX" = ( @@ -35469,6 +35464,14 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"vLk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/medical/virologyaccess) "vLm" = ( /obj/structure/table/steel, /turf/simulated/floor/tiled/steel, @@ -36944,9 +36947,6 @@ /area/medical/virologyisolation) "wCv" = ( /obj/machinery/atmospherics/valve/open, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/medical/virologypurge) "wCw" = ( @@ -37024,6 +37024,9 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) "wEC" = ( @@ -37633,10 +37636,6 @@ /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/public_garden) "xbi" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 10 }, @@ -37655,6 +37654,11 @@ pixel_y = 4 }, /obj/item/storage/box/masks, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) "xbC" = ( @@ -37923,6 +37927,11 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/steel, /area/security/prison) +"xgG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/medical/virologyisolation) "xgU" = ( /obj/effect/floor_decal/corner/purple{ dir = 5 @@ -38041,8 +38050,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/visible/green, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/medical/virologypurge) "xkq" = ( @@ -39413,7 +39423,6 @@ name = "Virology Purge Chamber"; req_one_access = list(39) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/medical/virologyisolation) "yco" = ( @@ -53447,7 +53456,7 @@ jFr vaW qjo kZl -jak +vLk jnU cZF qkU @@ -60235,7 +60244,7 @@ hWe tVG wEv xbi -jLF +xgG bec tmB mex @@ -60427,11 +60436,11 @@ psY pHX stV xfE -pmT +eXs pmT ybI xjW -ouJ +pYJ mkq mAk mAk @@ -60819,7 +60828,7 @@ jYF jYF lCp qTT -lRl +ouJ lCp lCp lCp