diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 9efe0641602..e577051f204 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -911,6 +911,6 @@ reqs = list(/obj/item/stack/sheet/mineral/metal_hydrogen = 10, /obj/item/grenade/gas_crystal/healium_crystal = 1, /obj/item/grenade/gas_crystal/proto_nitrate_crystal = 1, - /obj/item/grenade/gas_crystal/cyrion_b_crystal = 1 + /obj/item/grenade/gas_crystal/zauker_crystal = 1 ) category = CAT_MISC diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm index b05b72c8a32..091c63cf7a7 100644 --- a/code/game/objects/items/grenades/atmos_grenades.dm +++ b/code/game/objects/items/grenades/atmos_grenades.dm @@ -29,10 +29,10 @@ ///Amount of Oxygen gas released (close to the grenade) var/o2_gas_amount = 100 -/obj/item/grenade/gas_crystal/cyrion_b_crystal - name = "Cyrion B crystal" - desc = "A crystal made from the Cyrion B Gas, you can see the liquid plasma inside." - icon_state = "cyrion_b_crystal" +/obj/item/grenade/gas_crystal/zauker_crystal + name = "Zauker crystal" + desc = "A crystal made from the Zauker Gas, you can see the liquid plasma inside." + icon_state = "zauker_crystal" ex_dev = 1 ex_heavy = 2 ex_light = 4 @@ -89,7 +89,7 @@ floor_loc.air_update_turf() qdel(src) -/obj/item/grenade/gas_crystal/cyrion_b_crystal/prime(mob/living/lanced_by) +/obj/item/grenade/gas_crystal/zauker_crystal/prime(mob/living/lanced_by) . = ..() update_mob() qdel(src) diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index a700007ad73..7725c2bfa10 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -188,12 +188,12 @@ GLOBAL_LIST_INIT(nonreactive_gases, typecacheof(list(/datum/gas/oxygen, /datum/g moles_visible = MOLES_GAS_VISIBLE rarity = 100 -/datum/gas/cyrion_b - id = "cyrion_b" +/datum/gas/zauker + id = "zauker" specific_heat = 350 - name = "Cyrion B" + name = "Zauker" dangerous = TRUE - gas_overlay = "cyrion_b" + gas_overlay = "zauker" moles_visible = MOLES_GAS_VISIBLE rarity = 100 diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index e6e1b3c1801..1bee9cbe8b3 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -18,15 +18,15 @@ stimball = 7 ammoniacrystals = 8 hexane_plasma_filtering = 9 hexane_n2o_filtering = 10 -cyrion_b_decomp = 11 +zauker_decomp = 11 healium_production = 12 proto_nitrate_production = 13 -cyrion_b_production = 14 +zauker_production = 14 halon_formation = 15 hexane_formation = 16 healium_crystal_production = 17 proto_nitrate_crystal_production = 18 -cyrion_b_crystal_production = 19 +zauker_crystal_production = 19 proto_nitrate_response = 20 - 25 fusion = 26 metallic_hydrogen = 27 @@ -943,12 +943,12 @@ nobiliumsuppression = INFINITY air.temperature = max(((temperature * old_heat_capacity + energy_used) / new_heat_capacity), TCMB) return REACTING -/datum/gas_reaction/cyrion_b_formation +/datum/gas_reaction/zauker_formation priority = 14 - name = "Cyrion B formation" - id = "cyrion_b_formation" + name = "Zauker formation" + id = "zauker_formation" -/datum/gas_reaction/cyrion_b_formation/init_reqs() +/datum/gas_reaction/zauker_formation/init_reqs() min_requirements = list( /datum/gas/hypernoblium = MINIMUM_MOLE_COUNT, /datum/gas/stimulum = MINIMUM_MOLE_COUNT, @@ -956,18 +956,18 @@ nobiliumsuppression = INFINITY "MAX_TEMP" = 75000 ) -/datum/gas_reaction/cyrion_b_formation/react(datum/gas_mixture/air, datum/holder) +/datum/gas_reaction/zauker_formation/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases var/temperature = air.temperature var/old_heat_capacity = air.heat_capacity() var/heat_efficency = min(temperature * 0.000005, cached_gases[/datum/gas/hypernoblium][MOLES], cached_gases[/datum/gas/stimulum][MOLES]) var/energy_used = heat_efficency * 5000 - ASSERT_GAS(/datum/gas/cyrion_b, air) + ASSERT_GAS(/datum/gas/zauker, air) if ((cached_gases[/datum/gas/hypernoblium][MOLES] - heat_efficency * 0.01 < 0 ) || (cached_gases[/datum/gas/stimulum][MOLES] - heat_efficency * 0.5 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION cached_gases[/datum/gas/hypernoblium][MOLES] -= heat_efficency * 0.01 cached_gases[/datum/gas/stimulum][MOLES] -= heat_efficency * 0.5 - cached_gases[/datum/gas/cyrion_b][MOLES] += heat_efficency * 0.5 + cached_gases[/datum/gas/zauker][MOLES] += heat_efficency * 0.5 if(energy_used) var/new_heat_capacity = air.heat_capacity() @@ -1069,27 +1069,27 @@ nobiliumsuppression = INFINITY air.temperature = max(((temperature * old_heat_capacity + energy_used) / new_heat_capacity), TCMB) return REACTING -/datum/gas_reaction/cyrion_b_decomp +/datum/gas_reaction/zauker_decomp priority = 11 - name = "Cyrion B decomposition" - id = "cyrion_b_decomp" + name = "Zauker decomposition" + id = "zauker_decomp" -/datum/gas_reaction/cyrion_b_decomp/init_reqs() +/datum/gas_reaction/zauker_decomp/init_reqs() min_requirements = list( /datum/gas/nitrogen = MINIMUM_MOLE_COUNT, - /datum/gas/cyrion_b = MINIMUM_MOLE_COUNT + /datum/gas/zauker = MINIMUM_MOLE_COUNT ) -/datum/gas_reaction/cyrion_b_decomp/react(datum/gas_mixture/air, datum/holder) +/datum/gas_reaction/zauker_decomp/react(datum/gas_mixture/air, datum/holder) var/energy_released = 0 var/old_heat_capacity = air.heat_capacity() var/list/cached_gases = air.gases //this speeds things up because accessing datum vars is slow var/temperature = air.temperature var/burned_fuel = 0 - burned_fuel = min(20, cached_gases[/datum/gas/nitrogen][MOLES], cached_gases[/datum/gas/cyrion_b][MOLES]) - if(cached_gases[/datum/gas/cyrion_b][MOLES] - burned_fuel < 0) + burned_fuel = min(20, cached_gases[/datum/gas/nitrogen][MOLES], cached_gases[/datum/gas/zauker][MOLES]) + if(cached_gases[/datum/gas/zauker][MOLES] - burned_fuel < 0) return NO_REACTION - cached_gases[/datum/gas/cyrion_b][MOLES] -= burned_fuel + cached_gases[/datum/gas/zauker][MOLES] -= burned_fuel if(burned_fuel) energy_released += (460 * burned_fuel) @@ -1177,20 +1177,20 @@ nobiliumsuppression = INFINITY air.temperature = (temperature * old_heat_capacity + energy_released) / new_heat_capacity return REACTING -/datum/gas_reaction/cyrion_b_crystal_formation +/datum/gas_reaction/zauker_crystal_formation priority = 19 - name = "cyrion_b crystal formation" - id = "cyrion_b_crystal_formation" + name = "zauker crystal formation" + id = "zauker_crystal_formation" -/datum/gas_reaction/cyrion_b_crystal_formation/init_reqs() +/datum/gas_reaction/zauker_crystal_formation/init_reqs() min_requirements = list( /datum/gas/plasma = 50, - /datum/gas/cyrion_b = 10, + /datum/gas/zauker = 10, "TEMP" = 270, "MAX_TEMP" = 280 ) -/datum/gas_reaction/cyrion_b_crystal_formation/react(datum/gas_mixture/air, datum/holder) +/datum/gas_reaction/zauker_crystal_formation/react(datum/gas_mixture/air, datum/holder) var/energy_released = 0 var/old_heat_capacity = air.heat_capacity() var/list/cached_gases = air.gases @@ -1199,13 +1199,13 @@ nobiliumsuppression = INFINITY return NO_REACTION var/turf/open/location = holder var/consumed_fuel = 0 - consumed_fuel = min(cached_gases[/datum/gas/cyrion_b][MOLES] * 0.1, 20 * (temperature * 0.02)) - if ((cached_gases[/datum/gas/cyrion_b][MOLES] - consumed_fuel * 0.05 < 0 ) || (cached_gases[/datum/gas/plasma][MOLES] - consumed_fuel * 5 < 0)) //Shouldn't produce gas from nothing. + consumed_fuel = min(cached_gases[/datum/gas/zauker][MOLES] * 0.1, 20 * (temperature * 0.02)) + if ((cached_gases[/datum/gas/zauker][MOLES] - consumed_fuel * 0.05 < 0 ) || (cached_gases[/datum/gas/plasma][MOLES] - consumed_fuel * 5 < 0)) //Shouldn't produce gas from nothing. return NO_REACTION cached_gases[/datum/gas/plasma][MOLES] -= consumed_fuel * 5 - cached_gases[/datum/gas/cyrion_b][MOLES] -= consumed_fuel * 0.05 + cached_gases[/datum/gas/zauker][MOLES] -= consumed_fuel * 0.05 if(prob(10 * consumed_fuel)) - new /obj/item/grenade/gas_crystal/cyrion_b_crystal(location) + new /obj/item/grenade/gas_crystal/zauker_crystal(location) energy_released += consumed_fuel * 800 if(energy_released) var/new_heat_capacity = air.heat_capacity() @@ -1379,23 +1379,23 @@ nobiliumsuppression = INFINITY air.temperature = (temperature * old_heat_capacity + energy_released) / new_heat_capacity return REACTING -/datum/gas_reaction/proto_nitrate_cyrion_b_response +/datum/gas_reaction/proto_nitrate_zauker_response priority = 25 - name = "Proto Nitrate Cyrion B response" - id = "proto_nitrate_cyrion_b_response" + name = "Proto Nitrate Zauker response" + id = "proto_nitrate_zauker_response" -/datum/gas_reaction/proto_nitrate_cyrion_b_response/init_reqs() +/datum/gas_reaction/proto_nitrate_zauker_response/init_reqs() min_requirements = list( /datum/gas/proto_nitrate = MINIMUM_MOLE_COUNT, - /datum/gas/cyrion_b = MINIMUM_MOLE_COUNT, + /datum/gas/zauker = MINIMUM_MOLE_COUNT, "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST ) -/datum/gas_reaction/proto_nitrate_cyrion_b_response/react(datum/gas_mixture/air, datum/holder) +/datum/gas_reaction/proto_nitrate_zauker_response/react(datum/gas_mixture/air, datum/holder) var/list/cached_gases = air.gases var/turf/open/location = isturf(holder) ? holder : null - var max_power = min(5, cached_gases[/datum/gas/cyrion_b][MOLES]) - cached_gases[/datum/gas/cyrion_b][MOLES] = 0 + var max_power = min(5, cached_gases[/datum/gas/zauker][MOLES]) + cached_gases[/datum/gas/zauker][MOLES] = 0 explosion(location, max_power * 0.55, max_power * 0.95, max_power * 1.25, max_power* 3) return REACTING diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 4ff36e8d798..805d27dd9b4 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -104,7 +104,7 @@ /datum/gas/hydrogen = new/datum/tlv/dangerous, /datum/gas/healium = new/datum/tlv/dangerous, /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/cyrion_b = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, /datum/gas/halon = new/datum/tlv/dangerous, /datum/gas/hexane = new/datum/tlv/dangerous ) @@ -130,7 +130,7 @@ /datum/gas/hydrogen = new/datum/tlv/no_checks, /datum/gas/healium = new/datum/tlv/dangerous, /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/cyrion_b = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, /datum/gas/halon = new/datum/tlv/dangerous, /datum/gas/hexane = new/datum/tlv/dangerous ) @@ -156,7 +156,7 @@ /datum/gas/hydrogen = new/datum/tlv/dangerous, /datum/gas/healium = new/datum/tlv/dangerous, /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/cyrion_b = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, /datum/gas/halon = new/datum/tlv/dangerous, /datum/gas/hexane = new/datum/tlv/dangerous ) @@ -549,7 +549,7 @@ /datum/gas/hydrogen, /datum/gas/healium, /datum/gas/proto_nitrate, - /datum/gas/cyrion_b, + /datum/gas/zauker, /datum/gas/halon, /datum/gas/hexane, ), diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 84fefa3fc2f..257ee962522 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -67,7 +67,7 @@ "hydrogen" = /obj/machinery/portable_atmospherics/canister/hydrogen, "healium" = /obj/machinery/portable_atmospherics/canister/healium, "proto_nitrate" = /obj/machinery/portable_atmospherics/canister/proto_nitrate, - "cyrion_b" = /obj/machinery/portable_atmospherics/canister/cyrion_b, + "zauker" = /obj/machinery/portable_atmospherics/canister/zauker, "halon" = /obj/machinery/portable_atmospherics/canister/halon, "hexane" = /obj/machinery/portable_atmospherics/canister/hexane ) @@ -215,12 +215,12 @@ gas_type = /datum/gas/proto_nitrate filled = 1 -/obj/machinery/portable_atmospherics/canister/cyrion_b - name = "Cyrion B canister" - desc = "Cyrion B, highly toxic" - icon_state = "cyrion_b" - base_icon_state = "cyrion_b" - gas_type = /datum/gas/cyrion_b +/obj/machinery/portable_atmospherics/canister/zauker + name = "Zauker canister" + desc = "Zauker, highly toxic" + icon_state = "zauker" + base_icon_state = "zauker" + gas_type = /datum/gas/zauker filled = 1 /obj/machinery/portable_atmospherics/canister/halon diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 00f6f022023..a9950425c69 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -26,7 +26,7 @@ /datum/gas/hydrogen, /datum/gas/healium, /datum/gas/proto_nitrate, - /datum/gas/cyrion_b, + /datum/gas/zauker, /datum/gas/halon, /datum/gas/hexane, ) diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index 2d248780642..6ec21b297bd 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -34,11 +34,11 @@ description = "Our R&D department is working on the development of more efficient electrical batteries using hydrogen as a catalyst. Ship us a tank full of it. (20 Moles)" gas_type = /datum/gas/hydrogen -/datum/bounty/item/engineering/gas/cyrion_b_tank - name = "Full Tank of Cyrion-B" - description = "The main planet of \[REDACTED] has been chosen as testing grounds for the new weapon that uses Cyrion-B gas. Ship us a tank full of it. (20 Moles)" +/datum/bounty/item/engineering/gas/zauker_tank + name = "Full Tank of Zauker" + description = "The main planet of \[REDACTED] has been chosen as testing grounds for the new weapon that uses Zauker gas. Ship us a tank full of it. (20 Moles)" reward = 10000 - gas_type = /datum/gas/cyrion_b + gas_type = /datum/gas/zauker /datum/bounty/item/engineering/emitter name = "Emitter" diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index fe4c65de21f..2f2becf87a0 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -120,7 +120,7 @@ /datum/gas/hydrogen, /datum/gas/healium, /datum/gas/proto_nitrate, - /datum/gas/cyrion_b, + /datum/gas/zauker, /datum/gas/halon, /datum/gas/hexane ) @@ -135,7 +135,7 @@ worth += gases[/datum/gas/hydrogen][MOLES]*1 worth += gases[/datum/gas/healium][MOLES]*19 worth += gases[/datum/gas/proto_nitrate][MOLES]*5 - worth += gases[/datum/gas/cyrion_b][MOLES]*1050 + worth += gases[/datum/gas/zauker][MOLES]*1050 worth += gases[/datum/gas/halon][MOLES]*9 worth += gases[/datum/gas/hexane][MOLES]*6 return worth diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 75e9b9dfc5a..b8f5cddd4e4 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -24,7 +24,7 @@ #define HYDROGEN_HEAT_PENALTY 10 // similar heat penalty as tritium (dangerous) #define HEALIUM_HEAT_PENALTY 4 #define PROTO_NITRATE_HEAT_PENALTY -3 -#define CYRION_B_HEAT_PENALTY 8 +#define ZAUKER_HEAT_PENALTY 8 //All of these get divided by 10-bzcomp * 5 before having 1 added and being multiplied with power to determine rads //Keep the negative values here above -10 and we won't get negative rads @@ -37,7 +37,7 @@ #define HYDROGEN_TRANSMIT_MODIFIER 25 //increase the radiation emission, but less than the trit (2.5) #define HEALIUM_TRANSMIT_MODIFIER 2.4 #define PROTO_NITRATE_TRANSMIT_MODIFIER 15 -#define CYRION_B_TRANSMIT_MODIFIER 20 +#define ZAUKER_TRANSMIT_MODIFIER 20 #define BZ_RADIOACTIVITY_MODIFIER 5 //Improves the effect of transmit modifiers @@ -167,7 +167,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /datum/gas/hydrogen, /datum/gas/healium, /datum/gas/proto_nitrate, - /datum/gas/cyrion_b, + /datum/gas/zauker, ) ///The list of gases mapped against their current comp. We use this to calculate different values the supermatter uses, like power or heat resistance. It doesn't perfectly match the air around the sm, instead moving up at a rate determined by gas_change_rate per call. Ranges from 0 to 1 var/list/gas_comp = list( @@ -184,7 +184,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /datum/gas/hydrogen = 0, /datum/gas/healium = 0, /datum/gas/proto_nitrate = 0, - /datum/gas/cyrion_b = 0, + /datum/gas/zauker = 0, ) ///The list of gases mapped against their transmit values. We use it to determine the effect different gases have on radiation var/list/gas_trans = list( @@ -197,7 +197,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /datum/gas/hydrogen = HYDROGEN_TRANSMIT_MODIFIER, /datum/gas/healium = HEALIUM_TRANSMIT_MODIFIER, /datum/gas/proto_nitrate = PROTO_NITRATE_TRANSMIT_MODIFIER, - /datum/gas/cyrion_b = CYRION_B_TRANSMIT_MODIFIER, + /datum/gas/zauker = ZAUKER_TRANSMIT_MODIFIER, ) ///The list of gases mapped against their heat penaltys. We use it to determin molar and heat output var/list/gas_heat = list( @@ -213,7 +213,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /datum/gas/hydrogen = HYDROGEN_HEAT_PENALTY, /datum/gas/healium = HEALIUM_HEAT_PENALTY, /datum/gas/proto_nitrate = PROTO_NITRATE_HEAT_PENALTY, - /datum/gas/cyrion_b = CYRION_B_HEAT_PENALTY, + /datum/gas/zauker = ZAUKER_HEAT_PENALTY, ) ///The list of gases mapped against their heat resistance. We use it to moderate heat damage. var/list/gas_resist = list( @@ -235,7 +235,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) /datum/gas/hydrogen = 1, /datum/gas/healium = 1, /datum/gas/proto_nitrate = 1, - /datum/gas/cyrion_b = 1, + /datum/gas/zauker = 1, ) ///The last air sample's total molar count, will always be above or equal to 0 var/combined_gas = 0 @@ -647,7 +647,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) //(1 + (tritRad + pluoxDampen * bzDampen * o2Rad * plasmaRad / (10 - bzrads))) * freonbonus radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus/(10-(gas_comp[/datum/gas/bz] * BZ_RADIOACTIVITY_MODIFIER)))) * freonbonus))// RadModBZ(500%) - if(prob(gas_comp[/datum/gas/cyrion_b])) + if(prob(gas_comp[/datum/gas/zauker])) playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10) supermatter_zap(src, 6, clamp(power*2, 4000, 20000), ZAP_MOB_STUN) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 72c073ab4c6..3fa0c2c0ee4 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -113,7 +113,7 @@ /datum/gas/hypernoblium, /datum/gas/healium, /datum/gas/proto_nitrate, - /datum/gas/cyrion_b, + /datum/gas/zauker, /datum/gas/halon, /datum/gas/hexane ) @@ -345,15 +345,15 @@ // Proto Nitrate // Inert - // Cyrion B - var/cyrion_b_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/cyrion_b][MOLES]) - if(cyrion_b_pp > gas_stimulation_min) + // Zauker + var/zauker_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/zauker][MOLES]) + if(zauker_pp > gas_stimulation_min) H.adjustBruteLoss(25) H.adjustOxyLoss(5) H.adjustFireLoss(8) H.adjustToxLoss(8) - gas_breathed = breath_gases[/datum/gas/cyrion_b][MOLES] - breath_gases[/datum/gas/cyrion_b][MOLES]-=gas_breathed + gas_breathed = breath_gases[/datum/gas/zauker][MOLES] + breath_gases[/datum/gas/zauker][MOLES]-=gas_breathed // Halon var/halon_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/halon][MOLES]) diff --git a/icons/effects/atmospherics.dmi b/icons/effects/atmospherics.dmi index 640b26fb3f2..bfe7cc13143 100644 Binary files a/icons/effects/atmospherics.dmi and b/icons/effects/atmospherics.dmi differ diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 651b853922d..5e0d0bf32bc 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi index 0bcda18de50..2180a1644c7 100644 Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ