mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
custom_pain makes you actually be in pain (#8973)
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
if(power >= 50)
|
||||
message = "<font size=3>[message]</font>"
|
||||
|
||||
adjustHalLoss(halloss+power) // CHOMPEdit - Someone forgot to make it actually hurt
|
||||
|
||||
// Anti message spam checks
|
||||
// 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))
|
||||
|
||||
@@ -974,7 +974,7 @@
|
||||
if(alien == IS_SLIME && water_based)
|
||||
M.adjustToxLoss(removed * 2)
|
||||
*/ //VOREStation Removal End
|
||||
|
||||
|
||||
/datum/reagent/drink/overdose(var/mob/living/carbon/M, var/alien) //Add special interactions here in the future if desired.
|
||||
..()
|
||||
|
||||
@@ -1243,7 +1243,7 @@
|
||||
if(O.status & ORGAN_BROKEN)
|
||||
O.mend_fracture()
|
||||
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
|
||||
//VOREStation Edit End
|
||||
|
||||
@@ -3252,7 +3252,7 @@
|
||||
glass_desc = "Damn, the bartender even stirred it, not shook it."
|
||||
|
||||
allergen_type = ALLERGEN_FRUIT //Made from gin(fruit) and vermouth(fruit)
|
||||
|
||||
|
||||
/datum/reagent/ethanol/cuba_libre
|
||||
name = "Cuba Libre"
|
||||
id = "cubalibre"
|
||||
|
||||
@@ -736,7 +736,7 @@
|
||||
if(O.status & ORGAN_BROKEN)
|
||||
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.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
|
||||
|
||||
/datum/reagent/myelamine
|
||||
@@ -1460,4 +1460,4 @@
|
||||
M.adjustCloneLoss(-2 * removed)
|
||||
M.druggy = max(M.druggy, 20)
|
||||
M.hallucination = max(M.hallucination, 3)
|
||||
M.adjustBrainLoss(1 * removed) //your life for your mind. The Earthmother's Tithe.
|
||||
M.adjustBrainLoss(1 * removed) //your life for your mind. The Earthmother's Tithe.
|
||||
|
||||
Reference in New Issue
Block a user