cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes emptied shot glasses having the drinking glass filling icon. [MDB IGNORE] (#9569)

Browse Source 
* Fixes emptied shot glasses having the drinking glass filling icon.

* Feex?

* Update code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-21 18:32:43 +00:00
committed by GitHub
co-authored by Ghom GoldenAlpharex
parent c18e217ced
commit 30aa8edf8b
3 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+18 -32
View File
@@ -1,10 +1,11 @@
/obj/item/reagent_containers/food/drinks/drinkingglass
name = "drinking glass"
desc = "Your standard drinking glass."
icon_state = "glass_empty"
base_icon_state = "glass_empty"
amount_per_transfer_from_this = 10
fill_icon_thresholds = list(1)
fill_icon_state = "drinking_glass"
volume = 50
custom_materials = list(/datum/material/glass=500)
max_integrity = 20
@@ -36,23 +37,22 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/update_icon_state()
if(!length(reagents.reagent_list))
icon_state = "glass_empty"
icon_state = base_icon_state
return ..()
var/datum/reagent/largest_reagent = reagents.get_master_reagent()
if(largest_reagent?.glass_icon_state)
icon_state = largest_reagent.glass_icon_state
icon = largest_reagent.glass_icon || 'icons/obj/drinks.dmi' //SKYRAT EDIT ADDITION - CUSTOMIZATION
var/glass_icon = get_glass_icon(reagents.get_master_reagent())
if(glass_icon)
icon = glass_icon || 'icons/obj/drinks.dmi' //SKYRAT EDIT ADDITION - CUSTOMIZATION
icon_state = glass_icon
fill_icon_thresholds = null
else
//Make sure the fill_icon_thresholds and the icon_state are reset. We'll use reagent overlays.
fill_icon_thresholds = fill_icon_thresholds || list(1)
icon_state = base_icon_state
return ..()
/obj/item/reagent_containers/food/drinks/drinkingglass/update_overlays()
. = ..()
if(icon_state != initial(icon_state))
return
var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "glassoverlay")
reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
. += reagent_overlay
/obj/item/reagent_containers/food/drinks/proc/get_glass_icon(datum/reagent/largest_reagent)
return largest_reagent?.glass_icon_state
//Shot glasses!//
// This lets us add shots in here instead of lumping them in with drinks because >logic //
@@ -69,6 +69,7 @@
gulp_size = 15
amount_per_transfer_from_this = 15
possible_transfer_amounts = list(15)
fill_icon_state = "shot_glass"
volume = 15
custom_materials = list(/datum/material/glass=100)
custom_price = PAYCHECK_ASSISTANT * 0.4
@@ -88,23 +89,8 @@
else
desc = "The challenge is not taking as many as you can, but guessing what it is before you pass out."
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_icon_state()
. = ..()
if(!length(reagents.reagent_list))
icon_state = base_icon_state
return
var/datum/reagent/largest_reagent = reagents.get_master_reagent()
icon_state = largest_reagent.shot_glass_icon_state || "[base_icon_state]clear"
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/update_overlays()
. = ..()
if(icon_state != "[base_icon_state]clear")
return
var/mutable_appearance/shot_overlay = mutable_appearance(icon, "shotglassoverlay")
shot_overlay.color = mix_color_from_reagents(reagents.reagent_list)
. += shot_overlay
/obj/item/reagent_containers/food/drinks/get_glass_icon(datum/reagent/largest_reagent)
return largest_reagent?.shot_glass_icon_state
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda
name = "Soda Water"