diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index cce6b4fc41e..144f3221b9c 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -105,7 +105,7 @@
// Same as above but for alien candidates.
/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480)
- if(!isobj(O)) O = new /obj/screen/text()
+ if(!isobj(O)) O = new /atom/movable/screen/text()
O.maptext = maptext
O.maptext_height = maptext_height
O.maptext_width = maptext_width
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 5eb8be64a77..82abbd77408 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -383,14 +383,14 @@
var/global/list/click_catchers
-/obj/screen/click_catcher
+/atom/movable/screen/click_catcher
icon = 'icons/mob/screen_gen.dmi'
icon_state = "click_catcher"
plane = CLICKCATCHER_PLANE
mouse_opacity = MOUSE_OPACITY_OPAQUE
screen_loc = "CENTER-7,CENTER-7"
-/obj/screen/click_catcher/Destroy()
+/atom/movable/screen/click_catcher/Destroy()
SHOULD_CALL_PARENT(FALSE)
return QDEL_HINT_LETMELIVE
@@ -398,11 +398,11 @@ var/global/list/click_catchers
. = list()
for(var/i = 0, i<15, i++)
for(var/j = 0, j<15, j++)
- var/obj/screen/click_catcher/CC = new()
+ var/atom/movable/screen/click_catcher/CC = new()
CC.screen_loc = "NORTH-[i],EAST-[j]"
. += CC
-/obj/screen/click_catcher/Click(location, control, params)
+/atom/movable/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
if(modifiers["middle"] && istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm
index 9f458f0b8c2..e55deb79ff0 100644
--- a/code/_onclick/hud/ability_screen_objects.dm
+++ b/code/_onclick/hud/ability_screen_objects.dm
@@ -1,8 +1,8 @@
-/obj/screen/movable/ability_master
+/atom/movable/screen/movable/ability_master
name = "Abilities"
icon = 'icons/mob/screen_spells.dmi'
icon_state = "grey_spell_ready"
- var/list/obj/screen/ability/ability_objects = list()
+ var/list/atom/movable/screen/ability/ability_objects = list()
var/showing = FALSE // If we're 'open' or not.
var/open_state = "master_open" // What the button looks like when it's 'open', showing the other buttons.
@@ -12,13 +12,13 @@
var/mob/my_mob // The mob that possesses this hud object.
-/obj/screen/movable/ability_master/Initialize(mapload, owner)
+/atom/movable/screen/movable/ability_master/Initialize(mapload, owner)
. = ..()
if(owner)
my_mob = owner
update_abilities(0, owner)
-/obj/screen/movable/ability_master/Destroy()
+/atom/movable/screen/movable/ability_master/Destroy()
//Get rid of the ability objects.
remove_all_abilities()
ability_objects.Cut()
@@ -32,21 +32,21 @@
. = ..()
-/obj/screen/movable/ability_master/MouseDrop()
+/atom/movable/screen/movable/ability_master/MouseDrop()
if(showing)
return
return ..()
-/obj/screen/movable/ability_master/Click()
+/atom/movable/screen/movable/ability_master/Click()
if(!ability_objects.len) // If we're empty for some reason.
return
toggle_open()
-/obj/screen/movable/ability_master/proc/toggle_open(var/forced_state = 0, var/mob/user = usr)
+/atom/movable/screen/movable/ability_master/proc/toggle_open(var/forced_state = 0, var/mob/user = usr)
if(showing && (forced_state != 2)) // We are closing the ability master, hide the abilities.
- for(var/obj/screen/ability/O in ability_objects)
+ for(var/atom/movable/screen/ability/O in ability_objects)
if(my_mob && my_mob.client)
my_mob.client.screen -= O
showing = FALSE
@@ -60,7 +60,7 @@
overlays.Add(open_state)
update_icon()
-/obj/screen/movable/ability_master/proc/open_ability_master(var/mob/user = usr)
+/atom/movable/screen/movable/ability_master/proc/open_ability_master(var/mob/user = usr)
var/list/screen_loc_xy = splittext(screen_loc,",")
//Create list of X offsets
@@ -74,36 +74,36 @@
var/y_pix = screen_loc_Y[2]
for(var/i = 1; i <= ability_objects.len; i++)
- var/obj/screen/ability/A = ability_objects[i]
+ var/atom/movable/screen/ability/A = ability_objects[i]
var/xpos = x_position + (x_position < 8 ? 1 : -1)*(i%7)
var/ypos = y_position + (y_position < 8 ? round(i/7) : -round(i/7))
A.screen_loc = "[encode_screen_X(xpos, user)]:[x_pix],[encode_screen_Y(ypos, user)]:[y_pix]"
if(my_mob && my_mob.client)
my_mob.client.screen += A
-/obj/screen/movable/ability_master/proc/update_abilities(forced = 0, mob/user)
+/atom/movable/screen/movable/ability_master/proc/update_abilities(forced = 0, mob/user)
update_icon()
if(user && user.client)
if(!(src in user.client.screen))
user.client.screen += src
var/i = 1
- for(var/obj/screen/ability/ability in ability_objects)
+ for(var/atom/movable/screen/ability/ability in ability_objects)
ability.update_icon(forced)
ability.index = i
ability.maptext = "[ability.index]" // Slot number
i++
-/obj/screen/movable/ability_master/update_icon()
+/atom/movable/screen/movable/ability_master/update_icon()
if(ability_objects.len)
set_invisibility(0)
else
set_invisibility(101)
-/obj/screen/movable/ability_master/proc/add_ability(var/name_given)
+/atom/movable/screen/movable/ability_master/proc/add_ability(var/name_given)
if(!name)
return
- var/obj/screen/ability/new_button = new /obj/screen/ability
+ var/atom/movable/screen/ability/new_button = new /atom/movable/screen/ability
new_button.ability_master = src
new_button.name = name_given
new_button.ability_icon_state = name_given
@@ -112,7 +112,7 @@
if(my_mob.client)
toggle_open(2) //forces the icons to refresh on screen
-/obj/screen/movable/ability_master/proc/remove_ability(var/obj/screen/ability/ability)
+/atom/movable/screen/movable/ability_master/proc/remove_ability(var/atom/movable/screen/ability/ability)
if(!ability)
return
ability_objects.Remove(ability)
@@ -123,28 +123,28 @@
toggle_open(showing + 1)
update_icon()
-/obj/screen/movable/ability_master/proc/remove_all_abilities()
- for(var/obj/screen/ability/A in ability_objects)
+/atom/movable/screen/movable/ability_master/proc/remove_all_abilities()
+ for(var/atom/movable/screen/ability/A in ability_objects)
remove_ability(A)
-/obj/screen/movable/ability_master/proc/remove_all_psionic_abilities()
- for(var/obj/screen/ability/obj_based/psionic/A in ability_objects)
+/atom/movable/screen/movable/ability_master/proc/remove_all_psionic_abilities()
+ for(var/atom/movable/screen/ability/obj_based/psionic/A in ability_objects)
remove_ability(A)
-/obj/screen/movable/ability_master/proc/get_ability_by_name(name_to_search)
- for(var/obj/screen/ability/A in ability_objects)
+/atom/movable/screen/movable/ability_master/proc/get_ability_by_name(name_to_search)
+ for(var/atom/movable/screen/ability/A in ability_objects)
if(A.name == name_to_search)
return A
return
-/obj/screen/movable/ability_master/proc/get_ability_by_proc_ref(proc_ref)
- for(var/obj/screen/ability/verb_based/V in ability_objects)
+/atom/movable/screen/movable/ability_master/proc/get_ability_by_proc_ref(proc_ref)
+ for(var/atom/movable/screen/ability/verb_based/V in ability_objects)
if(V.verb_to_call == proc_ref)
return V
return
-/obj/screen/movable/ability_master/proc/get_ability_by_instance(var/obj/instance/)
- for(var/obj/screen/ability/obj_based/O in ability_objects)
+/atom/movable/screen/movable/ability_master/proc/get_ability_by_instance(var/obj/instance/)
+ for(var/atom/movable/screen/ability/obj_based/O in ability_objects)
if(O.object == instance)
return O
return
@@ -152,7 +152,7 @@
///////////ACTUAL ABILITIES////////////
//This is what you click to do things//
///////////////////////////////////////
-/obj/screen/ability
+/atom/movable/screen/ability
icon = 'icons/mob/screen_spells.dmi'
icon_state = "grey_spell_base"
maptext_x = 3
@@ -160,9 +160,9 @@
var/ability_icon_state = null
var/index = 0
- var/obj/screen/movable/ability_master/ability_master
+ var/atom/movable/screen/movable/ability_master/ability_master
-/obj/screen/ability/Destroy()
+/atom/movable/screen/ability/Destroy()
if(ability_master)
ability_master.ability_objects -= src
if(ability_master.my_mob && ability_master.my_mob.client)
@@ -172,13 +172,13 @@
ability_master = null
. = ..()
-/obj/screen/ability/update_icon()
+/atom/movable/screen/ability/update_icon()
overlays.Cut()
icon_state = "[background_base_state]_spell_base"
overlays += ability_icon_state
-/obj/screen/ability/Click(var/location, var/control, var/params)
+/atom/movable/screen/ability/Click(var/location, var/control, var/params)
if(!usr)
return
@@ -189,22 +189,22 @@
activate()
-/obj/screen/ability/MouseDrop(var/atom/A)
+/atom/movable/screen/ability/MouseDrop(var/atom/A)
if(!A || A == src)
return
- if(istype(A, /obj/screen/ability))
- var/obj/screen/ability/ability = A
+ if(istype(A, /atom/movable/screen/ability))
+ var/atom/movable/screen/ability/ability = A
if(ability.ability_master && ability.ability_master == src.ability_master)
ability_master.ability_objects.Swap(src.index, ability.index)
ability_master.toggle_open(2) // To update the UI.
// Makes the ability be triggered. The subclasses of this are responsible for carrying it out in whatever way it needs to.
-/obj/screen/ability/proc/activate()
+/atom/movable/screen/ability/proc/activate()
LOG_DEBUG("[src] had activate() called.")
// This checks if the ability can be used.
-/obj/screen/ability/proc/can_activate()
+/atom/movable/screen/ability/proc/can_activate()
return TRUE
/client/verb/activate_ability(var/slot as num)
@@ -218,30 +218,30 @@
return // No abilities.
if(slot > mob.ability_master.ability_objects.len || slot <= 0)
return // Out of bounds.
- var/obj/screen/ability/A = mob.ability_master.ability_objects[slot]
+ var/atom/movable/screen/ability/A = mob.ability_master.ability_objects[slot]
A.activate()
//////////Verb Abilities//////////
//Buttons to trigger verbs/procs//
//////////////////////////////////
-/obj/screen/ability/verb_based
+/atom/movable/screen/ability/verb_based
var/verb_to_call = null
var/object_used = null
var/arguments_to_use = list()
-/obj/screen/ability/verb_based/activate()
+/atom/movable/screen/ability/verb_based/activate()
if(object_used && verb_to_call)
call(object_used,verb_to_call)(arguments_to_use)
-/obj/screen/movable/ability_master/proc/add_verb_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
+/atom/movable/screen/movable/ability_master/proc/add_verb_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
if(!object_given)
message_admins("ERROR: add_verb_ability() was not given an object in its arguments.")
if(!verb_given)
message_admins("ERROR: add_verb_ability() was not given a verb/proc in its arguments.")
if(get_ability_by_proc_ref(verb_given))
return // Duplicate
- var/obj/screen/ability/verb_based/A = new /obj/screen/ability/verb_based()
+ var/atom/movable/screen/ability/verb_based/A = new /atom/movable/screen/ability/verb_based()
A.ability_master = src
A.object_used = object_given
A.verb_to_call = verb_given
@@ -254,18 +254,18 @@
toggle_open(2) //forces the icons to refresh on screen
//Changeling Abilities
-/obj/screen/ability/verb_based/changeling
+/atom/movable/screen/ability/verb_based/changeling
icon_state = "ling_spell_base"
background_base_state = "ling"
-/obj/screen/movable/ability_master/proc/add_ling_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
+/atom/movable/screen/movable/ability_master/proc/add_ling_ability(var/object_given, var/verb_given, var/name_given, var/ability_icon_given, var/arguments)
if(!object_given)
message_admins("ERROR: add_ling_ability() was not given an object in its arguments.")
if(!verb_given)
message_admins("ERROR: add_ling_ability() was not given a verb/proc in its arguments.")
if(get_ability_by_proc_ref(verb_given))
return // Duplicate
- var/obj/screen/ability/verb_based/changeling/A = new /obj/screen/ability/verb_based/changeling()
+ var/atom/movable/screen/ability/verb_based/changeling/A = new /atom/movable/screen/ability/verb_based/changeling()
A.ability_master = src
A.object_used = object_given
A.verb_to_call = verb_given
@@ -282,31 +282,31 @@
//Buttons to trigger objects//
//////////////////////////////
-/obj/screen/ability/obj_based
+/atom/movable/screen/ability/obj_based
var/obj/object
-/obj/screen/ability/obj_based/activate()
+/atom/movable/screen/ability/obj_based/activate()
if(object)
object.Click()
/// Psionics.
-/obj/screen/ability/obj_based/psionic
+/atom/movable/screen/ability/obj_based/psionic
icon_state = "nano_spell_base"
background_base_state = "nano"
var/singleton/psionic_power/connected_power
-/obj/screen/ability/obj_based/psionic/Destroy()
+/atom/movable/screen/ability/obj_based/psionic/Destroy()
connected_power = null
return ..()
-/obj/screen/movable/ability_master/proc/add_psionic_ability(var/obj/object_given, var/ability_icon_given, var/singleton/psionic_power/P, var/mob/user)
+/atom/movable/screen/movable/ability_master/proc/add_psionic_ability(var/obj/object_given, var/ability_icon_given, var/singleton/psionic_power/P, var/mob/user)
if(!object_given)
message_admins("ERROR: add_psionic_ability() was not given an object in its arguments.")
if(!P)
message_admins("Psionic ability added without connected psionic power singleton!")
if(get_ability_by_instance(object_given))
return // Duplicate
- var/obj/screen/ability/obj_based/psionic/A = new /obj/screen/ability/obj_based/psionic()
+ var/atom/movable/screen/ability/obj_based/psionic/A = new /atom/movable/screen/ability/obj_based/psionic()
A.ability_master = src
A.object = object_given
A.ability_icon_state = ability_icon_given
@@ -316,27 +316,27 @@
if(my_mob.client)
toggle_open(2, user) //forces the icons to refresh on screen
-/obj/screen/ability/obj_based/psionic/get_examine_text(mob/user)
+/atom/movable/screen/ability/obj_based/psionic/get_examine_text(mob/user)
. = ..()
. += SPAN_NOTICE("This ability is [connected_power.name].")
. += SPAN_NOTICE("[connected_power.desc]")
/// Technomancer.
-/obj/screen/ability/obj_based/technomancer
+/atom/movable/screen/ability/obj_based/technomancer
icon_state = "wiz_spell_base"
background_base_state = "wiz"
-/obj/screen/ability/obj_based/technomancer/activate()
+/atom/movable/screen/ability/obj_based/technomancer/activate()
if(ability_master.my_mob.incapacitated())
return
. = ..()
-/obj/screen/movable/ability_master/proc/add_technomancer_ability(var/obj/object_given, var/ability_icon_given)
+/atom/movable/screen/movable/ability_master/proc/add_technomancer_ability(var/obj/object_given, var/ability_icon_given)
if(!object_given)
message_admins("ERROR: add_technomancer_ability() was not given an object in its arguments.")
if(get_ability_by_instance(object_given))
return // Duplicate
- var/obj/screen/ability/obj_based/technomancer/A = new /obj/screen/ability/obj_based/technomancer()
+ var/atom/movable/screen/ability/obj_based/technomancer/A = new /atom/movable/screen/ability/obj_based/technomancer()
A.ability_master = src
A.object = object_given
A.ability_icon_state = ability_icon_given
diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm
index 4cf276fcd09..8307aba1532 100644
--- a/code/_onclick/hud/action.dm
+++ b/code/_onclick/hud/action.dm
@@ -25,7 +25,7 @@
var/check_flags = 0
var/processing = 0
var/active = 0
- var/obj/screen/movable/action_button/button = null
+ var/atom/movable/screen/movable/action_button/button = null
var/button_icon = 'icons/obj/action_buttons/actions.dmi'
var/button_icon_state = "default"
var/button_icon_color
@@ -130,15 +130,15 @@
/datum/action/proc/UpdateName()
return name
-/obj/screen/movable/action_button
+/atom/movable/screen/movable/action_button
var/datum/action/owner
screen_loc = "WEST,NORTH"
-/obj/screen/movable/action_button/Destroy(force)
+/atom/movable/screen/movable/action_button/Destroy(force)
owner = null
. = ..()
-/obj/screen/movable/action_button/Click(location,control,params)
+/atom/movable/screen/movable/action_button/Click(location,control,params)
var/list/modifiers = params2list(params)
if(modifiers["shift"])
moved = 0
@@ -148,7 +148,7 @@
owner.Trigger()
return 1
-/obj/screen/movable/action_button/update_icon()
+/atom/movable/screen/movable/action_button/update_icon()
if(!owner)
return
icon = owner.button_icon
@@ -173,13 +173,13 @@
color = rgb(255,255,255,255)
//Hide/Show Action Buttons ... Button
-/obj/screen/movable/action_button/hide_toggle
+/atom/movable/screen/movable/action_button/hide_toggle
name = "Hide Buttons"
icon = 'icons/obj/action_buttons/actions.dmi'
icon_state = "bg_default"
var/hidden = 0
-/obj/screen/movable/action_button/hide_toggle/Click()
+/atom/movable/screen/movable/action_button/hide_toggle/Click()
usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
hidden = usr.hud_used.action_buttons_hidden
@@ -191,7 +191,7 @@
usr.update_action_buttons()
-/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user)
+/atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(var/mob/living/user)
if(isalien(user))
icon_state = "bg_alien"
else
@@ -199,7 +199,7 @@
update_icon()
return
-/obj/screen/movable/action_button/hide_toggle/update_icon()
+/atom/movable/screen/movable/action_button/hide_toggle/update_icon()
ClearOverlays()
AddOverlays(hidden ? "show" : "hide")
@@ -220,7 +220,7 @@
var/coord_row_offset = AB_NORTH_OFFSET
return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:[coord_row_offset]"
-/datum/hud/proc/SetButtonCoords(var/obj/screen/button,var/number)
+/datum/hud/proc/SetButtonCoords(var/atom/movable/screen/button,var/number)
var/row = round((number-1)/AB_MAX_COLUMNS)
var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
var/x_offset = 32*(col-1) + AB_WEST_OFFSET + 2*col
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 013f70c38cb..6065f249872 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -6,20 +6,20 @@
myai.computer.layer = HUD_BASE_LAYER
adding = list(
- new /obj/screen/ai/core,
- new /obj/screen/ai/camera_list,
- new /obj/screen/ai/camera_track,
- new /obj/screen/ai/camera_light,
- new /obj/screen/ai/crew_manifest,
- new /obj/screen/ai/announcement,
- new /obj/screen/ai/call_shuttle,
- new /obj/screen/ai/state_laws,
- new /obj/screen/ai/take_image,
- new /obj/screen/ai/view_image,
- new /obj/screen/ai/sensor_aug,
- new /obj/screen/ai/remote_mech,
- new /obj/screen/ai/move_up,
- new /obj/screen/ai/move_down,
+ new /atom/movable/screen/ai/core,
+ new /atom/movable/screen/ai/camera_list,
+ new /atom/movable/screen/ai/camera_track,
+ new /atom/movable/screen/ai/camera_light,
+ new /atom/movable/screen/ai/crew_manifest,
+ new /atom/movable/screen/ai/announcement,
+ new /atom/movable/screen/ai/call_shuttle,
+ new /atom/movable/screen/ai/state_laws,
+ new /atom/movable/screen/ai/take_image,
+ new /atom/movable/screen/ai/view_image,
+ new /atom/movable/screen/ai/sensor_aug,
+ new /atom/movable/screen/ai/remote_mech,
+ new /atom/movable/screen/ai/move_up,
+ new /atom/movable/screen/ai/move_down,
myai.computer
)
diff --git a/code/_onclick/hud/borer_hud.dm b/code/_onclick/hud/borer_hud.dm
index 3ed2796680c..3a7b76f5563 100644
--- a/code/_onclick/hud/borer_hud.dm
+++ b/code/_onclick/hud/borer_hud.dm
@@ -4,7 +4,7 @@
/datum/hud/proc/borer_hud()
src.adding = list()
- var/obj/screen/borer/chemicals/C = new /obj/screen/borer/chemicals()
+ var/atom/movable/screen/borer/chemicals/C = new /atom/movable/screen/borer/chemicals()
adding += C
var/mob/living/simple_animal/borer/B = mymob
diff --git a/code/_onclick/hud/captive_brain_hud.dm b/code/_onclick/hud/captive_brain_hud.dm
index c8abae4ebc8..c2052872255 100644
--- a/code/_onclick/hud/captive_brain_hud.dm
+++ b/code/_onclick/hud/captive_brain_hud.dm
@@ -4,7 +4,7 @@
/datum/hud/proc/captive_brain_hud()
src.adding = list()
- var/obj/screen/resist = new /obj/screen()
+ var/atom/movable/screen/resist = new /atom/movable/screen()
resist.name = "resist"
resist.icon = 'icons/mob/screen/captive_brain.dmi'
resist.icon_state = "resist"
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index cef60f055c6..e55d6cb73cb 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -2,7 +2,7 @@
condition ? overlay_fullscreen(screen_name, screen_type, arg) : clear_fullscreen(screen_name)
/mob/proc/overlay_fullscreen(category, type, severity, animated = 0)
- var/obj/screen/fullscreen/screen = screens[category]
+ var/atom/movable/screen/fullscreen/screen = screens[category]
if(screen)
if(screen.type != type)
@@ -27,7 +27,7 @@
return screen
/mob/proc/clear_fullscreen(category, animated = 10)
- var/obj/screen/fullscreen/screen = screens[category]
+ var/atom/movable/screen/fullscreen/screen = screens[category]
if(!screen)
return
@@ -41,7 +41,7 @@
client.screen -= screen
qdel(screen)
-/mob/proc/clear_fullscreen_after_animate(obj/screen/fullscreen/screen)
+/mob/proc/clear_fullscreen_after_animate(atom/movable/screen/fullscreen/screen)
if(client)
client.screen -= screen
qdel(screen)
@@ -60,7 +60,7 @@
for(var/category in screens)
client.screen |= screens[category]
-/obj/screen/fullscreen
+/atom/movable/screen/fullscreen
icon = 'icons/mob/screen/full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
@@ -70,87 +70,87 @@
var/severity = 0
var/allstate = 0 //shows if it should show up for dead people too
-/obj/screen/fullscreen/Destroy()
+/atom/movable/screen/fullscreen/Destroy()
severity = 0
return ..()
-/obj/screen/fullscreen/brute
+/atom/movable/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
layer = DAMAGE_LAYER
-/obj/screen/fullscreen/oxy
+/atom/movable/screen/fullscreen/oxy
icon_state = "oxydamageoverlay"
layer = DAMAGE_LAYER
-/obj/screen/fullscreen/crit
+/atom/movable/screen/fullscreen/crit
icon_state = "passage"
layer = CRIT_LAYER
-/obj/screen/fullscreen/strong_pain
+/atom/movable/screen/fullscreen/strong_pain
icon_state = "strong_pain"
layer = CRIT_LAYER
-/obj/screen/fullscreen/blind
+/atom/movable/screen/fullscreen/blind
icon_state = "blackimageoverlay"
layer = BLIND_LAYER
-/obj/screen/fullscreen/blackout
+/atom/movable/screen/fullscreen/blackout
icon_state = "blackout"
layer = BLIND_LAYER
-/obj/screen/fullscreen/impaired
+/atom/movable/screen/fullscreen/impaired
icon_state = "impairedoverlay"
-/obj/screen/fullscreen/blurry
+/atom/movable/screen/fullscreen/blurry
icon = 'icons/mob/screen/effects.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "blurry"
alpha = 100
-/obj/screen/fullscreen/pain
+/atom/movable/screen/fullscreen/pain
icon_state = "brutedamageoverlay6"
alpha = 0
-/obj/screen/fullscreen/flash
+/atom/movable/screen/fullscreen/flash
icon = 'icons/mob/screen/effects.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
-/obj/screen/fullscreen/flash/noise
+/atom/movable/screen/fullscreen/flash/noise
icon_state = "noise"
alpha = 127
-/obj/screen/fullscreen/noise
+/atom/movable/screen/fullscreen/noise
icon = 'icons/effects/static.dmi'
icon_state = "1 light"
screen_loc = ui_entire_screen
alpha = 127
-/obj/screen/fullscreen/fadeout
+/atom/movable/screen/fullscreen/fadeout
icon = 'icons/mob/screen/effects.dmi'
icon_state = "black"
screen_loc = ui_entire_screen
alpha = 0
allstate = 1
-/obj/screen/fullscreen/fadeout/Initialize()
+/atom/movable/screen/fullscreen/fadeout/Initialize()
. = ..()
animate(src, alpha = 255, time = 10)
-/obj/screen/fullscreen/scanline
+/atom/movable/screen/fullscreen/scanline
icon = 'icons/effects/static.dmi'
icon_state = "scanlines"
screen_loc = ui_entire_screen
alpha = 50
-/obj/screen/fullscreen/frenzy
+/atom/movable/screen/fullscreen/frenzy
icon_state = "frenzyoverlay"
layer = BLIND_LAYER
-/obj/screen/fullscreen/teleport
+/atom/movable/screen/fullscreen/teleport
icon_state = "teleport"
-/obj/screen/fullscreen/blueprints
+/atom/movable/screen/fullscreen/blueprints
icon = 'icons/effects/blueprints.dmi'
icon_state = "base"
screen_loc = ui_entire_screen
diff --git a/code/_onclick/hud/gun_mode.dm b/code/_onclick/hud/gun_mode.dm
index 5e3f1363975..ef2b8bd110a 100644
--- a/code/_onclick/hud/gun_mode.dm
+++ b/code/_onclick/hud/gun_mode.dm
@@ -1,20 +1,20 @@
-/obj/screen/gun
+/atom/movable/screen/gun
name = "gun"
icon = 'icons/mob/screen/generic.dmi'
master = null
dir = 2
-/obj/screen/gun/Click(location, control, params)
+/atom/movable/screen/gun/Click(location, control, params)
if(!usr)
return
return 1
-/obj/screen/gun/move
+/atom/movable/screen/gun/move
name = "Allow Movement"
icon_state = "no_walk1"
screen_loc = ui_gun2
-/obj/screen/gun/move/Click(location, control, params)
+/atom/movable/screen/gun/move/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
@@ -23,12 +23,12 @@
return 1
return 0
-/obj/screen/gun/item
+/atom/movable/screen/gun/item
name = "Allow Item Use"
icon_state = "no_item1"
screen_loc = ui_gun1
-/obj/screen/gun/item/Click(location, control, params)
+/atom/movable/screen/gun/item/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
@@ -37,12 +37,12 @@
return 1
return 0
-/obj/screen/gun/mode
+/atom/movable/screen/gun/mode
name = "Toggle Gun Mode"
icon_state = "gun0"
screen_loc = ui_gun_select
-/obj/screen/gun/mode/Click(location, control, params)
+/atom/movable/screen/gun/mode/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
@@ -51,12 +51,12 @@
return 1
return 0
-/obj/screen/gun/radio
+/atom/movable/screen/gun/radio
name = "Allow Radio Use"
icon_state = "no_radio1"
screen_loc = ui_gun4
-/obj/screen/gun/radio/Click(location, control, params)
+/atom/movable/screen/gun/radio/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
@@ -65,13 +65,13 @@
return 1
return 0
-/obj/screen/gun/burstfire
+/atom/movable/screen/gun/burstfire
name = "Toggle Firing Mode"
desc = "This can be used in a macro as toggle-firing-mode."
icon_state = "toggle_burst_fire"
screen_loc = ui_burstfire
-/obj/screen/gun/burstfire/Click(location, control, params)
+/atom/movable/screen/gun/burstfire/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
@@ -86,13 +86,13 @@
if(istype(dakka))
dakka.toggle_firing_mode(user)
-/obj/screen/gun/uniqueaction
+/atom/movable/screen/gun/uniqueaction
name = "Unique Action"
desc = "This can be used in a macro as unique-action."
icon_state = "unique_action"
screen_loc = ui_uniqueaction
-/obj/screen/gun/uniqueaction/Click(location, control, params)
+/atom/movable/screen/gun/uniqueaction/Click(location, control, params)
if(..())
var/mob/living/user = usr
if(istype(user))
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 52533877624..c2c6ca9a010 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -5,24 +5,24 @@
var/datum/global_hud/global_hud // Initialized in SSatoms.
var/list/global_huds
-/datum/hud/var/obj/screen/grab_intent
-/datum/hud/var/obj/screen/hurt_intent
-/datum/hud/var/obj/screen/disarm_intent
-/datum/hud/var/obj/screen/help_intent
+/datum/hud/var/atom/movable/screen/grab_intent
+/datum/hud/var/atom/movable/screen/hurt_intent
+/datum/hud/var/atom/movable/screen/disarm_intent
+/datum/hud/var/atom/movable/screen/help_intent
/datum/global_hud
- var/obj/screen/vr_control
- var/obj/screen/druggy
- var/obj/screen/blurry
+ var/atom/movable/screen/vr_control
+ var/atom/movable/screen/druggy
+ var/atom/movable/screen/blurry
var/list/vimpaired
var/list/darkMask
- var/obj/screen/nvg
- var/obj/screen/thermal
- var/obj/screen/meson
- var/obj/screen/science
+ var/atom/movable/screen/nvg
+ var/atom/movable/screen/thermal
+ var/atom/movable/screen/meson
+ var/atom/movable/screen/science
/datum/global_hud/proc/setup_overlay(var/icon_state, var/color)
- var/obj/screen/screen = new /obj/screen()
+ var/atom/movable/screen/screen = new /atom/movable/screen()
screen.alpha = 25 // Adjust this if you want goggle overlays to be thinner or thicker.
screen.screen_loc = "SOUTHWEST to NORTHEAST" // Will tile up to the whole screen, scaling beyond 15x15 if needed.
screen.icon = 'icons/obj/hud_tiled.dmi'
@@ -34,7 +34,7 @@ var/list/global_huds
/datum/global_hud/New()
//420erryday psychedellic colours screen overlay for when you are high
- druggy = new /obj/screen()
+ druggy = new /atom/movable/screen()
druggy.screen_loc = ui_entire_screen
druggy.icon_state = "druggy"
druggy.layer = IMPAIRED_LAYER
@@ -43,14 +43,14 @@ var/list/global_huds
druggy.blend_mode = BLEND_MULTIPLY
//that white blurry effect you get when you eyes are damaged
- blurry = new /obj/screen()
+ blurry = new /atom/movable/screen()
blurry.screen_loc = ui_entire_screen
blurry.icon_state = "blurry"
blurry.layer = IMPAIRED_LAYER
blurry.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blurry.alpha = 100
- vr_control = new /obj/screen()
+ vr_control = new /atom/movable/screen()
vr_control.icon = 'icons/mob/screen/full.dmi'
vr_control.icon_state = "vr_control"
vr_control.screen_loc = "1,1"
@@ -62,10 +62,10 @@ var/list/global_huds
meson = setup_overlay("scanline", "#9fd800")
science = setup_overlay("scanline", "#d600d6")
- var/obj/screen/O
+ var/atom/movable/screen/O
var/i
//that nasty looking dither you get when you're short-sighted
- vimpaired = newlist(/obj/screen,/obj/screen,/obj/screen,/obj/screen)
+ vimpaired = newlist(/atom/movable/screen,/atom/movable/screen,/atom/movable/screen,/atom/movable/screen)
O = vimpaired[1]
O.screen_loc = "1,1 to 5,15"
O = vimpaired[2]
@@ -76,7 +76,7 @@ var/list/global_huds
O.screen_loc = "11,1 to 15,15"
//welding mask overlay black/dither
- darkMask = newlist(/obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen, /obj/screen)
+ darkMask = newlist(/atom/movable/screen, /atom/movable/screen, /atom/movable/screen, /atom/movable/screen, /atom/movable/screen, /atom/movable/screen, /atom/movable/screen, /atom/movable/screen)
O = darkMask[1]
O.screen_loc = "WEST+2,SOUTH+2 to WEST+4,NORTH-2"
O = darkMask[2]
@@ -136,18 +136,18 @@ var/list/global_huds
///Boolean, if the action buttons are hidden
var/action_buttons_hidden = FALSE
- var/obj/screen/blobpwrdisplay
- var/obj/screen/blobhealthdisplay
- var/obj/screen/r_hand_hud_object
- var/obj/screen/l_hand_hud_object
- var/obj/screen/action_intent
- var/obj/screen/movement_intent/move_intent
+ var/atom/movable/screen/blobpwrdisplay
+ var/atom/movable/screen/blobhealthdisplay
+ var/atom/movable/screen/r_hand_hud_object
+ var/atom/movable/screen/l_hand_hud_object
+ var/atom/movable/screen/action_intent
+ var/atom/movable/screen/movement_intent/move_intent
var/list/adding
var/list/other
- var/list/obj/screen/hotkeybuttons
+ var/list/atom/movable/screen/hotkeybuttons
- var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
+ var/atom/movable/screen/movable/action_button/hide_toggle/hide_actions_toggle
/datum/hud/New(mob/owner)
mymob = owner
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index 649e772e952..2e25181a1ee 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -16,14 +16,14 @@
src.hotkeybuttons = list() //These can be disabled for hotkey usersx
var/list/hud_elements = list()
- var/obj/screen/using
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/using
+ var/atom/movable/screen/inventory/inv_box
// Draw the various inventory equipment slots.
var/has_hidden_gear
for(var/gear_slot in hud_data.gear)
var/list/slot_data = hud_data.gear[gear_slot]
- var/hud_type = /obj/screen/inventory
+ var/hud_type = /atom/movable/screen/inventory
if(slot_data["slot_type"])
hud_type = slot_data["slot_type"]
inv_box = new hud_type()
@@ -47,7 +47,7 @@
src.adding += inv_box
if(has_hidden_gear)
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "toggle"
using.icon = ui_style
using.icon_state = "other"
@@ -59,7 +59,7 @@
// Draw the attack intent dialogue.
if(hud_data.has_a_intent)
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "act_intent"
using.icon = ui_style
using.icon_state = "intent_"+mymob.a_intent
@@ -77,7 +77,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = I_HELP
using.icon = ico
using.screen_loc = ui_acti
@@ -88,7 +88,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = I_DISARM
using.icon = ico
using.screen_loc = ui_acti
@@ -99,7 +99,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = I_GRAB
using.icon = ico
using.screen_loc = ui_acti
@@ -110,7 +110,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = I_HURT
using.icon = ico
using.screen_loc = ui_acti
@@ -120,7 +120,7 @@
//end intent small hud objects
if(hud_data.has_m_intent)
- using = new /obj/screen/movement_intent()
+ using = new /atom/movable/screen/movement_intent()
using.icon = ui_style
using.icon_state = (mymob.m_intent == M_RUN ? "running" : "walking")
using.color = ui_color
@@ -129,7 +129,7 @@
move_intent = using
if(hud_data.has_drop)
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "drop"
using.icon = ui_style
using.icon_state = "act_drop"
@@ -140,7 +140,7 @@
if(hud_data.has_hands)
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "equip"
using.icon = ui_style
using.icon_state = "act_equip"
@@ -149,7 +149,7 @@
using.alpha = ui_alpha
src.adding += using
- inv_box = new /obj/screen/inventory/hand()
+ inv_box = new /atom/movable/screen/inventory/hand()
inv_box.hud = src
inv_box.name = "right hand"
inv_box.icon = ui_style
@@ -164,7 +164,7 @@
src.r_hand_hud_object = inv_box
src.adding += inv_box
- inv_box = new /obj/screen/inventory/hand()
+ inv_box = new /atom/movable/screen/inventory/hand()
inv_box.hud = src
inv_box.name = "left hand"
inv_box.icon = ui_style
@@ -180,7 +180,7 @@
target.update_hud_hands()
- using = new /obj/screen/inventory()
+ using = new /atom/movable/screen/inventory()
using.name = "hand"
using.icon = ui_style
using.icon_state = "hand1"
@@ -190,7 +190,7 @@
using.hud = src
src.adding += using
- using = new /obj/screen/inventory()
+ using = new /atom/movable/screen/inventory()
using.name = "hand"
using.icon = ui_style
using.icon_state = "hand2"
@@ -201,7 +201,7 @@
src.adding += using
if(hud_data.has_resist)
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "resist"
using.icon = ui_style
using.icon_state = "act_resist"
@@ -211,7 +211,7 @@
src.hotkeybuttons += using
if(hud_data.has_throw)
- mymob.throw_icon = new /obj/screen()
+ mymob.throw_icon = new /atom/movable/screen()
mymob.throw_icon.icon = ui_style
mymob.throw_icon.icon_state = "act_throw_off"
mymob.throw_icon.name = "throw"
@@ -221,7 +221,7 @@
src.hotkeybuttons += mymob.throw_icon
hud_elements |= mymob.throw_icon
- mymob.pullin = new /obj/screen()
+ mymob.pullin = new /atom/movable/screen()
mymob.pullin.icon = ui_style
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
@@ -230,42 +230,42 @@
hud_elements |= mymob.pullin
if(hud_data.has_internals)
- mymob.internals = new /obj/screen/internals()
+ mymob.internals = new /atom/movable/screen/internals()
mymob.internals.icon = ui_style
hud_elements |= mymob.internals
if(!isnull(target.internal))
mymob.internals.icon_state = "internal1"
if(hud_data.has_warnings)
- mymob.oxygen = new /obj/screen/oxygen()
+ mymob.oxygen = new /atom/movable/screen/oxygen()
mymob.oxygen.icon = 'icons/mob/status_indicators.dmi'
mymob.oxygen.icon_state = "oxy0"
mymob.oxygen.name = "oxygen"
mymob.oxygen.screen_loc = ui_temp
hud_elements |= mymob.oxygen
- mymob.toxin = new /obj/screen/toxins()
+ mymob.toxin = new /atom/movable/screen/toxins()
mymob.toxin.icon = 'icons/mob/status_indicators.dmi'
mymob.toxin.icon_state = "tox0"
mymob.toxin.name = "toxin"
mymob.toxin.screen_loc = ui_temp
hud_elements |= mymob.toxin
- mymob.fire = new /obj/screen()
+ mymob.fire = new /atom/movable/screen()
mymob.fire.icon = ui_style
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_fire
hud_elements |= mymob.fire
- mymob.paralysis_indicator = new /obj/screen/paralysis()
+ mymob.paralysis_indicator = new /atom/movable/screen/paralysis()
mymob.paralysis_indicator.icon = 'icons/mob/status_indicators.dmi'
mymob.paralysis_indicator.icon_state = "paralysis0"
mymob.paralysis_indicator.name = "paralysis"
mymob.paralysis_indicator.screen_loc = ui_paralysis
hud_elements |= mymob.paralysis_indicator
- mymob.healths = new /obj/screen()
+ mymob.healths = new /atom/movable/screen()
mymob.healths.icon = ui_style
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
@@ -276,7 +276,7 @@
hud_elements |= mymob.healths
if(hud_data.has_pressure)
- mymob.pressure = new /obj/screen/pressure()
+ mymob.pressure = new /atom/movable/screen/pressure()
mymob.pressure.icon = 'icons/mob/status_indicators.dmi'
mymob.pressure.icon_state = "pressure0"
mymob.pressure.name = "pressure"
@@ -284,7 +284,7 @@
hud_elements |= mymob.pressure
if(hud_data.has_bodytemp)
- mymob.bodytemp = new /obj/screen/bodytemp()
+ mymob.bodytemp = new /atom/movable/screen/bodytemp()
mymob.bodytemp.icon = 'icons/mob/status_indicators.dmi'
mymob.bodytemp.icon_state = "temp1"
mymob.bodytemp.name = "body temperature"
@@ -292,7 +292,7 @@
hud_elements |= mymob.bodytemp
if(hud_data.has_cell)
- mymob.cells = new /obj/screen()
+ mymob.cells = new /atom/movable/screen()
mymob.cells.icon = 'icons/mob/screen/robot.dmi'
mymob.cells.icon_state = "charge-empty"
mymob.cells.name = "cell"
@@ -300,7 +300,7 @@
hud_elements |= target.cells
if(hud_data.has_nutrition)
- mymob.nutrition_icon = new /obj/screen/food()
+ mymob.nutrition_icon = new /atom/movable/screen/food()
mymob.nutrition_icon.icon = 'icons/mob/status_hunger.dmi'
mymob.nutrition_icon.pixel_w = 8
mymob.nutrition_icon.icon_state = "nutrition0"
@@ -309,7 +309,7 @@
hud_elements |= mymob.nutrition_icon
if(hud_data.has_hydration)
- mymob.hydration_icon = new /obj/screen/thirst()
+ mymob.hydration_icon = new /atom/movable/screen/thirst()
mymob.hydration_icon.icon = 'icons/mob/status_hunger.dmi'
mymob.hydration_icon.icon_state = "thirst0"
mymob.hydration_icon.name = "thirst"
@@ -317,27 +317,27 @@
hud_elements |= mymob.hydration_icon
if(hud_data.has_up_hint)
- mymob.up_hint = new /obj/screen()
+ mymob.up_hint = new /atom/movable/screen()
mymob.up_hint.icon = ui_style
mymob.up_hint.icon_state = "uphint0"
mymob.up_hint.name = "up hint"
mymob.up_hint.screen_loc = ui_up_hint
hud_elements |= mymob.up_hint
- mymob.pain = new /obj/screen/fullscreen/pain(null)
+ mymob.pain = new /atom/movable/screen/fullscreen/pain(null)
hud_elements |= mymob.pain
- mymob.instability_display = new /obj/screen/instability()
+ mymob.instability_display = new /atom/movable/screen/instability()
mymob.instability_display.screen_loc = ui_instability_display
mymob.instability_display.icon_state = "wiz_instability_none"
hud_elements |= mymob.instability_display
- mymob.energy_display = new /obj/screen/energy()
+ mymob.energy_display = new /atom/movable/screen/energy()
mymob.energy_display.screen_loc = ui_energy_display
mymob.energy_display.icon_state = "wiz_energy"
hud_elements |= mymob.energy_display
- mymob.zone_sel = new /obj/screen/zone_sel(null)
+ mymob.zone_sel = new /atom/movable/screen/zone_sel(null)
mymob.zone_sel.icon = ui_style
mymob.zone_sel.color = ui_color
mymob.zone_sel.alpha = ui_alpha
@@ -346,34 +346,34 @@
hud_elements |= mymob.zone_sel
//Handle the gun settings buttons
- mymob.gun_setting_icon = new /obj/screen/gun/mode(null)
+ mymob.gun_setting_icon = new /atom/movable/screen/gun/mode(null)
mymob.gun_setting_icon.icon = ui_style
mymob.gun_setting_icon.color = ui_color
mymob.gun_setting_icon.alpha = ui_alpha
hud_elements |= mymob.gun_setting_icon
- mymob.item_use_icon = new /obj/screen/gun/item(null)
+ mymob.item_use_icon = new /atom/movable/screen/gun/item(null)
mymob.item_use_icon.icon = ui_style
mymob.item_use_icon.color = ui_color
mymob.item_use_icon.alpha = ui_alpha
- mymob.gun_move_icon = new /obj/screen/gun/move(null)
+ mymob.gun_move_icon = new /atom/movable/screen/gun/move(null)
mymob.gun_move_icon.icon = ui_style
mymob.gun_move_icon.color = ui_color
mymob.gun_move_icon.alpha = ui_alpha
- mymob.radio_use_icon = new /obj/screen/gun/radio(null)
+ mymob.radio_use_icon = new /atom/movable/screen/gun/radio(null)
mymob.radio_use_icon.icon = ui_style
mymob.radio_use_icon.color = ui_color
mymob.radio_use_icon.alpha = ui_alpha
- mymob.toggle_firing_mode = new /obj/screen/gun/burstfire(null)
+ mymob.toggle_firing_mode = new /atom/movable/screen/gun/burstfire(null)
mymob.toggle_firing_mode.icon = ui_style
mymob.toggle_firing_mode.color = ui_color
mymob.toggle_firing_mode.alpha = ui_alpha
hud_elements |= mymob.toggle_firing_mode
- mymob.unique_action_icon = new /obj/screen/gun/uniqueaction(null)
+ mymob.unique_action_icon = new /atom/movable/screen/gun/uniqueaction(null)
mymob.unique_action_icon.icon = ui_style
mymob.unique_action_icon.color = ui_color
mymob.unique_action_icon.alpha = ui_alpha
@@ -411,7 +411,7 @@
// Yes, these use icon state. Yes, these are terrible. The alternative is duplicating
// a bunch of fairly blobby logic for every click override on these objects.
-/obj/screen/food/Click(var/location, var/control, var/params)
+/atom/movable/screen/food/Click(var/location, var/control, var/params)
if(istype(usr) && usr.nutrition_icon == src)
switch(icon_state)
if("nutrition0")
@@ -439,7 +439,7 @@
if("charge5")
to_chat(usr, SPAN_DANGER("You have almost no charge left!"))
-/obj/screen/thirst/Click(var/location, var/control, var/params)
+/atom/movable/screen/thirst/Click(var/location, var/control, var/params)
if(istype(usr) && usr.hydration_icon == src)
switch(icon_state)
if("thirst0")
@@ -453,7 +453,7 @@
if("thirst4")
to_chat(usr, SPAN_DANGER("You are entirely dehydrated!"))
-/obj/screen/bodytemp/Click(var/location, var/control, var/params)
+/atom/movable/screen/bodytemp/Click(var/location, var/control, var/params)
if(istype(usr) && usr.bodytemp == src)
switch(icon_state)
if("temp4")
@@ -475,7 +475,7 @@
else
to_chat(usr, SPAN_NOTICE("Your body is at a comfortable temperature."))
-/obj/screen/pressure/Click(var/location, var/control, var/params)
+/atom/movable/screen/pressure/Click(var/location, var/control, var/params)
if(istype(usr) && usr.pressure == src)
switch(icon_state)
if("pressure2")
@@ -489,45 +489,45 @@
else
to_chat(usr, SPAN_NOTICE("The local air pressure is comfortable."))
-/obj/screen/toxins/Click(var/location, var/control, var/params)
+/atom/movable/screen/toxins/Click(var/location, var/control, var/params)
if(istype(usr) && usr.toxin == src)
if(icon_state == "tox0")
to_chat(usr, SPAN_NOTICE("The air is clear of toxins."))
else
to_chat(usr, SPAN_DANGER("The air is eating away at your skin!"))
-/obj/screen/oxygen/Click(var/location, var/control, var/params)
+/atom/movable/screen/oxygen/Click(var/location, var/control, var/params)
if(istype(usr) && usr.oxygen == src)
if(icon_state == "oxy0")
to_chat(usr, SPAN_NOTICE("You are breathing easy."))
else
to_chat(usr, SPAN_DANGER("You cannot breathe!"))
-/obj/screen/paralysis/Click(var/location, var/control, var/params)
+/atom/movable/screen/paralysis/Click(var/location, var/control, var/params)
if(istype(usr) && usr.paralysis_indicator == src)
if(usr.paralysis)
to_chat(usr, SPAN_WARNING("You are completely paralyzed and cannot move!"))
else
to_chat(usr, SPAN_NOTICE("You are walking around completely fine."))
-/obj/screen/instability
+/atom/movable/screen/instability
name = "instability"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "instability-1"
invisibility = 101
-/obj/screen/energy
+/atom/movable/screen/energy
name = "energy"
icon = 'icons/mob/screen_gen.dmi'
icon_state = "wiz_energy"
invisibility = 101
-/obj/screen/status
+/atom/movable/screen/status
icon = 'icons/mob/screen/midnight.dmi'
icon_state = "status_template"
var/status_message
-/obj/screen/status/Initialize(mapload, var/set_icon, var/set_overlay, var/set_status_message)
+/atom/movable/screen/status/Initialize(mapload, var/set_icon, var/set_overlay, var/set_status_message)
icon = set_icon
var/image/status_overlay = image('icons/mob/screen/hud_status.dmi', null, set_overlay)
status_overlay.appearance_flags = RESET_COLOR
@@ -535,7 +535,7 @@
status_message = set_status_message
return ..()
-/obj/screen/status/Click(var/location, var/control, var/params)
+/atom/movable/screen/status/Click(var/location, var/control, var/params)
var/list/modifiers = params2list(params)
if(status_message && modifiers["shift"])
to_chat(usr, status_message)
diff --git a/code/_onclick/hud/morph.dm b/code/_onclick/hud/morph.dm
index 12dcb8023eb..d51a176213c 100644
--- a/code/_onclick/hud/morph.dm
+++ b/code/_onclick/hud/morph.dm
@@ -2,24 +2,24 @@
HUD.morph_hud()
/datum/hud/proc/morph_hud()
- var/obj/screen/mov_intent = new /obj/screen/movement_intent()
+ var/atom/movable/screen/mov_intent = new /atom/movable/screen/movement_intent()
mov_intent.set_dir(SOUTHWEST)
mov_intent.icon = 'icons/mob/screen/morph.dmi'
mov_intent.icon_state = (mymob.m_intent == M_RUN ? "running" : "walking")
move_intent = mov_intent
- mymob.healths = new /obj/screen()
+ mymob.healths = new /atom/movable/screen()
mymob.healths.name = "health"
mymob.healths.icon = 'icons/mob/screen/morph.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.screen_loc = ui_alien_health
- mymob.zone_sel = new /obj/screen/zone_sel()
+ mymob.zone_sel = new /atom/movable/screen/zone_sel()
mymob.zone_sel.icon = 'icons/mob/screen/morph.dmi'
mymob.zone_sel.ClearOverlays()
mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]"))
- var/obj/screen/resist = new /obj/screen()
+ var/atom/movable/screen/resist = new /atom/movable/screen()
resist.name = "resist"
resist.icon = 'icons/mob/screen/morph.dmi'
resist.icon_state = "act_resist"
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 39a937ed698..ef0e401edf1 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -8,18 +8,18 @@
//Movable Screen Object
//Not tied to the grid, places it's center where the cursor is
-/obj/screen/movable
+/atom/movable/screen/movable
var/snap2grid = FALSE
var/moved = FALSE
//Snap Screen Object
//Tied to the grid, snaps to the nearest turf
-/obj/screen/movable/snap
+/atom/movable/screen/movable/snap
snap2grid = TRUE
-/obj/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params)
+/atom/movable/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params)
var/list/PM = params2list(params)
//No screen-loc information? abort.
@@ -44,7 +44,7 @@
var/pix_Y = text2num(screen_loc_Y[2]) - 16
screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
-/obj/screen/movable/proc/encode_screen_X(X, var/mob/user = usr)
+/atom/movable/screen/movable/proc/encode_screen_X(X, var/mob/user = usr)
if(X > user?.client?.view+1)
. = "EAST-[user?.client?.view*2 + 1-X]"
else if(X < user?.client?.view+1)
@@ -52,7 +52,7 @@
else
. = "CENTER"
-/obj/screen/movable/proc/decode_screen_X(X, var/mob/user = usr)
+/atom/movable/screen/movable/proc/decode_screen_X(X, var/mob/user = usr)
//Find EAST/WEST implementations
if(findtext(X,"EAST-"))
var/num = text2num(copytext(X,6)) //Trim EAST-
@@ -67,7 +67,7 @@
else if(findtext(X,"CENTER"))
. = user?.client?.view+1
-/obj/screen/movable/proc/encode_screen_Y(Y, var/mob/user = usr)
+/atom/movable/screen/movable/proc/encode_screen_Y(Y, var/mob/user = usr)
if(Y > user?.client?.view+1)
. = "NORTH-[user?.client?.view*2 + 1-Y]"
else if(Y < user?.client?.view+1)
@@ -75,7 +75,7 @@
else
. = "CENTER"
-/obj/screen/movable/proc/decode_screen_Y(Y, var/mob/user = usr)
+/atom/movable/screen/movable/proc/decode_screen_Y(Y, var/mob/user = usr)
if(findtext(Y,"NORTH-"))
var/num = text2num(copytext(Y,7)) //Trim NORTH-
if(!num)
@@ -94,7 +94,7 @@
set category = "Debug"
set name = "Spawn Movable UI Object"
- var/obj/screen/movable/M = new()
+ var/atom/movable/screen/movable/M = new()
M.name = "Movable UI Object"
M.icon_state = "block"
M.maptext = "Movable"
@@ -113,7 +113,7 @@
set category = "Debug"
set name = "Spawn Snap UI Object"
- var/obj/screen/movable/snap/S = new()
+ var/atom/movable/screen/movable/snap/S = new()
S.name = "Snap UI Object"
S.icon_state = "block"
S.maptext = "Snap"
diff --git a/code/_onclick/hud/nymph_hud.dm b/code/_onclick/hud/nymph_hud.dm
index d2c97f00fc1..aafecd0b248 100644
--- a/code/_onclick/hud/nymph_hud.dm
+++ b/code/_onclick/hud/nymph_hud.dm
@@ -6,22 +6,22 @@
src.adding = list()
src.other = list()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/movement_intent()
+ using = new /atom/movable/screen/movement_intent()
using.set_dir(SOUTHWEST)
using.icon = 'icons/mob/screen/diona_nymph.dmi'
using.icon_state = (mymob.m_intent == M_RUN ? "running" : "walking")
src.adding += using
move_intent = using
- mymob.healths = new /obj/screen()
+ mymob.healths = new /atom/movable/screen()
mymob.healths.icon = 'icons/mob/screen/diona_nymph.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_alien_health
- mymob.fire = new /obj/screen()
+ mymob.fire = new /atom/movable/screen()
mymob.fire.icon = 'icons/mob/screen/diona_nymph.dmi'
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index bb88ce688f1..df453377559 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -16,12 +16,12 @@
/datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen/midnight.dmi')
- blobpwrdisplay = new /obj/screen()
+ blobpwrdisplay = new /atom/movable/screen()
blobpwrdisplay.name = "blob power"
blobpwrdisplay.icon_state = "block"
blobpwrdisplay.screen_loc = ui_health
- blobhealthdisplay = new /obj/screen()
+ blobhealthdisplay = new /atom/movable/screen()
blobhealthdisplay.name = "blob health"
blobhealthdisplay.icon_state = "block"
blobhealthdisplay.screen_loc = ui_internal
@@ -37,9 +37,9 @@
src.adding = list()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "act_intent"
using.set_dir(SOUTHWEST)
using.icon = ui_style
@@ -54,7 +54,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),1,ico.Height()/2,ico.Width()/2,ico.Height())
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = "help"
using.icon = ico
using.screen_loc = ui_zonesel
@@ -64,7 +64,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,ico.Height()/2,ico.Width(),ico.Height())
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = "disarm"
using.icon = ico
using.screen_loc = ui_zonesel
@@ -74,7 +74,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),ico.Width()/2,1,ico.Width(),ico.Height()/2)
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = "grab"
using.icon = ico
using.screen_loc = ui_zonesel
@@ -84,7 +84,7 @@
ico = new(ui_style, "black")
ico.MapColors(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, -1,-1,-1,-1)
ico.DrawBox(rgb(255,255,255,1),1,1,ico.Width()/2,ico.Height()/2)
- using = new /obj/screen( src )
+ using = new /atom/movable/screen( src )
using.name = I_HURT
using.icon = ico
using.screen_loc = ui_zonesel
@@ -112,31 +112,31 @@
constructtype = "harvester"
if(constructtype)
- mymob.fire = new /obj/screen()
+ mymob.fire = new /atom/movable/screen()
mymob.fire.icon = 'icons/mob/screen/construct.dmi'
mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_construct_fire
- mymob.healths = new /obj/screen()
+ mymob.healths = new /atom/movable/screen()
mymob.healths.icon = 'icons/mob/screen/construct.dmi'
mymob.healths.icon_state = "[constructtype]_health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_construct_health
- mymob.pullin = new /obj/screen()
+ mymob.pullin = new /atom/movable/screen()
mymob.pullin.icon = 'icons/mob/screen/construct.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
mymob.pullin.screen_loc = ui_construct_pull
- mymob.zone_sel = new /obj/screen/zone_sel()
+ mymob.zone_sel = new /atom/movable/screen/zone_sel()
mymob.zone_sel.icon = 'icons/mob/screen/construct.dmi'
mymob.zone_sel.ClearOverlays()
mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]"))
- mymob.purged = new /obj/screen()
+ mymob.purged = new /atom/movable/screen()
mymob.purged.icon = 'icons/mob/screen/construct.dmi'
mymob.purged.icon_state = "purge0"
mymob.purged.name = "purged"
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index 3dbdebceefb..eaef5fee7c0 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -3,54 +3,54 @@
GLOBAL_LIST_EMPTY(radial_menus)
-/obj/screen/radial
+/atom/movable/screen/radial
icon = 'icons/mob/screen/radial.dmi'
layer = RADIAL_BASE_LAYER
var/datum/radial_menu/parent
-/obj/screen/radial/Destroy()
+/atom/movable/screen/radial/Destroy()
QDEL_NULL(parent)
return ..()
-/obj/screen/radial/slice
+/atom/movable/screen/radial/slice
icon_state = "radial_slice"
var/choice
var/next_page = FALSE
var/tooltips = FALSE
-/obj/screen/radial/slice/MouseEntered(location, control, params)
+/atom/movable/screen/radial/slice/MouseEntered(location, control, params)
. = ..()
icon_state = "radial_slice_focus"
if(tooltips)
openToolTip(usr, src, params, title = name)
-/obj/screen/radial/slice/MouseExited(location, control, params)
+/atom/movable/screen/radial/slice/MouseExited(location, control, params)
. = ..()
icon_state = "radial_slice"
if(tooltips)
closeToolTip(usr)
-/obj/screen/radial/slice/Click(location, control, params)
+/atom/movable/screen/radial/slice/Click(location, control, params)
if(usr.client == parent.current_user)
if(next_page)
parent.next_page()
else
parent.element_chosen(choice,usr)
-/obj/screen/radial/center
+/atom/movable/screen/radial/center
name = "Close Menu"
icon_state = "radial_center"
-/obj/screen/radial/center/MouseEntered(location, control, params)
+/atom/movable/screen/radial/center/MouseEntered(location, control, params)
. = ..()
icon_state = "radial_center_focus"
-/obj/screen/radial/center/MouseExited(location, control, params)
+/atom/movable/screen/radial/center/MouseExited(location, control, params)
. = ..()
icon_state = "radial_center"
-/obj/screen/radial/center/Click(location, control, params)
+/atom/movable/screen/radial/center/Click(location, control, params)
if(usr.client == parent.current_user)
parent.finished = TRUE
@@ -62,8 +62,8 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/selected_choice
- var/list/obj/screen/elements = list()
- var/obj/screen/radial/center/close_button
+ var/list/atom/movable/screen/elements = list()
+ var/atom/movable/screen/radial/center/close_button
var/client/current_user
var/atom/anchor
var/image/menu_holder
@@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
if(elements.len < max_elements)
var/elements_to_add = max_elements - elements.len
for(var/i in 1 to elements_to_add) //Create all elements
- var/obj/screen/radial/slice/new_element = new /obj/screen/radial/slice
+ var/atom/movable/screen/radial/slice/new_element = new /atom/movable/screen/radial/slice
new_element.tooltips = use_tooltips
new_element.parent = src
elements += new_element
@@ -157,14 +157,14 @@ GLOBAL_LIST_EMPTY(radial_menus)
var/list/page_choices = page_data[current_page]
var/angle_per_element = round(zone / page_choices.len)
for(var/i in 1 to elements.len)
- var/obj/screen/radial/E = elements[i]
+ var/atom/movable/screen/radial/E = elements[i]
var/angle = Wrap(starting_angle + (i - 1) * angle_per_element,0,360)
if(i > page_choices.len)
HideElement(E)
else
SetElement(E,page_choices[i],angle,anim = anim,anim_order = i)
-/datum/radial_menu/proc/HideElement(obj/screen/radial/slice/E)
+/datum/radial_menu/proc/HideElement(atom/movable/screen/radial/slice/E)
E.overlays.Cut()
E.alpha = 0
E.name = "None"
@@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
E.choice = null
E.next_page = FALSE
-/datum/radial_menu/proc/SetElement(obj/screen/radial/slice/E,choice_id,angle,anim,anim_order)
+/datum/radial_menu/proc/SetElement(atom/movable/screen/radial/slice/E,choice_id,angle,anim,anim_order)
//Position
var/py = round(cos(angle) * radius) + py_shift
var/px = round(sin(angle) * radius)
@@ -285,7 +285,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
menu_holder.vis_contents = null
elements -= src
- for(var/obj/screen/radial/slice/possibly_our_child in elements)
+ for(var/atom/movable/screen/radial/slice/possibly_our_child in elements)
if(possibly_our_child.parent == src)
possibly_our_child.parent = null
diff --git a/code/_onclick/hud/radial_persistent.dm b/code/_onclick/hud/radial_persistent.dm
index b3cdfef090a..887df639eff 100644
--- a/code/_onclick/hud/radial_persistent.dm
+++ b/code/_onclick/hud/radial_persistent.dm
@@ -2,19 +2,19 @@
A derivative of radial menu which persists onscreen until closed and invokes a callback each time an element is clicked
*/
-/obj/screen/radial/persistent/center
+/atom/movable/screen/radial/persistent/center
name = "Close Menu"
icon_state = "radial_center"
-/obj/screen/radial/persistent/center/Click(location, control, params)
+/atom/movable/screen/radial/persistent/center/Click(location, control, params)
if(usr.client == parent.current_user)
parent.element_chosen(null,usr)
-/obj/screen/radial/persistent/center/MouseEntered(location, control, params)
+/atom/movable/screen/radial/persistent/center/MouseEntered(location, control, params)
. = ..()
icon_state = "radial_center_focus"
-/obj/screen/radial/persistent/center/MouseExited(location, control, params)
+/atom/movable/screen/radial/persistent/center/MouseExited(location, control, params)
. = ..()
icon_state = "radial_center"
@@ -23,7 +23,7 @@
var/datum/callback/select_proc_callback
/datum/radial_menu/persistent/New()
- close_button = new /obj/screen/radial/persistent/center
+ close_button = new /atom/movable/screen/radial/persistent/center
close_button.parent = src
/datum/radial_menu/persistent/element_chosen(choice_id,mob/user)
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index abf03dc6878..564b7c39fc9 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -1,4 +1,4 @@
-var/obj/screen/robot_inventory
+var/atom/movable/screen/robot_inventory
/mob/living/silicon/robot/instantiate_hud(datum/hud/HUD)
HUD.robot_hud()
@@ -8,7 +8,7 @@ var/obj/screen/robot_inventory
src.adding = list()
src.other = list()
- var/obj/screen/using
+ var/atom/movable/screen/using
if(!isrobot(mymob))
return
@@ -16,7 +16,7 @@ var/obj/screen/robot_inventory
var/mob/living/silicon/robot/r = mymob
//Radio
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "radio"
using.set_dir(SOUTHWEST)
using.icon = 'icons/mob/screen/robot.dmi'
@@ -26,22 +26,22 @@ var/obj/screen/robot_inventory
//Module select
- using = new /obj/screen/module/one()
+ using = new /atom/movable/screen/module/one()
src.adding += using
r.inv1 = using
- using = new /obj/screen/module/two()
+ using = new /atom/movable/screen/module/two()
src.adding += using
r.inv2 = using
- using = new /obj/screen/module/three()
+ using = new /atom/movable/screen/module/three()
src.adding += using
r.inv3 = using
//End of module select
//Intent
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "act_intent"
using.set_dir(SOUTHWEST)
using.icon = 'icons/mob/screen/robot.dmi'
@@ -51,28 +51,28 @@ var/obj/screen/robot_inventory
action_intent = using
// Up Hint
- mymob.up_hint = new /obj/screen()
+ mymob.up_hint = new /atom/movable/screen()
mymob.up_hint.icon = 'icons/mob/screen/robot.dmi'
mymob.up_hint.icon_state = "uphint0"
mymob.up_hint.name = "up hint"
mymob.up_hint.screen_loc = ui_up_hint
//Cell
- r.cells = new /obj/screen()
+ r.cells = new /atom/movable/screen()
r.cells.icon = 'icons/mob/screen/robot.dmi'
r.cells.icon_state = "charge-empty"
r.cells.name = "cell"
r.cells.screen_loc = ui_toxin
//Health
- mymob.healths = new /obj/screen()
+ mymob.healths = new /atom/movable/screen()
mymob.healths.icon = 'icons/mob/screen/robot.dmi'
mymob.healths.icon_state = "health0"
mymob.healths.name = "health"
mymob.healths.screen_loc = ui_borg_health
//Installed Module
- mymob.hands = new /obj/screen()
+ mymob.hands = new /atom/movable/screen()
mymob.hands.icon = 'icons/mob/screen/robot.dmi'
mymob.hands.icon_state = "nomod"
mymob.hands.name = "module"
@@ -87,7 +87,7 @@ var/obj/screen/robot_inventory
mymob.hands.name = "Return-to-core"
//Module Panel
- using = new /obj/screen()
+ using = new /atom/movable/screen()
using.name = "panel"
using.icon = 'icons/mob/screen/robot.dmi'
using.icon_state = "panel"
@@ -95,14 +95,14 @@ var/obj/screen/robot_inventory
src.adding += using
//Store
- mymob.throw_icon = new /obj/screen()
+ mymob.throw_icon = new /atom/movable/screen()
mymob.throw_icon.icon = 'icons/mob/screen/robot.dmi'
mymob.throw_icon.icon_state = "store"
mymob.throw_icon.name = "store"
mymob.throw_icon.screen_loc = ui_borg_store
//Inventory
- robot_inventory = new /obj/screen()
+ robot_inventory = new /atom/movable/screen()
robot_inventory.name = "inventory"
robot_inventory.icon = 'icons/mob/screen/robot.dmi'
robot_inventory.icon_state = "inventory"
@@ -110,13 +110,13 @@ var/obj/screen/robot_inventory
//Temp
- mymob.pullin = new /obj/screen()
+ mymob.pullin = new /atom/movable/screen()
mymob.pullin.icon = 'icons/mob/screen/robot.dmi'
mymob.pullin.icon_state = "pull0"
mymob.pullin.name = "pull"
mymob.pullin.screen_loc = ui_borg_pull
- mymob.zone_sel = new /obj/screen/zone_sel()
+ mymob.zone_sel = new /atom/movable/screen/zone_sel()
mymob.zone_sel.icon = 'icons/mob/screen/robot.dmi'
mymob.zone_sel.ClearOverlays()
mymob.zone_sel.AddOverlays(image('icons/mob/zone_sel.dmi', "[mymob.zone_sel.selecting]"))
@@ -127,12 +127,12 @@ var/obj/screen/robot_inventory
//Handle the gun settings buttons
- mymob.gun_setting_icon = new /obj/screen/gun/mode(null)
- mymob.item_use_icon = new /obj/screen/gun/item(null)
- mymob.gun_move_icon = new /obj/screen/gun/move(null)
- mymob.radio_use_icon = new /obj/screen/gun/radio(null)
- mymob.toggle_firing_mode = new /obj/screen/gun/burstfire(null)
- mymob.unique_action_icon = new /obj/screen/gun/uniqueaction(null)
+ mymob.gun_setting_icon = new /atom/movable/screen/gun/mode(null)
+ mymob.item_use_icon = new /atom/movable/screen/gun/item(null)
+ mymob.gun_move_icon = new /atom/movable/screen/gun/move(null)
+ mymob.radio_use_icon = new /atom/movable/screen/gun/radio(null)
+ mymob.toggle_firing_mode = new /atom/movable/screen/gun/burstfire(null)
+ mymob.unique_action_icon = new /atom/movable/screen/gun/uniqueaction(null)
mymob.client.screen = null
diff --git a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
index 69cc930186b..8d8abd6c873 100644
--- a/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
+++ b/code/_onclick/hud/screen_object_types/ai_screen_objs.dm
@@ -1,29 +1,29 @@
// AI and Borg screen objects be here.
-/obj/screen/module
+/atom/movable/screen/module
dir = SOUTHWEST
icon = 'icons/mob/screen/robot.dmi'
var/mod_pos
-/obj/screen/module/one
+/atom/movable/screen/module/one
name = "module1"
icon_state = "inv1"
screen_loc = ui_inv1
mod_pos = 1
-/obj/screen/module/two
+/atom/movable/screen/module/two
name = "module2"
icon_state = "inv2"
screen_loc = ui_inv2
mod_pos = 2
-/obj/screen/module/three
+/atom/movable/screen/module/three
name = "module3"
icon_state = "inv3"
screen_loc = ui_inv3
mod_pos = 3
-/obj/screen/module/Click()
+/atom/movable/screen/module/Click()
if (!istype(usr, /mob/living/silicon/robot))
return
@@ -32,129 +32,129 @@
var/mob/living/silicon/robot/R = usr
R.toggle_module(mod_pos)
-/obj/screen/ai
+/atom/movable/screen/ai
icon = 'icons/mob/screen/ai.dmi'
-/obj/screen/ai/core
+/atom/movable/screen/ai/core
name = "AI Core"
icon_state = "ai_core"
screen_loc = ui_ai_core
-/obj/screen/ai/core/Click()
+/atom/movable/screen/ai/core/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.view_core()
-/obj/screen/ai/camera_list
+/atom/movable/screen/ai/camera_list
name = "Show Camera List"
icon_state = "camera"
screen_loc = ui_ai_camera_list
-/obj/screen/ai/camera_list/Click()
+/atom/movable/screen/ai/camera_list/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/camera = tgui_input_list(AI, "Select a camera.", "Show Camera List", AI.get_camera_list())
if (camera)
AI.ai_camera_list(camera)
-/obj/screen/ai/camera_track
+/atom/movable/screen/ai/camera_track
name = "Track With Camera"
icon_state = "track"
screen_loc = ui_ai_track_with_camera
-/obj/screen/ai/camera_track/Click()
+/atom/movable/screen/ai/camera_track/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/target_name = tgui_input_list(AI, "Select a mob to track.", "Track With Camera", AI.trackable_mobs())
if (target_name)
AI.ai_camera_track(target_name)
-/obj/screen/ai/camera_light
+/atom/movable/screen/ai/camera_light
name = "Toggle Camera Light"
icon_state = "camera_light"
screen_loc = ui_ai_camera_light
-/obj/screen/ai/camera_light/Click()
+/atom/movable/screen/ai/camera_light/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.toggle_camera_light()
-/obj/screen/ai/crew_manifest
+/atom/movable/screen/ai/crew_manifest
name = "Show Crew Manifest"
icon_state = "manifest"
screen_loc = ui_ai_crew_manifest
-/obj/screen/ai/crew_manifest/Click()
+/atom/movable/screen/ai/crew_manifest/Click()
if (isAI(usr))
SSrecords.open_manifest_tgui(usr)
-/obj/screen/ai/announcement
+/atom/movable/screen/ai/announcement
name = "Announcement"
icon_state = "announcement"
screen_loc = ui_ai_announcement
-/obj/screen/ai/announcement/Click()
+/atom/movable/screen/ai/announcement/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_announcement()
-/obj/screen/ai/call_shuttle
+/atom/movable/screen/ai/call_shuttle
name = "Call Evacuation"
icon_state = "call_shuttle"
screen_loc = ui_ai_shuttle
-/obj/screen/ai/call_shuttle/Click()
+/atom/movable/screen/ai/call_shuttle/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_call_shuttle()
-/obj/screen/ai/state_laws
+/atom/movable/screen/ai/state_laws
name = "State Laws"
icon_state = "state_laws"
screen_loc = ui_ai_state_laws
-/obj/screen/ai/state_laws/Click()
+/atom/movable/screen/ai/state_laws/Click()
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.computer.ui_interact(usr)
AI.computer.run_program("lawmanager")
-/obj/screen/ai/take_image
+/atom/movable/screen/ai/take_image
name = "Take Image"
icon_state = "take_picture"
screen_loc = ui_ai_take_picture
-/obj/screen/ai/take_image/Click()
+/atom/movable/screen/ai/take_image/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_camera.toggle_camera_mode()
-/obj/screen/ai/view_image
+/atom/movable/screen/ai/view_image
name = "View Images"
icon_state = "view_images"
screen_loc = ui_ai_view_images
-/obj/screen/ai/view_image/Click()
+/atom/movable/screen/ai/view_image/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_camera.viewpictures()
-/obj/screen/ai/sensor_aug
+/atom/movable/screen/ai/sensor_aug
name = "Set Sensor Augmentation"
icon_state = "ai_sensor"
screen_loc = ui_ai_sensor
-/obj/screen/ai/sensor_aug/Click()
+/atom/movable/screen/ai/sensor_aug/Click()
if (isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.sensor_mode()
-/obj/screen/ai/remote_mech
+/atom/movable/screen/ai/remote_mech
name = "Remote Control Shell"
icon_state = "remote_mech"
screen_loc = ui_ai_mech
-/obj/screen/ai/remote_mech/Click()
+/atom/movable/screen/ai/remote_mech/Click()
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
if(AI.anchored)
@@ -162,20 +162,20 @@
else
to_chat(AI, SPAN_WARNING("You are unable to get a good connection while unanchored from the station systems."))
-/obj/screen/ai/move_up
+/atom/movable/screen/ai/move_up
name = "Move Up"
icon_state = "move_up"
screen_loc = ui_ai_move_up
-/obj/screen/ai/move_up/Click()
+/atom/movable/screen/ai/move_up/Click()
if (isAI(usr))
usr.up()
-/obj/screen/ai/move_down
+/atom/movable/screen/ai/move_down
name = "Move Down"
icon_state = "move_down"
screen_loc = ui_ai_move_down
-/obj/screen/ai/move_down/Click()
+/atom/movable/screen/ai/move_down/Click()
if (isAI(usr))
usr.down()
diff --git a/code/_onclick/hud/screen_object_types/borer.dm b/code/_onclick/hud/screen_object_types/borer.dm
index 80d50b15058..0950cb42469 100644
--- a/code/_onclick/hud/screen_object_types/borer.dm
+++ b/code/_onclick/hud/screen_object_types/borer.dm
@@ -1,14 +1,14 @@
-/obj/screen/borer
+/atom/movable/screen/borer
icon = 'icons/mob/screen/borer.dmi'
maptext_x = 5
maptext_y = 16
-/obj/screen/borer/chemicals
+/atom/movable/screen/borer/chemicals
name = "chemicals"
icon_state = "chemicals"
screen_loc = ui_alien_toxin
-/obj/screen/borer/chemicals/Click(var/location, var/control, var/params)
+/atom/movable/screen/borer/chemicals/Click(var/location, var/control, var/params)
if(istype(usr, /mob/living/simple_animal/borer))
var/mob/living/simple_animal/borer/B = usr
to_chat(usr, SPAN_NOTICE("You have [B.chemicals]u of chemicals to use for your abilities."))
diff --git a/code/_onclick/hud/screen_object_types/internals.dm b/code/_onclick/hud/screen_object_types/internals.dm
index e3d47af7d18..9cac77d6af6 100644
--- a/code/_onclick/hud/screen_object_types/internals.dm
+++ b/code/_onclick/hud/screen_object_types/internals.dm
@@ -1,9 +1,9 @@
-/obj/screen/internals
+/atom/movable/screen/internals
name = "internal"
screen_loc = ui_internal
icon_state = "internal0"
-/obj/screen/internals/Click()
+/atom/movable/screen/internals/Click()
if(!iscarbon(usr))
return
var/mob/living/carbon/C = usr
@@ -144,11 +144,11 @@
else
to_chat(C, SPAN_NOTICE("You don't have a[breathes==GAS_OXYGEN ? "n oxygen" : addtext(" ",breathes)] tank."))
-/obj/screen/internals/proc/lose_internals(var/mob/living/carbon/human/user)
+/atom/movable/screen/internals/proc/lose_internals(var/mob/living/carbon/human/user)
icon_state = "internal0"
user.internal = null
-/obj/screen/internals/proc/has_internals_mask(var/mob/living/carbon/human/user)
+/atom/movable/screen/internals/proc/has_internals_mask(var/mob/living/carbon/human/user)
if(user.wear_mask && (user.wear_mask.item_flags & ITEM_FLAG_AIRTIGHT))
return TRUE
if(user.head && (user.head.item_flags & ITEM_FLAG_AIRTIGHT))
diff --git a/code/_onclick/hud/screen_object_types/vampire.dm b/code/_onclick/hud/screen_object_types/vampire.dm
index 1e36e783258..abcb017a1a3 100644
--- a/code/_onclick/hud/screen_object_types/vampire.dm
+++ b/code/_onclick/hud/screen_object_types/vampire.dm
@@ -1,36 +1,36 @@
-/obj/screen/vampire
+/atom/movable/screen/vampire
icon = 'icons/mob/screen/vampire.dmi'
maptext_x = 5
maptext_y = 16
-/obj/screen/vampire/blood
+/atom/movable/screen/vampire/blood
name = "usable blood"
icon_state = "blood"
screen_loc = ui_alien_toxin
-/obj/screen/vampire/blood/Click(var/location, var/control, var/params)
+/atom/movable/screen/vampire/blood/Click(var/location, var/control, var/params)
if(ishuman(usr))
var/datum/vampire/vampire = usr.mind.antag_datums[MODE_VAMPIRE]
to_chat(usr, SPAN_NOTICE("You have [vampire.blood_usable]u of blood to use for vampiric powers."))
to_chat(usr, SPAN_WARNING("If it drops too low, you will go into a blood frenzy. You can only store a maximum of [VAMPIRE_MAX_USABLE_BLOOD]u."))
-/obj/screen/vampire/frenzy
+/atom/movable/screen/vampire/frenzy
name = "frenzy count"
icon_state = "frenzy"
screen_loc = ui_alien_fire
-/obj/screen/vampire/frenzy/Click(var/location, var/control, var/params)
+/atom/movable/screen/vampire/frenzy/Click(var/location, var/control, var/params)
if(ishuman(usr))
var/datum/vampire/vampire = usr.mind.antag_datums[MODE_VAMPIRE]
to_chat(usr, SPAN_WARNING("Your frenzy counter is at [vampire.frenzy]."))
to_chat(usr, SPAN_WARNING("If it raises too high, you will gain incredible power, but they will be very unsubtle. You can lower your frenzy counter by getting out of holy areas and by obtaining usable blood."))
-/obj/screen/vampire/suck
+/atom/movable/screen/vampire/suck
name = "blood_suck"
icon_state = "suck"
screen_loc = ui_suck
-/obj/screen/vampire/suck/Click(var/location, var/control, var/params)
+/atom/movable/screen/vampire/suck/Click(var/location, var/control, var/params)
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
H.vampire_drain_blood()
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 52b25db57e5..e79cd0da271 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -6,23 +6,22 @@
They are used with the client/screen list and the screen_loc var.
For more information, see the byond documentation on the screen_loc and screen vars.
*/
-/obj/screen
+/atom/movable/screen
name = ""
icon = 'icons/mob/screen/generic.dmi'
plane = HUD_PLANE
layer = HUD_BASE_LAYER
- unacidable = 1
var/obj/master = null //A reference to the object in the slot. Grabs or items, generally.
var/datum/hud/hud = null // A reference to the owner HUD, if any.
appearance_flags = NO_CLIENT_COLOR
-/obj/screen/Initialize(mapload, ...)
+/atom/movable/screen/Initialize(mapload, ...)
. = ..()
//This is done with signals because the screen code sucks, blame the ancient developers
if(hud)
RegisterSignal(hud, COMSIG_QDELETING, PROC_REF(handle_hud_destruction))
-/obj/screen/Destroy(force = FALSE)
+/atom/movable/screen/Destroy(force = FALSE)
master = null
screen_loc = null
hud = null
@@ -31,13 +30,13 @@
/**
* Handles the deletion of the HUD this screen is associated to
*/
-/obj/screen/proc/handle_hud_destruction()
+/atom/movable/screen/proc/handle_hud_destruction()
SIGNAL_HANDLER
UnregisterSignal(hud, COMSIG_QDELETING)
qdel(src)
-/obj/screen/text
+/atom/movable/screen/text
icon = null
icon_state = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -45,21 +44,21 @@
maptext_height = 480
maptext_width = 480
-/obj/screen/inventory
+/atom/movable/screen/inventory
var/slot_id //The identifier for the slot. It has nothing to do with ID cards.
var/list/object_overlays = list() // Required for inventory/screen overlays.
var/color_changed = FALSE
-/obj/screen/inventory/MouseEntered()
+/atom/movable/screen/inventory/MouseEntered()
..()
add_overlays()
-/obj/screen/inventory/MouseExited()
+/atom/movable/screen/inventory/MouseExited()
..()
CutOverlays(object_overlays)
object_overlays.Cut()
-/obj/screen/inventory/proc/add_overlays()
+/atom/movable/screen/inventory/proc/add_overlays()
var/mob/user = hud.mymob
if(hud && user && slot_id)
@@ -76,7 +75,7 @@
object_overlays += item_overlay
AddOverlays(object_overlays)
-/obj/screen/inventory/proc/set_color_for(var/set_color, var/set_time)
+/atom/movable/screen/inventory/proc/set_color_for(var/set_color, var/set_time)
if(color_changed)
return
var/old_color = color
@@ -84,14 +83,14 @@
color_changed = TRUE
addtimer(CALLBACK(src, PROC_REF(set_color_to), old_color), set_time)
-/obj/screen/inventory/proc/set_color_to(var/set_color)
+/atom/movable/screen/inventory/proc/set_color_to(var/set_color)
color = set_color
color_changed = FALSE
-/obj/screen/close
+/atom/movable/screen/close
name = "close"
-/obj/screen/close/Click()
+/atom/movable/screen/close/Click()
if(master)
if(istype(master, /obj/item/storage))
var/obj/item/storage/S = master
@@ -99,14 +98,14 @@
return 1
-/obj/screen/item_action
+/atom/movable/screen/item_action
var/obj/item/owner
-/obj/screen/item_action/Destroy()
+/atom/movable/screen/item_action/Destroy()
owner = null
. = ..()
-/obj/screen/item_action/Click()
+/atom/movable/screen/item_action/Click()
if(!usr || !owner)
return 1
if(!usr.canClick())
@@ -121,28 +120,28 @@
owner.ui_action_click()
return 1
-/obj/screen/grab
+/atom/movable/screen/grab
name = "grab"
-/obj/screen/grab/Click()
+/atom/movable/screen/grab/Click()
var/obj/item/grab/G = master
G.s_click(src)
return 1
-/obj/screen/grab/attack_hand()
+/atom/movable/screen/grab/attack_hand()
return
-/obj/screen/grab/attackby()
+/atom/movable/screen/grab/attackby()
return
-/obj/screen/storage
+/atom/movable/screen/storage
name = "storage"
screen_loc = "7,7 to 10,8"
plane = HUD_PLANE
layer = HUD_BASE_LAYER
-/obj/screen/storage/Click()
+/atom/movable/screen/storage/Click()
if(!usr.canClick())
return TRUE
if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
@@ -153,25 +152,25 @@
usr.ClickOn(master)
return TRUE
-/obj/screen/storage/background
+/atom/movable/screen/storage/background
name = "background storage"
layer = HUD_BELOW_ITEM_LAYER
-/obj/screen/storage/background/Initialize(mapload, var/obj/set_master, var/set_icon_state)
+/atom/movable/screen/storage/background/Initialize(mapload, var/obj/set_master, var/set_icon_state)
. = ..()
master = set_master
if(master)
name = master.name
icon_state = set_icon_state
-/obj/screen/storage/background/Click()
+/atom/movable/screen/storage/background/Click()
if(usr.incapacitated())
return TRUE
if(master)
usr.ClickOn(master)
return TRUE
-/obj/screen/zone_sel
+/atom/movable/screen/zone_sel
name = "damage zone"
icon_state = "zone_sel"
screen_loc = ui_zonesel
@@ -180,7 +179,7 @@
var/hovering_choice
var/mutable_appearance/selecting_appearance
-/obj/screen/zone_sel/Click(location, control,params)
+/atom/movable/screen/zone_sel/Click(location, control,params)
if(isobserver(usr))
return
@@ -193,10 +192,10 @@
return set_selected_zone(choice, usr)
-/obj/screen/zone_sel/MouseEntered(location, control, params)
+/atom/movable/screen/zone_sel/MouseEntered(location, control, params)
MouseMove(location, control, params)
-/obj/screen/zone_sel/MouseMove(location, control, params)
+/atom/movable/screen/zone_sel/MouseMove(location, control, params)
if(isobserver(usr))
return
@@ -225,12 +224,12 @@
anchored = TRUE
plane = HUD_ITEM_LAYER
-/obj/screen/zone_sel/MouseExited(location, control, params)
+/atom/movable/screen/zone_sel/MouseExited(location, control, params)
if(!isobserver(usr) && hovering_choice)
remove_vis_contents(hover_overlays_cache[hovering_choice])
hovering_choice = null
-/obj/screen/zone_sel/proc/get_zone_at(icon_x, icon_y)
+/atom/movable/screen/zone_sel/proc/get_zone_at(icon_x, icon_y)
switch(icon_y)
if(1 to 3) //Feet
switch(icon_x)
@@ -274,7 +273,7 @@
return BP_EYES
return BP_HEAD
-/obj/screen/zone_sel/proc/set_selected_zone(choice, mob/user)
+/atom/movable/screen/zone_sel/proc/set_selected_zone(choice, mob/user)
if(isobserver(user))
return
if(choice != selecting)
@@ -282,12 +281,12 @@
update_icon()
SEND_SIGNAL(user, COMSIG_MOB_ZONE_SEL_CHANGE, user)
-/obj/screen/zone_sel/update_icon()
+/atom/movable/screen/zone_sel/update_icon()
ClearOverlays()
selecting_appearance = mutable_appearance('icons/mob/zone_sel.dmi', "[selecting]")
AddOverlays(selecting_appearance)
-/obj/screen/Click(location, control, params)
+/atom/movable/screen/Click(location, control, params)
if(!usr)
return TRUE
var/list/modifiers = params2list(params)
@@ -426,7 +425,7 @@
return 0
return 1
-/obj/screen/inventory/Click()
+/atom/movable/screen/inventory/Click()
// At this point in client Click() code we have passed the 1/10 sec check and little else
// We don't even know if it's a middle click
if(!usr.canClick())
@@ -453,12 +452,12 @@
return 1
-/obj/screen/movement_intent
+/atom/movable/screen/movement_intent
name = "mov_intent"
screen_loc = ui_movi
//This updates the run/walk button on the hud
-/obj/screen/movement_intent/proc/update_move_icon(var/mob/living/user)
+/atom/movable/screen/movement_intent/proc/update_move_icon(var/mob/living/user)
if(!user.client)
return
@@ -481,7 +480,7 @@
#define BLACKLIST_SPECIES_RUNNING list(SPECIES_DIONA, SPECIES_DIONA_COEUS)
-/obj/screen/movement_intent/Click(location, control, params)
+/atom/movable/screen/movement_intent/Click(location, control, params)
if(!usr)
return 1
var/list/modifiers = params2list(params)
@@ -539,12 +538,12 @@
#undef BLACKLIST_SPECIES_RUNNING
// Hand slots are special to handle the handcuffs overlay
-/obj/screen/inventory/hand
+/atom/movable/screen/inventory/hand
var/image/handcuff_overlay
var/image/disabled_hand_overlay
var/image/removed_hand_overlay
-/obj/screen/inventory/hand/update_icon()
+/atom/movable/screen/inventory/hand/update_icon()
..()
if(!hud)
return
@@ -572,5 +571,5 @@
if(H.handcuffed)
AddOverlays(handcuff_overlay)
-/obj/screen/inventory/back
+/atom/movable/screen/inventory/back
name = "back"
diff --git a/code/_onclick/hud/spell_screen_objects.dm b/code/_onclick/hud/spell_screen_objects.dm
index c2bfb485cb6..14707e7cd47 100644
--- a/code/_onclick/hud/spell_screen_objects.dm
+++ b/code/_onclick/hud/spell_screen_objects.dm
@@ -1,8 +1,8 @@
-/obj/screen/movable/spell_master
+/atom/movable/screen/movable/spell_master
name = "Spells"
icon = 'icons/mob/screen/spells.dmi'
icon_state = "wiz_spell_ready"
- var/list/obj/screen/spell/spell_objects = list()
+ var/list/atom/movable/screen/spell/spell_objects = list()
var/showing = 0
var/open_state = "master_open"
@@ -12,8 +12,8 @@
var/mob/spell_holder
-/obj/screen/movable/spell_master/Destroy()
- for(var/obj/screen/spell/spells in spell_objects)
+/atom/movable/screen/movable/spell_master/Destroy()
+ for(var/atom/movable/screen/spell/spells in spell_objects)
spells.spellmaster = null
spell_objects.Cut()
if(spell_holder)
@@ -24,22 +24,22 @@
. = ..()
-/obj/screen/movable/spell_master/MouseDrop()
+/atom/movable/screen/movable/spell_master/MouseDrop()
if(showing)
return
return ..()
-/obj/screen/movable/spell_master/Click()
+/atom/movable/screen/movable/spell_master/Click()
if(!spell_objects.len)
qdel(src)
return
toggle_open()
-/obj/screen/movable/spell_master/proc/toggle_open(var/forced_state = 0)
+/atom/movable/screen/movable/spell_master/proc/toggle_open(var/forced_state = 0)
if(showing && (forced_state != 2))
- for(var/obj/screen/spell/O in spell_objects)
+ for(var/atom/movable/screen/spell/O in spell_objects)
if(spell_holder && spell_holder.client)
spell_holder.client.screen -= O
O.handle_icon_updates = 0
@@ -53,7 +53,7 @@
ClearOverlays()
AddOverlays(open_state)
-/obj/screen/movable/spell_master/proc/open_spellmaster()
+/atom/movable/screen/movable/spell_master/proc/open_spellmaster()
var/list/screen_loc_xy = text2list(screen_loc,",")
//Create list of X offsets
@@ -67,7 +67,7 @@
var/y_pix = screen_loc_Y[2]
for(var/i = 1; i <= spell_objects.len; i++)
- var/obj/screen/spell/S = spell_objects[i]
+ var/atom/movable/screen/spell/S = spell_objects[i]
var/xpos = x_position + (x_position < 8 ? 1 : -1)*(i%7)
var/ypos = y_position + (y_position < 8 ? round(i/7) : -round(i/7))
S.screen_loc = "[encode_screen_X(xpos)]:[x_pix],[encode_screen_Y(ypos)]:[y_pix]"
@@ -75,7 +75,7 @@
spell_holder.client.screen += S
S.handle_icon_updates = 1
-/obj/screen/movable/spell_master/proc/add_spell(var/spell/spell)
+/atom/movable/screen/movable/spell_master/proc/add_spell(var/spell/spell)
if(!spell) return
if(spell.connected_button) //we have one already, for some reason
@@ -90,7 +90,7 @@
if(spell.spell_flags & NO_BUTTON) //no button to add if we don't get one
return
- var/obj/screen/spell/newscreen = new /obj/screen/spell
+ var/atom/movable/screen/spell/newscreen = new /atom/movable/screen/spell
newscreen.spellmaster = src
newscreen.spell = spell
@@ -109,7 +109,7 @@
if(spell_holder.client)
toggle_open(2) //forces the icons to refresh on screen
-/obj/screen/movable/spell_master/proc/remove_spell(var/spell/spell)
+/atom/movable/screen/movable/spell_master/proc/remove_spell(var/spell/spell)
qdel(spell.connected_button)
spell.connected_button = null
@@ -119,21 +119,21 @@
else
qdel(src)
-/obj/screen/movable/spell_master/proc/silence_spells(var/amount)
- for(var/obj/screen/spell/spell in spell_objects)
+/atom/movable/screen/movable/spell_master/proc/silence_spells(var/amount)
+ for(var/atom/movable/screen/spell/spell in spell_objects)
spell.spell.silenced = amount
spell.spell.process()
spell.update_charge(1)
-/obj/screen/movable/spell_master/proc/update_spells(forced = 0, mob/user)
+/atom/movable/screen/movable/spell_master/proc/update_spells(forced = 0, mob/user)
if(user && user.client)
if(!(src in user.client.screen))
user.client.screen += src
- for(var/obj/screen/spell/spell in spell_objects)
+ for(var/atom/movable/screen/spell/spell in spell_objects)
spell.update_charge(forced)
-/obj/screen/movable/spell_master/genetic
+/atom/movable/screen/movable/spell_master/genetic
name = "Mutant Powers"
icon_state = "genetic_spell_ready"
@@ -145,7 +145,7 @@
//////////////ACTUAL SPELLS//////////////
//This is what you click to cast things//
/////////////////////////////////////////
-/obj/screen/spell
+/atom/movable/screen/spell
icon = 'icons/mob/screen/spells.dmi'
icon_state = "wiz_spell_base"
var/spell_base = "wiz"
@@ -153,11 +153,11 @@
var/spell/spell = null
var/handle_icon_updates = 0
- var/obj/screen/movable/spell_master/spellmaster
+ var/atom/movable/screen/movable/spell_master/spellmaster
var/icon/last_charged_icon
-/obj/screen/spell/Destroy()
+/atom/movable/screen/spell/Destroy()
spell = null
last_charged_icon = null
if(spellmaster)
@@ -170,7 +170,7 @@
. = ..()
-/obj/screen/spell/proc/update_charge(var/forced_update = 0)
+/atom/movable/screen/spell/proc/update_charge(var/forced_update = 0)
if(!spell)
qdel(src)
return
@@ -208,7 +208,7 @@
if(spell.silenced)
AddOverlays("silence")
-/obj/screen/spell/Click()
+/atom/movable/screen/spell/Click()
if(!usr || !spell)
qdel(src)
return
diff --git a/code/controllers/subsystems/evacuation/evacuation_pods.dm b/code/controllers/subsystems/evacuation/evacuation_pods.dm
index 4d2c0a0327e..5fcadf358ac 100644
--- a/code/controllers/subsystems/evacuation/evacuation_pods.dm
+++ b/code/controllers/subsystems/evacuation/evacuation_pods.dm
@@ -171,7 +171,7 @@
if(evacuation_controller && evacuation_controller.cancel_evacuation())
log_and_message_admins("[key_name(user)] has cancelled the crew transfer.")
-/obj/screen/fullscreen/bluespace_overlay
+/atom/movable/screen/fullscreen/bluespace_overlay
icon = 'icons/effects/effects.dmi'
icon_state = "mfoam"
screen_loc = "WEST,SOUTH to EAST,NORTH"
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 545d4df3239..7b255ae4e43 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -50,7 +50,7 @@ var/datum/controller/subsystem/ticker/SSticker
//station_explosion used to be a variable for every mob's hud. Which was a waste!
//Now we have a general cinematic centrally held within the gameticker....far more efficient!
- var/obj/screen/cinematic = null
+ var/atom/movable/screen/cinematic = null
var/list/default_lobby_tracks = list(
'sound/music/lobby/space.ogg',
@@ -609,7 +609,7 @@ var/datum/controller/subsystem/ticker/SSticker
for(var/mob/abstract/new_player/NP in GLOB.player_list)
if(!NP.client)
continue
- var/obj/screen/new_player/selection/join_game/JG = locate() in NP.client.screen
+ var/atom/movable/screen/new_player/selection/join_game/JG = locate() in NP.client.screen
JG.update_icon(NP)
to_world(SPAN_NOTICE("Enjoy the round!"))
if(SSatlas.current_sector.sector_welcome_message)
@@ -639,7 +639,7 @@ var/datum/controller/subsystem/ticker/SSticker
return //already a cinematic in progress!
//initialise our cinematic screen object
- cinematic = new /obj/screen{
+ cinematic = new /atom/movable/screen{
icon = 'icons/effects/station_explosion.dmi';
icon_state = "station_intact";
layer = HUD_ABOVE_ITEM_LAYER;
diff --git a/code/game/antagonist/station/vampire.dm b/code/game/antagonist/station/vampire.dm
index e3b2cc0b441..977d381ec4f 100644
--- a/code/game/antagonist/station/vampire.dm
+++ b/code/game/antagonist/station/vampire.dm
@@ -94,9 +94,9 @@ var/datum/antagonist/vampire/vamp = null
user.client.images += vampire.master_image
if(vampire.status & VAMP_ISTHRALL)
return
- vampire.blood_hud = new /obj/screen/vampire/blood()
- vampire.frenzy_hud = new /obj/screen/vampire/frenzy()
- vampire.blood_suck_hud = new /obj/screen/vampire/suck()
+ vampire.blood_hud = new /atom/movable/screen/vampire/blood()
+ vampire.frenzy_hud = new /atom/movable/screen/vampire/frenzy()
+ vampire.blood_suck_hud = new /atom/movable/screen/vampire/suck()
user.client.screen += vampire.blood_hud
user.client.screen += vampire.frenzy_hud
user.client.screen += vampire.blood_suck_hud
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index c9765d1c67d..32a64ef16f9 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -115,7 +115,7 @@
SEND_SIGNAL(src, COMSIG_ATOM_EMP_ACT, severity, protection)
return protection // Pass the protection value collected here upwards
-/atom/proc/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/atom/proc/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
return
/atom/proc/bullet_act(obj/projectile/P, def_zone)
diff --git a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
index 3eab559f814..754073f72f2 100644
--- a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
+++ b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm
@@ -47,7 +47,7 @@
bluespaced += M
if(M.client)
to_chat(M,SPAN_NOTICE("You feel oddly light, and somewhat disoriented as everything around you shimmers and warps ever so slightly."))
- M.overlay_fullscreen("bluespace", /obj/screen/fullscreen/bluespace_overlay)
+ M.overlay_fullscreen("bluespace", /atom/movable/screen/fullscreen/bluespace_overlay)
M.confused = 20
/datum/universal_state/bluespace_jump/proc/clear_bluespaced(var/mob/living/M)
@@ -126,7 +126,7 @@
daddy.dust()
qdel(src)
-/obj/screen/fullscreen/bluespace_overlay
+/atom/movable/screen/fullscreen/bluespace_overlay
icon = 'icons/effects/effects.dmi'
icon_state = "mfoam"
screen_loc = "WEST,SOUTH to EAST,NORTH"
diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm
index b4d279b8c27..f32f8d75446 100644
--- a/code/game/gamemodes/technomancer/core_obj.dm
+++ b/code/game/gamemodes/technomancer/core_obj.dm
@@ -65,7 +65,7 @@
/obj/item/technomancer_core/dropped(mob/user)
if(!wearer)
return
- for(var/obj/screen/ability/obj_based/technomancer/A in wearer.ability_master.ability_objects)
+ for(var/atom/movable/screen/ability/obj_based/technomancer/A in wearer.ability_master.ability_objects)
wearer.ability_master.remove_ability(A)
wearer = null
..()
@@ -221,7 +221,7 @@
if(spell_to_remove in spells)
spells.Remove(spell_to_remove)
if(wearer)
- var/obj/screen/ability/obj_based/technomancer/A = wearer.ability_master.get_ability_by_instance(spell_to_remove)
+ var/atom/movable/screen/ability/obj_based/technomancer/A = wearer.ability_master.get_ability_by_instance(spell_to_remove)
if(A)
wearer.ability_master.remove_ability(A)
qdel(spell_to_remove)
diff --git a/code/game/gamemodes/vampire/vampire_datum.dm b/code/game/gamemodes/vampire/vampire_datum.dm
index 89c241d2982..ddd05652c8a 100644
--- a/code/game/gamemodes/vampire/vampire_datum.dm
+++ b/code/game/gamemodes/vampire/vampire_datum.dm
@@ -10,9 +10,9 @@
var/status = 0 // Bitfield including different statuses.
var/stealth = TRUE // Do you want your victims to know of your sucking?
- var/obj/screen/blood_hud
- var/obj/screen/frenzy_hud
- var/obj/screen/blood_suck_hud
+ var/atom/movable/screen/blood_hud
+ var/atom/movable/screen/frenzy_hud
+ var/atom/movable/screen/blood_suck_hud
var/list/datum/power/vampire/purchased_powers = list() // List of power datums available for use.
var/obj/effect/dummy/veil_walk/holder = null // The veil_walk dummy.
diff --git a/code/game/gamemodes/vampire/vampire_helpers.dm b/code/game/gamemodes/vampire/vampire_helpers.dm
index 946188369b9..ca87fd7655e 100644
--- a/code/game/gamemodes/vampire/vampire_helpers.dm
+++ b/code/game/gamemodes/vampire/vampire_helpers.dm
@@ -13,8 +13,8 @@
vampire.blood_usable += 30
if(client)
- vampire.blood_hud = new /obj/screen/vampire/blood()
- vampire.frenzy_hud = new /obj/screen/vampire/frenzy()
+ vampire.blood_hud = new /atom/movable/screen/vampire/blood()
+ vampire.frenzy_hud = new /atom/movable/screen/vampire/frenzy()
client.screen += vampire.blood_hud
client.screen += vampire.frenzy_hud
@@ -193,7 +193,7 @@
visible_message(SPAN_DANGER("A dark aura manifests itself around [src.name], their eyes turning red and their composure changing to be more beast-like."),
SPAN_DANGER("You can resist no longer. The power of the Veil takes control over your mind: you are unable to speak or think. In people, you see nothing but prey to be feasted upon. You are reduced to an animal."))
- overlay_fullscreen("frenzy", /obj/screen/fullscreen/frenzy)
+ overlay_fullscreen("frenzy", /atom/movable/screen/fullscreen/frenzy)
mutations |= HULK
update_mutations()
@@ -270,13 +270,13 @@
if(client)
if(!vampire.blood_hud)
- vampire.blood_hud = new /obj/screen/vampire/blood()
+ vampire.blood_hud = new /atom/movable/screen/vampire/blood()
client.screen += vampire.blood_hud
if(!vampire.frenzy_hud)
- vampire.frenzy_hud = new /obj/screen/vampire/frenzy()
+ vampire.frenzy_hud = new /atom/movable/screen/vampire/frenzy()
client.screen += vampire.frenzy_hud
if(!vampire.blood_suck_hud)
- vampire.blood_suck_hud = new /obj/screen/vampire/suck()
+ vampire.blood_suck_hud = new /atom/movable/screen/vampire/suck()
client.screen += vampire.blood_suck_hud
vampire.blood_hud.maptext = SMALL_FONTS(7, vampire.blood_usable)
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index d9b6c8a0b2e..dd8de7c71f0 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -157,7 +157,7 @@
for(var/i=0; i old_next_use && holder.wearer)
- var/obj/screen/inventory/back/B = locate(/obj/screen/inventory/back) in holder.wearer.hud_used.adding
+ var/atom/movable/screen/inventory/back/B = locate(/atom/movable/screen/inventory/back) in holder.wearer.hud_used.adding
if(B)
B.set_color_for(COLOR_RED, module_cooldown)
diff --git a/code/modules/heavy_vehicle/interface/_interface.dm b/code/modules/heavy_vehicle/interface/_interface.dm
index 2e2fbc70a1f..fbb0429d4b1 100644
--- a/code/modules/heavy_vehicle/interface/_interface.dm
+++ b/code/modules/heavy_vehicle/interface/_interface.dm
@@ -14,32 +14,32 @@
if(!LAZYLEN(hud_elements))
var/i = 1
for(var/hardpoint in hardpoints)
- var/obj/screen/mecha/hardpoint/H = new(src, hardpoint)
+ var/atom/movable/screen/mecha/hardpoint/H = new(src, hardpoint)
H.screen_loc = "1:6,[15-i]" //temp
hud_elements |= H
hardpoint_hud_elements[hardpoint] = H
i++
var/list/additional_hud_elements = list(
- /obj/screen/mecha/toggle/power_control,
- /obj/screen/mecha/toggle/maint,
- /obj/screen/mecha/eject,
- /obj/screen/mecha/toggle/hardpoint,
- /obj/screen/mecha/toggle/hatch,
- /obj/screen/mecha/toggle/hatch_open,
- /obj/screen/mecha/radio,
- /obj/screen/mecha/toggle/sensor,
- /obj/screen/mecha/toggle/megaspeakers,
- /obj/screen/mecha/rename
+ /atom/movable/screen/mecha/toggle/power_control,
+ /atom/movable/screen/mecha/toggle/maint,
+ /atom/movable/screen/mecha/eject,
+ /atom/movable/screen/mecha/toggle/hardpoint,
+ /atom/movable/screen/mecha/toggle/hatch,
+ /atom/movable/screen/mecha/toggle/hatch_open,
+ /atom/movable/screen/mecha/radio,
+ /atom/movable/screen/mecha/toggle/sensor,
+ /atom/movable/screen/mecha/toggle/megaspeakers,
+ /atom/movable/screen/mecha/rename
)
if(body && body.pilot_coverage >= 100)
- additional_hud_elements += /obj/screen/mecha/toggle/air
+ additional_hud_elements += /atom/movable/screen/mecha/toggle/air
i = 0
var/pos = 7
for(var/additional_hud in additional_hud_elements)
- var/obj/screen/mecha/M = new additional_hud(src)
+ var/atom/movable/screen/mecha/M = new additional_hud(src)
var/y_position = i * -12
if(M.icon_state == "large_base")
y_position += 2
@@ -49,20 +49,20 @@
hud_elements |= M
i++
- hud_health = new /obj/screen/mecha/health(src)
+ hud_health = new /atom/movable/screen/mecha/health(src)
hud_health.screen_loc = "EAST-1:28,CENTER-3:11"
hud_elements |= hud_health
- hud_open = locate(/obj/screen/mecha/toggle/hatch_open) in hud_elements
- hud_power = new /obj/screen/mecha/power(src)
+ hud_open = locate(/atom/movable/screen/mecha/toggle/hatch_open) in hud_elements
+ hud_power = new /atom/movable/screen/mecha/power(src)
hud_power.screen_loc = "EAST-1:12,CENTER-4:25"
hud_elements |= hud_power
- hud_power_control = locate(/obj/screen/mecha/toggle/power_control) in hud_elements
+ hud_power_control = locate(/atom/movable/screen/mecha/toggle/power_control) in hud_elements
refresh_hud()
/mob/living/heavy_vehicle/handle_hud_icons()
for(var/hardpoint in hardpoint_hud_elements)
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
if(H) H.update_system_info()
handle_hud_icons_health()
handle_power_hud()
diff --git a/code/modules/heavy_vehicle/interface/screen_objects.dm b/code/modules/heavy_vehicle/interface/screen_objects.dm
index 4ef322e0c7c..34d9338925d 100644
--- a/code/modules/heavy_vehicle/interface/screen_objects.dm
+++ b/code/modules/heavy_vehicle/interface/screen_objects.dm
@@ -1,42 +1,42 @@
// Screen objects hereon out.
-/obj/screen/mecha
+/atom/movable/screen/mecha
name = "hardpoint"
icon = 'icons/mecha/mecha_hud.dmi'
icon_state = "hardpoint"
var/mob/living/heavy_vehicle/owner
maptext_y = 11
-/obj/screen/mecha/proc/notify_user(var/mob/user, var/text)
+/atom/movable/screen/mecha/proc/notify_user(var/mob/user, var/text)
if(user && user.loc == owner)
to_chat(user, text)
-/obj/screen/mecha/radio
+/atom/movable/screen/mecha/radio
name = "radio"
icon_state = "base"
maptext = "RADIO"
maptext_x = 2
maptext_y = 11
-/obj/screen/mecha/radio/Click()
+/atom/movable/screen/mecha/radio/Click()
if(..())
if(owner.radio)
owner.radio.attack_self(usr)
-/obj/screen/mecha/Initialize()
+/atom/movable/screen/mecha/Initialize()
. = ..()
var/mob/living/heavy_vehicle/newowner = loc
if(!istype(newowner))
return INITIALIZE_HINT_QDEL
owner = newowner
-/obj/screen/mecha/Destroy(force)
+/atom/movable/screen/mecha/Destroy(force)
owner = null
. = ..()
-/obj/screen/mecha/Click()
+/atom/movable/screen/mecha/Click()
return (!owner || !usr.incapacitated() && (usr == owner || usr.loc == owner))
-/obj/screen/mecha/hardpoint
+/atom/movable/screen/mecha/hardpoint
name = "hardpoint"
var/hardpoint_tag
var/obj/item/holding
@@ -45,16 +45,16 @@
maptext_y = 3
maptext_width = 120
-/obj/screen/mecha/hardpoint/Destroy()
+/atom/movable/screen/mecha/hardpoint/Destroy()
holding = null
hardpoint_tag = null
. = ..()
-/obj/screen/mecha/hardpoint/MouseDrop()
+/atom/movable/screen/mecha/hardpoint/MouseDrop()
..()
if(holding) holding.screen_loc = screen_loc
-/obj/screen/mecha/hardpoint/proc/update_system_info()
+/atom/movable/screen/mecha/hardpoint/proc/update_system_info()
// No point drawing it if we have no item to use or nobody to see it.
if(!holding || !owner)
return
@@ -132,12 +132,12 @@
new_overlays += GLOB.hardpoint_bar_cache[i]
overlays = new_overlays
-/obj/screen/mecha/hardpoint/Initialize(mapload, var/newtag)
+/atom/movable/screen/mecha/hardpoint/Initialize(mapload, var/newtag)
. = ..()
hardpoint_tag = newtag
name = "hardpoint ([hardpoint_tag])"
-/obj/screen/mecha/hardpoint/Click(var/location, var/control, var/params)
+/atom/movable/screen/mecha/hardpoint/Click(var/location, var/control, var/params)
if(!(..()))
return
@@ -160,98 +160,98 @@
if(owner.set_hardpoint(hardpoint_tag))
icon_state = "hardpoint_selected"
-/obj/screen/mecha/eject
+/atom/movable/screen/mecha/eject
name = "eject"
icon_state = "large_base"
maptext = "EJECT"
maptext_x = 3
maptext_y = 10
-/obj/screen/mecha/eject/Click()
+/atom/movable/screen/mecha/eject/Click()
if(..())
owner.eject(usr)
-/obj/screen/mecha/rename
+/atom/movable/screen/mecha/rename
name = "rename"
icon_state = "base"
maptext = "RENAME"
maptext_x = 1
maptext_y = 12
-/obj/screen/mecha/rename/Click()
+/atom/movable/screen/mecha/rename/Click()
if(..())
owner.rename(usr)
-/obj/screen/mecha/power
+/atom/movable/screen/mecha/power
name = "power"
icon_state = null
maptext_width = 64
maptext_y = 2
-/obj/screen/mecha/toggle
+/atom/movable/screen/mecha/toggle
name = "toggle"
var/toggled
-/obj/screen/mecha/toggle/Click()
+/atom/movable/screen/mecha/toggle/Click()
if(..()) toggled()
-/obj/screen/mecha/toggle/proc/toggled()
+/atom/movable/screen/mecha/toggle/proc/toggled()
toggled = !toggled
icon_state = "[initial(icon_state)][toggled ? "_enabled" : ""]"
return toggled
-/obj/screen/mecha/toggle/air
+/atom/movable/screen/mecha/toggle/air
name = "air"
icon_state = "base"
maptext = "AIR"
maptext_x = 8
-/obj/screen/mecha/toggle/air/toggled()
+/atom/movable/screen/mecha/toggle/air/toggled()
toggled = !toggled
owner.use_air = toggled
var/main_color = owner.use_air ? "#d1d1d1" : "#525252"
maptext = "AIR"
notify_user(usr, SPAN_NOTICE("Auxiliary atmospheric system [owner.use_air ? "enabled" : "disabled"]."))
-/obj/screen/mecha/toggle/maint
+/atom/movable/screen/mecha/toggle/maint
name = "toggle maintenance protocol"
icon_state = "large_base"
maptext = "MAINT"
maptext_x = 2
maptext_y = 10
-/obj/screen/mecha/toggle/maint/toggled()
+/atom/movable/screen/mecha/toggle/maint/toggled()
toggled = !toggled
owner.maintenance_protocols = toggled
var/main_color = owner.maintenance_protocols ? "#d1d1d1" : "#525252"
maptext = "MAINT"
notify_user(usr, SPAN_NOTICE("Maintenance protocols [owner.maintenance_protocols ? "enabled" : "disabled"]."))
-/obj/screen/mecha/toggle/power_control
+/atom/movable/screen/mecha/toggle/power_control
name = "power control"
icon_state = "large_base"
maptext = "POWER"
maptext_x = 1
maptext_y = 11
-/obj/screen/mecha/toggle/power_control/toggled()
+/atom/movable/screen/mecha/toggle/power_control/toggled()
toggled = !toggled
owner.toggle_power(usr)
var/main_color = toggled ? "#d1d1d1" : "#525252"
maptext = "POWER"
-/obj/screen/mecha/toggle/power_control/update_icon()
+/atom/movable/screen/mecha/toggle/power_control/update_icon()
toggled = (owner.power == MECH_POWER_ON)
return ..()
-/obj/screen/mecha/toggle/hardpoint
+/atom/movable/screen/mecha/toggle/hardpoint
name = "toggle hardpoint lock"
icon_state = "base"
maptext = "GEAR"
maptext_x = 4
-/obj/screen/mecha/toggle/hardpoint/toggled()
+/atom/movable/screen/mecha/toggle/hardpoint/toggled()
if(owner.force_locked)
notify_user(usr, SPAN_WARNING("The locking system cannot be operated due to software restriction. Contact the manufacturer for more details."))
return
@@ -261,13 +261,13 @@
maptext = "GEAR"
notify_user(usr, SPAN_NOTICE("Hardpoint system access is now [owner.hardpoints_locked ? "disabled" : "enabled"]."))
-/obj/screen/mecha/toggle/hatch
+/atom/movable/screen/mecha/toggle/hatch
name = "toggle hatch lock"
icon_state = "base"
maptext = "LOCK"
maptext_x = 5
-/obj/screen/mecha/toggle/hatch/toggled()
+/atom/movable/screen/mecha/toggle/hatch/toggled()
if(!owner.hatch_locked && !owner.hatch_closed)
notify_user(usr, SPAN_WARNING("You cannot lock the hatch while it is open."))
return
@@ -286,17 +286,17 @@
maptext_x = 5
notify_user(usr, SPAN_NOTICE("The [owner.body.hatch_descriptor] is [owner.hatch_locked ? "now" : "no longer" ] locked."))
-/obj/screen/mecha/toggle/hatch_open
+/atom/movable/screen/mecha/toggle/hatch_open
name = "open or close hatch"
icon_state = "base"
maptext = "CLOSE"
maptext_x = 3
-/obj/screen/mecha/toggle/hatch_open/update_icon()
+/atom/movable/screen/mecha/toggle/hatch_open/update_icon()
maptext = "[owner.hatch_closed ? "OPEN" : "CLOSE"]"
maptext_x = owner.hatch_closed ? 4 : 3
-/obj/screen/mecha/toggle/hatch_open/toggled(var/notify_user = TRUE)
+/atom/movable/screen/mecha/toggle/hatch_open/toggled(var/notify_user = TRUE)
if(owner.hatch_locked && owner.hatch_closed)
notify_user(usr, SPAN_WARNING("You cannot open the hatch while it is locked."))
return
@@ -308,18 +308,18 @@
owner.update_icon()
// This is basically just a holder for the updates the mech does.
-/obj/screen/mecha/health
+/atom/movable/screen/mecha/health
name = "exosuit integrity"
icon_state = "health"
-/obj/screen/mecha/toggle/sensor
+/atom/movable/screen/mecha/toggle/sensor
name = "toggle sensor matrix"
icon_state = "base"
maptext = "SENSOR"
maptext_x = 1
maptext_y = 12
-/obj/screen/mecha/toggle/sensor/toggled()
+/atom/movable/screen/mecha/toggle/sensor/toggled()
if(!owner.head)
notify_user(usr, SPAN_WARNING("I/O Error: Sensor systems not found."))
return
@@ -332,14 +332,14 @@
maptext = "SENSOR"
notify_user(usr, SPAN_NOTICE("[capitalize_first_letters(owner.head.name)] Advanced Sensor mode is [owner.head.active_sensors ? "now" : "no longer" ] active."))
-/obj/screen/mecha/toggle/megaspeakers
+/atom/movable/screen/mecha/toggle/megaspeakers
name = "toggle integrated megaspeakers"
icon_state = "base" // based
maptext = "VOLUME"
maptext_x = 1
maptext_y = 12
-/obj/screen/mecha/toggle/megaspeakers/toggled()
+/atom/movable/screen/mecha/toggle/megaspeakers/toggled()
toggled = !toggled
owner.loudening = toggled
var/main_color = owner.loudening ? "#d1d1d1" : "#525252"
diff --git a/code/modules/heavy_vehicle/mech_construction.dm b/code/modules/heavy_vehicle/mech_construction.dm
index 82637fd3485..44a3172ebf0 100644
--- a/code/modules/heavy_vehicle/mech_construction.dm
+++ b/code/modules/heavy_vehicle/mech_construction.dm
@@ -102,7 +102,7 @@
GLOB.destroyed_event.unregister(module_to_forget, src, PROC_REF(forget_module))
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[target]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[target]
H.holding = null
hud_elements -= module_to_forget
@@ -150,7 +150,7 @@
system.forceMove(src)
hardpoints[system_hardpoint] = system
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint]
H.holding = system
system.screen_loc = H.screen_loc
@@ -200,7 +200,7 @@
system.layer = initial(system.layer)
GLOB.destroyed_event.unregister(system, src, PROC_REF(forget_module))
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[system_hardpoint]
H.holding = null
for(var/thing in pilots)
diff --git a/code/modules/heavy_vehicle/mech_helpers.dm b/code/modules/heavy_vehicle/mech_helpers.dm
index 71d26009650..7a073e2b8f0 100644
--- a/code/modules/heavy_vehicle/mech_helpers.dm
+++ b/code/modules/heavy_vehicle/mech_helpers.dm
@@ -37,17 +37,17 @@
return offset_x
/mob/living/heavy_vehicle/proc/toggle_maintenance_protocols()
- var/obj/screen/mecha/toggle/maint/M = locate() in hud_elements
+ var/atom/movable/screen/mecha/toggle/maint/M = locate() in hud_elements
M.toggled()
return TRUE
/mob/living/heavy_vehicle/proc/toggle_hatch()
- var/obj/screen/mecha/toggle/hatch_open/H = locate() in hud_elements
+ var/atom/movable/screen/mecha/toggle/hatch_open/H = locate() in hud_elements
H.toggled()
return TRUE
/mob/living/heavy_vehicle/proc/toggle_lock()
- var/obj/screen/mecha/toggle/hatch/L = locate() in hud_elements
+ var/atom/movable/screen/mecha/toggle/hatch/L = locate() in hud_elements
L.toggled()
return TRUE
diff --git a/code/modules/heavy_vehicle/mech_interaction.dm b/code/modules/heavy_vehicle/mech_interaction.dm
index 5e7bd819617..7f8fdebeb74 100644
--- a/code/modules/heavy_vehicle/mech_interaction.dm
+++ b/code/modules/heavy_vehicle/mech_interaction.dm
@@ -161,7 +161,7 @@
var/old_next_move = next_move
next_move = max(world.time + timeout, next_move)
for(var/hardpoint in hardpoint_hud_elements)
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
if(H)
H.color = "#FF0000"
if(next_move > old_next_move) // TIMER_OVERRIDE would not work here, because the smaller delays tend to be called after the longer ones
@@ -169,7 +169,7 @@
/mob/living/heavy_vehicle/proc/reset_hardpoint_color()
for(var/hardpoint in hardpoint_hud_elements)
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
if(H)
H.color = null
@@ -188,7 +188,7 @@
for(var/hardpoint in hardpoints)
if(hardpoint != selected_hardpoint)
continue
- var/obj/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
+ var/atom/movable/screen/mecha/hardpoint/H = hardpoint_hud_elements[hardpoint]
if(istype(H))
H.icon_state = "hardpoint"
break
diff --git a/code/modules/heavy_vehicle/mecha.dm b/code/modules/heavy_vehicle/mecha.dm
index 0efde46f29c..ba6cef6019e 100644
--- a/code/modules/heavy_vehicle/mecha.dm
+++ b/code/modules/heavy_vehicle/mecha.dm
@@ -79,10 +79,10 @@
var/next_mecha_move = 0
var/list/hud_elements = list()
var/list/hardpoint_hud_elements = list()
- var/obj/screen/mecha/health/hud_health
- var/obj/screen/mecha/toggle/hatch_open/hud_open
- var/obj/screen/mecha/power/hud_power
- var/obj/screen/mecha/toggle/power_control/hud_power_control
+ var/atom/movable/screen/mecha/health/hud_health
+ var/atom/movable/screen/mecha/toggle/hatch_open/hud_open
+ var/atom/movable/screen/mecha/power/hud_power
+ var/atom/movable/screen/mecha/toggle/power_control/hud_power_control
//POWER
var/power = MECH_POWER_OFF
diff --git a/code/modules/mob/abstract/freelook/blueprints/blueprints.dm b/code/modules/mob/abstract/freelook/blueprints/blueprints.dm
index aaf62c350ab..c11232db994 100644
--- a/code/modules/mob/abstract/freelook/blueprints/blueprints.dm
+++ b/code/modules/mob/abstract/freelook/blueprints/blueprints.dm
@@ -265,7 +265,7 @@
return SEE_TURFS|BLIND
/mob/abstract/eye/blueprints/apply_visual(mob/living/M)
- M.overlay_fullscreen("blueprints", /obj/screen/fullscreen/blueprints)
+ M.overlay_fullscreen("blueprints", /atom/movable/screen/fullscreen/blueprints)
M.client.screen += area_name_effect
M.add_client_color(/datum/client_color/monochrome)
diff --git a/code/modules/mob/abstract/new_player/menu.dm b/code/modules/mob/abstract/new_player/menu.dm
index 36661aca96d..dd99df784df 100644
--- a/code/modules/mob/abstract/new_player/menu.dm
+++ b/code/modules/mob/abstract/new_player/menu.dm
@@ -12,39 +12,39 @@
SHOULD_NOT_SLEEP(TRUE)
adding = list()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/new_player/title(src)
+ using = new /atom/movable/screen/new_player/title(src)
using.name = "Title"
using.hud = src
adding += using
- using = new /obj/screen/new_player/selection/join_game(src)
+ using = new /atom/movable/screen/new_player/selection/join_game(src)
using.name = "Join Game"
using.hud = src
adding += using
- using = new /obj/screen/new_player/selection/settings(src)
+ using = new /atom/movable/screen/new_player/selection/settings(src)
using.name = "Setup Character"
adding += using
- using = new /obj/screen/new_player/selection/manifest(src)
+ using = new /atom/movable/screen/new_player/selection/manifest(src)
using.name = "Crew Manifest"
adding += using
- using = new /obj/screen/new_player/selection/observe(src)
+ using = new /atom/movable/screen/new_player/selection/observe(src)
using.name = "Observe"
adding += using
- using = new /obj/screen/new_player/selection/changelog(src)
+ using = new /atom/movable/screen/new_player/selection/changelog(src)
using.name = "Changelog"
adding += using
- using = new /obj/screen/new_player/selection/polls(src)
+ using = new /atom/movable/screen/new_player/selection/polls(src)
using.name = "Polls"
adding += using
- using = new /obj/screen/new_player/selection/lore_summary(src)
+ using = new /atom/movable/screen/new_player/selection/lore_summary(src)
using.name = "Current Lore Summary"
adding += using
@@ -52,32 +52,32 @@
mymob.client.screen += adding
src.adding += using
-/obj/screen/new_player
+/atom/movable/screen/new_player
icon = 'icons/misc/hudmenu/hudmenu.dmi'
layer = HUD_BASE_LAYER
-/obj/screen/new_player/Initialize()
+/atom/movable/screen/new_player/Initialize()
set_sector_things()
. = ..()
-/obj/screen/new_player/proc/set_sector_things()
+/atom/movable/screen/new_player/proc/set_sector_things()
if(SSatlas.current_sector.sector_hud_menu)
icon = SSatlas.current_sector.sector_hud_menu
-/obj/screen/new_player/title
+/atom/movable/screen/new_player/title
name = "Title"
screen_loc = "WEST,SOUTH"
var/lobby_index = 1
var/refresh_timer_id = null
-/obj/screen/new_player/title/Destroy(force)
+/atom/movable/screen/new_player/title/Destroy(force)
if(refresh_timer_id)
deltimer(refresh_timer_id)
refresh_timer_id = null
. = ..()
-/obj/screen/new_player/title/Initialize()
+/atom/movable/screen/new_player/title/Initialize()
if(SSatlas.current_sector.sector_lobby_art)
SSatlas.current_map.lobby_icon = pick(SSatlas.current_sector.sector_lobby_art)
else if(!SSatlas.current_map.lobby_icon)
@@ -105,10 +105,10 @@
. = ..()
-/obj/screen/new_player/title/set_sector_things()
+/atom/movable/screen/new_player/title/set_sector_things()
return
-/obj/screen/new_player/title/proc/Update()
+/atom/movable/screen/new_player/title/proc/Update()
SHOULD_NOT_SLEEP(TRUE)
if(QDELETED(src))
@@ -125,24 +125,24 @@
animate(alpha = 255, icon_state = SSatlas.current_map.lobby_screens[lobby_index], time = 1 SECOND)
refresh_timer_id = addtimer(CALLBACK(src, PROC_REF(Update)), SSatlas.current_map.lobby_transitions, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_OVERRIDE | TIMER_STOPPABLE)
-/obj/screen/new_player/selection
+/atom/movable/screen/new_player/selection
var/click_sound = 'sound/effects/menu_click.ogg'
var/hud_arrow
-/obj/screen/new_player/selection/New(datum/hud/H)
+/atom/movable/screen/new_player/selection/New(datum/hud/H)
color = null
hud = H
..()
-/obj/screen/new_player/selection/Initialize()
+/atom/movable/screen/new_player/selection/Initialize()
. = ..()
set_sector_things()
-/obj/screen/new_player/selection/Destroy(force)
+/atom/movable/screen/new_player/selection/Destroy(force)
hud = null
. = ..()
-/obj/screen/new_player/selection/set_sector_things()
+/atom/movable/screen/new_player/selection/set_sector_things()
. = ..()
if(SSatlas.current_sector.sector_hud_menu_sound)
click_sound = SSatlas.current_sector.sector_hud_menu_sound
@@ -151,7 +151,7 @@
// We'll reset the animation just so it doesn't get stuck
animate(src, color = null, transform = null, time = 3, easing = CUBIC_EASING)
-/obj/screen/new_player/selection/MouseEntered(location, control, params)
+/atom/movable/screen/new_player/selection/MouseEntered(location, control, params)
if(hud_arrow)
AddOverlays(hud_arrow)
else
@@ -160,54 +160,54 @@
animate(src, color = color_rotation(30), transform = M, time = 3, easing = CUBIC_EASING)
return ..()
-/obj/screen/new_player/selection/MouseExited(location,control,params)
+/atom/movable/screen/new_player/selection/MouseExited(location,control,params)
if(hud_arrow)
ClearOverlays()
else
animate(src, color = null, transform = null, time = 3, easing = CUBIC_EASING)
return ..()
-/obj/screen/new_player/selection/join_game
+/atom/movable/screen/new_player/selection/join_game
name = "Join Game"
icon_state = "unready"
screen_loc = "LEFT+0.1,CENTER-1"
-/obj/screen/new_player/selection/settings
+/atom/movable/screen/new_player/selection/settings
name = "Setup"
icon_state = "setup"
screen_loc = "LEFT+0.1,CENTER-2"
-/obj/screen/new_player/selection/manifest
+/atom/movable/screen/new_player/selection/manifest
name = "Crew Manifest"
icon_state = "manifest"
screen_loc = "LEFT+0.1,CENTER-3"
-/obj/screen/new_player/selection/observe
+/atom/movable/screen/new_player/selection/observe
name = "Observe"
icon_state = "observe"
screen_loc = "LEFT+0.1,CENTER-4"
-/obj/screen/new_player/selection/changelog
+/atom/movable/screen/new_player/selection/changelog
name = "Changelog"
icon_state = "changelog"
screen_loc = "LEFT+0.1,CENTER-5"
-/obj/screen/new_player/selection/polls
+/atom/movable/screen/new_player/selection/polls
name = "Polls"
icon_state = "polls"
screen_loc = "LEFT+0.1,CENTER-6"
-/obj/screen/new_player/selection/lore_summary
+/atom/movable/screen/new_player/selection/lore_summary
name = "Current Lore Summary"
icon_state = "lore_summary"
screen_loc = "LEFT+0.1,CENTER-7"
-/obj/screen/new_player/selection/join_game/Initialize()
+/atom/movable/screen/new_player/selection/join_game/Initialize()
. = ..()
var/mob/abstract/new_player/player = hud.mymob
update_icon(player)
-/obj/screen/new_player/selection/join_game/Click()
+/atom/movable/screen/new_player/selection/join_game/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
if(SSticker.current_state <= GAME_STATE_SETTING_UP)
@@ -219,7 +219,7 @@
player.join_game()
update_icon(player)
-/obj/screen/new_player/selection/join_game/update_icon(var/mob/abstract/new_player/player)
+/atom/movable/screen/new_player/selection/join_game/update_icon(var/mob/abstract/new_player/player)
if(SSticker.current_state <= GAME_STATE_SETTING_UP)
if(player.ready)
icon_state = "ready"
@@ -228,7 +228,7 @@
else
icon_state = "joingame"
-/obj/screen/new_player/selection/manifest/Click()
+/atom/movable/screen/new_player/selection/manifest/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
if(SSticker.current_state < GAME_STATE_PLAYING)
@@ -236,22 +236,22 @@
return
player.ViewManifest()
-/obj/screen/new_player/selection/observe/Click()
+/atom/movable/screen/new_player/selection/observe/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
player.new_player_observe()
-/obj/screen/new_player/selection/settings/Click()
+/atom/movable/screen/new_player/selection/settings/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
player.setupcharacter()
-/obj/screen/new_player/selection/changelog/Click()
+/atom/movable/screen/new_player/selection/changelog/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
player.client.changes()
-/obj/screen/new_player/selection/polls/Initialize()
+/atom/movable/screen/new_player/selection/polls/Initialize()
. = ..()
if(establish_db_connection(GLOB.dbcon))
var/mob/M = hud.mymob
@@ -263,12 +263,12 @@
if(newpoll)
icon_state = "polls_new"
-/obj/screen/new_player/selection/polls/Click()
+/atom/movable/screen/new_player/selection/polls/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
player.handle_player_polling()
-/obj/screen/new_player/selection/lore_summary/Click()
+/atom/movable/screen/new_player/selection/lore_summary/Click()
var/mob/abstract/new_player/player = usr
sound_to(player, click_sound)
player.show_lore_summary()
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index e9202a9e020..aa4bf49bbf4 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -403,7 +403,7 @@ var/list/slot_equipment_priority = list( \
return FALSE
/mob/living/carbon/throw_item(atom/target)
- if(stat || !target || istype(target, /obj/screen))
+ if(stat || !target || istype(target, /atom/movable/screen))
return FALSE
var/atom/movable/item = src.get_active_hand()
diff --git a/code/modules/mob/living/announcer.dm b/code/modules/mob/living/announcer.dm
index 8d6a6121d52..3226a8b4e8c 100755
--- a/code/modules/mob/living/announcer.dm
+++ b/code/modules/mob/living/announcer.dm
@@ -93,7 +93,7 @@
/mob/living/announcer/InStasis()
return FALSE
-/mob/living/announcer/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/mob/living/announcer/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
return FALSE
/mob/living/announcer/dust()
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index afe455ba172..de413423390 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -126,11 +126,11 @@
if(stat != DEAD)
if(blinded)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
else
clear_fullscreen("blind")
- set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
- set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
+ set_fullscreen(disabilities & NEARSIGHTED, "impaired", /atom/movable/screen/fullscreen/impaired, 1)
+ set_fullscreen(eye_blurry, "blurry", /atom/movable/screen/fullscreen/blurry)
if(machine)
if (machine.check_eye(src) < 0)
reset_view(null)
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index bbb9bc85ec1..f29d989344a 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -205,11 +205,11 @@
if(stat != DEAD)
if(blinded)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
else
clear_fullscreen("blind")
- set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
- set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
+ set_fullscreen(disabilities & NEARSIGHTED, "impaired", /atom/movable/screen/fullscreen/impaired, 1)
+ set_fullscreen(eye_blurry, "blurry", /atom/movable/screen/fullscreen/blurry)
if(druggy > 5)
add_client_color(/datum/client_color/oversaturated)
else
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index ad89ba2e666..1612eb27c14 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -872,7 +872,7 @@
if(HAS_TRAIT(src, TRAIT_ORIGIN_LIGHT_SENSITIVE))
return max(. - 1, FLASH_PROTECTION_REDUCED)
-/mob/living/carbon/human/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/mob/living/carbon/human/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
if(..())
var/obj/item/organ/E = get_eyes(no_synthetic = !affect_silicon)
if(istype(E))
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index f84648d1cc2..4e9ac1d3099 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -875,7 +875,7 @@
if(-INFINITY to -95) severity = 10
if(paralysis || InStasis())
severity = max(severity, 8)
- overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
+ overlay_fullscreen("crit", /atom/movable/screen/fullscreen/crit, severity)
else
clear_fullscreen("crit")
//Oxygen damage overlay
@@ -889,7 +889,7 @@
if(35 to 40) severity = 5
if(40 to 45) severity = 6
if(45 to INFINITY) severity = 7
- overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
+ overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/oxy, severity)
else
clear_fullscreen("oxy")
@@ -905,7 +905,7 @@
if(55 to 70) severity = 4
if(70 to 85) severity = 5
if(85 to INFINITY) severity = 6
- overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
else
clear_fullscreen("brute")
@@ -1147,7 +1147,7 @@
#undef POSING_STRING
/mob/living/carbon/human/proc/add_status_to_hud(var/set_overlay, var/set_status_message)
- var/obj/screen/status/new_status = new /obj/screen/status(null, ui_style2icon(client.prefs.UI_style), set_overlay, set_status_message)
+ var/atom/movable/screen/status/new_status = new /atom/movable/screen/status(null, ui_style2icon(client.prefs.UI_style), set_overlay, set_status_message)
new_status.alpha = client.prefs.UI_style_alpha
new_status.color = client.prefs.UI_style_color
new_status.screen_loc = get_status_loc(status_overlays ? LAZYLEN(status_overlays) + 1 : 1)
diff --git a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm
index c17c1646607..74b7dc8b31e 100644
--- a/code/modules/mob/living/carbon/human/species/outsider/revenant.dm
+++ b/code/modules/mob/living/carbon/human/species/outsider/revenant.dm
@@ -152,7 +152,7 @@
user.forceMove(target)
user.visible_message("[user] appears out of thin air!", SPAN_NOTICE("You successfully step into your destination."))
- user.overlay_fullscreen("teleport", /obj/screen/fullscreen/teleport)
+ user.overlay_fullscreen("teleport", /atom/movable/screen/fullscreen/teleport)
user.clear_fullscreen("teleport", 5 SECONDS)
playsound(get_turf(user), pick('sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg', 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg'), 50, TRUE)
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index aa4833dfbec..027ba9f3c46 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -621,17 +621,17 @@
if(!H.client)//no client, no screen to update
return 1
- H.set_fullscreen(H.eye_blind, "blind", /obj/screen/fullscreen/blind)
- H.set_fullscreen(H.stat == UNCONSCIOUS, "blackout", /obj/screen/fullscreen/blackout)
+ H.set_fullscreen(H.eye_blind, "blind", /atom/movable/screen/fullscreen/blind)
+ H.set_fullscreen(H.stat == UNCONSCIOUS, "blackout", /atom/movable/screen/fullscreen/blackout)
if(GLOB.config.welder_vision)
if(H.equipment_tint_total)
- H.overlay_fullscreen("welder", /obj/screen/fullscreen/impaired, H.equipment_tint_total, 0.5 SECONDS)
+ H.overlay_fullscreen("welder", /atom/movable/screen/fullscreen/impaired, H.equipment_tint_total, 0.5 SECONDS)
else
H.clear_fullscreen("welder")
var/how_nearsighted = get_how_nearsighted(H)
- H.set_fullscreen(how_nearsighted, "nearsighted", /obj/screen/fullscreen/oxy, how_nearsighted)
- H.set_fullscreen(H.eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
+ H.set_fullscreen(how_nearsighted, "nearsighted", /atom/movable/screen/fullscreen/oxy, how_nearsighted)
+ H.set_fullscreen(H.eye_blurry, "blurry", /atom/movable/screen/fullscreen/blurry)
if(H.druggy)
H.client.screen += global_hud.druggy
diff --git a/code/modules/mob/living/carbon/human/species/species_hud.dm b/code/modules/mob/living/carbon/human/species/species_hud.dm
index f5129adeffc..618c55ec70b 100644
--- a/code/modules/mob/living/carbon/human/species/species_hud.dm
+++ b/code/modules/mob/living/carbon/human/species/species_hud.dm
@@ -31,7 +31,7 @@
"shoes" = list("loc" = ui_shoes, "name" = "shoes", "slot" = slot_shoes, "state" = "shoes", "toggle" = 1),
"wrists" = list("loc" = ui_wrists, "name" = "wrists", "slot" = slot_wrists, "state" = "wrists", "toggle" = 1),
"suit storage" = list("loc" = ui_sstore1, "name" = "suit storage", "slot" = slot_s_store, "state" = "suitstore"),
- "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back", "slot_type" = /obj/screen/inventory/back),
+ "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back", "slot_type" = /atom/movable/screen/inventory/back),
"id" = list("loc" = ui_id, "name" = "id", "slot" = slot_wear_id, "state" = "id"),
"storage1" = list("loc" = ui_storage1, "name" = "left pocket", "slot" = slot_l_store, "state" = "pocket"),
"storage2" = list("loc" = ui_storage2, "name" = "right pocket", "slot" = slot_r_store, "state" = "pocket"),
@@ -106,7 +106,7 @@
gear = list(
"l_ear" = list("loc" = ui_shoes, "name" = "left ear", "slot" = slot_l_ear, "state" = "l_ear", "toggle" = 1),
- "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back", "slot_type" = /obj/screen/inventory/back),
+ "back" = list("loc" = ui_back, "name" = "back", "slot" = slot_back, "state" = "back", "slot_type" = /atom/movable/screen/inventory/back),
"id" = list("loc" = ui_id, "name" = "id", "slot" = slot_wear_id, "state" = "id"),
"storage1" = list("loc" = ui_storage1, "name" = "left pocket", "slot" = slot_l_store, "state" = "pocket"),
"storage2" = list("loc" = ui_storage2, "name" = "right pocket", "slot" = slot_r_store, "state" = "pocket")
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 08a750dca3c..acf31f96b72 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -131,13 +131,13 @@
return
if(eye_blind)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
else
clear_fullscreen("blind")
- set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
- set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
+ set_fullscreen(disabilities & NEARSIGHTED, "impaired", /atom/movable/screen/fullscreen/impaired, 1)
+ set_fullscreen(eye_blurry, "blurry", /atom/movable/screen/fullscreen/blurry)
- set_fullscreen(stat == UNCONSCIOUS, "blackout", /obj/screen/fullscreen/blackout)
+ set_fullscreen(stat == UNCONSCIOUS, "blackout", /atom/movable/screen/fullscreen/blackout)
if(machine)
var/viewflags = machine.check_eye(src)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b4755dccd1b..2333f3e6094 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -909,7 +909,7 @@ default behaviour is:
/mob/living/Initialize()
. = ..()
add_to_target_grid()
- ability_master = new /obj/screen/movable/ability_master(FALSE, src)
+ ability_master = new /atom/movable/screen/movable/ability_master(FALSE, src)
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index a36077714c0..c19ea8b6b66 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -119,7 +119,7 @@
for(var/obj/O in L)
O.emp_act(severity)
-/mob/living/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/mob/living/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
if(is_blind() && !(override_blindness_check || affect_silicon))
return FALSE
@@ -414,11 +414,11 @@
button_number++
if(A.button == null)
- var/obj/screen/movable/action_button/N = new(hud_used)
+ var/atom/movable/screen/movable/action_button/N = new(hud_used)
N.owner = A
A.button = N
- var/obj/screen/movable/action_button/B = A.button
+ var/atom/movable/screen/movable/action_button/B = A.button
B.update_icon()
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index b1070d4387e..ffd3c7844d8 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -167,7 +167,7 @@
/mob/living/silicon/ai/update_sight()
if(is_blind())
update_icon()
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
set_sight(sight&(~SEE_TURFS)&(~SEE_MOBS)&(~SEE_OBJS))
set_see_invisible(SEE_INVISIBLE_LIVING)
else if(stat == DEAD)
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 46af00f3a0b..a0125db6f01 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -254,11 +254,11 @@
if(stat != DEAD)
if(blinded)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
else
clear_fullscreen("blind")
- set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1)
- set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
+ set_fullscreen(disabilities & NEARSIGHTED, "impaired", /atom/movable/screen/fullscreen/impaired, 1)
+ set_fullscreen(eye_blurry, "blurry", /atom/movable/screen/fullscreen/blurry)
if (machine)
if (machine.check_eye(src) < 0)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2da2c3f7b64..bb8f1f9beb3 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -60,11 +60,11 @@
var/overclock_available = FALSE // if the overclock is available for use
// HUD Stuff
- var/obj/screen/inv1
- var/obj/screen/inv2
- var/obj/screen/inv3
+ var/atom/movable/screen/inv1
+ var/atom/movable/screen/inv2
+ var/atom/movable/screen/inv3
var/shown_robot_modules = FALSE //Used to determine whether they have the module menu shown or not
- var/obj/screen/robot_modules_background
+ var/atom/movable/screen/robot_modules_background
// Modules and active items
var/mod_type = "Default"
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index f1c2b1aabbd..49639762e4b 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -344,7 +344,7 @@
/mob/living/silicon/proc/is_malf_or_traitor()
return is_traitor() || is_malf()
-/mob/living/silicon/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/mob/living/silicon/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
if(affect_silicon)
return ..()
diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm
index f99bd388b80..aa15cb7575b 100644
--- a/code/modules/mob/living/simple_animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer.dm
@@ -30,7 +30,7 @@
var/used_dominate
var/datum/progressbar/ability_bar
var/ability_start_time = 0
- var/obj/screen/borer/chemicals/chem_hud
+ var/atom/movable/screen/borer/chemicals/chem_hud
var/chemicals = 10 // Chemicals used for reproduction and spitting neurotoxin.
var/mob/living/carbon/human/host // Human host for the brain worm.
var/truename // Name used for brainworm-speak.
diff --git a/code/modules/mob/living/simple_animal/hostile/morph.dm b/code/modules/mob/living/simple_animal/hostile/morph.dm
index d5898ffaf11..bdd13b1aa0f 100644
--- a/code/modules/mob/living/simple_animal/hostile/morph.dm
+++ b/code/modules/mob/living/simple_animal/hostile/morph.dm
@@ -51,7 +51,7 @@
var/melee_damage_disguised = 0
var/eat_while_disguised = FALSE
var/atom/movable/form = null
- var/static/list/blacklist_typecache = typecacheof(list(/obj/screen, /obj/singularity, /mob/living/simple_animal/hostile/morph, /obj/effect, /obj/structure/gore))
+ var/static/list/blacklist_typecache = typecacheof(list(/atom/movable/screen, /obj/singularity, /mob/living/simple_animal/hostile/morph, /obj/effect, /obj/structure/gore))
/mob/living/simple_animal/hostile/morph/Initialize()
. = ..()
@@ -233,8 +233,8 @@
return
return ..()
-/mob/living/simple_animal/hostile/morph/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /obj/screen/movable/spell_master)
+/mob/living/simple_animal/hostile/morph/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
. = ..()
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.open_state = "morph_open"
spell_master.closed_state = "morph_closed"
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 77da8a56ff2..cc3f36d3095 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -114,6 +114,6 @@
client.update_skybox(TRUE)
if(spell_masters)
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.toggle_open(1)
client.screen -= spell_master
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b082ec492b0..c2b4f072135 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -298,7 +298,7 @@
SHOULD_CALL_PARENT(TRUE)
if(LAZYLEN(spell_masters))
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.update_spells(0, src)
if(stat != DEAD)
@@ -1047,7 +1047,7 @@
/mob/living/carbon/human/flash_strong_pain()
if(can_feel_pain())
- overlay_fullscreen("strong_pain", /obj/screen/fullscreen/strong_pain)
+ overlay_fullscreen("strong_pain", /atom/movable/screen/fullscreen/strong_pain)
addtimer(CALLBACK(src, PROC_REF(clear_strong_pain)), 10, TIMER_UNIQUE)
/mob/living/proc/clear_strong_pain()
@@ -1385,7 +1385,7 @@
return 1
/client/proc/check_has_body_select()
- return mob && mob.hud_used && istype(mob.zone_sel, /obj/screen/zone_sel)
+ return mob && mob.hud_used && istype(mob.zone_sel, /atom/movable/screen/zone_sel)
/client/verb/body_toggle_head()
set name = "body-toggle-head"
@@ -1430,7 +1430,7 @@
/client/proc/toggle_zone_sel(list/zones)
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.zone_sel
+ var/atom/movable/screen/zone_sel/selector = mob.zone_sel
selector.set_selected_zone(next_in_list(mob.zone_sel.selecting,zones), usr)
/mob/proc/get_speech_bubble_state_modifier()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 30a7e4b560b..7c49b1fbf25 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -22,40 +22,40 @@
var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
can_be_buckled = TRUE
- var/obj/screen/cells = null
- var/obj/screen/flash = null
- var/obj/screen/blind = null
- var/obj/screen/hands = null
- var/obj/screen/pullin = null
- var/obj/screen/purged = null
- var/obj/screen/internals/internals = null
- var/obj/screen/oxygen = null
- var/obj/screen/paralysis_indicator = null
- var/obj/screen/i_select = null
- var/obj/screen/m_select = null
- var/obj/screen/toxin = null
- var/obj/screen/fire = null
- var/obj/screen/bodytemp = null
- var/obj/screen/healths = null
- var/obj/screen/throw_icon = null
- var/obj/screen/nutrition_icon = null
- var/obj/screen/hydration_icon = null
- var/obj/screen/pressure = null
- var/obj/screen/damageoverlay = null
- var/obj/screen/pain = null
- var/obj/screen/gun/item/item_use_icon = null
- var/obj/screen/gun/radio/radio_use_icon = null
- var/obj/screen/gun/move/gun_move_icon = null
- var/obj/screen/gun/mode/gun_setting_icon = null
- var/obj/screen/gun/unique_action_icon = null
- var/obj/screen/gun/toggle_firing_mode = null
- var/obj/screen/energy/energy_display = null
- var/obj/screen/instability/instability_display = null
- var/obj/screen/up_hint = null
+ var/atom/movable/screen/cells = null
+ var/atom/movable/screen/flash = null
+ var/atom/movable/screen/blind = null
+ var/atom/movable/screen/hands = null
+ var/atom/movable/screen/pullin = null
+ var/atom/movable/screen/purged = null
+ var/atom/movable/screen/internals/internals = null
+ var/atom/movable/screen/oxygen = null
+ var/atom/movable/screen/paralysis_indicator = null
+ var/atom/movable/screen/i_select = null
+ var/atom/movable/screen/m_select = null
+ var/atom/movable/screen/toxin = null
+ var/atom/movable/screen/fire = null
+ var/atom/movable/screen/bodytemp = null
+ var/atom/movable/screen/healths = null
+ var/atom/movable/screen/throw_icon = null
+ var/atom/movable/screen/nutrition_icon = null
+ var/atom/movable/screen/hydration_icon = null
+ var/atom/movable/screen/pressure = null
+ var/atom/movable/screen/damageoverlay = null
+ var/atom/movable/screen/pain = null
+ var/atom/movable/screen/gun/item/item_use_icon = null
+ var/atom/movable/screen/gun/radio/radio_use_icon = null
+ var/atom/movable/screen/gun/move/gun_move_icon = null
+ var/atom/movable/screen/gun/mode/gun_setting_icon = null
+ var/atom/movable/screen/gun/unique_action_icon = null
+ var/atom/movable/screen/gun/toggle_firing_mode = null
+ var/atom/movable/screen/energy/energy_display = null
+ var/atom/movable/screen/instability/instability_display = null
+ var/atom/movable/screen/up_hint = null
//spells hud icons - this interacts with add_spell and remove_spell
- var/list/obj/screen/movable/spell_master/spell_masters = null
- var/obj/screen/movable/ability_master/ability_master = null
+ var/list/atom/movable/screen/movable/spell_master/spell_masters = null
+ var/atom/movable/screen/movable/ability_master/ability_master = null
/*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob.
A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such.
@@ -63,7 +63,7 @@
I'll make some notes on where certain variable defines should probably go.
Changing this around would probably require a good look-over the pre-existing code.
*/
- var/obj/screen/zone_sel/zone_sel = null
+ var/atom/movable/screen/zone_sel/zone_sel = null
var/use_me = 1 //Allows all mobs to use the me verb by default, will have to manually specify they cannot
var/damageoverlaytemp = 0
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 63ef6aaf4c6..5f30f355afb 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -15,7 +15,7 @@
icon = 'icons/mob/screen/generic.dmi'
icon_state = "reinforce"
atom_flags = 0
- var/obj/screen/grab/hud = null
+ var/atom/movable/screen/grab/hud = null
var/mob/living/affecting = null
var/mob/living/carbon/human/assailant = null
var/state = GRAB_PASSIVE
@@ -50,7 +50,7 @@
affecting.grabbed_by += src
- hud = new /obj/screen/grab(src)
+ hud = new /atom/movable/screen/grab(src)
hud.icon_state = "reinforce"
icon_state = "grabbed"
hud.name = "reinforce grab"
@@ -249,7 +249,7 @@
if(EAST)
animate(affecting, pixel_x =-shift, pixel_y = affecting.get_standard_pixel_y(), 5, 1, LINEAR_EASING)
-/obj/item/grab/proc/s_click(obj/screen/S)
+/obj/item/grab/proc/s_click(atom/movable/screen/S)
if(!affecting)
return
if(state == GRAB_UPGRADING)
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index deadb4b2890..c33fb6b2298 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -321,7 +321,7 @@
return
if(istype(over_object, /obj/machinery/power/apc) && tesla_link)
return over_object.attackby(src, M)
- if(!istype(over_object, /obj/screen) && !(over_object == src))
+ if(!istype(over_object, /atom/movable/screen) && !(over_object == src))
return attack_self(M)
/obj/item/modular_computer/GetID()
diff --git a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
index 6fe41aead18..ee6fb32a7a7 100644
--- a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
+++ b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
@@ -30,12 +30,12 @@
return
if(!over_object || over_object == src)
return
- if(istype(over_object, /obj/screen/inventory))
- var/obj/screen/inventory/S = over_object
+ if(istype(over_object, /atom/movable/screen/inventory))
+ var/atom/movable/screen/inventory/S = over_object
if(S.slot_id == equip_slot)
return
if(ishuman(usr))
- if(!(istype(over_object, /obj/screen)))
+ if(!(istype(over_object, /atom/movable/screen)))
return ..()
if(!(loc == usr) || (loc && loc.loc == usr))
diff --git a/code/modules/organs/internal/eyes.dm b/code/modules/organs/internal/eyes.dm
index 6523cb6a4bd..d236256faf7 100644
--- a/code/modules/organs/internal/eyes.dm
+++ b/code/modules/organs/internal/eyes.dm
@@ -44,7 +44,7 @@
if(is_broken() && !oldbroken && owner && !owner.stat)
to_chat(owner, SPAN_DANGER("You go blind!"))
-/obj/item/organ/internal/eyes/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /obj/screen/fullscreen/flash, length = 2.5 SECONDS)
+/obj/item/organ/internal/eyes/flash_act(intensity = FLASH_PROTECTION_MODERATE, override_blindness_check = FALSE, affect_silicon = FALSE, ignore_inherent = FALSE, type = /atom/movable/screen/fullscreen/flash, length = 2.5 SECONDS)
var/burnthrough = intensity - owner.get_flash_protection(ignore_inherent)
if(burnthrough <= 0)
return
@@ -82,7 +82,7 @@
/obj/item/organ/internal/eyes/do_surge_effects()
if(owner)
- owner.overlay_fullscreen("noise", /obj/screen/fullscreen/flash/noise)
+ owner.overlay_fullscreen("noise", /atom/movable/screen/fullscreen/flash/noise)
/obj/item/organ/internal/eyes/clear_surge_effects()
if(owner)
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 6dedd6ceccc..90c37cf26ac 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -22,7 +22,7 @@
/obj/item/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
if(ishuman(usr))
var/mob/M = usr
- if(!(istype(over_object, /obj/screen) ))
+ if(!(istype(over_object, /atom/movable/screen) ))
return ..()
if(!M.restrained() && !M.stat)
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index e1fb972f1f8..38d09e1ff85 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -113,7 +113,7 @@ var/global/photo_count = 0
if((istype(usr, /mob/living/carbon/human)))
var/mob/M = usr
- if(!( istype(over_object, /obj/screen) ))
+ if(!( istype(over_object, /atom/movable/screen) ))
return ..()
playsound(loc, /singleton/sound_category/rustle_sound, 50, 1, -5)
if((!( M.restrained() ) && !( M.stat ) && M.back == src))
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index c5d1ad7a150..1ae5a64d5b0 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -186,7 +186,7 @@
can_switch_modes = 0
can_turret = 0
zoomdevicename = "rifle scope"
- var/obj/screen/overlay = null
+ var/atom/movable/screen/overlay = null
/obj/item/gun/energy/rifle/laser/tachyon/verb/scope()
set category = "Object"
diff --git a/code/modules/psionics/complexus/complexus.dm b/code/modules/psionics/complexus/complexus.dm
index fd532d4e0fe..f2e48200f60 100644
--- a/code/modules/psionics/complexus/complexus.dm
+++ b/code/modules/psionics/complexus/complexus.dm
@@ -23,7 +23,7 @@
var/aura_color = "#ff0022"
var/datum/component/armor/psionic/armor_component
- var/obj/screen/psi/hub/ui // Reference to the master psi UI object.
+ var/atom/movable/screen/psi/hub/ui // Reference to the master psi UI object.
var/mob/living/owner // Reference to our owner.
var/image/_aura_image // Client image
diff --git a/code/modules/psionics/complexus/complexus_process.dm b/code/modules/psionics/complexus/complexus_process.dm
index 561d66404d1..132357e3716 100644
--- a/code/modules/psionics/complexus/complexus_process.dm
+++ b/code/modules/psionics/complexus/complexus_process.dm
@@ -63,7 +63,7 @@
P.apply(owner)
/datum/psi_complexus/proc/wipe_user_abilities()
- for(var/obj/screen/ability/obj_based/psionic/P in owner.ability_master.ability_objects)
+ for(var/atom/movable/screen/ability/obj_based/psionic/P in owner.ability_master.ability_objects)
if((P.connected_power.ability_flags & PSI_FLAG_APEX) && get_rank() < PSI_RANK_APEX)
owner.ability_master.remove_ability(P)
if((P.connected_power.ability_flags & PSI_FLAG_LIMITLESS) && get_rank() < PSI_RANK_LIMITLESS)
diff --git a/code/modules/psionics/interface/ui.dm b/code/modules/psionics/interface/ui.dm
index 3beffd94bce..925bd11fc12 100644
--- a/code/modules/psionics/interface/ui.dm
+++ b/code/modules/psionics/interface/ui.dm
@@ -1,14 +1,14 @@
-/obj/screen/psi
+/atom/movable/screen/psi
icon = 'icons/mob/screen/psi.dmi'
var/mob/living/owner
var/hidden = TRUE
-/obj/screen/psi/New(var/mob/living/_owner)
+/atom/movable/screen/psi/New(var/mob/living/_owner)
loc = null
owner = _owner
update_icon()
-/obj/screen/psi/Destroy()
+/atom/movable/screen/psi/Destroy()
if(owner && owner.client)
owner.client.screen -= src
. = ..()
diff --git a/code/modules/psionics/interface/ui_hub.dm b/code/modules/psionics/interface/ui_hub.dm
index 9fe30cb9685..47fc04bdfb4 100644
--- a/code/modules/psionics/interface/ui_hub.dm
+++ b/code/modules/psionics/interface/ui_hub.dm
@@ -1,4 +1,4 @@
-/obj/screen/psi/hub
+/atom/movable/screen/psi/hub
name = "Psi"
icon_state = "psi_active"
screen_loc = "EAST-1:28,CENTER-3:11"
@@ -7,23 +7,23 @@
maptext_y = -8
var/image/on_cooldown
-/obj/screen/psi/hub/New(var/mob/living/_owner)
+/atom/movable/screen/psi/hub/New(var/mob/living/_owner)
on_cooldown = image(icon, "cooldown")
..()
START_PROCESSING(SSprocessing, src)
-/obj/screen/psi/hub/update_icon()
+/atom/movable/screen/psi/hub/update_icon()
if(!owner.psi)
return
icon_state = owner.psi.suppressed ? "psi_suppressed" : "psi_active"
-/obj/screen/psi/hub/Destroy()
+/atom/movable/screen/psi/hub/Destroy()
STOP_PROCESSING(SSprocessing, src)
owner = null
. = ..()
-/obj/screen/psi/hub/process()
+/atom/movable/screen/psi/hub/process()
if(!istype(owner))
qdel(src)
return
@@ -32,23 +32,23 @@
maptext = SMALL_FONTS(7, "[round((owner.psi.stamina/owner.psi.max_stamina)*100)]%")
update_icon()
-/obj/screen/psi/hub/Click(var/location, var/control, var/params)
+/atom/movable/screen/psi/hub/Click(var/location, var/control, var/params)
ui_interact(owner)
update_icon()
-/obj/screen/psi/hub/ui_interact(mob/user, datum/tgui/ui)
+/atom/movable/screen/psi/hub/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if (!ui)
ui = new(user, src, "PsionicShop", "Psionic Point Shop", 400, 500)
ui.open()
-/obj/screen/psi/hub/ui_state(mob/user)
+/atom/movable/screen/psi/hub/ui_state(mob/user)
return GLOB.conscious_state
-/obj/screen/psi/hub/ui_status(mob/user, datum/ui_state/state)
+/atom/movable/screen/psi/hub/ui_status(mob/user, datum/ui_state/state)
return UI_INTERACTIVE
-/obj/screen/psi/hub/ui_data(mob/user)
+/atom/movable/screen/psi/hub/ui_data(mob/user)
var/list/data = list()
var/owner_rank = owner.psi.get_rank()
data["available_psionics"] = list()
@@ -83,7 +83,7 @@
)
return data
-/obj/screen/psi/hub/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+/atom/movable/screen/psi/hub/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return TRUE
diff --git a/code/modules/spell_system/spells/spell_code.dm b/code/modules/spell_system/spells/spell_code.dm
index 53b35069f46..d939ebdbb3d 100644
--- a/code/modules/spell_system/spells/spell_code.dm
+++ b/code/modules/spell_system/spells/spell_code.dm
@@ -54,7 +54,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
var/hud_state = "" //name of the icon used in generating the spell hud object
var/override_base = ""
- var/obj/screen/connected_button
+ var/atom/movable/screen/connected_button
///////////////////////
///SETUP AND PROCESS///
@@ -76,7 +76,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
silenced = max(0,silenced-1)
sleep(1)
if(connected_button)
- var/obj/screen/spell/S = connected_button
+ var/atom/movable/screen/spell/S = connected_button
if(!istype(S))
return
S.update_charge(1)
diff --git a/code/modules/spell_system/spells/spells.dm b/code/modules/spell_system/spells/spells.dm
index 8a514ca32fe..ba5b0d3bc04 100644
--- a/code/modules/spell_system/spells/spells.dm
+++ b/code/modules/spell_system/spells/spells.dm
@@ -6,13 +6,13 @@
for(var/spell/spell_to_add in H.mind.learned_spells)
H.add_spell(spell_to_add)
-/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /obj/screen/movable/spell_master)
+/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /atom/movable/screen/movable/spell_master)
usr = src // whoever made screen objects is an asshole and forced me to do this, i regret absolutely nothing
if(!spell_masters)
spell_masters = list()
if(spell_masters.len)
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
if(spell_master.type == master_type)
LAZYADD(spell_list, spell_to_add)
spell_master.add_spell(spell_to_add)
@@ -20,7 +20,7 @@
LAZYDISTINCTADD(mind.learned_spells, spell_to_add)
return TRUE
- var/obj/screen/movable/spell_master/new_spell_master = new master_type //we're here because either we didn't find our type, or we have no spell masters to attach to
+ var/atom/movable/screen/movable/spell_master/new_spell_master = new master_type //we're here because either we didn't find our type, or we have no spell masters to attach to
if(client)
src.client.screen += new_spell_master
new_spell_master.spell_holder = src
@@ -46,7 +46,7 @@
if(mind && mind.learned_spells)
mind.learned_spells.Remove(spell_to_remove)
LAZYREMOVE(spell_list, spell_to_remove)
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.remove_spell(spell_to_remove)
return 1
@@ -57,5 +57,5 @@
if(!spell_masters || !spell_masters.len)
return
- for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
+ for(var/atom/movable/screen/movable/spell_master/spell_master in spell_masters)
spell_master.silence_spells(amount)
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index ccc866b11de..cdf1f7298d5 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -14,7 +14,7 @@ Configuration:
Usage:
- Define mouse event procs on your (probably HUD) object and simply call the show and hide procs respectively:
-/obj/screen/hud
+/atom/movable/screen/hud
MouseEntered(location, control, params)
usr.client.tooltip.show(params, title = src.name, content = src.desc)
MouseExited()
diff --git a/code/unit_tests/create_and_destroy.dm b/code/unit_tests/create_and_destroy.dm
index 84430f265f5..1b04e4fca50 100644
--- a/code/unit_tests/create_and_destroy.dm
+++ b/code/unit_tests/create_and_destroy.dm
@@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
/obj/machinery/ai_powersupply,
// Requires a player
- /obj/screen/new_player/selection/join_game,
+ /atom/movable/screen/new_player/selection/join_game,
// Requires to make a sound based on client pref in the announcement
/obj/effect/portal/revenant,
@@ -90,8 +90,8 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
/obj/spellbutton,
- /obj/screen/click_catcher,
- /obj/screen/new_player/selection/polls,
+ /atom/movable/screen/click_catcher,
+ /atom/movable/screen/new_player/selection/polls,
//Temporary exclusion while matt fixes it
/obj/projectile/beam/psi_lightning/wide,
@@ -138,7 +138,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
ignore += typesof(/obj/machinery/gravity_generator/main/station)
// Requires an owner's client
- ignore += typesof(/obj/screen/psi)
+ ignore += typesof(/atom/movable/screen/psi)
// Requires material on creation
ignore += typesof(/obj/effect/overlay/burnt_wall)
@@ -161,7 +161,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE)
ignore += typesof(/turf/simulated/floor/beach/water)
ignore += typesof(/mob/living/heavy_vehicle)
ignore += typesof(/obj/singularity/narsie)
- ignore += typesof(/obj/screen/ability)
+ ignore += typesof(/atom/movable/screen/ability)
ignore += typesof(/obj/effect/bmode)
// Requires something in icon update or runtimes
diff --git a/html/changelogs/GeneralCamo - Screen Refactor.yml b/html/changelogs/GeneralCamo - Screen Refactor.yml
new file mode 100644
index 00000000000..842cc1f1e83
--- /dev/null
+++ b/html/changelogs/GeneralCamo - Screen Refactor.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: GeneralCamo
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Refactor /obj/screen to /atom/movable/screen."
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm
index 05b8d7a17bf..510a93e5cf4 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dm
@@ -60,7 +60,6 @@
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/tajaran/summer,
/obj/item/clothing/under/pants/tajaran,
- /obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/track
)