Round End Credits

code/__DEFINES/subsystems.dm

@@ -187,6 +187,7 @@
 #define INIT_ORDER_MINOR_MAPPING -40
 #define INIT_ORDER_PATH -50
 #define INIT_ORDER_EXPLOSIONS -69
+#define INIT_ORDER_CREDITS -93
 #define INIT_ORDER_STATPANELS -97
 #define INIT_ORDER_BAN_CACHE -98
 #define INIT_ORDER_INIT_PROFILER -99 //Near the end, logs the costs of initialize

code/__HELPERS/roundend.dm

@@ -1,6 +1,9 @@
 #define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend
 #define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped
+#define POPCOUNT_ESCAPEES_HUMANONLY "human_escapees"
+#define POPCOUNT_ESCAPEES_HUMANONLY_LIST "human_escapees_list"
 #define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only.
+#define POPCOUNT_STATION_INTEGRITY "station_integrity"
 #define PERSONAL_LAST_ROUND "personal last round"
 #define SERVER_LAST_ROUND "server last round"
 
@@ -14,7 +17,9 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 	var/list/file_data = list("escapees" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "abandoned" = list("humans" = list(), "silicons" = list(), "others" = list(), "npcs" = list()), "ghosts" = list(), "additional data" = list())
 	var/num_survivors = 0 //Count of non-brain non-eye mobs with mind that are alive
 	var/num_escapees = 0 //Above and on centcom z
-	var/num_shuttle_escapees = 0 //Above and on escape shuttle
+	var/num_human_escapees = 0 //Above but humans only
+	var/num_shuttle_escapees = 0 //Above's above and on escape shuttle
+	var/list/list_of_human_escapees = list() //References to all escaped humans
 	var/list/area/shuttle_areas
 	if(SSshuttle?.emergency)
 		shuttle_areas = SSshuttle.emergency.shuttle_areas
@@ -39,6 +44,9 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 					escape_status = "escapees"
 					if(shuttle_areas[get_area(M)])
 						num_shuttle_escapees++
+						if(ishuman(M))
+							num_human_escapees++
+							list_of_human_escapees += M
 			if(isliving(M))
 				var/mob/living/L = M
 				mob_data["location"] = get_area(L)
@@ -91,8 +99,8 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 
 	var/datum/station_state/end_state = new /datum/station_state()
 	end_state.count()
-	var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
-	file_data["additional data"]["station integrity"] = station_integrity
+	var/roundend_station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
+	file_data["additional data"]["station integrity"] = roundend_station_integrity
 	WRITE_FILE(json_file, json_encode(file_data))
 
 	SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total"))
@@ -102,8 +110,10 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 	. = list()
 	.[POPCOUNT_SURVIVORS] = num_survivors
 	.[POPCOUNT_ESCAPEES] = num_escapees
+	.[POPCOUNT_ESCAPEES_HUMANONLY] = num_human_escapees
 	.[POPCOUNT_SHUTTLE_ESCAPEES] = num_shuttle_escapees
-	.["station_integrity"] = station_integrity
+	.[POPCOUNT_ESCAPEES_HUMANONLY_LIST] = list_of_human_escapees
+	.[POPCOUNT_STATION_INTEGRITY] = roundend_station_integrity
 
 /datum/controller/subsystem/ticker/proc/gather_antag_data()
 	var/team_gid = 1
@@ -220,6 +230,9 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 	LAZYCLEARLIST(round_end_events)
 
 	var/speed_round = (STATION_TIME_PASSED() <= 10 MINUTES)
+	popcount = gather_roundend_feedback()
+	SScredits.draft()
+	SScredits.finalize()
 
 	for(var/client/C in GLOB.clients)
 		if(!C?.credits)
@@ -229,7 +242,6 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
 			C?.give_award(/datum/award/achievement/misc/speed_round, C?.mob)
 		HandleRandomHardcoreScore(C)
 
-	var/popcount = gather_roundend_feedback()
 	display_report(popcount)
 
 	CHECK_TICK

code/_onclick/hud/credits.dm

@@ -1,28 +1,38 @@
-#define CREDIT_ROLL_SPEED 125
-#define CREDIT_SPAWN_SPEED 10
-#define CREDIT_ANIMATE_HEIGHT (14 * ICON_SIZE_Y)
-#define CREDIT_EASE_DURATION 22
-#define CREDITS_PATH "[global.config.directory]/contributors.dmi"
+#define CREDIT_ROLL_SPEED 9 SECONDS
+#define CREDIT_SPAWN_SPEED 1 SECONDS
+#define CREDIT_ANIMATE_HEIGHT (16 * world.icon_size)
+#define CREDIT_EASE_DURATION 2.2 SECONDS
 
 /client/proc/RollCredits()
 	set waitfor = FALSE
-	if(!fexists(CREDITS_PATH))
+	if(!prefs?.read_preference(/datum/preference/toggle/show_roundend_credits))
 		return
-	var/icon/credits_icon = new(CREDITS_PATH)
 	LAZYINITLIST(credits)
 	var/list/_credits = credits
 	add_verb(src, /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!")
+	var/list/credit_order_for_this_round = SScredits.credit_order_for_this_round
+
+	var/count = 0
 	for(var/I in credit_order_for_this_round)
 		if(!credits)
 			return
-		_credits += new /atom/movable/screen/credit(null, null, I, src, credits_icon)
-		sleep(CREDIT_SPAWN_SPEED)
+		if(istype(I, /obj/effect/title_card_object)) //huge image sleep
+			sleep(CREDIT_SPAWN_SPEED * 3.3)
+			count = 0
+		if(count && !istype(I, /atom/movable/screen/map_view/char_preview))
+			sleep(CREDIT_SPAWN_SPEED)
+
+		_credits += new /atom/movable/screen/credit(null, null, I, src)
+		if(istype(I, /atom/movable/screen/map_view/char_preview))
+			count++
+			if(count >= 6)
+				count = 0
+				sleep(CREDIT_SPAWN_SPEED)
+		if(!istype(I, /atom/movable/screen/map_view/char_preview))
+			sleep(CREDIT_SPAWN_SPEED)
+			count = 0
 	sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED)
 	remove_verb(src, /client/proc/ClearCredits)
-	qdel(credits_icon)
 
 /client/proc/ClearCredits()
 	set name = "Hide Credits"
@@ -34,32 +44,67 @@
 /atom/movable/screen/credit
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	alpha = 0
-	screen_loc = "12,1"
 	plane = SPLASHSCREEN_PLANE
+	screen_loc = "3,1"
 	var/client/parent
 	var/matrix/target
 
-/atom/movable/screen/credit/Initialize(mapload, datum/hud/hud_owner, credited, client/P, icon/I)
+/atom/movable/screen/credit/Initialize(mapload, datum/hud/hud_owner, credited, client/P)
 	. = ..()
-	icon = I
 	parent = P
-	icon_state = credited
-	maptext = MAPTEXT_PIXELLARI(credited)
-	maptext_x = ICON_SIZE_X + 8
-	maptext_y = (ICON_SIZE_Y / 2) - 4
-	maptext_width = ICON_SIZE_X * 3
+	var/view = P?.view
+	var/list/offsets = screen_loc_to_offset("3,1", view)
+
+	if(istype(credited, /atom/movable/screen/map_view/char_preview))
+		var/atom/movable/screen/map_view/char_preview/choice = credited
+		choice.plane = plane
+		choice.screen_loc = screen_loc
+		choice.alpha = alpha
+		maptext_width = choice.maptext_width
+		maptext = choice.maptext
+		appearance = choice.appearance
+		screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
+		add_overlay(choice)
+
+	if(istype(credited, /mutable_appearance))
+		var/mutable_appearance/choice = credited
+		choice.plane = plane
+		choice.screen_loc = screen_loc
+		choice.alpha = alpha
+		maptext_width = choice.maptext_width
+		maptext = choice.maptext
+		appearance = choice.appearance
+		screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
+		add_overlay(choice)
+
+	if(istype(credited, /obj/effect/title_card_object))
+		var/obj/effect/title_card_object/choice = credited
+		choice.plane = plane
+		choice.screen_loc = screen_loc
+		choice.alpha = alpha
+		maptext_width = choice.maptext_width
+		maptext = choice.maptext
+		appearance = choice.appearance
+		screen_loc = offset_to_screen_loc(offsets[1] + choice.pixel_x, offsets[2] + choice.pixel_y)
+		add_overlay(choice)
+
+	if(istext(credited))
+		maptext = MAPTEXT_PIXELLARI(credited)
+		maptext_x = world.icon_size + 8
+		maptext_y = (world.icon_size / 2) - 4
+		maptext_width = world.icon_size * 12
+		maptext_height = 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_REF(FadeOut)), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION)
 	QDEL_IN(src, CREDIT_ROLL_SPEED)
-	if(parent)
-		parent.screen += src
+	parent?.screen += src
 
 /atom/movable/screen/credit/Destroy()
-	icon = null
 	if(parent)
 		parent.screen -= src
 		LAZYREMOVE(parent.credits, src)
@@ -73,4 +118,3 @@
 #undef CREDIT_EASE_DURATION
 #undef CREDIT_ROLL_SPEED
 #undef CREDIT_SPAWN_SPEED
-#undef CREDITS_PATH