cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Raises pain thresholds, hopefully reduces lethality a bit, nerfs painkillers. (#11969)

Browse Source
This commit is contained in:
Matt Atlas
2021-07-30 11:54:57 +02:00
committed by GitHub
parent da94b06c30
commit 4559ff2494
14 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/internal/brain.dm
-1
View File
@@ -1,6 +1,5 @@
/obj/item/organ/internal/brain
name = "brain"
health = 400 //They need to live awhile longer than other organs. Is this even used by organ code anymore?
desc = "A piece of juicy meat found in a person's head."
organ_tag = BP_BRAIN
parent_organ = BP_HEAD
code/modules/organs/internal/heart.dm
+1 -1
View File
@@ -145,7 +145,7 @@
blood_max += ((W.damage / 40) * species.bleed_mod)
if(temp.status & ORGAN_ARTERY_CUT)
var/bleed_amount = Floor(owner.vessel.total_volume / (temp.applied_pressure || !open_wound ? 450 : 250))
var/bleed_amount = Floor((owner.vessel.total_volume / (temp.applied_pressure || !open_wound ? 450 : 250)) * temp.arterial_bleed_severity)
if(bleed_amount)
if(CE_BLOODCLOT in owner.chem_effects)
bleed_amount *= 0.8 // won't do much, but it'll help
code/modules/organs/internal/kidneys.dm
+2 -2
View File
@@ -25,9 +25,9 @@
var/decl/reagent/drink/coffee = REAGENT_VOLUME(owner.reagents, /decl/reagent/drink/coffee)
if(coffee)
if(is_bruised())
owner.adjustToxLoss(0.1 * PROCESS_ACCURACY)
owner.adjustToxLoss(0.1)
else if(is_broken())
owner.adjustToxLoss(0.3 * PROCESS_ACCURACY)
owner.adjustToxLoss(0.3)
if(is_bruised())
if(prob(5) && REAGENT_VOLUME(reagents, /decl/reagent/potassium) < 5)
code/modules/organs/internal/liver.dm
+1 -1
View File
@@ -45,7 +45,7 @@
filter_effect += 1
if(filter_effect < 2) //Trouble. You're not filtering well.
owner.adjustToxLoss(0.8 * max(2 - filter_effect, 0))
owner.adjustToxLoss(0.5 * max(2 - filter_effect, 0))
// Heal a bit if needed and we're not busy. This allows recovery from low amounts of toxloss.
if(!owner.total_radiation && damage > 0)
code/modules/organs/internal/lungs.dm
+2 -1
View File
@@ -97,7 +97,8 @@
else
owner.emote(pick("shiver","twitch"))
owner.adjustOxyLoss(HUMAN_MAX_OXYLOSS * breath_fail_ratio)
if(damage || owner.chem_effects[CE_BREATHLOSS] || world.time > last_successful_breath + 2 MINUTES)
owner.adjustOxyLoss(HUMAN_MAX_OXYLOSS * breath_fail_ratio)
owner.oxygen_alert = max(owner.oxygen_alert, 2)
/obj/item/organ/internal/lungs/proc/enable_rupture()