]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Adds Store on Collide and Wand of the Locker (#33710)
authorkeronshb <54602815+keronshb@users.noreply.github.com>
Wed, 4 Dec 2024 16:49:54 +0000 (11:49 -0500)
committerGitHub <noreply@github.com>
Wed, 4 Dec 2024 16:49:54 +0000 (17:49 +0100)
commit82528dce377ed76399fedf570a96459288354c95
treed12e20ccd7192ae463fc9d15ddb822653921b308
parent152cf3388b889ffb54fc801b8d515f815828fd0a
Adds Store on Collide and Wand of the Locker (#33710)

* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID
17 files changed:
Content.Shared/Lock/LockSystem.cs
Content.Shared/Storage/Components/StoreOnCollideComponent.cs [new file with mode: 0644]
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/prototypes/access/accesses.ftl
Resources/Locale/en-US/store/spellbook-catalog.ftl
Resources/Prototypes/Access/wizard.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/spellbook_catalog.yml
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-effect.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker-inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/locker.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json