cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10782 from phil235/VendingCharges

Browse Source 
Mech & vending machine fixes
This commit is contained in:
Cheridan
2015-07-24 00:02:31 -05:00
parent 1d48703c0e 1ab69f9fda
commit 05e227073d
11 changed files with 107 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/manuals.dm
+3 -1
View File
@@ -709,7 +709,7 @@
<h2>Microwave:</h2>
Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
It can cook multiple items at once. Use the higher power settings for faster (and riskier) cooking.
It can cook multiple items at once.
<h2>Processor:</h2>
Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...)
@@ -733,6 +733,8 @@
<b>Donuts:</b> 1u sugar + 1 pastry base<br>
<b>Fries:</b> Process potato.
<h2>Sharing your food:</h2>
You can put your meals on your kitchen counter or load them in the snack vending machines.
</body>
</html>
"}
code/game/objects/items/weapons/vending_items.dm
+20 -11
View File
@@ -12,18 +12,20 @@
throw_range = 7
w_class = 4.0
var/charges = 0 //how many restocking "charges" the refill has
var/charges = list(0, 0, 0) //how many restocking "charges" the refill has for standard/contraband/coin products
var/init_charges = list(0, 0, 0)
/obj/item/weapon/vending_refill/New(amt = -1)
..()
name = "\improper [machine_name] restocking unit"
if(isnum(amt) && amt > -1)
charges = amt
charges[1] = amt
/obj/item/weapon/vending_refill/examine(mob/user)
..()
if(charges)
user << "It can restock [charges] item(s)."
if(charges[1] > 0)
user << "It can restock [charges[1]] item(s)."
else
user << "It's empty!"
@@ -32,33 +34,40 @@
/obj/item/weapon/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
charges = 54//of 162
charges = list(52, 4, 0)//of 156 standard, 12 contraband
init_charges = list(52, 4, 0)
/obj/item/weapon/vending_refill/coffee
machine_name = "Solar's Best Hot Drinks"
icon_state = "refill_joe"
charges = 28//of 85
charges = list(25, 4, 0)//of 75 standard, 12 contraband
init_charges = list(25, 4, 0)
/obj/item/weapon/vending_refill/snack
machine_name = "Getmore Chocolate Corp"
charges = 14//of 42
charges = list(12, 2, 0)//of 36 standard, 6 contraband
init_charges = list(12, 2, 0)
/obj/item/weapon/vending_refill/cola
machine_name = "Robust Softdrinks"
icon_state = "refill_cola"
charges = 22//of 66
charges = list(20, 2, 0)//of 60 standard, 6 contraband
init_charges = list(20, 2, 0)
/obj/item/weapon/vending_refill/cigarette
machine_name = "ShadyCigs Deluxe"
icon_state = "refill_smoke"
charges = 14// of 42
charges = list(12, 1, 2)// of 36 standard, 3 contraband, 6 premium
init_charges = list(12, 1, 2)
/obj/item/weapon/vending_refill/autodrobe
machine_name = "AutoDrobe"
icon_state = "refill_costume"
charges = 29// of 87
charges = list(25, 2, 3)// of 75 standard, 6 contraband, 9 premium
init_charges = list(25, 2, 3)
/obj/item/weapon/vending_refill/clothing
machine_name = "ClothesMate"
icon_state = "refill_clothes"
charges = 30// of 90
charges = list(29, 2, 2)// of 85 standard, 6 contraband, 6 premium
init_charges = list(29, 2, 2)