syncs defines

code/_onclick/hud/_defines.dm

@@ -104,7 +104,7 @@
 #define ui_health "EAST-1:28,CENTER-1:15"
 #define ui_internal "EAST-1:28,CENTER:17"
 
-//borgs 
+//borgs
 #define ui_borg_health "EAST-1:28,CENTER-1:15"		//borgs have the health display where humans have the pressure damage indicator.
 
 //aliens

code/_onclick/hud/credits.dm

@@ -0,0 +1,69 @@
+#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)

code/_onclick/hud/fullscreen.dm

@@ -1,3 +1,4 @@
+
 /mob
 	var/list/screens = list()
 
@@ -174,4 +175,3 @@
 	layer = LIGHTING_LAYER
 	blend_mode = BLEND_ADD
 	show_when_dead = TRUE
-	

code/_onclick/hud/human.dm

@@ -280,10 +280,11 @@
 	healths = new /obj/screen/healths()
 	infodisplay += healths
 
-	//citadel code
+	//CIT CHANGE - adds arousal to hud
 	arousal = new /obj/screen/arousal()
 	arousal.icon_state = (owner.canbearoused == 1 ? "arousal0" : "")
 	infodisplay += arousal
+	//END OF CIT CHANGES
 
 	healthdoll = new /obj/screen/healthdoll()
 	infodisplay += healthdoll

code/_onclick/hud/parallax.dm

@@ -60,8 +60,6 @@
 		var/pref = C.prefs.parallax
 		if (isnull(pref))
 			pref = PARALLAX_HIGH
-			if (C.byond_version < 511)
-				pref = PARALLAX_DISABLE
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
 				C.parallax_throttle = FALSE

code/_onclick/item_attack.dm

@@ -58,7 +58,7 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-    
+
 	if(force && user.has_disability(DISABILITY_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return

code/_onclick/telekinesis.dm

@@ -78,7 +78,7 @@
 	var/mob/living/carbon/tk_user = null
 
 /obj/item/tk_grab/Initialize()
-	..()
+	. = ..()
 	START_PROCESSING(SSfastprocess, src)
 
 /obj/item/tk_grab/Destroy()