From f8458f13f4ceb7385bd176c3a2c2bcd047c94c62 Mon Sep 17 00:00:00 2001
From: jupotter <jupotter.g@gmail.com>
Date: Fri, 21 Jun 2013 17:29:37 +0200
Subject: [PATCH 1/2] Fix robotics on char setup screen

Robotics is no longer in engineering, but in medsci
---
 .../mob/new_player/preferences_setup.dm       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 36cf966566d..44b11436c21 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -431,6 +431,19 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ROBOTICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
 		else if(job_engsec_high)
 			switch(job_engsec_high)
@@ -538,19 +551,7 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
-				if(ROBOTICIST)
-					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
-					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/items_righthand.dmi', "toolbox_blue"), ICON_OVERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
-					switch(backbag)
-						if(2)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
-						if(3)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
-						if(4)
-							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
 				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
 					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)

From 97955c7ee25e53df69e6ea774c326a4bdfd62a74 Mon Sep 17 00:00:00 2001
From: jupotter <jupotter.g@gmail.com>
Date: Fri, 21 Jun 2013 17:38:30 +0200
Subject: [PATCH 2/2] Updated changelog

---
 html/changelog.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html/changelog.html b/html/changelog.html
index 4569a0db0e3..77b3b8487aa 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -57,6 +57,15 @@ Stuff which is in development and not yet visible to players or just code relate
 (ie. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit though. Thanks. -->
 
+<div class="commit sansserif">
+	<h2 class="date">21.06.2013</h2>
+	<h3 class="author">Jupotter updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Fix the robotiscist preview in the char setupe screen</li>
+	</ul>
+</div>
+
+
 <div class="commit sansserif">
 	<h2 class="date">18.06.2013</h2>
 	<h3 class="author">Segrain updated:</h3>