Fixed nanoUI issues with Watermelon Juice in the Soda Dispenser

Added some if statements so that NanoUI for the booze/soda dispensers isn't /exactly/ like the chemdispenser, mentions glass instead of beaker, and "drinks" instead of chemical.

Also removed my debug messages
This commit is contained in:
Ccomp5950
2013-11-23 01:43:34 -06:00
parent 91c56c6e77
commit ec79e75c0f
4 changed files with 38 additions and 15 deletions
@@ -183,7 +183,6 @@
return 1 // update UIs attached to this object
/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob)
world << "DEBUG: got chem_dispenser attack by"
if(isrobot(user))
return
@@ -200,9 +199,7 @@
if(src.beaker)
user << "Something is already loaded into the machine."
return
world << "DEBUG: Got to chem_dispenser/attackby istype check"
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food))
world << "DEBUG: Passed istype check"
if(!accept_glass && istype(B,/obj/item/weapon/reagent_containers/food))
user << "<span class='notice'>This machine only accepts beakers</span>"
src.beaker = B
@@ -259,7 +256,6 @@
dispensable_reagents = list("water","ice","coffee","tea","cream","lemon_lime","sugar","orangejuice","limejuice","cola","sodawater","tonic","beer","kahlua","whiskey","wine","vodka","gin","rum","tequilla","vermouth","cognac","ale","mead")
/obj/machinery/chem_dispenser/beer/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
world << "DEBUG: GOT BEER DISPENSER attackby"
..()
if(istype(B, /obj/item/device/multitool))
+1 -1
View File
@@ -2563,7 +2563,7 @@ datum
return
drink/cold/spacemountainwind
name = "MountainWind"
name = "Mountain Wind"
id = "spacemountainwind"
description = "Blows right through you like a space wind."
color = "#102000" // rgb: 16, 32, 0