Merge pull request #95 from FireNameFN/ReturnFireaxeAdvancedPrying

Returned advanced prying to fireaxe
Corvax-Frontier · Apr 30, 2024 · dd80173 · dd80173
2 parents 0cac50a + 4b5f353
commit dd80173
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl
@@ -4,6 +4,9 @@ tool-quality-anchoring-tool-name = Wrench
 tool-quality-prying-name = Prying
 tool-quality-prying-tool-name = Crowbar
 
+tool-quality-advanced-prying-name = Advanced Prying
+tool-quality-advanced-prying-tool-name = Fireaxe
+
 tool-quality-screwing-name = Screwing
 tool-quality-screwing-tool-name = Screwdriver
 

diff --git a/Resources/Locale/ru-RU/tools/tool-qualities.ftl b/Resources/Locale/ru-RU/tools/tool-qualities.ftl
@@ -2,6 +2,8 @@ tool-quality-anchoring-name = Закрепление
 tool-quality-anchoring-tool-name = Гаечный ключ
 tool-quality-prying-name = Монтирование
 tool-quality-prying-tool-name = Лом
+tool-quality-advanced-prying-name = Продвинутое Монтирование
+tool-quality-advanced-prying-tool-name = Пожарный Топор
 tool-quality-screwing-name = Свинчивание
 tool-quality-screwing-tool-name = Отвертка
 tool-quality-cutting-name = Резка

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -40,6 +40,7 @@
   - type: Tool
     qualities:
       - Prying
+      - AdvancedPrying
   - type: ToolTileCompatible
   - type: Prying
   - type: UseDelay

diff --git 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: [ AdvancedPrying ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -20,6 +21,7 @@
   - 1.0
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ AdvancedPrying ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -31,6 +33,7 @@
   sprite: /Textures/Tiles/plating_burnt.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ AdvancedPrying ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -42,6 +45,7 @@
   sprite: /Textures/Tiles/Asteroid/asteroid_plating.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ AdvancedPrying ]
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -53,6 +57,7 @@
   sprite: /Textures/Tiles/Misc/clockwork/clockwork_floor.png
   baseTurf: Lattice
   isSubfloor: true
+  deconstructTools: [ AdvancedPrying ]
   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: [ AdvancedPrying ]
   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
@@ -12,6 +12,13 @@
   spawn: Crowbar
   icon: { sprite: Objects/Tools/crowbar.rsi, state: icon }
 
+- type: tool
+  id: AdvancedPrying
+  name: tool-quality-advanced-prying-name
+  toolName: tool-quality-advanced-prying-tool-name
+  spawn: FireAxe
+  icon: { sprite: Objects/Weapons/Melee/fireaxe.rsi, state: icon }
+
 - type: tool
   id: Screwing
   name: tool-quality-screwing-name