Merge remote-tracking branch 'origin/master' into TGUI-3.0

2020-07-07 18:37:45 +03:00
parent 8cbe248465 1d791c4808
commit 280d3de6c3
93 changed files with 1927 additions and 1337 deletions
@@ -201,10 +201,13 @@ GLOBAL_LIST_EMPTY(objectives)
 	return won || ..()

 /datum/objective/assassinate/once/process()
-	won = check_completion()
+	won = check_midround_completion()
 	if(won)
 		STOP_PROCESSING(SSprocessing,src)

+/datum/objective/assassinate/once/proc/check_midround_completion()
+	return won || !considered_alive(target) //The target afking / logging off for a bit during the round doesn't complete it, but them being afk at roundend does.
+
 /datum/objective/assassinate/internal
 	var/stolen = 0 		//Have we already eliminated this target?