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

2020-06-30 02:30:29 +03:00
parent d7e30f9ae5 3c4a288ecc
commit 20245f7319
243 changed files with 3206 additions and 2152 deletions
@@ -412,6 +412,8 @@
 			give_guns(humanc)
 		if(GLOB.summon_magic_triggered)
 			give_magic(humanc)
+		if(GLOB.curse_of_madness_triggered)
+			give_madness(humanc, GLOB.curse_of_madness_triggered)

 	GLOB.joined_player_list += character.ckey
 	GLOB.latejoiners += character