diff --git a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/broken.png index b5259b9fb0..37cfa72c98 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/eject-unshaded.png index 0df1b9c0d6..4b3c9aa8aa 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/meta.json index ad688300fe..6ce2fc24bd 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by potato1234x (Github) for ss14", "size": { "x": 32, "y": 32 @@ -14,22 +14,12 @@ "name": "eject-unshaded", "delays": [ [ - 0.1, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.4, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/normal-unshaded.png index 1f45ce683c..9002a74836 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/off.png index 0b9062cc62..1935d262da 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/chefvend.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png index ac264f2251..671a4701fe 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json index e80ced870e..1c53b7c6cc 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png index 7adcc79ae4..c0e947c93f 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/cigs.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png index 5d7c5ff2d1..a7608d24c1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png deleted file mode 100644 index 02aec10265..0000000000 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/hellfire.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json index 89e03a3ef0..6a11e09a83 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177 and modified by potato1234x (github) for ss14", "size": { "x": 32, "y": 32 @@ -23,16 +23,6 @@ ] ] }, - { - "name": "hellfire", - "delays": [ - [ - 0.25, - 0.25, - 0.25 - ] - ] - }, { "name": "off" }, diff --git a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png index e4bef0b3a7..8e7814af60 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/coffee.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png index 4a62baccbc..aee42c80ce 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/deny-unshaded.png index 609c524fa5..b8221f982e 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/deny-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/eject-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/eject-unshaded.png index ca98be38dc..49fcef45a1 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/eject-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json index c0419a1195..711bdddffd 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Created by Hyenh#6078 (313846233099927552)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by potato1234x", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png index 58acab76a9..f04f2db2af 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png index 029cfb18b8..62c80ef27a 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/panel.png index e8babedfe5..c60f5c3069 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/panel.png and b/Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png index 99ef104517..a5a13b2fd2 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png index 7c760e8a15..5e802a7147 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json index 182a623278..eaf66cff8f 100644 --- a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1516a728931b4985c1e86f0c5995a5aa1554a1ad and modified by Swept and potato1234x", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png index 6e0de0cf5a..4f84067486 100644 Binary files a/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png and b/Resources/Textures/Structures/Machines/VendingMachines/snack.rsi/off.png differ