From 024208388390dd7272a2a049a2b5474de5aabf30 Mon Sep 17 00:00:00 2001 From: zumorica Date: Sat, 23 May 2020 12:08:00 +0200 Subject: [PATCH] Fix conflict screw up --- Resources/Prototypes/Entities/Items/tools.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Items/tools.yml b/Resources/Prototypes/Entities/Items/tools.yml index 97e60b4c44..37f8b8ad27 100644 --- a/Resources/Prototypes/Entities/Items/tools.yml +++ b/Resources/Prototypes/Entities/Items/tools.yml @@ -37,13 +37,12 @@ components: - type: Sprite sprite: Objects/Tools/screwdriver.rsi - state: screwdriver + layers: + - state: screwdriver-map + - state: screwdriver-screwybits - type: Icon sprite: Objects/Tools/screwdriver.rsi state: screwdriver - layers: - - state: screwdriver-map - - state: screwdriver-screwybits - type: Icon sprite: Objects/Tools/screwdriver.rsi