From 324cb1f12d55436c933e7196f4403869322da676 Mon Sep 17 00:00:00 2001 From: Rykka Date: Wed, 26 Aug 2020 18:20:11 -0400 Subject: [PATCH 1/3] Replace "Sleeping Agent" with Nitrous Oxide This makes it identical to it's real-life counterpart, and brings some actual sprite improvements upstream from Virgo. Earlyport of https://github.com/VOREStation/VOREStation/pull/8812 with an actual rename of the gas, ID, and sprite used. --- .../components/omni_devices/_omni_extras.dm | 2 +- .../components/trinary_devices/filter.dm | 4 ++-- .../components/unary/vent_scrubber.dm | 8 ++++---- code/ATMOSPHERICS/pipes/tank.dm | 2 +- code/datums/supplypacks/atmospherics.dm | 2 +- code/defines/gases.dm | 8 ++++---- code/game/machinery/air_alarm.dm | 2 +- code/game/machinery/atmoalter/canister.dm | 12 ++++++------ code/game/machinery/atmoalter/scrubber.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- .../objects/items/weapons/tanks/tank_types.dm | 2 +- code/game/turfs/flooring/flooring_premade.dm | 2 +- code/modules/clothing/masks/gasmask.dm | 6 +++--- code/modules/events/atmos_leak.dm | 4 ++-- .../event2/events/engineering/gas_leak.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 8 ++++---- .../engineering/supermatter_monitor.dm | 2 +- .../projectiles/guns/magnetic/gasthrower.dm | 2 +- .../xenoarcheaology/effects/gassleeping.dm | 4 ++-- icons/effects/tile_effects.dmi | Bin 1032 -> 15408 bytes maps/northern_star/polaris-1.dmm | 6 +++--- maps/northern_star/polaris-2.dmm | 2 +- maps/northern_star/polaris-5.dmm | 6 +++--- maps/southern_cross/southern_cross-1.dmm | 2 +- maps/southern_cross/southern_cross-4.dmm | 4 ++-- maps/southern_cross/southern_cross-6.dmm | 2 +- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm index fc25eae3b7..1a357327fb 100644 --- a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm +++ b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm @@ -103,7 +103,7 @@ if(ATM_P) return "phoron" if(ATM_N2O) - return "sleeping_agent" + return "nitrous_oxide" else return null \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index bde060a11a..7b2471d08a 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -51,7 +51,7 @@ if(3) //removing CO2 filtered_out = list("carbon_dioxide") if(4)//removing N2O - filtered_out = list("sleeping_agent") + filtered_out = list("nitrous_oxide") air1.volume = ATMOS_DEFAULT_VOLUME_FILTER air2.volume = ATMOS_DEFAULT_VOLUME_FILTER @@ -177,7 +177,7 @@ if(3) //removing CO2 filtered_out += "carbon_dioxide" if(4)//removing N2O - filtered_out += "sleeping_agent" + filtered_out += "nitrous_oxide" if (href_list["temp"]) src.temp = null diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm index 2c51eecfc6..1443b296d0 100644 --- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm @@ -107,7 +107,7 @@ "filter_n2" = ("nitrogen" in scrubbing_gas), "filter_co2" = ("carbon_dioxide" in scrubbing_gas), "filter_phoron" = ("phoron" in scrubbing_gas), - "filter_n2o" = ("sleeping_agent" in scrubbing_gas), + "filter_n2o" = ("nitrous_oxide" in scrubbing_gas), "filter_fuel" = ("volatile_fuel" in scrubbing_gas), "sigtype" = "status" ) @@ -230,10 +230,10 @@ else if(signal.data["toggle_tox_scrub"]) toggle += "phoron" - if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("sleeping_agent" in scrubbing_gas)) - toggle += "sleeping_agent" + if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("nitrous_oxide" in scrubbing_gas)) + toggle += "nitrous_oxide" else if(signal.data["toggle_n2o_scrub"]) - toggle += "sleeping_agent" + toggle += "nitrous_oxide" if(!isnull(signal.data["fuel_scrub"]) && text2num(signal.data["fuel_scrub"]) != ("volatile_fuel" in scrubbing_gas)) toggle += "volatile_fuel" diff --git a/code/ATMOSPHERICS/pipes/tank.dm b/code/ATMOSPHERICS/pipes/tank.dm index d77474054e..355a3d253a 100644 --- a/code/ATMOSPHERICS/pipes/tank.dm +++ b/code/ATMOSPHERICS/pipes/tank.dm @@ -156,7 +156,7 @@ air_temporary.volume = volume air_temporary.temperature = T0C - air_temporary.adjust_gas("sleeping_agent", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) + air_temporary.adjust_gas("nitrous_oxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature)) ..() icon_state = "n2o" diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index fb5d4a0e59..319b1de9e6 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -56,7 +56,7 @@ containername = "N2O gas canister crate" containertype = /obj/structure/closet/crate/secure/large/aether access = access_atmospherics - contains = list(/obj/machinery/portable_atmospherics/canister/sleeping_agent) + contains = list(/obj/machinery/portable_atmospherics/canister/nitrous_oxide) /datum/supply_pack/atmos/canister_carbon_dioxide name = "Carbon dioxide gas canister" diff --git a/code/defines/gases.dm b/code/defines/gases.dm index 14b5e3a7c0..8b56b5bf45 100644 --- a/code/defines/gases.dm +++ b/code/defines/gases.dm @@ -43,12 +43,12 @@ flags = XGM_GAS_FUEL -/decl/xgm_gas/sleeping_agent - id = "sleeping_agent" - name = "Sleeping Agent" +/decl/xgm_gas/nitrous_oxide + id = "nitrous_oxide" + name = "Nitrous Oxide" specific_heat = 40 // J/(mol*K) molar_mass = 0.044 // kg/mol. N2O - tile_overlay = "sleeping_agent" + tile_overlay = "nitrous_oxide" overlay_limit = 1 flags = XGM_GAS_OXIDIZER \ No newline at end of file diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm index b45d00c3f7..df5059b674 100644 --- a/code/game/machinery/air_alarm.dm +++ b/code/game/machinery/air_alarm.dm @@ -66,7 +66,7 @@ var/datum/radio_frequency/radio_connection var/list/TLV = list() - var/list/trace_gas = list("sleeping_agent", "volatile_fuel") //list of other gases that this air alarm is able to detect + var/list/trace_gas = list("nitrous_oxide", "volatile_fuel") //list of other gases that this air alarm is able to detect var/danger_level = 0 var/pressure_dangerlevel = 0 diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 3a012a1ccd..aefa6d6c38 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -26,7 +26,7 @@ /obj/machinery/portable_atmospherics/canister/drain_power() return -1 -/obj/machinery/portable_atmospherics/canister/sleeping_agent +/obj/machinery/portable_atmospherics/canister/nitrous_oxide name = "Canister: \[N2O\]" icon_state = "redws" canister_color = "redws" @@ -88,7 +88,7 @@ name = "Canister \[CO2\]" icon_state = "black" canister_color = "black" -/obj/machinery/portable_atmospherics/canister/empty/sleeping_agent +/obj/machinery/portable_atmospherics/canister/empty/nitrous_oxide name = "Canister \[N2O\]" icon_state = "redws" canister_color = "redws" @@ -387,17 +387,17 @@ update_flag src.update_icon() return 1 -/obj/machinery/portable_atmospherics/canister/sleeping_agent/New() +/obj/machinery/portable_atmospherics/canister/nitrous_oxide/New() ..() - air_contents.adjust_gas("sleeping_agent", MolesForPressure()) + air_contents.adjust_gas("nitrous_oxide", MolesForPressure()) src.update_icon() return 1 //Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0 -/obj/machinery/portable_atmospherics/canister/sleeping_agent/roomfiller/Initialize() +/obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize() . = ..() - air_contents.gas["sleeping_agent"] = 9*4000 + air_contents.gas["nitrous_oxide"] = 9*4000 var/turf/simulated/location = src.loc if (istype(src.loc)) location.assume_air(air_contents) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 879551493d..052cea472f 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -18,7 +18,7 @@ var/minrate = 0 var/maxrate = 10 * ONE_ATMOSPHERE - var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "sleeping_agent", "volatile_fuel") + var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "nitrous_oxide", "volatile_fuel") /obj/machinery/portable_atmospherics/powered/scrubber/New() ..() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 1497e4e7a0..c522b4300e 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -113,7 +113,7 @@ triggered = 1 for (var/turf/simulated/floor/target in range(1,src)) if(!target.blocks_air) - target.assume_gas("sleeping_agent", 30) + target.assume_gas("nitrous_oxide", 30) visible_message("\The [src.name] detonates!") spawn(0) qdel(src) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index a838bf6c03..d067d2d486 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -45,7 +45,7 @@ . = ..() air_contents.gas["oxygen"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD - air_contents.gas["sleeping_agent"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD + air_contents.gas["nitrous_oxide"] = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD air_contents.update_values() /* diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index dbdd4286ce..a81971060d 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -247,7 +247,7 @@ /turf/simulated/floor/reinforced/n20/Initialize() . = ..() if(!air) make_air() - air.adjust_gas("sleeping_agent", ATMOSTANK_NITROUSOXIDE) + air.adjust_gas("nitrous_oxide", ATMOSTANK_NITROUSOXIDE) /turf/simulated/floor/cult name = "engraved floor" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index fceca9600b..594600b601 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,7 +11,7 @@ permeability_coefficient = 0.01 siemens_coefficient = 0.9 var/gas_filter_strength = 1 //For gas mask filters - var/list/filtered_gases = list("phoron", "sleeping_agent") + var/list/filtered_gases = list("phoron", "nitrous_oxide") armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 75, rad = 0) /obj/item/clothing/mask/gas/filter_air(datum/gas_mixture/air) @@ -65,7 +65,7 @@ flags = PHORONGUARD item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT species_restricted = list(SPECIES_VOX) - filtered_gases = list("oxygen", "sleeping_agent") + filtered_gases = list("oxygen", "nitrous_oxide") var/mask_open = FALSE // Controls if the Vox can eat through this mask action_button_name = "Toggle Feeding Port" @@ -92,7 +92,7 @@ //body_parts_covered = 0 species_restricted = list(SPECIES_ZADDAT) flags_inv = HIDEEARS //semi-transparent - filtered_gases = list("phoron", "nitrogen", "sleeping_agent") + filtered_gases = list("phoron", "nitrogen", "nitrous_oxide") /obj/item/clothing/mask/gas/syndicate name = "tactical mask" diff --git a/code/modules/events/atmos_leak.dm b/code/modules/events/atmos_leak.dm index a3bc517be4..9b0bfc4d4a 100644 --- a/code/modules/events/atmos_leak.dm +++ b/code/modules/events/atmos_leak.dm @@ -1,5 +1,5 @@ // -// This event causes a gas leak of phoron, sleeping_agent, or carbon_dioxide in a random unoccupied area. +// This event causes a gas leak of phoron, nitrous_oxide, or carbon_dioxide in a random unoccupied area. // One wonders, where did the gas come from? Who knows! Its SPACE! But if you want something a touch // more "explainable" then check out the canister_leak event instead. // @@ -19,7 +19,7 @@ // Decide which area will be targeted! /datum/event/atmos_leak/setup() - var/gas_choices = list("carbon_dioxide", "sleeping_agent") // Annoying + var/gas_choices = list("carbon_dioxide", "nitrous_oxide") // Annoying if(severity >= EVENT_LEVEL_MODERATE) gas_choices += "phoron" // Dangerous if(severity >= EVENT_LEVEL_MAJOR) diff --git a/code/modules/gamemaster/event2/events/engineering/gas_leak.dm b/code/modules/gamemaster/event2/events/engineering/gas_leak.dm index fb8dc41f86..b0c52d6e07 100644 --- a/code/modules/gamemaster/event2/events/engineering/gas_leak.dm +++ b/code/modules/gamemaster/event2/events/engineering/gas_leak.dm @@ -15,7 +15,7 @@ /datum/event2/event/gas_leak - var/potential_gas_choices = list("carbon_dioxide", "sleeping_agent", "phoron", "volatile_fuel") + var/potential_gas_choices = list("carbon_dioxide", "nitrous_oxide", "phoron", "volatile_fuel") var/chosen_gas = null var/turf/chosen_turf = null diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 613d44c372..ad307cb5b0 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -476,7 +476,7 @@ throw_alert("oxy", /obj/screen/alert/not_enough_co2) if("volatile_fuel") throw_alert("oxy", /obj/screen/alert/not_enough_fuel) - if("sleeping_agent") + if("nitrous_oxide") throw_alert("oxy", /obj/screen/alert/not_enough_n2o) else @@ -528,8 +528,8 @@ clear_alert("tox_in_air") // If there's some other shit in the air lets deal with it here. - if(breath.gas["sleeping_agent"]) - var/SA_pp = (breath.gas["sleeping_agent"] / breath.total_moles) * breath_pressure + if(breath.gas["nitrous_oxide"]) + var/SA_pp = (breath.gas["nitrous_oxide"] / breath.total_moles) * breath_pressure // Enough to make us paralysed for a bit if(SA_pp > SA_para_min) @@ -545,7 +545,7 @@ else if(SA_pp > 0.15) if(prob(20)) spawn(0) emote(pick("giggle", "laugh")) - breath.adjust_gas("sleeping_agent", -breath.gas["sleeping_agent"]/6, update = 0) //update after + breath.adjust_gas("nitrous_oxide", -breath.gas["nitrous_oxide"]/6, update = 0) //update after // Were we able to breathe? if (failed_inhale || failed_exhale) diff --git a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm index 421bb65047..9f8e57da60 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm @@ -84,7 +84,7 @@ data["SM_gas_CO2"] = round(100*air.gas["carbon_dioxide"]/air.total_moles,0.01) data["SM_gas_N2"] = round(100*air.gas["nitrogen"]/air.total_moles,0.01) data["SM_gas_PH"] = round(100*air.gas["phoron"]/air.total_moles,0.01) - data["SM_gas_N2O"] = round(100*air.gas["sleeping_agent"]/air.total_moles,0.01) + data["SM_gas_N2O"] = round(100*air.gas["nitrous_oxide"]/air.total_moles,0.01) else data["SM_gas_O2"] = 0 data["SM_gas_CO2"] = 0 diff --git a/code/modules/projectiles/guns/magnetic/gasthrower.dm b/code/modules/projectiles/guns/magnetic/gasthrower.dm index 8132644bf9..d729719c32 100644 --- a/code/modules/projectiles/guns/magnetic/gasthrower.dm +++ b/code/modules/projectiles/guns/magnetic/gasthrower.dm @@ -37,7 +37,7 @@ var/phoron_amt = Tank.air_contents.gas["phoron"] var/co2_amt = Tank.air_contents.gas["carbon_dioxide"] var/oxy_amt = Tank.air_contents.gas["oxygen"] - var/n2o_amt = Tank.air_contents.gas["sleeping_agent"] + var/n2o_amt = Tank.air_contents.gas["nitrous_oxide"] if(isnull(co2_amt)) co2_amt = 0 diff --git a/code/modules/xenoarcheaology/effects/gassleeping.dm b/code/modules/xenoarcheaology/effects/gassleeping.dm index 8537880438..3c12f8f91c 100644 --- a/code/modules/xenoarcheaology/effects/gassleeping.dm +++ b/code/modules/xenoarcheaology/effects/gassleeping.dm @@ -10,10 +10,10 @@ if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) - holder_loc.assume_gas("sleeping_agent", rand(2, 15)) + holder_loc.assume_gas("nitrous_oxide", rand(2, 15)) /datum/artifact_effect/gassleeping/DoEffectAura() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) - holder_loc.assume_gas("sleeping_agent", pick(0, 0, 0.1, rand())) + holder_loc.assume_gas("nitrous_oxide", pick(0, 0, 0.1, rand())) diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi index 8529bdc816f48989c9ba7bfbb6a1403330115c80..6674aa75e903e51683492323eb7b89a709b89e31 100644 GIT binary patch literal 15408 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 Date: Wed, 26 Aug 2020 18:21:11 -0400 Subject: [PATCH 2/3] Updates a comment --- code/ATMOSPHERICS/components/trinary_devices/filter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 7b2471d08a..af735b0c09 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -24,7 +24,7 @@ 1: Oxygen: Oxygen ONLY 2: Nitrogen: Nitrogen ONLY 3: Carbon Dioxide: Carbon Dioxide ONLY - 4: Sleeping Agent (N2O) + 4: Nitrous Oxide (Formerly called Sleeping Agent) (N2O) */ var/filter_type = -1 var/list/filtered_out = list() From 4f93a3b7a862f129c38e389cce454ae966729cfc Mon Sep 17 00:00:00 2001 From: Rykka Date: Thu, 27 Aug 2020 21:46:08 -0400 Subject: [PATCH 3/3] Fix tags --- code/datums/supplypacks/atmospherics.dm | 2 +- maps/southern_cross/southern_cross-1.dmm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 319b1de9e6..3630b9bea0 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -50,7 +50,7 @@ access = access_atmospherics contains = list(/obj/machinery/portable_atmospherics/canister/phoron) -/datum/supply_pack/atmos/canister_sleeping_agent +/datum/supply_pack/atmos/canister_nitrous_oxide name = "N2O gas canister" cost = 15 containername = "N2O gas canister crate" diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index b7019f9430..9ead71a710 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -3511,8 +3511,8 @@ "bpH" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/obj/machinery/atmospherics/binary/pump,/turf/simulated/floor/tiled,/area/engineering/atmos) "bpI" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) "bpJ" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "CO2 to Mixing"},/turf/simulated/floor/tiled,/area/engineering/atmos) -"bpK" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Starboard"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) -"bpL" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/tiled,/area/engineering/atmos) +"bpK" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Starboard"; dir = 8},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) +"bpL" = (/obj/machinery/atmospherics/pipe/simple/visible/green,/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/simulated/floor/tiled,/area/engineering/atmos) "bpM" = (/obj/machinery/atmospherics/pipe/manifold/visible/green{dir = 1},/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "atmoslockdown"; name = "Atmospherics Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/engineering/atmos) "bpN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/valve/digital{dir = 4; name = "CO2 Outlet Valve"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Port"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) "bpO" = (/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos) @@ -4200,7 +4200,7 @@ "bCU" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/storage) "bCV" = (/obj/machinery/portable_atmospherics/canister/phoron,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/storage) "bCW" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/sign/warning/nosmoking_2{pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/rnd/storage) -"bCX" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/storage) +"bCX" = (/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/dark,/area/rnd/storage) "bCY" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/tiled/dark,/area/rnd/storage) "bCZ" = (/obj/machinery/mass_driver{dir = 1; id = "toxinsdriver"},/turf/simulated/floor/airless,/area/rnd/toxins_launch) "bDa" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/disposalpipe/trunk{dir = 4},/obj/structure/disposaloutlet{dir = 8},/turf/simulated/floor/plating,/area/rnd/toxins_launch)