From b08632353cada6e1c65a5d8f4b0ad1bb6646fd19 Mon Sep 17 00:00:00 2001
From: EOBGames <58124831+EOBGames@users.noreply.github.com>
Date: Tue, 17 Aug 2021 20:49:47 +0200
Subject: [PATCH] [MDB IGNORE] Eliminates Toxins (#60619)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.
Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.
Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.
Makes the code more legible and makes mapping less painful.
(The payment has been made)
---
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 2 +-
.../RandomRuins/SpaceRuins/gasthelizards.dmm | 2 +-
_maps/RandomRuins/SpaceRuins/oldstation.dmm | 2 +-
_maps/RandomZLevels/Academy.dmm | 2 +-
_maps/RandomZLevels/moonoutpost19.dmm | 6 +-
_maps/RandomZLevels/snowdin.dmm | 12 +-
_maps/RandomZLevels/undergroundoutpost45.dmm | 6 +-
.../map_files/Deltastation/DeltaStation2.dmm | 140 +++++++--------
.../map_files/IceBoxStation/IceBoxStation.dmm | 94 +++++-----
_maps/map_files/KiloStation/KiloStation.dmm | 92 +++++-----
_maps/map_files/MetaStation/MetaStation.dmm | 161 ++++++++++--------
_maps/map_files/debug/multiz.dmm | 2 +-
_maps/map_files/tramstation/tramstation.dmm | 84 ++++-----
code/__DEFINES/access.dm | 18 +-
code/__DEFINES/atmospherics.dm | 28 +--
code/__DEFINES/machines.dm | 2 +-
code/_globalvars/lists/flavor_misc.dm | 4 +-
code/_onclick/hud/alert.dm | 12 +-
code/controllers/subsystem/id_access.dm | 4 +-
code/datums/id_trim/jobs.dm | 14 +-
code/game/area/areas/ruins/space.dm | 4 +-
code/game/area/space_station_13_areas.dm | 20 +--
code/game/machinery/airlock_control.dm | 6 +-
code/game/machinery/buttons.dm | 10 +-
code/game/machinery/camera/camera.dm | 4 +-
code/game/machinery/computer/atmos_control.dm | 34 ++--
code/game/machinery/computer/camera.dm | 4 +-
code/game/machinery/computer/pod.dm | 6 +-
code/game/machinery/doors/airlock_types.dm | 10 +-
code/game/machinery/doors/poddoor.dm | 10 +-
.../embedded_controller/airlock_controller.dm | 12 +-
code/game/machinery/igniter.dm | 8 +-
code/game/machinery/mass_driver.dm | 4 +-
.../circuitboards/computer_circuitboards.dm | 10 +-
.../objects/items/devices/PDA/PDA_types.dm | 4 +-
code/game/objects/items/devices/PDA/cart.dm | 4 +-
code/game/objects/items/devices/camera_bug.dm | 2 +-
code/game/objects/items/manuals.dm | 8 +-
code/game/objects/items/religion.dm | 2 +-
code/game/objects/items/storage/backpack.dm | 16 +-
code/game/objects/items/storage/boxes.dm | 2 +-
code/game/objects/items/storage/firstaid.dm | 2 +-
code/game/objects/items/toys.dm | 2 +-
.../crates_lockers/closets/job_closets.dm | 4 +-
code/modules/antagonists/blob/blob_mobs.dm | 2 +-
code/modules/antagonists/morph/morph.dm | 2 +-
code/modules/antagonists/revenant/revenant.dm | 2 +-
.../antagonists/slaughter/slaughter.dm | 2 +-
.../atmospherics/environmental/LINDA_fire.dm | 6 +-
.../atmospherics/gasmixtures/gas_mixture.dm | 2 +-
.../atmospherics/machinery/airalarm.dm | 2 +-
.../components/binary_devices/dp_vent_pump.dm | 4 +-
.../atmospherics/machinery/components/tank.dm | 2 +-
.../unary_devices/outlet_injector.dm | 10 +-
.../components/unary_devices/vent_pump.dm | 10 +-
.../atmospherics/machinery/other/miner.dm | 2 +-
.../machinery/portable/canister.dm | 4 +-
code/modules/cargo/gondolapod.dm | 2 +-
code/modules/cargo/packs.dm | 26 +--
code/modules/clothing/suits/labcoat.dm | 2 +-
code/modules/clothing/under/jobs/rnd.dm | 4 +-
code/modules/events/spacevine.dm | 2 +-
.../experisci/experiment/types/explosive.dm | 2 +-
code/modules/flufftext/Hallucination.dm | 12 +-
code/modules/holiday/easter.dm | 2 +-
code/modules/holiday/halloween.dm | 2 +-
.../jobs/job_types/research_director.dm | 4 +-
code/modules/jobs/job_types/roboticist.dm | 4 +-
code/modules/jobs/job_types/scientist.dm | 6 +-
code/modules/mining/minebot.dm | 2 +-
code/modules/mob/living/carbon/alien/life.dm | 22 +--
code/modules/mob/living/carbon/human/life.dm | 4 +-
.../carbon/human/species_types/plasmamen.dm | 2 +-
.../modules/mob/living/carbon/init_signals.dm | 4 +-
code/modules/mob/living/carbon/life.dm | 14 +-
code/modules/mob/living/silicon/ai/ai.dm | 2 +-
.../mob/living/simple_animal/bot/bot.dm | 2 +-
.../mob/living/simple_animal/constructs.dm | 2 +-
.../living/simple_animal/eldritch_demons.dm | 2 +-
.../living/simple_animal/friendly/gondola.dm | 2 +-
.../living/simple_animal/friendly/trader.dm | 2 +-
.../living/simple_animal/guardian/guardian.dm | 2 +-
.../mob/living/simple_animal/hostile/alien.dm | 2 +-
.../mob/living/simple_animal/hostile/bear.dm | 2 +-
.../mob/living/simple_animal/hostile/bees.dm | 2 +-
.../mob/living/simple_animal/hostile/carp.dm | 2 +-
.../simple_animal/hostile/cat_butcher.dm | 2 +-
.../living/simple_animal/hostile/cockroach.dm | 2 +-
.../simple_animal/hostile/dark_wizard.dm | 2 +-
.../living/simple_animal/hostile/eyeballs.dm | 2 +-
.../living/simple_animal/hostile/faithless.dm | 2 +-
.../simple_animal/hostile/giant_spider.dm | 6 +-
.../living/simple_animal/hostile/hivebot.dm | 2 +-
.../hostile/jungle/_jungle_mobs.dm | 2 +-
.../simple_animal/hostile/killertomato.dm | 2 +-
.../hostile/megafauna/_megafauna.dm | 2 +-
.../mob/living/simple_animal/hostile/mimic.dm | 2 +-
.../hostile/mining_mobs/mining_mobs.dm | 2 +-
.../simple_animal/hostile/nanotrasen.dm | 2 +-
.../simple_animal/hostile/netherworld.dm | 2 +-
.../mob/living/simple_animal/hostile/ooze.dm | 2 +-
.../living/simple_animal/hostile/pirate.dm | 6 +-
.../simple_animal/hostile/retaliate/bat.dm | 6 +-
.../simple_animal/hostile/retaliate/clown.dm | 2 +-
.../simple_animal/hostile/retaliate/ghost.dm | 2 +-
.../hostile/retaliate/spaceman.dm | 2 +-
.../living/simple_animal/hostile/russian.dm | 2 +-
.../living/simple_animal/hostile/skeleton.dm | 2 +-
.../simple_animal/hostile/space_dragon.dm | 2 +-
.../living/simple_animal/hostile/statue.dm | 2 +-
.../living/simple_animal/hostile/stickman.dm | 2 +-
.../living/simple_animal/hostile/syndicate.dm | 16 +-
.../mob/living/simple_animal/hostile/tree.dm | 4 +-
.../living/simple_animal/hostile/vatbeast.dm | 2 +-
.../simple_animal/hostile/venus_human_trap.dm | 2 +-
.../living/simple_animal/hostile/wizard.dm | 2 +-
.../living/simple_animal/hostile/zombie.dm | 2 +-
.../modules/mob/living/simple_animal/shade.dm | 2 +-
.../mob/living/simple_animal/simple_animal.dm | 10 +-
.../mob/living/simple_animal/slime/slime.dm | 2 +-
code/modules/paperwork/paper_premade.dm | 2 +-
.../research/anomaly/explosive_compressor.dm | 2 +-
code/modules/research/rdconsole.dm | 2 +-
.../ruins/spaceruin_code/forgottenship.dm | 2 +-
code/modules/station_goals/dna_vault.dm | 4 +-
code/modules/surgery/organs/lungs.dm | 60 +++----
code/modules/swarmers/swarmer.dm | 2 +-
code/modules/uplink/uplink_items.dm | 2 +-
code/modules/vending/cartridge.dm | 2 +-
code/modules/vending/plasmaresearch.dm | 2 +-
code/modules/vending/wardrobes.dm | 4 +-
icons/hud/screen_alert.dmi | Bin 115643 -> 115646 bytes
icons/mob/clothing/back.dmi | Bin 129270 -> 136525 bytes
icons/mob/clothing/suit.dmi | Bin 400591 -> 400592 bytes
icons/mob/clothing/under/rnd.dmi | Bin 7087 -> 7087 bytes
.../inhands/equipment/backpack_lefthand.dmi | Bin 23024 -> 23022 bytes
.../inhands/equipment/backpack_righthand.dmi | Bin 23898 -> 23896 bytes
icons/obj/clothing/suits.dmi | Bin 142865 -> 142866 bytes
icons/obj/clothing/under/rnd.dmi | Bin 2448 -> 2448 bytes
icons/obj/pda.dmi | Bin 8369 -> 8375 bytes
icons/obj/stationobjs.dmi | Bin 83334 -> 83334 bytes
icons/obj/storage.dmi | Bin 88503 -> 88501 bytes
icons/turf/areas.dmi | Bin 42512 -> 42532 bytes
tools/UpdatePaths/toxins_to_plasma.txt | 38 +++++
144 files changed, 678 insertions(+), 611 deletions(-)
create mode 100644 tools/UpdatePaths/toxins_to_plasma.txt
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
index 6281480836c..cf7cc3553ad 100644
--- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -859,7 +859,7 @@
/area/ruin/space/derelict/bridge)
"ee" = (
/obj/structure/window/reinforced,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/airless{
icon_state = "damaged3"
},
diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
index 0aa0a532b3b..0bb6c7036e6 100644
--- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
+++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -221,7 +221,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron,
/area/ruin/space/has_grav/gasthelizard)
"F" = (
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index 927fcbec134..5d4f19f93b7 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -7214,7 +7214,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"Vm" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/east,
diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm
index 34d80916205..cd3d6b8b2da 100644
--- a/_maps/RandomZLevels/Academy.dmm
+++ b/_maps/RandomZLevels/Academy.dmm
@@ -445,7 +445,7 @@
/turf/open/floor/iron/dark,
/area/awaymission/academy/headmaster)
"cg" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/showroomfloor,
/area/awaymission/academy/headmaster)
"ch" = (
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
index ebb427c994b..98f29798f37 100644
--- a/_maps/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/RandomZLevels/moonoutpost19.dmm
@@ -3327,7 +3327,7 @@
name = "research director's locker";
req_access_txt = "201"
},
-/obj/item/storage/backpack/satchel/tox,
+/obj/item/storage/backpack/satchel/science,
/obj/item/clothing/gloves/color/latex,
/turf/open/floor/iron/cafeteria{
dir = 5
@@ -3335,8 +3335,8 @@
/area/awaymission/moonoutpost19/research)
"hr" = (
/obj/structure/table,
-/obj/item/cartridge/signal/toxins,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance,
+/obj/item/cartridge/signal/ordnance{
pixel_x = -4;
pixel_y = 2
},
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index bd5ff693a91..29765da3f22 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -8559,7 +8559,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xN" = (
@@ -8748,7 +8748,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
"yp" = (
@@ -11273,7 +11273,7 @@
/area/awaymission/snowdin/outside)
"Fn" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/outside)
"Fo" = (
@@ -13877,7 +13877,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
@@ -13958,7 +13958,7 @@
/area/awaymission/snowdin/post/garage)
"Ub" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
@@ -14178,7 +14178,7 @@
/area/awaymission/snowdin/post/mining_dock)
"WA" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/outside)
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index caa592f8ded..862840719c5 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -4789,7 +4789,7 @@
},
/area/awaymission/undergroundoutpost45/central)
"kd" = (
-/obj/item/storage/backpack/satchel/tox,
+/obj/item/storage/backpack/satchel/science,
/obj/item/clothing/gloves/color/latex,
/obj/item/clothing/suit/toggle/labcoat/science,
/obj/effect/decal/cleanable/dirt,
@@ -6538,8 +6538,8 @@
/area/awaymission/undergroundoutpost45/research)
"nk" = (
/obj/structure/table,
-/obj/item/cartridge/signal/toxins,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance,
+/obj/item/cartridge/signal/ordnance{
pixel_x = -4;
pixel_y = 2
},
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8f66e9e5a39..5bc18c17977 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -15414,13 +15414,9 @@
"ccL" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
- name = "Toxins Secure Storage";
+ name = "Ordnance Lab Storage";
req_access_txt = "71"
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/structure/cable,
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -15434,6 +15430,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron,
/area/science/mixing)
"ccM" = (
@@ -19636,13 +19636,9 @@
"cCk" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
- name = "Toxins Mixing Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -19651,6 +19647,10 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron,
/area/science/mixing)
"cCn" = (
@@ -27937,11 +27937,11 @@
"drR" = (
/obj/machinery/door/firedoor/heavy,
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/plating,
/area/science/mixing)
"drT" = (
@@ -30353,18 +30353,18 @@
"dDt" = (
/obj/machinery/door/firedoor/heavy,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/machinery/door/airlock/research{
- name = "Toxins Secure Storage";
+ name = "Ordnance Lab Storage";
req_access_txt = "71"
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron,
/area/science/mixing)
"dDw" = (
@@ -30642,9 +30642,9 @@
},
/obj/structure/table/reinforced,
/obj/machinery/requests_console/directional/west{
- department = "Toxins Lab";
+ department = "Ordnance Lab";
departmentType = 5;
- name = "Toxins Requests Console"
+ name = "Ordnance Lab Requests Console"
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
@@ -31006,7 +31006,7 @@
"dFL" = (
/obj/machinery/light/directional/east,
/obj/machinery/camera{
- c_tag = "Science - Toxins Mixing Lab Aft";
+ c_tag = "Science - Ordnance Lab Aft";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -31247,7 +31247,7 @@
/area/science/test_area)
"dHh" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/ordnance,
/obj/item/storage/firstaid/toxin{
pixel_x = -4;
pixel_y = 4
@@ -31899,7 +31899,7 @@
/area/science/mixing)
"dJZ" = (
/obj/machinery/camera{
- c_tag = "Science - Toxins Secure Storage";
+ c_tag = "Science - Ordnance Lab Storage";
dir = 4;
name = "science camera";
network = list("ss13","rd")
@@ -32016,7 +32016,7 @@
"dKE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Toxins Maintenance";
+ name = "Ordnance Lab Maintenance";
req_access_txt = "8"
},
/obj/effect/decal/cleanable/dirt,
@@ -32339,7 +32339,7 @@
/obj/item/target,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/preset/toxins{
+/obj/machinery/camera/preset/ordnance{
dir = 4
},
/turf/open/floor/plating/airless,
@@ -32416,7 +32416,7 @@
/turf/open/floor/iron,
/area/science/storage)
"dMa" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/science/storage)
@@ -32649,7 +32649,7 @@
/turf/open/floor/iron,
/area/science/storage)
"dNC" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -37371,7 +37371,7 @@
/obj/item/wrench,
/obj/item/clothing/mask/gas,
/obj/machinery/camera{
- c_tag = "Science - Toxins Launch Site";
+ c_tag = "Science - Ordnance Launch Site";
name = "science camera";
network = list("ss13","rd")
},
@@ -38081,7 +38081,7 @@
/turf/open/floor/iron,
/area/maintenance/starboard/fore)
"exE" = (
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"exW" = (
@@ -39515,7 +39515,7 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"eRQ" = (
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
+/obj/machinery/computer/atmos_control/tank/plasma_tank{
dir = 4
},
/obj/structure/window/reinforced{
@@ -41431,9 +41431,11 @@
/turf/open/floor/iron,
/area/engineering/atmos/upper)
"fpQ" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix{
pixel_x = -22
},
/turf/open/floor/engine,
@@ -42402,7 +42404,7 @@
/area/command/bridge)
"fFT" = (
/obj/machinery/camera{
- c_tag = "Science - Toxins Mixing Lab Fore";
+ c_tag = "Science - Ordnance Lab Fore";
dir = 4;
name = "science camera";
network = list("ss13","rd")
@@ -43306,7 +43308,7 @@
/area/command/heads_quarters/hos)
"fUX" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen/toxins{
+/obj/machinery/computer/security/telescreen/ordnance{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -49880,7 +49882,7 @@
/turf/open/floor/iron,
/area/cargo/miningoffice)
"hSn" = (
-/obj/machinery/airlock_sensor/incinerator_toxmix{
+/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_x = -24
},
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -55667,17 +55669,17 @@
/turf/open/floor/iron,
/area/engineering/atmos/upper)
"juf" = (
-/obj/machinery/button/ignition/incinerator/toxmix{
+/obj/machinery/button/ignition/incinerator/ordmix{
pixel_x = -6;
pixel_y = 30
},
-/obj/machinery/button/door/incinerator_vent_toxmix{
+/obj/machinery/button/door/incinerator_vent_ordmix{
pixel_x = 8;
pixel_y = 30
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
- c_tag = "Science - Toxins Mixing Lab Burn Chamber";
+ c_tag = "Science - Ordnance Lab Burn Chamber";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -57461,8 +57463,8 @@
/obj/machinery/door/firedoor/heavy,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
},
/turf/open/floor/plating,
/area/science/mixing)
@@ -58883,7 +58885,7 @@
/turf/open/floor/iron,
/area/engineering/supermatter/room)
"knt" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -63832,7 +63834,7 @@
/turf/open/floor/iron/grimy,
/area/service/bar)
"lyU" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
dir = 8
},
/turf/open/floor/engine,
@@ -65464,7 +65466,7 @@
/area/cargo/storage)
"lXF" = (
/obj/machinery/light/directional/east,
-/obj/machinery/computer/atmos_control/toxinsmix{
+/obj/machinery/computer/atmos_control/ordnancemix{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
@@ -73068,7 +73070,7 @@
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/research{
- name = "Toxins Launch Site";
+ name = "Ordnance Launch Site";
req_access_txt = "8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -73233,7 +73235,7 @@
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"nUg" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{
dir = 4
},
/turf/open/floor/engine/plasma,
@@ -75765,7 +75767,7 @@
/turf/open/floor/iron/dark,
/area/science/genetics)
"ozg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{
dir = 4
},
/turf/open/floor/engine/plasma,
@@ -76149,7 +76151,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/loading_area,
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver{
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{
pixel_x = 28
},
/turf/open/floor/iron,
@@ -76636,7 +76638,9 @@
/turf/open/floor/iron,
/area/ai_monitored/command/storage/eva)
"oIE" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/engine,
/area/science/mixing/chamber)
@@ -77906,7 +77910,7 @@
/turf/open/floor/iron,
/area/service/hydroponics)
"oYI" = (
-/obj/machinery/igniter/incinerator_toxmix,
+/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"oYK" = (
@@ -82669,7 +82673,7 @@
},
/area/maintenance/port/fore)
"qnx" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input,
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"qnF" = (
@@ -86102,13 +86106,9 @@
/obj/machinery/door/firedoor,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/research{
- name = "Toxins Mixing Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -86125,6 +86125,10 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron,
/area/science/mixing)
"reB" = (
@@ -87109,7 +87113,7 @@
/turf/open/floor/iron,
/area/engineering/main)
"rsF" = (
-/obj/machinery/door/poddoor/massdriver_toxins,
+/obj/machinery/door/poddoor/massdriver_ordnance,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/science/mixing)
@@ -87497,7 +87501,7 @@
/turf/open/floor/iron,
/area/service/kitchen)
"rzc" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
@@ -91064,7 +91068,7 @@
/turf/open/floor/iron/grimy,
/area/service/bar/atrium)
"svv" = (
-/obj/machinery/door/poddoor/incinerator_toxmix,
+/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"svG" = (
@@ -91630,7 +91634,7 @@
/turf/open/floor/carpet,
/area/command/bridge)
"sCm" = (
-/obj/machinery/mass_driver/toxins{
+/obj/machinery/mass_driver/ordnance{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -91746,7 +91750,7 @@
/turf/open/floor/iron,
/area/cargo/storage)
"sDu" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/engineering/main)
@@ -91929,8 +91933,8 @@
req_access_txt = "30"
},
/obj/machinery/button/door{
- id = "rdtoxins";
- name = "Toxins Containment Control";
+ id = "rdordnance";
+ name = "Ordnance Containment Control";
pixel_x = -7;
pixel_y = -4;
req_access_txt = "30"
@@ -92555,13 +92559,13 @@
/area/cargo/miningoffice)
"sNs" = (
/obj/structure/table,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = 6
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = -6
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_y = 6
},
/obj/machinery/camera{
@@ -101346,7 +101350,7 @@
/turf/open/space,
/area/space/nearstation)
"vdU" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
+/obj/machinery/air_sensor/atmos/plasma_tank,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"vdX" = (
@@ -110651,7 +110655,7 @@
/turf/open/floor/iron,
/area/engineering/main)
"xJA" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"xJD" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 8e6a6b5ddd1..3825ee45f16 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -8966,7 +8966,7 @@
},
/area/hallway/secondary/entry)
"bbg" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
dir = 4
},
/turf/open/floor/engine,
@@ -14913,7 +14913,7 @@
/area/science/xenobiology)
"bIS" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Launch Room";
+ name = "Ordnance Launch Room";
req_access_txt = "8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -15268,13 +15268,13 @@
/turf/open/floor/iron/white,
/area/science/xenobiology)
"bLk" = (
-/obj/machinery/mass_driver/toxins{
+/obj/machinery/mass_driver/ordnance{
dir = 4
},
/turf/open/floor/plating,
/area/science/mixing)
"bLl" = (
-/obj/machinery/door/poddoor/massdriver_toxins,
+/obj/machinery/door/poddoor/massdriver_ordnance,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/science/mixing)
@@ -15313,7 +15313,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/preset/toxins{
+/obj/machinery/camera/preset/ordnance{
dir = 8
},
/turf/open/floor/plating/icemoon,
@@ -15449,7 +15449,7 @@
/turf/open/floor/plating,
/area/science/xenobiology)
"bMu" = (
-/obj/machinery/door/poddoor/incinerator_toxmix,
+/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"bMB" = (
@@ -19260,7 +19260,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/security/armory)
"cwQ" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/structure/extinguisher_cabinet/directional/west,
/obj/effect/decal/cleanable/dirt,
@@ -20237,7 +20237,7 @@
/turf/open/floor/wood,
/area/commons/vacant_room/office)
"cKY" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"cLc" = (
@@ -21418,7 +21418,7 @@
/area/hallway/secondary/entry)
"dsa" = (
/obj/machinery/camera{
- c_tag = "Toxins Launch Room Access";
+ c_tag = "Ordnance Launch Room Access";
dir = 1;
network = list("ss13","rd")
},
@@ -23207,7 +23207,7 @@
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
- c_tag = "Toxins Lab South";
+ c_tag = "Ordnance Lab South";
dir = 1;
network = list("ss13","rd")
},
@@ -23981,7 +23981,7 @@
"fay" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
- name = "Toxins Launch Room Access";
+ name = "Ordnance Launch Room Access";
req_access_txt = "8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -25689,7 +25689,7 @@
/turf/open/floor/iron/white,
/area/medical/surgery)
"fXx" = (
-/obj/machinery/igniter/incinerator_toxmix,
+/obj/machinery/igniter/incinerator_ordmix,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
@@ -26908,7 +26908,7 @@
/turf/open/floor/iron,
/area/science/storage)
"gJz" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -27156,7 +27156,7 @@
/area/command/heads_quarters/hop)
"gPG" = (
/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/ordnance,
/obj/item/storage/firstaid/toxin,
/turf/open/floor/iron,
/area/science/mixing)
@@ -28975,7 +28975,7 @@
"hXT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/south,
-/obj/machinery/computer/atmos_control/toxinsmix{
+/obj/machinery/computer/atmos_control/ordnancemix{
dir = 1
},
/turf/open/floor/iron/white,
@@ -29919,11 +29919,11 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"iCR" = (
-/obj/machinery/button/ignition/incinerator/toxmix{
+/obj/machinery/button/ignition/incinerator/ordmix{
pixel_x = -8;
pixel_y = -24
},
-/obj/machinery/button/door/incinerator_vent_toxmix{
+/obj/machinery/button/door/incinerator_vent_ordmix{
pixel_x = 8;
pixel_y = -24
},
@@ -30310,7 +30310,7 @@
"iKH" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
- name = "Toxins Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
@@ -30366,7 +30366,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"iLI" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
@@ -30811,7 +30811,7 @@
/turf/open/floor/iron,
/area/commons/storage/tools)
"jah" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
+/obj/machinery/air_sensor/atmos/plasma_tank,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"jay" = (
@@ -32237,7 +32237,7 @@
/area/command/heads_quarters/captain)
"jOW" = (
/obj/effect/landmark/event_spawn,
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
@@ -33852,7 +33852,7 @@
req_access_txt = "8"
},
/obj/effect/turf_decal/loading_area,
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver{
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{
pixel_x = -24
},
/obj/effect/decal/cleanable/dirt,
@@ -34083,7 +34083,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/machinery/computer/security/telescreen/toxins{
+/obj/machinery/computer/security/telescreen/ordnance{
dir = 8;
pixel_x = 30
},
@@ -36638,7 +36638,7 @@
/area/command/heads_quarters/rd)
"miE" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
+ name = "Gas Storage";
req_access_txt = "71"
},
/obj/effect/decal/cleanable/dirt,
@@ -38070,7 +38070,7 @@
/turf/closed/wall/r_wall,
/area/engineering/supermatter)
"mWn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -38523,9 +38523,9 @@
/obj/item/pipe_dispenser,
/obj/machinery/light/directional/south,
/obj/machinery/requests_console/directional/south{
- department = "Toxins Lab";
+ department = "Ordnance Lab";
departmentType = 2;
- name = "Toxins Lab Requests Console";
+ name = "Ordnance Lab Requests Console";
receive_ore_updates = 1
},
/turf/open/floor/iron,
@@ -40021,7 +40021,7 @@
c_tag = "Incinerator";
dir = 4
},
-/obj/machinery/atmospherics/components/tank/toxins,
+/obj/machinery/atmospherics/components/tank/plasma,
/turf/open/floor/iron,
/area/maintenance/disposal/incinerator)
"odr" = (
@@ -42470,7 +42470,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"pvd" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/south,
/obj/effect/decal/cleanable/dirt,
@@ -44145,10 +44145,10 @@
/turf/open/floor/iron,
/area/engineering/atmos)
"qoZ" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/machinery/camera/autoname{
- c_tag = "Toxins Storage";
+ c_tag = "Gas Storage";
dir = 1;
network = list("ss13","rd")
},
@@ -49232,10 +49232,12 @@
/area/maintenance/fore/secondary)
"tfw" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix{
pixel_x = 24
},
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"tfL" = (
@@ -50828,7 +50830,7 @@
"tZf" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/obj/machinery/camera{
- c_tag = "Toxins Lab North";
+ c_tag = "Ordnance Lab North";
network = list("ss13","rd")
},
/obj/effect/decal/cleanable/dirt,
@@ -51591,7 +51593,7 @@
dir = 8
},
/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
+ name = "Gas Storage";
req_access_txt = "71"
},
/obj/structure/cable,
@@ -51620,7 +51622,7 @@
/turf/open/floor/iron,
/area/maintenance/starboard/aft)
"usV" = (
-/obj/machinery/airlock_sensor/incinerator_toxmix{
+/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_x = 24
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
@@ -52929,7 +52931,9 @@
/area/service/chapel)
"vhT" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"viq" = (
@@ -53176,7 +53180,7 @@
/obj/effect/turf_decal/stripes/line,
/obj/machinery/light/directional/north,
/obj/machinery/camera{
- c_tag = "Toxins Lab Burn Chamber";
+ c_tag = "Ordnance Lab Burn Chamber";
network = list("ss13","rd")
},
/obj/effect/decal/cleanable/dirt,
@@ -53220,7 +53224,7 @@
/turf/open/floor/iron,
/area/engineering/atmos)
"vtJ" = (
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
+/obj/machinery/computer/atmos_control/tank/plasma_tank{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
@@ -55129,15 +55133,15 @@
/area/medical/cryo)
"wvC" = (
/obj/structure/table,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = 4;
pixel_y = 6
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/cartridge/signal/toxins,
+/obj/item/cartridge/signal/ordnance,
/turf/open/floor/iron/cafeteria,
/area/command/heads_quarters/rd)
"wwp" = (
@@ -57052,7 +57056,7 @@
/turf/open/floor/iron/dark,
/area/service/chapel)
"xyS" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input{
dir = 1
},
/turf/open/floor/engine/vacuum,
@@ -57551,7 +57555,7 @@
/area/commons/dorms)
"xLE" = (
/obj/machinery/camera{
- c_tag = "Science Toxins Launch";
+ c_tag = "Science Ordnance Launch";
network = list("ss13","rd")
},
/obj/structure/table,
@@ -57721,7 +57725,7 @@
/turf/open/floor/wood,
/area/service/lawoffice)
"xRU" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/light/small/directional/west,
/obj/machinery/camera{
c_tag = "Engineering Secure Storage";
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 16ce406e76a..cfccc6d0271 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1310,7 +1310,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/structure/rack,
-/obj/item/storage/backpack/satchel/tox,
+/obj/item/storage/backpack/satchel/science,
/obj/item/analyzer,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11448,11 +11448,11 @@
/area/maintenance/aft)
"aMN" = (
/obj/machinery/atmospherics/components/binary/valve,
-/obj/machinery/button/ignition/incinerator/toxmix{
+/obj/machinery/button/ignition/incinerator/ordmix{
pixel_x = -6;
pixel_y = 30
},
-/obj/machinery/button/door/incinerator_vent_toxmix{
+/obj/machinery/button/door/incinerator_vent_ordmix{
pixel_x = 8;
pixel_y = 30
},
@@ -12273,7 +12273,7 @@
/area/science/mixing/chamber)
"aOT" = (
/obj/machinery/door/airlock/maintenance{
- name = "Toxins Lab Maintenance";
+ name = "Ordnance Lab Maintenance";
req_access_txt = "8"
},
/obj/structure/sign/directions/evac{
@@ -14404,7 +14404,7 @@
"aTU" = (
/obj/machinery/door/firedoor/heavy,
/obj/machinery/door/airlock/research{
- name = "Toxins Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/obj/structure/sign/warning/explosives/alt{
@@ -14727,7 +14727,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
+ name = "Ordnance Lab Storage";
req_access_txt = "8"
},
/obj/structure/cable,
@@ -15410,7 +15410,7 @@
/turf/open/floor/grass,
/area/science/genetics)
"aXs" = (
-/obj/machinery/door/poddoor/incinerator_toxmix,
+/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"aXt" = (
@@ -15508,7 +15508,7 @@
/area/science/mixing)
"aXK" = (
/obj/effect/decal/remains/human,
-/obj/machinery/sparker/toxmix{
+/obj/machinery/sparker/ordmix{
name = "chamber igniter";
pixel_x = -16
},
@@ -15527,7 +15527,7 @@
/turf/open/floor/iron/showroomfloor,
/area/science/storage)
"aXN" = (
-/obj/machinery/igniter/incinerator_toxmix,
+/obj/machinery/igniter/incinerator_ordmix,
/mob/living/simple_animal/chicken{
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0);
desc = "A timeless classic.";
@@ -16806,8 +16806,8 @@
/turf/open/floor/iron/dark,
/area/science/robotics/mechbay)
"baX" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input,
-/obj/machinery/sparker/toxmix{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input,
+/obj/machinery/sparker/ordmix{
name = "chamber igniter";
pixel_x = -16
},
@@ -16965,7 +16965,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Toxins Mixers";
+ c_tag = "Ordnance Lab Mixers";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -16973,7 +16973,7 @@
/turf/open/floor/iron/dark,
/area/science/mixing)
"bbt" = (
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
@@ -17019,7 +17019,7 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 1
},
-/obj/machinery/airlock_sensor/incinerator_toxmix{
+/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_x = -24
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden{
@@ -17028,7 +17028,7 @@
/turf/open/floor/engine,
/area/science/mixing/chamber)
"bbD" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
dir = 8
},
/obj/effect/landmark/blobstart,
@@ -17044,11 +17044,13 @@
/turf/open/floor/iron,
/area/hallway/primary/starboard)
"bbK" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix{
pixel_x = -22
},
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"bbN" = (
@@ -17156,8 +17158,10 @@
/turf/open/floor/iron/showroomfloor,
/area/science/mixing)
"bca" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"bcc" = (
@@ -17256,7 +17260,7 @@
/turf/open/floor/iron/dark,
/area/security/checkpoint/science/research)
"bcr" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -17296,7 +17300,7 @@
/turf/open/floor/iron/dark,
/area/science/storage)
"bcu" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral{
@@ -17392,7 +17396,7 @@
"bcL" = (
/obj/structure/table/reinforced,
/obj/item/wrench,
-/obj/item/book/manual/wiki/toxins{
+/obj/item/book/manual/wiki/ordnance{
pixel_x = 4;
pixel_y = 4
},
@@ -17974,7 +17978,7 @@
dir = 8
},
/obj/machinery/door/airlock/research{
- name = "Toxins Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/turf/open/floor/iron/dark,
@@ -18042,7 +18046,7 @@
/turf/open/floor/iron/dark,
/area/science/research)
"beI" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/bot,
/obj/structure/sign/warning/nosmoking{
pixel_y = -32
@@ -30703,7 +30707,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/preset/toxins{
+/obj/machinery/camera/preset/ordnance{
dir = 8
},
/turf/open/floor/engine/vacuum,
@@ -41361,7 +41365,7 @@
},
/obj/machinery/light/small/directional/north,
/obj/machinery/camera{
- c_tag = "Toxins Launch Site";
+ c_tag = "Testing Lab";
name = "science camera";
network = list("ss13","rd")
},
@@ -45198,12 +45202,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
- req_access_txt = "8"
- },
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/research{
+ name = "Ordnance Lab Storage";
+ req_access_txt = "8"
+ },
/turf/open/floor/iron/dark,
/area/science/storage)
"eUX" = (
@@ -46225,9 +46229,9 @@
},
/obj/machinery/light/directional/south,
/obj/machinery/requests_console/directional/south{
- department = "Toxins Lab";
+ department = "Ordnance Lab";
departmentType = 2;
- name = "Toxins Lab Requests Console";
+ name = "Ordnance Lab Requests Console";
receive_ore_updates = 1
},
/obj/structure/disposalpipe/segment{
@@ -48657,7 +48661,7 @@
dir = 1
},
/obj/machinery/camera{
- c_tag = "Toxins Burn Chamber";
+ c_tag = "Ordnance Lab Burn Chamber";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -49364,7 +49368,7 @@
/turf/open/floor/iron/dark,
/area/command/heads_quarters/hop)
"gSf" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{
dir = 1
},
/turf/open/floor/engine/plasma,
@@ -56752,7 +56756,7 @@
},
/obj/machinery/firealarm/directional/east,
/obj/machinery/camera{
- c_tag = "Toxins Storage";
+ c_tag = "Ordnance Lab Storage";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -60306,7 +60310,7 @@
},
/area/engineering/main)
"lwP" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
+/obj/machinery/air_sensor/atmos/plasma_tank,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"lxf" = (
@@ -61919,11 +61923,11 @@
/obj/item/cartridge/roboticist{
pixel_x = -3
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = 6
},
-/obj/item/cartridge/signal/toxins,
-/obj/item/cartridge/signal/toxins,
+/obj/item/cartridge/signal/ordnance,
+/obj/item/cartridge/signal/ordnance,
/obj/item/circuitboard/aicore{
pixel_y = 5
},
@@ -62534,7 +62538,7 @@
/area/science/robotics/mechbay)
"myY" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/iron/dark,
/area/engineering/main)
@@ -67208,7 +67212,7 @@
/turf/open/floor/plating/rust,
/area/security/prison)
"oCa" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"oCP" = (
@@ -68096,7 +68100,7 @@
/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
dir = 4
},
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
+/obj/machinery/computer/atmos_control/tank/plasma_tank{
dir = 1
},
/turf/open/floor/iron/showroomfloor,
@@ -74631,7 +74635,7 @@
/turf/open/floor/engine,
/area/engineering/supermatter/room)
"rFl" = (
-/obj/machinery/atmospherics/components/tank/toxins{
+/obj/machinery/atmospherics/components/tank/plasma{
dir = 4
},
/obj/effect/turf_decal/delivery,
@@ -81590,7 +81594,7 @@
/turf/open/floor/iron/dark,
/area/command/bridge)
"uHv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{
dir = 1
},
/turf/open/floor/engine/plasma,
@@ -88414,7 +88418,7 @@
/turf/open/floor/plating,
/area/maintenance/department/electrical)
"xAA" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 4
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 60290b9a3fd..7858837dab0 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -13455,8 +13455,8 @@
/area/maintenance/fore)
"cAH" = (
/obj/machinery/door/poddoor/shutters{
- id = "toxinsaccess";
- name = "Toxins Access"
+ id = "ordnanceaccess";
+ name = "Ordnance Access"
},
/turf/open/floor/iron,
/area/science/mixing)
@@ -15409,7 +15409,7 @@
/turf/open/floor/iron/white,
/area/medical/virology)
"cRK" = (
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
+/obj/machinery/computer/atmos_control/tank/plasma_tank{
dir = 8
},
/obj/structure/window/reinforced{
@@ -17593,7 +17593,7 @@
/area/medical/cryo)
"dvM" = (
/obj/item/target/alien/anchored,
-/obj/machinery/camera/preset/toxins{
+/obj/machinery/camera/preset/ordnance{
dir = 10
},
/obj/effect/turf_decal/stripes/line,
@@ -18720,7 +18720,7 @@
/area/engineering/supermatter)
"dNG" = (
/obj/machinery/door/airlock/maintenance{
- name = "Toxins Lab Maintenance";
+ name = "Ordnance Test Lab Maintenance";
req_access_txt = "8"
},
/turf/open/floor/plating,
@@ -19014,7 +19014,7 @@
},
/obj/structure/extinguisher_cabinet/directional/east,
/obj/machinery/camera{
- c_tag = "Science Toxins Launch 2";
+ c_tag = "Science Ordnance Test Lab 2";
dir = 8;
network = list("ss13","rd")
},
@@ -20297,7 +20297,7 @@
/turf/open/floor/iron/dark,
/area/security/brig)
"eoI" = (
-/obj/machinery/igniter/incinerator_toxmix,
+/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine,
/area/science/mixing/chamber)
"eoW" = (
@@ -20858,7 +20858,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"eyf" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
+/obj/machinery/air_sensor/atmos/plasma_tank,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"eyv" = (
@@ -24176,7 +24176,7 @@
},
/obj/structure/table,
/obj/effect/turf_decal/bot,
-/obj/machinery/computer/security/telescreen/toxins{
+/obj/machinery/computer/security/telescreen/ordnance{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -25089,7 +25089,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/light/small/directional/north,
/obj/machinery/camera{
- c_tag = "Science Toxins Corridor";
+ c_tag = "Science Ordnance Corridor";
dir = 4;
network = list("ss13","rd")
},
@@ -25789,7 +25789,7 @@
dir = 8
},
/obj/effect/turf_decal/bot,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/dark,
/area/science/storage)
"geq" = (
@@ -27597,7 +27597,7 @@
},
/obj/item/crowbar,
/obj/machinery/requests_console/directional/west{
- department = "Toxins Test Range";
+ department = "Ordnance Test Range";
departmentType = 5;
name = "Test Range Requests Console"
},
@@ -28273,7 +28273,7 @@
/area/medical/morgue)
"hbE" = (
/obj/machinery/door/airlock/maintenance{
- name = "Toxins Lab Maintenance";
+ name = "Ordnance Lab Maintenance";
req_access_txt = "8"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28427,7 +28427,7 @@
/area/hallway/primary/central)
"heZ" = (
/obj/machinery/camera{
- c_tag = "Science Toxins Lab";
+ c_tag = "Science Ordnance Lab";
dir = 1;
network = list("ss13","rd")
},
@@ -28641,7 +28641,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Science Toxins Mix";
+ c_tag = "Science Ordnance Mix";
dir = 1;
network = list("ss13","rd")
},
@@ -31129,7 +31129,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/dark,
/area/science/storage)
"ido" = (
@@ -33434,7 +33434,7 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"iSy" = (
-/obj/machinery/door/poddoor/incinerator_toxmix,
+/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine,
/area/science/mixing/chamber)
"iSE" = (
@@ -34499,8 +34499,8 @@
/area/engineering/main)
"jmX" = (
/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/firedoor/heavy,
@@ -34968,6 +34968,15 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/ai_monitored/command/storage/satellite)
+"jvq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
+/turf/open/floor/plating,
+/area/science/mixing)
"jvt" = (
/obj/machinery/power/apc/auto_name/north,
/obj/structure/cable,
@@ -39475,7 +39484,7 @@
/area/medical/virology)
"kXs" = (
/obj/machinery/door/airlock/maintenance{
- name = "Toxins Storage Maintenance";
+ name = "Ordnance Gas Storage Maintenance";
req_access_txt = "8"
},
/turf/open/floor/plating,
@@ -42361,8 +42370,8 @@
req_access_txt = "30"
},
/obj/machinery/button/door/directional/north{
- id = "rdtoxins";
- name = "Toxins Containment Control";
+ id = "rdordnance";
+ name = "Ordnance Containment Control";
pixel_x = 6;
req_access_txt = "30"
},
@@ -43027,9 +43036,9 @@
/turf/open/floor/plating,
/area/cargo/qm)
"mgc" = (
-/obj/machinery/button/door/incinerator_vent_toxmix{
- id = "toxinsaccess";
- name = "Toxins Access";
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ id = "ordnanceaccess";
+ name = "Ordnance Access";
pixel_x = -26;
pixel_y = -24
},
@@ -44347,8 +44356,10 @@
/turf/open/floor/iron/white,
/area/medical/medbay/central)
"mBC" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"mBE" = (
@@ -44917,7 +44928,7 @@
"mKO" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/components/tank/toxins{
+/obj/machinery/atmospherics/components/tank/plasma{
dir = 4
},
/turf/open/floor/iron,
@@ -47782,7 +47793,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/dark,
/area/science/storage)
"nFK" = (
@@ -48682,7 +48693,7 @@
/turf/open/floor/iron/white,
/area/medical/chemistry)
"nSp" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
dir = 8
},
/turf/open/floor/engine,
@@ -48983,11 +48994,11 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"nXE" = (
-/obj/machinery/button/door/incinerator_vent_toxmix{
+/obj/machinery/button/door/incinerator_vent_ordmix{
pixel_x = 8;
pixel_y = -30
},
-/obj/machinery/button/ignition/incinerator/toxmix{
+/obj/machinery/button/ignition/incinerator/ordmix{
pixel_x = -6;
pixel_y = -30
},
@@ -49001,9 +49012,9 @@
dir = 4
},
/obj/machinery/requests_console/directional/west{
- department = "Toxins Lab";
+ department = "Ordnance Lab";
departmentType = 5;
- name = "Toxins Requests Console"
+ name = "Ordnance Requests Console"
},
/obj/effect/turf_decal/siding{
dir = 10
@@ -51039,7 +51050,7 @@
},
/area/maintenance/starboard/fore)
"oJk" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating,
/area/engineering/main)
"oJo" = (
@@ -51607,13 +51618,13 @@
/obj/effect/turf_decal/siding{
dir = 4
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = 6
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = -6
},
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_y = 6
},
/turf/open/floor/iron/dark,
@@ -51904,7 +51915,7 @@
/turf/open/floor/wood,
/area/commons/dorms)
"oUO" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -53101,7 +53112,7 @@
},
/area/engineering/atmos)
"ppi" = (
-/obj/machinery/door/poddoor/massdriver_toxins,
+/obj/machinery/door/poddoor/massdriver_ordnance,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/science/mixing)
@@ -53118,7 +53129,7 @@
/area/maintenance/port/aft)
"ppA" = (
/obj/machinery/camera{
- c_tag = "Science Toxins Secure";
+ c_tag = "Science Ordnance Gas Storage";
dir = 4;
network = list("ss13","rd")
},
@@ -54468,7 +54479,7 @@
/turf/open/floor/iron/grimy,
/area/service/chapel/office)
"pOT" = (
-/obj/machinery/airlock_sensor/incinerator_toxmix{
+/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_x = -24
},
/obj/machinery/atmospherics/components/binary/pump/on{
@@ -54513,7 +54524,7 @@
/turf/open/floor/wood,
/area/service/library)
"pPt" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -55101,7 +55112,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron/white,
/area/science/xenobiology)
"qag" = (
@@ -55575,11 +55586,13 @@
},
/area/service/chapel)
"qhS" = (
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix{
pixel_x = -22
},
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"qhU" = (
@@ -55786,7 +55799,7 @@
/turf/open/floor/carpet,
/area/service/chapel)
"qkq" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input{
dir = 1
},
/turf/open/floor/engine,
@@ -61374,8 +61387,8 @@
/area/engineering/atmos)
"scO" = (
/obj/machinery/door/poddoor/shutters{
- id = "toxinsaccess";
- name = "Toxins Access"
+ id = "ordnanceaccess";
+ name = "Ordnance Access"
},
/turf/open/floor/iron/white,
/area/science/storage)
@@ -63431,7 +63444,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/machinery/camera{
- c_tag = "Science Toxins Secure 2";
+ c_tag = "Science Ordnance Gas Storage 2";
dir = 8;
network = list("ss13","rd")
},
@@ -65329,18 +65342,18 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/machinery/door/airlock/research{
- name = "Toxins Mixing Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron/white,
/area/science/mixing)
"trd" = (
@@ -66413,7 +66426,7 @@
dir = 8
},
/obj/structure/table,
-/obj/machinery/computer/security/telescreen/toxins{
+/obj/machinery/computer/security/telescreen/ordnance{
dir = 1
},
/turf/open/floor/iron/dark,
@@ -66986,7 +66999,7 @@
/turf/open/floor/iron/dark,
/area/ai_monitored/aisat/exterior)
"tTJ" = (
-/obj/machinery/mass_driver/toxins,
+/obj/machinery/mass_driver/ordnance,
/turf/open/floor/plating,
/area/science/mixing)
"tTK" = (
@@ -69356,7 +69369,7 @@
pixel_x = -4;
pixel_y = 4
},
-/obj/item/book/manual/wiki/toxins{
+/obj/item/book/manual/wiki/ordnance{
pixel_x = 4;
pixel_y = 1
},
@@ -70395,7 +70408,7 @@
dir = 4
},
/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
+ name = "Ordnance Gas Storage";
req_access_txt = "8"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -70503,18 +70516,18 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "rdtoxins";
- name = "Toxins Lab Shutters"
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/research{
- name = "Toxins Mixing Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rdordnance";
+ name = "Ordnance Lab Shutters"
+ },
/turf/open/floor/iron/white,
/area/science/mixing)
"uZF" = (
@@ -72376,7 +72389,7 @@
dir = 1;
network = list("ss13","rd")
},
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver{
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{
pixel_y = -24
},
/turf/open/floor/iron/dark,
@@ -72935,7 +72948,7 @@
/obj/effect/turf_decal/bot,
/obj/item/wrench,
/obj/machinery/camera{
- c_tag = "Science Toxins Test";
+ c_tag = "Science Ordnance Test Lab";
dir = 4
},
/turf/open/floor/iron/dark,
@@ -75001,7 +75014,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/research{
- name = "Toxins Test Lab";
+ name = "Ordnance Test Lab";
req_access_txt = "8"
},
/obj/structure/disposalpipe/segment,
@@ -77549,7 +77562,7 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"xuL" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"xuW" = (
@@ -77847,7 +77860,7 @@
/turf/open/floor/plating,
/area/security/checkpoint/customs)
"xzs" = (
-/obj/machinery/computer/atmos_control/toxinsmix,
+/obj/machinery/computer/atmos_control/ordnancemix,
/obj/effect/turf_decal/bot,
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/siding{
@@ -78374,7 +78387,7 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"xHV" = (
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank,
/turf/open/floor/engine,
/area/science/mixing/chamber)
"xIm" = (
@@ -111010,7 +111023,7 @@ cKH
flD
ipr
gBp
-jmX
+jvq
uGO
gmC
eqN
@@ -111267,7 +111280,7 @@ ayU
ntG
iyu
lfh
-jmX
+jvq
xzs
uNE
heZ
@@ -111781,7 +111794,7 @@ cZP
lbj
joB
hSZ
-jmX
+jvq
aWD
uox
gAo
@@ -112038,7 +112051,7 @@ eIk
hMa
mDG
iVt
-jmX
+jvq
dbG
tUz
wZN
@@ -112295,7 +112308,7 @@ hSZ
oRD
wMR
sIB
-jmX
+jvq
aWu
him
nXE
diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm
index 5934d8c5b4d..3ba0cd24a4f 100644
--- a/_maps/map_files/debug/multiz.dmm
+++ b/_maps/map_files/debug/multiz.dmm
@@ -1079,7 +1079,7 @@
dir = 8;
icon_state = "connector_map-2"
},
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating,
/area/construction)
"gW" = (
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index efab2bfbd1f..4f593949e45 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -10366,7 +10366,7 @@
/area/maintenance/starboard/secondary)
"aSm" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Toxins Maintnenace";
+ name = "Ordnance Lab Maintenance";
req_one_access_txt = "47"
},
/obj/effect/decal/cleanable/dirt,
@@ -11480,7 +11480,7 @@
/turf/open/floor/iron,
/area/security/prison)
"beR" = (
-/obj/machinery/door/poddoor/incinerator_toxmix,
+/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"beV" = (
@@ -12598,7 +12598,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/mine/explored)
"bzF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -12888,7 +12888,7 @@
/turf/open/floor/engine,
/area/science/cytology)
"bFu" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix,
/turf/open/floor/engine,
/area/science/mixing/chamber)
"bFz" = (
@@ -14159,7 +14159,7 @@
/area/science/xenobiology)
"cbi" = (
/obj/structure/table,
-/obj/item/book/manual/wiki/toxins,
+/obj/item/book/manual/wiki/ordnance,
/obj/item/storage/firstaid/toxin,
/turf/open/floor/iron,
/area/science/mixing)
@@ -16426,12 +16426,12 @@
"cWa" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance{
pixel_x = -4;
pixel_y = 2
},
-/obj/item/cartridge/signal/toxins,
-/obj/item/cartridge/signal/toxins{
+/obj/item/cartridge/signal/ordnance,
+/obj/item/cartridge/signal/ordnance{
pixel_x = 4;
pixel_y = 6
},
@@ -18998,7 +18998,7 @@
/turf/open/floor/iron,
/area/command/heads_quarters/ce)
"dSz" = (
-/obj/machinery/computer/atmos_control/toxinsmix{
+/obj/machinery/computer/atmos_control/ordnancemix{
dir = 1
},
/turf/open/floor/iron,
@@ -19705,7 +19705,7 @@
dir = 4
},
/obj/machinery/camera{
- c_tag = "Science - Toxins North";
+ c_tag = "Science - Ordnance Lab North";
dir = 6;
network = list("ss13","rd")
},
@@ -22992,7 +22992,7 @@
/turf/open/floor/iron,
/area/science/storage)
"ftL" = (
-/obj/machinery/mass_driver/toxins{
+/obj/machinery/mass_driver/ordnance{
dir = 4
},
/turf/open/floor/plating,
@@ -23680,7 +23680,7 @@
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 4
},
-/obj/machinery/airlock_sensor/incinerator_toxmix{
+/obj/machinery/airlock_sensor/incinerator_ordmix{
pixel_y = 24
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -24402,7 +24402,7 @@
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"fTg" = (
-/obj/machinery/computer/atmos_control/tank/toxin_tank{
+/obj/machinery/computer/atmos_control/tank/plasma_tank{
dir = 8
},
/obj/effect/turf_decal/trimline/purple/filled/line{
@@ -26622,7 +26622,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/computer/security/telescreen/toxins{
+/obj/machinery/computer/security/telescreen/ordnance{
dir = 8;
pixel_x = 30
},
@@ -27307,7 +27307,7 @@
/turf/open/floor/iron/white,
/area/medical/surgery)
"gYs" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/plating,
/area/engineering/engine_smes)
"gYI" = (
@@ -33234,7 +33234,7 @@
/area/medical/treatment_center)
"jeu" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/science/storage)
@@ -34401,11 +34401,11 @@
/turf/open/floor/iron/white,
/area/science/cytology)
"jDt" = (
-/obj/machinery/computer/atmos_control/toxinsmix{
+/obj/machinery/computer/atmos_control/ordnancemix{
dir = 8
},
/obj/machinery/camera{
- c_tag = "Science - Toxins South";
+ c_tag = "Science - Ordnance Lab South";
dir = 9;
network = list("ss13","rd")
},
@@ -37817,7 +37817,7 @@
name = "Mass Driver Door";
req_access_txt = "8"
},
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver{
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver{
pixel_x = -24
},
/turf/open/floor/iron,
@@ -41026,7 +41026,7 @@
/obj/machinery/airalarm/directional/north,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/camera{
- c_tag = "Science - Toxins Canister Storage";
+ c_tag = "Science - Ordnance Gas Storage";
dir = 6;
network = list("ss13","rd")
},
@@ -41453,10 +41453,12 @@
/area/medical/surgery)
"mhs" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior,
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix{
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix{
pixel_y = 26
},
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"mhz" = (
@@ -45143,7 +45145,7 @@
/turf/open/floor/iron,
/area/engineering/break_room)
"nEN" = (
-/obj/machinery/air_sensor/atmos/toxin_tank,
+/obj/machinery/air_sensor/atmos/plasma_tank,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"nET" = (
@@ -45190,7 +45192,7 @@
/area/hallway/primary/port)
"nFJ" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Lab";
+ name = "Ordnance Lab";
req_access_txt = "8"
},
/obj/structure/disposalpipe/segment{
@@ -46913,7 +46915,7 @@
/turf/open/floor/iron/white,
/area/medical/virology)
"olj" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"olm" = (
@@ -47019,7 +47021,7 @@
/turf/closed/wall/r_wall,
/area/engineering/supermatter)
"omu" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input{
dir = 8
},
/turf/open/floor/engine/plasma,
@@ -50102,7 +50104,7 @@
/turf/open/floor/plating,
/area/engineering/supermatter/room)
"prF" = (
-/obj/machinery/igniter/incinerator_toxmix,
+/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"prM" = (
@@ -50441,7 +50443,7 @@
/obj/machinery/research/explosive_compressor,
/obj/effect/turf_decal/bot,
/obj/machinery/camera{
- c_tag = "Science - Toxins Launch Room";
+ c_tag = "Science - Ordnance Launch Room";
dir = 6;
network = list("ss13","rd")
},
@@ -51458,7 +51460,7 @@
/area/service/kitchen)
"pPY" = (
/obj/effect/turf_decal/delivery,
-/obj/machinery/portable_atmospherics/canister/toxins,
+/obj/machinery/portable_atmospherics/canister/plasma,
/turf/open/floor/iron,
/area/science/storage)
"pQa" = (
@@ -54570,11 +54572,11 @@
/area/service/chapel/office)
"rbt" = (
/obj/machinery/meter,
-/obj/machinery/button/door/incinerator_vent_toxmix{
+/obj/machinery/button/door/incinerator_vent_ordmix{
pixel_x = -25;
pixel_y = 5
},
-/obj/machinery/button/ignition/incinerator/toxmix{
+/obj/machinery/button/ignition/incinerator/ordmix{
pixel_x = -25;
pixel_y = -5
},
@@ -56083,7 +56085,7 @@
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/scrubber,
/obj/machinery/camera{
- c_tag = "Science - Toxins Misc Storage";
+ c_tag = "Science - Ordnance Misc Storage";
dir = 8;
network = list("ss13","rd")
},
@@ -58312,7 +58314,7 @@
/area/engineering/atmos)
"svG" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Misc Storage";
+ name = "Ordnance Misc Storage";
req_access_txt = "71"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -58555,7 +58557,7 @@
/turf/open/floor/vault,
/area/hallway/primary/tram/center)
"sAP" = (
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank,
/turf/open/floor/engine/vacuum,
/area/science/mixing/chamber)
"sAS" = (
@@ -59071,7 +59073,7 @@
/turf/open/floor/iron,
/area/medical/medbay/central)
"sMM" = (
-/obj/machinery/door/poddoor/massdriver_toxins,
+/obj/machinery/door/poddoor/massdriver_ordnance,
/turf/open/floor/plating,
/area/science/mixing)
"sMW" = (
@@ -59287,7 +59289,7 @@
/area/hallway/secondary/command)
"sSM" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Launch Room";
+ name = "Ordnance Launch Room";
req_access_txt = "8"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
@@ -60694,7 +60696,7 @@
/turf/open/floor/iron,
/area/cargo/miningdock)
"tqT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input{
dir = 4
},
/turf/open/floor/engine/vacuum,
@@ -66122,7 +66124,7 @@
/area/engineering/atmos)
"vqq" = (
/obj/machinery/door/airlock/research{
- name = "Toxins Storage";
+ name = "Ordnance Gas Storage";
req_access_txt = "71"
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -67273,7 +67275,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/machinery/camera/preset/toxins{
+/obj/machinery/camera/preset/ordnance{
dir = 8
},
/turf/open/floor/plating/airless,
@@ -72644,7 +72646,9 @@
/area/security/office)
"xJw" = (
/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior,
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
/turf/open/floor/engine,
/area/science/mixing/chamber)
"xJA" = (
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 390ab971f7c..2c31d55b77f 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -12,8 +12,8 @@
#define ACCESS_MORGUE 6
/// R&D department and R&D console
#define ACCESS_RND 7
-/// Toxins lab and burn chamber
-#define ACCESS_TOXINS 8
+/// Ordnance lab and burn chamber
+#define ACCESS_ORDNANCE 8
/// Genetics access
#define ACCESS_GENETICS 9
/// Engineering area, power monitor, power flow control console
@@ -80,8 +80,8 @@
/// Pharmacy access (Chemistry room in Medbay)
#define ACCESS_PHARMACY 69 ///Nice.
#define ACCESS_PSYCHOLOGY 70
-/// Toxins tank storage room access
-#define ACCESS_TOXINS_STORAGE 71
+/// Ordnance gas storage room access
+#define ACCESS_ORDNANCE_STORAGE 71
/// Room and launching.
#define ACCESS_AUX_BASE 72
@@ -276,7 +276,7 @@
/// Command staff/secure accesses, think bridge/armoury, AI upload, notably access to modify ID cards themselves. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMAND)
#define COMMAND_ACCESS list( \
- ACCESS_TOXINS_STORAGE, \
+ ACCESS_ORDNANCE_STORAGE, \
ACCESS_MINISAT, \
ACCESS_TCOMSAT, \
ACCESS_KEYCARD_AUTH, \
@@ -289,7 +289,7 @@
ACCESS_ARMORY, \
ACCESS_AI_UPLOAD, \
ACCESS_CHANGE_IDS, \
- ACCESS_TOXINS, \
+ ACCESS_ORDNANCE, \
ACCESS_EVA, \
ACCESS_GATEWAY, \
ACCESS_ALL_PERSONAL_LOCKERS, \
@@ -401,8 +401,8 @@
#define REGION_ACCESS_RESEARCH list( \
ACCESS_RESEARCH, \
ACCESS_RND, \
- ACCESS_TOXINS, \
- ACCESS_TOXINS_STORAGE, \
+ ACCESS_ORDNANCE, \
+ ACCESS_ORDNANCE_STORAGE, \
ACCESS_GENETICS, \
ACCESS_ROBOTICS, \
ACCESS_XENOBIOLOGY, \
@@ -480,7 +480,7 @@
/obj/item/pda/detective = list(REGION_SECURITY), \
/obj/item/pda/warden = list(REGION_SECURITY), \
/obj/item/pda/janitor = list(REGION_GENERAL), \
- /obj/item/pda/toxins = list(REGION_RESEARCH), \
+ /obj/item/pda/science = list(REGION_RESEARCH), \
/obj/item/pda/heads/hop = list(REGION_COMMAND), \
/obj/item/pda/heads/hos = list(REGION_COMMAND), \
/obj/item/pda/heads/cmo = list(REGION_COMMAND), \
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index 4ed7e668c75..564bbe3fd67 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -377,9 +377,9 @@
#define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"
#define ATMOS_GAS_MONITOR_SENSOR_O2 "o2_sensor"
-#define ATMOS_GAS_MONITOR_INPUT_TOX "tox_in"
-#define ATMOS_GAS_MONITOR_OUTPUT_TOX "tox_out"
-#define ATMOS_GAS_MONITOR_SENSOR_TOX "tox_sensor"
+#define ATMOS_GAS_MONITOR_INPUT_PLAS "plas_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_PLAS "plas_out"
+#define ATMOS_GAS_MONITOR_SENSOR_PLAS "plas_sensor"
#define ATMOS_GAS_MONITOR_INPUT_AIR "air_in"
#define ATMOS_GAS_MONITOR_OUTPUT_AIR "air_out"
@@ -469,9 +469,9 @@
#define ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR "incinerator_out"
#define ATMOS_GAS_MONITOR_SENSOR_INCINERATOR "incinerator_sensor"
-#define ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB "toxinslab_in"
-#define ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB "toxinslab_out"
-#define ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB "toxinslab_sensor"
+#define ATMOS_GAS_MONITOR_INPUT_ORDNANCE_LAB "ordnancelab_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_ORDNANCE_LAB "ordnancelab_out"
+#define ATMOS_GAS_MONITOR_SENSOR_ORDNANCE_LAB "ordnancelab_sensor"
#define ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION "distro-loop_meter"
#define ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE "atmos-waste_loop_meter"
@@ -481,14 +481,14 @@
//AIRLOCK CONTROLLER TAGS
-//RnD toxins burn chamber
-#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter"
-#define INCINERATOR_TOXMIX_VENT "toxmix_vent"
-#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump"
-#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor"
-#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller"
-#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior"
-#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior"
+//RnD ordnance burn chamber
+#define INCINERATOR_ORDMIX_IGNITER "ordmix_igniter"
+#define INCINERATOR_ORDMIX_VENT "ordmix_vent"
+#define INCINERATOR_ORDMIX_DP_VENTPUMP "ordmix_airlock_pump"
+#define INCINERATOR_ORDMIX_AIRLOCK_SENSOR "ordmix_airlock_sensor"
+#define INCINERATOR_ORDMIX_AIRLOCK_CONTROLLER "ordmix_airlock_controller"
+#define INCINERATOR_ORDMIX_AIRLOCK_INTERIOR "ordmix_airlock_interior"
+#define INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR "ordmix_airlock_exterior"
//Atmospherics/maintenance incinerator
#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter"
diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm
index 6e47918df52..8bdfe4a79bf 100644
--- a/code/__DEFINES/machines.dm
+++ b/code/__DEFINES/machines.dm
@@ -144,7 +144,7 @@
#define MACHINE_DEFAULT_ELECTRIFY_TIME 30
//mass drivers and related machinery
-#define MASSDRIVER_TOXINS "toxinsdriver"
+#define MASSDRIVER_ORDNANCE "ordnancedriver"
#define MASSDRIVER_CHAPEL "chapelgun"
#define MASSDRIVER_DISPOSALS "trash"
#define MASSDRIVER_SHACK "shack"
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 95ae8df1f36..a0daabd5bd6 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(scarySounds, list('sound/weapons/thudswoosh.ogg','sound/weapons
22 Janitor
23 Genetics
24 Experimentor Lab
-25 Toxins
+25 Ordnance
26 Dormitories
27 Virology
28 Xenobiology
@@ -237,7 +237,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
"CMO Office", "Chemistry", "Research", "RD Office",
"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
- "Experimentor Lab", "Toxins", "Dormitories", "Virology",
+ "Experimentor Lab", "Ordnance", "Dormitories", "Virology",
"Xenobiology", "Law Office","Detective's Office"))
GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt"))
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index ac843f505a8..6a5341b8d0b 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -147,15 +147,15 @@
desc = "There's too much carbon dioxide in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_co2"
-/atom/movable/screen/alert/not_enough_tox
+/atom/movable/screen/alert/not_enough_plas
name = "Choking (No Plasma)"
desc = "You're not getting enough plasma. Find some good air before you pass out!"
- icon_state = "not_enough_tox"
+ icon_state = "not_enough_plas"
-/atom/movable/screen/alert/too_much_tox
+/atom/movable/screen/alert/too_much_plas
name = "Choking (Plasma)"
desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it."
- icon_state = "too_much_tox"
+ icon_state = "too_much_plas"
/atom/movable/screen/alert/not_enough_n2o
name = "Choking (No N2O)"
@@ -392,10 +392,10 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
//ALIENS
-/atom/movable/screen/alert/alien_tox
+/atom/movable/screen/alert/alien_plas
name = "Plasma"
desc = "There's flammable plasma in the air. If it lights up, you'll be toast."
- icon_state = "alien_tox"
+ icon_state = "alien_plas"
alerttooltipstyle = "alien"
/atom/movable/screen/alert/alien_fire
diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm
index 60cd8e1a863..8a3d516b973 100644
--- a/code/controllers/subsystem/id_access.dm
+++ b/code/controllers/subsystem/id_access.dm
@@ -253,8 +253,8 @@ SUBSYSTEM_DEF(id_access)
desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab"
desc_by_access["[ACCESS_MORGUE]"] = "Morgue"
desc_by_access["[ACCESS_RND]"] = "R&D Lab"
- desc_by_access["[ACCESS_TOXINS]"] = "Toxins Lab"
- desc_by_access["[ACCESS_TOXINS_STORAGE]"] = "Toxins Storage"
+ desc_by_access["[ACCESS_ORDNANCE]"] = "Ordnance Lab"
+ desc_by_access["[ACCESS_ORDNANCE_STORAGE]"] = "Ordnance Storage"
desc_by_access["[ACCESS_CHEMISTRY]"] = "Chemistry Lab"
desc_by_access["[ACCESS_RD]"] = "RD Office"
desc_by_access["[ACCESS_BAR]"] = "Bar"
diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
index d250f367294..d57850481bc 100644
--- a/code/datums/id_trim/jobs.dm
+++ b/code/datums/id_trim/jobs.dm
@@ -407,18 +407,18 @@
assignment = "Research Director"
trim_state = "trim_researchdirector"
full_access = list(ACCESS_HEADS, ACCESS_RND, ACCESS_GENETICS, ACCESS_MORGUE,
- ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE,
+ ACCESS_ORDNANCE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE,
ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD,
ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM,
ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK,
- ACCESS_TOXINS_STORAGE, ACCESS_AUX_BASE, ACCESS_EVA)
+ ACCESS_ORDNANCE_STORAGE, ACCESS_AUX_BASE, ACCESS_EVA)
full_wildcard_access = list(ACCESS_RD)
minimal_access = list(ACCESS_HEADS, ACCESS_RND, ACCESS_GENETICS, ACCESS_MORGUE,
- ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE,
+ ACCESS_ORDNANCE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE,
ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD,
ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM,
ACCESS_TECH_STORAGE, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_NETWORK,
- ACCESS_TOXINS_STORAGE, ACCESS_AUX_BASE, ACCESS_EVA)
+ ACCESS_ORDNANCE_STORAGE, ACCESS_AUX_BASE, ACCESS_EVA)
minimal_wildcard_access = list(ACCESS_RD)
config_job = "research_director"
template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS)
@@ -427,7 +427,7 @@
/datum/id_trim/job/roboticist
assignment = "Roboticist"
trim_state = "trim_roboticist"
- full_access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE,
+ full_access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE,
ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_AUX_BASE)
minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM,
ACCESS_RND, ACCESS_AUX_BASE)
@@ -438,9 +438,9 @@
/datum/id_trim/job/scientist
assignment = "Scientist"
trim_state = "trim_scientist"
- full_access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
+ full_access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY,
ACCESS_MECH_SCIENCE, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_GENETICS, ACCESS_AUX_BASE)
- minimal_access = list(ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE,
+ minimal_access = list(ACCESS_RND, ACCESS_ORDNANCE, ACCESS_ORDNANCE_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE,
ACCESS_MINERAL_STOREROOM, ACCESS_AUX_BASE)
config_job = "scientist"
template_access = list(ACCESS_CAPTAIN, ACCESS_RD, ACCESS_CHANGE_IDS)
diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm
index c2742052661..c851801b8c2 100644
--- a/code/game/area/areas/ruins/space.dm
+++ b/code/game/area/areas/ruins/space.dm
@@ -262,11 +262,11 @@
/area/ruin/space/has_grav/ancientstation/proto
name = "\improper Delta Station Prototype Lab"
- icon_state = "toxlab"
+ icon_state = "ordlab"
/area/ruin/space/has_grav/ancientstation/rnd
name = "Delta Station Research and Development"
- icon_state = "toxlab"
+ icon_state = "ordlab"
/area/ruin/space/has_grav/ancientstation/deltaai
name = "\improper Delta Station AI Core"
diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm
index 961b0ccd8e6..62cc1d3c18f 100644
--- a/code/game/area/space_station_13_areas.dm
+++ b/code/game/area/space_station_13_areas.dm
@@ -1353,21 +1353,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "cytology"
/area/science/storage
- name = "Toxins Storage"
- icon_state = "tox_storage"
+ name = "Ordnance Storage"
+ icon_state = "ord_storage"
/area/science/test_area
- name = "\improper Toxins Test Area"
- icon_state = "tox_test"
+ name = "\improper Ordnance Test Area"
+ icon_state = "ord_test"
area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
/area/science/mixing
- name = "\improper Toxins Mixing Lab"
- icon_state = "tox_mix"
+ name = "\improper Ordnance Mixing Lab"
+ icon_state = "ord_mix"
/area/science/mixing/chamber
- name = "\improper Toxins Mixing Chamber"
- icon_state = "tox_mix_chamber"
+ name = "\improper Ordnance Mixing Chamber"
+ icon_state = "ord_mix_chamber"
area_flags = BLOBS_ALLOWED | UNIQUE_AREA | CULT_PERMITTED
/area/science/genetics
@@ -1376,11 +1376,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
/area/science/misc_lab
name = "\improper Testing Lab"
- icon_state = "tox_misc"
+ icon_state = "ord_misc"
/area/science/misc_lab/range
name = "\improper Research Testing Range"
- icon_state = "tox_range"
+ icon_state = "ord_range"
/area/science/server
name = "\improper Research Division Server Room"
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index a99c60daa3a..8ae22fb003c 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -102,9 +102,9 @@
var/on = TRUE
var/alert = FALSE
-/obj/machinery/airlock_sensor/incinerator_toxmix
- id_tag = INCINERATOR_TOXMIX_AIRLOCK_SENSOR
- master_tag = INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER
+/obj/machinery/airlock_sensor/incinerator_ordmix
+ id_tag = INCINERATOR_ORDMIX_AIRLOCK_SENSOR
+ master_tag = INCINERATOR_ORDMIX_AIRLOCK_CONTROLLER
/obj/machinery/airlock_sensor/incinerator_atmos
id_tag = INCINERATOR_ATMOS_AIRLOCK_SENSOR
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 6bfbaa4c6c5..af1858548c6 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -219,10 +219,10 @@
device = C
..()
-/obj/machinery/button/door/incinerator_vent_toxmix
+/obj/machinery/button/door/incinerator_vent_ordmix
name = "combustion chamber vent control"
- id = INCINERATOR_TOXMIX_VENT
- req_access = list(ACCESS_TOXINS)
+ id = INCINERATOR_ORDMIX_VENT
+ req_access = list(ACCESS_ORDNANCE)
/obj/machinery/button/door/incinerator_vent_atmos_main
name = "turbine vent control"
@@ -278,8 +278,8 @@
name = "combustion chamber ignition switch"
desc = "A remote control switch for the combustion chamber's igniter."
-/obj/machinery/button/ignition/incinerator/toxmix
- id = INCINERATOR_TOXMIX_IGNITER
+/obj/machinery/button/ignition/incinerator/ordmix
+ id = INCINERATOR_ORDMIX_IGNITER
/obj/machinery/button/ignition/incinerator/atmos
id = INCINERATOR_ATMOS_IGNITER
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 4de05ede30b..dfc9782b0fd 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -43,11 +43,11 @@
///Represents a signel source of camera alarms about movement or camera tampering
var/datum/alarm_handler/alarm_manager
-/obj/machinery/camera/preset/toxins //Bomb test site in space
+/obj/machinery/camera/preset/ordnance //Bomb test site in space
name = "Hardened Bomb-Test Camera"
desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top."
c_tag = "Bomb Testing Site"
- network = list("rd","toxins")
+ network = list("rd","ordnance")
use_power = NO_POWER_USE //Test site is an unpowered area
invuln = TRUE
light_range = 10
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 4ab30ffb829..1ae0d322a3f 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -13,12 +13,12 @@
var/frequency = FREQ_ATMOS_STORAGE
var/datum/radio_frequency/radio_connection
-/obj/machinery/air_sensor/atmos/toxin_tank
+/obj/machinery/air_sensor/atmos/plasma_tank
name = "plasma tank gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_TOX
-/obj/machinery/air_sensor/atmos/toxins_mixing_tank
- name = "toxins mixing gas sensor"
- id_tag = ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_PLAS
+/obj/machinery/air_sensor/atmos/ordnance_mixing_tank
+ name = "ordnance mixing gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_ORDNANCE_LAB
/obj/machinery/air_sensor/atmos/oxygen_tank
name = "oxygen tank gas sensor"
id_tag = ATMOS_GAS_MONITOR_SENSOR_O2
@@ -147,7 +147,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank",
ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank",
ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank",
- ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank",
+ ATMOS_GAS_MONITOR_SENSOR_PLAS = "Plasma Tank",
ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank",
ATMOS_GAS_MONITOR_SENSOR_AIR = "Mixed Air Tank",
ATMOS_GAS_MONITOR_SENSOR_MIX = "Mix Tank",
@@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION = "Distribution Loop",
ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE = "Atmos Waste Loop",
ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber",
- ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber"
+ ATMOS_GAS_MONITOR_SENSOR_ORDNANCE_LAB = "Ordnance Mixing Chamber"
)
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
@@ -229,11 +229,11 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
sensors = list(ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber")
circuit = /obj/item/circuitboard/computer/atmos_control/incinerator
-//Toxins mix sensor only
-/obj/machinery/computer/atmos_control/toxinsmix
- name = "Toxins Mixing Air Control"
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber")
- circuit = /obj/item/circuitboard/computer/atmos_control/toxinsmix
+//Ordnance mix sensor only
+/obj/machinery/computer/atmos_control/ordnancemix
+ name = "Ordnance Mixing Air Control"
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_ORDNANCE_LAB = "Ordnance Mixing Chamber")
+ circuit = /obj/item/circuitboard/computer/atmos_control/ordnancemix
/////////////////////////////////////////////////////////////
// LARGE TANK CONTROL
@@ -254,12 +254,12 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
sensors = list(ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank")
circuit = /obj/item/circuitboard/computer/atmos_control/tank/oxygen_tank
-/obj/machinery/computer/atmos_control/tank/toxin_tank
+/obj/machinery/computer/atmos_control/tank/plasma_tank
name = "Plasma Supply Control"
- input_tag = ATMOS_GAS_MONITOR_INPUT_TOX
- output_tag = ATMOS_GAS_MONITOR_OUTPUT_TOX
- sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank")
- circuit = /obj/item/circuitboard/computer/atmos_control/tank/toxin_tank
+ input_tag = ATMOS_GAS_MONITOR_INPUT_PLAS
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_PLAS
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_PLAS = "Plasma Tank")
+ circuit = /obj/item/circuitboard/computer/atmos_control/tank/plasma_tank
/obj/machinery/computer/atmos_control/tank/air_tank
name = "Mixed Air Supply Control"
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 53b2cbcef35..f60cb7b2df7 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -339,10 +339,10 @@
desc = "A telescreen that connects to the vault's camera network."
network = list("vault")
-/obj/machinery/computer/security/telescreen/toxins
+/obj/machinery/computer/security/telescreen/ordnance
name = "bomb test site monitor"
desc = "A telescreen that connects to the bomb test site's camera."
- network = list("toxins")
+ network = list("ordnance")
/obj/machinery/computer/security/telescreen/engine
name = "engine monitor"
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 859c2ff4c04..ea25d22c357 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -143,11 +143,11 @@
icon_keyboard = null
density = FALSE
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver
- id = MASSDRIVER_TOXINS
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver
+ id = MASSDRIVER_ORDNANCE
//for maps where pod doors are outside of the standard 4 tile controller detection range (ie Pubbystation)
-/obj/machinery/computer/pod/old/mass_driver_controller/toxinsdriver/longrange
+/obj/machinery/computer/pod/old/mass_driver_controller/ordnancedriver/longrange
range = 6
/obj/machinery/computer/pod/old/mass_driver_controller/chapelgun
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 1cac18afb18..fe704ead0dc 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -110,15 +110,15 @@
autoclose = FALSE
frequency = FREQ_AIRLOCK_CONTROL
heat_proof = TRUE
- req_access = list(ACCESS_TOXINS)
+ req_access = list(ACCESS_ORDNANCE)
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_interior
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior
name = "Mixing Room Interior Airlock"
- id_tag = INCINERATOR_TOXMIX_AIRLOCK_INTERIOR
+ id_tag = INCINERATOR_ORDMIX_AIRLOCK_INTERIOR
-/obj/machinery/door/airlock/research/glass/incinerator/toxmix_exterior
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior
name = "Mixing Room Exterior Airlock"
- id_tag = INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR
+ id_tag = INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR
/obj/machinery/door/airlock/mining/glass
opacity = FALSE
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index c36fd2f562d..61eb6fd6e8c 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -103,9 +103,9 @@
else
INVOKE_ASYNC(src, .proc/close)
-/obj/machinery/door/poddoor/incinerator_toxmix
+/obj/machinery/door/poddoor/incinerator_ordmix
name = "combustion chamber vent"
- id = INCINERATOR_TOXMIX_VENT
+ id = INCINERATOR_ORDMIX_VENT
/obj/machinery/door/poddoor/incinerator_atmos_main
name = "turbine vent"
@@ -131,9 +131,9 @@
name = "combustion chamber vent"
id = INCINERATOR_SYNDICATELAVA_AUXVENT
-/obj/machinery/door/poddoor/massdriver_toxins
- name = "Toxins Launcher Bay Door"
- id = MASSDRIVER_TOXINS
+/obj/machinery/door/poddoor/massdriver_ordnance
+ name = "Ordnance Launcher Bay Door"
+ id = MASSDRIVER_ORDNANCE
/obj/machinery/door/poddoor/massdriver_chapel
name = "Chapel Launcher Bay Door"
diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm
index bd4767fd481..a4668e1dc51 100644
--- a/code/game/machinery/embedded_controller/airlock_controller.dm
+++ b/code/game/machinery/embedded_controller/airlock_controller.dm
@@ -211,14 +211,14 @@
var/sensor_tag
var/sanitize_external
-/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_toxmix
+/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_ordmix
name = "Incinerator Access Console"
- airpump_tag = INCINERATOR_TOXMIX_DP_VENTPUMP
- exterior_door_tag = INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR
- id_tag = INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER
- interior_door_tag = INCINERATOR_TOXMIX_AIRLOCK_INTERIOR
+ airpump_tag = INCINERATOR_ORDMIX_DP_VENTPUMP
+ exterior_door_tag = INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR
+ id_tag = INCINERATOR_ORDMIX_AIRLOCK_CONTROLLER
+ interior_door_tag = INCINERATOR_ORDMIX_AIRLOCK_INTERIOR
sanitize_external = TRUE
- sensor_tag = INCINERATOR_TOXMIX_AIRLOCK_SENSOR
+ sensor_tag = INCINERATOR_ORDMIX_AIRLOCK_SENSOR
/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos
name = "Incinerator Access Console"
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index a2c341fd7e1..7d343f6a34e 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -14,8 +14,8 @@
var/id = null
var/on = FALSE
-/obj/machinery/igniter/incinerator_toxmix
- id = INCINERATOR_TOXMIX_IGNITER
+/obj/machinery/igniter/incinerator_ordmix
+ id = INCINERATOR_ORDMIX_IGNITER
/obj/machinery/igniter/incinerator_atmos
id = INCINERATOR_ATMOS_IGNITER
@@ -85,8 +85,8 @@
dir = EAST
pixel_x = -26
-/obj/machinery/sparker/toxmix
- id = INCINERATOR_TOXMIX_IGNITER
+/obj/machinery/sparker/ordmix
+ id = INCINERATOR_ORDMIX_IGNITER
/obj/machinery/sparker/Initialize()
. = ..()
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index c6a65449a77..00670d1f8aa 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -15,8 +15,8 @@
name = "holy driver"
id = MASSDRIVER_CHAPEL
-/obj/machinery/mass_driver/toxins
- id = MASSDRIVER_TOXINS
+/obj/machinery/mass_driver/ordnance
+ id = MASSDRIVER_ORDNANCE
/obj/machinery/mass_driver/trash
id = MASSDRIVER_DISPOSALS
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index b37d5c7d87c..baf7a4afada 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -40,9 +40,9 @@
name = "Incinerator Air Control (Computer Board)"
build_path = /obj/machinery/computer/atmos_control/incinerator
-/obj/item/circuitboard/computer/atmos_control/toxinsmix
- name = "Toxins Mixing Air Control (Computer Board)"
- build_path = /obj/machinery/computer/atmos_control/toxinsmix
+/obj/item/circuitboard/computer/atmos_control/ordnancemix
+ name = "Ordnance Mixing Air Control (Computer Board)"
+ build_path = /obj/machinery/computer/atmos_control/ordnancemix
/obj/item/circuitboard/computer/atmos_control/tank
name = "Tank Control (Computer Board)"
@@ -52,9 +52,9 @@
name = "Oxygen Supply Control (Computer Board)"
build_path = /obj/machinery/computer/atmos_control/tank/oxygen_tank
-/obj/item/circuitboard/computer/atmos_control/tank/toxin_tank
+/obj/item/circuitboard/computer/atmos_control/tank/plasma_tank
name = "Plasma Supply Control (Computer Board)"
- build_path = /obj/machinery/computer/atmos_control/tank/toxin_tank
+ build_path = /obj/machinery/computer/atmos_control/tank/plasma_tank
/obj/item/circuitboard/computer/atmos_control/tank/air_tank
name = "Mixed Air Supply Control (Computer Board)"
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index 81d74039e73..7ad2be24f31 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -107,9 +107,9 @@
greyscale_colors = "#933ea8#a92323"
ttone = "slip"
-/obj/item/pda/toxins
+/obj/item/pda/science
name = "scientist PDA"
- default_cartridge = /obj/item/cartridge/signal/toxins
+ default_cartridge = /obj/item/cartridge/signal/ordnance
greyscale_config = /datum/greyscale_config/pda/stripe_thick
greyscale_colors = "#e2e2e2#000099#9e00ea"
ttone = "boom"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 41ad208b54d..1de5e35c812 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -102,10 +102,10 @@
name = "generic signaler cartridge"
desc = "A data cartridge with an integrated radio signaler module."
-/obj/item/cartridge/signal/toxins
+/obj/item/cartridge/signal/ordnance
name = "\improper Signal Ace 2 cartridge"
desc = "Complete with integrated radio signaler!"
- icon_state = "cart-tox"
+ icon_state = "cart-ord"
access = CART_REAGENT_SCANNER | CART_ATMOS
/obj/item/cartridge/signal/Initialize()
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index de944f81c6a..baadd60e35a 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -82,7 +82,7 @@
for(var/obj/machinery/camera/camera in GLOB.cameranet.cameras)
if(camera.machine_stat || !camera.can_use())
continue
- if(length(list("ss13","mine", "rd", "labor", "toxins", "minisat") & camera.network))
+ if(length(list("ss13","mine", "rd", "labor", "ordnance", "minisat") & camera.network))
var/datum/weakref/camera_ref = WEAKREF(camera)
if(!camera_ref || !camera.c_tag)
continue
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index e25381a1fb9..56e12f11ff4 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -413,14 +413,14 @@
title = "DIY Chemical Grenades"
page_link = "Grenade"
-/obj/item/book/manual/wiki/toxins
- name = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
+/obj/item/book/manual/wiki/ordnance
+ name = "Ordnance for Dummies or: How I Learned to Stop Worrying and Love the Maxcap"
icon_state = "book6"
author = "Cuban Pete"
- title = "Toxins or: How I Learned to Stop Worrying and Love the Maxcap"
+ title = "Ordnance for Dummies or: How I Learned to Stop Worrying and Love the Maxcap"
page_link = "Guide_to_toxins"
-/obj/item/book/manual/wiki/toxins/suicide_act(mob/user)
+/obj/item/book/manual/wiki/ordnance/suicide_act(mob/user)
var/mob/living/carbon/human/H = user
user.visible_message(span_suicide("[user] starts dancing to the Rhumba Beat! It looks like [user.p_theyre()] trying to commit suicide!"))
playsound(loc, 'sound/effects/spray.ogg', 10, TRUE, -3)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 4a40c09ed30..3bc06c25d0a 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -150,7 +150,7 @@
inspiration_available = FALSE
/obj/item/banner/science/check_inspiration(mob/living/carbon/human/H)
- return H.on_fire //Sciencia is pleased by dedication to the art of Toxins
+ return H.on_fire //Sciencia is pleased by dedication to the art of Ordnance
/datum/crafting_recipe/science_banner
name = "Sciencia Banner"
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index c10abd24d54..44f61e5d22f 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -181,8 +181,8 @@
/obj/item/storage/backpack/science
name = "science backpack"
desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
- icon_state = "toxpack"
- inhand_icon_state = "toxpack"
+ icon_state = "scipack"
+ inhand_icon_state = "scipack"
/obj/item/storage/backpack/virology
name = "virology backpack"
@@ -274,11 +274,11 @@
icon_state = "satchel-gen"
inhand_icon_state = "satchel-gen"
-/obj/item/storage/backpack/satchel/tox
+/obj/item/storage/backpack/satchel/science
name = "scientist satchel"
desc = "Useful for holding research materials."
- icon_state = "satchel-tox"
- inhand_icon_state = "satchel-tox"
+ icon_state = "satchel-sci"
+ inhand_icon_state = "satchel-sci"
/obj/item/storage/backpack/satchel/hyd
name = "botanist satchel"
@@ -406,11 +406,11 @@
icon_state = "duffel-genetics"
inhand_icon_state = "duffel-genetics"
-/obj/item/storage/backpack/duffelbag/toxins
+/obj/item/storage/backpack/duffelbag/science
name = "scientist's duffel bag"
desc = "A large duffel bag for holding extra scientific components."
- icon_state = "duffel-toxins"
- inhand_icon_state = "duffel-toxins"
+ icon_state = "duffel-sci"
+ inhand_icon_state = "duffel-sci"
/obj/item/storage/backpack/duffelbag/virology
name = "virologist's duffel bag"
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 3dd39d019a7..09fde3df4ac 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -546,7 +546,7 @@
var/newcart = pick( /obj/item/cartridge/engineering,
/obj/item/cartridge/security,
/obj/item/cartridge/medical,
- /obj/item/cartridge/signal/toxins,
+ /obj/item/cartridge/signal/ordnance,
/obj/item/cartridge/quartermaster)
new newcart(src)
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 83276134a03..c95f44d5133 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -152,7 +152,7 @@
/obj/item/storage/firstaid/fire
name = "burn treatment kit"
- desc = "A specialized medical kit for when the toxins lab -spontaneously- burns down."
+ desc = "A specialized medical kit for when the ordnance lab -spontaneously- burns down."
icon_state = "ointment"
inhand_icon_state = "firstaid-ointment"
damagetype_healed = BURN
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 1f83f6253f9..cb1bb7b00f0 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1427,7 +1427,7 @@
/obj/item/toy/figure/scientist
name = "\improper Scientist action figure"
icon_state = "scientist"
- toysay = "I call toxins."
+ toysay = "I call ordnance."
toysound = 'sound/effects/explosionfar.ogg'
/obj/item/toy/figure/syndie
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 2893f17606e..68fa499b122 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -278,8 +278,8 @@
var/static/items_inside = list(
/obj/item/clothing/accessory/pocketprotector = 1,
/obj/item/storage/backpack/science = 2,
- /obj/item/storage/backpack/satchel/tox = 2,
- /obj/item/storage/backpack/duffelbag/toxins = 2,
+ /obj/item/storage/backpack/satchel/science = 2,
+ /obj/item/storage/backpack/duffelbag/science = 2,
/obj/item/clothing/suit/hooded/wintercoat/science = 1,
/obj/item/clothing/under/rank/rnd/scientist = 3,
/obj/item/clothing/suit/toggle/labcoat/science = 3,
diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm
index 911dd59a618..dd3cc1d19f9 100644
--- a/code/modules/antagonists/blob/blob_mobs.dm
+++ b/code/modules/antagonists/blob/blob_mobs.dm
@@ -10,7 +10,7 @@
faction = list(ROLE_BLOB)
bubble_icon = "blob"
speak_emote = null //so we use verb_yell/verb_say/etc
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
unique_name = 1
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index bbb1cbfaecb..6e609dc60f3 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -12,7 +12,7 @@
stop_automated_movement = 1
status_flags = CANPUSH
pass_flags = PASSTABLE
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxHealth = 150
health = 150
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index fb56ec07c37..5989add04c9 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -36,7 +36,7 @@
response_harm_simple = "punch through"
unsuitable_atmos_damage = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) //I don't know how you'd apply those, but revenants no-sell them anyway.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
harm_intent_damage = 0
diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 52df098bfd1..434061441a4 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -23,7 +23,7 @@
status_flags = CANPUSH
attack_sound = 'sound/magic/demon_attack1.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 250 //Weak to cold
maxbodytemp = INFINITY
faction = list("hell")
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 76601fcfed5..16ac351fbaa 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -24,21 +24,21 @@
if (oxy < 0.5)
return
. = air_gases[/datum/gas/plasma]
- var/tox = . ? .[MOLES] : 0
+ var/plas = . ? .[MOLES] : 0
. = air_gases[/datum/gas/tritium]
var/trit = . ? .[MOLES] : 0
. = air_gases[/datum/gas/hydrogen]
var/h2 = . ? .[MOLES] : 0
if(active_hotspot)
if(soh)
- if(tox > 0.5 || trit > 0.5 || h2 > 0.5)
+ if(plas > 0.5 || trit > 0.5 || h2 > 0.5)
if(active_hotspot.temperature < exposed_temperature)
active_hotspot.temperature = exposed_temperature
if(active_hotspot.volume < exposed_volume)
active_hotspot.volume = exposed_volume
return
- if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5 || h2 > 0.5))
+ if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (plas > 0.5 || trit > 0.5 || h2 > 0.5))
active_hotspot = new /obj/effect/hotspot(src, exposed_volume*25, exposed_temperature)
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index ffbba1f331b..a732469edaf 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -498,7 +498,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
///Takes the amount of the gas you want to PP as an argument
///So I don't have to do some hacky switches/defines/magic strings
///eg:
-///Tox_PP = get_partial_pressure(gas_mixture.toxins)
+///Plas_PP = get_partial_pressure(gas_mixture.plasma)
///O2_PP = get_partial_pressure(gas_mixture.oxygen)
/datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure)
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 39aa7ef2be6..f2b4c2e2259 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -178,7 +178,7 @@
name = "chamber air alarm"
locked = FALSE
req_access = null
- req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_TOXINS)
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ORDNANCE)
/obj/machinery/airalarm/all_access
name = "all-access air alarm"
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
index c99053b9387..d686540875d 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm
@@ -219,8 +219,8 @@
piping_layer = 4
icon_state = "dpvent_map_on-4"
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix
- id = INCINERATOR_TOXMIX_DP_VENTPUMP
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix
+ id = INCINERATOR_ORDMIX_DP_VENTPUMP
frequency = FREQ_AIRLOCK_CONTROL
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_atmos
diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm
index 923d76b865c..4d6e994614f 100644
--- a/code/modules/atmospherics/machinery/components/tank.dm
+++ b/code/modules/atmospherics/machinery/components/tank.dm
@@ -349,7 +349,7 @@
/obj/machinery/atmospherics/components/tank/carbon_dioxide
gas_type = /datum/gas/carbon_dioxide
-/obj/machinery/atmospherics/components/tank/toxins
+/obj/machinery/atmospherics/components/tank/plasma
gas_type = /datum/gas/plasma
/obj/machinery/atmospherics/components/tank/nitrogen
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 435bff29a5c..d47cf89b827 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -226,9 +226,9 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste
name = "engine outlet injector"
id = ATMOS_GAS_MONITOR_WASTE_ENGINE
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input
name = "plasma tank input injector"
- id = ATMOS_GAS_MONITOR_INPUT_TOX
+ id = ATMOS_GAS_MONITOR_INPUT_PLAS
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input
name = "oxygen tank input injector"
id = ATMOS_GAS_MONITOR_INPUT_O2
@@ -298,6 +298,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input
name = "incinerator chamber input injector"
id = ATMOS_GAS_MONITOR_INPUT_INCINERATOR
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input
- name = "toxins mixing input injector"
- id = ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/ordnance_mixing_input
+ name = "ordnance mixing input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_ORDNANCE_LAB
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 74b79a027da..c92f1a27a62 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -361,9 +361,9 @@
on = TRUE
icon_state = "vent_map_siphon_on-3"
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/plasma_output
name = "plasma tank output inlet"
- id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOX
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_PLAS
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output
name = "oxygen tank output inlet"
id_tag = ATMOS_GAS_MONITOR_OUTPUT_O2
@@ -431,9 +431,9 @@
name = "incinerator chamber output inlet"
id_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR
frequency = FREQ_ATMOS_CONTROL
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output
- name = "toxins mixing output inlet"
- id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/ordnance_mixing_output
+ name = "ordnance mixing output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_ORDNANCE_LAB
frequency = FREQ_ATMOS_CONTROL
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/layer2
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index 1356c475add..9606fb646e1 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -159,7 +159,7 @@
overlay_color = "#007FFF"
spawn_id = /datum/gas/oxygen
-/obj/machinery/atmospherics/miner/toxins
+/obj/machinery/atmospherics/miner/plasma
name = "\improper Plasma Gas Miner"
overlay_color = "#FF0000"
spawn_id = /datum/gas/plasma
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 7683fc9ab61..7d2aaae17d6 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
"n2" = /obj/machinery/portable_atmospherics/canister/nitrogen,
"o2" = /obj/machinery/portable_atmospherics/canister/oxygen,
"co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
- "plasma" = /obj/machinery/portable_atmospherics/canister/toxins,
+ "plasma" = /obj/machinery/portable_atmospherics/canister/plasma,
"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
"no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
@@ -259,7 +259,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
greyscale_config = /datum/greyscale_config/canister
greyscale_colors = "#9b5d7f"
-/obj/machinery/portable_atmospherics/canister/toxins
+/obj/machinery/portable_atmospherics/canister/plasma
name = "Plasma canister"
desc = "Plasma gas. The reason YOU are here. Highly toxic."
gas_type = /datum/gas/plasma
diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index e507096b6b7..e06c9615875 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -20,7 +20,7 @@
layer = TABLE_LAYER//so that deliveries dont appear underneath it
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 2, /obj/item/food/meat/slab/gondola = 2)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index fa581690a8a..2a0c77bca5d 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1319,10 +1319,10 @@
/datum/supply_pack/science/plasma
name = "Plasma Assembly Crate"
- desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open."
+ desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Ordnance access to open."
cost = CARGO_CRATE_VALUE * 2
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
/obj/item/tank/internals/plasma,
@@ -1342,8 +1342,8 @@
name = "Raw Flux Anomaly"
desc = "The raw core of a flux anomaly, ready to be implosion-compressed into a powerful artifact."
cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/raw_anomaly_core/flux)
crate_name = "raw flux anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1352,8 +1352,8 @@
name = "Raw Gravitational Anomaly"
desc = "The raw core of a gravitational anomaly, ready to be implosion-compressed into a powerful artifact."
cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/raw_anomaly_core/grav)
crate_name = "raw pyro anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1362,8 +1362,8 @@
name = "Raw Vortex Anomaly"
desc = "The raw core of a vortex anomaly, ready to be implosion-compressed into a powerful artifact."
cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/raw_anomaly_core/vortex)
crate_name = "raw vortex anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1372,8 +1372,8 @@
name = "Raw Bluespace Anomaly"
desc = "The raw core of a bluespace anomaly, ready to be implosion-compressed into a powerful artifact."
cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/raw_anomaly_core/bluespace)
crate_name = "raw bluespace anomaly"
crate_type = /obj/structure/closet/crate/secure/science
@@ -1382,8 +1382,8 @@
name = "Raw Pyro Anomaly"
desc = "The raw core of a pyro anomaly, ready to be implosion-compressed into a powerful artifact."
cost = CARGO_CRATE_VALUE * 10
- access = ACCESS_TOXINS
- access_view = ACCESS_TOXINS
+ access = ACCESS_ORDNANCE
+ access_view = ACCESS_ORDNANCE
contains = list(/obj/item/raw_anomaly_core/pyro)
crate_name = "raw pyro anomaly"
crate_type = /obj/structure/closet/crate/secure/science
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index d293d7fb7dd..bb1c8ce248b 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -71,7 +71,7 @@
/obj/item/clothing/suit/toggle/labcoat/science
name = "scientist labcoat"
desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
- icon_state = "labcoat_tox"
+ icon_state = "labcoat_sci"
/obj/item/clothing/suit/toggle/labcoat/roboticist
name = "roboticist labcoat"
diff --git a/code/modules/clothing/under/jobs/rnd.dm b/code/modules/clothing/under/jobs/rnd.dm
index 1294daeecf9..9d7c9e417d7 100644
--- a/code/modules/clothing/under/jobs/rnd.dm
+++ b/code/modules/clothing/under/jobs/rnd.dm
@@ -61,14 +61,14 @@
/obj/item/clothing/under/rank/rnd/scientist
desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
name = "scientist's jumpsuit"
- icon_state = "toxins"
+ icon_state = "science"
inhand_icon_state = "w_suit"
permeability_coefficient = 0.5
/obj/item/clothing/under/rank/rnd/scientist/skirt
name = "scientist's jumpskirt"
desc = "It's made of a special fiber that provides minor protection against explosives. It has markings that denote the wearer as a scientist."
- icon_state = "toxinswhite_skirt"
+ icon_state = "sciwhite_skirt"
inhand_icon_state = "w_suit"
body_parts_covered = CHEST|GROIN|ARMS
dying_key = DYE_REGISTRY_JUMPSKIRT
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 3efecec1370..ca19c4fa3e8 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -250,7 +250,7 @@
GM.garbage_collect()
/datum/spacevine_mutation/plasma_eater
- name = "toxins consuming"
+ name = "plasma consuming"
hue = "#ffbbff"
severity = 3
quality = POSITIVE
diff --git a/code/modules/experisci/experiment/types/explosive.dm b/code/modules/experisci/experiment/types/explosive.dm
index 279019fdb8d..288e4d1f6d9 100644
--- a/code/modules/experisci/experiment/types/explosive.dm
+++ b/code/modules/experisci/experiment/types/explosive.dm
@@ -2,7 +2,7 @@
name = "Explosive Experiment"
description = "An experiment requiring an explosion to progress"
exp_tag = "Explosion"
- performance_hint = "Perform explosive experiments using the research doppler array in the toxins lab."
+ performance_hint = "Perform explosive experiments using the research doppler array in the ordnance lab."
/// The required devastation range to complete the experiment
var/required_devastation = 0
/// The required heavy impact range to complete the experiment
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8748be37f25..bbde9cd6036 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
return
Expand()
if((get_turf(target) in flood_turfs) && !target.internal)
- new /datum/hallucination/fake_alert(target, TRUE, "too_much_tox")
+ new /datum/hallucination/fake_alert(target, TRUE, "too_much_plas")
next_expand = world.time + FAKE_FLOOD_EXPAND_TIME
/datum/hallucination/fake_flood/proc/Expand()
@@ -1109,23 +1109,23 @@ GLOBAL_LIST_INIT(hallucination_list, list(
/datum/hallucination/fake_alert/New(mob/living/carbon/C, forced = TRUE, specific, duration = 150)
set waitfor = FALSE
..()
- alert_type = pick("not_enough_oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","too_much_tox","newlaw","nutrition","charge","gravity","fire","locked","hacked","temphot","tempcold","pressure")
+ alert_type = pick("not_enough_oxy","not_enough_plas","not_enough_co2","too_much_oxy","too_much_co2","too_much_plas","newlaw","nutrition","charge","gravity","fire","locked","hacked","temphot","tempcold","pressure")
if(specific)
alert_type = specific
feedback_details += "Type: [alert_type]"
switch(alert_type)
if("not_enough_oxy")
target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_oxy, override = TRUE)
- if("not_enough_tox")
- target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_tox, override = TRUE)
+ if("not_enough_plas")
+ target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_plas, override = TRUE)
if("not_enough_co2")
target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_co2, override = TRUE)
if("too_much_oxy")
target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_oxy, override = TRUE)
if("too_much_co2")
target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_co2, override = TRUE)
- if("too_much_tox")
- target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_tox, override = TRUE)
+ if("too_much_plas")
+ target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_plas, override = TRUE)
if("nutrition")
if(prob(50))
target.throw_alert(alert_type, /atom/movable/screen/alert/fat, override = TRUE)
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index c9896a91304..5010f77550e 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -91,7 +91,7 @@
icon_living = "s_rabbit_white"
icon_dead = "s_rabbit_white_dead"
icon_prefix = "s_rabbit"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
unsuitable_atmos_damage = 0
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index 38e5467f598..e273c7b01d6 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -188,7 +188,7 @@
maxHealth = INFINITY
health = INFINITY
emote_see = list("silently stares")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 0
minbodytemp = 0
maxbodytemp = INFINITY
diff --git a/code/modules/jobs/job_types/research_director.dm b/code/modules/jobs/job_types/research_director.dm
index b62b3dfa400..ffc7f962215 100644
--- a/code/modules/jobs/job_types/research_director.dm
+++ b/code/modules/jobs/job_types/research_director.dm
@@ -62,8 +62,8 @@
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced/command=1)
backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- duffelbag = /obj/item/storage/backpack/duffelbag/toxins
+ satchel = /obj/item/storage/backpack/satchel/science
+ duffelbag = /obj/item/storage/backpack/duffelbag/science
skillchips = list(/obj/item/skillchip/job/research_director)
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index 4635c036a73..1004971edb9 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -48,8 +48,8 @@
suit = /obj/item/clothing/suit/toggle/labcoat/roboticist
backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- duffelbag = /obj/item/storage/backpack/duffelbag/toxins
+ satchel = /obj/item/storage/backpack/satchel/science
+ duffelbag = /obj/item/storage/backpack/duffelbag/science
backpack_contents = list(/obj/item/modular_computer/tablet/preset/science=1)
pda_slot = ITEM_SLOT_LPOCKET
diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm
index ee1b460f1ee..3015f5ae51e 100644
--- a/code/modules/jobs/job_types/scientist.dm
+++ b/code/modules/jobs/job_types/scientist.dm
@@ -37,15 +37,15 @@
name = "Scientist"
jobtype = /datum/job/scientist
- belt = /obj/item/pda/toxins
+ belt = /obj/item/pda/science
ears = /obj/item/radio/headset/headset_sci
uniform = /obj/item/clothing/under/rank/rnd/scientist
shoes = /obj/item/clothing/shoes/sneakers/white
suit = /obj/item/clothing/suit/toggle/labcoat/science
backpack = /obj/item/storage/backpack/science
- satchel = /obj/item/storage/backpack/satchel/tox
- duffelbag = /obj/item/storage/backpack/duffelbag/toxins
+ satchel = /obj/item/storage/backpack/satchel/science
+ duffelbag = /obj/item/storage/backpack/duffelbag/science
backpack_contents = list(/obj/item/modular_computer/tablet/preset/science=1)
id_trim = /datum/id_trim/job/scientist
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 308b25c2bad..1577d3d5d1b 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -13,7 +13,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
faction = list("neutral")
combat_mode = TRUE
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
move_to_delay = 10
health = 125
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 1d8c8ca2b1e..833b9bfb306 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -10,28 +10,28 @@
//Aliens breathe in vaccuum
return 0
- var/toxins_used = 0
- var/tox_detect_threshold = 0.02
+ var/plasma_used = 0
+ var/plas_detect_threshold = 0.02
var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
var/list/breath_gases = breath.gases
breath.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
- //Partial pressure of the toxins in our breath
- var/Toxins_pp = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
+ //Partial pressure of the plasma in our breath
+ var/Plasma_pp = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
- if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
+ if(Plasma_pp > plas_detect_threshold) // Detect plasma in air
adjustPlasma(breath_gases[/datum/gas/plasma][MOLES]*250)
- throw_alert("alien_tox", /atom/movable/screen/alert/alien_tox)
+ throw_alert("alien_plas", /atom/movable/screen/alert/alien_plas)
- toxins_used = breath_gases[/datum/gas/plasma][MOLES]
+ plasma_used = breath_gases[/datum/gas/plasma][MOLES]
else
- clear_alert("alien_tox")
+ clear_alert("alien_plas")
- //Breathe in toxins and out oxygen
- breath_gases[/datum/gas/plasma][MOLES] -= toxins_used
- breath_gases[/datum/gas/oxygen][MOLES] += toxins_used
+ //Breathe in plasma and out oxygen
+ breath_gases[/datum/gas/plasma][MOLES] -= plasma_used
+ breath_gases[/datum/gas/oxygen][MOLES] += plasma_used
breath.garbage_collect()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index ab547ea4825..5ba204b5342 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -102,8 +102,8 @@
if(S.breathid == "o2")
throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
- else if(S.breathid == "tox")
- throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
+ else if(S.breathid == "plas")
+ throw_alert("not_enough_plas", /atom/movable/screen/alert/not_enough_plas)
else if(S.breathid == "co2")
throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2)
else if(S.breathid == "n2")
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index ea7bd22bd7a..c5da0f9a57f 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -25,7 +25,7 @@
heatmod = 1.5
brutemod = 1.5
payday_modifier = 0.75
- breathid = "tox"
+ breathid = "plas"
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
var/internal_fire = FALSE //If the bones themselves are burning clothes won't help you much
disliked_food = FRUIT | CLOTH
diff --git a/code/modules/mob/living/carbon/init_signals.dm b/code/modules/mob/living/carbon/init_signals.dm
index c7524486bc4..75a363447a1 100644
--- a/code/modules/mob/living/carbon/init_signals.dm
+++ b/code/modules/mob/living/carbon/init_signals.dm
@@ -16,8 +16,8 @@
failed_last_breath = FALSE
clear_alert("too_much_oxy")
clear_alert("not_enough_oxy")
- clear_alert("too_much_tox")
- clear_alert("not_enough_tox")
+ clear_alert("too_much_plas")
+ clear_alert("not_enough_plas")
clear_alert("nitro")
clear_alert("too_much_nitro")
clear_alert("not_enough_nitro")
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 667f0871aa7..78e0a4aaf82 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -157,7 +157,7 @@
var/safe_oxy_min = 16
var/safe_co2_max = 10
- var/safe_tox_max = 0.05
+ var/safe_plas_max = 0.05
var/SA_para_min = 1
var/SA_sleep_min = 5
var/oxygen_used = 0
@@ -166,7 +166,7 @@
var/list/breath_gases = breath.gases
breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz)
var/O2_partialpressure = (breath_gases[/datum/gas/oxygen][MOLES]/breath.total_moles())*breath_pressure
- var/Toxins_partialpressure = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
+ var/Plasma_partialpressure = (breath_gases[/datum/gas/plasma][MOLES]/breath.total_moles())*breath_pressure
var/CO2_partialpressure = (breath_gases[/datum/gas/carbon_dioxide][MOLES]/breath.total_moles())*breath_pressure
@@ -209,13 +209,13 @@
else
co2overloadtime = 0
- //TOXINS/PLASMA
- if(Toxins_partialpressure > safe_tox_max)
- var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_tox_max) * 10
+ //PLASMA
+ if(Plasma_partialpressure > safe_plas_max)
+ var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_plas_max) * 10
adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
- throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
+ throw_alert("too_much_plas", /atom/movable/screen/alert/too_much_plas)
else
- clear_alert("too_much_tox")
+ clear_alert("too_much_plas")
//NITROUS OXIDE
if(breath_gases[/datum/gas/nitrous_oxide])
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index d68504ff090..a28b5bdbb70 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -594,7 +594,7 @@
if(!C.can_use())
continue
- tempnetwork.Remove("rd", "toxins", "prison")
+ tempnetwork.Remove("rd", "ordnance", "prison")
if(tempnetwork.len)
for(var/i in C.network)
cameralist[i] = i
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index beb56724f51..be289f4844f 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -8,7 +8,7 @@
wander = 0
healable = 0
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
maxbodytemp = INFINITY
minbodytemp = 0
has_unlimited_silicon_privilege = 1
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index e54c4b8e796..ac7cbeb93c9 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -22,7 +22,7 @@
see_in_dark = 7
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
healable = 0
diff --git a/code/modules/mob/living/simple_animal/eldritch_demons.dm b/code/modules/mob/living/simple_animal/eldritch_demons.dm
index b140b6d24ed..3030297d82d 100644
--- a/code/modules/mob/living/simple_animal/eldritch_demons.dm
+++ b/code/modules/mob/living/simple_animal/eldritch_demons.dm
@@ -21,7 +21,7 @@
see_in_dark = 7
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
healable = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm
index 2bdae83e90b..7b2408daf07 100644
--- a/code/modules/mob/living/simple_animal/friendly/gondola.dm
+++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm
@@ -22,7 +22,7 @@
icon_living = "gondola"
loot = list(/obj/effect/decal/cleanable/blood/gibs, /obj/item/stack/sheet/animalhide/gondola = 1, /obj/item/food/meat/slab/gondola = 1)
//Gondolas aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
maxHealth = 200
diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm
index fb64422b1d3..fe4ff0c2798 100644
--- a/code/modules/mob/living/simple_animal/friendly/trader.dm
+++ b/code/modules/mob/living/simple_animal/friendly/trader.dm
@@ -19,7 +19,7 @@
attack_sound = 'sound/weapons/punch1.ogg'
del_on_death = TRUE
loot = list(/obj/effect/mob_spawn/human/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 2.5
casingtype = /obj/item/ammo_casing/shotgun/buckshot
wander = FALSE
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 065159289fe..64a689cf47e 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
combat_mode = TRUE
stop_automated_movement = 1
attack_sound = 'sound/weapons/punch1.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
attack_verb_continuous = "punches"
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 03af415b7e6..5bc63d3fd7a 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -23,7 +23,7 @@
combat_mode = TRUE
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
faction = list(ROLE_ALIEN)
status_flags = CANPUSH
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index d2ba20a91a2..e75721e3d5b 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -38,7 +38,7 @@
friendly_verb_simple = "bear hug"
//Space bears aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index c5af0ab5040..9148760997c 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -47,7 +47,7 @@
held_w_class = WEIGHT_CLASS_TINY
//Spaceborn beings don't get hurt by space
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index e45fdc64be3..4ab7bb6f179 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -35,7 +35,7 @@
attack_vis_effect = ATTACK_EFFECT_BITE
speak_emote = list("gnashes")
//Space carp aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
diff --git a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
index bcab77e91b3..29b5799d75a 100644
--- a/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cat_butcher.dm
@@ -23,7 +23,7 @@
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
sentience_type = SENTIENCE_HUMANOID
loot = list(/obj/effect/mob_spawn/human/corpse/cat_butcher, /obj/item/circular_saw)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list("hostile")
check_friendly_fire = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/cockroach.dm b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
index f44f9843068..1da277b0531 100644
--- a/code/modules/mob/living/simple_animal/hostile/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/hostile/cockroach.dm
@@ -7,7 +7,7 @@
maxHealth = 1
turns_per_move = 5
loot = list(/obj/effect/decal/cleanable/insectguts)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = INFINITY
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
diff --git a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
index 64efbcb06d1..8807b9474c1 100644
--- a/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/dark_wizard.dm
@@ -29,7 +29,7 @@
weather_immunities = list(WEATHER_LAVA, WEATHER_ASH)
minbodytemp = 0
maxbodytemp = INFINITY
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
loot = list(/obj/effect/decal/remains/human)
del_on_death = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
index 101240042e7..906c1af069e 100644
--- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
@@ -25,7 +25,7 @@
attack_verb_continuous = "blinks at"
attack_verb_simple = "blink at"
attack_sound = 'sound/weapons/pierce.ogg'
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index c1f11fe5ed3..d5ffc96678f 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -27,7 +27,7 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
speak_emote = list("growls")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("faithless")
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index e52a70d6036..9888c623d93 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -594,7 +594,7 @@
*/
/mob/living/simple_animal/hostile/giant_spider/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
@@ -611,7 +611,7 @@
*/
/mob/living/simple_animal/hostile/giant_spider/nurse/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
@@ -627,7 +627,7 @@
*/
/mob/living/simple_animal/hostile/giant_spider/hunter/ice
name = "giant ice spider"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
poison_type = /datum/reagent/consumable/frostoil
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 997b5c52292..9b2e4315d53 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -24,7 +24,7 @@
projectiletype = /obj/projectile/hivebotbullet
faction = list("hivebot")
check_friendly_fire = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
verb_say = "states"
verb_ask = "queries"
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
index 11979e7f0ce..8e2873ba7a5 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/_jungle_mobs.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/jungle
vision_range = 5
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
faction = list("jungle")
weather_immunities = list(WEATHER_ACID)
obj_damage = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 9a428e9abd5..2a7b31b265d 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -25,7 +25,7 @@
attack_sound = 'sound/weapons/punch1.ogg'
faction = list("plants")
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 150
maxbodytemp = 500
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
index 90bb97eaa57..79d0a1723ab 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
@@ -14,7 +14,7 @@
robust_searching = TRUE
ranged_ignores_vision = TRUE
stat_attack = DEAD
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
damage_coeff = list(BRUTE = 1, BURN = 0.5, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
minbodytemp = 0
maxbodytemp = INFINITY
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 7d549fde334..b0bb5677e17 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -24,7 +24,7 @@
speak_emote = list("creaks")
taunt_chance = 30
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("mimic")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index eb2b1f1ed08..381ca9d32ac 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -1,7 +1,7 @@
//the base mining mob
/mob/living/simple_animal/hostile/asteroid
vision_range = 2
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
faction = list("mining")
weather_immunities = list(WEATHER_LAVA,WEATHER_ASH)
obj_damage = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
index ad679fd5db9..9d9199aee42 100644
--- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
@@ -23,7 +23,7 @@
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list(ROLE_DEATHSQUAD)
check_friendly_fire = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
index 86db07e79df..51d52d85fe7 100644
--- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm
+++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm
@@ -16,7 +16,7 @@
faction = list("nether")
speak_emote = list("screams")
gold_core_spawnable = HOSTILE_SPAWN
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
var/phaser = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm
index 7336df660bb..461c13555b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/ooze.dm
+++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm
@@ -10,7 +10,7 @@
gender = NEUTER
emote_see = list("jiggles", "bounces in place")
speak_emote = list("blorbles")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
hud_type = /datum/hud/ooze
minbodytemp = 250
maxbodytemp = INFINITY
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 2c8b9f93b5c..9414eba70f3 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -21,7 +21,7 @@
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
speak_emote = list("yarrs")
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
@@ -51,7 +51,7 @@
icon_state = "piratespace"
icon_living = "piratespace"
icon_dead = "piratespace_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
@@ -90,7 +90,7 @@
icon_state = "piratespaceranged"
icon_living = "piratespaceranged"
icon_dead = "piratespaceranged_dead"
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index e9e921715be..81dc4dbd263 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -31,9 +31,9 @@
speak_emote = list("squeaks")
var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus
var/min_oxy = 0
- var/max_tox = 0
+ var/max_plas = 0
//Space bats need no air to fly in.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
@@ -56,7 +56,7 @@
maxHealth = 250
health = 250
max_co2 = 5
- max_tox = 2
+ max_plas = 2
melee_damage_lower = 15
melee_damage_upper = 20
min_oxy = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 789f916bc91..31334583505 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -29,7 +29,7 @@
del_on_death = 1
loot = list(/obj/effect/mob_spawn/human/clown/corpse)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 270
maxbodytemp = 370
unsuitable_atmos_damage = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
index df346a51cd8..da78c4d3a55 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm
@@ -25,7 +25,7 @@
speak_emote = list("weeps")
deathmessage = "wails, disintegrating into a pile of ectoplasm!"
loot = list(/obj/item/ectoplasm)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
pressure_resistance = 300
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
index 19b128fcad4..115edfd7f4a 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -54,7 +54,7 @@
sentience_type = SENTIENCE_HUMANOID
combat_mode = TRUE
loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
status_flags = CANPUSH
search_objects = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 24c506c7115..e2d9267600c 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -22,7 +22,7 @@
combat_mode = TRUE
loot = list(/obj/effect/mob_spawn/human/corpse/russian,
/obj/item/kitchen/knife)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list("russian")
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
index b65dfd3eaab..3bbfb56dd08 100644
--- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm
+++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm
@@ -24,7 +24,7 @@
attack_verb_simple = "slash"
attack_sound = 'sound/hallucinations/growl1.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 5
robust_searching = 1
stat_attack = HARD_CRIT
diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
index afe066ee891..fa64582803d 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -59,7 +59,7 @@
mouse_opacity = MOUSE_OPACITY_ICON
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
deathmessage = "screeches as its wings turn to dust and it collapses on the floor, its life extinguished."
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
faction = list("carp")
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index b5c7dc386dd..c3cc09ecdc7 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -29,7 +29,7 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
attack_vis_effect = ATTACK_EFFECT_CLAW
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
faction = list("statue")
diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm
index 655f2e3be23..1d5fef888fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/stickman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm
@@ -23,7 +23,7 @@
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list("hostile","stickman")
check_friendly_fire = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 160e7009a14..12610e6f06b 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -39,7 +39,7 @@
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list(ROLE_SYNDICATE)
check_friendly_fire = 1
@@ -57,7 +57,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
@@ -92,7 +92,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
projectile_deflect_chance = 50
@@ -144,7 +144,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
projectile_deflect_chance = 50
@@ -191,7 +191,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
@@ -224,7 +224,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
@@ -254,7 +254,7 @@
name = "Syndicate Commando"
maxHealth = 170
health = 170
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
speed = 1
@@ -306,7 +306,7 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
attack_vis_effect = ATTACK_EFFECT_SLASH
faction = list(ROLE_SYNDICATE)
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
mob_size = MOB_SIZE_TINY
limb_destroyer = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 4110f54cf09..9d31133e2d2 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -35,7 +35,7 @@
emote_taunt = list("growls")
taunt_chance = 20
- atmos_requirements = list("min_oxy" = 2, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 2, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 2.5
minbodytemp = 0
maxbodytemp = 1200
@@ -92,7 +92,7 @@
loot = list(/obj/item/stack/rods)
speak_emote = list("polls")
faction = list()
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
is_tree = FALSE
/mob/living/simple_animal/hostile/tree/festivus/attack_hand(mob/living/carbon/human/user, list/modifiers)
diff --git a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm
index f36611d500b..a47186dd479 100644
--- a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm
+++ b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm
@@ -11,7 +11,7 @@
gender = NEUTER
environment_smash = ENVIRONMENT_SMASH_STRUCTURES
speak_emote = list("roars")
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
health = 250
maxHealth = 250
damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 1, CLONE = 2, STAMINA = 0, OXY = 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index c93257a50ce..417cbeb742a 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -121,7 +121,7 @@
deathsound = 'sound/creatures/venus_trap_death.ogg'
attack_sound = 'sound/creatures/venus_trap_hit.ogg'
unsuitable_heat_damage = 5 //note that venus human traps do not take cold damage, only heat damage- this is because space vines can cause hull breaches
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 0
/// copied over from the code from eyeballs (the mob) to make it easier for venus human traps to see in kudzu that doesn't have the transparency mutation
sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index d3898c0ef07..c5280b62ff8 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -19,7 +19,7 @@
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
- atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list(ROLE_WIZARD)
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm
index ed4e069d6d2..1097cf23312 100644
--- a/code/modules/mob/living/simple_animal/hostile/zombie.dm
+++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm
@@ -18,7 +18,7 @@
attack_sound = 'sound/hallucinations/growl1.ogg'
attack_vis_effect = ATTACK_EFFECT_BITE
combat_mode = TRUE
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
status_flags = CANPUSH
del_on_death = 1
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index ea4d21e4226..8c9a1abecdf 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -25,7 +25,7 @@
attack_verb_simple = "metaphysically strike"
minbodytemp = 0
maxbodytemp = INFINITY
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
speed = -1 //they don't have to lug a body made of runed metal around
stop_automated_movement = 1
faction = list("cult")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 444edb48488..a911672ae1f 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -69,7 +69,7 @@
///Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
///Leaving something at 0 means it's off - has no maximum.
- var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+ var/list/atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
///This damage is taken when atmos doesn't fit all the requirements above.
var/unsuitable_atmos_damage = 1
@@ -310,7 +310,7 @@
var/ST_gases = ST.air.gases
ST.air.assert_gases(arglist(GLOB.hardcoded_gases))
- var/tox = ST_gases[/datum/gas/plasma][MOLES]
+ var/plas = ST_gases[/datum/gas/plasma][MOLES]
var/oxy = ST_gases[/datum/gas/oxygen][MOLES]
var/n2 = ST_gases[/datum/gas/nitrogen][MOLES]
var/co2 = ST_gases[/datum/gas/carbon_dioxide][MOLES]
@@ -321,9 +321,9 @@
. = FALSE
else if(atmos_requirements["max_oxy"] && oxy > atmos_requirements["max_oxy"])
. = FALSE
- else if(atmos_requirements["min_tox"] && tox < atmos_requirements["min_tox"])
+ else if(atmos_requirements["min_plas"] && plas < atmos_requirements["min_plas"])
. = FALSE
- else if(atmos_requirements["max_tox"] && tox > atmos_requirements["max_tox"])
+ else if(atmos_requirements["max_plas"] && plas > atmos_requirements["max_plas"])
. = FALSE
else if(atmos_requirements["min_n2"] && n2 < atmos_requirements["min_n2"])
. = FALSE
@@ -334,7 +334,7 @@
else if(atmos_requirements["max_co2"] && co2 > atmos_requirements["max_co2"])
. = FALSE
else
- if(atmos_requirements["min_oxy"] || atmos_requirements["min_tox"] || atmos_requirements["min_n2"] || atmos_requirements["min_co2"])
+ if(atmos_requirements["min_oxy"] || atmos_requirements["min_plas"] || atmos_requirements["min_n2"] || atmos_requirements["min_co2"])
. = FALSE
/mob/living/simple_animal/proc/environment_temperature_is_safe(datum/gas_mixture/environment)
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index e80ac89bdb1..bb704d392de 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -23,7 +23,7 @@
bubble_icon = "slime"
initial_language_holder = /datum/language_holder/slime
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
maxHealth = 150
health = 150
diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm
index 7c3040baa69..2b298513a8b 100644
--- a/code/modules/paperwork/paper_premade.dm
+++ b/code/modules/paperwork/paper_premade.dm
@@ -55,7 +55,7 @@
name = "paper- 'Judgement'"
info = "For crimes against the station, the offender is sentenced to:
\n
\n"
-/obj/item/paper/fluff/jobs/toxins/chemical_info
+/obj/item/paper/fluff/jobs/ordnance/chemical_info
name = "paper- 'Chemical Information'"
info = "Known Onboard Toxins:
\n\tGrade A Semi-Liquid Plasma:
\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.
\n\t\tA gas mask fails to filter plasma after 50 units.
\n\t\tWill attempt to diffuse like a gas.
\n\t\tFiltered by scrubbers.
\n\t\tThere is a bottled version which is very different
\n\t\t\tfrom the version found in canisters!
\n
\n\t\tWARNING: Highly Flammable. Keep away from heat sources
\n\t\texcept in an enclosed fire area!
\n\t\tWARNING: It is a crime to use this without authorization.
\nKnown Onboard Anti-Toxin:
\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.
\n\t\tBest if injected directly into bloodstream.
\n\t\tA full injection is in every regular Med-Kit.
\n\t\tSpecial toxin Kits hold around 7.
\n
\nKnown Onboard Chemicals (other):
\n\tRejuvenation T#001:
\n\t\tEven 1 unit injected directly into the bloodstream
\n\t\t\twill cure unconscious and sleep toxins.
\n\t\tIf administered to a dying patient it will prevent
\n\t\t\tfurther damage for about units*3 seconds.
\n\t\t\tit will not cure them or allow them to be cured.
\n\t\tIt can be administered to a non-dying patient
\n\t\t\tbut the chemicals disappear just as fast.
\n\tMorphine T#054:
\n\t\t5 units will induce precisely 1 minute of sleep.
\n\t\t\tThe effect are cumulative.
\n\t\tWARNING: It is a crime to use this without authorization"
diff --git a/code/modules/research/anomaly/explosive_compressor.dm b/code/modules/research/anomaly/explosive_compressor.dm
index 226319fefa2..4591c356bd6 100644
--- a/code/modules/research/anomaly/explosive_compressor.dm
+++ b/code/modules/research/anomaly/explosive_compressor.dm
@@ -8,7 +8,7 @@
*
* The explosive compressor machine used in anomaly core production.
*
- * Uses the standard toxins/tank explosion scaling to compress raw anomaly cores into completed ones. The required explosion radius increases as more cores of that type are created.
+ * Uses the standard ordnance/tank explosion scaling to compress raw anomaly cores into completed ones. The required explosion radius increases as more cores of that type are created.
*/
/obj/machinery/research/explosive_compressor
name = "implosion compressor"
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 7571f0f9d87..d5cb047a483 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -12,7 +12,7 @@ aren't already linked to another console. Any consoles it cannot link up with (e
linked or there aren't any in range), you'll just not have access to that menu. In the settings menu, there are menu options that
allow a player to attempt to re-sync with nearby consoles. You can also force it to disconnect from a specific console.
-The only thing that requires toxins access is locking and unlocking the console on the settings menu.
+The only thing that requires ordnance access is locking and unlocking the console on the settings menu.
Nothing else in the console has ID requirements.
*/
diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm
index 802929700b2..910fbfacc66 100644
--- a/code/modules/ruins/spaceruin_code/forgottenship.dm
+++ b/code/modules/ruins/spaceruin_code/forgottenship.dm
@@ -184,7 +184,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
rapid_melee = 3
retreat_distance = 0
minimum_distance = 1
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
projectiletype = /obj/projectile/beam/laser
projectilesound = 'sound/weapons/laser.ogg'
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 12ae1cc52ac..aebd68400a6 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -254,8 +254,8 @@
to_chat(H, span_notice("You feel resistant to airborne toxins."))
if(locate(/obj/item/organ/lungs) in H.internal_organs)
var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS]
- L.tox_breath_dam_min = 0
- L.tox_breath_dam_max = 0
+ L.plas_breath_dam_min = 0
+ L.plas_breath_dam_max = 0
ADD_TRAIT(H, TRAIT_VIRUSIMMUNE, "dna_vault")
if(VAULT_NOBREATH)
to_chat(H, span_notice("Your lungs feel great."))
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index e9f8cc05466..d60c324455d 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -29,9 +29,9 @@
var/safe_nitro_max = 0
var/safe_co2_min = 0
var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
- var/safe_toxins_min = 0
- ///How much breath partial pressure is a safe amount of toxins. 0 means that we are immune to toxins.
- var/safe_toxins_max = 0.05
+ var/safe_plasma_min = 0
+ ///How much breath partial pressure is a safe amount of plasma. 0 means that we are immune to plasma.
+ var/safe_plasma_max = 0.05
var/SA_para_min = 1 //Sleeping agent
var/SA_sleep_min = 5 //Sleeping agent
var/BZ_trip_balls_min = 1 //BZ gas
@@ -53,9 +53,9 @@
var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
var/co2_damage_type = OXY
- var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
- var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
- var/tox_damage_type = TOX
+ var/plas_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/plas_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/plas_damage_type = TOX
var/cold_message = "your face freezing and an icicle forming"
var/cold_level_1_threshold = 260
@@ -96,8 +96,8 @@
breather.failed_last_breath = TRUE
if(safe_oxygen_min)
breather.throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
- else if(safe_toxins_min)
- breather.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
+ else if(safe_plasma_min)
+ breather.throw_alert("not_enough_plas", /atom/movable/screen/alert/not_enough_plas)
else if(safe_co2_min)
breather.throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2)
else if(safe_nitro_min)
@@ -117,7 +117,7 @@
//Partial pressures in our breath
var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
- var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
+ var/Plasma_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
//Vars for n2o and healium induced euphorias.
var/n2o_euphoria = EUPHORIA_LAST_FLAG
@@ -216,29 +216,29 @@
gas_breathed = 0
- //-- TOX --//
+ //-- PLASMA --//
- //Too much toxins!
- if(safe_toxins_max)
- if(Toxins_pp > safe_toxins_max)
- var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_toxins_max) * 10
- breather.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
- breather.throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
+ //Too much plasma!
+ if(safe_plasma_max)
+ if(Plasma_pp > safe_plasma_max)
+ var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_plasma_max) * 10
+ breather.apply_damage_type(clamp(ratio, plas_breath_dam_min, plas_breath_dam_max), plas_damage_type)
+ breather.throw_alert("too_much_plas", /atom/movable/screen/alert/too_much_plas)
else
- breather.clear_alert("too_much_tox")
+ breather.clear_alert("too_much_plas")
- //Too little toxins!
- if(safe_toxins_min)
- if(Toxins_pp < safe_toxins_min)
- gas_breathed = handle_too_little_breath(breather, Toxins_pp, safe_toxins_min, breath_gases[/datum/gas/plasma][MOLES])
- breather.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
+ //Too little plasma!
+ if(safe_plasma_min)
+ if(Plasma_pp < safe_plasma_min)
+ gas_breathed = handle_too_little_breath(breather, Plasma_pp, safe_plasma_min, breath_gases[/datum/gas/plasma][MOLES])
+ breather.throw_alert("not_enough_plas", /atom/movable/screen/alert/not_enough_plas)
else
breather.failed_last_breath = FALSE
if(breather.health >= breather.crit_threshold)
breather.adjustOxyLoss(-5)
gas_breathed = breath_gases[/datum/gas/plasma][MOLES]
- breather.clear_alert("not_enough_tox")
+ breather.clear_alert("not_enough_plas")
//Exhale
breath_gases[/datum/gas/plasma][MOLES] -= gas_breathed
@@ -497,14 +497,14 @@
icon_state = "lungs-plasma"
safe_oxygen_min = 0 //We don't breathe this
- safe_toxins_min = 16 //We breathe THIS!
- safe_toxins_max = 0
+ safe_plasma_min = 16 //We breathe THIS!
+ safe_plasma_max = 0
/obj/item/organ/lungs/slime
name = "vacuole"
desc = "A large organelle designed to store oxygen and other important gasses."
- safe_toxins_max = 0 //We breathe this to gain POWER.
+ safe_plasma_max = 0 //We breathe this to gain POWER.
/obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/breather_slime)
. = ..()
@@ -531,9 +531,9 @@
/obj/item/organ/lungs/cybernetic/tier3
name = "upgraded cybernetic lungs"
- desc = "A more advanced version of the stock cybernetic lungs. Features the ability to filter out lower levels of toxins and carbon dioxide."
+ desc = "A more advanced version of the stock cybernetic lungs. Features the ability to filter out lower levels of plasma and carbon dioxide."
icon_state = "lungs-c-u2"
- safe_toxins_max = 20
+ safe_plasma_max = 20
safe_co2_max = 20
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
safe_oxygen_min = 13
@@ -590,10 +590,10 @@
safe_oxygen_min = max(0, oxygen_pp - GAS_TOLERANCE)
safe_nitro_min = max(0, nitrogen_pp - GAS_TOLERANCE)
- safe_toxins_min = max(0, plasma_pp - GAS_TOLERANCE)
+ safe_plasma_min = max(0, plasma_pp - GAS_TOLERANCE)
// Increase plasma tolerance based on amount in base air
- safe_toxins_max += plasma_pp
+ safe_plasma_max += plasma_pp
// CO2 is always a waste gas, so none is required, but ashwalkers
// tolerate the base amount plus tolerance*2 (humans tolerate only 10 pp)
diff --git a/code/modules/swarmers/swarmer.dm b/code/modules/swarmers/swarmer.dm
index 2c86a0e3330..4db76e1445b 100644
--- a/code/modules/swarmers/swarmer.dm
+++ b/code/modules/swarmers/swarmer.dm
@@ -33,7 +33,7 @@
harm_intent_damage = 5
minbodytemp = 0
maxbodytemp = 500
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 0
melee_damage_lower = 30
melee_damage_upper = 30
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 03e178a74c1..baa84431bd6 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -430,7 +430,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/flamethrower
name = "Flamethrower"
- desc = "A flamethrower, fueled by a portion of highly flammable biotoxins stolen previously from Nanotrasen \
+ desc = "A flamethrower, fueled by a portion of highly flammable plasma stolen previously from Nanotrasen \
stations. Make a statement by roasting the filth in their own greed. Use with caution."
item = /obj/item/flamethrower/full/tank
cost = 4
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index fb03cb9c546..3965501f89b 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -9,7 +9,7 @@
/obj/item/cartridge/engineering = 10,
/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,
- /obj/item/cartridge/signal/toxins = 10,
+ /obj/item/cartridge/signal/ordnance = 10,
/obj/item/pda/heads = 10,
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm
index 466c1c4c428..75d09f64c50 100644
--- a/code/modules/vending/plasmaresearch.dm
+++ b/code/modules/vending/plasmaresearch.dm
@@ -1,6 +1,6 @@
//This one's from bay12
/obj/machinery/vending/plasmaresearch
- name = "\improper Toximate 3000"
+ name = "\improper Bombuddy 3000"
desc = "All the fine parts you need in one vending machine!"
products = list(/obj/item/clothing/under/rank/rnd/scientist = 6,
/obj/item/clothing/suit/bio_suit = 6,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 728ead5b4a7..7ee88aae5de 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -183,8 +183,8 @@
vend_reply = "Thank you for using the SciDrobe!"
products = list(/obj/item/clothing/accessory/pocketprotector = 3,
/obj/item/storage/backpack/science = 3,
- /obj/item/storage/backpack/satchel/tox = 3,
- /obj/item/storage/backpack/duffelbag/toxins = 3,
+ /obj/item/storage/backpack/satchel/science = 3,
+ /obj/item/storage/backpack/duffelbag/science = 3,
/obj/item/clothing/head/beret/science = 3,
/obj/item/clothing/head/beret/science/fancy = 3,
/obj/item/clothing/suit/hooded/wintercoat/science = 3,
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index f06b5df4d6958f2477ac277335e6191d1234de17..0d45300b5da9763dc9f415c83faeee5757653f9a 100755
GIT binary patch
delta 915
zcmV;E18n@ehX=lg2aqIxae7o(bVOxyV{&P5bZKvH004NLotI6I8a)ih&+sWm?G;tK
zu(0icOSM(ChxRK(nZzV19($S>DE;)$0X^(2yVH0OLIUacPaNB^osZ4eZ{MGPHcvmE
z=Ld)>Fg4re;nUrGb__QAX4|Zm^O=X>d_Mn4S!Zar%?FJENbN#@gb(wX4KX#_=6*ig
zMcu*q_Z3R~y8w`o=07JPnW5`ZXQ>%I>QqN#u521g!+<(aReHFcx$~_zgE=K&oJ70_8CSyl6-^hSBup^QZTColiv7Uu-slf}ZuLi@TipliWeu-yIvGivn(-)R9Osi(Whe+7lqMNain
z=OU+6KdXzJQoZcBqN5F(l+lzjXv}_s#_Q!|URLcPkyLSWBbus$#j;CjLg;CjGbOuFUFLvt#X-Jb;aC}{ukv9$$!yKPW_i%
zrzZYIIX&%g%%g5vcjE&!KG$}Jd+K0NQ&U}jnQm+jtzCp6vRW*SW@}YiNT4c7y2SlM62AS&1
z8bDNhfOwwsCf=_rwXD4xK$MfR_HO{O-t?jC^GO*H_>fq}S<`YrGnWnplc?Kx28|Hwjxn*A(Bep{KD?;}1K*dlC##Qws>g*a
zSd|!U5LB~NVg#}R5`*)Z0y&N&jcj#wg4fT97Mbn;!=>OH{I@=yr_3aXrl$Ol2(4et
pzWcOZy#6ldADeGKpPHv1&-4EP(&_`h5gV=n#enVUlu7AIkc}JXe3(FnnTX&!>;@EJs5Q+PA1|Qh5;M+{UwT|Na}O*&-Z_ye>P7)
zp63UMDKItL=HbiTe0B^r`)1p$mh+j1;Cw#+Nm*xTw#_Gv0Z8qCLWEEAnGG>D+va{g
z+eO{M`S%q{{C@!;AV7PGRJ!Awa6@5o2`w7
z_I0$FJwkm+!#Dze4ZO8ptY0hY>1P;iJ^Ku!9Z9~y_N&EeASswt0!sA@YGJ1f<}q&O
zIj5d;vu&2^#ka*!8H;lQ@5y3eW1)TB8PK(0Em&^<12by%1>b1_BPpl5$iD@3)J0B7
zM%B;iBBxX@JFe(xgC=D(r3@OgpP=zNy87`id=PKpwb=`Qvcqe$59D-jrrj_foWO?Q
zd>URS9D3AL9o*4EnP*9}f`>Jm*s{6&&=VcAztbn*UuMAJzf1st1Bj2nZ
zo%|#_FK^#}cXTiu)Al-QJf%=Cvat}@a}%u3ivzfxF9Wz9uUCUt3K$Ge7@t$t@es%f
zz*6r{5gZUiox=f?;qkUN==z(*@?n^+a?^`3rE9BPW>#G>H)Q`sc|-1Bw39RcW!I^B
ze^E}(`XlJQVEQ;ha6TglMv!AjUb(0#!$|cS4nGKg$#)@Va8kJQb(WpR)=7&=f<
z2Wt74e1Ngx`;8`LCP@2G_tcqhu|Vpz0mU~+cDt%3kU~Dx?@Eiz*7$%ZG{YcMeOUvD
ziVqOaQ{Keub)}XycLRuWQr7$pAl6$xbbUT40|Fls%Q#C~buj)o8kT8EORA4_r=D1{
zQWwa7D#Mf`*N>q?Cwk=4pz|M}EB{dk`L0a14Xz~e4;D*yn4paZv{0|6eujl#Y0
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index f7d3cf068e75932b7539cd28902d620e0ca9f929..97110a4c1b011b4c8c2577a9ef1698ddff8f9c4d 100644
GIT binary patch
literal 136525
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