Merge pull request #4728 from Citadel-Station-13/upstream-merge-33933

[MIRROR] Late joiners also get summoned guns/magic
2018-01-10 19:50:33 +00:00
parent 5597c55064 e42a819000
commit 7c576c7d32
9 changed files with 209 additions and 220 deletions
@@ -362,6 +362,11 @@
 			if(CONFIG_GET(flag/allow_crew_objectives))
 				SSticker.generate_individual_objectives(humanc.mind)

+		if(GLOB.summon_guns_triggered)
+			give_guns(humanc)
+		if(GLOB.summon_magic_triggered)
+			give_magic(humanc)
+
 	GLOB.joined_player_list += character.ckey
 	GLOB.latejoiners += character