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

code/modules/events/holiday/xmas.dm

@@ -29,7 +29,7 @@
 		other_half.icon_state = "cracker2"
 		target.put_in_active_hand(other_half)
 		playsound(user, 'sound/effects/snap.ogg', 50, 1)
-		return 1
+		return TRUE
 	return ..()
 
 /obj/item/clothing/head/festive

code/modules/events/immovable_rod.dm

@@ -101,7 +101,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	walk_towards(src, destination, 1)
 
 /obj/effect/immovablerod/ex_act(severity, target, origin)
-	return 0
+	return FALSE
 
 /obj/effect/immovablerod/singularity_act()
 	return

code/modules/events/pirates.dm

@@ -458,9 +458,9 @@
 /datum/export/pirate/ransom/get_cost(atom/movable/AM)
 	var/mob/living/carbon/human/H = AM
 	if(H.stat != CONSCIOUS || !H.mind || !H.mind.assigned_role) //mint condition only
-		return 0
+		return FALSE
 	else if("pirate" in H.faction) //can't ransom your fellow pirates to CentCom!
-		return 0
+		return FALSE
 	else
 		if(H.mind.assigned_role in GLOB.command_positions)
 			return 3000

code/modules/events/portal_storm.dm

@@ -108,16 +108,16 @@
 
 /datum/round_event/portal_storm/proc/spawn_hostile()
 	if(!hostile_types || !hostile_types.len)
-		return 0
+		return FALSE
 	return ISMULTIPLE(activeFor, 2)
 
 /datum/round_event/portal_storm/proc/spawn_boss()
 	if(!boss_types || !boss_types.len)
-		return 0
+		return FALSE
 
 	if(activeFor == next_boss_spawn)
 		next_boss_spawn += CEILING(number_of_hostiles / number_of_bosses, 1)
-		return 1
+		return TRUE
 
 /datum/round_event/portal_storm/proc/time_to_end()
 	if(!hostile_types.len && !boss_types.len)

code/modules/events/spacevine.dm

@@ -124,7 +124,7 @@
 	quality = MINOR_NEGATIVE
 
 /datum/spacevine_mutation/fire_proof/process_temperature(obj/structure/spacevine/holder, temp, volume)
-	return 1
+	return TRUE
 
 /datum/spacevine_mutation/fire_proof/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
 	if(I && I.damtype == "fire")

code/modules/events/wizard/greentext.dm

@@ -13,7 +13,7 @@
 		if(!ishuman(M))
 			holder_canadates -= M
 	if(!holder_canadates) //Very unlikely, but just in case
-		return 0
+		return FALSE
 
 	var/mob/living/carbon/human/H = pick(holder_canadates)
 	new /obj/item/greentext(H.loc)

code/modules/events/wizard/madness.dm

@@ -13,7 +13,7 @@
 
 	var/suggested = pick(strings(REDPILL_FILE, "redpill_questions"))
 
-	forced_secret = (input(usr, "What horrifying truth will you reveal?", "Curse of Madness", sortList(suggested)) as text|null) || suggested
+	forced_secret = (input(usr, "What horrifying truth will you reveal?", "Curse of Madness", sort_list(suggested)) as text|null) || suggested
 
 /datum/round_event/wizard/madness/start()
 	var/datum/round_event_control/wizard/madness/C = control