Merge branch 'master' of https://github.com/Baystation12/Baystation12 into laptop-multifix

code/game/machinery/embedded_controller/airlock_docking_controller.dm

@@ -108,7 +108,9 @@
 
 //are we ready for undocking?
 /datum/computer/file/embedded_program/docking/airlock/ready_for_undocking()
-	return airlock_program.check_doors_secured()
+	var/ext_closed = airlock_program.check_exterior_door_secured()
+	var/int_closed = airlock_program.check_interior_door_secured()
+	return (ext_closed || int_closed)
 
 //An airlock controller to be used by the airlock-based docking port controller.
 //Same as a regular airlock controller but allows disabling of the regular airlock functions when docking

code/game/machinery/embedded_controller/airlock_program.dm

@@ -35,10 +35,10 @@
 	
 	if (istype(M, /obj/machinery/embedded_controller/radio/airlock))	//if our controller is an airlock controller than we can auto-init our tags
 		var/obj/machinery/embedded_controller/radio/airlock/controller = M
-		tag_exterior_door = controller.tag_exterior_door
-		tag_interior_door = controller.tag_interior_door
-		tag_airpump = controller.tag_airpump
-		tag_chamber_sensor = controller.tag_chamber_sensor
+		tag_exterior_door = controller.tag_exterior_door? controller.tag_exterior_door : "[id_tag]_outer"
+		tag_interior_door = controller.tag_interior_door? controller.tag_interior_door : "[id_tag]_inner"
+		tag_airpump = controller.tag_airpump? controller.tag_airpump : "[id_tag]_pump"
+		tag_chamber_sensor = controller.tag_chamber_sensor? controller.tag_chamber_sensor : "[id_tag]_sensor"
 		tag_exterior_sensor = controller.tag_exterior_sensor
 		tag_interior_sensor = controller.tag_interior_sensor
 		memory["secure"] = controller.tag_secure
@@ -248,9 +248,15 @@
 	return (state == STATE_WAIT && target_state == TARGET_NONE)
 
 //are the doors closed and locked?
+/datum/computer/file/embedded_program/airlock/proc/check_exterior_door_secured()
+	return (memory["exterior_status"]["state"] == "closed" &&  memory["exterior_status"]["lock"] == "locked")
+
+/datum/computer/file/embedded_program/airlock/proc/check_interior_door_secured()
+	return (memory["interior_status"]["state"] == "closed" &&  memory["interior_status"]["lock"] == "locked")
+
 /datum/computer/file/embedded_program/airlock/proc/check_doors_secured()
-	var/ext_closed = (memory["exterior_status"]["state"] == "closed" &&  memory["exterior_status"]["lock"] == "locked")
-	var/int_closed = (memory["interior_status"]["state"] == "closed" &&  memory["interior_status"]["lock"] == "locked")
+	var/ext_closed = check_exterior_door_secured()
+	var/int_closed = check_interior_door_secured()
 	return (ext_closed && int_closed)
 
 /datum/computer/file/embedded_program/airlock/proc/signalDoor(var/tag, var/command)

code/game/machinery/embedded_controller/escape_pod_docking_controller.dm

@@ -1,5 +1,6 @@
 //This controller goes on the escape pod itself
 /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod
+	name = "escape pod controller"
 	var/datum/shuttle/ferry/escape_pod/pod
 
 /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)

code/game/machinery/embedded_controller/simple_docking_controller.dm

@@ -58,7 +58,7 @@
 	if (istype(M, /obj/machinery/embedded_controller/radio/simple_docking_controller))
 		var/obj/machinery/embedded_controller/radio/simple_docking_controller/controller = M
 		
-		tag_door = controller.tag_door
+		tag_door = controller.tag_door? controller.tag_door : "[id_tag]_hatch"
 			
 		spawn(10)
 			signal_door("update")		//signals connected doors to update their status

code/game/verbs/ooc.dm

@@ -131,9 +131,12 @@ var/global/normal_ooc_colour = "#002eb8"
 
 	var/list/heard = get_mobs_in_view(7, src.mob)
 	var/mob/S = src.mob
+	
 	var/display_name = S.key
 	if(S.stat != DEAD)
 		display_name = S.name
+	
+	// Handle non-admins
 	for(var/mob/M in heard)
 		if(!M.client)
 			continue
@@ -149,6 +152,12 @@ var/global/normal_ooc_colour = "#002eb8"
 					else
 						display_name = holder.fakekey
 			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
+	
+	// Now handle admins
+	display_name = S.key
+	if(S.stat != DEAD)
+		display_name = "[S.name]/([S.key])"
+	
 	for(var/client/C in admins)
 		if(C.prefs.toggles & CHAT_LOOC)
 			var/prefix = "(R)LOOC"

code/modules/admin/IsBanned.dm

@@ -1,3 +1,4 @@
+#ifndef OVERRIDE_BAN_SYSTEM
 //Blocks an attempt to connect before even creating our client datum thing.
 world/IsBanned(key,address,computer_id)
 	if(ckey(key) in admin_datums)
@@ -79,3 +80,6 @@ world/IsBanned(key,address,computer_id)
 		if (failedip)
 			message_admins("[key] has logged in with a blank ip in the ban check.")
 		return ..()	//default pager ban stuff
+#endif
+#undef OVERRIDE_BAN_SYSTEM
+

code/modules/events/event_dynamic.dm

@@ -76,7 +76,6 @@ var/list/event_last_fired = list()
 		possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 10
 		possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 10
 		possibleEvents[/datum/event/viral_infection] = active_with_role["Medical"] * 10
-		possibleEvents[/datum/event/organ_failure] = active_with_role["Medical"] * 50
 
 	possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50
 	if(active_with_role["Security"] > 0)

code/modules/events/organ_failure.dm

@@ -1,44 +0,0 @@
-datum/event/organ_failure
-	var/severity = 1
-
-datum/event/organ_failure/setup()
-	announceWhen = rand(0, 300)
-	endWhen = announceWhen + 1
-	severity = rand(1, 3)
-
-datum/event/organ_failure/announce()
-	command_alert("Confirmed outbreak of level [rand(3,7)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
-	world << sound('sound/AI/outbreak5.ogg')
-
-datum/event/organ_failure/start()
-	var/list/candidates = list()	//list of candidate keys
-	for(var/mob/living/carbon/human/G in player_list)
-		if(G.mind && G.mind.current && G.mind.current.stat != DEAD && G.health > 70 && G.internal_organs)
-			candidates += G
-	if(!candidates.len)	return
-	candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
-
-	while(severity > 0 && candidates.len)
-		var/mob/living/carbon/human/C = candidates[1]
-
-		var/acute = prob(15)
-		if (prob(75))
-			//internal organ infection
-			var/datum/organ/internal/I = pick(C.internal_organs)
-			
-			if (acute)
-				I.germ_level = max(INFECTION_LEVEL_TWO, I.germ_level)
-			else
-				I.germ_level = max(rand(INFECTION_LEVEL_ONE,INFECTION_LEVEL_ONE*2), I.germ_level)
-		else
-			//external organ infection
-			var/datum/organ/external/O = pick(C.organs)
-			
-			if (acute)
-				O.germ_level = max(INFECTION_LEVEL_TWO, O.germ_level)
-			else
-				O.germ_level = max(rand(INFECTION_LEVEL_ONE,INFECTION_LEVEL_ONE*2), O.germ_level)
-			
-			C.bad_external_organs |= O
-
-		severity--

code/modules/mob/living/silicon/ai/ai.dm

@@ -100,7 +100,6 @@ var/list/ai_list = list()
 	add_language("Siik'maas", 0)
 	add_language("Siik'tajr", 0)
 	add_language("Skrellian", 0)
-	add_language("Rootspeak", 0)
 	add_language("Tradeband", 1)
 	add_language("Gutter", 0)
 

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -317,10 +317,10 @@
 	if (!yes || ( \
 	 !istype(AM,/obj/machinery/door) && \
 	 !istype(AM,/obj/machinery/recharge_station) && \
-	 !istype(AM,/obj/machinery/disposal/deliveryChute && \
+	 !istype(AM,/obj/machinery/disposal/deliveryChute) && \
 	 !istype(AM,/obj/machinery/teleport/hub) && \
 	 !istype(AM,/obj/effect/portal)
-	))) return
+	)) return
 	..()
 	return
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -47,7 +47,6 @@
 	R.add_language("Siik'maas", 0)
 	R.add_language("Siik'tajr", 0)
 	R.add_language("Skrellian", 0)
-	R.add_language("Rootspeak", 0)
 	R.add_language("Tradeband", 0)
 	R.add_language("Gutter", 0)