diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml deleted file mode 100644 index 9fd31f65c6..0000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/mining.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: vendingMachineInventory - id: DwarvenMiningEquipmentInventory - name: Dwarven Mining Equipment - spriteName: mining - startingInventory: - Pickaxe: 4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml new file mode 100644 index 0000000000..2b41c9c482 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -0,0 +1,15 @@ +- type: vendingMachineInventory + id: SalvageEquipmentInventory + name: Salvage Equipment + spriteName: mining + startingInventory: + Crowbar: 2 + Pickaxe: 4 + OreBag: 4 + Flare: 4 + FlashlightLantern: 2 + Floodlight: 2 + HandheldGPSBasic: 2 + RadioHandheld: 2 + WeaponProtoKineticAccelerator: 2 + SurvivalKnife: 2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 7777ff1dd3..9983064159 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -887,6 +887,38 @@ energy: 1.6 color: "#ffe599" +- type: entity + parent: VendingMachine + id: VendingMachineSalvage + name: salvage vendor + description: A dwarves best friend! + components: + - type: VendingMachine + pack: SalvageEquipmentInventory + - type: Sprite + sprite: Structures/Machines/VendingMachines/mining.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + eject: true + ejectUnshaded: false + denyUnshaded: true + broken: true + - type: WiresVisualizer + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#9dc5c9" + # job clothing - type: entity diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png new file mode 100644 index 0000000000..7c51ef95ed Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png new file mode 100644 index 0000000000..647877bda6 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json new file mode 100644 index 0000000000..d3f202239c --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tgstation at source. Modified by Peptide90 to work with SS14. Broken state by Peptide based on off.", + "source": "https://github.com/tgstation/tgstation/commit/2b7f2c42f1bd57497052e8ef593d5e05ea45208e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 4.7, + 0.1 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.13, + 0.13 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/normal-unshaded.png new file mode 100644 index 0000000000..7828f6feb0 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png new file mode 100644 index 0000000000..7c760e8a15 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/panel.png new file mode 100644 index 0000000000..b732206a8e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/mining.rsi/panel.png differ