Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-01-19 23:12:17 -07:00
parent fce8e18ccc 0f4f07dc95
commit 89e204b980
20 changed files with 167 additions and 126 deletions
@@ -178,7 +178,7 @@
 		if(!C.credits)
 			C.RollCredits()
 		C.playtitlemusic(40)
-
+	CONFIG_SET(flag/suicide_allowed,TRUE) // EORG suicides allowed
 	var/popcount = gather_roundend_feedback()
 	display_report(popcount)