Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Commit 11096ad

Browse files
Unkn0wnGh0st333slarticodefastEmoGarbage404
authored
New Weapon: Knuckle Dusters (space-wizards#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 <retron404@gmail.com>
1 parent 5d26a38 commit 11096ad

42 files changed

Lines changed: 494 additions & 0 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit
55
steal-target-groups-hand-teleporter = hand teleporter
66
steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots
77
steal-target-groups-box-folder-qm-clipboard = requisition digi-board
8+
steal-target-groups-clothing-hands-knuckledusters-qm = golden knuckledusters
89
steal-target-groups-food-meat-corgi = prime-cut corgi meat
910
steal-target-groups-captain-id-card = captain ID card
1011
steal-target-groups-jetpack-captain-filled = captain's jetpack

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ uplink-fire-axe-flaming-desc = A classic-style weapon infused with advanced atmo
2929
uplink-gloves-north-star-name = Gloves of the North Star
3030
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.
3131
32+
uplink-gloves-knuckleduster-name = Syndicate Knuckle Dusters
33+
uplink-gloves-knuckleduster-desc = A pair of plastitanium knuckle dusters that let you punch hard enough to break the captains jaw into pieces.
3234
# Explosives
3335
uplink-explosive-grenade-name = Explosive Grenade
3436
uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# gloves
2+
- type: entity
3+
id: ActionToggleKnuckleDustersStun
4+
name: Toggle stun knuckle dusters
5+
description: Toggles the duster's built in stun baton.
6+
components:
7+
- type: InstantAction
8+
event: !type:ToggleActionEvent

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
- id: RubberStampDenied
1818
- id: RubberStampQm
1919
- id: AstroNavCartridge
20+
- id: ClothingHandsKnuckleDustersQM
2021
- id: MailTeleporterMachineCircuitboard
2122

2223
- type: entity

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
- id: BalloonSyn
148148
- id: WeaponSniperMosin
149149
weight: 2
150+
- id: ClothingHandsKnuckleDustersSyndicate
150151

151152
- type: entityTable
152153
id: MaintenanceLockerLoot

Resources/Prototypes/Catalog/uplink_catalog.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,20 @@
107107
categories:
108108
- UplinkWeaponry
109109

110+
- type: listing
111+
id: UplinkGlovesKnuckleDusters
112+
name: uplink-gloves-knuckleduster-name
113+
description: uplink-gloves-knuckleduster-desc
114+
icon: { sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi, state: syndicateknuckleduster }
115+
productEntity: ClothingHandsKnuckleDustersSyndicate
116+
discountCategory: veryRareDiscounts
117+
discountDownTo:
118+
Telecrystal: 3
119+
cost:
120+
Telecrystal: 6
121+
categories:
122+
- UplinkWeaponry
123+
110124
- type: listing
111125
id: UplinkDisposableTurret
112126
name: uplink-disposable-turret-name

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

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,3 +449,194 @@
449449
fiberMaterial: fibers-rubber
450450
fiberColor: fibers-yellow
451451
- type: FingerprintMask
452+
453+
#Knuckledusters
454+
- type: entity
455+
parent: [ClothingHandsBase, BaseMinorContraband]
456+
id: ClothingHandsKnuckleDusters
457+
name: knuckle dusters
458+
description: "Cold plasteel knuckle dusters, makes your punches hit much harder."
459+
components:
460+
- type: Sprite
461+
sprite: Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi
462+
state: knuckleduster
463+
- type: Clothing
464+
sprite: Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi
465+
- type: Fiber
466+
fiberColor: fibers-silver
467+
- type: MeleeWeapon
468+
attackRate: 1.5
469+
damage:
470+
types:
471+
Blunt: 12 #Damaged focus unlike Rigged or Northstars which are stun and speed focus
472+
soundHit:
473+
collection: Punch
474+
animation: WeaponArcFist
475+
mustBeEquippedToUse: true
476+
- type: Tag
477+
tags:
478+
- WhitelistChameleon
479+
480+
- type: entity
481+
parent: [ClothingHandsKnuckleDusters, BaseMinorContraband] #Craftable version of base knuckledusters
482+
id: ClothingHandsKnuckleDustersBrass
483+
name: brass knuckle dusters
484+
description: "Brass knuckle dusters, just like how they used to make em and still hit just as hard."
485+
components:
486+
- type: Sprite
487+
sprite: Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi
488+
state: brassknuckleduster
489+
- type: Clothing
490+
sprite: Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi
491+
- type: Construction
492+
graph: ClothingHandsKnuckleDustersBrass
493+
node: icon
494+
- type: Tag
495+
tags:
496+
- WhitelistChameleon
497+
498+
- type: entity
499+
parent: [ClothingHandsBase, BaseGrandTheftContraband]
500+
id: ClothingHandsKnuckleDustersQM
501+
name: QM's golden knuckle dusters
502+
description: "24karat gold infused with plasteel and branded with the Nanotrasen logo. A true symbol of the Quartermaster's might."
503+
components:
504+
- type: Sprite
505+
sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi
506+
state: goldenknuckleduster
507+
- type: Clothing
508+
sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi
509+
- type: Fiber
510+
fiberColor: fibers-gold
511+
- type: MeleeWeapon
512+
attackRate: 1.5
513+
damage:
514+
types:
515+
Blunt: 14
516+
soundHit:
517+
collection: Punch
518+
animation: WeaponArcFist
519+
mustBeEquippedToUse: true
520+
- type: Tag
521+
tags:
522+
- WhitelistChameleon
523+
- type: StealTarget
524+
stealGroup: ClothingHandsKnuckleDustersQM
525+
526+
- type: entity
527+
parent: [ClothingHandsBase, BaseSyndicateContraband]
528+
id: ClothingHandsKnuckleDustersSyndicate
529+
name: syndicate knuckle dusters
530+
description: "Plastitanium knuckle dusters branded with the blood-red S. A real man beats someone to death with these."
531+
components:
532+
- type: Sprite
533+
sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi
534+
state: syndicateknuckleduster
535+
- type: Clothing
536+
sprite: Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi
537+
- type: MeleeWeapon
538+
attackRate: 1.5
539+
damage:
540+
types:
541+
Blunt: 8
542+
Piercing: 8
543+
soundHit:
544+
collection: Punch
545+
animation: WeaponArcFist
546+
mustBeEquippedToUse: true
547+
- type: Tag
548+
tags:
549+
- WhitelistChameleon
550+
551+
- type: entity
552+
name: stun knuckle dusters
553+
parent: [ClothingHandsBase, BaseToggleClothing, BaseSecurityContraband]
554+
id: ClothingHandsKnuckleDustersStun
555+
description: A pair of knuckle dusters combined with the tech of a stun baton. This makes beating tiders a whole lot easier.
556+
components:
557+
- type: Sprite
558+
sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi
559+
layers:
560+
- state: knuckleduster_off
561+
map: [ "enum.ToggleVisuals.Layer" ]
562+
- type: Clothing
563+
sprite: Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi
564+
equippedPrefix: on
565+
- type: Appearance
566+
- type: GenericVisualizer
567+
visuals:
568+
enum.ToggleVisuals.Toggled:
569+
enum.ToggleVisuals.Layer:
570+
True: {state: knuckleduster_on}
571+
False: {state: knuckleduster_off}
572+
- type: ToggleClothing
573+
action: ActionToggleKnuckleDustersStun
574+
- type: ItemToggle
575+
predictable: false
576+
soundActivate:
577+
collection: sparks
578+
params:
579+
variation: 0.250
580+
volume: 5
581+
soundDeactivate:
582+
collection: sparks
583+
params:
584+
variation: 0.250
585+
volume: 5
586+
soundFailToActivate:
587+
path: /Audio/Machines/button.ogg
588+
params:
589+
variation: 0.250
590+
volume: 5
591+
- type: Stunbaton
592+
energyPerUse: 50
593+
- type: ItemToggleMeleeWeapon
594+
activatedDamage:
595+
types:
596+
Blunt: 0
597+
- type: MeleeWeapon
598+
attackRate: 1.5
599+
damage:
600+
types:
601+
Blunt: 8
602+
bluntStaminaDamageFactor: 2.0
603+
animation: WeaponArcFist
604+
- type: StaminaDamageOnHit
605+
damage: 35
606+
sound: /Audio/Weapons/egloves.ogg
607+
- type: StaminaDamageOnCollide
608+
damage: 35
609+
sound: /Audio/Weapons/egloves.ogg
610+
- type: LandAtCursor # it deals stamina damage when thrown
611+
- type: Battery
612+
maxCharge: 1000
613+
startingCharge: 1000
614+
- type: GuideHelp
615+
guides:
616+
- Security
617+
- Antagonists
618+
619+
- type: entity #Admeme
620+
parent: ClothingHandsKnuckleDusters
621+
id: ClothingHandsKnuckleBoneCrushers
622+
name: bone crushers
623+
description: "Blessed by the Gods to break all those who don't obey."
624+
components:
625+
- type: Sprite
626+
sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi
627+
state: goldenknuckleduster
628+
- type: Clothing
629+
sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi
630+
- type: Fiber
631+
fiberColor: fibers-gold
632+
- type: MeleeWeapon
633+
attackRate: 2
634+
damage:
635+
types:
636+
Blunt: 35
637+
soundHit:
638+
collection: Punch
639+
animation: WeaponArcFist
640+
- type: Tag
641+
tags: [] # ignore "WhitelistChameleon" tag
642+

Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@
357357
- id: Shiv
358358
- id: SawImprov
359359
- id: HydroponicsToolMiniHoe
360+
- id: ClothingHandsKnuckleDusters
360361

361362
- type: entity
362363
name: Maint Loot Spawner

Resources/Prototypes/Objectives/stealTargetGroups.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@
4242
sprite: Objects/Misc/qm_clipboard.rsi
4343
state: qm_clipboard
4444

45+
- type: stealTargetGroup
46+
id: ClothingHandsKnuckleDustersQM
47+
name: steal-target-groups-clothing-hands-knuckledusters-qm
48+
sprite:
49+
sprite: Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi
50+
state: goldenknuckleduster
51+
4552
- type: stealTargetGroup
4653
id: FoodMeatCorgi
4754
name: steal-target-groups-food-meat-corgi

Resources/Prototypes/Objectives/traitor.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,16 @@
233233
stealGroup: BoxFolderQmClipboard
234234
owner: job-name-qm
235235

236+
- type: entity
237+
parent: BaseTraitorStealObjective
238+
id: KnuckleDustersStealObjective
239+
components:
240+
- type: NotJobRequirement
241+
job: Quartermaster
242+
- type: StealCondition
243+
stealGroup: ClothingHandsKnuckleDustersQM
244+
owner: job-name-qm
245+
236246
## hop
237247

238248
- type: entity

0 commit comments

Comments
 (0)