From 220d2e65a9196d415222ab72f266cd8c6ad08690 Mon Sep 17 00:00:00 2001 From: Dexler <69513582+DexlerXD@users.noreply.github.com> Date: Sun, 18 Feb 2024 22:29:38 +0300 Subject: [PATCH 1/2] fixed fireaxe and wirecutter prying --- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 2 +- Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 26d728f251fe..e1cc34c249d1 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -37,7 +37,7 @@ - type: Item sprite: Objects/Tools/wirecutters.rsi storedRotation: -90 - - type: ToolTileCompatible +# - type: ToolTileCompatible SS220-tools-tile-prying-fix - type: PhysicalComposition materialComposition: Steel: 100 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index b46ee0963360..8b4d516b9d6e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -37,6 +37,7 @@ - type: Tool qualities: - Prying + - PlatingCutting #SS220-tools-tile-prying-fix - type: ToolTileCompatible - type: Prying - type: UseDelay From 7106282bfcfaa626c982ac0a04a1a1a36b7aff03 Mon Sep 17 00:00:00 2001 From: Dexler <69513582+DexlerXD@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:20:01 +0300 Subject: [PATCH 2/2] at last, the test fix --- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 2 +- Resources/Prototypes/Tiles/plating.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index e1cc34c249d1..26d728f251fe 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -37,7 +37,7 @@ - type: Item sprite: Objects/Tools/wirecutters.rsi storedRotation: -90 -# - type: ToolTileCompatible SS220-tools-tile-prying-fix + - type: ToolTileCompatible - type: PhysicalComposition materialComposition: Steel: 100 diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml index f8212e1b8571..b90211c4402a 100644 --- a/Resources/Prototypes/Tiles/plating.yml +++ b/Resources/Prototypes/Tiles/plating.yml @@ -3,7 +3,7 @@ name: tiles-plating sprite: /Textures/Tiles/plating.png baseTurf: Lattice - deconstructTools: [ PlatingCutting, Cutting ] #SS220 JOL TilePryingng + deconstructTools: [ PlatingCutting ] #SS220 JOL TilePryingng && tools-tile-prying-fix isSubfloor: true footstepSounds: collection: FootstepPlating @@ -20,7 +20,7 @@ - 1.0 - 1.0 baseTurf: Lattice - deconstructTools: [ PlatingCutting, Cutting ] #SS220 JOL TilePryingng + deconstructTools: [ PlatingCutting ] #SS220 JOL TilePryingng && tools-tile-prying-fix isSubfloor: true footstepSounds: collection: FootstepPlating @@ -32,7 +32,7 @@ name: tiles-plating sprite: /Textures/Tiles/plating_burnt.png baseTurf: Lattice - deconstructTools: [ PlatingCutting, Cutting ] #SS220 JOL TilePryingng + deconstructTools: [ PlatingCutting ] #SS220 JOL TilePryingng && tools-tile-prying-fix isSubfloor: true footstepSounds: collection: FootstepPlating @@ -44,7 +44,7 @@ name: tiles-asteroid-plating sprite: /Textures/Tiles/Asteroid/asteroid_plating.png baseTurf: Lattice - deconstructTools: [ PlatingCutting, Cutting ] #SS220 JOL TilePryingng + deconstructTools: [ PlatingCutting ] #SS220 JOL TilePryingng && tools-tile-prying-fix isSubfloor: true footstepSounds: collection: FootstepPlating @@ -56,7 +56,7 @@ name: tiles-snow-plating 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 - deconstructTools: [ PlatingCutting, Cutting ] #SS220 JOL TilePryingng + deconstructTools: [ PlatingCutting ] #SS220 JOL TilePryingng && tools-tile-prying-fix isSubfloor: true footstepSounds: collection: FootstepPlating