something something merge conflicts

This commit is contained in:
Aurorablade
2016-10-24 22:30:02 -04:00
parent 78eb685ac6
commit 306520660d
+1 -4
View File
@@ -79,10 +79,7 @@ proc/get_radio_key_from_channel(var/channel)
message = stutter(message)
verb = "stammers"
speech_problem_flag = 1
if(cultslurring)
message = cultslur(message)
verb = "slurs"
speech_problem_flag = 1
if(COMIC in mutations)
message = "<span class='sans'>[message]</span>"