[MIRROR] Dizzy and jittery components (#11273)

Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-07-30 16:20:22 -07:00
committed by GitHub
parent 105391bfee
commit fb4d35fb7a
26 changed files with 210 additions and 129 deletions
@@ -999,7 +999,7 @@
if(!(M.species.allergens & allergen_type))
var/bonus = M.food_preference(allergen_type)
M.adjust_nutrition((nutrition + bonus) * removed)
M.dizziness = max(0, M.dizziness + adj_dizzy)
M.make_dizzy(adj_dizzy)
M.drowsyness = max(0, M.drowsyness + adj_drowsy)
M.AdjustSleeping(adj_sleepy)
if(adj_temp > 0 && M.bodytemperature < 310) // 310 is the normal bodytemp. 310.055
@@ -2203,7 +2203,7 @@
M.add_chemical_effect(CE_SPEEDBOOST, 1)
M.make_jittery(20)
M.druggy = max(M.druggy, 30)
M.dizziness += 5
M.make_dizzy(5)
M.drowsyness = 0
/datum/reagent/drink/grenadine //Description implies that the grenadine we would be working with does not contain fruit, so no allergens.
@@ -2515,8 +2515,7 @@
M.adjustOxyLoss(-4 * removed)
M.heal_organ_damage(2 * removed, 2 * removed)
M.adjustToxLoss(-2 * removed)
if(M.dizziness)
M.dizziness = max(0, M.dizziness - 15)
M.make_dizzy(-15)
if(M.confused)
M.Confuse(-5)
@@ -3073,7 +3072,7 @@
if(alien == IS_DIONA)
return
M.adjust_nutrition((M.food_preference(allergen_type) / 2) * removed) //RS edit
M.jitteriness = max(M.jitteriness - 3, 0)
M.make_jittery(-3)
/datum/reagent/ethanol/beer/lite
name = REAGENT_LITEBEER
@@ -3134,7 +3133,7 @@
if(alien == IS_DIONA)
return
if(M.species.robo_ethanol_drunk || !(M.isSynthetic()))
M.dizziness +=5
M.make_dizzy(5)
/datum/reagent/ethanol/firepunch
name = REAGENT_FIREPUNCH
@@ -3172,7 +3171,7 @@
if(alien == IS_DIONA)
return
..()
M.dizziness = max(0, M.dizziness - 5)
M.make_dizzy(-5)
M.drowsyness = max(0, M.drowsyness - 3)
M.AdjustSleeping(-2)
if(M.bodytemperature > 310)
@@ -102,7 +102,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.get_jittery() < 100) //Same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (xc.feral <=0) //check if they're unferalled
xc.feral = 0
@@ -468,7 +468,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling
if(xc && xc.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.get_jittery() < 100) // same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (xc.feral <=0) //check if they're unferalled
xc.feral = 0
@@ -558,7 +558,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/component/xenochimera/xc = M.get_xenochimera_component()
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.jitteriness < 100) //Same check as feral triggers to stop them immediately re-feralling
if(xc && xc.feral > 0 && H.nutrition > 150 && H.traumatic_shock < 20 && H.get_jittery() < 100) //Same check as feral triggers to stop them immediately re-feralling
xc.feral -= removed * 3 //Should calm them down quick, provided they're actually in a state to STAY calm.
if(xc.feral <=0) //Check if they're unferalled
xc.feral = 0
+2 -2
View File
@@ -1053,7 +1053,7 @@
/datum/reagent/ethylredoxrazine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
M.dizziness = 0
M.clear_dizzy()
M.drowsyness = 0
M.stuttering = 0
M.SetConfused(0)
@@ -1065,7 +1065,7 @@
/datum/reagent/ethylredoxrazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
M.dizziness = 0
M.clear_dizzy()
M.drowsyness = 0
M.stuttering = 0
M.SetConfused(0)
@@ -14,8 +14,7 @@
M.Confuse(-8*removed)
if(M.eye_blurry)
M.eye_blurry = max(M.eye_blurry - 25*removed, 0)
if(M.jitteriness)
M.make_jittery(min(-25*removed,0))
M.make_jittery(-25*removed)
/datum/reagent/numbing_enzyme
name = REAGENT_NUMBENZYME
+2 -2
View File
@@ -196,12 +196,12 @@
M.SetStunned(0)
M.SetParalysis(0)
M.silent = 0
M.dizziness = 0
M.clear_dizzy()
M.clear_jittery()
M.drowsyness = 0
M.stuttering = 0
M.SetConfused(0)
M.SetSleeping(0)
M.jitteriness = 0
M.radiation = 0
M.ExtinguishMob()
M.fire_stacks = 0
+1 -1
View File
@@ -859,7 +859,7 @@
/datum/reagent/impedrezene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_DIONA)
return
M.jitteriness = max(M.jitteriness - 5, 0)
M.make_jittery(-5)
if(prob(80))
M.adjustBrainLoss(0.1 * removed)
if(prob(50))