[NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss (#38678)

* The only commit that matters

* I had to stop playing with my cat to push this change

* Yaml removal

* Proper drunk status effect and remove shitcode

* Review changes

* whoops

* Whoops x2

* Update master fix merge conflicts

* Fix merge conflicts

* Dunk Component kill

* MORE RELAYS

* Holy fucking breaking changes

* Ough

* 46 file diff

* Fix bad commits

* Erm what the test fail?

* Fix those last two

* Merge conflicts

* Me when I fix the merge conflicts

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-08-18 13:26:29 -07:00
committed by GitHub
parent d737e39a98
commit 6b73d320b9
27 changed files with 235 additions and 176 deletions

View File

@@ -19,7 +19,6 @@
group: GenericNumber
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- TemporaryBlindness
- RadiationProtection

View File

@@ -35,7 +35,6 @@
bodyType: KinematicController # Same for all inheritors
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- type: Pullable
- type: Tag

View File

@@ -15,7 +15,6 @@
bodyType: KinematicController # Same for all inheritors
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- type: Repairable
doAfterDelay: 8

View File

@@ -19,7 +19,6 @@
baseSprintSpeed : 4
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- TemporaryBlindness
- Pacified
@@ -93,7 +92,6 @@
baseDecayRate: 0.04
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- TemporaryBlindness
- Pacified

View File

@@ -100,7 +100,6 @@
types: {}
- type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
allowed:
- Stutter
- Electrocution
- TemporaryBlindness
- Pacified

View File

@@ -120,10 +120,7 @@
- !type:WashCreamPieReaction
- type: StatusEffects
allowed:
- Stutter
- Electrocution
- Drunk
- SlurredSpeech
- RatvarianLanguage
- PressureImmunity
- Muted

View File

@@ -0,0 +1,18 @@
- type: entity
parent: MobStatusEffectBase
id: BloodstreamStatusEffectBase
abstract: true
components:
- type: StatusEffect
whitelist:
components:
- Bloodstream
- type: entity
parent: [ BloodstreamStatusEffectBase ]
id: StatusEffectBloodloss
name: bloodloss
components:
- type: StutteringAccent
- type: DrunkStatusEffect
- type: RejuvenateRemovedStatusEffect

View File

@@ -78,3 +78,17 @@
name: hallucinations
components:
- type: SeeingRainbowsStatusEffect
# Causes your vision to become blurry and gives me a headache.
- type: entity
parent: MobStatusEffectDebuff
id: StatusEffectWoozy
name: woozy
components:
- type: DrunkStatusEffect
# Causes you to get drunk
- type: entity
parent: [ StatusEffectWoozy, StatusEffectSlurred ]
id: StatusEffectDrunk
name: drunk

View File

@@ -0,0 +1,27 @@
- type: entity
parent: MobStatusEffectDebuff
id: SpeechStatusEffectBase
abstract: true
components:
- type: StatusEffect
whitelist:
components:
- MobState
- Speech
requireAll: true
# Causes you to st-t-u-t-t-t-er randomly when talking.
- type: entity
parent: SpeechStatusEffectBase
id: StatusEffectStutter
name: stutter
components:
- type: StutteringAccent
# Causes you to schlur your words schwhen talking.
- type: entity
parent: SpeechStatusEffectBase
id: StatusEffectSlurred
name: slurred
components:
- type: SlurredAccent

View File

@@ -12,9 +12,9 @@
- !type:GenericStatusEffect
key: Stutter
component: ScrambledAccent
- !type:Drunk
slurSpeech: false
boozePower: 20
- !type:ModifyStatusEffect
effectProto: StatusEffectSlurred
time: 20.0
- type: reagent
id: Dylovene
@@ -104,8 +104,8 @@
metabolisms:
Medicine:
effects:
- !type:GenericStatusEffect
key: Drunk
- !type:ModifyStatusEffect
effectProto: StatusEffectDrunk
time: 6.0
type: Remove
- !type:HealthChange
@@ -1353,8 +1353,8 @@
key: Jitter
time: 2.0
type: Remove
- !type:GenericStatusEffect
key: Drunk
- !type:ModifyStatusEffect
effectProto: StatusEffectDrunk
time: 6.0
type: Remove
- !type:PopupMessage # we dont have sanity/mood so this will have to do