cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6538.

Browse Source
This commit is contained in:
eswordthecat
2015-11-12 03:10:57 +08:00
parent dc0894338c
commit b7009b32fa
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/machinery/vending.dm
View File

@@ -112,10 +112,6 @@ var/global/num_vending_terminals = 1
// so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
src.last_slogan = world.time + rand(0, slogan_delay)
if(!product_records.len)
src.build_inventory(products)
src.build_inventory(contraband, 1)
src.build_inventory(premium, 0, 1)
power_change()
coinbox = new(src)
@@ -125,6 +121,12 @@ var/global/num_vending_terminals = 1
return
/obj/machinery/vending/initialize()
product_records = new/list()
build_inventory(products)
build_inventory(contraband, 1)
build_inventory(premium, 0, 1)
/obj/machinery/vending/RefreshParts()
var/manipcount = 0
for(var/obj/item/weapon/stock_parts/SP in component_parts)
@@ -253,7 +255,7 @@ var/global/num_vending_terminals = 1
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/machinery/vending/proc/build_inventory() called tick#: [world.time]")
var/obj/item/temp
for(var/typepath in productlist)
for (var/typepath in productlist)
var/amount = productlist[typepath]
var/price = prices[typepath]
if(isnull(amount)) amount = 1
@@ -275,13 +277,13 @@ var/global/num_vending_terminals = 1
R.category=CAT_NORMAL
product_records += R
temp = typepath
temp = new typepath(null)
if (delay_product_spawn)
sleep(1)
R.product_name = initial(temp.name)
R.subcategory = initial(temp.vending_cat)
R.product_name = temp.name
R.subcategory = temp.vending_cat
/obj/machinery/vending/proc/get_item_by_type(var/this_type)
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\/obj/machinery/vending/proc/get_item_by_type() called tick#: [world.time]")