From 7b5b354e9dd4c0d7c3de7c18e3ff67ddbf7e7026 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 19 Jan 2018 08:47:49 -0500 Subject: [PATCH] Update ticker.dm --- code/controllers/subsystem/ticker.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 69f168cdac..1d4316f2b2 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -126,10 +126,6 @@ SUBSYSTEM_DEF(ticker) login_music = pick(music) else login_music = "config/title_music/sounds/[pick(music)]" -<<<<<<< HEAD - -======= ->>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck crewobjlist = typesof(/datum/objective/crew) miscreantobjlist = (typesof(/datum/objective/miscreant) - /datum/objective/miscreant)