Skip to content

Commit

Permalink
LessLethalVend (#527)
Browse files Browse the repository at this point in the history
* Added Circuitvend Art

*Circuitvend Sprite

*Amended vending_machines.yml to show sprite

* Shredding Sprites

Added nanotransen and syndicate shredder sprites
-Off
-Idle
-Shredding money
-not shredding anything

* Shredder, 2!

Even better JSON

* Added the LessLethalVending Machine

* Update

It works

* Fix

* Added restock to the vender

* More ammo types and some fun weapons

-Added
*Beanbag and Mosin rubbers
*Darts to the contraband inventory (I think its funny)
*Practice shotgun shells to emag

*Added a flare gun as a alternative to the double barrel
     -May need to tweak the prices of weapons in the vend, flare, pisol, and disabler at $5000 currently

* Updated Costs and added RubberMosin

* Fix
  • Loading branch information
IData-RedactedI committed Nov 7, 2023
1 parent 8730f1e commit 1b68e5f
Show file tree
Hide file tree
Showing 23 changed files with 228 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -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?
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@
- type: GuideHelp
guides:
- Security
- type: StaticPrice
price: 800

- type: entity
name: practice disabler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,5 @@
whitelist:
tags:
- CartridgePistol
- type: StaticPrice
price: 550
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@
quickEquip: false
slots:
- Belt

- type: StaticPrice #Dunno if I should be doing this outside of the _NF file
price: 150
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,12 @@
contents:
- id: VendingMachineRestockCuddlyCritterVend
amount: 2

- type: entity
id: CrateVendingMachineRestockLessLethalVendFilled
parent: CratePlasticBiodegradable
components:
- type: StorageFill
contents:
- id: VendingMachineRestockLessLethalVend
amount: 1
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@

- type: entity
id: Kardashev-MosinNonlethal
parent: WeaponSniperMosin
suffix: Non-lethal
components:
- type: BallisticAmmoProvider
whitelist:
tags:
- CartridgeLightRifle
capacity: 10
proto: CartridgeLightRifleRubber
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}

]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1b68e5f

Please sign in to comment.