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>
	Tue, 9 Jan 2024 12:23:11 +0000 (13:23 +0100)
committer	GitHub <noreply@github.com>
	Tue, 9 Jan 2024 12:23:11 +0000 (15:23 +0300)
commit	5fd3d4552c8cf783fe8fe03dc0cfa472958e6282
tree	6803f9f91fbe79e785b947a02bbda03d3bd05368	tree \| snapshot
parent	d59e28522ae942c58fdabe9a49dfb067713604b6	commit \| diff

More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)

* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

25 files changed:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml		diff \| blob \| history
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml		diff \| blob \| history
Resources/Prototypes/Reagents/pyrotechnic.yml		diff \| blob \| history
Resources/Prototypes/Recipes/Reactions/pyrotechnic.yml		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/glassshot.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/grapeshot.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/grapeshot.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/shard.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/base.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-closed.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/bolt-open.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/icon.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/flintlock.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/base.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-closed.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/bolt-open.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/icon.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-left.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/inhand-right.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Snipers/musket.rsi/meta.json		diff \| blob \| history

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

RSS Atom