Merge pull request #1185 from Erthilo/master

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

code/defines/obj/vending.dm

@@ -126,9 +126,9 @@
 	name = "Robust Softdrinks"
 	desc = "A softdrink vendor provided by Robust Industries, LLC."
 	icon_state = "Cola_Machine"
-	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up"
-	product_amounts = "10;10;10;10;10"
-	product_prices = "1;1;1;1;1"
+	product_paths = "/obj/item/weapon/reagent_containers/food/drinks/cola;/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind;/obj/item/weapon/reagent_containers/food/drinks/dr_gibb;/obj/item/weapon/reagent_containers/food/drinks/starkist;/obj/item/weapon/reagent_containers/food/drinks/space_up;/obj/item/weapon/reagent_containers/food/drinks/waterbottle"
+//	product_amounts = "10;10;10;10;10"
+	product_prices = "1;1;1;1;1;1"
 	product_slogans = "Robust Softdrinks: More robust then a toolbox to the head!"
 	product_hidden = "/obj/item/weapon/reagent_containers/food/drinks/thirteenloko"
 	product_hideamt = "5"

code/game/hud.dm

@@ -35,19 +35,19 @@
 #define ui_monkey_back "6:14,1:5"	//monkey
 
 //Lower right, persistant menu
-#define ui_dropbutton "13:26,1:5"
-#define ui_throw "13:26,1:5"
-#define ui_pull "13:26,2:7"
-#define ui_acti "12:24,1:5"
+#define ui_dropbutton "11:22,1:5"
+#define ui_throw "11:22,1:5"
+#define ui_pull "12:24,1:5"
+#define ui_movi "12:24,1:5"
 
-#define ui_movi "13:26,2:7"
+#define ui_acti "13:26,1:5"
 #define ui_zonesel "14:28,1:5"
 
 //Gun buttons
-#define ui_gun1 "11:22,2:7"
-#define ui_gun2 "10:20,2:7"
-#define ui_gun3 "9:18,2:7"
-#define ui_gun_select "11:22,1:5"
+#define ui_gun1 "13:26,2:5"
+#define ui_gun2 "12:24,2:5"
+#define ui_gun3 "11:22,2:5"
+#define ui_gun_select "14:28,2:5"
 
 //Middle right (damage indicators)
 #define ui_pressure "14:28,6:13"
@@ -67,12 +67,15 @@
 #define ui_health "14:28,7:15"
 #define ui_internal "14:28,8:17"
 
+//For non-human compatibility
 									//borgs
 #define ui_borg_health "14:28,6:13" //borgs have the health display where humans have the pressure damage indicator.
 #define ui_alien_health "14:28,6:13" //aliens have the health display where humans have the pressure damage indicator.
 #define ui_throw_old "13:26,2:7"
 #define ui_movi_old "12:24,2:7"
 #define ui_pull_old "14:28,2:7"
+#define ui_dropbutton_old "12:24,1:5"
+#define ui_pull_borg "12:24,1:5"
 
 //Pop-up inventory
 #define ui_shoes "2:8,1:5"
@@ -92,10 +95,10 @@
 
 
 //Intent small buttons
-#define ui_help_small "12:16,1:-3"
-#define ui_disarm_small "12:16,1:12"
-#define ui_grab_small "12:32,1:12"
-#define ui_harm_small "12:32,1:-3"
+#define ui_help_small "13:18,1:-3"
+#define ui_disarm_small "13:18,1:12"
+#define ui_grab_small "13:34,1:12"
+#define ui_harm_small "13:34,1:-3"
 
 
 

code/game/jobs/job/medical.dm

@@ -52,6 +52,12 @@
 		if(H.mind.role_alt_title && H.mind.role_alt_title == "Virologist")
 			H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform)
 			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/virologist(H), H.slot_wear_suit)
+		else if(H.mind.role_alt_title && H.mind.role_alt_title == "Emergency Physician")
+			H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
+			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/fr_jacket(H), H.slot_wear_suit)
+		else if(H.mind.role_alt_title && H.mind.role_alt_title == "Surgeon")
+			H.equip_if_possible(new /obj/item/clothing/under/rank/medical/blue(H), H.slot_w_uniform)
+			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		else
 			H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
 			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)

code/game/objects/items/clothing.dm

@@ -398,10 +398,16 @@ THERMAL GLASSES
 		usr << "You unbutton the labcoat."
 	else if(src.icon_state == "fr_jacket_open")
 		src.icon_state = "fr_jacket"
-		usr << "You button up the labcoat."
+		usr << "You button up the jacket."
 	else if(src.icon_state == "fr_jacket")
 		src.icon_state = "fr_jacket_open"
-		usr << "You unbutton the labcoat."
+		usr << "You unbutton the jacket."
+	else if(src.icon_state == "fr_sleeve_open")
+		src.icon_state = "fr_sleeve"
+		usr << "You button up the jacket."
+	else if(src.icon_state == "fr_sleeve")
+		src.icon_state = "fr_sleeve_open"
+		usr << "You unbutton the jacket."
 	else
 		usr << "Sorry! The suit you're wearing doesn't have buttons!"
 	usr.update_clothing()

code/game/response_team.dm

@@ -27,7 +27,7 @@ client/verb/JoinResponseTeam()
 			new_commando.mind.key = usr.key
 			new_commando.key = usr.key
 
-			new_commando << "\blue You are [!leader_selected?"a member":"the <B>LEADER</B>"] of an armed response team in CentComm's service. Something went down on [station_name()] and they're now on code red. Go in there and fix the problem."
+			new_commando << "\blue You are [!leader_selected?"a member":"the <B>LEADER</B>"] of an Emergency Response Team under CentComm's service. There is a code red alert on [station_name()], you are tasked to go and fix the problem."
 			new_commando << "<b>You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready."
 			del(L)
 
@@ -81,7 +81,7 @@ proc/trigger_armed_response_team(var/force = 0)
 	if(!nuke)
 		nuke = locate() in world
 	var/obj/item/weapon/paper/P = new
-	P.info = "Your orders, Commander, are to use all necessary tools given to return the station to a survivable condition. <br> To this end, you have been provided with the best tools we can give in the three areas of Medical Engineering and Security. The nuclear authorization code is: <b>[ nuke ? nuke.r_code : "AHH, THE NUKE IS GONE!"]</b>. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then burn this message."
+	P.info = "Your orders, Commander, are to use all means necessary to return the station to a survivable condition.<br>To this end, you have been provided with the best tools we can give in the three areas of Medicine, Engineering, and Security. The nuclear authorization code is: <b>[ nuke ? nuke.r_code : "AHH, THE NUKE IS GONE!"]</b>. Be warned, if you detonate this without good reason, we will hold you to account for damages. Memorise this code, and then burn this message."
 	P.name = "Emergency Nuclear Code, and ERT Orders"
 	for (var/obj/effect/landmark/A in world)
 		if (A.name == "nukecode")

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")