]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4b51b29) | patch
Head of Security's Energy Magnum (and Warden's Energy Shotgun) (#40615)
authorSpanky <180730777+spanky-spanky@users.noreply.github.com>
Tue, 7 Oct 2025 15:53:55 +0000 (11:53 -0400)
committerGitHub <noreply@github.com>
Tue, 7 Oct 2025 15:53:55 +0000 (15:53 +0000)
commitff01e13d247d916b58bd9638be79a012c130e166
treea3fecb1ec544dc26ebc3c0ea3943abfb0b179d52tree | snapshot
parent4b51b2953d780fba56fd9721b4a91f44d3f8fbfacommit | diff
Head of Security's Energy Magnum (and Warden's Energy Shotgun) (#40615)

* Energy magnum and projectile protos, locker fills, and traitor objective updates.

* Fix objective

* Objective and .rsi tweaks

* Rewrite item description.

* Remove energy shotgun self charging and decrease magnum disabler cost.

* Bring magnum disabler fire cost in line with regular disabler.

* Bunch of sprite improvements including charge status visuals.

* whoops

* Minor sprite edit for clarity

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
23 files changed:
Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl diff | blob | history
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml diff | blob | history
Resources/Prototypes/Catalog/Fills/Lockers/security.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml diff | blob | history
Resources/Prototypes/Objectives/objectiveGroups.yml diff | blob | history
Resources/Prototypes/Objectives/stealTargetGroups.yml diff | blob | history
Resources/Prototypes/Objectives/traitor.yml diff | blob | history
Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml diff | blob | history
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/base.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-BELT.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/equipped-SUITSTORAGE.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-0.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-1.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-2.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/mag-unshaded-3.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_magnum.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/magnum_piercing.png [new file with mode: 0644] blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_magnum.rsi/meta.json [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский