Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/area/areas.dm

@@ -269,17 +269,17 @@
 	if(prob(35))
 
 		if(istype(src, /area/chapel))
-			sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg')
+			sound = pick('sound/ambience/ambicha1.ogg','sound/ambience/ambicha2.ogg','sound/ambience/ambicha3.ogg','sound/ambience/ambicha4.ogg','sound/music/traitor.ogg')
 		else if(istype(src, /area/medical/morgue))
-			sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/ambience/title2.ogg')
+			sound = pick('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg')
 		else if(type == /area)
-			sound = pick('sound/ambience/ambispace.ogg','sound/ambience/title2.ogg',)
+			sound = pick('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg')
 		else if(istype(src, /area/engine))
 			sound = pick('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg','sound/ambience/ambisin4.ogg')
 		else if(istype(src, /area/AIsattele) || istype(src, /area/turret_protected/ai) || istype(src, /area/turret_protected/ai_upload) || istype(src, /area/turret_protected/ai_upload_foyer))
 			sound = pick('sound/ambience/ambimalf.ogg')
 		else if(istype(src, /area/mine/explored) || istype(src, /area/mine/unexplored))
-			sound = pick('sound/ambience/ambimine.ogg')
+			sound = pick('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
 			musVolume = 25
 		else if(istype(src, /area/tcommsat) || istype(src, /area/turret_protected/tcomwest) || istype(src, /area/turret_protected/tcomeast) || istype(src, /area/turret_protected/tcomfoyer) || istype(src, /area/turret_protected/tcomsat))
 			sound = pick('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg')

code/game/gamemodes/gameticker.dm

@@ -37,9 +37,9 @@ var/global/datum/controller/gameticker/ticker
 	var/triai = 0//Global holder for Triumvirate
 
 /datum/controller/gameticker/proc/pregame()
-	login_music = pick('sound/ambience/title2.ogg','sound/ambience/title1.ogg','sound/ambience/b12_combined_start.ogg') // choose title music!
-	for(var/mob/new_player/M in mob_list)
-		if(M.client)	M.client.playtitlemusic()
+	login_music = pick(\
+	'sound/music/title1.ogg',\
+	'sound/music/b12_combined_start.ogg')
 	do
 		pregame_timeleft = 180
 		world << "<B><FONT color='blue'>Welcome to the pre-game lobby!</FONT></B>"
@@ -105,6 +105,13 @@ var/global/datum/controller/gameticker/ticker
 	else
 		src.mode.announce()
 
+	//setup the money accounts
+	if(!centcomm_account_db)
+		for(var/obj/machinery/account_database/check_db in world)
+			if(check_db.z == 2)
+				centcomm_account_db = check_db
+				break
+
 	create_characters() //Create player characters and transfer them
 	collect_minds()
 	equip_characters()

code/game/gamemodes/intercept_report.dm

@@ -124,6 +124,8 @@
 	var/name_2 = pick(src.org_names_2)
 
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
+
 	var/fingerprints = num2text(md5(H.dna.uni_identity))
 	var/traitor_name = H.real_name
 	var/prob_right_dude = rand(1, 100)
@@ -147,6 +149,7 @@
 
 	var/prob_right_dude = rand(1, 100)
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
 	var/traitor_job = H.mind.assigned_role
 
 	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] have stumbled upon some dark secrets. They apparently want to spread the dangerous knowledge onto as many stations as they can."
@@ -165,6 +168,7 @@
 
 	var/prob_right_dude = rand(1, 100)
 	var/mob/living/carbon/human/H = get_suspect()
+	if(!H) return
 	var/traitor_job = H.mind.assigned_role
 
 	src.text += "<BR><BR>It has been brought to our attention that the [name_1] [name_2] are attempting to stir unrest on one of our stations in your sector."

code/game/gamemodes/nuclear/nuclear.dm

@@ -6,7 +6,7 @@
 	name = "nuclear emergency"
 	config_tag = "nuclear"
 	required_players = 6
-	required_players_secret = 15 // 15 players - 5 players to be the nuke ops = 10 players remaining
+	required_players_secret = 25 // 25 players - 5 players to be the nuke ops = 20 players remaining
 	required_enemies = 5
 	recommended_enemies = 5
 

code/game/gamemodes/traitor/traitor.dm

@@ -294,6 +294,6 @@
 
 	// Tell them about people they might want to contact.
 	var/mob/living/carbon/human/M = get_nt_opposed()
-	if(M != traitor_mob)
+	if(M && M != traitor_mob)
 		traitor_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them."
 		traitor_mob.mind.store_memory("<b>Potential Collaborator</b>: [M.real_name]")

code/game/jobs/access.dm

@@ -63,6 +63,7 @@
 /var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
 /var/const/access_gateway = 62
 /var/const/access_sec_doors = 63 // Security front doors
+/var/const/access_psychiatrist = 64 // Psychiatrist's office
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.
@@ -205,7 +206,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_construction,
-	            access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery,
+	            access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery,
 	            access_theatre, access_research, access_mining, access_mailsorting,
 	            access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce,
 	            access_keycard_auth, access_tcomsat, access_gateway)
@@ -223,7 +224,7 @@
 		if(1) //security
 			return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos)
 		if(2) //medbay
-			return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo)
+			return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo)
 		if(3) //research
 			return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd)
 		if(4) //engineering and maintenance
@@ -335,6 +336,8 @@
 			return "Robotics"
 		if(access_virology)
 			return "Virology"
+		if(access_psychiatrist)
+			return "Psychiatrist's Office"
 		if(access_cmo)
 			return "Chief Medical Officer"
 		if(access_qm)

code/game/jobs/job/medical.dm

@@ -11,10 +11,10 @@
 	req_admin_notify = 1
 	access = list(access_medical, access_morgue, access_genetics, access_heads,
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
-			access_keycard_auth, access_sec_doors)
+			access_keycard_auth, access_sec_doors, access_psychiatrist)
 	minimal_access = list(access_medical, access_morgue, access_genetics, access_heads,
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
-			access_keycard_auth, access_sec_doors)
+			access_keycard_auth, access_sec_doors, access_psychiatrist)
 	minimal_player_age = 7
 
 	equip(var/mob/living/carbon/human/H)
@@ -48,8 +48,8 @@
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
-	minimal_access = list(access_medical, access_morgue, access_surgery)
-	alt_titles = list("Surgeon","Emergency Physician","Nurse","Orderly")
+	minimal_access = list(access_medical, access_morgue, access_surgery, access_virology)
+	alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -74,11 +74,12 @@
 				if("Medical Doctor")
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
-				if("Orderly")
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
 				if("Nurse")
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
-					H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+					if(H.gender == FEMALE)
+						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/nursesuit(H), slot_w_uniform)
+						H.equip_to_slot_or_del(new /obj/item/clothing/head/nursehat(H), slot_head)
+					else
+						H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(H), slot_w_uniform)
 		else
 			H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
 			H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
@@ -151,7 +152,7 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
-/datum/job/virologist
+/*/datum/job/virologist
 	title = "Virologist"
 	flag = VIROLOGIST
 	department_flag = MEDSCI
@@ -182,4 +183,36 @@
 			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
+		return 1*/
+
+/datum/job/psychiatrist
+	title = "Psychiatrist"
+	flag = PSYCHIATRIST
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	supervisors = "the chief medical officer"
+	selection_color = "#ffeef0"
+	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_psychiatrist)
+	minimal_access = list(access_medical, access_psychiatrist)
+	alt_titles = list("Psychologist")
+
+
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears)
+		switch(H.backbag)
+			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(H), slot_back)
+			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
+		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

@@ -74,7 +74,7 @@
 	selection_color = "#ffeeff"
 	access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
 	minimal_access = 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.
-	alt_titles = list("Biomedical Engineer","Mechatronic Engineer")
+	alt_titles = list("Biomechanical Engineer","Mechatronic Engineer")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0

code/game/jobs/job_controller.dm

@@ -324,6 +324,25 @@ var/global/datum/controller/occupations/job_master
 			if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf))
 				H.loc = S.loc
 
+		//give them an account in the station database
+		if(centcomm_account_db)
+			var/datum/money_account/M = centcomm_account_db.add_account(H.real_name, starting_funds = rand(50,500)*10, pre_existing = 1)
+			if(H.mind)
+				var/remembered_info = ""
+				remembered_info += "<b>Your account number is:</b> #[M.account_number]<br>"
+				remembered_info += "<b>Your account pin is:</b> [M.remote_access_pin]<br>"
+				remembered_info += "<b>Your account funds are:</b> $[M.money]<br>"
+
+				if(M.transaction_log.len)
+					var/datum/transaction/T = M.transaction_log[1]
+					remembered_info += "<b>Your account was created:</b> [T.time], [T.date] at [T.source_terminal]<br>"
+				H.mind.store_memory(remembered_info)
+
+				H.mind.initial_account = M
+
+			spawn(0)
+				H << "\blue<b>Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]</b>"
+
 		var/alt_title = null
 		if(H.mind)
 			H.mind.assigned_role = rank
@@ -385,13 +404,20 @@ var/global/datum/controller/occupations/job_master
 			C.rank = rank
 			C.assignment = title ? title : rank
 			C.name = "[C.registered_name]'s ID Card ([C.assignment])"
+
+			//put the player's account number onto the ID
+			if(H.mind && H.mind.initial_account)
+				C.associated_account_number = H.mind.initial_account.account_number
+
 			H.equip_to_slot_or_del(C, slot_wear_id)
+
 		H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt)
 		if(locate(/obj/item/device/pda,H))
 			var/obj/item/device/pda/pda = locate(/obj/item/device/pda,H)
 			pda.owner = H.real_name
 			pda.ownjob = C.assignment
 			pda.name = "PDA-[H.real_name] ([pda.ownjob])"
+
 		return 1
 
 

code/game/jobs/jobs.dm

@@ -23,6 +23,7 @@ var/const/CMO				=(1<<3)
 var/const/DOCTOR			=(1<<4)
 var/const/GENETICIST		=(1<<5)
 var/const/VIROLOGIST		=(1<<6)
+var/const/PSYCHIATRIST		=(1<<7)
 
 
 var/const/CIVILIAN			=(1<<2)
@@ -75,7 +76,7 @@ var/list/medical_positions = list(
 	"Chief Medical Officer",
 	"Medical Doctor",
 	"Geneticist",
-	"Virologist",
+	"Psychiatrist",
 	"Chemist"
 )
 

code/game/machinery/bots/secbot.dm

@@ -12,7 +12,7 @@
 	brute_dam_coeff = 0.5
 //	weight = 1.0E7
 	req_one_access = list(access_security, access_forensics_lockers)
-	var/mob/living/carbon/target
+	var/mob/target
 	var/oldtarget_name
 	var/threatlevel = 0
 	var/target_lastloc //Loc of target when arrested.
@@ -22,6 +22,7 @@
 	var/idcheck = 0 //If false, all station IDs are authorized for weapons.
 	var/check_records = 1 //Does it check security records?
 	var/arrest_type = 0 //If true, don't handcuff
+	var/next_harm_time = 0
 
 	var/mode = 0
 #define SECBOT_IDLE 		0		// idle
@@ -219,30 +220,47 @@ Auto Patrol: []"},
 
 			if(target)		// make sure target exists
 				if(get_dist(src, src.target) <= 1)		// if right next to perp
-					playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
-					src.icon_state = "secbot-c"
-					spawn(2)
-						src.icon_state = "secbot[src.on]"
-					var/mob/living/carbon/M = src.target
-					var/maxstuns = 4
-					if(istype(M, /mob/living/carbon/human))
-						if(M.stuttering < 10 && (!(HULK in M.mutations)))
+					if(istype(src.target,/mob/living/carbon))
+						playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+						src.icon_state = "secbot-c"
+						spawn(2)
+							src.icon_state = "secbot[src.on]"
+						var/mob/living/carbon/M = src.target
+						var/maxstuns = 4
+						if(istype(M, /mob/living/carbon/human))
+							if(M.stuttering < 10 && (!(HULK in M.mutations)))
+								M.stuttering = 10
+							M.Stun(10)
+							M.Weaken(10)
+						else
+							M.Weaken(10)
 							M.stuttering = 10
-						M.Stun(10)
-						M.Weaken(10)
-					else
-						M.Weaken(10)
-						M.stuttering = 10
-						M.Stun(10)
-					maxstuns--
-					if(maxstuns <= 0)
-						target = null
-					visible_message("\red <B>[src.target] has been stunned by [src]!</B>")
+							M.Stun(10)
+						maxstuns--
+						if(maxstuns <= 0)
+							target = null
+						visible_message("\red <B>[src.target] has been stunned by [src]!</B>")
 
-					mode = SECBOT_PREP_ARREST
-					src.anchored = 1
-					src.target_lastloc = M.loc
-					return
+						mode = SECBOT_PREP_ARREST
+						src.anchored = 1
+						src.target_lastloc = M.loc
+						return
+					else if(istype(src.target,/mob/living/simple_animal))
+						//just harmbaton them until dead
+						if(world.time > next_harm_time)
+							next_harm_time = world.time + 15
+							playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+							visible_message("\red <B>[src] beats [src.target] with the stun baton!</B>")
+							src.icon_state = "secbot-c"
+							spawn(2)
+								src.icon_state = "secbot[src.on]"
+
+							var/mob/living/simple_animal/S = src.target
+							S.AdjustStunned(10)
+							S.adjustBruteLoss(15)
+							if(S.stat)
+								src.frustration = 8
+								playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
 
 				else								// not next to perp
 					var/turf/olddist = get_dist(src, src.target)
@@ -251,6 +269,8 @@ Auto Patrol: []"},
 						src.frustration++
 					else
 						src.frustration = 0
+			else
+				src.frustration = 8
 
 		if(SECBOT_PREP_ARREST)		// preparing to arrest target
 
@@ -261,19 +281,22 @@ Auto Patrol: []"},
 				return
 
 			if(istype(src.target,/mob/living/carbon))
-				if(!src.target.handcuffed && !src.arrest_type)
+				var/mob/living/carbon/C = target
+				if(!C.handcuffed && !src.arrest_type)
 					playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
 					mode = SECBOT_ARREST
 					visible_message("\red <B>[src] is trying to put handcuffs on [src.target]!</B>")
 
 					spawn(60)
 						if(get_dist(src, src.target) <= 1)
-							if(src.target.handcuffed)
-								return
+							/*if(src.target.handcuffed)
+								return*/
 
 							if(istype(src.target,/mob/living/carbon))
-								target.handcuffed = new /obj/item/weapon/handcuffs(target)
-								target.update_inv_handcuffed()	//update the handcuffs overlay
+								C = target
+								if(!C.handcuffed)
+									C.handcuffed = new /obj/item/weapon/handcuffs(target)
+									C.update_inv_handcuffed()	//update the handcuffs overlay
 
 							mode = SECBOT_IDLE
 							src.target = null
@@ -284,6 +307,7 @@ Auto Patrol: []"},
 							playsound(src.loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
 		//					var/arrest_message = pick("Have a secure day!","I AM THE LAW.", "God made tomorrow for the crooks we don't catch today.","You can't outrun a radio.")
 		//					src.speak(arrest_message)
+
 			else
 				mode = SECBOT_IDLE
 				src.target = null
@@ -293,10 +317,16 @@ Auto Patrol: []"},
 
 		if(SECBOT_ARREST)		// arresting
 
-			if(!target || target.handcuffed)
+			if(!target || !istype(target, /mob/living/carbon))
 				src.anchored = 0
 				mode = SECBOT_IDLE
 				return
+			else
+				var/mob/living/carbon/C = target
+				if(!C.handcuffed)
+					src.anchored = 0
+					mode = SECBOT_IDLE
+					return
 
 
 		if(SECBOT_START_PATROL)	// start a patrol
@@ -560,27 +590,35 @@ Auto Patrol: []"},
 
 /obj/machinery/bot/secbot/proc/look_for_perp()
 	src.anchored = 0
-	for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal
-		if((C.stat) || (C.handcuffed))
-			continue
+	for (var/mob/living/M in view(7,src)) //Let's find us a criminal
+		if(istype(M, /mob/living/carbon))
+			var/mob/living/carbon/C = M
+			if((C.stat) || (C.handcuffed))
+				continue
 
-		if((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
-			continue
+			if((C.name == src.oldtarget_name) && (world.time < src.last_found + 100))
+				continue
 
-		if(istype(C, /mob/living/carbon/human))
-			src.threatlevel = src.assess_perp(C)
-		else if((src.idcheck) && (istype(C, /mob/living/carbon/monkey)))
-			src.threatlevel = 4
+			if(istype(C, /mob/living/carbon/human))
+				src.threatlevel = src.assess_perp(C)
+			else if((src.idcheck) && (istype(C, /mob/living/carbon/monkey)))
+				src.threatlevel = 4
+
+		else if(istype(M, /mob/living/simple_animal/hostile))
+			if(M.stat == DEAD)
+				continue
+			else
+				src.threatlevel = 4
 
 		if(!src.threatlevel)
 			continue
 
 		else if(src.threatlevel >= 4)
-			src.target = C
-			src.oldtarget_name = C.name
+			src.target = M
+			src.oldtarget_name = M.name
 			src.speak("Level [src.threatlevel] infraction alert!")
 			playsound(src.loc, pick('sound/voice/bcriminal.ogg', 'sound/voice/bjustice.ogg', 'sound/voice/bfreeze.ogg'), 50, 0)
-			src.visible_message("<b>[src]</b> points at [C.name]!")
+			src.visible_message("<b>[src]</b> points at [M.name]!")
 			mode = SECBOT_HUNT
 			spawn(0)
 				process()	// ensure bot quickly responds to a perp

code/game/machinery/computer/card.dm

@@ -51,14 +51,24 @@
 	if (!( ticker ))
 		return
 	if (mode) // accessing crew manifest
-		var/crew = ""
+
+		dat += "<h4>Crew Manifest</h4>"
+		dat += "Entries cannot be modified from this terminal.<br><br>"
+		if(data_core)
+			dat += data_core.get_manifest(0) // make it monochrome
+		dat += "<br>"
+		dat += "<a href='?src=\ref[src];choice=print'>Print</a><br>"
+		dat += "<br>"
+		dat += "<a href='?src=\ref[src];choice=mode;mode_target=0'>Access ID modification console.</a><br>"
+
+		/*var/crew = ""
 		var/list/L = list()
 		for (var/datum/data/record/t in data_core.general)
 			var/R = t.fields["name"] + " - " + t.fields["rank"]
 			L += R
 		for(var/R in sortList(L))
-			crew += "[R]<br>"
-		dat = "<tt><b>Crew Manifest:</b><br>Please use security record computer to modify entries.<br><br>[crew]<a href='?src=\ref[src];choice=print'>Print</a><br><br><a href='?src=\ref[src];choice=mode;mode_target=0'>Access ID modification console.</a><br></tt>"
+			crew += "[R]<br>"*/
+		//dat = "<tt><b>Crew Manifest:</b><br>Please use security record computer to modify entries.<br><br>[crew]<a href='?src=\ref[src];choice=print'>Print</a><br><br><a href='?src=\ref[src];choice=mode;mode_target=0'>Access ID modification console.</a><br></tt>"
 	else
 		var/header = "<div align='center'><b>Identification Card Modifier</b></div>"
 
@@ -114,6 +124,14 @@
 									var nameField = document.getElementById('namefield');
 									nameField.style.backgroundColor = "#DDFFDD";
 								}
+								function markAccountGreen(){
+									var nameField = document.getElementById('accountfield');
+									nameField.style.backgroundColor = "#DDFFDD";
+								}
+								function markAccountRed(){
+									var nameField = document.getElementById('accountfield');
+									nameField.style.backgroundColor = "#FFDDDD";
+								}
 								function showAll(){
 									var allJobsSlot = document.getElementById('alljobsslot');
 									allJobsSlot.innerHTML = "<a href='#' onclick='hideAll()'>hide</a><br>"+ "[jobs_all]";
@@ -129,10 +147,16 @@
 			carddesc += "<b>registered_name:</b> <input type='text' id='namefield' name='reg' value='[target_owner]' style='width:250px; background-color:white;' onchange='markRed()'>"
 			carddesc += "<input type='submit' value='Rename' onclick='markGreen()'>"
 			carddesc += "</form>"
+
+			carddesc += "<form name='accountnum' action='?src=\ref[src]' method='get'>"
+			carddesc += "<input type='hidden' name='src' value='\ref[src]'>"
+			carddesc += "<input type='hidden' name='choice' value='account'>"
+			carddesc += "<b>Stored account number:</b> <input type='text' id='accountfield' name='account' value='[modify.associated_account_number]' style='width:250px; background-color:white;' onchange='markAccountRed()'>"
+			carddesc += "<input type='submit' value='Rename' onclick='markAccountGreen()'>"
+			carddesc += "</form>"
+
 			carddesc += "<b>Assignment:</b> "
-
 			var/jobs = "<span id='alljobsslot'><a href='#' onclick='showAll()'>[target_rank]</a></span>" //CHECK THIS
-
 			var/accesses = ""
 			if(istype(src,/obj/machinery/computer/card/centcom))
 				accesses += "<h5>Central Command:</h5>"
@@ -260,6 +284,13 @@
 						modify.registered_name = temp_name
 					else
 						src.visible_message("<span class='notice'>[src] buzzes rudely.</span>")
+		if ("account")
+			if (authenticated)
+				var/t2 = modify
+				//var/t1 = input(usr, "What name?", "ID computer", null)  as text
+				if ((authenticated && modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf)))
+					var/account_num = text2num(href_list["account"])
+					modify.associated_account_number = account_num
 		if ("mode")
 			mode = text2num(href_list["mode_target"])
 		if ("print")
@@ -267,13 +298,19 @@
 				printing = 1
 				sleep(50)
 				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc )
-				var/t1 = "<B>Crew Manifest:</B><BR>"
+				/*var/t1 = "<B>Crew Manifest:</B><BR>"
 				var/list/L = list()
 				for (var/datum/data/record/t in data_core.general)
 					var/R = t.fields["name"] + " - " + t.fields["rank"]
 					L += R
 				for(var/R in sortList(L))
-					t1 += "[R]<br>"
+					t1 += "[R]<br>"*/
+
+				var/t1 = "<h4>Crew Manifest</h4>"
+				t1 += "<br>"
+				if(data_core)
+					t1 += data_core.get_manifest(0) // make it monochrome
+
 				P.info = t1
 				P.name = "paper- 'Crew Manifest'"
 				printing = null

code/game/machinery/cryo.dm

@@ -10,7 +10,6 @@
 	var/temperature_archived
 	var/mob/living/carbon/occupant = null
 	var/beaker = null
-	var/next_trans = 0
 
 	var/current_heat_capacity = 50
 
@@ -164,12 +163,12 @@
 				var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
 				var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
 				occupant.heal_organ_damage(heal_brute,heal_fire)
-		if(beaker && (next_trans == 0))
+		var/has_cryo = occupant.reagents.get_reagent_amount("cryoxadone") >= 1
+		var/has_clonexa = occupant.reagents.get_reagent_amount("clonexadone") >= 1
+		var/has_cryo_medicine = has_cryo || has_clonexa
+		if(beaker && !has_cryo_medicine)
 			beaker:reagents.trans_to(occupant, 1, 10)
 			beaker:reagents.reaction(occupant)
-	next_trans++
-	if(next_trans == 10)
-		next_trans = 0
 
 /obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents()
 	if(air_contents.total_moles() < 1)

code/game/machinery/turrets.dm

@@ -190,6 +190,12 @@
 						targeting_active = 1
 						target()
 						targeting_active = 0
+
+		if(prob(15))
+			if(prob(50))
+				playsound(src.loc, 'sound/effects/turret/move1.wav', 60, 1)
+			else
+				playsound(src.loc, 'sound/effects/turret/move2.wav', 60, 1)
 	else if(!isPopping())//else, pop down
 		if(!isDown())
 			popDown()
@@ -244,6 +250,7 @@
 	if ((!isPopping()) || src.popping==-1)
 		invisibility = 0
 		popping = 1
+		playsound(src.loc, 'sound/effects/turret/open.wav', 60, 1)
 		if (src.cover!=null)
 			flick("popup", src.cover)
 			src.cover.icon_state = "openTurretCover"
@@ -253,6 +260,7 @@
 /obj/machinery/turret/proc/popDown()
 	if ((!isPopping()) || src.popping==1)
 		popping = -1
+		playsound(src.loc, 'sound/effects/turret/open.wav', 60, 1)
 		if (src.cover!=null)
 			flick("popdown", src.cover)
 			src.cover.icon_state = "turretCover"

code/game/objects/items/devices/PDA/PDA.dm

@@ -914,7 +914,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 					user.show_message("\blue Localized Damage, Brute/Burn:",1)
 					if(length(damaged)>0)
 						for(var/datum/organ/external/org in damaged)
-							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.display_name),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
 					else
 						user.show_message("\blue \t Limbs are OK.",1)
 

code/game/objects/items/devices/scanners.dm

@@ -112,7 +112,7 @@ MASS SPECTROMETER
 		if(length(damaged)>0)
 			for(var/datum/organ/external/org in damaged)
 				user.show_message(text("\blue \t []: [][]\blue - []",	\
-				capitalize(org.getDisplayName()),					\
+				capitalize(org.display_name),					\
 				(org.brute_dam > 0)	?	"\red [org.brute_dam]"							:0,		\
 				(org.status & ORGAN_BLEEDING)?"\red <b>\[Bleeding\]</b>":"\t", 		\
 				(org.burn_dam > 0)	?	"<font color='#FFA500'>[org.burn_dam]</font>"	:0),1)
@@ -146,7 +146,7 @@ MASS SPECTROMETER
 		var/mob/living/carbon/human/H = M
 		for(var/name in H.organs_by_name)
 			var/datum/organ/external/e = H.organs_by_name[name]
-			var/limb = e.getDisplayName()
+			var/limb = e.display_name
 			if(e.status & ORGAN_BROKEN)
 				if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & ORGAN_SPLINTED)))
 					user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport."
@@ -328,4 +328,4 @@ MASS SPECTROMETER
 	name = "advanced mass-spectrometer"
 	icon_state = "adv_spectrometer"
 	details = 1
-	origin_tech = "magnets=4;biotech=2"
+	origin_tech = "magnets=4;biotech=2"

code/game/objects/items/stacks/medical.dm

@@ -48,7 +48,7 @@
 					if (W.current_stage <= W.max_bleeding_stage)
 						user.visible_message( 	"\blue [user] bandages [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You bandage [W.desc] on [M]'s [affecting.display_name]." )
-						H.add_side_effect("Itch")
+						//H.add_side_effect("Itch")
 					else if (istype(W,/datum/wound/bruise))
 						user.visible_message( 	"\blue [user] places bruise patch over [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You place bruise patch over [W.desc] on [M]'s [affecting.display_name]." )

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -73,6 +73,8 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \
 	new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \
+	new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/rust_fuel_assembly_port_frame, 12, time = 50, one_per_turf = 1), \
+	new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/rust_fuel_compressor_frame, 12, time = 50, one_per_turf = 1), \
 	)
 
 /obj/item/stack/sheet/plasteel

code/game/objects/items/weapons/implants/implant.dm

@@ -180,33 +180,39 @@ Implant Specifics:<BR>"}
 		switch (severity)
 			if (2.0)	//Weak EMP will make implant tear limbs off.
 				if (prob(50))
-					if (ishuman(imp_in) && part)
-						imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
-						playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
-						spawn(25)
-							if (ishuman(imp_in) && part)
-								//No tearing off these parts since it's pretty much killing
-								//and you can't replace groins
-								if (istype(part,/datum/organ/external/chest) ||	\
-									istype(part,/datum/organ/external/groin) ||	\
-									istype(part,/datum/organ/external/head))
-									part.createwound(BRUISE, 60)	//mangle them instead
-								else
-									part.droplimb(1)
-							explosion(get_turf(imp_in), -1, -1, 2, 3, 3)
-							del(src)
-
+					small_boom()
 			if (1.0)	//strong EMP will melt implant either making it go off, or disarming it
-				if (prob(50))
-					activate()		//50% chance of bye bye
-				else
-					meltdown()		//50% chance of implant disarming
+				if (prob(70))
+					if (prob(50))
+						small_boom()
+					else
+						if (prob(50))
+							activate()		//50% chance of bye bye
+						else
+							meltdown()		//50% chance of implant disarming
 		spawn (20)
 			malfunction--
 
 	islegal()
 		return 0
 
+	proc/small_boom()
+		if (ishuman(imp_in) && part)
+			imp_in.visible_message("\red Something beeps inside [imp_in][part ? "'s [part.display_name]" : ""]!")
+			playsound(loc, 'sound/items/countdown.ogg', 75, 1, -3)
+			spawn(25)
+				if (ishuman(imp_in) && part)
+					//No tearing off these parts since it's pretty much killing
+					//and you can't replace groins
+					if (istype(part,/datum/organ/external/chest) ||	\
+						istype(part,/datum/organ/external/groin) ||	\
+						istype(part,/datum/organ/external/head))
+						part.createwound(BRUISE, 60)	//mangle them instead
+					else
+						part.droplimb(1)
+				explosion(get_turf(imp_in), -1, -1, 2, 3, 3)
+				del(src)
+
 /obj/item/weapon/implant/chem
 	name = "chem"
 	desc = "Injects things."
@@ -440,7 +446,10 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 	activate()
 		var/turf/t = get_turf(src)
-		src.scanned.loc = t
+		if (imp_in)
+			imp_in.put_in_hands(scanned)
+		else
+			scanned.loc = t
 		del src
 
 	implanted(mob/source as mob)

code/game/objects/items/weapons/storage/wallets.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/storage/wallet
 	name = "wallet"
 	desc = "It can hold a few small and personal things."
-	storage_slots = 4
+	storage_slots = 10
 	icon_state = "wallet"
 	w_class = 2
 	can_hold = list(

code/game/turfs/simulated/walls.dm

@@ -265,6 +265,16 @@
 		AH.try_build(src)
 		return
 
+	else if(istype(W,/obj/item/rust_fuel_compressor_frame))
+		var/obj/item/rust_fuel_compressor_frame/AH = W
+		AH.try_build(src)
+		return
+
+	else if(istype(W,/obj/item/rust_fuel_assembly_port_frame))
+		var/obj/item/rust_fuel_assembly_port_frame/AH = W
+		AH.try_build(src)
+		return
+
 	//Poster stuff
 	else if(istype(W,/obj/item/weapon/contraband/poster))
 		place_poster(W,user)

code/game/verbs/ooc.dm

@@ -41,22 +41,25 @@ var/global/normal_ooc_colour = "#002eb8"
 
 	log_ooc("[mob.name]/[key] : [msg]")
 
+	var/display_colour = normal_ooc_colour
+	if(holder && !holder.fakekey)
+		display_colour = "#0099cc"	//light blue
+		if(holder.rights & R_MOD)
+			display_colour = "#184880"	//dark blue
+		else if(holder.rights & R_ADMIN)
+			if(config.allow_admin_ooccolor)
+				display_colour = src.prefs.ooccolor
+			else
+				display_colour = "#b82e00"	//orange
+
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
 			var/display_name = src.key
-			var/display_colour = normal_ooc_colour
-
-			if(holder)
-				if(holder.fakekey)
-					if(C.holder)
-						display_name = "[holder.fakekey]/([src.key])"
-					else
-						display_name = holder.fakekey
-				else if(config.allow_admin_ooccolor)
-					display_colour = src.prefs.ooccolor
+			if(holder.fakekey)
+				if(C.holder)
+					display_name = "[holder.fakekey]/([src.key])"
 				else
-					display_colour = "#b82e00"
-
+					display_name = holder.fakekey
 			C << "<font color='[display_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 
 			/*

code/game/verbs/who.dm

@@ -46,11 +46,12 @@
 	set category = "Admin"
 	set name = "Adminwho"
 
-	var/msg = "<b>Current Admins:</b>\n"
+	var/msg = ""
+	var/num_mods_online = 0
 	var/num_admins_online = 0
 	if(holder)
 		for(var/client/C in admins)
-			if(C.holder.rank != "Moderator")
+			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
 				msg += "\t[C] is a [C.holder.rank]"
 
 				if(C.holder.fakekey)
@@ -66,26 +67,35 @@
 				if(C.is_afk())
 					msg += " (AFK)"
 				msg += "\n"
+
 				num_admins_online++
+			else
+				num_mods_online++
 	else
 		for(var/client/C in admins)
-			if(C.holder.rank != "Moderator")
+			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
 				if(!C.holder.fakekey)
 					msg += "\t[C] is a [C.holder.rank]\n"
 					num_admins_online++
+			else
+				num_mods_online++
 
-	msg += "<b>There are [num_admins_online] administrators online</b>\n"
+	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg
+	msg += "<b>There are also [num_mods_online] moderators online.</b> To view online moderators, type 'modwho'\n"
 	src << msg
 
 /client/verb/modwho()
 	set category = "Admin"
 	set name = "Modwho"
 
-	var/msg = "<b>Current Moderators:</b>\n"
+	var/msg = ""
+	var/num_admins_online = 0
 	var/num_mods_online = 0
 	if(holder)
 		for(var/client/C in admins)
-			if(C.holder.rank == "Moderator")
+			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
+				num_admins_online++
+			else
 				msg += "\t[C] is a [C.holder.rank]"
 
 				if(isobserver(C.mob))
@@ -101,9 +111,11 @@
 				num_mods_online++
 	else
 		for(var/client/C in admins)
-			if(C.holder.rank == "Moderator")
+			if(R_ADMIN & C.holder.rights || !(R_MOD & C.holder.rights))
+				num_admins_online++
+			else
 				msg += "\t[C] is a [C.holder.rank]\n"
-				num_mods_online++
 
-	msg += "<b>There are [num_mods_online] moderators online</b>\n"
+	msg = "<b>Current Moderators ([num_mods_online]):</b>\n" + msg
+	msg += "<b>There are also [num_admins_online] admins online.</b> To view online admins, type 'adminwho'\n"
 	src << msg