Merge pull request #9453 from Ghommie/Ghommie-cit226

Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
parent c56a303d50 4c1eba0d81
commit af0962088c
20 changed files with 124 additions and 52 deletions
@@ -408,7 +408,7 @@

 	// Ghost and delete the mob.
 	if(!mob_occupant.get_ghost(1))
-		mob_occupant.ghostize(0) // Players who cryo out may not re-enter the round
+		mob_occupant.ghostize(FALSE, penalize = TRUE)

 	QDEL_NULL(occupant)
 	open_machine()