cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-12 16:52:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

•Fix for the drinks not mixing. Now I have to fix reagent parsing too, it's buggy.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2144 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou@gmail.com
2011-09-06 20:08:18 +00:00
parent 7de17034a5
commit 90ab1f47b2
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Tools.dm
+3 -3
View File
@@ -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")
icons/changelog.html
+6 -6
View File
@@ -1,4 +1,4 @@
<html>
<html>
<head>
<title>/tg/ Station 13 Changelog</title>
@@ -58,8 +58,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
<ul>
<li><b>Agouri updated:</b>
<ul>
<li>Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again.</li>
<li>More info here: <a href="http://code.google.com/p/tgstation13/source/detail?r=2136/">rev2136</a></li>
<li>Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. <font color='red'><b>EDIT: FIXED DRINK MIXING</b></font></li>
<li>More info here: <a href="http://code.google.com/p/tgstation13/source/detail?r=2136/" target='_blank'>rev2136</a></li>
</ul>
</ul>
<ul>
@@ -132,7 +132,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<li><b>Kor updated:</b>
<ul>
<li>Added Necronomicon bible (credit Joseph Curwen)</li>
<li>Removed Doc Scratch clothing from chaplain’s locker and added as a random spawn in the theatre.</li>
<li>Removed Doc Scratch clothing from chaplain’s locker and added as a random spawn in the theatre.</li>
<li>Shaft Miners now start with regular oxygen tanks.</li>
<li>Mutate now gives the wizard hulk and OPTIC BLAST instead of hulk and TK.</li>
<li>Spiderman suit is no longer armoured or space worthy.</li>
@@ -161,7 +161,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<li><b>Lasty updated:</b>
<ul>
<li>The costumes that spawn in the theatre are now randomized.</li>
<li>The kitchen now has a Smartfridge which can be directly loaded from the Botanist’s plantbags. No more crates! (credit to Rolan7).</li>
<li>The kitchen now has a Smartfridge which can be directly loaded from the Botanist’s plantbags. No more crates! (credit to Rolan7).</li>
<li>Snappops can now be acquired from the arcade machines. Amaze your friends! (credit to Petethegoat)</li>
<li>Bangindonk.ogg added to random end sounds list.</li>
</ul>
@@ -173,7 +173,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
<li><b>Superpxdude updated:</b>
<ul>
<li>The mail system actually works properly now! Probably!</li>
<li>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.</li>
<li>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.</li>
</ul>
</ul>