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

# Conflicts:
#	code/modules/ninja/suit/suit.dm

code/game/gamemodes/dynamic/dynamic.dm

@@ -711,10 +711,15 @@ GLOBAL_VAR_INIT(dynamic_forced_storyteller, null)
 		update_playercounts()
 		if (storyteller.should_inject_antag())
 			SSblackbox.record_feedback("tally","dynamic",1,"Attempted midround injections")
-			var/list/drafted_rules = storyteller.midround_draft()
-			if (drafted_rules.len > 0)
-				SSblackbox.record_feedback("tally","dynamic",1,"Successful midround injections")
-				picking_midround_latejoin_rule(drafted_rules)
+			do_midround_injection()
+
+/datum/game_mode/dynamic/proc/do_midround_injection()
+	set waitfor = FALSE
+	var/list/drafted_rules = storyteller.midround_draft()
+	if (drafted_rules.len > 0)
+		SSblackbox.record_feedback("tally","dynamic",1,"Successful midround injections")
+		picking_midround_latejoin_rule(drafted_rules)
+
 
 /// Updates current_players.
 /datum/game_mode/dynamic/proc/update_playercounts()

code/game/gamemodes/gangs/dominator.dm

@@ -105,14 +105,18 @@
 					if(tempgang != gang)
 						tempgang.message_gangtools("WARNING: [gang.name] Gang takeover imminent. Their dominator at [domloc.map_name] must be destroyed!",1,1)
 		else
-			Cinematic(CINEMATIC_MALF,world) //Here is the gang victory trigger on the dominator ending.
-			gang.winner = TRUE
-			SSticker.news_report = GANG_VICTORY
-			SSticker.force_ending = TRUE
+			endgame()
 
 	if(!.)
 		STOP_PROCESSING(SSmachines, src)
 
+/obj/machinery/dominator/proc/endgame()
+	set waitfor = FALSE
+	Cinematic(CINEMATIC_MALF,world) //Here is the gang victory trigger on the dominator ending.
+	gang.winner = TRUE
+	SSticker.news_report = GANG_VICTORY
+	SSticker.force_ending = TRUE
+
 /obj/machinery/dominator/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
 	switch(damage_type)
 		if(BRUTE)

code/game/gamemodes/objective_items.dm

@@ -130,7 +130,7 @@
 /datum/objective_item/steal/plasma/check_special_completion(obj/item/tank/T)
 	var/target_amount = text2num(name)
 	var/found_amount = 0
-	found_amount += T.air_contents.get_moles(/datum/gas/plasma)
+	found_amount += T.air_contents.get_moles(GAS_PLASMA)
 	return found_amount>=target_amount