Moved Mail To just north of Cargo Bay.

Moved the Vacant office over by arrivals.
Merged Mail Sorter and Cargo Tech.
Cargo Techs now spawn with Mail Room access.
QM now spawns with Mail Room access.
Commented out the lockreset, lockenable, woodhit and pianocrash audio files from the respective lockers and piano smashing. It was causing compiling errors.

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

code/defines/obj/closet.dm

@@ -67,7 +67,7 @@
 		if (isrobot(usr) || src.locked)
 			if(istype(O, /obj/item/device/multitool))
 				user << "\red Resetting circuitry..."
-				playsound(user, 'lockreset.wav', 50, 1)
+				//playsound(user, 'lockreset.wav', 50, 1) -- Causes Compiling Errors -Superxpdude
 				sleep(50) // Sleeping time~
 				src.locked = 0
 				user << "\blue You disable the locking modules."
@@ -125,7 +125,7 @@
 					sleep(50)
 					src.locked = 1
 					user << "\blue You re-enable the locking modules."
-					playsound(user, 'lockenable.wav', 50, 1)
+					//playsound(user, 'lockenable.wav', 50, 1) -- Causes Compiling Errors -Superxpdude
 					return
 			else
 				localopened = !localopened

code/game/jobs/access.dm

@@ -170,13 +170,11 @@
 		if("Roboticist")
 			return list(access_robotics, access_tech_storage, access_maint_tunnels)
 		if("Cargo Technician")
-			return list(access_maint_tunnels, access_cargo, access_cargo_bot)
-		if("Mail Sorter")
-			return list(access_maint_tunnels, access_mailsorting)
+			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
 		if("Shaft Miner")
 			return list(access_maint_tunnels, access_mining, access_mint, access_mining_station)
 		if("Quartermaster")
-			return list(access_maint_tunnels, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining_office, access_mining)
+			return list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining_office, access_mining)
 		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,
@@ -365,5 +363,5 @@
 /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", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster", "Mail Sorter",
+				"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
 				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")

code/game/jobs/jobprocs.dm

@@ -547,13 +547,6 @@
 			src.equip_if_possible(new /obj/item/clothing/under/rank/cargo(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/device/pda/quartermaster(src), slot_belt)
 
-		if ("Mail Sorter")
-			src.equip_if_possible(new /obj/item/device/radio/headset/headset_cargo(src), slot_ears)
-			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/rank/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/heads/ce (src), slot_ears)
 			src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt)

code/game/jobs/jobs.dm

@@ -22,8 +22,7 @@ var/list/occupations = list(
 	"Clown", "Mime",
 	"Chemist", "Chemist",
 	"Quartermaster",
-	"Cargo Technician","Cargo Technician",
-	"Mail Sorter", "Mail Sorter",
+	"Cargo Technician","Cargo Technician","Cargo Technician",
 	"Botanist", "Botanist",
 	"Librarian",
 	"Lawyer",

code/game/magic/musician.dm

@@ -116,7 +116,7 @@ datum/song
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(istype(W, /obj/item/weapon/fireaxe) && W.wielded == 1)
-			playsound(src.loc, 'woodhit.ogg', 50, 0)
+			//playsound(src.loc, 'woodhit.ogg', 50, 0) -- Causes Compiling Errors -Superxpdude
 			for(var/mob/O in viewers(user, null))
 				O.show_message(text("\red <B> [] forcefully slams the [] with the Fire axe!</B>", user, src), 1)
 			if(!src.broken) //we don't want an already damaged piano to be more damageable
@@ -124,7 +124,7 @@ datum/song
 				if(prob(src.hitstaken*8))
 					src.broken = 1
 					src.icon_state = "pianobroken"
-					playsound(src.loc, 'pianocrash.ogg', 50, 0)
+					//playsound(src.loc, 'pianocrash.ogg', 50, 0) -- Causes Commpiling Errors -Superxpdude
 					return
 				return
 		return