From 9e9cbb95ffe316479f7167ee7c143ca31487c5f9 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Tue, 29 Oct 2013 16:36:09 +0100 Subject: [PATCH] You can actually see the contents of the bottle --- code/modules/reagents/Chemistry-Machinery.dm | 4 +-- .../reagent_containers/glass/bottle.dm | 31 ++++++++++++++++++ icons/obj/reagentfillings.dmi | Bin 1297 -> 1272 bytes 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 7f096f0b578..d51b1e2d283 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -386,12 +386,12 @@ reagents.clear_reagents() icon_state = "mixer0" else if (href_list["createpill"] || href_list["createpill_multiple"]) - var/name = reject_bad_text(input(usr,"Name:","Name your pill!",reagents.get_master_reagent_name())) var/count = 1 if (href_list["createpill_multiple"]) count = isgoodnumber(input("Select the number of pills to make.", 10, pillamount) as num) if (count > 20) count = 20 //Pevent people from creating huge stacks of pills easily. Maybe move the number to defines? var/amount_per_pill = reagents.total_volume/count if (amount_per_pill > 50) amount_per_pill = 50 + var/name = reject_bad_text(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)")) while (count--) var/obj/item/weapon/reagent_containers/pill/P = new/obj/item/weapon/reagent_containers/pill(src.loc) if(!name) name = reagents.get_master_reagent_name() @@ -501,7 +501,7 @@ if(!condi) dat += "

Create pill (50 units max)
" dat += "Create multiple pills
" - dat += "Create bottle (30 units max)" + dat += "Create bottle (30 units max)" else dat += "Create bottle (50 units max)" if(!condi) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index c4beb0a8f91..a1240ebec56 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -17,9 +17,40 @@ if(!icon_state) icon_state = "bottle[rand(1,20)]" + + //Copypasta from /obj/item/weapon/reagent_containers/glass/beaker + on_reagent_change() + update_icon() + + pickup(mob/user) + ..() + update_icon() + + dropped(mob/user) + ..() + update_icon() + + attack_hand() + ..() + update_icon() + update_icon() overlays.Cut() + if(reagents.total_volume) + var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10") + + var/percent = round((reagents.total_volume / volume) * 100) + switch(percent) + if(0 to 24) filling.icon_state = "[icon_state]10" + if(25 to 49) filling.icon_state = "[icon_state]25" + if(50 to 74) filling.icon_state = "[icon_state]50" + if(75 to 90) filling.icon_state = "[icon_state]75" + if(91 to INFINITY) filling.icon_state = "[icon_state]100" + + filling.icon += mix_color_from_reagents(reagents.reagent_list) + overlays += filling + if (!is_open_container()) var/image/lid = image(icon, src, "lid_bottle") overlays += lid diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index f236fbc2c0609a3fa14672c8343e9e4d453ebbe5..2d6eb81ba9234d222d638a169cbc155cfe071b26 100644 GIT binary patch literal 1272 zcmeAS@N?(olHy`uVBq!ia0vp^2Y`412OE%#(nyX4QXi^9B1&9Ri<65o3raHc^B5Q^ z=1iUB+jYo6p!NF8V3A#6Lb4Zq&74zCIK2;OPF+4js@3cA;XC(SU%O4PDZl&Sh8abd{qC-^!X}M?6<7y}A8E|Bpp0(-&H; z?7tEuylV63^;5nJb2hK$<;V*-s=I2(;j;^tY;->uZ1hdz{l$W~V{)u~XKyS%a8j~b z#A4s>)0s7Y%J;g=-1mr&>7?z6%(H89Jc=W4I`F*E(v}Vg3Nu?UcTJ9i?opO`FHSzok__Cd9Jlkmdrpnvr=4KDEtnK@rTS|R+f9P)+ z|I_n)H!#n8zWo;C+536_9x=RWcqX6uPkOu4gfq|axPYJ&!3x%%p8YUE+x#x? ztzTsco32FdpB`lAbNS2l?EU#N$NTsHnzNee#;3ZnUmxEy?b-2h?~lv})5RZzd1=aD z`(vrjFgs(f*uVE7JJLcK*5VAa9{T58f zJ9&PAckJx_*Q*QJKkNUKR(Qm+fqB;cubdBlGj=>{Hdw^jkin!di=jh}fpq3A-}2^n zZ{_mR9!H3=7Chh1{N8pF^Nlww8MXcyuYZ2Y+{_U5{=nMjm(|q|@Mf)DUR+UK=Xz!7 z`jxkm|7~4={8skA_Zuu4tar%nc==~%q0H<(FEfklmmg)kbMWs6-{-|TehiC#)-mh~ z$^L7|b9nw^i+_cuKmSmfkpUF9WF*VMV1EJ)tX;RYZtvGhP+V*{6=q$K&GaH|RW<8b zBfKQ_&c2_@AU5lL!_q1KmrZJ=+y06@sCjty`TM6w|Gaa4q1Q0o{X?bT7K^6uaW&-@ z`=9>s)!}=vhvB^YLxVq`#Wy}@n)AL!SIqJCT>aXA)9 IsXlv|&%Q|JY=1R2YjJ SX<7h_G6qjqKbLh*2~7ZWh$&bA literal 1297 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fH>yG+N?cNllZ!G7N;32F7#J$% zOr5xw>yU#$%j-MAI#JrkqseXH1)y(17oLOJ~Y@Efk=QHnz#CJ2*KTm%A`1A2s+ZZp` zGsoZVGCt$q*MDaHRy+QO{kBRwEe}{*%zc@YQJj0g`p1vOpZmXBOaltudw#fgM*X+! z13S$g$kzP1_;c^ghPR*3|N9|jp1^;OUFDRuBA%$mwS@dsz!mrzY zm9jrRKR+IHYI)EpAZfpJivH7=FE>8bWAWHM{h{sFHgf@m?XM;79f&T}Hh(2_=iw#m z4U9W|kH6@<*`RIy($j<8Orf^t&IGdurMD8%wWsf6x!v&P>JHi5 z15>^C3+Nu0x?AFbe$~UDQy9coUE8I|=LCT+yx%4K;8gDR+sB1& z)h*>H`1+?gT4%8+rYZCK$H))$?R6*4SY2+I3oPRpJYD@<);T3K F0RXA!NLBy<