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

2024-03-08 19:10:22 -03:00
parent fcd036dab5 c4c3a8ace1
commit a65f323734
810 changed files with 140372 additions and 5523 deletions
@@ -48,7 +48,7 @@ SUBSYSTEM_DEF(activity)

 /datum/controller/subsystem/activity/proc/get_average_threat()
 	if(!length(threat_history))
-		return 0
+		return FALSE
 	var/total_weight = 0
 	var/total_amt = 0
 	for(var/i in 1 to threat_history.len-1)