cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

custom_pain makes you actually be in pain (#8973)

Browse Source
This commit is contained in:
Guti
2024-09-16 11:28:33 +02:00
committed by GitHub
parent fd4095fee3
commit c709ef53d3
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/organs/pain.dm
View File

@@ -17,6 +17,8 @@
if(power >= 50) if(power >= 50)
message = "<font size=3>[message]</font>" message = "<font size=3>[message]</font>"
adjustHalLoss(halloss+power) // CHOMPEdit - Someone forgot to make it actually hurt
// Anti message spam checks // Anti message spam checks
// If multiple limbs are injured, cooldown is ignored to print all injuries until all limbs are iterated over // If multiple limbs are injured, cooldown is ignored to print all injuries until all limbs are iterated over
if(client?.prefs?.read_preference(/datum/preference/toggle/pain_frequency)) if(client?.prefs?.read_preference(/datum/preference/toggle/pain_frequency))

2
code/modules/reagents/reagents/food_drinks.dm
View File

@@ -1243,7 +1243,7 @@
if(O.status & ORGAN_BROKEN) if(O.status & ORGAN_BROKEN)
O.mend_fracture() O.mend_fracture()
H.custom_pain("You feel the agonizing power of calcium mending your bones!",60) H.custom_pain("You feel the agonizing power of calcium mending your bones!",60)
H.AdjustWeakened(1) H.AdjustStunned(1) // CHOMPEdit - Crawling again, weakened to stunned
break // Only mend one bone, whichever comes first in the list break // Only mend one bone, whichever comes first in the list
//VOREStation Edit End //VOREStation Edit End

2
code/modules/reagents/reagents/medicine.dm
View File

@@ -736,7 +736,7 @@
if(O.status & ORGAN_BROKEN) if(O.status & ORGAN_BROKEN)
O.mend_fracture() //Only works if the bone won't rebreak, as usual O.mend_fracture() //Only works if the bone won't rebreak, as usual
H.custom_pain("You feel a terrible agony tear through your bones!",60) H.custom_pain("You feel a terrible agony tear through your bones!",60)
H.AdjustWeakened(1) //Bones being regrown will knock you over H.AdjustStunned(1) //Bones being regrown will knock you over - CHOMPEdit - Crawling made this trivial, get stunned
//CHOMPEdit End //CHOMPEdit End
/datum/reagent/myelamine /datum/reagent/myelamine