port Knuckle duster and fixing ntpd locker sprite

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -5,6 +5,9 @@ uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowere
 uplink-revolver-python-name = Python
 uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum.
 
+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 Captain’s jaw into pieces.
+
 uplink-pistol-cobra-name = Cobra
 uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless).
 

Resources/Prototypes/CharacterItemGroups/Jobs/Logistics/logisticsOfficer.yml

@@ -24,11 +24,15 @@
 #  maxItems: 1
 #  items:
 #
-#- type: characterItemGroup
-#  id: LoadoutLogisticsOfficerGloves
-#  maxItems: 1
-#  items:
-#
+- type: characterItemGroup
+  id: LoadoutLogisticsOfficerGloves
+  maxItems: 1
+  items:
+    - type: loadout
+      id: LoadoutCommandQMBlackGlove
+    - type: loadout
+      id: LoadoutCommandQMKnuckleDuster
+
 - type: characterItemGroup
   id: LoadoutLogisticsOfficerHead
   maxItems: 1

Resources/Prototypes/Loadouts/Jobs/Logistics/logisticsOfficer.yml

@@ -10,6 +10,31 @@
 # Eyes
 
 # Gloves
+- type: loadout
+  id: LoadoutCommandQMBlackGlove
+  category: JobsLogisticsLogisticsOfficer
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutLogisticsOfficerGloves
+    - !type:CharacterJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingHandsGlovesColorBlack
+
+- type: loadout
+  id: LoadoutCommandQMKnuckleDuster
+  category: JobsLogisticsLogisticsOfficer
+  cost: 0
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutLogisticsOfficerGloves
+    - !type:CharacterJobRequirement
+      jobs:
+        - Quartermaster
+  items:
+    - ClothingHandsKnuckleDustersQM
 
 # Head
 - type: loadout

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

Resources/Prototypes/Recipes/Construction/weapons.yml

@@ -173,3 +173,14 @@
   description: Bones and silk combined together.
   icon: { sprite: Objects/Weapons/Melee/bone_spear.rsi, state: spear }
   objectType: Item
+
+- type: construction
+  name: brass knuckle dusters
+  id: ClothingHandsKnuckleDustersBrass
+  graph: ClothingHandsKnuckleDustersBrass
+  startNode: start
+  targetNode: icon
+  category: construction-category-weapons
+  description: Brass knuckle dusters; a classic in the field of beating people to death.
+  icon: { sprite: _Goobstation/Clothing/Hands/Gloves/knuckleduster.rsi, state: brassknuckleduster } # Goobstation
+  objectType: Item

Resources/Prototypes/_Goobstation/Catalog/uplink_catalog.yml

@@ -158,6 +158,17 @@
   categories:
   - UplinkWeaponry
 
+- type: listing
+  id: UplinkGlovesKnuckleDusters
+  name: uplink-gloves-knuckleduster-name
+  description: uplink-gloves-knuckleduster-desc
+  icon: { sprite: _Goobstation/Clothing/Hands/Gloves/knuckleduster.rsi, state: syndicateknuckleduster }
+  productEntity: ClothingHandsKnuckleDustersSyndicate
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkWeaponry
+
 # Wearables
 
 - type: listing

Resources/Prototypes/_Goobstation/Entities/Clothing/Hands/gloves.yml

@@ -0,0 +1,101 @@
+# Knuckle Dusters
+
+- type: entity
+  parent: BaseItem
+  id: ClothingHandsKnuckleDustersBase
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _Goobstation/Clothing/Hands/Gloves/knuckleduster.rsi
+    state: knuckleduster
+  - type: Clothing
+    sprite: _Goobstation/Clothing/Hands/Gloves/knuckleduster.rsi
+    slots: [ gloves ]
+  - type: Appearance
+  - type: Item
+    size: Small
+    storedRotation: -90
+  - type: MeleeWeapon
+    attackRate: 1.5
+    damage:
+      types:
+        Blunt: 12
+    soundHit:
+      collection: Punch
+    animation: WeaponArcFist
+    mustBeEquippedToUse: true
+    canWideSwing: false
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
+- type: entity
+  parent: [ClothingHandsKnuckleDustersBase, BaseMinorContraband]
+  id: ClothingHandsKnuckleDusters
+  name: knuckle dusters
+  description: Sturdy plasteel knuckle-dusters. Adds a whole lot more weight to your punches.
+
+- type: entity
+  parent: [ClothingHandsKnuckleDustersBase, BaseMinorContraband] # Craftable Version
+  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
+    state: brassknuckleduster
+  - type: Construction
+    graph: ClothingHandsKnuckleDustersBrass
+    node: icon
+
+- type: entity
+  parent: [ClothingHandsKnuckleDustersBase, BaseSyndicateContraband]
+  id: ClothingHandsKnuckleDustersSyndicate
+  name: syndicate knuckle dusters
+  description: Plastitanium knuckle dusters branded with the syndicate logo. A real man beats someone to death with these.
+  components:
+  - type: Sprite
+    state: syndicateknuckleduster
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 16
+
+- type: entity
+  parent: [ClothingHandsKnuckleDustersBase, BaseCommandContraband]
+  id: ClothingHandsKnuckleDustersQM
+  #suffix: DO NOT MAP - Arcadis turn em into normal command item
+  name: quartermaster's engraved knuckleduster
+  description: Forged by the finest craftsmen at the Quartermaster's request, this hard and dense knuckle-duster is designed to deliver bone-crushing blows and damage the internal organs of the unfortunate victim.
+  components:
+  - type: Sprite
+    state: goldenknuckleduster
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 12
+  - type: PhysicalComposition
+    materialComposition:
+      Gold: 500
+  - type: StaticPrice
+    price: 1337
+  - type: StaminaDamageOnHit
+    damage: 18 # plus half the blunt (6) - 24 damage - 5 hits to stun
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
+- type: entity
+  parent: [ClothingHandsKnuckleDustersBase, BaseCentcommContraband]
+  id: ClothingHandsKnuckleBoneCrushers
+  name: bone crushers
+  description: "Blessed by the Gods to break all those who don't obey."
+  components:
+  - type: Sprite
+    state: goldenknuckleduster
+  - type: MeleeWeapon
+    attackRate: 2
+    damage:
+      types:
+        Blunt: 50 #Arcadis Station - BUMP THAT BADBOY UP
+  - type: Tag
+    tags: [] # ignore "WhitelistChameleon" tag

Resources/Textures/Structures/Storage/closet.rsi/meta.json

@@ -606,6 +606,15 @@
         },
         {
             "name": "representative_door"
+        },
+        {
+            "name": "NTPD"
+        },
+        {
+            "name": "NTPD_door"
+        },
+        {
+            "name": "NTPD_open"
         }
     ]
 }

Resources/Textures/_Goobstation/Clothing/Hands/Gloves/knuckleduster.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Paradise Station, equipped-HAND by SolsticeOfTheWinter",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "knuckleduster"
+    },
+	{
+      "name": "goldenknuckleduster"
+    },
+	{
+      "name": "brassknuckleduster"
+    },
+	{
+      "name": "syndicateknuckleduster"
+    },
+	{
+      "name": "equipped-HAND",
+      "directions": 4
+    }
+  ]
+}