Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING

2017-11-20 00:21:38 -05:00
parent 226c420f39 fd094bfd19
commit c2864b3b8b
1218 changed files with 80559 additions and 76738 deletions
@@ -83,7 +83,7 @@
 /datum/game_mode/traitor/proc/add_latejoin_traitor(datum/mind/character)
 	var/datum/antagonist/traitor/new_antag = new antag_datum(character)
 	new_antag.should_specialise = TRUE
-	character.add_antag_datum(antag_datum)
+	character.add_antag_datum(new_antag)



@@ -144,6 +144,7 @@
 			else
 				text += "<br><font color='red'><B>The [special_role_text] has failed!</B></font>"
 				SSblackbox.add_details("traitor_success","FAIL")
+				SEND_SOUND(traitor.current, 'sound/ambience/ambifailure.ogg')

 			text += "<br>"