From 1da290d14dca0570b8fbbd4a8804062eebb5d6bf Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Mon, 15 Sep 2014 14:22:33 +0930
Subject: [PATCH] Fix for cyborgs becoming lings in calamity mode.

---
 code/game/gamemodes/calamity/calamity.dm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm
index 63f3e9008a5..e179bda6c6b 100644
--- a/code/game/gamemodes/calamity/calamity.dm
+++ b/code/game/gamemodes/calamity/calamity.dm
@@ -198,7 +198,18 @@
 		if("syndi")
 			possible_antags = get_players_for_role(BE_OPERATIVE)
 		if("ling")
+
 			possible_antags = get_players_for_role(BE_CHANGELING)
+
+			var/list/unsuitable_players = list()
+
+			for(var/datum/mind/player in possible_antags)
+				if(player && (player.assigned_role == "Cyborg" || player.assigned_role == "AI"))
+					unsuitable_players |= player
+
+			if(unsuitable_players.len)
+				possible_antags -= unsuitable_players
+
 		if("tater")
 			possible_antags = get_players_for_role(BE_TRAITOR)
 		if("wiz")