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

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

@@ -352,6 +352,10 @@ proc/process_ghost_teleport_locs()
 	name = "Prison Medbay"
 	icon_state = "medbay"
 
+/area/medical/mechbay
+	name = "Mech Bay"
+	icon_state = "mechbay"
+
 /area/prison/solar
 	name = "Prison Solar Array"
 	icon_state = "storage"
@@ -569,9 +573,13 @@ proc/process_ghost_teleport_locs()
 	icon_state = "kitchen"
 
 /area/crew_quarters/bar
-	name= "Bar"
+	name = "Bar"
 	icon_state = "bar"
 
+/area/crew_quarters/theatre
+	name = "Theatre"
+	icon_state = "Theatre"
+
 /area/library
  	name = "Library"
  	icon_state = "library"
@@ -627,6 +635,18 @@ proc/process_ghost_teleport_locs()
 	name = "Engine Launcher Room"
 	icon_state = "engine_monitoring"
 
+/area/assembly/chargebay
+	name = "Recharging Bay"
+	icon_state = "mechbay"
+
+/area/assembly/showroom
+	name = "Robotics Showroom"
+	icon_state = "showroom"
+
+/area/assembly/assembly_line
+	name = "Assembly Line"
+	icon_state = "ass_line"
+
 //Teleporter
 
 /area/teleporter
@@ -674,6 +694,14 @@ proc/process_ghost_teleport_locs()
 	name = "Surgery"
 	icon_state = "surgery"
 
+/area/medical/exam_room
+	name = "Exam Room"
+	icon_state = "exam_room"
+
+/area/medical/genetics
+	name = "Genetics"
+	icon_state = "genetics"
+
 //Security
 
 /area/security/main
@@ -801,6 +829,10 @@ proc/process_ghost_teleport_locs()
 	name = "Toxin Mixing Room"
 	icon_state = "toxmix"
 
+/area/toxins/server
+	name = "Server Room"
+	icon_state = "server"
+
 //Storage
 
 /area/storage/tools

code/defines/obj.dm

@@ -760,6 +760,15 @@
 	var/occupied = 1
 	var/destroyed = 0
 
+/obj/showcase
+	name = "Showcase"
+	icon = 'stationobjs.dmi'
+	icon_state = "showcase_1"
+	desc = "A stand with the empty body of a cyborg bolted to it."
+	density = 1
+	anchored = 1
+	unacidable = 1//temporary until I decide whether the borg can be removed. -veyveyr
+
 obj/item/brain
 	name = "brain"
 	icon = 'surgery.dmi'
@@ -945,4 +954,4 @@ obj/item/brain
 	throw_speed = 5
 	throw_range = 20
 	flags = FPRINT | TABLEPASS | CONDUCT
-	max_amount = 60
+	max_amount = 60

code/game/jobs/access.dm

@@ -44,6 +44,8 @@
 	access_clown = 43
 	access_mime = 44
 	access_surgery = 45
+	access_theatre = 46
+	access_research = 47
 
 /obj/var/list/req_access = null
 /obj/var/req_access_txt = "0"
@@ -128,17 +130,18 @@
 		if("Warden")
 			return list(access_security, access_brig, access_armory, access_court)
 		if("Scientist")
-			return list(access_tox, access_tox_storage)
+			return list(access_tox, access_tox_storage, access_research)
 		if("Head of Security")
 			return list(access_medical, access_morgue, access_tox, access_tox_storage, access_chemistry, access_medlab, access_court,
 			            access_teleporter, access_heads, access_tech_storage, access_security, access_brig, access_atmospherics,
-			            access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics)
+			            access_maint_tunnels, access_bar, access_janitor, access_kitchen, access_robotics, access_armory, access_hydroponics, access_theatre, access_research)
 		if("Head of Personnel")
 			return list(access_security, access_brig, access_court, access_forensics_lockers,
 			            access_tox, access_tox_storage, access_chemistry, access_medical, access_medlab, access_engine, access_rd,
 			            access_emergency_storage, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_tech_storage, access_maint_tunnels, access_bar, access_janitor,
-			            access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_hydroponics, access_lawyer, access_virology, access_surgery)
+			            access_crematorium, access_kitchen, access_robotics, access_cargo, access_cargo_bot, access_hydroponics, access_lawyer, access_virology, access_surgery,
+			            access_theatre, access_research)
 		if("Atmospheric Technician")
 			return list(access_atmospherics, access_maint_tunnels, access_emergency_storage)
 		if("Barman")
@@ -148,9 +151,9 @@
 		if("Janitor")
 			return list(access_janitor, access_maint_tunnels)
 		if("Clown")
-			return list(access_maint_tunnels, access_clown)
+			return list(access_maint_tunnels, access_clown, access_theatre)
 		if("Mime")
-			return list(access_maint_tunnels, access_mime)
+			return list(access_maint_tunnels, access_mime, access_theatre)
 		if("Chef")
 			return list(access_kitchen, access_morgue)
 		if("Roboticist")
@@ -167,11 +170,11 @@
 		if("Research Director") // added hydroponics access -- Skie
 			return list(access_medical, access_morgue, access_medlab, access_robotics, access_rd,
 			            access_tech_storage, access_maint_tunnels, access_heads, access_tox,
-			            access_tox_storage, access_chemistry, access_teleporter, access_hydroponics, access_virology)
+			            access_tox_storage, access_chemistry, access_teleporter, access_hydroponics, access_virology, access_research)
 		if("Virologist")
-			return list(access_medical, access_morgue, access_virology)
+			return list(access_medical, access_morgue, access_virology, access_research)
 		if("Chief Medical Officer")
-			return list(access_medical, access_morgue, access_medlab, access_robotics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery)
+			return list(access_medical, access_morgue, access_medlab, access_robotics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_research)
 		else
 			return list()
 
@@ -183,7 +186,8 @@
 	            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_cmo, access_qm, access_clown, access_mime, access_surgery)
+	            access_hydroponics, access_library, access_manufacturing, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery,
+	            access_theatre, access_research)
 
 /proc/get_access_desc(A)
 	switch(A)
@@ -275,10 +279,13 @@
 			return "Silent Access"
 		if(access_surgery)
 			return "Operating Room"
+		if(access_theatre)
+			return "Theatre"
+		if(access_research)
+			return "Research"
 
 /proc/get_all_jobs()
 	return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
 				"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", "Cargo Technician", "Chief Medical Officer")
-
+				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")