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 0000000000..c793be4520 Binary files /dev/null and b/Resources/Textures/Buildings/autolathe.rsi/autolathe_inserting_gold_plate.png differ diff --git a/Resources/Textures/Buildings/autolathe.rsi/meta.json b/Resources/Textures/Buildings/autolathe.rsi/meta.json index 9f868d6a0c..3bbee4b1e5 100644 --- a/Resources/Textures/Buildings/autolathe.rsi/meta.json +++ b/Resources/Textures/Buildings/autolathe.rsi/meta.json @@ -91,6 +91,23 @@ ] ] }, + { + "name": "autolathe_inserting_gold_plate", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "autolathe_inserting_unlit", "directions": 1, diff --git a/Resources/Textures/Objects/Tools/Toolbox_b.png b/Resources/Textures/Objects/Tools/Toolbox_b.png deleted file mode 100644 index dadba6320c..0000000000 Binary files a/Resources/Textures/Objects/Tools/Toolbox_b.png and /dev/null differ diff --git a/Resources/Textures/Objects/Tools/Toolbox_y.png b/Resources/Textures/Objects/Tools/Toolbox_y.png deleted file mode 100644 index e04977356d..0000000000 Binary files a/Resources/Textures/Objects/Tools/Toolbox_y.png and /dev/null differ 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 0000000000..6aa7ef39ba Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon.png differ 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 0000000000..9a5509406a Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-right.png new file mode 100644 index 0000000000..f9f5aab026 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-right.png differ 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 0000000000..f19cffe22e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png differ 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 0000000000..a225040351 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-right.png new file mode 100644 index 0000000000..07fc615946 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-right.png differ 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 0000000000..fe8cb034dc Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png differ 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 0000000000..8e3dc3bc31 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-left.png differ 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 0000000000..9a1527bd5f Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-right.png differ 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 0000000000..72259f51d5 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png differ 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 0000000000..42653a288e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-right.png new file mode 100644 index 0000000000..7ecda34f3e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json new file mode 100644 index 0000000000..649baaf1b0 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.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_syn.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png new file mode 100644 index 0000000000..f2eb8d86bd Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png differ 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 0000000000..c99a548fad Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-left.png differ 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 0000000000..4b6d335eba Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json new file mode 100644 index 0000000000..649baaf1b0 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.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_yellow.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png new file mode 100644 index 0000000000..b90ddbe53e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-left.png new file mode 100644 index 0000000000..03a61d15ca Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-left.png differ 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 0000000000..48950df2f4 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json new file mode 100644 index 0000000000..649baaf1b0 --- /dev/null +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.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/toolbox_r.png b/Resources/Textures/Objects/Tools/toolbox_r.png deleted file mode 100644 index 21e8ad6e0b..0000000000 Binary files a/Resources/Textures/Objects/Tools/toolbox_r.png and /dev/null differ