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 1144bf2b8ff26d1a2667ac9695cd30bb9149c16d..dee1745e2e92e0fe08b6057478650f362b54f21a 100644 (file)
--- 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 (file)
index 0000000..5089f8e
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 ac15590b67148e2fb5c17d53dac500c98183e5c8..ff57de9b8d06ba4be538d98ba0b553e86428eea9 100644 (file)
--- 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 (file)
index 0000000..36235b2
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 6623f6a5e76bbfeca3443132c55f94a48c212275..779df3938d5b50861a34737b781107b372650a25 100644 (file)
--- 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 (file)
index 0000000..7bcd9d3
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 cc850c7381abae6f5eea1093c29ef93e25848171..c59c2866f06da0dcf7c9b6e1d47234165979d9f4 100644 (file)
--- 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 (file)
index 0000000..0c6a471
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 7297aecddd50b9e02a14f7c83a53a45c14de8b08..fae51fea4ab09b1fbd197bffdfe25e6a704643a3 100644 (file)
--- 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 (file)
index 0000000..f554113
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 3d3bd865ea1e229effe4b0961a2f0bc82fe5e6db..a442600ce532d4856d34ea986815bcaea18dbfbb 100644 (file)
--- 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