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	Flareguy <78941145+Flareguy@users.noreply.github.com>
	Sat, 16 Dec 2023 04:23:57 +0000 (22:23 -0600)
committer	GitHub <noreply@github.com>
	Sat, 16 Dec 2023 04:23:57 +0000 (23:23 -0500)
commit	e31cf20871662df6794354f66354190ed24c8074
tree	fff448dc98586d5c993116b9183d05810062e821	tree \| snapshot
parent	87c48047e10346c27dc4ee06ad6a7f371c853862	commit \| diff

Ports the /tg/ shotgun sprites (#22539)

* ports the /tg/ shotgun sprites

* webedit fail

* i'm wario and my furniture is broken

* hopefully finally actually fix tests? maybe? my couch is broken

* update shotgun cabinet

* update shotgun cabinet MORE

* ohhhhhh my god...

45 files changed:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/equipped-BACKPACK.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/bolt-open.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/equipped-BACKPACK.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/db-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/enforcer-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/improvised-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/meta.json	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/pump-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-left.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/inhands_64x.rsi/sawn-inhand-right.png	[new file with mode: 0644]	blob
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/bolt-open.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/meta.json		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/equipped-BACKPACK.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/icon.png		diff \| blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-left.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/inhand-right.png	[deleted file]	blob \| history
Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/meta.json		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-empty-open.png		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-closed.png		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet-filled-open.png		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/cabinet.png		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/meta.json		diff \| blob \| history
Resources/Textures/Structures/Wallmounts/shotgun_cabinet.rsi/shotgun.png		diff \| blob \| history

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

RSS Atom