For Icarus: map updates to medbay & sec, ID computer updates and clarification

For Pete: made chemistry and genetics fully part of medbay, research can go die. Added cheri's hydro closets to hydroponics.

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

code/game/jobs/access.dm

@@ -301,17 +301,17 @@
 		if(1) //security
 			return list(access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos)
 		if(2) //medbay
-			return list(access_medical, access_medlab, access_morgue, access_chemistry, access_virology, access_cmo, access_surgery)
+			return list(access_medical, access_medlab, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo)
 		if(3) //research
-			return list(access_tox, access_tox_storage, access_rd, access_hydroponics, access_research, access_xenobiology)
+			return list(access_research, access_tox, access_tox_storage, access_xenobiology, access_rd)
 		if(4) //engineering and maintenance
-			return list(access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce)
+			return list(access_engine, access_engine_equip, access_maint_tunnels, access_external_airlocks, access_tech_storage, access_atmospherics, access_construction, access_robotics, access_ce)
 		if(5) //command
-			return list(access_change_ids, access_ai_upload, access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_mint_vault, access_heads_vault, access_hop, access_RC_announce, access_keycard_auth, access_tcomsat)
+			return list(access_heads, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_all_personal_lockers, access_heads_vault, access_RC_announce, access_keycard_auth, access_tcomsat, access_hop, access_captain)
 		if(6) //station general
-			return list(access_chapel_office, access_kitchen,access_bar, access_janitor, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
+			return list(access_kitchen,access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_clown, access_mime)
 		if(7) //supply
-			return list(access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mailsorting, access_mint)
+			return list(access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_mining, access_mining_station)
 
 /proc/get_region_accesses_name(var/code)
 	switch(code)
@@ -342,29 +342,29 @@
 		if(access_security)
 			return "Security"
 		if(access_brig)
-			return "Brig"
+			return "Brig Cells"
 		if(access_court)
 			return "Courtroom"
 		if(access_forensics_lockers)
-			return "Forensics"
+			return "Detective's Office"
 		if(access_medical)
 			return "Medical"
 		if(access_medlab)
-			return "Med-Sci"
+			return "Genetics Lab"
 		if(access_morgue)
 			return "Morgue"
 		if(access_tox)
-			return "Toxins Research"
+			return "Research Lab"
 		if(access_tox_storage)
 			return "Toxins Storage"
 		if(access_chemistry)
-			return "Toxins Chemical Lab"
+			return "Chemistry Lab"
 		if(access_rd)
 			return "RD Private"
 		if(access_bar)
 			return "Bar"
 		if(access_janitor)
-			return "Janitorial Equipment"
+			return "Custodial Closet"
 		if(access_engine)
 			return "Engineering"
 		if(access_engine_equip)
@@ -372,7 +372,7 @@
 		if(access_maint_tunnels)
 			return "Maintenance"
 		if(access_external_airlocks)
-			return "External Airlock"
+			return "External Airlocks"
 		if(access_emergency_storage)
 			return "Emergency Storage"
 		if(access_change_ids)
@@ -384,11 +384,11 @@
 		if(access_eva)
 			return "EVA"
 		if(access_heads)
-			return "Head's Quarters/Bridge"
+			return "Bridge"
 		if(access_captain)
-			return "Captain's Quarters"
+			return "Captain Private"
 		if(access_all_personal_lockers)
-			return "Personal Locker"
+			return "Personal Lockers"
 		if(access_chapel_office)
 			return "Chapel Office"
 		if(access_tech_storage)
@@ -400,7 +400,7 @@
 		if(access_armory)
 			return "Armory"
 		if(access_construction)
-			return "Construction Site"
+			return "Construction Areas"
 		if(access_kitchen)
 			return "Kitchen"
 		if(access_hydroponics)
@@ -428,7 +428,7 @@
 		if(access_manufacturing)
 			return "Manufacturing"
 		if(access_research)
-			return "Research"
+			return "Science"
 		if(access_mining)
 			return "Mining"
 		if(access_mining_office)
@@ -442,9 +442,9 @@
 		if(access_heads_vault)
 			return "Main Vault"
 		if(access_mining_station)
-			return "Mining Station"
+			return "Mining Station EVA"
 		if(access_xenobiology)
-			return "Xenobiology"
+			return "Xenobiology Lab"
 		if(access_hop)
 			return "HoP Private"
 		if(access_hos)
@@ -452,11 +452,11 @@
 		if(access_ce)
 			return "CE Private"
 		if(access_RC_announce)
-			return "RC announcements"
+			return "RC Announcements"
 		if(access_keycard_auth)
-			return "Keycode auth. device"
+			return "Keycode Auth. Device"
 		if(access_tcomsat)
-			return "Telecommunications Satellite"
+			return "Telecoms Satellite"
 
 /proc/get_centcom_access_desc(A)
 	switch(A)
@@ -480,10 +480,10 @@
 			return "Code Gold"
 
 /proc/get_all_jobs()
-	return list("Assistant", "Station Engineer", "Shaft Miner", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
-				"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
-				"Chaplain", "Bartender", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
-				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")
+	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", "Geneticist", "Virologist",
+				"Research Director", "Scientist", "Chemist", "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/medical.dm

@@ -59,6 +59,29 @@
 
 
 
+//Chemist is a medical job damnit	//YEAH FUCK YOU SCIENCE	-Pete
+/datum/job/chemist
+	title = "Chemist"
+	flag = CHEMIST
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the chief medical officer"
+	selection_color = "#ffeef0"
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
+		H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform)
+		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
+		H.equip_if_possible(new /obj/item/device/pda/toxins(H), H.slot_belt)
+		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/chemist(H), H.slot_wear_suit)
+		return 1
+
+
+
 /datum/job/geneticist
 	title = "Geneticist"
 	flag = GENETICIST
@@ -66,13 +89,13 @@
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "the chief medical officer and research director"
+	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
+		H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
 		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
 		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(H), H.slot_w_uniform)
@@ -95,13 +118,13 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the chief medical officer and research director"
+	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
+		H.equip_if_possible(new /obj/item/device/radio/headset/headset_med(H), H.slot_ears)
 		if(H.backbag == 2) H.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (H), H.slot_back)
 		if(H.backbag == 3) H.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(H), H.slot_back)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform)

code/game/jobs/job/science.dm

@@ -42,26 +42,4 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/science(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/mask/gas(H), H.slot_wear_mask)
 		H.equip_if_possible(new /obj/item/weapon/tank/oxygen(H), H.slot_l_hand)
-		return 1
-
-
-//Chemist is a medical job damnit
-/datum/job/chemist
-	title = "Chemist"
-	flag = CHEMIST
-	department_flag = MEDSCI
-	faction = "Station"
-	total_positions = 2
-	spawn_positions = 2
-	supervisors = "the chief medical officer and the research director"
-	selection_color = "#ffeeff"
-
-
-	equip(var/mob/living/carbon/human/H)
-		if(!H)	return 0
-		H.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci(H), H.slot_ears)
-		H.equip_if_possible(new /obj/item/clothing/under/rank/chemist(H), H.slot_w_uniform)
-		H.equip_if_possible(new /obj/item/clothing/shoes/white(H), H.slot_shoes)
-		H.equip_if_possible(new /obj/item/device/pda/toxins(H), H.slot_belt)
-		H.equip_if_possible(new /obj/item/clothing/suit/labcoat/chemist(H), H.slot_wear_suit)
-		return 1
+		return 1

code/game/objects/crates.dm

@@ -187,8 +187,6 @@
 		..()
 		new /obj/item/weapon/plantbgone(src)
 		new /obj/item/weapon/plantbgone(src)
-		new /obj/item/weapon/plantbgone(src)
-		new /obj/item/weapon/hatchet(src)
 		new /obj/item/weapon/minihoe(src)
 //		new /obj/item/weapon/weedspray(src)
 //		new /obj/item/weapon/weedspray(src)

html/changelog.html

@@ -47,7 +47,21 @@ 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">May 04 2012</h2>
+	<h2 class="date">Saturday, May 5th</h2>
+	<h3 class="author">Petethegoat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">RD get the fuck out of chemistry and genetics</li>
+		<li class="tweak">CHEMISTS, DON'T BE DICKS TO RESEARCH, GIVE THEM ACID YOU TIGHT FUCKS</li>
+	</ul>
+	<h3 class="author">Icarus updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Updates to Sec, including a stationary scrubber for the prison area.</li>
+		<li class="tweak">Swapped around cryogenics and the patient rooms in medbay.</li>
+	</ul>
+</div>
+
+<div class="commit sansserif">
+	<h2 class="date">Friday, May 4th</h2>
 	<h3 class="author">Cheridan updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="imageadd">-Added fat jumpsuit sprites for orange, pink, yellow, owl, security, and warden jumpsuits.</li>