merge conflict fix

This commit is contained in:
Firecage
2015-05-31 02:45:46 +02:00
153 changed files with 4309 additions and 4255 deletions
@@ -331,7 +331,6 @@ var/const/SIGNAL_COOLDOWN = 20 // 2 seconds
var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null)
virt.name = source
virt.job = job
virt.faketrack = 1
virt.languages = HUMAN
//END SAY REWRITE RELATED CODE.