cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 11:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes a mistake that made space bartenders sad. [MDB IGNORE] (#9623)

Browse Source 
* Fixes a mistake that made space bartenders sad. (#62978)

* Fixes a mistake that made space bartenders sad.

* Update drinkingglass.dm

* Fixes a mistake that made space bartenders sad.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-11-22 22:05:13 +00:00
committed by GitHub
parent d83935142d
commit 9fcaa61457
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+4 -4
View File
@@ -4,7 +4,7 @@
icon_state = "glass_empty"
base_icon_state = "glass_empty"
amount_per_transfer_from_this = 10
fill_icon_thresholds = list(1)
fill_icon_thresholds = list(0)
fill_icon_state = "drinking_glass"
volume = 50
custom_materials = list(/datum/material/glass=500)
@@ -36,7 +36,7 @@
desc = largest_reagent?.glass_desc || initial(desc)
/obj/item/reagent_containers/food/drinks/drinkingglass/update_icon_state()
if(!length(reagents.reagent_list))
if(!reagents.total_volume)
icon_state = base_icon_state
return ..()
@@ -51,7 +51,7 @@
icon_state = base_icon_state
return ..()
/obj/item/reagent_containers/food/drinks/proc/get_glass_icon(datum/reagent/largest_reagent)
/obj/item/reagent_containers/food/drinks/drinkingglass/proc/get_glass_icon(datum/reagent/largest_reagent)
return largest_reagent?.glass_icon_state
//Shot glasses!//
@@ -89,7 +89,7 @@
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/get_glass_icon(datum/reagent/largest_reagent)
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/get_glass_icon(datum/reagent/largest_reagent)
return largest_reagent?.shot_glass_icon_state
/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda