Merge pull request #5195 from Citadel-Station-13/upstream-merge-35064

[MIRROR] Fixes blood contract names
2018-01-30 23:16:41 -06:00
parent bc5e3917a5 e5b34c80e2
commit d49a578463
1 changed files with 12 additions and 1 deletions
@@ -910,7 +910,18 @@
 	if(used)
 		return
 	used = TRUE
-	var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in GLOB.player_list
+	
+	var/list/da_list = list()
+	for(var/I in GLOB.alive_mob_list & GLOB.player_list)
+		var/mob/living/L = I
+		da_list[L.real_name] = L
+		
+	var/choice = input(user,"Who do you want dead?","Choose Your Victim") as null|anything in da_list
+	
+	choice = da_list[choice]
+	
+	if(!choice)
+		return

 	if(!(isliving(choice)))
 		to_chat(user, "[choice] is already dead!")