]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working...
authornikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Mon, 18 Mar 2024 22:35:46 +0000 (00:35 +0200)
committerGitHub <noreply@github.com>
Mon, 18 Mar 2024 22:35:46 +0000 (23:35 +0100)
commit22e9d6562f21bdd4f0962d6e3b6fcdd81bb4c253
tree88073f4e19f77fe7d7cece0326a9b2e6c902a4fc
parent5185a4a6b379abf88f0a26856c719e3fbb7c2a25
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)

* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect

* Move check up to apply to all actions and do thing I forgor to do before

* Change check into an ActionBlocker check that also checks whether the user is sleeping.

* Make checking for Consciousness the default for actions

Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.

* Fix typos my beloved

I had an unbelievable skill issue

* Fix major skill issue
13 files changed:
Content.Client/Actions/ActionsSystem.cs
Content.Server/Bed/Sleep/SleepingSystem.cs
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
Content.Shared/Actions/BaseActionComponent.cs
Content.Shared/Actions/SharedActionsSystem.cs
Content.Shared/Interaction/Events/InteractionAttemptEvent.cs
Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
Resources/Prototypes/Actions/crit.yml
Resources/Prototypes/Actions/diona.yml
Resources/Prototypes/Actions/types.yml
Resources/Prototypes/Entities/Mobs/Player/guardian.yml
Resources/Prototypes/Entities/Objects/Fun/pai.yml
Resources/mapping_actions.yml