diff --git a/Resources/Prototypes/Entities/buildings/vending_machines.yml b/Resources/Prototypes/Entities/buildings/vending_machines.yml index 27b33ca455..84af9207d1 100644 --- a/Resources/Prototypes/Entities/buildings/vending_machines.yml +++ b/Resources/Prototypes/Entities/buildings/vending_machines.yml @@ -100,6 +100,16 @@ pack: Hot Drinks machine - type: Icon sprite: Buildings/VendingMachines/coffee.rsi + - type: Sprite + sprite: Buildings/VendingMachines/coffee.rsi + layers: + - state: normal + map: ["enum.VendingMachineVisualLayers.Base"] + - state: screen + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - map: ["enum.WiresVisualLayers.MaintenancePanel"] + state: panel - type: entity parent: VendingMachine diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png index 9011ed896a..590351570b 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png index 8c3ac65247..d62be37f93 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png index 346630bdd4..7c62b0721d 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json index 3fd1786893..12fd9a9146 100644 --- a/Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/cart.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "eject", "directions": 1, "delays": [[1.0, 0.5, 0.1, 0.1, 0.1, 1.0, 0.1, 0.1, 0.1, 0.3]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.5,0.05,0.5,0.05,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png index 5e3b16c09f..a960108cbf 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png index 5ad446a4ea..11f38174a5 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cart.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/cart.rsi/panel.png new file mode 100644 index 0000000000..b0b7e5a0f4 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/cart.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png index bf6c7193a2..ac264f2251 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/deny.png new file mode 100644 index 0000000000..2ed8a88e1c Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png index 9810b6f80a..873d7e8e70 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json index 59b45560a0..d00c37f2ec 100644 --- a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[1.0, 0.2, 0.1, 0.1, 0.1, 0.1, 1.0, 0.1, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png index 648b07707b..036d9b33e8 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png index 1c00c141a7..7adcc79ae4 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cigs.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/panel.png new file mode 100644 index 0000000000..15e5dbcafb Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/cigs.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png index 2f2b33484b..5d7c5ff2d1 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/deny.png new file mode 100644 index 0000000000..17aabbe639 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png index 4ad833c272..d3329033b7 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/hellfire.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/hellfire.png new file mode 100644 index 0000000000..02aec10265 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/hellfire.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json index b9afef1fe1..0dc3d47206 100644 --- a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[0.1, 0.4, 2.0, 0.2, 0.1, 0.1, 0.5, 0.5, 0.1, 0.1, 0.9]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"hellfire","directions":1,"delays":[[0.25,0.25,0.25]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"screen","directions":1,"delays":[[0.6,0.6,0.6,0.6]]},{"name":"eject","directions":1,"delays":[[0.2,0.2,0.6,0.3,0.3,0.3,0.3,0.3,0.3,0.2,0.2,0.2,0.2,0.8]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png index 1b34b300c7..90d1bbd8bb 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png index 8f3f38d395..e4bef0b3a7 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/panel.png new file mode 100644 index 0000000000..1d9416bb74 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/coffee.rsi/screen.png b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/screen.png new file mode 100644 index 0000000000..cc64a9de57 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/coffee.rsi/screen.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png index 9e71945651..bf478bada1 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/deny.png new file mode 100644 index 0000000000..3bc5c1a554 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png index 00b0ac604d..00c05769a8 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json index 7fbf06ed12..276f9ec8ad 100644 --- a/Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/cola.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[0.5, 0.1, 1.0, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.5,0.1,1.0,0.1,0.1]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"off","directions":1,"delays":[[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png index 008b06fad0..80ab90fb8b 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png index eb69c479aa..319189dbe7 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/cola.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/cola.rsi/panel.png new file mode 100644 index 0000000000..757e802cec Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/cola.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png index 269fd2413e..c5ec97becf 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png index e80ae63204..a4ca61c04c 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png index b264f79641..0b657ff93a 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json index 2b31ecfa9f..a830d84162 100644 --- a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/Baystation12/Baystation12", "states": [{"name": "broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "deny", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "eject", "directions": 4, "delays": [[0.1, 0.4, 0.1], [0.1, 0.4, 0.1], [0.1, 0.4, 0.1], [0.1, 0.4, 0.1]]}, {"name": "normal", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "off", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "panel", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{"copyright":"https://github.com/Baystation12/Baystation12","license":"CC-BY-SA-3.0","size":{"x":32,"y":32},"states":[{"delays":[[1.0]],"directions":1,"name":"broken"},{"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]],"directions":1,"name":"deny"},{"delays":[[0.1,0.4,0.1]],"directions":1,"name":"eject"},{"delays":[[1.0]],"directions":1,"name":"normal"},{"delays":[[1.0]],"directions":1,"name":"off"},{"delays":[[1.0]],"directions":1,"name":"panel"}],"version":1} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png index 69a4917451..45fecab42b 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png index 40157e31aa..da55bc32d0 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png index 7e979c73a4..aa44ed2e9f 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png and b/Resources/Textures/Buildings/VendingMachines/engivend.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png index 4e431f4066..6f7a130202 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png index 5dc50d852b..9c73caedef 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png index b7d6d63db7..c00889f7e9 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json index a4f3fc1fc1..6b9dc19981 100644 --- a/Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/medical.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "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, 0.1]]}, {"name": "eject", "directions": 1, "delays": [[0.1, 0.2, 0.2, 0.1, 0.1, 0.1, 1.0, 0.1, 0.1, 0.1, 0.2, 0.2]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.4,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png index a9c9deb847..2b58e1171a 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png index da657c04cb..36707c738a 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/medical.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/medical.rsi/panel.png new file mode 100644 index 0000000000..2200c34848 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/medical.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png index 13bbe7fa26..ddbc85cc3a 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png index d9ce3fd34c..686150ace5 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/eject.png new file mode 100644 index 0000000000..00ebf9513c Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json index d62b3d9fe5..6b9dc19981 100644 --- a/Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/sec.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}, {"name": "vend", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.0, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.4,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png index fe3fbe94c9..39350f5269 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png index 42f571c0e2..7662481687 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/panel.png new file mode 100644 index 0000000000..c568b18e21 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/sec.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sec.rsi/vend.png b/Resources/Textures/Buildings/VendingMachines/sec.rsi/vend.png deleted file mode 100644 index 22eeee1674..0000000000 Binary files a/Resources/Textures/Buildings/VendingMachines/sec.rsi/vend.png and /dev/null differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png index 16269f09b7..9142ddaef6 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/deny.png new file mode 100644 index 0000000000..cc277a5521 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png index b810de9329..056bb7f1e0 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json index 06ccea2d4f..4db277b7bd 100644 --- a/Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/snack.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[1.0, 0.1, 0.1, 0.1, 0.1, 0.5, 0.1, 1.0, 0.1, 0.1, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[0.8,0.8,0.8]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png index c8d12c6ea6..cc086552a2 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png index a7273a7a39..119d9a494a 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/snack.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/snack.rsi/panel.png new file mode 100644 index 0000000000..119757acb6 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/snack.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png index 00eced676c..2dea2f52ae 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/deny.png new file mode 100644 index 0000000000..0b25e5cf7e Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png index 08e4c74ad9..ca286a53d8 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json index d86e193474..51ef3f6e2c 100644 --- a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.4, 0.1, 0.1, 0.1, 0.3, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.4,0.4]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png index 1d362218cb..5eab060bc7 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png index 7305029413..e793b98e14 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/panel.png new file mode 100644 index 0000000000..c3720eb355 Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/sovietsoda.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png index 8aafe495ea..32fdbb98f3 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png index 4cde8afe53..2b52d5bd84 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/eject.png new file mode 100644 index 0000000000..d40c01396f Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json index 67c1a6ff8f..5ce19b184b 100644 --- a/Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/theater.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "normal", "directions": 1, "delays": [[4.5, 0.1, 0.4, 0.1]]}, {"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"overlay","directions":1,"delays":[[3.0,0.1]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png index 689ae27abf..83be99ca3b 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png index 94cfa6be97..069d91a373 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/overlay.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/overlay.png new file mode 100644 index 0000000000..a0bf454c8d Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/overlay.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/theater.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/theater.rsi/panel.png new file mode 100644 index 0000000000..6c43cd885b Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/theater.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png index ba41ccb960..6efd6f3a4f 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/deny.png new file mode 100644 index 0000000000..d8c1a8d69a Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/eject.png new file mode 100644 index 0000000000..895181a2af Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json index bac3fed86a..d00c37f2ec 100644 --- a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[0.2, 0.2, 0.2]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png index 72f49dde08..5063d3c1e1 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png index d81bf2e651..c1de348dd4 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/panel.png new file mode 100644 index 0000000000..785f93e81b Binary files /dev/null and b/Resources/Textures/Buildings/VendingMachines/vendomat.rsi/panel.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png index bf67611c84..83602e54d5 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/broken.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png index c7a9c08d75..3b1938a44d 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/deny.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png index 0e583b6089..ef706dfbbe 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/eject.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json index 9cc243e0c0..97b0c2ab7a 100644 --- a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/Baystation12/Baystation12", "states": [{"name": "broken", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "deny", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "eject", "directions": 4, "delays": [[0.1, 0.4, 0.1, 0.1], [0.1, 0.4, 0.1, 0.1], [0.1, 0.4, 0.1, 0.1], [0.1, 0.4, 0.1, 0.1]]}, {"name": "normal", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "off", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "panel", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{"copyright":"https://github.com/Baystation12/Baystation12","license":"CC-BY-SA-3.0","size":{"x":32,"y":32},"states":[{"delays":[[1.0]],"directions":1,"name":"broken"},{"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]],"directions":1,"name":"deny"},{"delays":[[0.1,0.4,0.1,0.1]],"directions":1,"name":"eject"},{"delays":[[1.0]],"directions":1,"name":"normal"},{"delays":[[1.0]],"directions":1,"name":"off"},{"delays":[[1.0]],"directions":1,"name":"panel"}],"version":1} \ No newline at end of file diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png index 9e4be58f8e..0eeeae5c0e 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/normal.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png index acd8bdaa57..ee5c8c46c0 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/off.png differ diff --git a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png index 7e979c73a4..aa44ed2e9f 100644 Binary files a/Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png and b/Resources/Textures/Buildings/VendingMachines/youtool.rsi/panel.png differ