mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 00:53:23 +01:00
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>
This commit is contained in:
Contrabang
@@ -44,7 +44,7 @@ SUBSYSTEM_DEF(debugview)
|
||||
C.debug_text_overlay.maptext = "<span class='maptext' style='background-color: #272727;'>[out_text]</span>"
|
||||
|
||||
/datum/controller/subsystem/debugview/proc/start_processing(client/C)
|
||||
C.debug_text_overlay = new /obj/screen/debugtextholder(null, C)
|
||||
C.debug_text_overlay = new /atom/movable/screen/debugtextholder(null, C)
|
||||
C.screen |= C.debug_text_overlay
|
||||
processing |= C
|
||||
|
||||
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(debugview)
|
||||
C.screen -= C.debug_text_overlay
|
||||
QDEL_NULL(C.debug_text_overlay)
|
||||
|
||||
/obj/screen/debugtextholder
|
||||
/atom/movable/screen/debugtextholder
|
||||
icon = 'icons/mob/screen_full.dmi'
|
||||
icon_state = "empty"
|
||||
screen_loc = "TOP,LEFT"
|
||||
@@ -61,11 +61,11 @@ SUBSYSTEM_DEF(debugview)
|
||||
maptext_height = 480 // 15 * 32 (15 tiles, 32 pixels each)
|
||||
maptext_width = 480 // changes with prefs
|
||||
|
||||
/obj/screen/debugtextholder/Initialize(mapload, client/C)
|
||||
/atom/movable/screen/debugtextholder/Initialize(mapload, client/C)
|
||||
. = ..()
|
||||
update_view(C)
|
||||
|
||||
/obj/screen/debugtextholder/proc/update_view(client/C)
|
||||
/atom/movable/screen/debugtextholder/proc/update_view(client/C)
|
||||
var/list/viewsizes = getviewsize(C.view)
|
||||
maptext_width = viewsizes[1] * world.icon_size
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ SUBSYSTEM_DEF(ghost_spawns)
|
||||
|
||||
// If we somehow send two polls for the same mob type, but with a duration on the second one shorter than the time left on the first one,
|
||||
// we need to keep the first one's timeout rather than use the shorter one
|
||||
var/obj/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category)
|
||||
var/atom/movable/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category)
|
||||
var/alert_time = poll_time
|
||||
var/alert_poll = P
|
||||
if(current_alert && current_alert.timeout > (world.time + poll_time - world.tick_lag))
|
||||
@@ -78,7 +78,7 @@ SUBSYSTEM_DEF(ghost_spawns)
|
||||
alert_poll = current_alert.poll
|
||||
|
||||
// Send them an on-screen alert
|
||||
var/obj/screen/alert/notify_action/A = M.throw_alert(category, /obj/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE)
|
||||
var/atom/movable/screen/alert/notify_action/A = M.throw_alert(category, /atom/movable/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE)
|
||||
if(!A)
|
||||
continue
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(parallax)
|
||||
/datum/controller/subsystem/parallax/PreInit()
|
||||
. = ..()
|
||||
if(prob(70)) //70% chance to pick a special extra layer
|
||||
random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids)
|
||||
random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
|
||||
random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE) //Special color for random_layer1. Has to be done here so everyone sees the same color.
|
||||
planet_y_offset = rand(100, 160)
|
||||
planet_x_offset = rand(100, 160)
|
||||
|
||||
@@ -54,7 +54,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
/// Holder for inital autotransfer vote timer
|
||||
var/next_autotransfer = 0
|
||||
/// Used for station explosion cinematic
|
||||
var/obj/screen/cinematic = null
|
||||
var/atom/movable/screen/cinematic = null
|
||||
/// Spam Prevention. Announce round end only once.
|
||||
var/round_end_announced = FALSE
|
||||
/// Is the ticker currently processing? If FALSE, roundstart is delayed
|
||||
@@ -364,7 +364,7 @@ SUBSYSTEM_DEF(ticker)
|
||||
|
||||
auto_toggle_ooc(TRUE) // Turn it on
|
||||
//initialise our cinematic screen object
|
||||
cinematic = new /obj/screen(src)
|
||||
cinematic = new /atom/movable/screen(src)
|
||||
cinematic.icon = 'icons/effects/station_explosion.dmi'
|
||||
cinematic.icon_state = "station_intact"
|
||||
cinematic.layer = 21
|
||||
|
||||
Reference in New Issue
Block a user