]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Teslaloose and Singuloose counterplay (#23444)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Fri, 5 Jan 2024 02:48:09 +0000 (05:48 +0300)
committerGitHub <noreply@github.com>
Fri, 5 Jan 2024 02:48:09 +0000 (18:48 -0800)
commit0f8c004a2f6cce3443f0e2e9bbbc3c8ac12d0eba
tree2bec7ea65cb70dfac80551ea9b2cd9de1cbb976d
parentbb100e54ceb0c0fc3972326d59d868afa63e7c42
Teslaloose and Singuloose counterplay (#23444)

* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>
* Update Resources/Locale/en-US/research/technologies.ftl

Co-authored-by: Kara <lunarautomaton6@gmail.com>
---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
22 files changed:
Content.Server/Tesla/Components/TeslaEnergyBallComponent.cs
Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs
Resources/Locale/en-US/prototypes/catalog/fills/crates/engineering-crates.ftl
Resources/Locale/en-US/research/technologies.ftl
Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Structures/Holographic/projections.yml
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
Resources/Prototypes/Recipes/Lathes/tools.yml
Resources/Prototypes/Research/experimental.yml
Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/Holoprojectors/field.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/particle_decelerator.rsi/base.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/particle_decelerator.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/particle_decelerator.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Guns/Battery/particle_decelerator.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Holo/field.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Holo/field.rsi/meta.json [new file with mode: 0644]