]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Melee Executions (#30104)
authorScribbles0 <91828755+Scribbles0@users.noreply.github.com>
Sun, 11 Aug 2024 03:05:54 +0000 (20:05 -0700)
committerGitHub <noreply@github.com>
Sun, 11 Aug 2024 03:05:54 +0000 (13:05 +1000)
commit220aff21eb51cb69ea12a209ec330e40a5e045db
treef8c79e50be5f24c75c591bb201473ee6c56aadf1
parentc25c5ec666e8b97f9e50c50a838f291ef73c489a
Melee Executions (#30104)

* melee executions

* fix damage bug

* cleanup

* address reviews hopefully

* resistance bypass mechanic

* component changes

* self executions (not finished yet)

* self execs part two

* ok i fixed things (still not finished)

* finish everything

* review stuff

* nuke if (kind = special)

* more review stuffs

* Make suicide system much less hardcoded and make much more use of events

* Fix a dumb bug I introduced

* self execution popups

* Integration tests

* Why did they even take 0.5 blunt damage?

* More consistent integration tests

* Destructive equals true

* Allow it to dirty-dispose

* IS THIS WHAT YOU WANT?

* FRESH AND CLEAN

* modifier to multiplier

* don't jinx the integration tests

* no file-scoped namespace

* Move the rest of execution to shared, create SuicideGhostEvent

* handled

* Get rid of unused code and add a comment

* ghost before suicide

* stop cat suicides

* popup fix + small suicide change

* make it a bit better

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
26 files changed:
Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs [new file with mode: 0644]
Content.Server/Chat/Commands/SuicideCommand.cs
Content.Server/Chat/SuicideSystem.cs
Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs
Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs
Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
Content.Server/Materials/MaterialReclaimerSystem.cs
Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs
Content.Server/Morgue/CrematoriumSystem.cs
Content.Shared/Chat/SharedSuicideSystem.cs [new file with mode: 0644]
Content.Shared/Execution/DoAfterEvent.cs [new file with mode: 0644]
Content.Shared/Execution/ExecutionComponent.cs [new file with mode: 0644]
Content.Shared/Execution/SharedExecutionSystem.cs [new file with mode: 0644]
Content.Shared/Interaction/Events/SuicideEvent.cs
Content.Shared/Mind/SharedMindSystem.cs
Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs
Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
Resources/Locale/en-US/execution/execution.ftl [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml
Resources/Prototypes/Entities/Objects/Materials/shards.yml
Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml