Merge pull request #2955 from Segrain/master

Medical clothes.

code/game/jobs/job/medical.dm

@@ -76,7 +76,10 @@
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
 				if("Nurse")
 					if(H.gender == FEMALE)
-						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
+						if(prob(50))
+							H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
+						else
+							H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nurse(H), slot_w_uniform)
 						H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
 					else
 						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -122,6 +122,17 @@
 			new /obj/item/weapon/storage/backpack/satchel_med(src)
 		new /obj/item/clothing/suit/bio_suit/cmo(src)
 		new /obj/item/clothing/head/bio_hood/cmo(src)
+		new /obj/item/clothing/shoes/white(src)
+		switch(pick("blue", "green", "purple"))
+			if ("blue")
+				new /obj/item/clothing/under/rank/medical/blue(src)
+				new /obj/item/clothing/head/surgery/blue(src)
+			if ("green")
+				new /obj/item/clothing/under/rank/medical/green(src)
+				new /obj/item/clothing/head/surgery/green(src)
+			if ("purple")
+				new /obj/item/clothing/under/rank/medical/purple(src)
+				new /obj/item/clothing/head/surgery/purple(src)
 		new /obj/item/clothing/under/rank/chief_medical_officer(src)
 		new /obj/item/clothing/suit/storage/labcoat/cmo(src)
 		new /obj/item/weapon/cartridge/cmo(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -305,7 +305,7 @@
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/virology_white/New()
+/obj/structure/closet/wardrobe/medic_white/New()
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical(src)
 	new /obj/item/clothing/under/rank/medical/blue(src)

code/modules/clothing/head/jobs.dm

@@ -59,7 +59,7 @@
 	name = "surgical cap"
 	desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs."
 	icon_state = "surgcap_blue"
-	flags = FPRINT | TABLEPASS
+	flags = FPRINT | TABLEPASS | BLOCKHAIR
 
 /obj/item/clothing/head/surgery/purple
 	desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs. This one is deep purple."

code/modules/clothing/suits/jobs.dm

@@ -103,6 +103,9 @@
 	icon_state = "hazard"
 	item_state = "hazard"
 	blood_overlay_type = "armor"
+	allowed = list (/obj/item/device/analyzer, /obj/item/device/flashlight, /obj/item/device/multitool, /obj/item/device/radio, /obj/item/device/t_scanner, \
+	/obj/item/weapon/crowbar, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/wirecutters, /obj/item/weapon/wrench, \
+	/obj/item/weapon/tank/emergency_oxygen)
 
 //Lawyer
 /obj/item/clothing/suit/storage/lawyer/bluejacket
@@ -150,16 +153,37 @@
 				return
 		usr.update_inv_wear_suit()	//so our overlays update
 
+//Medical
+/obj/item/clothing/suit/storage/fr_jacket
+	name = "first responder jacket"
+	desc = "A high-visibility jacket worn by medical first responders."
+	icon_state = "fr_jacket_open"
+	item_state = "fr_jacket"
+	blood_overlay_type = "armor"
+	allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
+	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen)
+
+	verb/toggle()
+		set name = "Toggle Jacket Buttons"
+		set category = "Object"
+		set src in usr
+
+		if(!usr.canmove || usr.stat || usr.restrained())
+			return 0
+
+		switch(icon_state)
+			if("fr_jacket_open")
+				src.icon_state = "fr_jacket"
+				usr << "You button up the jacket."
+			if("fr_jacket")
+				src.icon_state = "fr_jacket_open"
+				usr << "You unbutton the jacket."
+		usr.update_inv_wear_suit()	//so our overlays update
+
 //Mime
 /obj/item/clothing/suit/suspenders
 	name = "suspenders"
 	desc = "They suspend the illusion of the mime's play."
 	icon = 'icons/obj/clothing/belts.dmi'
 	icon_state = "suspenders"
-	blood_overlay_type = "armor" //it's the less thing that I can put here
-
-/obj/item/clothing/suit/storage/fr_jacket
-	name = "first responder jacket"
-	desc = "A high-visibility jacket worn by medical first responders."
-	icon_state = "fr_jacket_open"
-	item_state = "fr_jacket"
+	blood_overlay_type = "armor" //it's the less thing that I can put here

code/modules/clothing/suits/labcoat.dm

@@ -90,6 +90,7 @@
 	name = "Virologist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
 /obj/item/clothing/suit/storage/labcoat/science
 	name = "Scientist Labcoat"

config/admins.txt

@@ -32,4 +32,4 @@ strumpetplaya - Retired Admin
 tastyfish - Retired Admin
 uristqwerty - Game Master
 wrongnumber - Game Admin
-mij - Game Admin
+mij - Game Admin