diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index e7e1252a1f..6ebff58054 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -367,31 +367,6 @@ - type: AccessReader access: [["Service"]] -- type: entity - parent: VendingMachine - id: VendingMachineSales - name: Sales - components: - - type: VendingMachine - pack: Sales - - type: Sprite - sprite: Constructible/Power/VendingMachines/sale.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - brokenUnshaded: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineSec diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json index 61901426da..a358a551ce 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/21d5a65346cfdaa61e86410cf9323e4e03a362d9", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json index d262e0049d..e1ffe04acf 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json index bcca5620cc..e80ced870e 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json index 9b8b70a6f4..89e03a3ef0 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json index e6c88899b0..6c3db20d43 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json index bba22b2d83..035a490dbc 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/7c41613c521b6fab647ae98e1283f86b3cef382a", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json index d57f4ec0c9..6df73619fe 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json index 2cf9a24e7e..2c61f1ce8c 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json index 17451a85e4..02a78e6548 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/7c41613c521b6fab647ae98e1283f86b3cef382a", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png deleted file mode 100644 index 86dde0af4e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png deleted file mode 100644 index 5036439a63..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json deleted file mode 100644 index c9c6f67855..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken" - }, - { - "name": "broken-unshaded", - "delays": [ - [ - 1, - 0.05, - 0.1, - 0.02 - ] - ] - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png deleted file mode 100644 index 79d03c6c74..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png deleted file mode 100644 index 29308d52c1..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json index cafccdfabf..ead3f0ed80 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/7c41613c521b6fab647ae98e1283f86b3cef382a", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json index 3f1ec5cf52..9c0fd5f6f3 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/21d5a65346cfdaa61e86410cf9323e4e03a362d9", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json index bd48d5b390..d62304e316 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json index 42654486b9..911ec910b0 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json index 8bbbbeb1e4..8c67a03d35 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json index bcca5620cc..e80ced870e 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png index 4f2e2cacc2..d475325657 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png index e2042da994..1bcfc8675b 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json index a11313214d..f5374af616 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32 @@ -14,15 +14,6 @@ "name": "deny-unshaded", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3, - 0.1, 0.1, 0.1, 0.1 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png index 032f615f62..cc142068da 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png index 4d66fd0a43..18ab63da21 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json index 84266eea4c..badab7d1d6 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/f200ae08d71ecbc91412ee650a334981892f5177", "size": { "x": 32, "y": 32