diff --git a/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml new file mode 100644 index 0000000000..99c1d707ea --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml @@ -0,0 +1,83 @@ +- type: entity + name: brass knuckles + parent: ClothingHandsBase + id: WeaponBrassKnuckles + description: Ever wanted to protect your bar but your hands are too big for guns? S.E.S.W.C has what you need! + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + - type: MeleeWeapon + autoAttack: true + attackRate: 2 # ~12 dps + damage: + types: + Blunt: 6 + soundHit: + collection: Punch + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: StaminaDamageOnHit + damage: 11 + - type: Armor + modifiers: + coefficients: + Shock: 1.05 # oh no so conductive + - type: Insulated + coefficient: 1.5 # Extra damage. Don't punch wires, kids. + - type: Tag + tags: + - WhitelistChameleon + - BrassKnuckles + - type: PhysicalComposition + materialComposition: + Brass: 1000 + - type: StaticPrice + price: 300 # Ensures these can be sold and have a reasonable vending value. + +- type: entity + name: improvised brass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesImprovised + description: Ever wanted to punch just a little harder? + components: + - type: MeleeWeapon + attackRate: 1.6 # ~9.6 dps + - type: Construction + graph: GraphWeaponBrassKnucklesImprovised + node: WeaponBrassKnucklesImprovised + +- type: entity + name: crass knuckles + parent: WeaponBrassKnuckles + id: WeaponBrassKnucklesWhoopie + description: Questionably silent, questionably deadly. + components: + - type: Sprite + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + - type: Clothing + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + - type: MeleeWeapon + damage: + types: + Blunt: 0 # ~0 dps :^) + Structural: 0 + soundHit: + collection: Parp + - type: Construction + graph: GraphWeaponBrassKnucklesWhoopie + node: WeaponBrassKnucklesWhoopie + - type: StaminaDamageOnHit + damage: 4 # 8 per second, similar to the toy hammer + - type: Armor + modifiers: + coefficients: + Shock: 1.0 # Nothing special. + - type: Insulated + coefficient: 1 # Nothing special. + - type: Tag + tags: + - WhitelistChameleon diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml new file mode 100644 index 0000000000..8ea2629002 --- /dev/null +++ b/Resources/Prototypes/Floof/Recipes/Crafting/Graphs/brassknuckles_graph.yml @@ -0,0 +1,36 @@ +- type: constructionGraph + id: GraphWeaponBrassKnucklesImprovised + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesImprovised + steps: + - material: Brass + amount: 10 + doAfter: 4 + - node: WeaponBrassKnucklesImprovised + entity: WeaponBrassKnucklesImprovised + +- type: constructionGraph + id: GraphWeaponBrassKnucklesWhoopie + start: start + graph: + - node: start + edges: + - to: WeaponBrassKnucklesWhoopie + steps: + - tag: BrassKnuckles + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + name: brass knuckles + doAfter: 2 + - tag: WhoopieCushion + icon: + sprite: Objects/Fun/whoopie.rsi + state: icon + name: whoopie cushion + doAfter: 2 + - node: WeaponBrassKnucklesWhoopie + entity: WeaponBrassKnucklesWhoopie diff --git a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml index a89e5f5e41..f4fa65485e 100644 --- a/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml @@ -24,3 +24,29 @@ sprite: Floof/Structures/sleepingbag.rsi state: open objectType: Item + +- type: construction + name: improvised brass knuckles + id: BrassKnucklesImprovised + graph: GraphWeaponBrassKnucklesImprovised + startNode: start + targetNode: WeaponBrassKnucklesImprovised + category: construction-category-weapons + description: Ever wanted to punch just a little harder? + icon: + sprite: Floof/Objects/Weapons/Melee/brassknuckles.rsi + state: icon + objectType: Item + +- type: construction + name: crass knuckles + id: CrassKnuckles + graph: GraphWeaponBrassKnucklesWhoopie + startNode: start + targetNode: WeaponBrassKnucklesWhoopie + category: construction-category-weapons + description: Questionably silent, unquestionably deadly. + icon: + sprite: Floof/Objects/Weapons/Melee/crassknuckles.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/Loadouts/Jobs/service.yml b/Resources/Prototypes/Loadouts/Jobs/service.yml index f2301e6aa0..48cad8e7ed 100644 --- a/Resources/Prototypes/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Loadouts/Jobs/service.yml @@ -334,7 +334,23 @@ - WeaponSniperMosinRubber - type: loadout # Floof - id: LoadoutServiceBartenderArgentiNonlethal + id: LoadoutServiceBartenderBrassKnuckles + category: JobsServiceBartender + cost: 0 + exclusive: true + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutBartenderWeapon + - !type:CharacterJobRequirement + jobs: + - Bartender + - !type:CharacterSpeciesRequirement + species: + - Oni + items: + - WeaponBrassKnuckles + +- type: loadout category: JobsServiceBartender cost: 0 exclusive: true @@ -344,6 +360,7 @@ - !type:CharacterJobRequirement jobs: - Bartender + id: LoadoutServiceBartenderArgentiNonlethal items: - WeaponRevolverArgentiNonlethal diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index fb8d005c24..70157410ee 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1363,3 +1363,8 @@ - type: Tag id: WriteIgnoreStamps + +#Floof tags + +- type: Tag + id: BrassKnuckles diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png new file mode 100644 index 0000000000..15c95b994a Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png new file mode 100644 index 0000000000..537c32f1bb Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png new file mode 100644 index 0000000000..5543d82e7b Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png new file mode 100644 index 0000000000..eb143f6032 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json new file mode 100644 index 0000000000..b72e9836ed --- /dev/null +++ b/Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by Whatstone, inhand-left, inhand-right by VividPups, equipped-HAND by VividPups and modified by Whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png new file mode 100644 index 0000000000..cf1893f7b4 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png new file mode 100644 index 0000000000..03fe3c298d Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png new file mode 100644 index 0000000000..06e2ca400d Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png new file mode 100644 index 0000000000..45893fcc66 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json new file mode 100644 index 0000000000..7d2effdd44 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon by Whatstone, inhand-left, inhand-right, equipped-HAND by VividPups, modified by Whatstone", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}