Skip to content

Commit

Permalink
Merge branch 'master' into Floofstation-V7
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxxoTrystan committed Dec 7, 2024
2 parents e2378ad + 344bada commit 354cbf7
Show file tree
Hide file tree
Showing 17 changed files with 239 additions and 5 deletions.
18 changes: 18 additions & 0 deletions Resources/Changelog/Floof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1729,3 +1729,21 @@ Entries:
id: 226
time: '2024-12-07T06:16:59.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/383
- author: VividPups
changes:
- type: Add
message: 'brass-knuckles to the oni loadout '
- type: Add
message: can now craft brass knuckles as a stun weapon
- type: Add
message: 'the crass-knuckles '
id: 227
time: '2024-12-07T15:04:35.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/371
- author: fenndragon
changes:
- type: Fix
message: 'Fixed Irregular Extended '
id: 228
time: '2024-12-07T15:06:13.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/385
83 changes: 83 additions & 0 deletions Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions Resources/Prototypes/Floof/Recipes/Crafting/improvised.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions Resources/Prototypes/GameRules/roundstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@
startingSlope: 0.2
downwardsLimit: -0.35
upwardsLimit: 0.4

# More likely to go down than up, so calmness prevails
- type: entity
id: IrregularExtendedStationEventScheduler
Expand All @@ -274,9 +273,7 @@
startingSlope: -1
downwardsLimit: -0.4
upwardsLimit: 0.3
downwardsBias: -1.1
upwardsBias: 0.9


# variation passes
- type: entity
id: BasicRoundstartVariation
Expand Down
19 changes: 18 additions & 1 deletion Resources/Prototypes/Loadouts/Jobs/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -344,6 +360,7 @@
- !type:CharacterJobRequirement
jobs:
- Bartender
id: LoadoutServiceBartenderArgentiNonlethal
items:
- WeaponRevolverArgentiNonlethal

Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1363,3 +1363,8 @@

- type: Tag
id: WriteIgnoreStamps

#Floof tags

- type: Tag
id: BrassKnuckles
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit 354cbf7

Please sign in to comment.