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. -->
- Agouri updated:
- - Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again.
- - More info here: rev2136
+ - Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. EDIT: FIXED DRINK MIXING
+ - More info here: rev2136
@@ -132,7 +132,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
- Kor updated:
- Added Necronomicon bible (credit Joseph Curwen)
- - Removed Doc Scratch clothing from chaplain’s locker and added as a random spawn in the theatre.
+ - Removed Doc Scratch clothing from chaplains locker and added as a random spawn in the theatre.
- Shaft Miners now start with regular oxygen tanks.
- Mutate now gives the wizard hulk and OPTIC BLAST instead of hulk and TK.
- Spiderman suit is no longer armoured or space worthy.
@@ -161,7 +161,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
- Lasty updated:
- The costumes that spawn in the theatre are now randomized.
- - The kitchen now has a Smartfridge which can be directly loaded from the Botanist’s plantbags. No more crates! (credit to Rolan7).
+ - The kitchen now has a Smartfridge which can be directly loaded from the Botanists plantbags. No more crates! (credit to Rolan7).
- Snappops can now be acquired from the arcade machines. Amaze your friends! (credit to Petethegoat)
- Bangindonk.ogg added to random end sounds list.
@@ -173,7 +173,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
- Superpxdude updated:
- The mail system actually works properly now! Probably!
- - Most hats had their “headspace” tag removed, meaning they will no longer substitute for a space helmet in protecting you from the dangers of space.
+ - Most hats had their headspace tag removed, meaning they will no longer substitute for a space helmet in protecting you from the dangers of space.