Merge pull request #3352 from Cerebulon/vendingpanels

Adds missing vending machine maintenance panel sprites.
This commit is contained in:
Anewbe
2017-04-24 10:03:28 -05:00
committed by GitHub
2 changed files with 5 additions and 4 deletions

View File

@@ -78,7 +78,7 @@
C.traits = new() C.traits = new()
C.nameVar = "grey" C.nameVar = "grey"
I.add_product(C) I.add_product(C)
/obj/machinery/smartfridge/secure/medbay /obj/machinery/smartfridge/secure/medbay
name = "\improper Refrigerated Medicine Storage" name = "\improper Refrigerated Medicine Storage"
@@ -139,6 +139,7 @@
icon_state = "drying_rack" icon_state = "drying_rack"
icon_on = "drying_rack_on" icon_on = "drying_rack_on"
icon_off = "drying_rack" icon_off = "drying_rack"
icon_panel = "drying_rack-panel"
/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj) /obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/)) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/))
@@ -260,7 +261,7 @@
locked = -1 locked = -1
user << "You short out the product lock on [src]." user << "You short out the product lock on [src]."
return 1 return 1
/obj/machinery/smartfridge/proc/stock(obj/item/O) /obj/machinery/smartfridge/proc/stock(obj/item/O)
var/hasRecord = FALSE //Check to see if this passes or not. var/hasRecord = FALSE //Check to see if this passes or not.
for(var/datum/stored_item/I in item_records) for(var/datum/stored_item/I in item_records)
@@ -273,7 +274,7 @@
item.add_product(O) item.add_product(O)
item_records.Add(item) item_records.Add(item)
nanomanager.update_uis(src) nanomanager.update_uis(src)
/obj/machinery/smartfridge/proc/vend(datum/stored_item/I) /obj/machinery/smartfridge/proc/vend(datum/stored_item/I)
I.get_product(get_turf(src)) I.get_product(get_turf(src))
nanomanager.update_uis(src) nanomanager.update_uis(src)
@@ -357,7 +358,7 @@
if (!throw_item) if (!throw_item)
continue continue
break break
if(!throw_item) if(!throw_item)
return 0 return 0
spawn(0) spawn(0)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB