]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ffe6b16) | patch
TG Vending Machines + Tweaks (#14703)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Fri, 24 Mar 2023 08:54:47 +0000 (18:54 +1000)
committerGitHub <noreply@github.com>
Fri, 24 Mar 2023 08:54:47 +0000 (02:54 -0600)
commit51778afe6f701c0f1a2ba62db983e8cd40b264df
treeb5a0ab83916600cb84c3346e4cdf17266ae27d5ftree | snapshot
parentffe6b166d61e534bb141f460e0d922ca23bc388fcommit | diff
TG Vending Machines + Tweaks (#14703)

* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
99 files changed:
Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl [moved from Resources/Locale/en-US/advertisements/chemdrobe.ftl with 100% similarity] blob | history
Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl diff | blob | history
Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl diff | blob | history
Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl diff | blob | history
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml diff | blob | history
Resources/Prototypes/Catalog/Fills/Crates/vending.yml diff | blob | history
Resources/Prototypes/Catalog/VendingMachines/Inventories/centdrobe.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml diff | blob | history
Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml diff | blob | history
Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml [new file with mode: 0644] blob
Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml diff | blob | history
Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml [new file with mode: 0644] blob
Resources/Prototypes/Entities/Markers/Spawners/Random/vendingsnacks.yml [new file with mode: 0644] blob
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml diff | blob | history
Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml diff | blob | history
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml diff | blob | history
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml diff | blob | history
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/icon_open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/icon_open.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json diff | blob | history
Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_robotics.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/centdrobe.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/cola-red.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png diff | blob | history
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/pwrgame.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/any.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/drink.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/snack.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/robotics.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/shamblersjuice.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/soda.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/spaceup.rsi/panel.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/broken.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/deny-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/eject-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal-unshaded.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/normal.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/off.png [new file with mode: 0644] blob
Resources/Textures/Structures/Machines/VendingMachines/starkist.rsi/panel.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский