cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6627 from VOREStation/aro-carafes

Browse Source 
Adds carafes and pitchers
This commit is contained in:
Novacat
2020-03-01 10:52:28 -05:00
committed by GitHub
parent aabba971c6 e9750627aa
commit 65c9b4087f
6 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/drinkingglass/drinkingglass.dm
+8 -8
View File
@@ -74,9 +74,9 @@
update_icon()
/obj/item/weapon/reagent_containers/food/drinks/glass2/proc/can_add_extra(obj/item/weapon/glass_extra/GE)
if(!("[base_icon]_[GE.glass_addition]left" in icon_states(DRINK_ICON_FILE)))
if(!("[base_icon]_[GE.glass_addition]left" in icon_states(icon))) //VOREStation Edit
return 0
if(!("[base_icon]_[GE.glass_addition]right" in icon_states(DRINK_ICON_FILE)))
if(!("[base_icon]_[GE.glass_addition]right" in icon_states(icon))) //VOREStation Edit
return 0
return 1
@@ -106,20 +106,20 @@
over_liquid |= "[base_icon][amnt]_fizz"
for(var/S in R.glass_special)
if("[base_icon]_[S]" in icon_states(DRINK_ICON_FILE))
if("[base_icon]_[S]" in icon_states(icon)) //VOREStation Edit
under_liquid |= "[base_icon]_[S]"
else if("[base_icon][amnt]_[S]" in icon_states(DRINK_ICON_FILE))
else if("[base_icon][amnt]_[S]" in icon_states(icon)) //VOREStation Edit
over_liquid |= "[base_icon][amnt]_[S]"
for(var/k in under_liquid)
underlays += image(DRINK_ICON_FILE, src, k, -3)
underlays += image(icon, src, k, -3) //VOREStation Edit
var/image/filling = image(DRINK_ICON_FILE, src, "[base_icon][amnt][R.glass_icon]", -2)
var/image/filling = image(icon, src, "[base_icon][amnt][R.glass_icon]", -2) //VOREStation Edit
filling.color = reagents.get_color()
underlays += filling
for(var/k in over_liquid)
underlays += image(DRINK_ICON_FILE, src, k, -1)
underlays += image(icon, src, k, -1) //VOREStation Edit
else
name = initial(name)
desc = initial(desc)
@@ -128,7 +128,7 @@
for(var/item in extras)
if(istype(item, /obj/item/weapon/glass_extra))
var/obj/item/weapon/glass_extra/GE = item
var/image/I = image(DRINK_ICON_FILE, src, "[base_icon]_[GE.glass_addition][side]")
var/image/I = image(icon, src, "[base_icon]_[GE.glass_addition][side]") //VOREStation Edit
if(GE.glass_color)
I.color = GE.glass_color
underlays += I
code/modules/food/drinkingglass/serving_glasses.dm
+20
View File
@@ -0,0 +1,20 @@
/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
name = "glass carafe"
base_name = "carafe"
base_icon = "carafe"
icon = 'icons/obj/drinks_vr.dmi'
filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
volume = 120
possible_transfer_amounts = list(5,15,30)
matter = list("glass" = 50)
/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
name = "plastic pitcher"
base_name = "pitcher"
base_icon = "pitcher"
icon = 'icons/obj/drinks_vr.dmi'
filling_states = list(15, 30, 50, 70, 85, 100)
volume = 120
possible_transfer_amounts = list(5,15,30)
matter = list("plastic" = 50)