mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
# Conflicts: # _maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm # _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm # _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm # _maps/map_files/tramstation/tramstation.dmm # code/_onclick/hud/new_player.dm # code/datums/components/squashable.dm # code/datums/diseases/advance/symptoms/heal.dm # code/datums/diseases/chronic_illness.dm # code/datums/status_effects/buffs.dm # code/datums/status_effects/debuffs/drunk.dm # code/datums/status_effects/debuffs/stamcrit.dm # code/game/machinery/computer/crew.dm # code/game/objects/items/devices/scanners/health_analyzer.dm # code/game/objects/items/wall_mounted.dm # code/game/turfs/closed/indestructible.dm # code/modules/admin/view_variables/filterrific.dm # code/modules/antagonists/heretic/influences.dm # code/modules/cargo/orderconsole.dm # code/modules/client/preferences.dm # code/modules/events/space_vines/vine_mutations.dm # code/modules/mob/dead/new_player/new_player.dm # code/modules/mob/living/carbon/human/death.dm # code/modules/mob/living/carbon/human/species_types/jellypeople.dm # code/modules/mob/living/damage_procs.dm # code/modules/mob/living/living.dm # code/modules/mob_spawn/ghost_roles/mining_roles.dm # code/modules/mob_spawn/mob_spawn.dm # code/modules/projectiles/ammunition/energy/laser.dm # code/modules/projectiles/guns/ballistic/launchers.dm # code/modules/projectiles/guns/energy/laser.dm # code/modules/reagents/chemistry/machinery/chem_dispenser.dm # code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm # code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm # code/modules/reagents/chemistry/reagents/medicine_reagents.dm # code/modules/surgery/healing.dm # code/modules/unit_tests/designs.dm # icons/mob/inhands/items_lefthand.dmi # icons/mob/inhands/items_righthand.dmi # tgui/packages/tgui/interfaces/ChemDispenser.tsx
This commit is contained in:
nevimer
@@ -263,7 +263,7 @@
|
||||
breathe_gas_volume(breath, /datum/gas/oxygen, /datum/gas/carbon_dioxide)
|
||||
// Heal mob if not in crit.
|
||||
if(breather.health >= breather.crit_threshold && breather.oxyloss)
|
||||
breather.adjustOxyLoss(-5)
|
||||
breather.adjust_oxy_loss(-5)
|
||||
|
||||
/// Maximum Oxygen effects. "Too much O2!"
|
||||
/obj/item/organ/lungs/proc/too_much_oxygen(mob/living/carbon/breather, datum/gas_mixture/breath, o2_pp, old_o2_pp)
|
||||
@@ -310,7 +310,7 @@
|
||||
breathe_gas_volume(breath, /datum/gas/nitrogen, /datum/gas/carbon_dioxide)
|
||||
// Heal mob if not in crit.
|
||||
if(breather.health >= breather.crit_threshold && breather.oxyloss)
|
||||
breather.adjustOxyLoss(-5)
|
||||
breather.adjust_oxy_loss(-5)
|
||||
|
||||
/// Maximum CO2 effects. "Too much CO2!"
|
||||
/obj/item/organ/lungs/proc/too_much_co2(mob/living/carbon/breather, datum/gas_mixture/breath, co2_pp, old_co2_pp)
|
||||
@@ -364,7 +364,7 @@
|
||||
breathe_gas_volume(breath, /datum/gas/plasma, /datum/gas/carbon_dioxide)
|
||||
// Heal mob if not in crit.
|
||||
if(breather.health >= breather.crit_threshold && breather.oxyloss)
|
||||
breather.adjustOxyLoss(-5)
|
||||
breather.adjust_oxy_loss(-5)
|
||||
|
||||
/// Maximum Plasma effects. "Too much Plasma!"
|
||||
/obj/item/organ/lungs/proc/too_much_plasma(mob/living/carbon/breather, datum/gas_mixture/breath, plasma_pp, old_plasma_pp)
|
||||
@@ -390,7 +390,7 @@
|
||||
if(bz_pp > BZ_trip_balls_min)
|
||||
breather.reagents.add_reagent(/datum/reagent/bz_metabolites, clamp(bz_pp, 1, 5))
|
||||
if(bz_pp > BZ_brain_damage_min && prob(33))
|
||||
breather.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 150, ORGAN_ORGANIC)
|
||||
breather.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3, 150, ORGAN_ORGANIC)
|
||||
|
||||
/// Breathing in refridgerator coolent, shit's caustic
|
||||
/obj/item/organ/lungs/proc/too_much_freon(mob/living/carbon/breather, datum/gas_mixture/breath, freon_pp, old_freon_pp)
|
||||
@@ -402,12 +402,12 @@
|
||||
to_chat(breather, span_alert("Your mouth feels like it's burning!"))
|
||||
if (freon_pp > 40)
|
||||
breather.emote("gasp")
|
||||
breather.adjustFireLoss(15)
|
||||
breather.adjust_fire_loss(15)
|
||||
if (prob(freon_pp / 2))
|
||||
to_chat(breather, span_alert("Your throat closes up!"))
|
||||
breather.set_silence_if_lower(6 SECONDS)
|
||||
else
|
||||
breather.adjustFireLoss(freon_pp / 4)
|
||||
breather.adjust_fire_loss(freon_pp / 4)
|
||||
|
||||
/// Breathing in halon, convert it to a reagent
|
||||
/obj/item/organ/lungs/proc/too_much_halon(mob/living/carbon/breather, datum/gas_mixture/breath, halon_pp, old_halon_pp)
|
||||
@@ -415,7 +415,7 @@
|
||||
breathe_gas_volume(breath, /datum/gas/halon)
|
||||
// Metabolize to reagent.
|
||||
if(halon_pp > gas_stimulation_min)
|
||||
breather.adjustOxyLoss(5)
|
||||
breather.adjust_oxy_loss(5)
|
||||
breather.reagents.add_reagent(/datum/reagent/halon, max(0, 1 - breather.reagents.get_reagent_amount(/datum/reagent/halon)))
|
||||
|
||||
/// Sleeping gas with healing properties.
|
||||
@@ -557,7 +557,7 @@
|
||||
// Random chance to inflict side effects increases with pressure.
|
||||
if((prob(nitrium_pp) && (nitrium_pp > 15)))
|
||||
// Nitrium side-effect.
|
||||
breather.adjustOrganLoss(ORGAN_SLOT_LUNGS, nitrium_pp * 0.1)
|
||||
breather.adjust_organ_loss(ORGAN_SLOT_LUNGS, nitrium_pp * 0.1)
|
||||
to_chat(breather, span_notice("You feel a burning sensation in your chest"))
|
||||
// Metabolize to reagents.
|
||||
if (nitrium_pp > 5)
|
||||
@@ -574,7 +574,7 @@
|
||||
// Tritium side-effects.
|
||||
if(gas_breathed > moles_visible)
|
||||
var/ratio = gas_breathed * 15
|
||||
breather.adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
|
||||
breather.adjust_tox_loss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
|
||||
// If you're breathing in half an atmosphere of radioactive gas, you fucked up.
|
||||
if((trit_pp > tritium_irradiation_moles_min) && SSradiation.can_irradiate_basic(breather))
|
||||
var/lerp_scale = min(tritium_irradiation_moles_max, trit_pp - tritium_irradiation_moles_min) / (tritium_irradiation_moles_max - tritium_irradiation_moles_min)
|
||||
@@ -631,7 +631,7 @@
|
||||
breather.failed_last_breath = FALSE
|
||||
// Vacuum-adapted lungs regenerate oxyloss even when breathing nothing.
|
||||
if(breather.health >= breather.crit_threshold && breather.oxyloss)
|
||||
breather.adjustOxyLoss(-5)
|
||||
breather.adjust_oxy_loss(-5)
|
||||
else
|
||||
// Can't breathe!
|
||||
breather.failed_last_breath = TRUE
|
||||
@@ -913,7 +913,7 @@
|
||||
. = ..()
|
||||
if (breath?.gases[/datum/gas/plasma])
|
||||
var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma][MOLES])
|
||||
breather_slime.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
|
||||
breather_slime.adjust_blood_volume(0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
|
||||
|
||||
/obj/item/organ/lungs/smoker_lungs
|
||||
name = "smoker lungs"
|
||||
|
||||
Reference in New Issue
Block a user