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

Conflicts: baystation12.dme code/game/jobs/job/captain.dm code/game/jobs/job/security.dm code/modules/clothing/spacesuits/rig.dm code/modules/mob/living/carbon/human/hud.dm html/changelog.html icons/obj/items.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-01-05 23:11:52 +00:00 · 2013-01-23 01:02:27 +10:00
parent 82ebb7ab5a 090495f386
commit 7f05c6fdb3
60 changed files with 1097 additions and 899 deletions
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -9,7 +9,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 	config_tag = "changeling"
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
-	required_players = 15
+	required_players = 2
+	required_players_secret = 5
 	required_enemies = 1
 	recommended_enemies = 4

--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -3,7 +3,8 @@
 	config_tag = "traitorchan"
 	traitors_possible = 3 //hard limit on traitors if scaling is turned off
 	restricted_jobs = list("AI", "Cyborg")
-	required_players = 20
+	required_players = 3
+	required_players_secret = 10
 	required_enemies = 2
 	recommended_enemies = 3

--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -22,7 +22,8 @@
 	config_tag = "cult"
 	restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain")
 	protected_jobs = list()
-	required_players = 15
+	required_players = 5
+	required_players_secret = 15
 	required_enemies = 3
 	recommended_enemies = 4

--- a/code/game/gamemodes/epidemic/epidemic.dm
+++ b/code/game/gamemodes/epidemic/epidemic.dm
@@ -1,7 +1,8 @@
 /datum/game_mode/epidemic
 	name = "epidemic"
 	config_tag = "epidemic"
-	required_players = 6
+	required_players = 1
+	required_players_secret = 15

 	var/const/waittime_l = 300 //lower bound on time before intercept arrives (in tenths of seconds)
 	var/const/waittime_h = 600 //upper bound on time before intercept arrives (in tenths of seconds)
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -46,13 +46,15 @@
 		possibleEvents["Meteor"] = 80 * engineer_count
 		possibleEvents["Blob"] = 30 * engineer_count
 		possibleEvents["Spacevine"] = 30 * engineer_count
+		possibleEvents["Grid Check"] = 10 * engineer_count
 	if(medical_count >= 1)
 		possibleEvents["Radiation"] = medical_count * 100
 		possibleEvents["Virus"] = medical_count * 50
 		possibleEvents["Appendicitis"] = medical_count * 50
 	if(security_count >= 1)
 		possibleEvents["Prison Break"] = security_count * 50
-		possibleEvents["Space Ninja"] = security_count * 10 // very low chance for space ninja event
+		/*if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)
+			possibleEvents["Space Ninja"] = security_count * 10*/

 	var/picked_event = pick(possibleEvents)
 	var/chance = possibleEvents[picked_event]
@@ -77,54 +79,6 @@
 		return 0

 	switch(picked_event)
-		if("Meteor")
-			command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
-			for(var/mob/M in player_list)
-				if(!istype(M,/mob/new_player))
-					M << sound('sound/AI/meteors.ogg')
-			spawn(100)
-				meteor_wave()
-				spawn_meteors()
-			spawn(700)
-				meteor_wave()
-				spawn_meteors()
-
-		if(2)
-			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			for(var/mob/M in player_list)
-				if(!istype(M,/mob/new_player))
-					M << sound('sound/AI/granomalies.ogg')
-			var/turf/T = pick(blobstart)
-			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
-			spawn(rand(50, 300))
-				del(bh)
-		/*
-		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
-			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/spanomalies.ogg')
-			var/list/turfs = new
-			var/turf/picked
-			for(var/turf/simulated/floor/T in world)
-				if(T.z == 1)
-					turfs += T
-			for(var/turf/simulated/floor/T in turfs)
-				if(prob(20))
-					spawn(50+rand(0,3000))
-						picked = pick(turfs)
-						var/obj/effect/portal/P = new /obj/effect/portal( T )
-						P.target = picked
-						P.creator = null
-						P.icon = 'icons/obj/objects.dmi'
-						P.failchance = 0
-						P.icon_state = "anom"
-						P.name = "wormhole"
-						spawn(rand(300,600))
-							del(P)
-		*/
-		if(3)
-			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-				space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
-		if(4)			mini_blob_event()
 		if("Space Ninja")
 			//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
 			space_ninja_arrival()
@@ -148,6 +102,10 @@
 			spacevine_infestation()
 		if("Communications")
 			communications_blackout()
+		if("Grid Check")
+			grid_check()
+		if("Meteor")
+			meteor_shower()

 	return 1

@@ -163,8 +121,9 @@
 	for(var/obj/machinery/telecomms/T in telecomms_list)
 		T.emp_act(1)

-/proc/power_failure()
-	command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure")
+/proc/power_failure(var/is_grid_check = 0)
+	command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", is_grid_check ? "Automated Grid Check" : "Critical Power Failure")
+
 	for(var/mob/M in player_list)
 		M << sound('sound/AI/poweroff.ogg')
 	for(var/obj/machinery/power/smes/S in world)
@@ -624,10 +583,28 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 	world << "Ion Storm Main Done"
 	*/

+/proc/meteor_shower()
+	command_alert("The station is now in a meteor shower", "Meteor Alert")
+
+	spawn(0)
+		var/waves = rand(1,4)
+		while(waves > 0)
+			sleep(rand(20,100))
+			spawn_meteors(rand(1,3))
+			waves--
+
+		command_alert("The station has cleared the meteor shower", "Meteor Alert")
+
+/proc/grid_check()
+	spawn(0)
+		power_failure(1)
+		sleep(rand(100,600))
+		power_restore()
+
 // Returns how many characters are currently active(not logged out, not AFK for more than 10 minutes)
 // with a specific role.
 // Note that this isn't sorted by department, because e.g. having a roboticist shouldn't make meteors spawn.
-proc/number_active_with_role(role)
+/proc/number_active_with_role(role)
 	var/count = 0
 	for(var/mob/M in player_list)
 		if(!M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive
@@ -657,4 +634,4 @@ proc/number_active_with_role(role)
 			if("Cyborg")
 				if(M.mind.assigned_role == "Cyborg")
 					count++
-	return count
+	return count
--- a/code/game/gamemodes/events/BlowOut.dm
+++ b/code/game/gamemodes/events/BlowOut.dm
@@ -1,32 +0,0 @@
-/area/var/radsafe = 0
-/area/maintenance/radsafe = 1
-/area/ai_monitored/maintenance/radsafe = 1
-/area/centcom/radsafe = 1
-/area/admin/radsafe = 1
-/area/adminsafety/radsafe = 1
-/area/shuttle/radsafe = 1
-/area/syndicate_station/radsafe = 1
-/area/asteroid/radsafe = 1
-/area/crew_quarters/sleeping/radsafe = 1
-
-/datum/event/blowout
-	Lifetime = 150
-	Announce()
-		if(!forced && prob(90))
-			ActiveEvent = null
-			SpawnEvent()
-			del src
-			return
-		command_alert("Warning: station approaching high-density radiation cloud. Seek cover immediately.")
-	Tick()
-		if(ActiveFor == 50)
-			command_alert("Station has entered radiation cloud. Do not leave cover until it has passed.")
-		if(ActiveFor == 100 || ActiveFor == 150)	//1/2 and 2/2 f the way after it start proper make peope be half dead mostly
-			for(var/mob/living/carbon/M in world)
-				var/area = get_area(M)
-				if(area:radsafe)
-					continue
-				if(!M.stat)
-					M.radiate(100)
-	Die()
-		command_alert("The station has cleared the radiation cloud. It is now safe to leave cover.")
--- a/code/game/gamemodes/events/ElectricalStorm.dm
+++ b/code/game/gamemodes/events/ElectricalStorm.dm
@@ -1,88 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04
-
-/datum/event/electricalstorm
-	var/list/obj/machinery/light/Lights = list( )
-	var/list/obj/machinery/light/APCs = list( )
-	var/list/obj/machinery/light/Doors = list( )
-	var/list/obj/machinery/light/Comms = list( )
-
-	Announce()
-//		command_alert("The station is flying through an electrical storm.  Radio communications may be disrupted", "Anomaly Alert")
-
-		for(var/obj/machinery/light/Light in world)
-			if(Light.z == 1 && Light.status != 0)
-				Lights += Light
-
-		for(var/obj/machinery/power/apc/APC in world)
-			if(APC.z == 1 && !APC.crit)
-				APCs += APC
-
-		for(var/obj/machinery/door/airlock/Door in world)
-			if(Door.z == 1 && !istype(Door,/obj/machinery/door/airlock/secure))
-				Doors += Door
-
-		for(var/obj/machinery/telecomms/processor/T in world)
-			if(prob(90) && !(T.stat & (BROKEN|NOPOWER)))
-				T.stat |= BROKEN
-				Comms |= T
-
-	Tick()
-		for(var/x = 0; x < 3; x++)
-			if (prob(30))
-				BlowLight()
-		if (prob(10))
-			DisruptAPC()
-		if (prob(10))
-			DisableDoor()
-
-
-	Die()
-		command_alert("The station has cleared the electrical storm.  Radio communications restored", "Anomaly Alert")
-		for(var/obj/machinery/telecomms/processor/T in Comms)
-			T.stat &= ~BROKEN
-		Comms = list()
-
-	proc
-		BlowLight() //Blow out a light fixture
-			var/obj/machinery/light/Light = null
-			var/failed_attempts = 0
-			while (Light == null || Light.status != 0)
-				Light = pick(Lights)
-				failed_attempts++
-				if (failed_attempts >= 10)
-					return
-
-			spawn(0) //Overload the light, spectacularly.
-				//Light.sd_SetLuminosity(10)
-				//sleep(2)
-				Light.on = 1
-				Light.broken()
-				Lights -= Light
-
-		DisruptAPC()
-			var/failed_attempts = 0
-			var/obj/machinery/power/apc/APC
-			while (!APC || !APC.operating)
-				APC = pick(APCs)
-				failed_attempts++
-				if (failed_attempts >= 10)
-					return
-
-			if (prob(40))
-				APC.operating = 0 //Blow its breaker
-			if (prob(8))
-				APC.set_broken()
-			APCs -= APC
-
-		DisableDoor()
-			var/obj/machinery/door/airlock/Airlock
-			while (!Airlock || Airlock.z != 1)
-				Airlock = pick(Doors)
-			Airlock.pulse(airlockIndexToWireColor[4])
-			for (var/x = 0; x < 2; x++)
-				var/Wire = 0
-				while(!Wire || Wire == 4)
-					Wire = rand(1, 9)
-				Airlock.pulse(airlockIndexToWireColor[Wire])
-			Airlock.update_icon()
-			Doors -= Airlock
--- a/code/game/gamemodes/events/GravitationalAnomaly.dm
+++ b/code/game/gamemodes/events/GravitationalAnomaly.dm
@@ -1,10 +0,0 @@
-/datum/event/gravitationalanomaly
-
-	Announce()
-
-		command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-		world << sound('granomalies.ogg')
-		var/turf/T = pick(blobstart)
-		var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
-		spawn(rand(50, 300))
-			del(bh)
--- a/code/game/gamemodes/events/ImmovableRod.dm
+++ b/code/game/gamemodes/events/ImmovableRod.dm
@@ -1,5 +0,0 @@
-/datum/event/immovablerod
-
-	Announce()
-
-		immovablerod()
--- a/code/game/gamemodes/events/MeteorStorm.dm
+++ b/code/game/gamemodes/events/MeteorStorm.dm
@@ -1,11 +0,0 @@
-/datum/event/meteorstorm
-
-	Announce()
-		command_alert("The station is now in a meteor shower", "Meteor Alert")
-
-	Tick()
-		if (prob(20))
-			meteor_wave()
-
-	Die()
-		command_alert("The station has cleared the meteor shower", "Meteor Alert")
--- a/code/game/gamemodes/events/PowerOffline.dm
+++ b/code/game/gamemodes/events/PowerOffline.dm
@@ -1,16 +0,0 @@
-/datum/event/power_offline
-	Announce()
-		for(var/obj/machinery/power/apc/a in world)
-			if(!a.crit && a.z == 1)
-				if(istype(a.area, /area/ai_monitored/storage/eva) || istype(a.area, /area/engine)\
-				|| istype(a.area, /area/toxins/xenobiology) || istype(a.area, /area/turret_protected/ai))
-					continue
-				a.eventoff = 1
-				a.update()
-
-	Die()
-		command_alert("The station has finished an automated power system grid check, thank you.", "Maintenance alert")
-		for(var/obj/machinery/power/apc/a in world)
-			if(!a.crit)
-				a.eventoff = 0
-				a.update()
--- a/code/game/gamemodes/events/PrisonBreak.dm
+++ b/code/game/gamemodes/events/PrisonBreak.dm
@@ -1,30 +0,0 @@
-/datum/event/prisonbreak
-
-	Announce()
-
-		for (var/obj/machinery/power/apc/temp_apc in world)
-			if(istype(get_area(temp_apc), /area/security/prison))
-				temp_apc.overload_lighting()
-			if(istype(get_area(temp_apc), /area/security/brig))
-				temp_apc.overload_lighting()
-	//	for (var/obj/machinery/computer/prison_shuttle/temp_shuttle in world)
-	//		temp_shuttle.prison_break()
-		for (var/obj/structure/closet/secure_closet/brig/temp_closet in world)
-			if(istype(get_area(temp_closet), /area/security/prison))
-				temp_closet.locked = 0
-				temp_closet.icon_state = temp_closet.icon_closed
-		for (var/obj/machinery/door/airlock/security/temp_airlock in world)
-			if(istype(get_area(temp_airlock), /area/security/prison))
-				temp_airlock.prison_open()
-			if(istype(get_area(temp_airlock), /area/security/brig))
-				temp_airlock.prison_open()
-		for (var/obj/machinery/door/airlock/glass/glass_security/temp_glassairlock in world)
-			if(istype(get_area(temp_glassairlock), /area/security/prison))
-				temp_glassairlock.prison_open()
-			if(istype(get_area(temp_glassairlock), /area/security/brig))
-				temp_glassairlock.prison_open()
-		for (var/obj/machinery/door_timer/temp_timer in world)
-			if(istype(get_area(temp_timer), /area/security/brig))
-				temp_timer.releasetime = 1
-		sleep(150)
-		command_alert("Glitch in imprisonment subroutines detected on [station_name()]. Recommend station AI involvement.", "Security Alert")
--- a/code/game/gamemodes/events/RadiationBelt.dm
+++ b/code/game/gamemodes/events/RadiationBelt.dm
@@ -1,27 +0,0 @@
-/datum/event/radiation
-	var/current_iteration = 0
-
-	// 50 - 20 (grace period) seconds lifetime
-	Lifetime = 50
-	Announce()
-		command_alert("The station is now travelling through a radiation belt. Take shelter in the maintenance tunnels, or in the crew quarters!", "Medical Alert")
-
-	Tick()
-		current_iteration++
-
-		// start radiating after 20 seconds grace period
-		if(current_iteration > 20)
-			for(var/mob/living/carbon/L in world)
-				// check whether they're in a safe place
-				// if they are, do not radiate
-				var/turf/T = get_turf(L)
-				if(T && ( istype(T.loc, /area/maintenance) || istype(T.loc, /area/crew_quarters) ))
-					continue
-
-				if (istype(L, /mob/living/carbon/monkey)) // So as to stop monkeys from dying in their pens
-					L.apply_effect(rand(3,4), IRRADIATE)
-				else
-					L.apply_effect(rand(4,10), IRRADIATE)
-
-	Die()
-		command_alert("The station has cleared the radiation belt", "Medical Alert")
--- a/code/game/gamemodes/events/SpaceCarp.dm
+++ b/code/game/gamemodes/events/SpaceCarp.dm
@@ -1,14 +0,0 @@
-/datum/event/spacecarp
-
-	Announce()
-
-		for(var/obj/effect/landmark/C in world)
-			if(C.name == "carpspawn")
-				if(prob(99))
-					new /mob/living/simple_animal/carp(C.loc)
-				else
-					new /mob/living/simple_animal/carp/elite(C.loc)
-		//sleep(100)
-		spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes.
-			command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert")
-			world << sound('commandreport.ogg')
--- a/code/game/gamemodes/events/SpaceNinja.dm
+++ b/code/game/gamemodes/events/SpaceNinja.dm
@@ -1,6 +0,0 @@
-/datum/event/spaceninja
-
-	Announce()
-
-		if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-			space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -24,6 +24,7 @@
 	var/list/restricted_jobs = list()	// Jobs it doesn't make sense to be.  I.E chaplain or AI cultist
 	var/list/protected_jobs = list()	// Jobs that can't be tratiors because
 	var/required_players = 0
+	var/required_players_secret = 0 //Minimum number of players for that game mode to be chose in Secret
 	var/required_enemies = 0
 	var/recommended_enemies = 0
 	var/uplink_welcome = "Syndicate Uplink Console:"
@@ -84,8 +85,13 @@ Implants;
 	for(var/mob/new_player/player in player_list)
 		if((player.client)&&(player.ready))
 			playerC++
-	if(playerC >= required_players)
-		return 1
+
+	if(master_mode=="secret")
+		if(playerC >= required_players_secret)
+			return 1
+	else
+		if(playerC >= required_players)
+			return 1
 	return 0


--- a/code/game/gamemodes/malfunction/malfunction.dm
+++ b/code/game/gamemodes/malfunction/malfunction.dm
@@ -4,7 +4,8 @@
 /datum/game_mode/malfunction
 	name = "AI malfunction"
 	config_tag = "malfunction"
-	required_players = 20
+	required_players = 2
+	required_players_secret = 15
 	required_enemies = 1
 	recommended_enemies = 1

--- a/code/game/gamemodes/meme/meme.dm
+++ b/code/game/gamemodes/meme/meme.dm
@@ -5,7 +5,8 @@
 /datum/game_mode/meme
 	name = "Memetic Anomaly"
 	config_tag = "meme"
-	required_players = 6
+	required_players = 3
+	required_players_secret = 10
 	restricted_jobs = list("AI", "Cyborg")
 	recommended_enemies = 2 // need at least a meme and a host
 	votable = 0 // temporarily disable this mode for voting
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -5,7 +5,8 @@
 /datum/game_mode/nuclear
 	name = "nuclear emergency"
 	config_tag = "nuclear"
-	required_players = 20 // 20 players - 5 players to be the nuke ops = 15 players remaining
+	required_players = 6
+	required_players_secret = 15 // 15 players - 5 players to be the nuke ops = 10 players remaining
 	required_enemies = 5
 	recommended_enemies = 5

--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -15,7 +15,8 @@
 	name = "revolution"
 	config_tag = "revolution"
 	restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
-	required_players = 20
+	required_players = 4
+	required_players_secret = 15
 	required_enemies = 3
 	recommended_enemies = 3

--- a/code/game/gamemodes/revolution/rp_revolution.dm
+++ b/code/game/gamemodes/revolution/rp_revolution.dm
@@ -3,7 +3,8 @@
 /datum/game_mode/revolution/rp_revolution
 	name = "rp-revolution"
 	config_tag = "rp-revolution"
-	required_players = 12
+	required_players = 4
+	required_players_secret = 12
 	required_enemies = 3
 	recommended_enemies = 3

--- a/code/game/gamemodes/traitor/traitor_info.dm
+++ b/code/game/gamemodes/traitor/traitor_info.dm
@@ -1,7 +0,0 @@
-/datum/traitorinfo
-	var/starting_objective = ""
-	var/starting_player_count = 0
-	var/starting_occupation = ""
-	var/starting_name = ""
-	var/ckey = ""
-	var/list/spawnlist = list()
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -5,7 +5,8 @@
 /datum/game_mode/wizard
 	name = "wizard"
 	config_tag = "wizard"
-	required_players = 20
+	required_players = 2
+	required_players_secret = 10
 	required_enemies = 1
 	recommended_enemies = 1

--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -414,29 +414,45 @@
 /proc/get_all_centcom_jobs()
 	return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander")

-/obj/proc/GetJobName()
+//gets the actual job rank (ignoring alt titles)
+//this is used solely for sechuds
+/obj/proc/GetJobRealName()
 	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
 		return

-	var/jobName
-	var/realJobName
-
-	// hack for alt titles
-	if(istype(loc, /mob))
-		var/mob/M = loc
-		if(M.mind && M.mind.role_alt_title == jobName && M.mind.assigned_role in get_all_jobs())
-			return M.mind.assigned_role
-
+	var/rank
+	var/assignment
 	if(istype(src, /obj/item/device/pda))
 		if(src:id)
-			jobName = src:id:assignment
-			realJobName = src:id:assignment_real_title
-	if(istype(src, /obj/item/weapon/card/id))
-		jobName = src:assignment
-		realJobName = src:assignment_real_title
+			rank = src:id:rank
+			assignment = src:id:assignment
+	else if(istype(src, /obj/item/weapon/card/id))
+		rank = src:rank
+		assignment = src:assignment

-	if( (realJobName in get_all_jobs()) || (jobName in get_all_jobs()) )
-		return jobName
+	if( rank in get_all_jobs() )
+		return rank
+
+	if( assignment in get_all_jobs() )
+		return assignment
+
+	return "Unknown"
+
+//gets the alt title, failing that the actual job rank
+//this is unused
+/obj/proc/sdsdsd()	//GetJobDisplayName
+	if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
+		return
+
+	var/assignment
+	if(istype(src, /obj/item/device/pda))
+		if(src:id)
+			assignment = src:id:assignment
+	else if(istype(src, /obj/item/weapon/card/id))
+		assignment = src:assignment
+
+	if(assignment)
+		return assignment

 	return "Unknown"

--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -11,8 +11,8 @@
 	req_admin_notify = 1
 	access = list() 			//See get_access()
 	minimal_access = list() 	//See get_access()
-	alt_titles = list("Administrator")	minimal_player_age = 14
-
+	alt_titles = list("Administrator")
+	minimal_player_age = 14
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_ears)
@@ -55,7 +55,7 @@
 	selection_color = "#ddddff"
 	idtype = /obj/item/weapon/card/id/silver
 	req_admin_notify = 1
-	alt_titles = list("Human resources director","Executive Officer")	minimal_player_age = 10
+	minimal_player_age = 10
 	access = 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_construction, access_morgue,
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -10,7 +10,7 @@
 	selection_color = "#dddddd"
 	access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
 	minimal_access = list(access_bar)
-	alt_titles = list("Waiter","Waitress")
+

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -52,7 +52,7 @@
 	selection_color = "#dddddd"
 	access = list(access_hydroponics, access_bar, access_kitchen, access_morgue)
 	minimal_access = list(access_kitchen, access_morgue)
-	alt_titles = list("Gourmet chef","Cook")
+	alt_titles = list("Cook")


 	equip(var/mob/living/carbon/human/H)
@@ -83,6 +83,7 @@
 	minimal_access = list(access_hydroponics, access_morgue) // Removed tox and chem access because STOP PISSING OFF THE CHEMIST GUYS // //Removed medical access because WHAT THE FUCK YOU AREN'T A DOCTOR YOU GROW WHEAT //Given Morgue access because they have a viable means of cloning.
 	alt_titles = list("Hydroponicist")

+
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/hydroponics(H), slot_w_uniform)
@@ -111,7 +112,6 @@
 	selection_color = "#dddddd"
 	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
 	minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
-	alt_titles = list("Supplies Officer","Logistics Officer")


 	equip(var/mob/living/carbon/human/H)
@@ -142,7 +142,6 @@
 	selection_color = "#dddddd"
 	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
 	minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
-	alt_titles = list("Supplies worker","Courier","Logistics worker")


 	equip(var/mob/living/carbon/human/H)
@@ -171,7 +170,7 @@
 	selection_color = "#dddddd"
 	access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station)
 	minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting)
-	alt_titles = list("Deep space miner","NTCA Affiliate","Prospector")
+	alt_titles = list("Deep space miner")


 	equip(var/mob/living/carbon/human/H)
@@ -283,7 +282,7 @@
 	selection_color = "#dddddd"
 	access = list(access_janitor, access_maint_tunnels)
 	minimal_access = list(access_janitor, access_maint_tunnels)
-	alt_titles = list("Custodial officer","Hygiene supervisor","OHS assistant","Health and Safety worker")
+	alt_titles = list("Custodial officer")


 	equip(var/mob/living/carbon/human/H)
@@ -312,7 +311,7 @@
 	selection_color = "#dddddd"
 	access = list(access_library, access_maint_tunnels)
 	minimal_access = list(access_library)
-	alt_titles = list("Journalist","Clerk","Record keeper")
+	alt_titles = list("Journalist")


 	equip(var/mob/living/carbon/human/H)
@@ -341,7 +340,7 @@ var/global/lawyer = 0//Checks for another lawyer
 	selection_color = "#dddddd"
 	access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels)
 	minimal_access = list(access_lawyer, access_court, access_sec_doors)
-	alt_titles = list("Attourney","Barrister","Solicitor","Queen's Counsel","Paralegal")
+	alt_titles = list("Attourney", "IA Consultant")


 	equip(var/mob/living/carbon/human/H)
--- a/code/game/jobs/job/civilian_chaplain.dm
+++ b/code/game/jobs/job/civilian_chaplain.dm
@@ -10,7 +10,7 @@
 	selection_color = "#dddddd"
 	access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
 	minimal_access = list(access_morgue, access_chapel_office, access_crematorium)
-	alt_titles = list("Counselor","Psychiatrist","Crew services adviser","Morale Officer")
+	alt_titles = list("Counselor")


 	equip(var/mob/living/carbon/human/H)
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -9,7 +9,6 @@
 	selection_color = "#ffeeaa"
 	idtype = /obj/item/weapon/card/id/silver
 	req_admin_notify = 1
-	alt_titles = list("Engineering supervisor")
 	access = 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_construction, access_sec_doors,
@@ -56,7 +55,6 @@
 	alt_titles = list("Technician","Maintenance technician","Engine technician","EVA technician","Electrician","Construction specialist")


-
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_ears)
@@ -89,7 +87,6 @@
 	selection_color = "#fff5cc"
 	access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
 	minimal_access = list(access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction)
-	alt_titles = list("Pipeworker","Gas supervisor","Firefighter")


 	equip(var/mob/living/carbon/human/H)
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -130,7 +130,6 @@
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research)
 	minimal_access = list(access_medical, access_morgue, access_genetics, access_research)
-	alt_titles = list("Sequencer")


 	equip(var/mob/living/carbon/human/H)
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -46,7 +46,7 @@
 	selection_color = "#ffeeff"
 	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
 	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology)
-	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist","High Energy Materials Researcher")
+	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist")

 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -9,7 +9,6 @@
 	selection_color = "#ffdddd"
 	idtype = /obj/item/weapon/card/id/silver
 	req_admin_notify = 1
-	alt_titles = list("Commander","Commissioner")
 	access = 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_construction, access_mailsorting,
@@ -56,9 +55,8 @@
 	spawn_positions = 1
 	supervisors = "the head of security"
 	selection_color = "#ffeeee"
-	access	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue)
- = list(access_security, access_sec_doors, access_brig, access_armory, access_court)
-	alt_titles = list("Arsenal clerk","Brig supervisor","Superintendant")	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court)
+	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue)
+	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court)
 	minimal_player_age = 7

 	equip(var/mob/living/carbon/human/H)
@@ -98,7 +96,7 @@

 	access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
 	minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court)
-	alt_titles = list("Forensic Technician","Investigator")
+	alt_titles = list("Forensic Technician")
 	minimal_player_age = 7
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -145,8 +143,7 @@
 	selection_color = "#ffeeee"
 	access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_court)
-	alt_titles = list("OHS marshal","Enforcer")	minimal_player_age = 7
-
+	minimal_player_age = 7
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears)
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -38,8 +38,8 @@ var/global/datum/controller/occupations/job_master
 			if(J.title == rank)	return J
 		return null

-	proc/GetAltTitle(mob/new_player/player, rank)
-		return player.client.prefs.GetAltTitle(GetJob(rank))
+	proc/GetPlayerAltTitle(mob/new_player/player, rank)
+		return player.client.prefs.GetPlayerAltTitle(GetJob(rank))

 	proc/AssignRole(var/mob/new_player/player, var/rank, var/latejoin = 0)
 		Debug("Running AR, Player: [player], Rank: [rank], LJ: [latejoin]")
@@ -54,7 +54,7 @@ var/global/datum/controller/occupations/job_master
 			if((job.current_positions < position_limit) || position_limit == -1)
 				Debug("Player: [player] is now Rank: [rank], JCP:[job.current_positions], JPL:[position_limit]")
 				player.mind.assigned_role = rank
-				player.mind.role_alt_title = GetAltTitle(player, rank)
+				player.mind.role_alt_title = GetPlayerAltTitle(player, rank)
 				unassigned -= player
 				job.current_positions++
 				return 1
@@ -311,9 +311,6 @@ var/global/datum/controller/occupations/job_master
 			H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator."

 		H.job = rank
-		if(H.mind && H.mind.assigned_role != rank)
-			H.mind.assigned_role = rank
-			H.mind.role_alt_title = null

 		if(!joined_late)
 			var/obj/S = null
@@ -331,6 +328,7 @@ var/global/datum/controller/occupations/job_master

 		if(H.mind)
 			H.mind.assigned_role = rank
+			H.mind.role_alt_title = null

 			switch(rank)
 				if("Cyborg")
@@ -359,10 +357,7 @@ var/global/datum/controller/occupations/job_master
 		if(job.req_admin_notify)
 			H << "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>"

-		if(H.mind.assigned_role == rank && H.mind.role_alt_title)
-			spawnId(H, rank, H.mind.role_alt_title)
-		else
-			spawnId(H,rank)
+		spawnId(H, rank, H.mind.role_alt_title)
 		H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears)
 //		H.update_icons()
 		return 1
@@ -370,7 +365,6 @@ var/global/datum/controller/occupations/job_master

 	proc/spawnId(var/mob/living/carbon/human/H, rank, title)
 		if(!H)	return 0
-		if(!title) title = rank
 		var/obj/item/weapon/card/id/C = null

 		var/datum/job/job = null
@@ -389,7 +383,8 @@ var/global/datum/controller/occupations/job_master
 			C = new /obj/item/weapon/card/id(H)
 		if(C)
 			C.registered_name = H.real_name
-			C.assignment = title
+			C.rank = rank
+			C.assignment = title ? title : rank
 			C.name = "[C.registered_name]'s ID Card ([C.assignment])"
 			H.equip_to_slot_or_del(C, slot_wear_id)
 		H.equip_to_slot_or_del(new /obj/item/device/pda(H), slot_belt)
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -232,8 +232,9 @@
 				var/t1 = href_list["assign_target"]
 				if(t1 == "Custom")
 					var/temp_t = copytext(sanitize(input("Enter a custom job assignment.","Assignment")),1,MAX_MESSAGE_LEN)
-					if(temp_t)
-						t1 = temp_t
+					//let custom jobs function as an impromptu alt title, mainly for sechuds
+					if(temp_t && modify)
+						modify.assignment = temp_t
 				else
 					var/datum/job/jobdatum
 					for(var/jobtype in typesof(/datum/job))
@@ -246,8 +247,9 @@
 						return

 					modify.access = ( istype(src,/obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
-				if (modify)
-					modify.assignment = t1
+					if (modify)
+						modify.assignment = t1
+						modify.rank = t1
 		if ("reg")
 			if (authenticated)
 				var/t2 = modify
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -52,7 +52,7 @@
 					world << text("\blue <B>Alert: [] authorizations needed until shuttle is launched early</B>", src.auth_need - src.authorized.len)

 				if("Abort")
-					world << "\blue <B>All authorizations to shorting time for shuttle launch have been revoked!</B>"
+					world << "\blue <B>All authorizations to shortening time for shuttle launch have been revoked!</B>"
 					src.authorized.len = 0
 					src.authorized = list(  )

--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -4,7 +4,7 @@
 	icon_state = "cell-off"
 	density = 1
 	anchored = 1.0
-	layer = 5
+	layer = 2.8

 	var/on = 0
 	var/temperature_archived
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -1,3 +1,5 @@
+#define SPEED_MULTIPLIER 0.5
+
 /obj/machinery/hydroponics
 	name = "hydroponics tray"
 	icon = 'icons/obj/hydroponics.dmi'
@@ -45,42 +47,42 @@ obj/machinery/hydroponics/process()
 		lastcycle = world.time
 		if(planted && !dead)
 			// Advance age
-			age++
+			age += 1 * SPEED_MULTIPLIER

 //Nutrients//////////////////////////////////////////////////////////////
 			// Nutrients deplete slowly
 			if(nutrilevel > 0)
 				if(prob(50))
-					nutrilevel -= 1
+					nutrilevel -= 1 * SPEED_MULTIPLIER

 			// Lack of nutrients hurts non-weeds
 			if(nutrilevel <= 0 && myseed.plant_type != 1)
-				health -= rand(1,3)
+				health -= rand(1,3) * SPEED_MULTIPLIER

 //Water//////////////////////////////////////////////////////////////////
 			// Drink random amount of water
-			waterlevel = max(waterlevel - rand(1,6), 0)
+			waterlevel = max(waterlevel - rand(1,6) * SPEED_MULTIPLIER, 0)

 			// If the plant is dry, it loses health pretty fast, unless mushroom
 			if(waterlevel <= 10 && myseed.plant_type != 2)
-				health -= rand(0,1)
+				health -= rand(0,1) * SPEED_MULTIPLIER
 				if(waterlevel <= 0)
-					health -= rand(0,2)
+					health -= rand(0,2) * SPEED_MULTIPLIER

 			// Sufficient water level and nutrient level = plant healthy
 			else if(waterlevel > 10 && nutrilevel > 0)
-				health += rand(1,2)
+				health += rand(1,2) * SPEED_MULTIPLIER
 				if(prob(5))  //5 percent chance the weed population will increase
-					weedlevel += 1
+					weedlevel += 1 * SPEED_MULTIPLIER
 //Toxins/////////////////////////////////////////////////////////////////

 			// Too much toxins cause harm, but when the plant drinks the contaiminated water, the toxins disappear slowly
 			if(toxic >= 40 && toxic < 80)
-				health -= 1
-				toxic -= rand(1,10)
+				health -= 1 * SPEED_MULTIPLIER
+				toxic -= rand(1,10) * SPEED_MULTIPLIER
 			else if(toxic >= 80) // I don't think it ever gets here tbh unless above is commented out
-				health -= 3
-				toxic -= rand(1,10)
+				health -= 3 * SPEED_MULTIPLIER
+				toxic -= rand(1,10) * SPEED_MULTIPLIER
 			else if(toxic < 0) // Make sure it won't go overoboard
 				toxic = 0

@@ -91,11 +93,11 @@ obj/machinery/hydroponics/process()
 				pestlevel = 10

 			else if(pestlevel >= 5)
-				health -= 1
+				health -= 1 * SPEED_MULTIPLIER

 			// If it's a weed, it doesn't stunt the growth
 			if(weedlevel >= 5 && myseed.plant_type != 1 )
-				health -= 1
+				health -= 1 * SPEED_MULTIPLIER


 //Health & Age///////////////////////////////////////////////////////////
@@ -107,12 +109,12 @@ obj/machinery/hydroponics/process()
 			else if(health <= 0)
 				dead = 1
 				harvest = 0
-				weedlevel += 1 // Weeds flourish
+				weedlevel += 1 * SPEED_MULTIPLIER // Weeds flourish
 				pestlevel = 0 // Pests die

 			// If the plant is too old, lose health fast
 			if(age > myseed.lifespan)
-				health -= rand(1,5)
+				health -= rand(1,5) * SPEED_MULTIPLIER

 			// Harvest code
 			if(age > myseed.production && (age - lastproduce) > myseed.production && (!harvest && !dead))
@@ -129,10 +131,10 @@ obj/machinery/hydroponics/process()
 				else
 					lastproduce = age
 			if(prob(5))  // On each tick, there's a 5 percent chance the pest population will increase
-				pestlevel += 1
+				pestlevel += 1 * SPEED_MULTIPLIER
 		else
 			if(waterlevel > 10 && nutrilevel > 0 && prob(10))  // If there's no plant, the percentage chance is 10%
-				weedlevel += 1
+				weedlevel += 1 * SPEED_MULTIPLIER
 				if(weedlevel > 10)
 					weedlevel = 10

@@ -712,6 +714,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			user.visible_message("\red [user] starts uprooting the weeds.", "\red You remove the weeds from the [src].")
 			weedlevel = 0
 			updateicon()
+			src.updateicon()
 		else
 			user << "\red This plot is completely devoid of weeds. It doesn't need uprooting."

@@ -1037,4 +1040,6 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				SetLuminosity(round(myseed.potency/10))
 		else
 			SetLuminosity(0)
-		return
+		return
+
+#undef SPEED_MULTIPLIER
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -72,6 +72,7 @@ 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), \
 	)

 /obj/item/stack/sheet/plasteel
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -167,6 +167,7 @@
 		src.add_fingerprint(user)
 		if (src.bullets < 1)
 			user.show_message("\red *click* *click*", 2)
+			playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 			return
 		playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1)
 		src.bullets--
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -16,6 +16,7 @@
 	desc = "Does card things."
 	icon = 'icons/obj/card.dmi'
 	w_class = 1.0
+	var/associated_account_number = 0

 	var/list/files = list(  )

@@ -74,8 +75,9 @@
 	var/dna_hash = "\[UNSET\]"
 	var/fingerprint_hash = "\[UNSET\]"

-	var/assignment = null
-	var/assignment_real_title = null
+	//alt titles are handled a bit weirdly in order to unobtrusively integrate into existing ID system
+	var/assignment = null	//can be alt title or the actual job
+	var/rank = null			//actual job
 	var/dorm = 0		// determines if this ID has claimed a dorm already

 /obj/item/weapon/card/id/attack_self(mob/user as mob)