From 34f9269f5eb456bc1dca8d855b241b4d18d0013f Mon Sep 17 00:00:00 2001 From: "uhangi@gmail.com" Date: Wed, 23 Feb 2011 02:51:28 +0000 Subject: [PATCH] Large beakers now hold 100 units instead of 50, code contribution by Slith. Regular beakers already hold 50 units, so large beakers should hold twice as much now. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1093 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 30 +++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index ab79ef5b03e..0cbcc2701f6 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -370,7 +370,7 @@ src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT var/datum/reagents/R = new/datum/reagents(volume) reagents = R - R.my_atom = src + R.my_atom = src attackby(obj/item/weapon/W as obj, mob/user as mob) return @@ -621,7 +621,7 @@ user << "\blue You take a blood sample from [target]" for(var/mob/O in viewers(4, user)) O.show_message("\red [user] takes a blood sample from [target].", 1) - + else //if not mob if(!target.reagents.total_volume) user << "\red [target] is empty." @@ -637,7 +637,7 @@ if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() - + if(SYRINGE_INJECT) if(!reagents.total_volume) user << "\red The Syringe is empty." @@ -666,7 +666,7 @@ if (reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() - + return update_icon() @@ -732,7 +732,7 @@ possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. - New() + New() ..() src.pixel_x = rand(-5.0, 5) //Randomizes postion slightly. src.pixel_y = rand(-5.0, 5) @@ -1124,13 +1124,19 @@ icon_state = "blender_jug_f" /obj/item/weapon/reagent_containers/glass/large - name = "large reagent glass" - desc = "A large reagent glass." - icon = 'chemical.dmi' - icon_state = "beakerlarge" - item_state = "beaker" - amount_per_transfer_from_this = 10 - flags = FPRINT | TABLEPASS | OPENCONTAINER + name = "large reagent glass" + desc = "A large reagent glass." + icon = 'chemical.dmi' + icon_state = "beakerlarge" + item_state = "beaker" + + New() + var/datum/reagents/R = new/datum/reagents(100) + reagents = R + R.my_atom = src + + amount_per_transfer_from_this = 10 + flags = FPRINT | TABLEPASS | OPENCONTAINER /obj/item/weapon/reagent_containers/glass/bottle name = "bottle"