diff --git a/GainStation13/code/modules/food_and_drinks/bigbottle.dm b/GainStation13/code/modules/food_and_drinks/bigbottle.dm index 1cb09e428a..fb2ce63445 100644 --- a/GainStation13/code/modules/food_and_drinks/bigbottle.dm +++ b/GainStation13/code/modules/food_and_drinks/bigbottle.dm @@ -11,6 +11,7 @@ icon = 'GainStation13/icons/obj/food/bigbottle.dmi' icon_state = "bigbottle" list_reagents = list(/datum/reagent/consumable/space_cola = 25) + custom_materials = list(/datum/material/plastic=200) foodtype = SUGAR /obj/item/reagent_containers/food/drinks/bigbottle/starkist @@ -33,3 +34,32 @@ icon_state = "bigbottle_spr" list_reagents = list(/datum/reagent/consumable/space_up = 80) foodtype = SUGAR + +/obj/item/reagent_containers/food/drinks/bigbottle/update_icon() + cut_overlays() + var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "reagent") + if(reagents.reagent_list.len) + var/datum/reagent/R = reagents.get_master_reagent() + if(!renamedByPlayer) + name = "bottle of" + R.name + desc = R.glass_desc + + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0) + reagent_overlay.icon_state = "reagent0" + if(1 to 19) + reagent_overlay.icon_state = "reagent20" + if(20 to 39) + reagent_overlay.icon_state = "reagent40" + if(40 to 59) + reagent_overlay.icon_state = "reagent60" + if(60 to 79) + reagent_overlay.icon_state = "reagent80" + if(80 to 100) + reagent_overlay.icon_state = "reagent100" + reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list) + add_overlay(reagent_overlay) + else + reagent_overlay.icon_state = "reagent0" + add_overlay(reagent_overlay) diff --git a/GainStation13/icons/obj/chairs.dmi b/GainStation13/icons/obj/chairs.dmi index 4519c2ea03..1aef513332 100644 Binary files a/GainStation13/icons/obj/chairs.dmi and b/GainStation13/icons/obj/chairs.dmi differ