diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl new file mode 100644 index 00000000000..52512c18225 --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl @@ -0,0 +1,20 @@ +advertisement-lesslethalvend-1 = Brighten someone else's day with a rubber bullet! +advertisement-lesslethalvend-2 = Less Lethal (tm). Its the way to go! +advertisement-lesslethalvend-3 = Beanbags aren't just for sitting on! +advertisement-lesslethalvend-4 = Shock your friends with a tazer TODAY! +advertisement-lesslethalvend-5 = Warning: must be over 3 months old to purchase +advertisement-lesslethalvend-6 = Dont belive their lies +advertisement-lesslethalvend-7 = Tire out your foes with the peaceful option TODAY! +advertisement-lesslethalvend-8 = Less Lethal (tm) means more FUN +advertisement-lesslethalvend-9 = BUY BUY BUY BUY NOW! +advertisement-lesslethalvend-10 = Only a complete idiot buys lethal, go Less Lethal (tm) TODAY! +advertisement-lesslethalvend-11 = Beat those evildoers with a stick. NOW +advertisement-lesslethalvend-12 = Proudly parnered with the NFSD +advertisement-lesslethalvend-13 = Vote Space Kennidy, sponsored by the Less Lethal Group +advertisement-lesslethalvend-14 = Less death means we pass the saving on to YOU! +advertisement-lesslethalvend-15 = Proud to be the No. 1 weapon machine on Frontier Station +advertisement-lesslethalvend-16 = Warning: do not eat the rubber bullets. +advertisement-lesslethalvend-17 = Buy the handy dandy beanbag shell. Its organic! +advertisement-lesslethalvend-18 = Warning: do not eat the beanbag shells. +advertisement-lesslethalvend-19 = Buy your rubbers here TODAY! +advertisement-lesslethalvend-20 = Could you be our 1,000,000th customer? diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index f59af15bfd6..aa5a6ee5082 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -317,6 +317,8 @@ - type: GuideHelp guides: - Security + - type: StaticPrice + price: 800 - type: entity name: practice disabler diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 7bfd914d94f..76b88502768 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -191,3 +191,5 @@ whitelist: tags: - CartridgePistol + - type: StaticPrice + price: 550 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index d41346380c3..97146067eb1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -36,3 +36,6 @@ quickEquip: false slots: - Belt + + - type: StaticPrice #Dunno if I should be doing this outside of the _NF file + price: 150 diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index 90c71335695..c630f3fcc63 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -45,3 +45,13 @@ cost: 100 category: Fun group: market + +- type: cargoProduct + id: CrateVendingMachineRestockLessLethalVend + icon: + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockLessLethalVendFilled + cost: 100 + category: Security + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 32bed41754a..61bd0217956 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -33,3 +33,12 @@ contents: - id: VendingMachineRestockCuddlyCritterVend amount: 2 + +- type: entity + id: CrateVendingMachineRestockLessLethalVendFilled + parent: CratePlasticBiodegradable + components: + - type: StorageFill + contents: + - id: VendingMachineRestockLessLethalVend + amount: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml new file mode 100644 index 00000000000..8ac32fbf921 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml @@ -0,0 +1,23 @@ +- type: advertisementsPack + id: LessLethalVendAds + advertisements: + - advertisement-lesslethalvend-1 + - advertisement-lesslethalvend-2 + - advertisement-lesslethalvend-3 + - advertisement-lesslethalvend-4 + - advertisement-lesslethalvend-5 + - advertisement-lesslethalvend-6 + - advertisement-lesslethalvend-7 + - advertisement-lesslethalvend-8 + - advertisement-lesslethalvend-9 + - advertisement-lesslethalvend-10 + - advertisement-lesslethalvend-11 + - advertisement-lesslethalvend-12 + - advertisement-lesslethalvend-13 + - advertisement-lesslethalvend-14 + - advertisement-lesslethalvend-15 + - advertisement-lesslethalvend-16 + - advertisement-lesslethalvend-17 + - advertisement-lesslethalvend-18 + - advertisement-lesslethalvend-19 + - advertisement-lesslethalvend-20 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml new file mode 100644 index 00000000000..53875ccee24 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -0,0 +1,31 @@ +- type: vendingMachineInventory + id: LessLethalVendInventory + startingInventory: + WeaponDisabler: 10 + Kardashev-MosinNonlethal: 20 + WeaponPistolMk58Nonlethal: 10 + WeaponShotgunDoubleBarreledRubber: 10 + WeaponFlareGun: 20 + BoxDonkSoftBox: 10 + BoxCartridgeCap: 10 + MagazineBoxPistolRubber: 10 + MagazineBoxMagnumRubber: 10 + BoxBeanbag: 8 + MagazineBoxRifleRubber: 8 + MagazineBoxLightRifleRubber: 4 + MagazineBoxCaselessRifleRubber: 4 + + contrabandInventory: + DartYellow: 20 + DartPurple: 20 + DartBlue: 20 + + emaggedInventory: + WeaponLaserCarbinePractice: 4 + WeaponDisablerPractice: 4 + MagazineBoxPistolPractice: 10 + MagazineBoxMagnumPractice: 10 + MagazineBoxLightRiflePractice: 10 + MagazineBoxCaselessRiflePractice: 10 + BoxShotgunPractice: 10 + 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 b4f02cd2475..0cb54c67c91 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 @@ -113,3 +113,21 @@ - state: green_bit shader: unshaded - state: refill_parts # TODO Update this later with a new sprite + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockLessLethalVend + name: LessLethalVend restock box + description: A box containing rubber bullets and disruptors for the Less Lethal vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - LessLethalVendInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_lesslethal + - type: CargoSellBlacklist diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml new file mode 100644 index 00000000000..c7518a112b3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -0,0 +1,12 @@ + +- type: entity + id: Kardashev-MosinNonlethal + parent: WeaponSniperMosin + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeLightRifle + capacity: 10 + proto: CartridgeLightRifleRubber diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 399282078cb..657504d8563 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -199,3 +199,36 @@ radius: 1.5 energy: 1.6 color: "#ff033e" + +- type: entity + parent: VendingMachine + id: LessLethalVendingMachine + name: LessLethalVend + description: Making violence safe since '08 + components: + - type: VendingMachine + pack: LessLethalVendInventory + 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/lesslethalvend.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" diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png new file mode 100644 index 00000000000..01a8c4ed215 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png new file mode 100644 index 00000000000..e362ff17152 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png differ 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 new file mode 100644 index 00000000000..0ac580f8d77 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "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|", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "green_bit" + }, + { + "name": "refill_lesslethal" + } + + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png new file mode 100644 index 00000000000..63fbb2afdd5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png new file mode 100644 index 00000000000..c69d15ddf86 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png new file mode 100644 index 00000000000..dd265621e11 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png new file mode 100644 index 00000000000..6959b718b87 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/meta.json new file mode 100644 index 00000000000..5afae204193 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.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", + "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/lesslethalvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/normal-unshaded.png new file mode 100644 index 00000000000..e86bf6a2f60 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png new file mode 100644 index 00000000000..e2e139b5f42 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png new file mode 100644 index 00000000000..faddc533514 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png differ diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png new file mode 100644 index 00000000000..946265b5a66 Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png differ