]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
New Weapon: Knuckle Dusters (#33470)
authorUnkn0wn_Gh0st <shadowstalkermll@gmail.com>
Sat, 3 May 2025 04:18:08 +0000 (23:18 -0500)
committerGitHub <noreply@github.com>
Sat, 3 May 2025 04:18:08 +0000 (00:18 -0400)
* 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 <retron404@gmail.com>
42 files changed:
Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl
Resources/Locale/en-US/store/uplink-catalog.ftl
Resources/Prototypes/Actions/security.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
Resources/Prototypes/Catalog/uplink_catalog.yml
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
Resources/Prototypes/Objectives/stealTargetGroups.yml
Resources/Prototypes/Objectives/traitor.yml
Resources/Prototypes/Recipes/Construction/Graphs/weapons/brass_knuckles.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Construction/weapons.yml
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/brassknuckleduster.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_nocell.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_off.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_on.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/goldenknuckleduster.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/knuckleduster.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png [new file with mode: 0644]

index 6fc6ad850a6bdc4d51a9554196e038b4d9331fd5..a84549ec95e32437d2b99075ed237cde606f3250 100644 (file)
@@ -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
index 819b4eda195c45bdf1fb7fed88a5a96340f2f3d7..dea5167f0157d8932b1af15fe5230a24ed7570d7 100644 (file)
@@ -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 (file)
index 0000000..ace9d91
--- /dev/null
@@ -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
index 05c362ac6abb87d80b0defb4d1f8e2fcfdf5e823..a3303939b40862f0436c1f57c9b0923c079165f6 100644 (file)
@@ -17,6 +17,7 @@
     - id: RubberStampDenied
     - id: RubberStampQm
     - id: AstroNavCartridge
+    - id: ClothingHandsKnuckleDustersQM
     - id: MailTeleporterMachineCircuitboard
 
 - type: entity
index 33b0ab1a509e2b7497a3376e2c5cf059487f29ef..d79808f6cd8c031db3ce1a7375a4479fb368a47f 100644 (file)
     - id: BalloonSyn
     - id: WeaponSniperMosin
       weight: 2
+    - id: ClothingHandsKnuckleDustersSyndicate
 
 - type: entityTable
   id: MaintenanceLockerLoot
index e2c07fe78fdc51dac5dcc8b1f68b0610b9facbe4..d716b7231ff198c539d775544adfefbcb30fc8ba 100644 (file)
   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
index 6f23003c1af21ce177964c0e57b86b8baec8427f..1144bf2b8ff26d1a2667ac9695cd30bb9149c16d 100644 (file)
     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
+
index 4f1315ce1db648621bbe1c5b3aebbd5891a72637..5f54e9a5c3cf29e324bb3c8cf8178a63f1ed29a9 100644 (file)
       - id: Shiv
       - id: SawImprov
       - id: HydroponicsToolMiniHoe
+      - id: ClothingHandsKnuckleDusters
 
 - type: entity
   name: Maint Loot Spawner
index 43d8101b73d26d4780e1a8d7ca9f1fd7330705bd..50bc7a3a85d0214e0000deb18070ab6dbc52feb9 100644 (file)
     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
index 4b6d9e0e66b5bd1262ff647001ba6d6837cb5116..98c6b9789fb9b4ba59e6cc307b4fcd925766eeb0 100644 (file)
     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 (file)
index 0000000..6fbe77c
--- /dev/null
@@ -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
index f703724cc9648406fd60a319ff1b12188107510d..290dc300996a0fdfedfcacb303f0d609ab58c3e2 100644 (file)
   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 (file)
index 0000000..5b5bce8
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 (file)
index 0000000..e89b472
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 (file)
index 0000000..ce8f8b3
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 (file)
index 0000000..3bbb545
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 (file)
index 0000000..ac15590
--- /dev/null
@@ -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 (file)
index 0000000..bbd5489
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 (file)
index 0000000..fe031d4
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 (file)
index 0000000..bf60708
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 (file)
index 0000000..0026213
--- /dev/null
@@ -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 (file)
index 0000000..d9e6c56
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 (file)
index 0000000..71adc49
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 (file)
index 0000000..91f7030
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 (file)
index 0000000..1fad00b
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 (file)
index 0000000..7bba52d
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 (file)
index 0000000..a53cd5a
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 (file)
index 0000000..4279650
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 (file)
index 0000000..e1a381a
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 (file)
index 0000000..fd1532f
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 (file)
index 0000000..305b425
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 (file)
index 0000000..6623f6a
--- /dev/null
@@ -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 (file)
index 0000000..728630b
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 (file)
index 0000000..b16d272
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 (file)
index 0000000..97f0f31
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 (file)
index 0000000..32089b0
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 (file)
index 0000000..cc850c7
--- /dev/null
@@ -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 (file)
index 0000000..8f9880c
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 (file)
index 0000000..af2d234
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 (file)
index 0000000..4af1278
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 (file)
index 0000000..7297aec
--- /dev/null
@@ -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 (file)
index 0000000..c14eca8
Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png differ