From 34d9e0d60cf33823ae425fbb3c5a4c2bedeb7c5e Mon Sep 17 00:00:00 2001
From: zelezniciar1 <39102800+zelezniciar1@users.noreply.github.com>
Date: Tue, 17 Sep 2024 23:40:13 +0000
Subject: [PATCH] Re-Adds Fireaxe Prying (#921)
# Description
- Makes the fireaxe once again able to perform its primary function.
- There is now a way to emergency space a room without using an RCD.
- Viva Atmosia.
---
# TODO
[x] Return Fireaxe Prying
---
Media
---
# Changelog
:cl: zelezniciar
- tweak: The fireaxe once again can pry subfloors
Co-authored-by: SsalamethVersaach
---
Resources/Locale/en-US/tools/tool-qualities.ftl | 5 ++++-
.../Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 1 +
Resources/Prototypes/Tiles/plating.yml | 6 ++++++
Resources/Prototypes/tool_qualities.yml | 7 +++++++
4 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl
index 14e42390a76..2482dca5174 100644
--- a/Resources/Locale/en-US/tools/tool-qualities.ftl
+++ b/Resources/Locale/en-US/tools/tool-qualities.ftl
@@ -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
\ No newline at end of file
+tool-quality-digging-tool-name = Shovel
+
+tool-quality-axing-name = Axing
+tool-quality-axing-tool-name = Fireaxe
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index b30a2855796..6630a22ea7d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -43,6 +43,7 @@
- type: Tool
qualities:
- Prying
+ - Axing
- type: ToolTileCompatible
- type: Prying
- type: UseDelay
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 7edb1ae784c..0a74ef9fd43 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -4,6 +4,7 @@
sprite: /Textures/Tiles/plating.png
baseTurf: Lattice
isSubfloor: true
+ deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
@@ -20,6 +21,7 @@
- 1.0
baseTurf: Lattice
isSubfloor: true
+ deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
@@ -31,6 +33,7 @@
sprite: /Textures/Tiles/plating_burnt.png
baseTurf: Lattice
isSubfloor: true
+ deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
@@ -42,6 +45,7 @@
sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
baseTurf: Lattice
isSubfloor: true
+ deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
@@ -53,6 +57,7 @@
sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
baseTurf: Lattice
isSubfloor: true
+ deconstructTools: [ Axing ]
footstepSounds:
collection: FootstepPlating
friction: 0.3
@@ -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
diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml
index ff55d9fcf14..4508ea94b71 100644
--- a/Resources/Prototypes/tool_qualities.yml
+++ b/Resources/Prototypes/tool_qualities.yml
@@ -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 }