cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unnerf security's non-lethals, revert pain decay changes. (#11305)

Browse Source
This commit is contained in:
Matt Atlas
2021-03-02 20:40:03 +01:00
committed by GitHub
parent 0fc1fcf84f
commit d1a30fc4a0
20 changed files with 119 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/organs/organ_external.dm
+2 -1
View File
@@ -1443,7 +1443,8 @@ Note that amputating the affected organ does in fact remove the infection from t
amount -= (owner.chem_effects[CE_PAINKILLER]/3)
if(amount <= 0)
return
pain = max(0, min(max_damage, pain + amount))
var/threshold = max_damage * 2
pain = max(0, min(threshold, pain + amount))
if(owner && ((amount > 15 && prob(20)) || (amount > 30 && prob(60))))
owner.emote("scream")
return pain-last_pain