shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-33316

Browse Source
This commit is contained in:
deathride58
2017-12-11 00:01:02 +00:00
committed by GitHub
parent f3fd81af24 cad71813a3
commit ccd370328c
395 changed files with 6473 additions and 3467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/vending_items.dm
+2 -2
View File
@@ -37,8 +37,8 @@
/obj/item/vending_refill/boozeomat
machine_name = "Booze-O-Mat"
icon_state = "refill_booze"
charges = list(54, 4, 0)//of 159 standard, 12 contraband
init_charges = list(54, 4, 0)
charges = list(58, 4, 0)//of 174 standard, 12 contraband
init_charges = list(58, 4, 0)
/obj/item/vending_refill/coffee
machine_name = "Solar's Best Hot Drinks"