]> git.smokeofanarchy.ru Git - space-station-14.git/commit
[NEW STATUS SYSTEM] Drunkenness, Stuttering, Slurred Speech, and Bloodloss (#38678)
authorPrincess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Mon, 18 Aug 2025 20:26:29 +0000 (13:26 -0700)
committerGitHub <noreply@github.com>
Mon, 18 Aug 2025 20:26:29 +0000 (16:26 -0400)
commit6b73d320b9eb35cab7cbcc9301759fa0ff395a80
treef6c99245863b60fc656644416424727b1ea85d21
parentd737e39a98a88d07bee24106901206cfc7d8fbb4
[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>
27 files changed:
Content.Client/Drunk/DrunkOverlay.cs
Content.Client/Drunk/DrunkSystem.cs
Content.Server/Electrocution/ElectrocutionSystem.cs
Content.Server/Speech/Components/StutteringAccentComponent.cs
Content.Server/Speech/EntitySystems/SlurredSystem.cs
Content.Server/Speech/EntitySystems/StutteringSystem.cs
Content.Shared/Body/Components/BloodstreamComponent.cs
Content.Shared/Body/Systems/SharedBloodstreamSystem.cs
Content.Shared/Drunk/DrunkComponent.cs [deleted file]
Content.Shared/Drunk/DrunkStatusEffectComponent.cs [new file with mode: 0644]
Content.Shared/Drunk/DrunkSystem.cs [deleted file]
Content.Shared/Drunk/SharedDrunkSystem.cs [new file with mode: 0644]
Content.Shared/EntityEffects/Effects/Drunk.cs
Content.Shared/Speech/EntitySystems/SharedSlurredSystem.cs
Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs
Content.Shared/StatusEffectNew/Components/StatusEffectComponent.cs
Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
Resources/Prototypes/Entities/Mobs/Species/base.yml
Resources/Prototypes/Entities/StatusEffects/body.yml [new file with mode: 0644]
Resources/Prototypes/Entities/StatusEffects/misc.yml
Resources/Prototypes/Entities/StatusEffects/speech.yml [new file with mode: 0644]
Resources/Prototypes/Reagents/medicine.yml