Refactors screen objects to /atom/movable (#24068)

* introduce helper + remove unused proc * we love compatibility * Update code/_onclick/hud/action_button.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/action_button.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/alert.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/blob_overmind.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/blob_overmind.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/blob_overmind.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/martial_arts/martial.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/mining/lavaland/loot/tendril_loot.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/species/shadow.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/mob/living/carbon/human/species/shadow.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/mob/living/living_update_status.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/screen_objects.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/screen_objects.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/_onclick/hud/screen_objects.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/internal.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/machinery/computer/camera_advanced.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/machinery/computer/camera_advanced.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/internal.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/game/mecha/mecha.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * deconflict --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2026-08-22 11:37:40 +01:00 · 2024-03-03 17:37:51 +00:00
parent cc433a3794
commit 87a318a7de
125 changed files with 1036 additions and 1047 deletions
@@ -1,4 +1,4 @@
-/obj/screen/text/blurb
+/atom/movable/screen/text/blurb
 	maptext_height = 64
 	maptext_width = 512
 	screen_loc = "LEFT+1,BOTTOM+2"
@@ -33,7 +33,7 @@
 	var/background_a = 0


-/obj/screen/text/blurb/proc/show_to(list/client/viewers)
+/atom/movable/screen/text/blurb/proc/show_to(list/client/viewers)
 	if(!blurb_text || !viewers)
 		return

@@ -52,12 +52,12 @@
 	print_text()

 	if(hold_for)
-		addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, hide_from), viewers), hold_for)
+		addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable/screen/text/blurb, hide_from), viewers), hold_for)
 	else
 		hide_from(viewers)


-/obj/screen/text/blurb/proc/get_text_style()
+/atom/movable/screen/text/blurb/proc/get_text_style()
 	PRIVATE_PROC(TRUE)

 	return {"\
@@ -69,25 +69,25 @@
 		color: [text_color];
 	"}

-/obj/screen/text/blurb/proc/hide_from(list/client/viewers)
+/atom/movable/screen/text/blurb/proc/hide_from(list/client/viewers)
 	PRIVATE_PROC(TRUE)

 	fade()
-	addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, remove_from_viewers), viewers), fade_animation_duration)
+	addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable/screen/text/blurb, remove_from_viewers), viewers), fade_animation_duration)

-/obj/screen/text/blurb/proc/appear()
+/atom/movable/screen/text/blurb/proc/appear()
 	PRIVATE_PROC(TRUE)

 	animate(src, alpha = 255, time = appear_animation_duration)


-/obj/screen/text/blurb/proc/fade()
+/atom/movable/screen/text/blurb/proc/fade()
 	PRIVATE_PROC(TRUE)

 	animate(src, alpha = 0, time = fade_animation_duration)


-/obj/screen/text/blurb/proc/print_text()
+/atom/movable/screen/text/blurb/proc/print_text()
 	PRIVATE_PROC(TRUE)

 	var/text_style = get_text_style()
@@ -97,10 +97,10 @@
 		maptext += get_formatted_text_segment(text_style, segment_start, segment_end)
 		sleep(interval)

-/obj/screen/text/blurb/proc/get_formatted_text_segment(style, segment_start, segment_end)
+/atom/movable/screen/text/blurb/proc/get_formatted_text_segment(style, segment_start, segment_end)
 	return "<span style=\"[style]\">[copytext_char(blurb_text, segment_start, segment_end)]</span>"

-/obj/screen/text/blurb/proc/remove_from_viewers(list/client/viewers)
+/atom/movable/screen/text/blurb/proc/remove_from_viewers(list/client/viewers)
 	PRIVATE_PROC(TRUE)

 	for(var/client/viewer as anything in viewers)
@@ -116,7 +116,7 @@
 		return
 	SEND_SOUND(show_blurb_to, sound('sound/machines/typewriter.ogg'))

-	var/obj/screen/text/blurb/location_blurb = new()
+	var/atom/movable/screen/text/blurb/location_blurb = new()
 	if(antag_check.antag_datums)
 		for(var/datum/antagonist/role)
 			if(role.custom_blurb())
@@ -146,7 +146,7 @@
 	if(!length(GLOB.clients))
 		return

-	var/obj/screen/text/blurb/server_restart_blurb = new()
+	var/atom/movable/screen/text/blurb/server_restart_blurb = new()
 	server_restart_blurb.text_color = COLOR_RED
 	server_restart_blurb.blurb_text = "Round is restarting...\n[reason]"
 	server_restart_blurb.hold_for = 90 SECONDS
@@ -45,7 +45,7 @@
 			html_tags += list(html_tag, html_tag + 1, html_tag + 2, html_tag + 3)
 			html_tag = findtext(message, regex("</.>"), html_tag + 3)

-	var/obj/screen/text/T = new()
+	var/atom/movable/screen/text/T = new()
 	T.screen_loc = screen_position
 	switch(text_alignment)
 		if("center")