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 5c7a806b5aff6b957e43a9465aa0dcff780e2fd1..bf08db78f712fb47a7add4859b881d76ad6b02ce 100644 (file)
--- 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 d86c8fbebadf8f0c17d8057017fab7fef2152e7c..3c034a66741c17d9eb144ff57baf258df32449d3 100644 (file)
--- 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 7c7f3a6302c3c006b00035d6d36d40a1a4d0ac0f..3ab913e119b2fbef0e9e61808c7c523739fd0b85 100644 (file)
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 b99080f54887d346839f660452b8045f0f1f9ea8..6f6a799beea30e644abd37956d3dc95d0862fbad 100644 (file)
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 b49a8326d74fccba9a2f219a721449f0c00cf729..feea84ebd5008893cb4a380c6f7f0276bb4c4f3b 100644 (file)
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 93624bf969db6f7440d35f7f8ae73db8a090a1d3..1214dc57edb6370004dbe215eb3a56b1455e1e49 100644 (file)
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 (file)
index db6378d..0000000
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 (file)
index 0000000..a4c73f4
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 5b65737755c27698e27c590989f93bff9c2df451..d24811cb1099820e88e7acdd32e6696113e6eba7 100644 (file)
--- 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 738cb44dd2818917f8264a8ebda12511f56a642e..f0bf008f0374077bbc8ac02ef1216fbf57c7b163 100644 (file)
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 5c7fde0e3a245203028c063177f9f34fd92b6fdb..a52ebb4acd62f4179f767930a3a9036038cf1ed7 100644 (file)
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 8daacc33400dd95898f4110083345be4be56e184..0399579abd8b403995cee3e5c85421b5a2c5ff71 100644 (file)
--- 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