Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes all vending machine copyrights (#3798)

Browse Source
This commit is contained in:
Swept
2021-04-05 12:52:09 +00:00
committed by GitHub
parent f46ad7c12d
commit 5387f87608
27 changed files with 17 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json
View File

@@ -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

BIN
Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

47
Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json
View File

@@ -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"
}
]
}

BIN
Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 532 B

BIN
Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

2
Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json
View File

@@ -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

2
Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json
View File

@@ -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

BIN
Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/broken.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 662 B

After

Width:  |  Height:  |  Size: 273 B

BIN
Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 737 B

After

Width:  |  Height:  |  Size: 467 B

11
Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json
View File

@@ -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

BIN
Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 244 B

BIN
Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/off.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 241 B

2
Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json
View File

@@ -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