QM split to one QM in charge with two Cargo Technicians.

Chief Medical Officer added in charge of Medbay.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@415 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/area/Space Station 13 areas.dm

@@ -544,12 +544,12 @@
 
 
 /area/quartermaster/office
-	name = "Quartermaster's Office"
+	name = "Cargo Office"
 	icon_state = "quartoffice"
 
 
 /area/quartermaster/storage
-	name = "Quartermaster's Storage"
+	name = "Cargo Bay"
 	icon_state = "quartstorage"
 
 
@@ -557,6 +557,10 @@
 	name = "Quartermasters"
 	icon_state = "quart"
 
+/area/quartermaster/qm
+	name = "Quartermaster's Office"
+	icon_state = "quart"
+
 /area/janitor/
 	name = "Janitors Closet"
 	icon_state = "janitor"
@@ -813,4 +817,8 @@
 
 /area/lawoffice
 	name = "Law Office"
-	icon_state = "law"
+	icon_state = "law"
+
+/area/cmo
+	name = "Chief Medical Officer's office"
+	icon_state = "CMO"

code/game/jobs/access.dm

@@ -37,6 +37,8 @@
 	access_library = 37
 	access_lawyer = 38
 	access_virology = 39
+	access_cmo = 40
+	access_qm = 41
 
 
 /obj/var/list/req_access = null
@@ -143,8 +145,10 @@
 		if("Roboticist")
 			return list(access_robotics, access_tech_storage, access_medical, access_morgue,
 			            access_maint_tunnels)
-		if("Quartermaster")
+		if("Cargo Technician")
 			return list(access_maint_tunnels, access_cargo, access_cargo_bot)
+		if("Quartermaster")
+			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_qm)
 		if("Chief Engineer")
 			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
@@ -155,6 +159,8 @@
 			            access_tox_storage, access_chemistry, access_teleporter, access_hydroponics, access_virology)
 		if("Virologist")
 			return list(access_medical, access_morgue, access_virology)
+		if("Chief Medical Officer")
+			return list(access_medical, access_morgue, access_medlab, access_robotics, access_heads, access_chemistry, access_virology, access_cmo)
 		else
 			return list()
 
@@ -166,7 +172,7 @@
 	            access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers,
 	            access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen,
 	            access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_cargo_bot, access_construction,
-	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology)
+	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm)
 
 /proc/get_access_desc(A)
 	switch(A)
@@ -244,10 +250,14 @@
 			return "Robotics"
 		if(access_virology)
 			return "Virology"
+		if(access_cmo)
+			return "Chief Medical Officer's office"
+		if(access_qm)
+			return "Quartermaster's Office"
 
 /proc/get_all_jobs()
 	return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer",
 				"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
 				"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
-				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist")
+				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")
 

code/game/jobs/jobprocs.dm

@@ -486,8 +486,16 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/under/cargo(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/device/pda/quartermaster(src), slot_belt)
+			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
+			src.equip_if_possible(new /obj/item/weapon/clipboard(src), slot_l_hand)
 			//src.equip_if_possible(new /obj/item/clothing/suit/exo_suit(src), slot_wear_suit)
 
+		if ("Cargo Technician")
+			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
+			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
+			src.equip_if_possible(new /obj/item/clothing/under/cargo(src), slot_w_uniform)
+			src.equip_if_possible(new /obj/item/device/pda/quartermaster(src), slot_belt)
+
 		if ("Chief Engineer")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt)
@@ -506,6 +514,14 @@
 			src.equip_if_possible(new /obj/item/weapon/pen(src), slot_l_hand)
 			src.equip_if_possible(new /obj/item/weapon/clipboard(src), slot_r_hand)
 
+		if ("Chief Medical Officer")
+			src.equip_if_possible(new /obj/item/device/radio/headset/headset_com (src), slot_ears) // -- TLE
+			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
+			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
+			src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
+			src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
+			src.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(src), slot_l_hand)
+
 		if ("Virologist")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)

code/game/jobs/jobs.dm

@@ -19,11 +19,13 @@ var/list/occupations = list(
 	"Janitor",
 	"Clown", "Mime",
 	"Chemist",
-	"Quartermaster","Quartermaster","Quartermaster",
+	"Quartermaster",
+	"Cargo Technician","Cargo Technician",
 	"Botanist", "Botanist",
 	"Librarian",
 	"Lawyer",
-	"Virologist")
+	"Virologist",
+	"Chief Medical Officer")
 
 var/list/assistant_occupations = list(
 	"Assistant")