From: Jackal298 <129199891+Jackal298@users.noreply.github.com>
Date: Thu, 11 Jan 2024 22:47:51 +0000 (+0300)
Subject: Respite and minor changes to mercenary items (#23783)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f9f5db935785737117a16771fe960f6b8cfef778;p=space-station-14.git

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
---

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 5c7a806b5a..bf08db78f7 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -268,9 +268,9 @@
   description: High-quality combat gloves to protect hands from mechanical damage during combat.
   components:
   - type: Sprite
-    sprite: Clothing/Hands/Gloves/Color/olive.rsi
+    sprite: Clothing/Hands/Gloves/mercbattle.rsi
   - type: Clothing
-    sprite: Clothing/Hands/Gloves/Color/olive.rsi
+    sprite: Clothing/Hands/Gloves/mercbattle.rsi
   - type: Butcherable
     butcheringType: Knife
     spawned:
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index d86c8fbeba..3c034a6674 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -962,7 +962,7 @@
       mode: SensorOff
 
 - type: entity
-  parent: UnsensoredClothingUniformBase
+  parent: ClothingUniformBase
   id: ClothingUniformJumpsuitMercenary
   name: mercenary jumpsuit
   description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png
index 7c7f3a6302..3ab913e119 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png
index b99080f548..6f6a799bee 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png
index b49a8326d7..feea84ebd5 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png
index 93624bf969..1214dc57ed 100644
Binary files a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png
deleted file mode 100644
index db6378de51..0000000000
Binary files a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/equipped-HAND.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png
rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/equipped-HAND.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png
new file mode 100644
index 0000000000..a4c73f4d81
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png
rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png
rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json
similarity index 74%
rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json
rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json
index 5b65737755..d24811cb10 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/clothing/gloves.dmi",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png
index 738cb44dd2..f0bf008f03 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png
index 5c7fde0e3a..a52ebb4acd 100644
Binary files a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
index 8daacc3340..0399579abd 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/54ecdcc05bcaf335489938b1253a2a733ba12271",
+  "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/54ecdcc05bcaf335489938b1253a2a733ba12271 and paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/clothing/gloves.dmi",
   "size": {
     "x": 32,
     "y": 32