Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/game/machinery/computer/atmos_control.dm

@@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers)
 		IO |= text[1]
 	if(!IO.len)
 		to_chat(user, "<span class='alert'>No machinery detected.</span>")
-	var/S = input("Select the device set: ", "Selection", IO[1]) as anything in sortList(IO)
+	var/S = input("Select the device set: ", "Selection", IO[1]) as anything in sort_list(IO)
 	if(src)
 		src.input_tag = "[S]_in"
 		src.output_tag = "[S]_out"

code/game/machinery/computer/camera_advanced.dm

@@ -179,7 +179,7 @@
 	user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
 	user.sight = SEE_TURFS | SEE_BLACKNESS
 	user.see_in_dark = 2
-	return 1
+	return TRUE
 
 /mob/camera/aiEye/remote/Destroy()
 	if(origin && eye_user)

code/game/machinery/computer/card.dm

@@ -505,10 +505,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				var/datum/job/j = SSjob.GetJob(edit_job_target)
 				if(!j)
 					updateUsrDialog()
-					return 0
+					return FALSE
 				if(can_open_job(j) != 1)
 					updateUsrDialog()
-					return 0
+					return FALSE
 				if(opened_positions[edit_job_target] >= 0)
 					GLOB.time_last_changed_position = world.time / 10
 				j.total_positions++
@@ -522,10 +522,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				var/datum/job/j = SSjob.GetJob(edit_job_target)
 				if(!j)
 					updateUsrDialog()
-					return 0
+					return FALSE
 				if(can_close_job(j) != 1)
 					updateUsrDialog()
-					return 0
+					return FALSE
 				//Allow instant closing without cooldown if a position has been opened before
 				if(opened_positions[edit_job_target] <= 0)
 					GLOB.time_last_changed_position = world.time / 10
@@ -540,7 +540,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 				var/datum/job/j = SSjob.GetJob(priority_target)
 				if(!j)
 					updateUsrDialog()
-					return 0
+					return FALSE
 				var/priority = TRUE
 				if(j in SSjob.prioritized_jobs)
 					SSjob.prioritized_jobs -= j

code/game/machinery/computer/law.dm

@@ -5,8 +5,8 @@
 	icon_screen = "command"
 
 /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/aiModule))
-		var/obj/item/aiModule/M = O
+	if(istype(O, /obj/item/ai_module))
+		var/obj/item/ai_module/M = O
 		if(src.stat & (NOPOWER|BROKEN|MAINT))
 			return
 		if(!current)
@@ -27,8 +27,8 @@
 
 /obj/machinery/computer/upload/proc/can_upload_to(mob/living/silicon/S)
 	if(S.stat == DEAD)
-		return 0
-	return 1
+		return FALSE
+	return TRUE
 
 /obj/machinery/computer/upload/ai
 	name = "\improper AI upload console"
@@ -45,9 +45,9 @@
 
 /obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A)
 	if(!A || !isAI(A))
-		return 0
+		return FALSE
 	if(A.control_disabled)
-		return 0
+		return FALSE
 	return ..()
 
 
@@ -66,7 +66,7 @@
 
 /obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B)
 	if(!B || !iscyborg(B))
-		return 0
+		return FALSE
 	if(B.scrambledcodes || B.emagged)
-		return 0
+		return FALSE
 	return ..()

code/game/machinery/computer/medical.dm

@@ -571,8 +571,8 @@
 				if(user.canUseTopic(src, !hasSiliconAccessInArea(user)))
 					if(!record1 || record1 == active1)
 						if(!record2 || record2 == active2)
-							return 1
-	return 0
+							return TRUE
+	return FALSE
 
 /obj/machinery/computer/med_data/laptop
 	name = "medical laptop"

code/game/machinery/computer/security.dm

@@ -805,9 +805,9 @@ What a mess.*/
 		if(authenticated)
 			if(user.canUseTopic(src, !hasSiliconAccessInArea(user)))
 				if(!trim(message1))
-					return 0
+					return FALSE
 				if(!record1 || record1 == active1)
 					if(!record2 || record2 == active2)
-						return 1
-	return 0
+						return TRUE
+	return FALSE