From a0f815c5c4a179a98294a8ec1bb01faf8e78c305 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Thu, 18 Jan 2018 23:38:15 -0200
Subject: [PATCH] Revert "Fix config_dir usage (#34469)"

---
 code/_onclick/hud/credits.dm          | 72 +++++++++++++++++++++++++++
 code/controllers/subsystem/ticker.dm  |  3 ++
 code/controllers/subsystem/title.dm   |  4 ++
 code/game/objects/items/AI_modules.dm |  5 ++
 4 files changed, 84 insertions(+)

diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm
index dfdbf390c1..6a13a2cddb 100644
--- a/code/_onclick/hud/credits.dm
+++ b/code/_onclick/hud/credits.dm
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #define CREDIT_ROLL_SPEED 125
 #define CREDIT_SPAWN_SPEED 10
 #define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size)
@@ -67,3 +68,74 @@
 
 /obj/screen/credit/proc/FadeOut()
 	animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
+=======
+#define CREDIT_ROLL_SPEED 125
+#define CREDIT_SPAWN_SPEED 10
+#define CREDIT_ANIMATE_HEIGHT (14 * world.icon_size)
+#define CREDIT_EASE_DURATION 22
+#define CREDITS_PATH "[GLOB.config_dir]contributors.dmi"
+
+/client/proc/RollCredits()
+	set waitfor = FALSE
+	if(!fexists(CREDITS_PATH))
+		return
+	var/icon/credits_icon = new(CREDITS_PATH)
+	LAZYINITLIST(credits)
+	var/list/_credits = credits
+	verbs += /client/proc/ClearCredits
+	var/static/list/credit_order_for_this_round
+	if(isnull(credit_order_for_this_round))
+		credit_order_for_this_round = list("Thanks for playing!") + (shuffle(icon_states(credits_icon)) - "Thanks for playing!")
+	for(var/I in credit_order_for_this_round)
+		if(!credits)
+			return
+		_credits += new /obj/screen/credit(null, I, src, credits_icon)
+		sleep(CREDIT_SPAWN_SPEED)
+	sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED)
+	verbs -= /client/proc/ClearCredits
+	qdel(credits_icon)
+
+/client/proc/ClearCredits()
+	set name = "Hide Credits"
+	set category = "OOC"
+	verbs -= /client/proc/ClearCredits
+	QDEL_LIST(credits)
+	credits = null
+
+/obj/screen/credit
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	alpha = 0
+	screen_loc = "12,1"
+	layer = SPLASHSCREEN_LAYER
+	var/client/parent
+	var/matrix/target
+
+/obj/screen/credit/Initialize(mapload, credited, client/P, icon/I)
+	. = ..()
+	icon = I
+	parent = P
+	icon_state = credited
+	maptext = credited
+	maptext_x = world.icon_size + 8
+	maptext_y = (world.icon_size / 2) - 4
+	maptext_width = world.icon_size * 3
+	var/matrix/M = matrix(transform)
+	M.Translate(0, CREDIT_ANIMATE_HEIGHT)
+	animate(src, transform = M, time = CREDIT_ROLL_SPEED)
+	target = M
+	animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL)
+	addtimer(CALLBACK(src, .proc/FadeOut), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
+	QDEL_IN(src, CREDIT_ROLL_SPEED)
+	P.screen += src
+
+/obj/screen/credit/Destroy()
+	var/client/P = parent
+	P.screen -= src
+	icon = null
+	LAZYREMOVE(P.credits, src)
+	parent = null
+	return ..()
+
+/obj/screen/credit/proc/FadeOut()
+	animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
+>>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index df6ac28247..69f168cdac 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -126,7 +126,10 @@ 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)
diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index 4cdde58d33..b8c6d9a2a0 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -35,7 +35,11 @@ SUBSYSTEM_DEF(title)
 		
 	if(length(title_screens))
 		file_path = "config/title_screens/images/[pick(title_screens)]"
+<<<<<<< HEAD
 	
+=======
+
+>>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
 	if(!file_path)
 		file_path = "icons/default_title.dmi"
 	
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index 19aead8baf..9ae52842b1 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -398,8 +398,13 @@ AI MODULES
 /obj/item/aiModule/core/full/custom
 	name = "Default Core AI Module"
 
+<<<<<<< HEAD
 /obj/item/aiModule/core/full/custom/New()
 	..()
+=======
+/obj/item/aiModule/core/full/custom/Initialize()
+	. = ..()
+>>>>>>> 1bc398c... Merge pull request #34603 from optimumtact/pigfuck
 	for(var/line in world.file2list("config/silicon_laws.txt"))
 		if(!line)
 			continue