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.
This commit is contained in:
brainfood1183
2025-05-25 19:03:01 +01:00
committed by GitHub
parent d81977281e
commit 51ca833662
11 changed files with 36 additions and 8 deletions

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

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