From 67143b1371590a531ddb6273c035956c68beddf9 Mon Sep 17 00:00:00 2001 From: Swept Date: Sun, 24 May 2020 16:56:19 +0000 Subject: [PATCH] Toolboxes Update (#985) --- Content.Client/EntryPoint.cs | 3 + .../Components/Power/AutolatheVisualizer2D.cs | 10 ++- .../Power/ProtolatheVisualizer2D.cs | 10 ++- .../Construction/ConstructionComponent.cs | 1 + .../Fill/ToolboxEmergencyFillComponent.cs | 39 ++++++++ .../Storage/Fill/ToolboxGoldFillComponent.cs | 39 ++++++++ .../Components/Research/LatheComponent.cs | 3 + .../Construction/ConstructionPrototype.cs | 1 + .../Components/Power/SharedLatheComponent.cs | 5 +- .../Components/SharedStackComponent.cs | 3 +- .../Prototypes/Entities/Items/materials.yml | 24 +++++ .../Prototypes/Entities/Items/toolbox.yml | 83 ++++++++++++++++-- Resources/Prototypes/materials.yml | 9 ++ .../autolathe_inserting_gold_plate.png | Bin 0 -> 1709 bytes .../Buildings/autolathe.rsi/meta.json | 17 ++++ .../Textures/Objects/Tools/Toolbox_b.png | Bin 241 -> 0 bytes .../Textures/Objects/Tools/Toolbox_y.png | Bin 241 -> 0 bytes .../Tools/Toolboxes/toolbox_blue.rsi/icon.png | Bin 0 -> 182 bytes .../toolbox_blue.rsi/inhand-left.png | Bin 0 -> 297 bytes .../toolbox_blue.rsi/inhand-right.png | Bin 0 -> 296 bytes .../Toolboxes/toolbox_blue.rsi/meta.json | 55 ++++++++++++ .../Tools/Toolboxes/toolbox_gold.rsi/icon.png | Bin 0 -> 1383 bytes .../toolbox_gold.rsi/inhand-left.png | Bin 0 -> 319 bytes .../toolbox_gold.rsi/inhand-right.png | Bin 0 -> 317 bytes .../Toolboxes/toolbox_gold.rsi/meta.json | 72 +++++++++++++++ .../Toolboxes/toolbox_green.rsi/icon.png | Bin 0 -> 280 bytes .../toolbox_green.rsi/inhand-left.png | Bin 0 -> 301 bytes .../toolbox_green.rsi/inhand-right.png | Bin 0 -> 300 bytes .../Toolboxes/toolbox_green.rsi/meta.json | 55 ++++++++++++ .../Tools/Toolboxes/toolbox_red.rsi/icon.png | Bin 0 -> 182 bytes .../Toolboxes/toolbox_red.rsi/inhand-left.png | Bin 0 -> 296 bytes .../toolbox_red.rsi/inhand-right.png | Bin 0 -> 295 bytes .../Tools/Toolboxes/toolbox_red.rsi/meta.json | 55 ++++++++++++ .../Tools/Toolboxes/toolbox_syn.rsi/icon.png | Bin 0 -> 187 bytes .../Toolboxes/toolbox_syn.rsi/inhand-left.png | Bin 0 -> 325 bytes .../toolbox_syn.rsi/inhand-right.png | Bin 0 -> 301 bytes .../Tools/Toolboxes/toolbox_syn.rsi/meta.json | 55 ++++++++++++ .../Toolboxes/toolbox_yellow.rsi/icon.png | Bin 0 -> 173 bytes .../toolbox_yellow.rsi/inhand-left.png | Bin 0 -> 299 bytes .../toolbox_yellow.rsi/inhand-right.png | Bin 0 -> 298 bytes .../Toolboxes/toolbox_yellow.rsi/meta.json | 55 ++++++++++++ .../Textures/Objects/Tools/toolbox_r.png | Bin 241 -> 0 bytes 42 files changed, 581 insertions(+), 13 deletions(-) create mode 100644 Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs create mode 100644 Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs create mode 100644 Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png delete mode 100644 Resources/Textures/Objects/Tools/Toolbox_b.png delete mode 100644 Resources/Textures/Objects/Tools/Toolbox_y.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Tools/toolbox_r.png diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index d90835489c..404e20157d 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -68,6 +68,9 @@ namespace Content.Client "Explosive", "OnUseTimerTrigger", "ToolboxElectricalFill", + "ToolboxEmergencyFill", + "WarpPoint", + "ToolboxGoldFill", "ToolLockerFill", "EmitSoundOnUse", "FootstepModifier", diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs index 6ad061678b..e8eb61f505 100644 --- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer2D.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.GameObjects.Components.Power; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -16,6 +16,7 @@ namespace Content.Client.GameObjects.Components.Power private Animation _buildingAnimation; private Animation _insertingMetalAnimation; private Animation _insertingGlassAnimation; + private Animation _insertingGoldAnimation; public override void LoadData(YamlMappingNode node) { @@ -24,6 +25,7 @@ namespace Content.Client.GameObjects.Components.Power _buildingAnimation = PopulateAnimation("autolathe_building", "autolathe_building_unlit", 0.5f); _insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f); _insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f); + _insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f); } private Animation PopulateAnimation(string sprite, string spriteUnlit, float length) @@ -91,6 +93,12 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Play(_insertingGlassAnimation, AnimationKey); } break; + case LatheVisualState.InsertingGold: + if (!animPlayer.HasRunningAnimation(AnimationKey)) + { + animPlayer.Play(_insertingGoldAnimation, AnimationKey); + } + break; default: throw new ArgumentOutOfRangeException(); } diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs index 4547c1668c..cc58ff6c53 100644 --- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer2D.cs @@ -1,4 +1,4 @@ -using System; +using System; using Content.Shared.GameObjects.Components.Power; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -16,6 +16,7 @@ namespace Content.Client.GameObjects.Components.Power private Animation _buildingAnimation; private Animation _insertingMetalAnimation; private Animation _insertingGlassAnimation; + private Animation _insertingGoldAnimation; public override void LoadData(YamlMappingNode node) { @@ -24,6 +25,7 @@ namespace Content.Client.GameObjects.Components.Power _buildingAnimation = PopulateAnimation("protolathe_building", 0.9f); _insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f); _insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f); + _insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f); } private Animation PopulateAnimation(string sprite, float length) @@ -87,6 +89,12 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Play(_insertingGlassAnimation, AnimationKey); } break; + case LatheVisualState.InsertingGold: + if (!animPlayer.HasRunningAnimation(AnimationKey)) + { + animPlayer.Play(_insertingGoldAnimation, AnimationKey); + } + break; default: throw new ArgumentOutOfRangeException(); } diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs index ecaec70e5a..8e9c91bd1a 100644 --- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs +++ b/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs @@ -163,6 +163,7 @@ namespace Content.Server.GameObjects.Components.Construction = new Dictionary { { StackType.Cable, MaterialType.Cable }, + { StackType.Gold, MaterialType.Gold }, { StackType.Glass, MaterialType.Glass }, { StackType.Metal, MaterialType.Metal } }; diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs new file mode 100644 index 0000000000..349ccb01b9 --- /dev/null +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxEmergencyFillComponent.cs @@ -0,0 +1,39 @@ +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Random; + +namespace Content.Server.GameObjects.Components.Items.Storage.Fill +{ + [RegisterComponent] + internal sealed class ToolboxEmergencyFillComponent : Component, IMapInit + { + public override string Name => "ToolboxEmergencyFill"; + +#pragma warning disable 649 + [Dependency] private readonly IEntityManager _entityManager; +#pragma warning restore 649 + + void IMapInit.MapInit() + { + var storage = Owner.GetComponent(); + var random = IoCManager.Resolve(); + + void Spawn(string prototype) + { + storage.Insert(_entityManager.SpawnEntity(prototype, Owner.Transform.GridPosition)); + } + + Spawn("BreathMaskClothing"); + Spawn("BreathMaskClothing"); + Spawn("FoodChocolateBar"); + Spawn("FlashlightLantern"); + Spawn("FlashlightLantern"); + + Spawn(random.Prob(0.15f) ? "HarmonicaInstrument" : "FoodChocolateBar"); + } + } +} diff --git a/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs new file mode 100644 index 0000000000..595babd5ca --- /dev/null +++ b/Content.Server/GameObjects/Components/Items/Storage/Fill/ToolboxGoldFillComponent.cs @@ -0,0 +1,39 @@ +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Interfaces.Random; +using Robust.Shared.IoC; +using Robust.Shared.Map; +using Robust.Shared.Random; + +namespace Content.Server.GameObjects.Components.Items.Storage.Fill +{ + [RegisterComponent] + internal sealed class ToolboxGoldFillComponent : Component, IMapInit + { + public override string Name => "ToolboxGoldFill"; + +#pragma warning disable 649 + [Dependency] private readonly IEntityManager _entityManager; +#pragma warning restore 649 + + void IMapInit.MapInit() + { + var storage = Owner.GetComponent(); + var random = IoCManager.Resolve(); + + void Spawn(string prototype) + { + storage.Insert(_entityManager.SpawnEntity(prototype, Owner.Transform.GridPosition)); + } + + Spawn("GoldStack"); + Spawn("GoldStack"); + Spawn("GoldStack"); + Spawn("GoldStack"); + Spawn("GoldStack"); + + Spawn(random.Prob(0.05f) ? "DrinkGoldenCup" : "GoldStack"); + } + } +} diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/GameObjects/Components/Research/LatheComponent.cs index 66cf882876..34c4223468 100644 --- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs +++ b/Content.Server/GameObjects/Components/Research/LatheComponent.cs @@ -190,6 +190,9 @@ namespace Content.Server.GameObjects.Components.Research case "Glass": SetAppearance(LatheVisualState.InsertingGlass); break; + case "Gold": + SetAppearance(LatheVisualState.InsertingGold); + break; } Timer.Spawn(InsertionTime, async () => diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/ConstructionPrototype.cs index 6b7a83bb25..14e62ca006 100644 --- a/Content.Shared/Construction/ConstructionPrototype.cs +++ b/Content.Shared/Construction/ConstructionPrototype.cs @@ -214,6 +214,7 @@ namespace Content.Shared.Construction Metal, Glass, Cable, + Gold, } } } diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs index 21ab0d43a0..a8dc5bb3d3 100644 --- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs +++ b/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Power @@ -9,6 +9,7 @@ namespace Content.Shared.GameObjects.Components.Power Idle, Producing, InsertingMetal, - InsertingGlass + InsertingGlass, + InsertingGold } } diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 821d0355ee..3713108839 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.Reflection; using Robust.Shared.IoC; @@ -121,6 +121,7 @@ namespace Content.Shared.GameObjects.Components Metal, Glass, Cable, + Gold, Ointment, Brutepack, FloorTileSteel, diff --git a/Resources/Prototypes/Entities/Items/materials.yml b/Resources/Prototypes/Entities/Items/materials.yml index 3f90e938c6..fd0fc0cff9 100644 --- a/Resources/Prototypes/Entities/Items/materials.yml +++ b/Resources/Prototypes/Entities/Items/materials.yml @@ -77,3 +77,27 @@ components: - type: Stack count: 1 + +- type: entity + name: Gold Bar + id: GoldStack + parent: MaterialStack + components: + - type: Material + materials: + - key: enum.MaterialKeys.Stack + mat: gold + - type: Stack + stacktype: enum.StackType.Gold + - type: Sprite + texture: Objects/Materials/goldbar_single.png + - type: Icon + texture: Objects/Materials/goldbar_single.png + +- type: entity + id: GoldStack1 + name: Gold Bar 1 + parent: GoldStack + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml index 1028efa5b1..50873d311c 100644 --- a/Resources/Prototypes/Entities/Items/toolbox.yml +++ b/Resources/Prototypes/Entities/Items/toolbox.yml @@ -18,26 +18,36 @@ description: A bright red toolbox, stocked with emergency tools components: - type: Sprite - texture: Objects/Tools/toolbox_r.png - + sprite: Objects/Tools/Toolboxes/toolbox_red.rsi + state: icon - type: Icon - texture: Objects/Tools/toolbox_r.png + sprite: Objects/Tools/Toolboxes/toolbox_red.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_red.rsi - type: entity id: ToolboxEmergencyFilled + name: Emergency Toolbox parent: ToolboxEmergency suffix: Filled + components: + - type: ToolboxEmergencyFill - type: entity name: Mechanical Toolbox parent: ToolboxBase - id: BlueToolboxItem + id: ToolboxMechanical description: A blue box, stocked with mechanical tools components: - type: Sprite - texture: Objects/Tools/Toolbox_b.png + sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi + state: icon - type: Icon - texture: Objects/Tools/Toolbox_b.png + sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_blue.rsi - type: entity name: Electrical Toolbox @@ -46,9 +56,13 @@ description: A toolbox typically stocked with electrical gear components: - type: Sprite - texture: Objects/Tools/Toolbox_y.png + sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi + state: icon - type: Icon - texture: Objects/Tools/Toolbox_y.png + sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi - type: entity id: ToolboxElectricalFilled @@ -57,3 +71,56 @@ parent: ToolboxElectrical components: - type: ToolboxElectricalFill + +- type: entity + name: Artistic Toolbox + parent: ToolboxBase + id: ToolboxArtistic + description: A toolbox typically stocked with artistic supplies + components: + - type: Sprite + sprite: Objects/Tools/Toolboxes/toolbox_green.rsi + state: icon + - type: Icon + sprite: Objects/Tools/Toolboxes/toolbox_green.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_green.rsi + +- type: entity + name: Syndicate Toolbox + parent: ToolboxBase + id: ToolboxSyndicate + description: A sinister looking toolbox filled with elite syndicate tools. + components: + - type: Sprite + sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi + state: icon + - type: Icon + sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_syn.rsi + +- type: entity + name: Golden Toolbox + parent: ToolboxBase + id: ToolboxGolden + description: A solid gold toolbox. A rapper would kill for this. + components: + - type: Sprite + sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi + state: icon + - type: Icon + sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi + state: icon + - type: Item + sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi + +- type: entity + id: ToolboxGoldFilled + name: Golden Toolbox + parent: ToolboxGolden + suffix: Filled + components: + - type: ToolboxGoldFill diff --git a/Resources/Prototypes/materials.yml b/Resources/Prototypes/materials.yml index 3cc4ffdfcc..dbf0460ed6 100644 --- a/Resources/Prototypes/materials.yml +++ b/Resources/Prototypes/materials.yml @@ -17,3 +17,12 @@ electricresistivity: 1.0e+13 thermalconductivity: 0.9 specificheat: 840 + +- type: material + id: gold + name: Gold + icon: Objects/Materials/goldbar_single.png + density: 10000 + electricresistivity: 8.0e-9 + thermalconductivity: 30 + specificheat: 1000 diff --git a/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..c793be452081d6968003d27a814c0b7a634f58ca GIT binary patch literal 1709 zcmai#dpOgJAIHBen`pMqA&SKhg+oM1gt>=Kxg2uIwY25ZaUa!gB;?k@T#j6S2}9Cp zIXOZpj4^WQAhzF@iOg(!INQ&fpZ@v%^?RP*AD_?r{m6d|!oyirO@(^1S&?gAT{FuSei}AEnC02h-Wlz2>0v`nGt}Ii=RD@) z;p8|U(aN*SJ%QW&+(nDSV9?tbJ_fzx9DacUrc0fk17m6u~MNVVWM8#f>GBPOv;4eaCqN0Y6MJ7v~j_8)0qHaq(h zY620!K4HeBTm$>hY@PP^Dha%#l1jJs3C%j$Q#IeJXCK5Fnn1jj@a_H)dyn?$Uf7YU z-!f4xr)$qa3Z!dc#ezX=3+u){+2lNT3s^=MhOJ7MbAr3p8H#=&7Ed&stfVoc8t zBh16X&B$iYWlvXtxYv_`>g2pqZ9K!^&FxgUWI4wl{1E}qZ&yBcEiTdG(ABjx!_5Kh z+novV7-9TpS=q?SOszE}j&HAos0K=Y1oQ?NmDhA8XOLzCZx*%9Pu=O`-)xoN7f9F8 zQs@IqaY(&x8QnU95k}Oz8*%7rRK-$G$$@w(aVK5L0^IrzJuY{pOFv>WK|XBbqW3kO z?V=ez7AXJCAk=7MVb^oyXIf{vsYl|8g4azGIsOzu%eja|x<$ynx4d+VjVf`1a>~Z; z9Jz-1=V;IM$kj97QtFswulgoWHHjZcHCRybV0!Ar@irBrXQFmdxjsz#!@^f5kuadp z%d($4_8`g22DkRd+;cIT)(b=aLrZ)2{woU0-_O;42KanRxvb}Sh0_QMP0u8i8mLJw zgXoO#tU}Fm`PrM(OT9Ggn-9$9l-uu8Ur?~zWCsmhNkNeiiAQ-@?u}1P{aD|hPtL<~ zIg!Up4u+9pN|;}6Aj))uy5;mQSP`Rql8FI^u5j{^+Hk0}U*&KUlGr>fPDlNfQ@$>c zwAmULGOn=Bx}I?62?Q1}~Lph2>I!>T|z&o_hs@Nv_+w(CHfFqhRu=f4Q^mCBj; z$71ch#t%9e5s04H4U5w2-V;jUbg<$3I{0NQz7yfF19IAgq^ANtvVCEY2^k=VjT2W| zOIwSC&HF_VzdKm`+z!Yuk5NAMQ3lYkJQ#_N#v8QxV(s(y?uG78@)Sr+?zi=|%DIQw z{^g5qE3iAWOFq=Uu(H#)k}1c!U> zdtg?A*y!PjB%!`dA-wX5Hi!RD;+0uz63t>*8X$GQxypnXFps%&FJ zfk`PEqt6;GSsj+lYwJ{Yl-CzG682UjpE&D{5L3&qK|jo0Ue^!)U-)ZfCF0REzd*hD^*-|;o z^_M%8+NO~V7;_P76={9_z0$2)s!~}KMsY!VqPvtED=T5cZcx7=jxk#gI7%LhK`}zA z0*6!0)JVk~bK=~6AjZyNb-(ldFX*l(U&o(jpxQb1Wp%^trpfc?7gAA43}JiW*Z=?jv&)AI`CL_tz0a&T^{2JOO`C@lDIYpsF<-N$S;_|;n|HeAg9jL#W6%Ov*MK+a~kOZcg#=EW3&&_$cj>$ZD< m1LK*cdIk?1iWDviGBAX&Dz>t=PALMqgu&C*&t;ucLK6VY*;O6@ diff --git a/Resources/Textures/Objects/Tools/Toolbox_y.png b/Resources/Textures/Objects/Tools/Toolbox_y.png deleted file mode 100644 index e04977356d6377d3df223faf6f9983b0fd703f0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*Z=?j7sN7rxXAGTA$wyE z!;hN`yB9EA+0I~XrnGtz!=`n!w?>_q3slTl666=m;PC858jw@x>EaloF)=woBE}&g zK%n*fikuvk1|0>KkcAx&HtpcpxnqaMt{n$h=1iI5;pDls7mOf!vlTcw|y^Ku=NdGN}`nkFVZkqj(XF0dZD6CA)2a`=vn oz_td)GfVXh9yk;!Tohzr2w_!hWo?~O1at|5r>mdKI;Vst0L*wz>% diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6aa7ef39ba964f0b94418f708221e280d3f11980 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*P};|D$5kh@j4py?lSeC znS9{=l`B_#d;~&)3K&a*{DK)Ap4~_Ta{N7A978lFCMQS)IRpd*cyM}fIQ;B6c1&&I zLd9dp+5#8_latd`Ra4WGg&A8Ky0}*{usjeeXk?6GYEqb>(NVzR(Yjc{PWQ%H0T-j> b044_0(-Id|KdDUs8qMJ8>gTe~DWM4fH;Ff9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9a5509406a824955a91a89ce0bf3eb9286229df8 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0UE@rr6Yfrcv*%E!wgV zfPBW1AirP+hi5m^fSkgrkcbkO)Z*l#%z~24{5%GRiaEhy1x2ObzXTV2{Q5-8TUYDc zne)LLLJck&KX{~b-beE!Ls3uf4h!QT z-Nve$S4b?G-fg^A!_Zvxh}n~%u!66}jI;R|G#<;!v@bjR9ca0qr;B5VMQ?I~1nU+? z9fd=To({qtlHv-SDNQWX9td-=a<*JJR=YSMfPtM|BAaPON{k8Psq}pefD^&r9Atdi*h^u~qe(|5g(w8CRI#^L*W9mUr@7oD zw6oh-b@K{|CDXf&*J>D=iykq15)@YOwU}`>AA`nYS()}_XTJk2_w{sf46*1C7!{oE!ePb8L`rSowoJ obR&b-0VyuQ1l|RW%$=+Z|LQm=8^<}f0S#vGboFyt=akR{03R}C00000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json new file mode 100644 index 0000000000..649baaf1b0 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f19cffe22ef6c415a4429822095aa6a582c8aeff GIT binary patch literal 1383 zcmbVMX;4#F6i$j7MPlgKxyXGE{7+ zj-Y^oT8M~abb=c}BU%!c3QS@HG-lC^4KXBvBxHT>(cp~#JKmXd&zx`W+Vf zW25k%D?Bk644%AeM}j*yyQ6IWJojErIl2;qnY)R+BjTr%jrzv+eDyBOPR7H37cV(> zKvgz(A#V?nn3qcGjwcQeH+erI66165OTCD}GOUYmHLEAL$dVOZTi7Dqx_@77E;)+b zo|MJJyD$E@!aHDb$I%0|@3^wyt@2KjHZZ8fi8j>U&TRjB+8lSdW9`NwGe91A~92bABl zv9d9|(m+@_BZSdIMU90GWB#rEniw@bO^fERDE7p=hzy7{403HkA2z^U64od{iAx`Y zcUFpGG(x>6YDc=k7r}jc#&`GGD(ig%gVj093h2UheQO^@AJ3FZ@_zr;dU^?JBF#I3@G0QIr(3{qauN*R=@jd-Mg$j|16@x}$ zfn9A&KC{&^VD{-(wgJSFZ9|js8=7Sf1G)DqWHu@)bs~mh*#)0pOTq-D9duNq8G<&W zIzy-+8OJ#7YvSkbv+{#_#fbET?Zq&vS~F@a;l0fVUvp}F&;A0&(6{frd_{3)Tny6J zCI%Z@T?d)90m^Ik+e~jukHD*Ficqw!dQ5N=de-TPeMeid$U$3E{E6wwA}2%M;Alu1zE_slPoYDF$CBz_%dMYC}|E z_1}c$6F46}Ks7)G>0sIgkXy^=zck*`c3Og*lFKVcl-z%Upw&|L^OPgf{E!qQ6wWh2 z+ls(9KF;O3=Nd)b56MW9%_9`gZ2{usaa$@OVW7MB57VsZYX-bCaGzkAS)1{UxWjy~ z_@Kv@!{Fh3u~o8BBAAz?whOC+sc81N=8(r(9nR9Qdmyu} z%{f&+n6=$C63&I5aYXu-g@b|n!7D`#=0(=JuQOPGS>EGb``(J0{sJkqnlfl6x$YHI zaKyF_xwm)%H!I6XPm_Kq?z&P8S4l`!v0A!$pvzwsh-9xCB^>|JP^r@?b4ZcRriKMl z7Jkl*mqbd)+s$VJxCl Ql{kx&cgF6x6Pa56AEL0fcmMzZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a225040351ab0d3ef4e25e6cbcc713b8c339c3cb GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0L?W!EovT!~aKJU1ba( z{lBgQ3Ne-h`2{mLJiCzw=P@u;%n1%FC@TH_CAi?@*C$%u zx?1PXoDbd*YH-o`!6TjXKAI;Pih6o?SQrNxUpDqqnDc1Tkx3y6!7Ekl?bS8+E7{rF ztGjk~8>?12`3ceOI&gNs#SSc%Y=1yHB(DFo27sn8f&g29M z*2M`Qm>7B3v=WS3j3jzDXbS|jXa*e0Yw1w-Y2+?rZE7-LZL*Lt9;N!wQN@zkdlX`1tjS zmbb3fxija3H-s8oG=A_%=e&>RNrs}H-W?XkLB^Mjy%gp=nsj7Rh(hp66?=Pi&HYMt zw)X0-o!!Q&n^#CInci)@R>RO-^oZG$ps<3k#f-E07&KPON}ah=*9f#c-qXb~#G^Ag zL4tL0f&ddE)1jVI5l?4|KIH1zD5aRg5&oblw6Q}urcoh`wW;aGTr)1WgBlB@6Ih(~ zICwa6s{ZF%s4ZaTrmNJ#dqJdQ#{w}yCA|zT7S_P-j)~zW3=HB%EIrH*&OHTM#o+1c K=d#Wzp$PzGnQ%@3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json new file mode 100644 index 0000000000..1fa6dbf895 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.2, + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fe8cb034dce630d2ba32ea3b01e5c00586e527db GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ`<^b2ArY;~60D08M0%P8`6UWj z4>U5fA1FE3^XC7KD}Qzr@}GNlA>feYv|yuUO>YYe3Jy$2J}AztaC+^fp9V+z=cJ~r z_`tN0C-8{%Hba9O63M&7Q~1sZzFm~cgVUXX-kX>?7@ejGF}Kx8LA|n&S3*L9 Y!6nMcs&%np1JJ7sp00i_>zopr0O>4lyZ`_I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8e3dc3bc312bbe1ea6b5f6224cf7b1d3a51a5f12 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0UERLR+iHDs8`|`UBnj zKt5whkY6x^!?PP{Ku&2@NJNQCYH@N=WKhlO#F@nvH#g*lHV9hnrO5Ujazh05j~D#n)kRP625 zHTOGpb{ng1ULmn$ez);j4MTI$BW6#6!V10?Gu~!k*kdAhT{hz7TA%~`JY5_^EP9g@ zBv`jF>L?sy^mGvJkQ7(oOle}7_CT0}m9yo-vD(E60SxTy64^{MQesRPPo?i;5d2Zk ssC9rfbff&TCQ}9_0V#*<@JB2R_TJnJ>U4O@fF?6|y85}Sb4q9e07PzM_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9a1527bd5fcaa25922c47f85d5b41f74ac52c052 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-uK)l4*NM>9>aj}OZ~3ZK zf(0nfSQ6wH%;50sMjDV)S``ve;*wgNT$EW*l9`{!z)&$KIIN(k^!u0Kf{$OHXnE^u zojY?rctfbcMdJsLbk6%|o@6NM>D^&r9Atdi*h^u~qe(|5g(w7TZd{?Vd54OzeF85s7M$X%C>c)1qn0AEiR#}JF& zYq8_-||Pgg&ebxsLQ09p2DP5=M^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json new file mode 100644 index 0000000000..649baaf1b0 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "copyright": "Taken from https://github.com/tgstation/tgstation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..72259f51d5756f8ebd0821b58f6d37df54e557b4 GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*P};|Rx>j@FfhCm72GVq z^2^cY%9ShK{1Z!o3K&a*{DK)Ap4~_Ta{N7A978lFCMQS)IRpd*cyM}fIQ;B6c1&&I zLd9dp+5#8_latd`Ra4WGg&A8Ky0}*{usjeeXk?6GYEqb>(NVzR(Yjc{PWQ%H0T-j> b044_0(-Id|KdDUs8qMJ8>gTe~DWM4ftP3_) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..42653a288e9b2c7875c922cb63c77f7318c85566 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-u0Xn)nR&AS%R5oQ(!08g zfPBW1AirP+hi5m^fSiJ=kcbkO)Z*l#%z~24{5%GRiaEhy1x2ObzXTV2{Q5-8TUYDc zne)LLLJck&KX{~b-beE!Ls3uf4h!QTV$7mXi0(mC&=d6J>1r+0^iaggz4V=sj{k0u?N6rvEkQpMh0U30(EJ`GdX z&TeDX%_}69Ozk#at6^v^dc^EWP*}m&Vn%5`2G&@a^$V(WQh|2+db&7FVdQ&MBb@0HYB$h5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c99a548fadecc3a4704fc220dd573faf23b7470f GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{S0JsZsHmc%qM)F#go8s_ zSvm1Zd^%8+u_VYZn8D%MjWi&qs466)#3i*jxhS)sBr`vcfuUkfa9BZ6>GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-7NsbX)huDM@n z-wq>v)!@!`72q!PjC&X?_O(owBnxPO4W2+Mev`;uzx5 znVcZOx;Wtj6QhJP<8GVDMpF*1Xo+p?=ALr!(W8dY#tBMySQyuEv9Km`v24@^DHY*i zQaI2s(NT1wWsjFnSH>qDy%jd%;wG$KE7VrBEt<`sFQ>r868Q75ECU0lJS+Qq8NL}n P>li#;{an^LB{Ts5$Yg5T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4b6d335eba581c295447b01a08a22a80cb16eec4 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-uK)l4S5;M2QBm0}z#^D* zUj-=6SQ6wH%;50sMjDV)R233Y;*wgNT$EW*l9`{!z)&$KIIN(k^!u0Kf{$OHXnE^u zojY?rctfbcMdJsLbk6%|o@6NM>D^&r9Atdi*h^u~qe(|5g(w8CRI#^L*W9nPZ-J6ge6LvUcZ-@aQC@xCkedmNHzI0hDDd3GxeOaCmkj4ao8Iba4#Pn3$X(5#%7i#j>ErO;t5jTs&P>)pbR~ zhDnnqE?6*O;-pOsP7XIDLK&C}xFrrV=rL}PW|}C&6qKmZ;m=)W9AINC!N_pOU1k}<+U9EFx z&IfM@HMnT};E~RGAI*~tMLoScER2JUFB^L)%y~5F$fOX3;FT)&_UfAZmG&8#s;lph z>FhRE-Mm6#$?R_9wHk)zqDRc01ceoREoPj}&roV4C*b)g@gC56KTj9O5R2aA1PRtH zj5-R37(E??J0!&wI8&NfrachmVC8JNaIAK5LI49hyF@nAjFcD?##8D07zBURGin`R o4c#cetjUx?NkGaWJNyv~gS|KRf;t_ZGN8!}p00i_>zopr0GaJ#tpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..48950df2f40e6fb6ea9f7ad5c82078aeff19c77b GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-uK)l4FAm~d-^}!S3yZ3M ztuj!Yu_VYZn8D%MjWi&qxGE%~#3i*jxhS)sBr`vcfuUkfa9BZ6>GvS zI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-7NsbX)huDM@npOLA$ z`u>>CZe!KWDSi#p~#@YM~rABfBo{tjm0j>A-ba4!^=uJ+L zU^QXj<51)7NQh|=xWK}#iW*Z=?jConR;VrKpSy?IPb%a<>=_uo_kRLocs^ybK9GL}NQx+WXWmTLoZOM`) z@7S(Bo;GdTwTo;jF(C;|GmUp!rJtMgavhU-@XE!SCMGPRg nwg$#COZ5yMI20*d6l7osVO4BpZJkmCbP0o}tDnm{r-UW|fOJzk