From: Unkn0wn_Gh0st Date: Sat, 3 May 2025 04:18:08 +0000 (-0500) Subject: New Weapon: Knuckle Dusters (#33470) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=11096ad9bf6ce9bcbe5c090736549eb91352ef3f;p=space-station-14.git New Weapon: Knuckle Dusters (#33470) * New Weapon: Knuckle Dusters * Tag YAML Error Fix * Crafting Graph Node Error (Thank you slarticodefast) Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Crafting Node Error Part 2 Electric Boogaloo Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Contraban & QM Dusters Nerf * Stun Knuckledusters (Unfinished) * Typo * Fix test fails * The dastardly maintainer balance webedit * Fix contraband parenting * Fix construction failure --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 --- diff --git a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl index 6fc6ad850a..a84549ec95 100644 --- a/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl +++ b/Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl @@ -5,6 +5,7 @@ steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit steal-target-groups-hand-teleporter = hand teleporter steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots steal-target-groups-box-folder-qm-clipboard = requisition digi-board +steal-target-groups-clothing-hands-knuckledusters-qm = golden knuckledusters steal-target-groups-food-meat-corgi = prime-cut corgi meat steal-target-groups-captain-id-card = captain ID card steal-target-groups-jetpack-captain-filled = captain's jetpack diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 819b4eda19..dea5167f01 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -29,6 +29,8 @@ uplink-fire-axe-flaming-desc = A classic-style weapon infused with advanced atmo uplink-gloves-north-star-name = Gloves of the North Star uplink-gloves-north-star-desc = A pair of gloves that reduce your punching cooldown drastically, allowing you to beat people to death in a flurry of punches. +uplink-gloves-knuckleduster-name = Syndicate Knuckle Dusters +uplink-gloves-knuckleduster-desc = A pair of plastitanium knuckle dusters that let you punch hard enough to break the captains jaw into pieces. # Explosives uplink-explosive-grenade-name = Explosive Grenade uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage. diff --git a/Resources/Prototypes/Actions/security.yml b/Resources/Prototypes/Actions/security.yml new file mode 100644 index 0000000000..ace9d914e4 --- /dev/null +++ b/Resources/Prototypes/Actions/security.yml @@ -0,0 +1,8 @@ +# gloves +- type: entity + id: ActionToggleKnuckleDustersStun + name: Toggle stun knuckle dusters + description: Toggles the duster's built in stun baton. + components: + - type: InstantAction + event: !type:ToggleActionEvent diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 05c362ac6a..a3303939b4 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -17,6 +17,7 @@ - id: RubberStampDenied - id: RubberStampQm - id: AstroNavCartridge + - id: ClothingHandsKnuckleDustersQM - id: MailTeleporterMachineCircuitboard - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index 33b0ab1a50..d79808f6cd 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -147,6 +147,7 @@ - id: BalloonSyn - id: WeaponSniperMosin weight: 2 + - id: ClothingHandsKnuckleDustersSyndicate - type: entityTable id: MaintenanceLockerLoot diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e2c07fe78f..d716b7231f 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -107,6 +107,20 @@ categories: - UplinkWeaponry +- type: listing + id: UplinkGlovesKnuckleDusters + name: uplink-gloves-knuckleduster-name + description: uplink-gloves-knuckleduster-desc + icon: { sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi, state: syndicateknuckleduster } + productEntity: ClothingHandsKnuckleDustersSyndicate + discountCategory: veryRareDiscounts + discountDownTo: + Telecrystal: 3 + cost: + Telecrystal: 6 + categories: + - UplinkWeaponry + - type: listing id: UplinkDisposableTurret name: uplink-disposable-turret-name diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 6f23003c1a..1144bf2b8f 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -449,3 +449,194 @@ fiberMaterial: fibers-rubber fiberColor: fibers-yellow - type: FingerprintMask + +#Knuckledusters +- type: entity + parent: [ClothingHandsBase, BaseMinorContraband] + id: ClothingHandsKnuckleDusters + name: knuckle dusters + description: "Cold plasteel knuckle dusters, makes your punches hit much harder." + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi + state: knuckleduster + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi + - type: Fiber + fiberColor: fibers-silver + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 12 #Damaged focus unlike Rigged or Northstars which are stun and speed focus + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: [ClothingHandsKnuckleDusters, BaseMinorContraband] #Craftable version of base knuckledusters + id: ClothingHandsKnuckleDustersBrass + name: brass knuckle dusters + description: "Brass knuckle dusters, just like how they used to make em and still hit just as hard." + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi + state: brassknuckleduster + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi + - type: Construction + graph: ClothingHandsKnuckleDustersBrass + node: icon + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + parent: [ClothingHandsBase, BaseGrandTheftContraband] + id: ClothingHandsKnuckleDustersQM + name: QM's golden knuckle dusters + description: "24karat gold infused with plasteel and branded with the Nanotrasen logo. A true symbol of the Quartermaster's might." + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi + state: goldenknuckleduster + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi + - type: Fiber + fiberColor: fibers-gold + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 14 + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: Tag + tags: + - WhitelistChameleon + - type: StealTarget + stealGroup: ClothingHandsKnuckleDustersQM + +- type: entity + parent: [ClothingHandsBase, BaseSyndicateContraband] + id: ClothingHandsKnuckleDustersSyndicate + name: syndicate knuckle dusters + description: "Plastitanium knuckle dusters branded with the blood-red S. A real man beats someone to death with these." + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi + state: syndicateknuckleduster + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 8 + Piercing: 8 + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: Tag + tags: + - WhitelistChameleon + +- type: entity + name: stun knuckle dusters + parent: [ClothingHandsBase, BaseToggleClothing, BaseSecurityContraband] + id: ClothingHandsKnuckleDustersStun + description: A pair of knuckle dusters combined with the tech of a stun baton. This makes beating tiders a whole lot easier. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi + layers: + - state: knuckleduster_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi + equippedPrefix: on + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: knuckleduster_on} + False: {state: knuckleduster_off} + - type: ToggleClothing + action: ActionToggleKnuckleDustersStun + - type: ItemToggle + predictable: false + soundActivate: + collection: sparks + params: + variation: 0.250 + volume: 5 + soundDeactivate: + collection: sparks + params: + variation: 0.250 + volume: 5 + soundFailToActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.250 + volume: 5 + - type: Stunbaton + energyPerUse: 50 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 0 + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 8 + bluntStaminaDamageFactor: 2.0 + animation: WeaponArcFist + - type: StaminaDamageOnHit + damage: 35 + sound: /Audio/Weapons/egloves.ogg + - type: StaminaDamageOnCollide + damage: 35 + sound: /Audio/Weapons/egloves.ogg + - type: LandAtCursor # it deals stamina damage when thrown + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: GuideHelp + guides: + - Security + - Antagonists + +- type: entity #Admeme + parent: ClothingHandsKnuckleDusters + id: ClothingHandsKnuckleBoneCrushers + name: bone crushers + description: "Blessed by the Gods to break all those who don't obey." + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi + state: goldenknuckleduster + - type: Clothing + sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi + - type: Fiber + fiberColor: fibers-gold + - type: MeleeWeapon + attackRate: 2 + damage: + types: + Blunt: 35 + soundHit: + collection: Punch + animation: WeaponArcFist + - type: Tag + tags: [] # ignore "WhitelistChameleon" tag + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 4f1315ce1d..5f54e9a5c3 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -357,6 +357,7 @@ - id: Shiv - id: SawImprov - id: HydroponicsToolMiniHoe + - id: ClothingHandsKnuckleDusters - type: entity name: Maint Loot Spawner diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 43d8101b73..50bc7a3a85 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -42,6 +42,13 @@ sprite: Objects/Misc/qm_clipboard.rsi state: qm_clipboard +- type: stealTargetGroup + id: ClothingHandsKnuckleDustersQM + name: steal-target-groups-clothing-hands-knuckledusters-qm + sprite: + sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi + state: goldenknuckleduster + - type: stealTargetGroup id: FoodMeatCorgi name: steal-target-groups-food-meat-corgi diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index 4b6d9e0e66..98c6b9789f 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -233,6 +233,16 @@ stealGroup: BoxFolderQmClipboard owner: job-name-qm +- type: entity + parent: BaseTraitorStealObjective + id: KnuckleDustersStealObjective + components: + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + stealGroup: ClothingHandsKnuckleDustersQM + owner: job-name-qm + ## hop - type: entity diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/brass_knuckles.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/brass_knuckles.yml new file mode 100644 index 0000000000..6fbe77c735 --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/brass_knuckles.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: ClothingHandsKnuckleDustersBrass + start: start + graph: + - node: start + edges: + - to: icon + steps: + - material: Brass + amount: 6 + doAfter: 10 + - node: icon + entity: ClothingHandsKnuckleDustersBrass diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index f703724cc9..290dc30099 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -157,3 +157,11 @@ targetNode: spear category: construction-category-weapons objectType: Item + +- type: construction + id: ClothingHandsKnuckleDustersBrass + graph: ClothingHandsKnuckleDustersBrass + startNode: start + targetNode: icon + category: construction-category-weapons + objectType: Item diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/brassknuckleduster.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/brassknuckleduster.png new file mode 100644 index 0000000000..5b5bce8a66 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/brassknuckleduster.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND.png new file mode 100644 index 0000000000..e89b472705 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-left.png new file mode 100644 index 0000000000..ce8f8b316b Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-right.png new file mode 100644 index 0000000000..3bbb5453ba Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-right.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 new file mode 100644 index 0000000000..ac15590b67 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brassknuckleduster" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_nocell.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_nocell.png new file mode 100644 index 0000000000..bbd5489439 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_nocell.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_off.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_off.png new file mode 100644 index 0000000000..fe031d4ba2 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_off.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_on.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_on.png new file mode 100644 index 0000000000..bf60708b41 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_on.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/meta.json new file mode 100644 index 0000000000..00262137c8 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/meta.json @@ -0,0 +1,133 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "knuckleduster_off" + }, + { + "name": "knuckleduster_nocell" + }, + { + "name": "knuckleduster_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off-equipped-HAND", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-equipped-HAND", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-equipped-HAND.png new file mode 100644 index 0000000000..d9e6c56750 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-left.png new file mode 100644 index 0000000000..71adc490d8 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-right.png new file mode 100644 index 0000000000..91f703060a Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-equipped-HAND.png new file mode 100644 index 0000000000..1fad00b0a4 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-left.png new file mode 100644 index 0000000000..7bba52d7d8 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-right.png new file mode 100644 index 0000000000..a53cd5a731 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND.png new file mode 100644 index 0000000000..4279650c2d Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/goldenknuckleduster.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/goldenknuckleduster.png new file mode 100644 index 0000000000..e1a381af63 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/goldenknuckleduster.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-left.png new file mode 100644 index 0000000000..fd1532ff00 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-right.png new file mode 100644 index 0000000000..305b4256b8 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-right.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 new file mode 100644 index 0000000000..6623f6a5e7 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "goldenknuckleduster" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND.png new file mode 100644 index 0000000000..728630b44c Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-left.png new file mode 100644 index 0000000000..b16d27250a Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-right.png new file mode 100644 index 0000000000..97f0f315b2 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/knuckleduster.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/knuckleduster.png new file mode 100644 index 0000000000..32089b0fb6 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/knuckleduster.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 new file mode 100644 index 0000000000..cc850c7381 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "knuckleduster" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND.png new file mode 100644 index 0000000000..8f9880c14c Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-left.png new file mode 100644 index 0000000000..af2d23476d Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-right.png new file mode 100644 index 0000000000..4af1278320 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-right.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 new file mode 100644 index 0000000000..7297aecddd --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "syndicateknuckleduster" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png new file mode 100644 index 0000000000..c14eca836b Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png differ