From be718fd30933107be34a88246b6f4ee4ce72d394 Mon Sep 17 00:00:00 2001 From: Swept Date: Wed, 11 Aug 2021 09:37:31 -0700 Subject: [PATCH] Parents crowbar-red and merges RSIs --- .../Entities/Objects/Tools/tools.yml | 21 +++++------------- .../Objects/Tools/crowbar.rsi/meta.json | 15 +++++++++++++ .../red-equipped-BELT.png} | Bin .../icon.png => crowbar.rsi/red-icon.png} | Bin .../red-inhand-left.png} | Bin .../red-inhand-right.png} | Bin .../crowbar_red.rsi/red-equipped-BELT.png | Bin 0 -> 150 bytes .../Tools/crowbar_red.rsi/red-icon.png | Bin 0 -> 200 bytes .../Tools/crowbar_red.rsi/red-inhand-left.png | Bin 0 -> 322 bytes .../crowbar_red.rsi/red-inhand-right.png | Bin 0 -> 329 bytes 10 files changed, 21 insertions(+), 15 deletions(-) rename Resources/Textures/Objects/Tools/{crowbar_red.rsi/equipped-BELT.png => crowbar.rsi/red-equipped-BELT.png} (100%) rename Resources/Textures/Objects/Tools/{crowbar_red.rsi/icon.png => crowbar.rsi/red-icon.png} (100%) rename Resources/Textures/Objects/Tools/{crowbar_red.rsi/inhand-left.png => crowbar.rsi/red-inhand-left.png} (100%) rename Resources/Textures/Objects/Tools/{crowbar_red.rsi/inhand-right.png => crowbar.rsi/red-inhand-right.png} (100%) create mode 100644 Resources/Textures/Objects/Tools/crowbar_red.rsi/red-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tools/crowbar_red.rsi/red-icon.png create mode 100644 Resources/Textures/Objects/Tools/crowbar_red.rsi/red-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/crowbar_red.rsi/red-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index af8dfc7c1d..0f470756ed 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -116,29 +116,20 @@ - type: entity name: emergency crowbar - parent: BaseItem + parent: Crowbar id: CrowbarRed - description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: - type: Tag tags: - Crowbar - CrowbarRed - type: Sprite - sprite: Objects/Tools/crowbar_red.rsi - state: icon + sprite: Objects/Tools/crowbar.rsi + state: red-icon - type: Item - sprite: Objects/Tools/crowbar_red.rsi - size: 5 - - type: ItemCooldown - - type: MeleeWeapon - damage: 7 - - type: Tool - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg - - type: TilePrying + sprite: Objects/Tools/crowbar.rsi + size: 10 + HeldPrefix: red - type: entity name: multitool diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index 0fa78806cf..1778efa00c 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -15,12 +15,27 @@ "name": "inhand-right", "directions": 4 }, + { + "name": "red-inhand-left", + "directions": 4 + }, + { + "name": "red-inhand-right", + "directions": 4 + }, { "name": "icon" }, + { + "name": "red-icon" + }, { "name": "equipped-BELT", "directions": 4 + }, + { + "name": "red-equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-equipped-BELT.png similarity index 100% rename from Resources/Textures/Objects/Tools/crowbar_red.rsi/equipped-BELT.png rename to Resources/Textures/Objects/Tools/crowbar.rsi/red-equipped-BELT.png diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png similarity index 100% rename from Resources/Textures/Objects/Tools/crowbar_red.rsi/icon.png rename to Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-left.png rename to Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-left.png diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-right.png rename to Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-right.png diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-equipped-BELT.png b/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..e512032624530912dbaabfa63c149c143712da83 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=v7RoDAr*7pUhU>Qpuod=;DR96 zxyhucR11Rt^`yD2X!jO$Fq8uFPbQ8RJ`R{+4hb8?`wbla+m%%P3OT4 oj+pn|JFJ;RmdKI;Vst0F)vycK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ac25643123eae1511c713087fb498e3faf6db763 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*Z&Rw_4M=#^7GTu(n3Q* zcCoU~WMIf}RV@Z%-FoVOh8)-mJoTrOph{nX^gasTNT#G(QPMyLMz|!I~ zM>J4G!@5gCQCrYdFrmavD1k>iC85MgNWfP-K_Jj2^uU3RWei8TCNQNqu(LWn%ix+K t8~CHiNo@s}OGtpIfdSVdEeRC{hDGmr{NG9Ep99*&;OXk;vd$@?2>^21I5PkM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-inhand-left.png b/Resources/Textures/Objects/Tools/crowbar_red.rsi/red-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..79cada41ced710144bfd328181d5476f93607212 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0Fu;fk97CFD)%CG$f>x zQJ5Vl#8?vK7tG-B>_!@pQ&1HWQR0$XoLrPyP?DLS$G}iACpfI2sPy}n;DV1|pJ;jO zYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jYwpz8Z=<gE*^OQv=kuhlR#7d>M3Bq*%lYcZoV9|PkInHl0U5{iI!r+T_LhIn))CrGd^ zPFTROn5k!JM=axH0V`%%4Xp*2X1GZx2H$89c4=hRs}x*?vuWMD{3OA8GN z@pV@Nsbwq)@(X5gcy=QV$SJ4_i70VNElw`VEGWs$&tqVym=hdUP*nQ;OK`!*uTQkR zb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(urLlXzHIEJFz3;vBa=cDf;D$)?6=X}sIgDO z)U~tQSatIXi6v9Jjn`@znu{JWdlD2@@U@sxnva2ThRh7{83{!|yK_8U978-hlM^IZ z7dQNK;8?9OnW5+CijGi5rw9**)l54q7Ax}2P890l+i~X^M`%LRVJ^WL7n^phIk2!$ zq^Bv+LFYgmlLF%vB?j+#&YCV8rfD2vx^c7MK$D6_lk2>Tk~dl0b+jgMcRma^0EW~? W7QX8;)owt089ZJ6T-G@yGywn$V|7FT literal 0 HcmV?d00001