Merge pull request #1732 from Citadel-Station-13/olawd

removes 'oof'
2017-06-22 09:09:45 -05:00
parent 19dba1751c 20486e0184
commit 9cdda1cb9e
1 changed files with 3 additions and 4 deletions
@@ -95,7 +95,6 @@
 		message_simple = S.deathmessage
 	. = ..()
 	message_simple = initial(message_simple)
-	playsound(user.loc, 'sound/voice/oof.ogg', 80, 1, 1)//Defenitley not copypasta
 	if(. && isalienadult(user))
 		playsound(user.loc, 'sound/voice/hiss6.ogg', 80, 1, 1)

@@ -421,9 +420,9 @@
 	message = null
 	emote_type = EMOTE_VISIBLE

-/datum/emote/living/custom/replace_pronoun(mob/user, message)
-	return message
-
+/datum/emote/living/custom/replace_pronoun(mob/user, message)
+	return message
+
 /datum/emote/living/help
 	key = "help"