diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index c01ef1a7a3e..553b5953c32 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -43,8 +43,23 @@ usr << "\blue [R.volume] units of [R.name]" else usr << "\blue Nothing." + if (!is_open_container()) + usr << "\blue Airtight lid seals it completely." + + attack_self() + ..() + if (is_open_container()) + usr << "You put the lid on \the [src]." + flags ^= OPENCONTAINER + else + usr << "You take the lid off \the [src]." + flags |= OPENCONTAINER + update_icon() afterattack(obj/target, mob/user , flag) + if (!is_open_container()) + return + for(var/type in src.can_be_placed_into) if(istype(target, type)) return @@ -149,6 +164,10 @@ filling.icon += mix_color_from_reagents(reagents.reagent_list) overlays += filling + if (!is_open_container()) + var/image/lid = image(icon, src, "lid_[initial(icon_state)]") + overlays += lid + /obj/item/weapon/reagent_containers/glass/beaker/large name = "large beaker" desc = "A large beaker. Can hold up to 100 units." diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 0b03e21d95c..c4beb0a8f91 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -17,6 +17,13 @@ if(!icon_state) icon_state = "bottle[rand(1,20)]" + update_icon() + overlays.Cut() + + if (!is_open_container()) + var/image/lid = image(icon, src, "lid_bottle") + overlays += lid + /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline name = "inaprovaline bottle" desc = "A small bottle. Contains inaprovaline - used to stabilize patients." diff --git a/html/changelog.html b/html/changelog.html index 7698458200e..8aefc995b04 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -58,6 +58,13 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> +
+

26th May 2013

+

Chinsky updated:

+
    +
  • Lids! Click beaker/bottle in hand to put them on/off. Prevent spilling
  • +
+

25th May 2013

diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 751e3ec7c03..313a90b3053 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ