Skip to content

Commit

Permalink
Refinements to Violet Protocol (#5933)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Tweaks Chlorine gas.
tweak: Adjusts Virology layout and scrubber net.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Captain277 authored Sep 10, 2023
1 parent f38ebf6 commit 93d6e49
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 42 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/atmospherics/machinery/scrubber.dm
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions code/controllers/subsystem/air.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions code/modules/atmospherics/gasmixtures/gas_types_hardcoded.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
85 changes: 47 additions & 38 deletions maps/rift/levels/rift-04-surface1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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";
Expand All @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
},
Expand All @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -53447,7 +53456,7 @@ jFr
vaW
qjo
kZl
jak
vLk
jnU
cZF
qkU
Expand Down Expand Up @@ -60235,7 +60244,7 @@ hWe
tVG
wEv
xbi
jLF
xgG
bec
tmB
mex
Expand Down Expand Up @@ -60427,11 +60436,11 @@ psY
pHX
stV
xfE
pmT
eXs
pmT
ybI
xjW
ouJ
pYJ
mkq
mAk
mAk
Expand Down Expand Up @@ -60819,7 +60828,7 @@ jYF
jYF
lCp
qTT
lRl
ouJ
lCp
lCp
lCp
Expand Down

0 comments on commit 93d6e49

Please sign in to comment.