Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-Adds Fireaxe Prying #921

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Re-Adds Fireaxe Prying #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Resources/Locale/en-US/tools/tool-qualities.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ tool-quality-rolling-name = Rolling
tool-quality-rolling-tool-name = Rolling Pin

tool-quality-digging-name = Digging
tool-quality-digging-tool-name = Shovel
tool-quality-digging-tool-name = Shovel

tool-quality-axing-name = Axing
tool-quality-axing-tool-name = Fireaxe
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
- type: Tool
qualities:
- Prying
- Axing
- type: ToolTileCompatible
- type: Prying
- type: UseDelay
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Tiles/plating.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
sprite: /Textures/Tiles/plating.png
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
Expand All @@ -20,6 +21,7 @@
- 1.0
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
Expand All @@ -31,6 +33,7 @@
sprite: /Textures/Tiles/plating_burnt.png
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
Expand All @@ -42,6 +45,7 @@
sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
Expand All @@ -53,6 +57,7 @@
sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
Expand All @@ -64,6 +69,7 @@
sprite: /Textures/Tiles/snow_plating.png #Not in the snow planet RSI because it doesn't have any metadata. Should probably be moved to its own folder later.
baseTurf: Lattice
isSubfloor: true
deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.15 #a little less then actual snow
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/tool_qualities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,10 @@
toolName: tool-quality-rolling-tool-name
spawn: RollingPin
icon: { sprite: Objects/Tools/rolling_pin.rsi, state: icon }

- type: tool
id: Axing
name: tool-quality-axing-name
toolName: tool-quality-axing-tool-name
spawn: FireAxe
icon: { sprite: Objects/Weapons/Melee/fireaxe.rsi, state: icon }
Loading