git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
	Mon, 19 Aug 2024 11:14:30 +0000 (13:14 +0200)
committer	GitHub <noreply@github.com>
	Mon, 19 Aug 2024 11:14:30 +0000 (21:14 +1000)
commit	2f923d88e4aa624f55dd7f4f7a2a57e5ff8d22c2
tree	96599f0a331ac9b3b04dbb24f7882aead09e4a91	tree \| snapshot
parent	972bd566f541287b3b25fe098200dcf37a5b84b5	commit \| diff

New head of security weapon:Energy Shotgun (#30643)

* Reset hopefully?

* removes the emergency security orders

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

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

24 files changed:

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml	[deleted file]	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_shotgun.rsi/base.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/meta.json		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom