Merge pull request #1185 from Erthilo/master

HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes

code/modules/chemical/Chemistry-Tools.dm

@@ -2911,6 +2911,15 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/waterbottle
+	name = "water bottle"
+	desc = "Straight from the ice lakes of Mars!"
+	icon_state = "waterbottle"
+	New()
+		..()
+		reagents.add_reagent("water", 30)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
 
 /obj/item/weapon/reagent_containers/food/drinks/sillycup
 	name = "Paper Cup"

code/modules/clothing/suits/labcoat.dm

@@ -48,5 +48,11 @@
 
 /obj/item/clothing/suit/storage/labcoat/fr_jacket
 	name = "first responder jacket"
-	desc = "\"The first moments are the most crucial.\""
+	desc = "A high-visibility jacket worn by medical first responders."
 	icon_state = "fr_jacket_open"
+	item_state = "fr_jacket"
+
+/obj/item/clothing/suit/storage/labcoat/fr_jacket/sleeve
+	name = "first responder jacket"
+	desc = "A high-visibility jacket worn by medical first responders. Has rolled up sleeves."
+	icon_state = "fr_sleeve_open"

code/modules/mob/living/carbon/alien/humanoid/hud.dm

@@ -146,7 +146,7 @@
 	using.name = "drop"
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = "act_drop"
-	using.screen_loc = ui_dropbutton
+	using.screen_loc = ui_dropbutton_old
 	using.layer = 19
 	src.adding += using
 

code/modules/mob/living/carbon/alien/larva/hud.dm

@@ -56,7 +56,7 @@
 	using.dir = SOUTHWEST
 	using.icon = 'screen1_alien.dmi'
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")
-	using.screen_loc = ui_movi_old
+	using.screen_loc = ui_acti
 	using.layer = 20
 	src.adding += using
 	move_intent = using

code/modules/mob/living/silicon/robot/hud.dm

@@ -202,7 +202,7 @@
 	mymob.pullin.icon = 'screen1_robot.dmi'
 	mymob.pullin.icon_state = "pull0"
 	mymob.pullin.name = "pull"
-	mymob.pullin.screen_loc = ui_pull_old
+	mymob.pullin.screen_loc = ui_pull_borg
 
 	mymob.blind = new /obj/screen( null )
 	mymob.blind.icon = 'screen1_robot.dmi'

code/modules/projectiles/projectile/change.dm

@@ -166,10 +166,10 @@
 				var/last = pick(last_names)
 				O.name = "[first] [last]"
 				O.real_name = "[first] [last]"
-				var/race = pick("lizard","golem","metroid","plant","normal")
+				var/race = pick("golem","metroid","plant","normal")
 				switch(race)
-					if("lizard")
-						O.mutantrace = "lizard"
+//					if("lizard")
+//						O.mutantrace = "lizard"
 					if("golem")
 						O.mutantrace = "golem"
 					if("metroid")