-
Notifications
You must be signed in to change notification settings - Fork 618
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
1 parent
8730f1e
commit 1b68e5f
Showing
23 changed files
with
228 additions
and
0 deletions.
There are no files selected for viewing
20 changes: 20 additions & 0 deletions
20
Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -191,3 +191,5 @@ | |
whitelist: | ||
tags: | ||
- CartridgePistol | ||
- type: StaticPrice | ||
price: 550 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
31 changes: 31 additions & 0 deletions
31
Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+241 Bytes
...rces/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+175 Bytes
...Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
|
||
] | ||
} |
Binary file added
BIN
+790 Bytes
.../_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.72 KB
.../Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.01 KB
...es/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.18 KB
...s/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions
44
Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} | ||
] | ||
} |
Binary file added
BIN
+932 Bytes
.../_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/normal-unshaded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.2 KB
...ces/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+245 Bytes
...s/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png
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.