diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 2c5f807f43a5..dd1f41e5718f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -25,6 +25,12 @@ - type: Tag tags: - Toolbox + - type: GenericVisualizer + visuals: + enum.StorageVisuals.Open: + base: + True: { state: icon-open } + False: { state: icon } - type: Appearance - type: entity diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon-open.png new file mode 100644 index 000000000000..e4005aaed7dc Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon-open.png 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 index d3e389276d46..6aa7ef39ba96 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/icon.png 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 index 2cbae76c35f8..e8d224c195af 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-left.png 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 index 5955b4a29410..c2441bc90709 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/inhand-right.png 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 index db0940d0b10c..6f911268773b 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -17,6 +17,9 @@ }, { "name": "icon" + }, + { + "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon-open.png new file mode 100644 index 000000000000..6ba8ef5dcbaf Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png index 31b6d933d9fc..f19cffe22ef6 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/icon.png 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 index 77f8a9ab6e32..83b0686c0796 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-left.png 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 index a4f14a7cd9e6..1ee30397bec0 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/inhand-right.png 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 index 324af2c79c8f..408055202359 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_gold.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -19,21 +19,51 @@ "name": "icon", "delays": [ [ - 0.5, - 0.5, - 0.5, 0.2, 0.2, - 0.5, - 0.5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, 0.2, 0.2, - 0.5, - 0.5, + 0.2, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.2 + ] + ] + }, + { + "name": "icon-open", + "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 ] ] } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon-open.png new file mode 100644 index 000000000000..7656cfbf015e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png index 9ab6de83245c..fe8cb034dce6 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/icon.png 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 index bc0a8322ec5d..653fcbc038bb 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-left.png 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 index 35318beb5a80..77726c3c30f7 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/inhand-right.png 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 index db0940d0b10c..6f911268773b 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -17,6 +17,9 @@ }, { "name": "icon" + }, + { + "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon-open.png new file mode 100644 index 000000000000..0c2244423165 Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png index 607dbb55d967..72259f51d575 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/icon.png 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 index 516f59128170..f2e7c47e352b 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-left.png 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 index dd28a971dd09..110cbbff70fe 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/inhand-right.png 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 index db0940d0b10c..6f911268773b 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -17,6 +17,9 @@ }, { "name": "icon" + }, + { + "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon-open.png new file mode 100644 index 000000000000..42fc6724051e Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png index 9f7f4561beeb..f2eb8d86bd8e 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/icon.png 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 index e7f67c0f9307..7bcc0e66c63c 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-left.png 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 index 0f453d25c65a..cfbc43c287c1 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/inhand-right.png 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 index db0940d0b10c..ebc7858be976 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_syn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -16,7 +16,10 @@ "directions": 4 }, { - "name": "icon" + "name": "icon" + }, + { + "name": "icon-open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/icon.png index 3802f59abc55..28c31211983d 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/icon.png and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-left.png index 39ca8b2ef2e6..bba3c79b46aa 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-left.png and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-right.png index 4e42aa5e7547..574d59a620a5 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-right.png and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json index db0940d0b10c..12106394ebd0 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_thief.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "license": "CC0-1.0", + "copyright": "Created by TheShuEd(github) for ss14", "size": { "x": 32, "y": 32 @@ -19,4 +19,4 @@ "name": "icon" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon-open.png new file mode 100644 index 000000000000..67273713b72d Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon-open.png differ diff --git a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png index ffaf79a02f91..b90ddbe53ea3 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/icon.png 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 index 2d6ece1cb2ca..d656b7d1c4cc 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-left.png 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 index a1a4a4f7fe96..97f411b89b25 100644 Binary files a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/inhand-right.png 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 index db0940d0b10c..6f911268773b 100644 --- a/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/Toolboxes/toolbox_yellow.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/000286d446f40d3897816bc4776a7c754aa93d7d, held sprites redone by Alekshhh, modified further by ps3moira (github)", + "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , held sprites redone by Alekshhh", "size": { "x": 32, "y": 32 @@ -17,6 +17,9 @@ }, { "name": "icon" + }, + { + "name": "icon-open" } ] -} +} \ No newline at end of file