diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index c3599c4d97c..47ab0cdd1b5 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -56,6 +56,16 @@ category: cargoproduct-category-name-security group: market +- type: cargoProduct + id: CrateVendingMachineRestockNonLethalVend + icon: + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockNonLethalVendFilled + cost: 100 # Frontier + category: cargoproduct-category-name-security + group: market + - type: cargoProduct id: CrateVendingMachineRestockAutoTuneVend abstract: true diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index ef165874ac3..a4972ba8759 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -53,6 +53,17 @@ - id: VendingMachineRestockLessLethalVend amount: 2 +- type: entity + id: CrateVendingMachineRestockNonLethalVendFilled + parent: CratePlasticBiodegradable + name: NonLethalVend restock crate + description: Contains two restock boxes for the NonLethalVend vending machine. + components: + - type: StorageFill + contents: + - id: VendingMachineRestockNonLethalVend + amount: 2 + - type: entity id: CrateVendingMachineRestockAutoTuneVendFilled parent: CratePlasticBiodegradable diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml index 9f8ef8fd7a8..06c97b19fa8 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml @@ -40,7 +40,7 @@ CrayonRainbow: 5 WeaponWaterPistol: 8 WeaponWaterBlaster: 4 - TargetDarts: 1 + TargetDartsFlatpack: 1 BoxDarts: 2 ChessBoard: 2 BackgammonBoard: 2 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 4bee76153f4..9086abe8c7d 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -6,23 +6,17 @@ WeaponRevolverArgentiNonlethal: 10 WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 - BoxDonkSoftBox: 10 - BoxCartridgeCap: 10 - MagazineBoxPistolRubber: 10 - MagazineBoxMagnumRubber: 10 BoxBeanbag: 8 MagazineBoxRifleRubber: 8 - MagazineBoxLightRifleRubber: 4 - MagazineBoxCaselessRifleRubber: 4 - SpeedLoaderRifleHeavyRubber: 10 + MagazineBoxCaselessRifleRubber: 10 + MagazineBoxLightRifleRubber: 5 + MagazineBoxPistolRubber: 10 + MagazineBoxMagnumRubber: 10 contrabandInventory: + SpeedLoaderRifleHeavyRubber: 3 + SpeedLoaderPistolRubber: 3 + SpeedLoaderMagnumRubber: 3 WeaponRifleBB: 2 BoxCartridgeBB: 10 emaggedInventory: - WeaponLaserCarbinePractice: 4 - WeaponDisablerPractice: 4 - MagazineBoxPistolPractice: 10 - MagazineBoxMagnumPractice: 10 - MagazineBoxLightRiflePractice: 10 - MagazineBoxCaselessRiflePractice: 10 - BoxShotgunPractice: 10 + ThrowingKnife: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml new file mode 100644 index 00000000000..1dbc5afea58 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml @@ -0,0 +1,23 @@ +- type: vendingMachineInventory + id: NonLethalVendInventory + startingInventory: + WeaponDisablerPractice: 4 + WeaponLaserCarbinePractice: 4 + BoxShotgunPractice: 8 + MagazineBoxRiflePractice: 8 + MagazineBoxCaselessRiflePractice: 10 + MagazineBoxLightRiflePractice: 5 + MagazineBoxPistolPractice: 10 + MagazineBoxMagnumPractice: 10 + RevolverCapGun: 2 + BoxCartridgeCap: 4 + FoamCrossbow: 2 + BoxDonkSoftBox: 4 + TargetDartsFlatpack: 2 + BoxDarts: 4 + contrabandInventory: + SpeedLoaderRifleHeavyPractice: 3 + SpeedLoaderPistolPractice: 3 + SpeedLoaderMagnumPractice: 3 + emaggedInventory: + ThrowingKnife: 1 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml new file mode 100644 index 00000000000..4d138b0f55d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml @@ -0,0 +1,13 @@ +- type: entity + name: dartboard + id: TargetDartsFlatpack + parent: BaseNFFlatpack + description: A flatpack used for constructing a dart board. + components: + - type: Flatpack + entity: TargetDarts + - type: Sprite + layers: + - state: service_tray + - type: StaticPrice + price: 40 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index ea1594b4336..8265a9b2935 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -127,6 +127,23 @@ shader: unshaded - state: refill_lesslethal +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockNonLethalVend + name: NonLethalVend restock box + description: A box containing practice bullets for the Non Lethal vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - NonLethalVendInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_nonlethal + - type: entity parent: SecuredVendingMachineRestock id: VendingMachineRestockAutoTuneVend diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 9c6bb597015..1d4f7bea910 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -235,6 +235,39 @@ energy: 1.6 color: "#ff033e" +- type: entity + parent: VendingMachine + id: NonLethalVendingMachine + name: NonLethalVend + description: Try not to aim for the eyes! + components: + - type: VendingMachine + pack: NonLethalVendInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 3 + - type: Advertise + pack: LessLethalVendAds + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/nonlethalvend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ff033e" + - type: entity parent: [BaseStructureUnanchorable, VendingMachine] id: VendingMachineAutoTuneVend diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json index a4a1bfdd17f..d3fe3db9937 100644 --- a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. LessLethalVend by @|Data_Redacted| pottedplant by @erhardsteinhauer based on @minnie6969 work", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. LessLethalVend by @|Data_Redacted| pottedplant by @erhardsteinhauer based on @minnie6969 work, NonlethalVend made by Slush modified from the NonLethalVend", "size": { "x": 32, "y": 32 @@ -27,6 +27,9 @@ }, { "name": "refill_nfsdtec" - } + }, + { + "name": "refill_nonlethal" + } ] } diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png new file mode 100644 index 00000000000..1fcf2c6d6e0 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png new file mode 100644 index 00000000000..34d717b17ae Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png new file mode 100644 index 00000000000..e88b7af717a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png new file mode 100644 index 00000000000..ab098b08edf Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json new file mode 100644 index 00000000000..30ce8a13dab --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by [Data_Redacted] https://github.com/IData-RedactedI and art edited by Slush [Disord: slush6789]", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.5, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.2, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png new file mode 100644 index 00000000000..1a05c9d528e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png new file mode 100644 index 00000000000..43ecef81185 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png new file mode 100644 index 00000000000..231c1f49d7e Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png differ