]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 25c477a) | patch
Respite and minor changes to mercenary items (#23783)
authorJackal298 <129199891+Jackal298@users.noreply.github.com>
Thu, 11 Jan 2024 22:47:51 +0000 (01:47 +0300)
committerGitHub <noreply@github.com>
Thu, 11 Jan 2024 22:47:51 +0000 (17:47 -0500)
commitf9f5db935785737117a16771fe960f6b8cfef778
tree08869b4c9cc6e1894471779f4253feec8b5bfc21tree | snapshot
parent25c477a64270aa5b2394ed5405c29a6882a78925commit | diff
Respite and minor changes to mercenary items (#23783)

* Respite and minor changes to mercenary items

This is try number three, everything should be fine this time

* Fix meta

* Fix bot

* Fix bot 2

* Fix meta 2

* Fix meta 3
15 files changed:
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml diff | blob | history
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml diff | blob | history
Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png diff | blob | history
Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png diff | blob | history
Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png diff | blob | history
Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png diff | blob | history
Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png [deleted file] blob | history
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/equipped-HAND.png [moved from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png with 100% similarity] blob | history
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-left.png [moved from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png with 100% similarity] blob | history
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-right.png [moved from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png with 100% similarity] blob | history
Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json [moved from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json with 74% similarity] diff | blob | history
Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png diff | blob | history
Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png diff | blob | history
Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json diff | blob | history
Форк Space Station 14 с переводами на русский