From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Date: Sun, 25 May 2025 18:03:01 +0000 (+0100)
Subject: kangaroos can now be equipped with north stars and knuckle dusters. (#37789)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=51ca833662e760e3ec26e305a38b296c5af610cc;p=space-station-14.git

kangaroos can now be equipped with north stars and knuckle dusters. (#37789)

* kangaroos can now be equipped with north stars and knuckle dusters (except stun knuckle duster).

* whitespace issues fix..

* damn whitespace

* fix whitespace

* fix whitespace

* final fix.
---

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 1144bf2b8f..dee1745e2e 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -156,7 +156,7 @@
   - type: Fiber
     fiberMaterial: fibers-nitrile
   - type: FingerprintMask
-####
+
 - type: entity
   parent: ClothingHandsButcherable
   id: ClothingHandsGlovesLeather
@@ -418,6 +418,10 @@
         type: MeleeSpeechBoundUserInterface
   - type: StaticPrice
     price: 0
+  - type: Tag
+    tags:
+    - Kangaroo
+    - WhitelistChameleon
 
 - type: entity
   parent: [ClothingHandsBase, BaseSecurityContraband]
@@ -476,6 +480,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - Kangaroo
 
 - type: entity
   parent: [ClothingHandsKnuckleDusters, BaseMinorContraband] #Craftable version of base knuckledusters
@@ -494,6 +499,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - Kangaroo
 
 - type: entity
   parent: [ClothingHandsBase, BaseGrandTheftContraband]
@@ -520,6 +526,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - Kangaroo
   - type: StealTarget
     stealGroup: ClothingHandsKnuckleDustersQM
 
@@ -547,6 +554,7 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+    - Kangaroo
 
 - type: entity
   name: stun knuckle dusters
@@ -638,5 +646,5 @@
       collection: Punch
     animation: WeaponArcFist
   - type: Tag
-    tags: [] # ignore "WhitelistChameleon" tag
-
+    tags:
+    - Kangaroo
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND-kangaroo.png
new file mode 100644
index 0000000000..5089f8e72e
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND-kangaroo.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json
index ac15590b67..ff57de9b8d 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f, and altered by Unkn0wnGh0st333; In hand sprites done by Unkn0wnGh0st333 on github",
+    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f, and altered by Unkn0wnGh0st333; In hand sprites done by Unkn0wnGh0st333 on github, inhand-kangaroo by brainfood (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-HAND",
             "directions": 4
         },
+        {
+            "name": "equipped-HAND-kangaroo",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND-kangaroo.png
new file mode 100644
index 0000000000..36235b25f1
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND-kangaroo.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json
index 6623f6a5e7..779df3938d 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github",
+    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github, inhand-kangaroo by brainfood (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-HAND",
             "directions": 4
         },
+        {
+            "name": "equipped-HAND-kangaroo",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND-kangaroo.png
new file mode 100644
index 0000000000..7bcd9d339c
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND-kangaroo.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json
index cc850c7381..c59c2866f0 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github",
+    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github, inhand-kangaroo by brainfood (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-HAND",
             "directions": 4
         },
+        {
+            "name": "equipped-HAND-kangaroo",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND-kangaroo.png
new file mode 100644
index 0000000000..0c6a471a5a
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND-kangaroo.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json
index 7297aecddd..fae51fea4a 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github",
+    "copyright": "Icon taken from ParadiseSS13 at commit https://github.com/ParadiseSS13/Paradise/commit/391f296ed9b06d9bd13daca5b51c68740e714f1f; In hand sprites done by Unkn0wnGh0st333 on github, inhand-kangaroo by brainfood (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -14,6 +14,10 @@
             "name": "equipped-HAND",
             "directions": 4
         },
+        {
+            "name": "equipped-HAND-kangaroo",
+            "directions": 4
+        },
         {
             "name": "inhand-left",
             "directions": 4
diff --git a/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/equipped-HAND-kangaroo.png b/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/equipped-HAND-kangaroo.png
new file mode 100644
index 0000000000..f554113b67
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/equipped-HAND-kangaroo.png differ
diff --git a/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/meta.json
index 3d3bd865ea..a442600ce5 100644
--- a/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/meta.json
+++ b/Resources/Textures/Clothing/Hands/Gloves/northstar.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/37864/commits/efdef3f1f997d1c0575c36cd31a5db575d1df0ca#diff-a4eb7c89f7231f0aaf0c2f69d730dea56383019f2aa5c6a1d91a82c781b528e6. Modified by hercoyote23 (github) for SS14, inhand sprites by SeamLesss (Github)",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/37864/commits/efdef3f1f997d1c0575c36cd31a5db575d1df0ca#diff-a4eb7c89f7231f0aaf0c2f69d730dea56383019f2aa5c6a1d91a82c781b528e6. Modified by hercoyote23 (github) for SS14, inhand sprites by SeamLesss (Github), inhand-kangaroo sprite by brainfood (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-HAND",
       "directions": 4
     },
+    {
+      "name": "equipped-HAND-kangaroo",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4