Robotics is now a full Science department.

Completely remapped Research Division, Robotics, Medbay, and the Library.
Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics.

APC access renamed to Power Equipment. Assigned to SMES room door and PA shutter controls.
Delivery Office access renamed to Cargo Office and given to miners.
CE loses robotics access.
Roboticists and geneticists get Science corridor access
HoS and HoP get construction access (Engineering/Atmos lobby) and cargo office access (cargo lobby)

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

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

@@ -594,11 +594,11 @@ proc/process_ghost_teleport_locs()
 	icon_state = "fsmaint"
 
 /area/maintenance/asmaint
-	name = "Library Maintenance"
+	name = "Medbay Maintenance"
 	icon_state = "asmaint"
 
 /area/maintenance/asmaint2
-	name = "Med-Sci Maintenance"
+	name = "Science Maintenance"
 	icon_state = "asmaint"
 
 /area/maintenance/apmaint
@@ -622,7 +622,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "pmaint"
 
 /area/maintenance/aft
-	name = "Robotics Maintenance"
+	name = "Engineering Maintenance"
 	icon_state = "amaint"
 
 /area/maintenance/storage
@@ -851,10 +851,10 @@ proc/process_ghost_teleport_locs()
 
 	engineering
 		name = "Engineering"
-		icon_state = "engine"
+		icon_state = "engine_smes"
 
 	break_room
-		name = "\improper Engineering Break Room"
+		name = "\improper Engineering Foyer"
 		icon_state = "engine"
 
 	chiefs_office
@@ -911,15 +911,19 @@ proc/process_ghost_teleport_locs()
 
 
 /area/assembly/chargebay
-	name = "\improper Recharging Bay"
+	name = "\improper Mech Bay"
 	icon_state = "mechbay"
 
 /area/assembly/showroom
 	name = "\improper Robotics Showroom"
 	icon_state = "showroom"
 
-/area/assembly/assembly_line
-	name = "\improper Robotics Assembly Line"
+/area/assembly/robotics
+	name = "\improper Robotics Lab"
+	icon_state = "ass_line"
+
+/area/assembly/assembly_line //Derelict Assembly Line
+	name = "\improper Assembly Line"
 	icon_state = "ass_line"
 
 //Teleporter
@@ -1006,7 +1010,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "cloning"
 
 /area/medical/sleeper
-	name = "\improper Medical Sleeper Room"
+	name = "Medbay Treatment Center"
 	icon_state = "exam_room"
 
 //Security
@@ -1068,6 +1072,22 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Security Checkpoint"
 	icon_state = "security"
 
+/area/security/checkpoint/supply
+	name = "Security Post - Cargo Bay"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/engineering
+	name = "Security Post - Engineering"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/medical
+	name = "Security Post - Medbay"
+	icon_state = "checkpoint1"
+
+/area/security/checkpoint/science
+	name = "Security Post - Science"
+	icon_state = "checkpoint1"
+
 /area/security/vacantoffice
 	name = "\improper Vacant Office"
 	icon_state = "security"
@@ -1119,7 +1139,7 @@ proc/process_ghost_teleport_locs()
 //Toxins
 
 /area/toxins/lab
-	name = "\improper Research Lab"
+	name = "\improper Research and Development"
 	icon_state = "toxlab"
 
 /area/toxins/xenobiology

code/game/jobs/access.dm

@@ -178,7 +178,7 @@
 /proc/get_access(job)
 	switch(job)
 		if("Geneticist")
-			return list(access_medical, access_morgue, access_genetics)
+			return list(access_medical, access_morgue, access_genetics, access_research)
 		if("Station Engineer")
 			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
 		if("Assistant")
@@ -209,12 +209,12 @@
 		if("Head of Security")
 			return list(access_security, access_sec_doors, access_brig, access_armory, access_court,
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
-			            access_research, access_engine, access_mining, access_medical,
+			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
 			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway)
 		if("Head of Personnel")
 			return list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
-			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor,
+			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
 			            access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway)
@@ -233,17 +233,17 @@
 		if("Chef")
 			return list(access_kitchen, access_morgue)
 		if("Roboticist")
-			return list(access_robotics, access_tech_storage, access_morgue) //As a job that handles so many corpses, it makes sense for them to have morgue access.
+			return list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
 		if("Cargo Technician")
 			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
 		if("Shaft Miner")
-			return list(access_mining, access_mint, access_mining_station)
+			return list(access_mining, access_mint, access_mining_station, access_mailsorting)
 		if("Quartermaster")
 			return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
 		if("Chief Engineer")
 			return list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
-			            access_heads, access_ai_upload, access_construction, access_robotics, access_sec_doors,
+			            access_heads, access_ai_upload, access_construction, access_sec_doors,
 			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat)
 		if("Research Director")
 			return list(access_rd, access_heads, access_tox, access_genetics,
@@ -373,7 +373,7 @@
 		if(access_engine)
 			return "Engineering"
 		if(access_engine_equip)
-			return "APCs"
+			return "Power Equipment"
 		if(access_maint_tunnels)
 			return "Maintenance"
 		if(access_external_airlocks)
@@ -439,7 +439,7 @@
 		if(access_mining_office)
 			return "Mining Office"
 		if(access_mailsorting)
-			return "Delivery Office"
+			return "Cargo Office"
 		if(access_mint)
 			return "Mint"
 		if(access_mint_vault)
@@ -447,7 +447,7 @@
 		if(access_heads_vault)
 			return "Main Vault"
 		if(access_mining_station)
-			return "Mining Station EVA"
+			return "Mining EVA"
 		if(access_xenobiology)
 			return "Xenobiology Lab"
 		if(access_hop)
@@ -491,8 +491,8 @@
 /proc/get_all_jobs()
 	return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Chef", "Botanist", "Quartermaster", "Cargo Technician",
 				"Shaft Miner", "Clown", "Mime", "Janitor", "Librarian", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer",
-				"Atmospheric Technician", "Roboticist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
-				"Research Director", "Scientist", "Head of Security", "Warden", "Detective", "Security Officer")
+				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
+				"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer")
 
 /proc/get_all_centcom_jobs()
 	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander")

code/game/jobs/job/engineering.dm

@@ -85,32 +85,3 @@
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
 		return 1
-
-
-
-/datum/job/roboticist
-	title = "Roboticist"
-	flag = ROBOTICIST
-	department_flag = ENGSEC
-	faction = "Station"
-	total_positions = 2
-	spawn_positions = 1
-	supervisors = "the chief engineer and research director"
-	selection_color = "#fff5cc"
-
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_rob(H), slot_ears)
-		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand)
-		if(H.backbag == 1)
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-		else
-			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		return 1

code/game/jobs/job/science.dm

@@ -44,3 +44,32 @@
 //		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask)
 //		H.equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(H), slot_l_hand)
 		return 1
+
+
+
+/datum/job/roboticist
+	title = "Roboticist"
+	flag = ROBOTICIST
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 1
+	supervisors = "research director"
+	selection_color = "#ffeeff"
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_ears)
+		if(H.backbag == 2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
+		if(H.backbag == 3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/roboticist(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/roboticist(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit)
+//		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(H), slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		return 1

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

@@ -19,7 +19,7 @@
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
 		new /obj/item/clothing/head/hardhat/white(src)
-		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/glasses/welding(src)
 		new /obj/item/clothing/gloves/yellow(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/cartridge/ce(src)

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

@@ -177,11 +177,9 @@
 		new /obj/item/clothing/gloves/black(src)
 		new /obj/item/clothing/head/det_hat(src)
 		new /obj/item/clothing/shoes/brown(src)
-		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/weapon/cartridge/detective(src)
-		new /obj/item/weapon/clipboard(src)
-		new /obj/item/device/detective_scanner(src)
 		new /obj/item/weapon/storage/box/evidence(src)
+		new /obj/item/device/radio/headset/headset_sec(src)
+		new /obj/item/device/detective_scanner(src)
 		new /obj/item/clothing/suit/armor/det_suit(src)
 		new /obj/item/ammo_magazine/c38(src)
 		new /obj/item/ammo_magazine/c38(src)

code/modules/reagents/reagent_containers/glass.dm

@@ -146,6 +146,12 @@
 		reagents.add_reagent("cryoxadone", 30)
 		update_icon()
 
+/obj/item/weapon/reagent_containers/glass/beaker/sulphuric
+	New()
+		..()
+		reagents.add_reagent("sacid", 50)
+		update_icon()
+
 /obj/item/weapon/reagent_containers/glass/beaker/slime
 	New()
 		..()

html/changelog.html

@@ -50,6 +50,17 @@ should be listed in the changelog upon commit tho. Thanks. -->
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 <div class="commit sansserif">
 	<h2 class="date">12 December 2012</h2>
+	<h3 class="author">Ikarrus updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Robotics is now a full Science department.</li>
+		<li class="tweak">Completely remapped Research Division, Robotics, Medbay, and the Library.</li>
+		<li class="tweak">Partially remapped Cargo Bay, Mining Dock, Engineering, and Atmospherics.</li>
+		<li class="tweak">Changed the access of the HoS and HoP. For a list, refer to their respective <a href="http://nanotrasen.com/wiki/index.php/Head_of_Personnel">wiki</a> <a href="http://nanotrasen.com/wiki/index.php/Head_of_Security">pages</a>.</li>
+	</ul>
+	<h3 class="author">Errorage updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Miners now have to go through cargo to reach the Mining Dock.</li>
+	</ul>
 	<h3 class="author">Petethegoat updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="tweak">The Detective's revolver no longer cares about how cool you look. It now spawns in his locker.</li>

tgstation.dme

@@ -1057,7 +1057,7 @@
 #include "code\WorkInProgress\explosion_particles.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-#include "maps\tgstation.2.0.9.dmm"
+#include "maps\tgstation.2.1.0.dmm"
 #include "maps\RandomZLevels\Academy.dm"
 #include "maps\RandomZLevels\challenge.dm"
 #include "maps\RandomZLevels\stationCollision.dm"