From 90ab1f47b2f7eb033f92aa0d2fcec1de2cdcc016 Mon Sep 17 00:00:00 2001 From: "polyxenitopalidou@gmail.com" Date: Tue, 6 Sep 2011 20:08:18 +0000 Subject: [PATCH] =?UTF-8?q?=E2=80=A2Fix=20for=20the=20drinks=20not=20mixin?= =?UTF-8?q?g.=20Now=20I=20have=20to=20fix=20reagent=20parsing=20too,=20it'?= =?UTF-8?q?s=20buggy.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2144 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/chemical/Chemistry-Tools.dm | 6 +++--- icons/changelog.html | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 548b5d8928a..283dc6d3ad3 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -2748,14 +2748,14 @@ volume = 50 on_reagent_change() - if(reagents.reagent_list.len > 1 ) + /*if(reagents.reagent_list.len > 1 ) icon_state = "glass_brown" name = "Glass of Hooch" - desc = "Two or more drinks, mixed together." + desc = "Two or more drinks, mixed together."*/ /*else if(reagents.reagent_list.len == 1) for(var/datum/reagent/R in reagents.reagent_list) switch(R.id)*/ - else if (reagents.reagent_list.len == 1) + if (reagents.reagent_list.len > 0) //mrid = R.get_master_reagent_id() switch(reagents.get_master_reagent_id()) if("beer") diff --git a/icons/changelog.html b/icons/changelog.html index 294aa939be7..25e8220bc17 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -1,4 +1,4 @@ - + /tg/ Station 13 Changelog @@ -58,8 +58,8 @@ should be listed in the changelog upon commit tho. Thanks. -->