woo

code/game/gamemodes/cult/runes.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm	(rejected hunks)
-@@ -520,7 +520,7 @@ var/list/teleport_runes = list()
- 
- //Rite of Resurrection: Requires the corpse of a cultist and that there have been less revives than the number of people sacrificed
- /obj/effect/rune/raise_dead
--	cultist_name = "Raise Dead"
-+	cultist_name = "Resurrect Cultist"
- 	cultist_desc = "requires the corpse of a cultist placed upon the rune. Provided there have been sufficient sacrifices, they will be revived."
- 	invocation = null //Depends on the name of the user - see below
- 	icon_state = "1"

code/game/gamemodes/game_mode.dm.rej

@@ -1,18 +0,0 @@
-diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm	(rejected hunks)
-@@ -81,12 +81,12 @@
- 	spawn (ROUNDSTART_LOGOUT_REPORT_TIME)
- 		display_roundstart_logout_report()
- 
--	feedback_set_details("round_start","[time2text(world.realtime)]")
-+	SSblackbox.set_details("round_start","[time2text(world.realtime)]")
- 	if(SSticker && SSticker.mode)
--		feedback_set_details("game_mode","[SSticker.mode]")
-+		SSblackbox.set_details("game_mode","[SSticker.mode]")
- 	if(GLOB.revdata.commit)
--		feedback_set_details("revision","[GLOB.revdata.commit]")
--	feedback_set_details("server_ip","[world.internet_address]:[world.port]")
-+		SSblackbox.set_details("revision","[GLOB.revdata.commit]")
-+	SSblackbox.set_details("server_ip","[world.internet_address]:[world.port]")
- 	if(report)
- 		spawn (rand(waittime_l, waittime_h))
- 			send_intercept(0)