diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index fb30d979702..cc018287a5e 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -340,7 +340,7 @@
/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()
+ O = new /atom/movable/screen/text()
O.maptext = maptext
O.maptext_height = maptext_height
O.maptext_width = maptext_width
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 3ed75494289..60d1520f1e6 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -26,7 +26,7 @@
if(multicam_on)
var/turf/T = get_turf(A)
if(T)
- for(var/obj/screen/movable/pic_in_pic/ai/P in T.vis_locs)
+ for(var/atom/movable/screen/movable/pic_in_pic/ai/P in T.vis_locs)
if(P.ai == src)
P.Click(params)
break
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index ca3a11441f2..fe5ed806903 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -402,14 +402,14 @@
setDir(WEST)
//debug
-/obj/screen/proc/scale_to(x1,y1)
+/atom/movable/screen/proc/scale_to(x1,y1)
if(!y1)
y1 = x1
var/matrix/M = new
M.Scale(x1,y1)
transform = M
-/obj/screen/click_catcher
+/atom/movable/screen/click_catcher
icon = 'icons/hud/screen_gen.dmi'
icon_state = "catcher"
plane = CLICKCATCHER_PLANE
@@ -419,7 +419,7 @@
#define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size)
#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose.
-/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
+/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
var/icon/newicon = icon('icons/hud/screen_gen.dmi', "catcher")
var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
@@ -434,7 +434,7 @@
M.Scale(px/sx, py/sy)
transform = M
-/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"] && iscarbon(usr))
var/mob/living/carbon/C = usr
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index 536e09b3b8e..26fd1d9ceab 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -80,10 +80,10 @@
/atom/proc/IsAutoclickable()
return TRUE
-/obj/screen/IsAutoclickable()
+/atom/movable/screen/IsAutoclickable()
return FALSE
-/obj/screen/click_catcher/IsAutoclickable()
+/atom/movable/screen/click_catcher/IsAutoclickable()
return TRUE
/client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params)
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index a4733874895..78cef8d4775 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -1,6 +1,6 @@
#define ACTION_BUTTON_DEFAULT_BACKGROUND "default"
-/obj/screen/movable/action_button
+/atom/movable/screen/movable/action_button
var/datum/action/linked_action
var/actiontooltipstyle = ""
screen_loc = null
@@ -11,7 +11,7 @@
var/id
var/ordered = TRUE //If the button gets placed into the default bar
-/obj/screen/movable/action_button/proc/can_use(mob/user)
+/atom/movable/screen/movable/action_button/proc/can_use(mob/user)
if (linked_action)
return linked_action.owner == user
else if (isobserver(user))
@@ -20,14 +20,14 @@
else
return TRUE
-/obj/screen/movable/action_button/MouseDrop(over_object)
+/atom/movable/screen/movable/action_button/MouseDrop(over_object)
if(!can_use(usr))
return
- if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle)))
+ if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle)))
if(locked)
to_chat(usr, "Action button \"[name]\" is locked, unlock it first.")
return
- var/obj/screen/movable/action_button/B = over_object
+ var/atom/movable/screen/movable/action_button/B = over_object
var/list/actions = usr.actions
actions.Swap(actions.Find(src.linked_action), actions.Find(B.linked_action))
moved = FALSE
@@ -38,7 +38,7 @@
else
return ..()
-/obj/screen/movable/action_button/Click(location,control,params)
+/atom/movable/screen/movable/action_button/Click(location,control,params)
if (!can_use(usr))
return FALSE
@@ -63,7 +63,7 @@
return TRUE
//Hide/Show Action Buttons ... Button
-/obj/screen/movable/action_button/hide_toggle
+/atom/movable/screen/movable/action_button/hide_toggle
name = "Hide Buttons"
desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions."
icon = 'icons/hud/actions.dmi'
@@ -75,7 +75,7 @@
var/mutable_appearance/hide_appearance
var/mutable_appearance/show_appearance
-/obj/screen/movable/action_button/hide_toggle/Initialize()
+/atom/movable/screen/movable/action_button/hide_toggle/Initialize()
. = ..()
var/static/list/icon_cache = list()
@@ -90,7 +90,7 @@
show_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, show_state)
-/obj/screen/movable/action_button/hide_toggle/Click(location,control,params)
+/atom/movable/screen/movable/action_button/hide_toggle/Click(location,control,params)
if (!can_use(usr))
return
@@ -111,7 +111,7 @@
if(modifiers["alt"])
for(var/V in usr.actions)
var/datum/action/A = V
- var/obj/screen/movable/action_button/B = A.button
+ var/atom/movable/screen/movable/action_button/B = A.button
B.moved = FALSE
if(B.id && usr.client)
usr.client.prefs.action_buttons_screen_locs["[B.name]_[B.id]"] = null
@@ -133,10 +133,10 @@
update_icon()
usr.update_action_buttons()
-/obj/screen/movable/action_button/hide_toggle/AltClick(mob/user)
+/atom/movable/screen/movable/action_button/hide_toggle/AltClick(mob/user)
for(var/V in user.actions)
var/datum/action/A = V
- var/obj/screen/movable/action_button/B = A.button
+ var/atom/movable/screen/movable/action_button/B = A.button
B.moved = FALSE
if(moved)
moved = FALSE
@@ -144,7 +144,7 @@
to_chat(user, "Action button positions have been reset.")
-/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud)
+/atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud)
var/settings = owner_hud.get_action_buttons_icons()
icon = settings["bg_icon"]
icon_state = settings["bg_state"]
@@ -153,19 +153,19 @@
show_state = settings["toggle_show"]
update_icon()
-/obj/screen/movable/action_button/hide_toggle/update_overlays()
+/atom/movable/screen/movable/action_button/hide_toggle/update_overlays()
. = ..()
if(hidden)
. += show_appearance
else
. += hide_appearance
-/obj/screen/movable/action_button/MouseEntered(location,control,params)
+/atom/movable/screen/movable/action_button/MouseEntered(location,control,params)
if(!QDELETED(src))
openToolTip(usr,src,params,title = name,content = desc,theme = actiontooltipstyle)
-/obj/screen/movable/action_button/MouseExited()
+/atom/movable/screen/movable/action_button/MouseExited()
closeToolTip(usr)
/datum/hud/proc/get_action_buttons_icons()
@@ -203,7 +203,7 @@
else
for(var/datum/action/A in actions)
A.UpdateButtonIcon()
- var/obj/screen/movable/action_button/B = A.button
+ var/atom/movable/screen/movable/action_button/B = A.button
if(B.ordered)
button_number++
if(B.moved)
@@ -239,7 +239,7 @@
return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:-6"
-/datum/hud/proc/SetButtonCoords(obj/screen/button,number)
+/datum/hud/proc/SetButtonCoords(atom/movable/screen/button,number)
var/row = round((number-1)/AB_MAX_COLUMNS)
var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1
var/x_offset = 32*(col-1) + 4 + 2*col
diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index 57e87fa9be9..37930e4aed5 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -1,136 +1,136 @@
-/obj/screen/ai
+/atom/movable/screen/ai
icon = 'icons/hud/screen_ai.dmi'
-/obj/screen/ai/Click()
+/atom/movable/screen/ai/Click()
if(isobserver(usr) || usr.incapacitated())
return TRUE
-/obj/screen/ai/aicore
+/atom/movable/screen/ai/aicore
name = "AI core"
icon_state = "ai_core"
-/obj/screen/ai/aicore/Click()
+/atom/movable/screen/ai/aicore/Click()
if(..())
return
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"
-/obj/screen/ai/camera_list/Click()
+/atom/movable/screen/ai/camera_list/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.show_camera_list()
-/obj/screen/ai/camera_track
+/atom/movable/screen/ai/camera_track
name = "Track With Camera"
icon_state = "track"
-/obj/screen/ai/camera_track/Click()
+/atom/movable/screen/ai/camera_track/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
var/target_name = input(AI, "Choose who you want to track", "Tracking") as null|anything in AI.trackable_mobs()
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"
-/obj/screen/ai/camera_light/Click()
+/atom/movable/screen/ai/camera_light/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.toggle_camera_light()
-/obj/screen/ai/crew_monitor
+/atom/movable/screen/ai/crew_monitor
name = "Crew Monitoring Console"
icon_state = "crew_monitor"
-/obj/screen/ai/crew_monitor/Click()
+/atom/movable/screen/ai/crew_monitor/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
GLOB.crewmonitor.show(AI,AI)
-/obj/screen/ai/crew_manifest
+/atom/movable/screen/ai/crew_manifest
name = "Crew Manifest"
icon_state = "manifest"
-/obj/screen/ai/crew_manifest/Click()
+/atom/movable/screen/ai/crew_manifest/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.ai_roster()
-/obj/screen/ai/alerts
+/atom/movable/screen/ai/alerts
name = "Show Alerts"
icon_state = "alerts"
-/obj/screen/ai/alerts/Click()
+/atom/movable/screen/ai/alerts/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.ai_alerts()
-/obj/screen/ai/announcement
+/atom/movable/screen/ai/announcement
name = "Make Vox Announcement"
icon_state = "announcement"
-/obj/screen/ai/announcement/Click()
+/atom/movable/screen/ai/announcement/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.announcement()
-/obj/screen/ai/call_shuttle
+/atom/movable/screen/ai/call_shuttle
name = "Call Emergency Shuttle"
icon_state = "call_shuttle"
-/obj/screen/ai/call_shuttle/Click()
+/atom/movable/screen/ai/call_shuttle/Click()
if(..())
return
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"
-/obj/screen/ai/state_laws/Click()
+/atom/movable/screen/ai/state_laws/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.checklaws()
-/obj/screen/ai/pda_msg_send
+/atom/movable/screen/ai/pda_msg_send
name = "PDA - Send Message"
icon_state = "pda_send"
-/obj/screen/ai/pda_msg_send/Click()
+/atom/movable/screen/ai/pda_msg_send/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.cmd_send_pdamesg(usr)
-/obj/screen/ai/pda_msg_show
+/atom/movable/screen/ai/pda_msg_show
name = "PDA - Show Message Log"
icon_state = "pda_receive"
-/obj/screen/ai/pda_msg_show/Click()
+/atom/movable/screen/ai/pda_msg_show/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.cmd_show_message_log(usr)
-/obj/screen/ai/image_take
+/atom/movable/screen/ai/image_take
name = "Take Image"
icon_state = "take_picture"
-/obj/screen/ai/image_take/Click()
+/atom/movable/screen/ai/image_take/Click()
if(..())
return
if(isAI(usr))
@@ -140,42 +140,42 @@
var/mob/living/silicon/robot/R = usr
R.aicamera.toggle_camera_mode(usr)
-/obj/screen/ai/image_view
+/atom/movable/screen/ai/image_view
name = "View Images"
icon_state = "view_images"
-/obj/screen/ai/image_view/Click()
+/atom/movable/screen/ai/image_view/Click()
if(..())
return
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.aicamera.viewpictures(usr)
-/obj/screen/ai/sensors
+/atom/movable/screen/ai/sensors
name = "Sensor Augmentation"
icon_state = "ai_sensor"
-/obj/screen/ai/sensors/Click()
+/atom/movable/screen/ai/sensors/Click()
if(..())
return
var/mob/living/silicon/S = usr
S.toggle_sensors()
-/obj/screen/ai/multicam
+/atom/movable/screen/ai/multicam
name = "Multicamera Mode"
icon_state = "multicam"
-/obj/screen/ai/multicam/Click()
+/atom/movable/screen/ai/multicam/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.toggle_multicam()
-/obj/screen/ai/add_multicam
+/atom/movable/screen/ai/add_multicam
name = "New Camera"
icon_state = "new_cam"
-/obj/screen/ai/add_multicam/Click()
+/atom/movable/screen/ai/add_multicam/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
@@ -187,112 +187,112 @@
/datum/hud/ai/New(mob/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
// Language menu
- using = new /obj/screen/language_menu
+ using = new /atom/movable/screen/language_menu
using.screen_loc = ui_borg_language_menu
using.hud = src
static_inventory += using
//AI core
- using = new /obj/screen/ai/aicore()
+ using = new /atom/movable/screen/ai/aicore()
using.screen_loc = ui_ai_core
using.hud = src
static_inventory += using
//Camera list
- using = new /obj/screen/ai/camera_list()
+ using = new /atom/movable/screen/ai/camera_list()
using.screen_loc = ui_ai_camera_list
using.hud = src
static_inventory += using
//Track
- using = new /obj/screen/ai/camera_track()
+ using = new /atom/movable/screen/ai/camera_track()
using.screen_loc = ui_ai_track_with_camera
using.hud = src
static_inventory += using
//Camera light
- using = new /obj/screen/ai/camera_light()
+ using = new /atom/movable/screen/ai/camera_light()
using.screen_loc = ui_ai_camera_light
using.hud = src
static_inventory += using
//Crew Monitoring
- using = new /obj/screen/ai/crew_monitor()
+ using = new /atom/movable/screen/ai/crew_monitor()
using.screen_loc = ui_ai_crew_monitor
using.hud = src
static_inventory += using
//Crew Manifest
- using = new /obj/screen/ai/crew_manifest()
+ using = new /atom/movable/screen/ai/crew_manifest()
using.screen_loc = ui_ai_crew_manifest
using.hud = src
static_inventory += using
//Alerts
- using = new /obj/screen/ai/alerts()
+ using = new /atom/movable/screen/ai/alerts()
using.screen_loc = ui_ai_alerts
using.hud = src
static_inventory += using
//Announcement
- using = new /obj/screen/ai/announcement()
+ using = new /atom/movable/screen/ai/announcement()
using.screen_loc = ui_ai_announcement
using.hud = src
static_inventory += using
//Shuttle
- using = new /obj/screen/ai/call_shuttle()
+ using = new /atom/movable/screen/ai/call_shuttle()
using.screen_loc = ui_ai_shuttle
using.hud = src
static_inventory += using
//Laws
- using = new /obj/screen/ai/state_laws()
+ using = new /atom/movable/screen/ai/state_laws()
using.screen_loc = ui_ai_state_laws
using.hud = src
static_inventory += using
//PDA message
- using = new /obj/screen/ai/pda_msg_send()
+ using = new /atom/movable/screen/ai/pda_msg_send()
using.screen_loc = ui_ai_pda_send
using.hud = src
static_inventory += using
//PDA log
- using = new /obj/screen/ai/pda_msg_show()
+ using = new /atom/movable/screen/ai/pda_msg_show()
using.screen_loc = ui_ai_pda_log
using.hud = src
static_inventory += using
//Take image
- using = new /obj/screen/ai/image_take()
+ using = new /atom/movable/screen/ai/image_take()
using.screen_loc = ui_ai_take_picture
using.hud = src
static_inventory += using
//View images
- using = new /obj/screen/ai/image_view()
+ using = new /atom/movable/screen/ai/image_view()
using.screen_loc = ui_ai_view_images
using.hud = src
static_inventory += using
//Medical/Security sensors
- using = new /obj/screen/ai/sensors()
+ using = new /atom/movable/screen/ai/sensors()
using.screen_loc = ui_ai_sensor
using.hud = src
static_inventory += using
//Multicamera mode
- using = new /obj/screen/ai/multicam()
+ using = new /atom/movable/screen/ai/multicam()
using.screen_loc = ui_ai_multicam
using.hud = src
static_inventory += using
//Add multicamera camera
- using = new /obj/screen/ai/add_multicam()
+ using = new /atom/movable/screen/ai/add_multicam()
using.screen_loc = ui_ai_add_multicam
using.hud = src
static_inventory += using
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 74b15baa276..ee2b1405421 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -18,7 +18,7 @@
if(!category || QDELETED(src))
return
- var/obj/screen/alert/thealert
+ var/atom/movable/screen/alert/thealert
if(alerts[category])
thealert = alerts[category]
if(thealert.override_alerts)
@@ -69,13 +69,13 @@
thealert.timeout = world.time + thealert.timeout - world.tick_lag
return thealert
-/mob/proc/alert_timeout(obj/screen/alert/alert, category)
+/mob/proc/alert_timeout(atom/movable/screen/alert/alert, category)
if(alert.timeout && alerts[category] == alert && world.time >= alert.timeout)
clear_alert(category)
// Proc to clear an existing alert.
/mob/proc/clear_alert(category, clear_override = FALSE)
- var/obj/screen/alert/alert = alerts[category]
+ var/atom/movable/screen/alert/alert = alerts[category]
if(!alert)
return 0
if(alert.override_alerts && !clear_override)
@@ -87,7 +87,7 @@
client.screen -= alert
qdel(alert)
-/obj/screen/alert
+/atom/movable/screen/alert
icon = 'icons/hud/screen_alert.dmi'
icon_state = "default"
name = "Alert"
@@ -100,154 +100,154 @@
var/mob/owner //Alert owner
-/obj/screen/alert/MouseEntered(location,control,params)
+/atom/movable/screen/alert/MouseEntered(location,control,params)
if(!QDELETED(src))
openToolTip(usr,src,params,title = name,content = desc,theme = alerttooltipstyle)
-/obj/screen/alert/MouseExited()
+/atom/movable/screen/alert/MouseExited()
closeToolTip(usr)
//Gas alerts
-/obj/screen/alert/not_enough_oxy
+/atom/movable/screen/alert/not_enough_oxy
name = "Choking (No O2)"
desc = "You're not getting enough oxygen. Find some good air before you pass out! The box in your backpack has an oxygen tank and breath mask in it."
icon_state = "not_enough_oxy"
-/obj/screen/alert/too_much_oxy
+/atom/movable/screen/alert/too_much_oxy
name = "Choking (O2)"
desc = "There's too much oxygen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_oxy"
-/obj/screen/alert/not_enough_nitro
+/atom/movable/screen/alert/not_enough_nitro
name = "Choking (No N2)"
desc = "You're not getting enough nitrogen. Find some good air before you pass out!"
icon_state = "not_enough_nitro"
-/obj/screen/alert/too_much_nitro
+/atom/movable/screen/alert/too_much_nitro
name = "Choking (N2)"
desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_nitro"
-/obj/screen/alert/not_enough_co2
+/atom/movable/screen/alert/not_enough_co2
name = "Choking (No CO2)"
desc = "You're not getting enough carbon dioxide. Find some good air before you pass out!"
icon_state = "not_enough_co2"
-/obj/screen/alert/too_much_co2
+/atom/movable/screen/alert/too_much_co2
name = "Choking (CO2)"
desc = "There's too much carbon dioxide in the air, and you're breathing it in! Find some good air before you pass out!"
icon_state = "too_much_co2"
-/obj/screen/alert/not_enough_tox
+/atom/movable/screen/alert/not_enough_tox
name = "Choking (No Plasma)"
desc = "You're not getting enough plasma. Find some good air before you pass out!"
icon_state = "not_enough_tox"
-/obj/screen/alert/too_much_tox
+/atom/movable/screen/alert/too_much_tox
name = "Choking (Plasma)"
desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it."
icon_state = "too_much_tox"
//End gas alerts
-/obj/screen/alert/fat
+/atom/movable/screen/alert/fat
name = "Fat"
desc = "You ate too much food, lardass. Run around the station and lose some weight."
icon_state = "fat"
-/obj/screen/alert/hungry
+/atom/movable/screen/alert/hungry
name = "Hungry"
desc = "Some food would be good right about now."
icon_state = "hungry"
-/obj/screen/alert/starving
+/atom/movable/screen/alert/starving
name = "Starving"
desc = "You're severely malnourished. The hunger pains make moving around a chore."
icon_state = "starving"
-/obj/screen/alert/gross
+/atom/movable/screen/alert/gross
name = "Grossed out."
desc = "That was kind of gross..."
icon_state = "gross"
-/obj/screen/alert/verygross
+/atom/movable/screen/alert/verygross
name = "Very grossed out."
desc = "You're not feeling very well..."
icon_state = "gross2"
-/obj/screen/alert/disgusted
+/atom/movable/screen/alert/disgusted
name = "DISGUSTED"
desc = "ABSOLUTELY DISGUSTIN'"
icon_state = "gross3"
-/obj/screen/alert/hot
+/atom/movable/screen/alert/hot
name = "Too Hot"
desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit."
icon_state = "hot"
-/obj/screen/alert/cold
+/atom/movable/screen/alert/cold
name = "Too Cold"
desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit."
icon_state = "cold"
-/obj/screen/alert/lowpressure
+/atom/movable/screen/alert/lowpressure
name = "Low Pressure"
desc = "The air around you is hazardously thin. A space suit would protect you."
icon_state = "lowpressure"
-/obj/screen/alert/highpressure
+/atom/movable/screen/alert/highpressure
name = "High Pressure"
desc = "The air around you is hazardously thick. A fire suit would protect you."
icon_state = "highpressure"
-/obj/screen/alert/blind
+/atom/movable/screen/alert/blind
name = "Blind"
desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, \
or something covering your eyes."
icon_state = "blind"
-/obj/screen/alert/high
+/atom/movable/screen/alert/high
name = "High"
desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already."
icon_state = "high"
-/obj/screen/alert/hypnosis
+/atom/movable/screen/alert/hypnosis
name = "Hypnosis"
desc = "Something's hypnotizing you, but you're not really sure about what."
icon_state = "hypnosis"
var/phrase
-/obj/screen/alert/mind_control
+/atom/movable/screen/alert/mind_control
name = "Mind Control"
desc = "Your mind has been hijacked! Click to view the mind control command."
icon_state = "mind_control"
var/command
-/obj/screen/alert/mind_control/Click()
+/atom/movable/screen/alert/mind_control/Click()
var/mob/living/L = usr
if(L != owner)
return
to_chat(L, "[command]")
-/obj/screen/alert/drunk
+/atom/movable/screen/alert/drunk
name = "Drunk"
desc = "All that alcohol you've been drinking is impairing your speech, motor skills, and mental cognition. Make sure to act like it."
icon_state = "drunk"
-/obj/screen/alert/embeddedobject
+/atom/movable/screen/alert/embeddedobject
name = "Embedded Object"
desc = "Something got lodged into your flesh and is causing major bleeding. It might fall out with time, but surgery is the safest way. \
If you're feeling frisky, examine yourself and click the underlined item to pull the object out."
icon_state = "embeddedobject"
-/obj/screen/alert/embeddedobject/Click()
+/atom/movable/screen/alert/embeddedobject/Click()
if(isliving(usr) && usr == owner)
var/mob/living/carbon/M = usr
return M.help_shake_act(M)
-/obj/screen/alert/weightless
+/atom/movable/screen/alert/weightless
name = "Weightless"
desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \
wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \
@@ -255,22 +255,22 @@ magboots would let you walk around normally on the floor. Barring those, you can
or shoot a gun to move around via Newton's 3rd Law of Motion."
icon_state = "weightless"
-/obj/screen/alert/highgravity
+/atom/movable/screen/alert/highgravity
name = "High Gravity"
desc = "You're getting crushed by high gravity, picking up items and movement will be slowed."
icon_state = "paralysis"
-/obj/screen/alert/veryhighgravity
+/atom/movable/screen/alert/veryhighgravity
name = "Crushing Gravity"
desc = "You're getting crushed by high gravity, picking up items and movement will be slowed. You'll also accumulate brute damage!"
icon_state = "paralysis"
-/obj/screen/alert/fire
+/atom/movable/screen/alert/fire
name = "On Fire"
desc = "You're on fire. Stop, drop and roll to put the fire out or move to a vacuum area."
icon_state = "fire"
-/obj/screen/alert/fire/Click()
+/atom/movable/screen/alert/fire/Click()
var/mob/living/L = usr
if(!istype(L) || !L.can_resist() || L != owner)
return
@@ -278,7 +278,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
if(L.mobility_flags & MOBILITY_MOVE)
return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt.
-/obj/screen/alert/give // information set when the give alert is made
+/atom/movable/screen/alert/give // information set when the give alert is made
icon_state = "default"
var/mob/living/carbon/giver
var/obj/item/receiving
@@ -293,7 +293,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
* * giver - The person giving the alert and item
* * receiving - The item being given by the giver
*/
-/obj/screen/alert/give/proc/setup(mob/living/carbon/taker, mob/living/carbon/giver, obj/item/receiving)
+/atom/movable/screen/alert/give/proc/setup(mob/living/carbon/taker, mob/living/carbon/giver, obj/item/receiving)
name = "[giver] is offering [receiving]"
desc = "[giver] is offering [receiving]. Click this alert to take it."
icon_state = "template"
@@ -303,24 +303,24 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
src.giver = giver
RegisterSignal(taker, COMSIG_MOVABLE_MOVED, .proc/check_in_range, taker)
-/obj/screen/alert/give/proc/check_in_range(atom/taker)
+/atom/movable/screen/alert/give/proc/check_in_range(atom/taker)
SIGNAL_HANDLER
if (!giver.CanReach(taker))
to_chat(owner, "You moved out of range of [giver]!")
owner.clear_alert("[giver]")
-/obj/screen/alert/give/Click(location, control, params)
+/atom/movable/screen/alert/give/Click(location, control, params)
. = ..()
var/mob/living/carbon/C = owner
C.take(giver, receiving)
-/obj/screen/alert/highfive
+/atom/movable/screen/alert/highfive
icon_state = "default"
var/mob/living/carbon/giver
var/obj/item/slapper/slapper_item
-/obj/screen/alert/highfive/proc/setup(mob/living/carbon/taker, mob/living/carbon/giver, obj/item/slapper/slap)
+/atom/movable/screen/alert/highfive/proc/setup(mob/living/carbon/taker, mob/living/carbon/giver, obj/item/slapper/slap)
name = "[giver] is offering a high-five"
desc = "[giver] wants a high-five! Click this alert to take it."
icon_state = "template"
@@ -329,19 +329,19 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
src.slapper_item = slap
src.giver = giver
-/obj/screen/alert/highfive/Click(location, control, params)
+/atom/movable/screen/alert/highfive/Click(location, control, params)
. = ..()
var/datum/status_effect/high_fiving/high_five_effect = giver.has_status_effect(STATUS_EFFECT_HIGHFIVE)
if(high_five_effect)
high_five_effect.we_did_it(owner)
/// Gives the player the option to succumb while in critical condition
-/obj/screen/alert/succumb
+/atom/movable/screen/alert/succumb
name = "Succumb"
desc = "Shuffle off this mortal coil."
icon_state = "succumb"
-/obj/screen/alert/succumb/Click()
+/atom/movable/screen/alert/succumb/Click()
if (isobserver(usr))
return
@@ -357,20 +357,20 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
//ALIENS
-/obj/screen/alert/alien_tox
+/atom/movable/screen/alert/alien_tox
name = "Plasma"
desc = "There's flammable plasma in the air. If it lights up, you'll be toast."
icon_state = "alien_tox"
alerttooltipstyle = "alien"
-/obj/screen/alert/alien_fire
+/atom/movable/screen/alert/alien_fire
// This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire
name = "Too Hot"
desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you."
icon_state = "alien_fire"
alerttooltipstyle = "alien"
-/obj/screen/alert/alien_vulnerable
+/atom/movable/screen/alert/alien_vulnerable
name = "Severed Matriarchy"
desc = "Your queen has been killed, you will suffer movement penalties and loss of hivemind. A new queen cannot be made until you recover."
icon_state = "alien_noqueen"
@@ -378,7 +378,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
//BLOBS
-/obj/screen/alert/nofactory
+/atom/movable/screen/alert/nofactory
name = "No Factory"
desc = "You have no factory, and are slowly dying!"
icon_state = "blobbernaut_nofactory"
@@ -386,7 +386,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
// BLOODCULT
-/obj/screen/alert/bloodsense
+/atom/movable/screen/alert/bloodsense
name = "Blood Sense"
desc = "Allows you to sense blood that is manipulated by dark magicks."
icon_state = "cult_sense"
@@ -395,17 +395,17 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
var/angle = 0
var/mob/living/simple_animal/hostile/construct/Cviewer = null
-/obj/screen/alert/bloodsense/Initialize()
+/atom/movable/screen/alert/bloodsense/Initialize()
. = ..()
narnar = new('icons/hud/screen_alert.dmi', "mini_nar")
START_PROCESSING(SSprocessing, src)
-/obj/screen/alert/bloodsense/Destroy()
+/atom/movable/screen/alert/bloodsense/Destroy()
Cviewer = null
STOP_PROCESSING(SSprocessing, src)
return ..()
-/obj/screen/alert/bloodsense/process()
+/atom/movable/screen/alert/bloodsense/process()
var/atom/blood_target
if(!owner.mind)
@@ -495,19 +495,19 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
//GUARDIANS
-/obj/screen/alert/cancharge
+/atom/movable/screen/alert/cancharge
name = "Charge Ready"
desc = "You are ready to charge at a location!"
icon_state = "guardian_charge"
alerttooltipstyle = "parasite"
-/obj/screen/alert/canstealth
+/atom/movable/screen/alert/canstealth
name = "Stealth Ready"
desc = "You are ready to enter stealth!"
icon_state = "guardian_canstealth"
alerttooltipstyle = "parasite"
-/obj/screen/alert/instealth
+/atom/movable/screen/alert/instealth
name = "In Stealth"
desc = "You are in stealth and your next attack will do bonus damage!"
icon_state = "guardian_instealth"
@@ -515,54 +515,54 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
//SILICONS
-/obj/screen/alert/nocell
+/atom/movable/screen/alert/nocell
name = "Missing Power Cell"
desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance."
icon_state = "nocell"
-/obj/screen/alert/emptycell
+/atom/movable/screen/alert/emptycell
name = "Out of Power"
desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \
Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
icon_state = "emptycell"
-/obj/screen/alert/lowcell
+/atom/movable/screen/alert/lowcell
name = "Low Charge"
desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite."
icon_state = "lowcell"
//Ethereal
-/obj/screen/alert/etherealcharge
+/atom/movable/screen/alert/etherealcharge
name = "Low Blood Charge"
desc = "Your blood's electric charge is running low, find a source of charge for your blood. Use a recharging station found in robotics or the dormitory bathrooms, or eat some Ethereal-friendly food."
icon_state = "etherealcharge"
-/obj/screen/alert/ethereal_overcharge
+/atom/movable/screen/alert/ethereal_overcharge
name = "Blood Overcharge"
desc = "Your blood's electric charge is becoming dangerously high, find an outlet for your energy. Use Grab Intent on an APC to channel your energy into it."
icon_state = "ethereal_overcharge"
//Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg
-/obj/screen/alert/hacked
+/atom/movable/screen/alert/hacked
name = "Hacked"
desc = "Hazardous non-standard equipment detected. Please ensure any usage of this equipment is in line with unit's laws, if any."
icon_state = "hacked"
-/obj/screen/alert/locked
+/atom/movable/screen/alert/locked
name = "Locked Down"
desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \
office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary."
icon_state = "locked"
-/obj/screen/alert/newlaw
+/atom/movable/screen/alert/newlaw
name = "Law Update"
desc = "Laws have potentially been uploaded to or removed from this unit. Please be aware of any changes \
so as to remain in compliance with the most up-to-date laws."
icon_state = "newlaw"
timeout = 300
-/obj/screen/alert/hackingapc
+/atom/movable/screen/alert/hackingapc
name = "Hacking APC"
desc = "An Area Power Controller is being hacked. When the process is \
complete, you will have exclusive control of it, and you will gain \
@@ -571,7 +571,7 @@ so as to remain in compliance with the most up-to-date laws."
timeout = 600
var/atom/target = null
-/obj/screen/alert/hackingapc/Click()
+/atom/movable/screen/alert/hackingapc/Click()
if(!usr || !usr.client || usr != owner)
return
if(!target)
@@ -583,7 +583,7 @@ so as to remain in compliance with the most up-to-date laws."
//MECHS
-/obj/screen/alert/low_mech_integrity
+/atom/movable/screen/alert/low_mech_integrity
name = "Mech Damaged"
desc = "Mech integrity is low."
icon_state = "low_mech_integrity"
@@ -591,19 +591,19 @@ so as to remain in compliance with the most up-to-date laws."
//GHOSTS
//TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages
-/obj/screen/alert/notify_cloning
+/atom/movable/screen/alert/notify_cloning
name = "Revival"
desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!"
icon_state = "template"
timeout = 300
-/obj/screen/alert/notify_cloning/Click()
+/atom/movable/screen/alert/notify_cloning/Click()
if(!usr || !usr.client || usr != owner)
return
var/mob/dead/observer/G = usr
G.reenter_corpse()
-/obj/screen/alert/notify_action
+/atom/movable/screen/alert/notify_action
name = "Body created"
desc = "A body was created. You can enter it."
icon_state = "template"
@@ -611,7 +611,7 @@ so as to remain in compliance with the most up-to-date laws."
var/atom/target = null
var/action = NOTIFY_JUMP
-/obj/screen/alert/notify_action/Click()
+/atom/movable/screen/alert/notify_action/Click()
if(!usr || !usr.client || usr != owner)
return
if(!target)
@@ -631,20 +631,20 @@ so as to remain in compliance with the most up-to-date laws."
//OBJECT-BASED
-/obj/screen/alert/restrained/buckled
+/atom/movable/screen/alert/restrained/buckled
name = "Buckled"
desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed."
icon_state = "buckled"
-/obj/screen/alert/restrained/handcuffed
+/atom/movable/screen/alert/restrained/handcuffed
name = "Handcuffed"
desc = "You're handcuffed and can't act. If anyone drags you, you won't be able to move. Click the alert to free yourself."
-/obj/screen/alert/restrained/legcuffed
+/atom/movable/screen/alert/restrained/legcuffed
name = "Legcuffed"
desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself."
-/obj/screen/alert/restrained/Click()
+/atom/movable/screen/alert/restrained/Click()
var/mob/living/L = usr
if(!istype(L) || !L.can_resist() || L != owner)
return
@@ -652,7 +652,7 @@ so as to remain in compliance with the most up-to-date laws."
if((L.mobility_flags & MOBILITY_MOVE) && (L.last_special <= world.time))
return L.resist_restraints()
-/obj/screen/alert/restrained/buckled/Click()
+/atom/movable/screen/alert/restrained/buckled/Click()
var/mob/living/L = usr
if(!istype(L) || !L.can_resist() || L != owner)
return
@@ -660,17 +660,17 @@ so as to remain in compliance with the most up-to-date laws."
if(L.last_special <= world.time)
return L.resist_buckle()
-/obj/screen/alert/shoes/untied
+/atom/movable/screen/alert/shoes/untied
name = "Untied Shoes"
desc = "Your shoes are untied! Click the alert or your shoes to tie them."
icon_state = "shoealert"
-/obj/screen/alert/shoes/knotted
+/atom/movable/screen/alert/shoes/knotted
name = "Knotted Shoes"
desc = "Someone tied your shoelaces together! Click the alert or your shoes to undo the knot."
icon_state = "shoealert"
-/obj/screen/alert/shoes/Click()
+/atom/movable/screen/alert/shoes/Click()
var/mob/living/carbon/C = usr
if(!istype(C) || !C.can_resist() || C != owner || !C.shoes)
return
@@ -690,7 +690,7 @@ so as to remain in compliance with the most up-to-date laws."
screenmob.client.screen -= alerts[alerts[i]]
return 1
for(var/i = 1, i <= alerts.len, i++)
- var/obj/screen/alert/alert = alerts[alerts[i]]
+ var/atom/movable/screen/alert/alert = alerts[alerts[i]]
if(alert.icon_state == "template")
alert.icon = ui_style
switch(i)
@@ -713,7 +713,7 @@ so as to remain in compliance with the most up-to-date laws."
reorganize_alerts(M)
return 1
-/obj/screen/alert/Click(location, control, params)
+/atom/movable/screen/alert/Click(location, control, params)
if(!usr || !usr.client)
return
var/paramslist = params2list(params)
@@ -725,7 +725,7 @@ so as to remain in compliance with the most up-to-date laws."
if(master)
return usr.client.Click(master, location, control, params)
-/obj/screen/alert/Destroy()
+/atom/movable/screen/alert/Destroy()
. = ..()
severity = 0
master = null
diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
index 20cc3af3b16..d0db2a3c0d9 100644
--- a/code/_onclick/hud/alien.dm
+++ b/code/_onclick/hud/alien.dm
@@ -1,21 +1,21 @@
-/obj/screen/alien
+/atom/movable/screen/alien
icon = 'icons/hud/screen_alien.dmi'
-/obj/screen/alien/leap
+/atom/movable/screen/alien/leap
name = "toggle leap"
icon_state = "leap_off"
-/obj/screen/alien/leap/Click()
+/atom/movable/screen/alien/leap/Click()
if(isalienhunter(usr))
var/mob/living/carbon/alien/humanoid/hunter/AH = usr
AH.toggle_leap()
-/obj/screen/alien/plasma_display
+/atom/movable/screen/alien/plasma_display
name = "plasma stored"
icon_state = "power_display"
screen_loc = ui_alienplasmadisplay
-/obj/screen/alien/alien_queen_finder
+/atom/movable/screen/alien/alien_queen_finder
name = "queen sense"
desc = "Allows you to sense the general direction of your Queen."
icon_state = "queen_finder"
@@ -27,7 +27,7 @@
/datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
//equippable shit
@@ -36,21 +36,21 @@
//begin buttons
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
using.hud = src
static_inventory += using
- using = new /obj/screen/act_intent/alien()
+ using = new /atom/movable/screen/act_intent/alien()
using.icon_state = mymob.a_intent
using.hud = src
static_inventory += using
@@ -58,34 +58,34 @@
if(isalienhunter(mymob))
var/mob/living/carbon/alien/humanoid/hunter/H = mymob
- H.leap_icon = new /obj/screen/alien/leap()
+ H.leap_icon = new /atom/movable/screen/alien/leap()
H.leap_icon.screen_loc = ui_alien_storage_r
static_inventory += H.leap_icon
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.screen_loc = ui_alien_language_menu
using.hud = src
static_inventory += using
- using = new /obj/screen/drop()
+ using = new /atom/movable/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
using.hud = src
static_inventory += using
- using = new /obj/screen/resist()
+ using = new /atom/movable/screen/resist()
using.icon = ui_style
using.screen_loc = ui_above_movement
using.hud = src
hotkeybuttons += using
- throw_icon = new /obj/screen/throw_catch()
+ throw_icon = new /atom/movable/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
throw_icon.hud = src
hotkeybuttons += throw_icon
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_movement
@@ -94,25 +94,25 @@
//begin indicators
- healths = new /obj/screen/healths/alien()
+ healths = new /atom/movable/screen/healths/alien()
healths.hud = src
infodisplay += healths
- alien_plasma_display = new /obj/screen/alien/plasma_display()
+ alien_plasma_display = new /atom/movable/screen/alien/plasma_display()
alien_plasma_display.hud = src
infodisplay += alien_plasma_display
if(!isalienqueen(mymob))
- alien_queen_finder = new /obj/screen/alien/alien_queen_finder
+ alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder
alien_queen_finder.hud = src
infodisplay += alien_queen_finder
- zone_select = new /obj/screen/zone_sel/alien()
+ zone_select = new /atom/movable/screen/zone_sel/alien()
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index a0293ff03d1..3b7d8249328 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -3,35 +3,35 @@
/datum/hud/larva/New(mob/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/act_intent/alien()
+ using = new /atom/movable/screen/act_intent/alien()
using.icon_state = mymob.a_intent
using.hud = src
static_inventory += using
action_intent = using
- healths = new /obj/screen/healths/alien()
+ healths = new /atom/movable/screen/healths/alien()
healths.hud = src
infodisplay += healths
- alien_queen_finder = new /obj/screen/alien/alien_queen_finder()
+ alien_queen_finder = new /atom/movable/screen/alien/alien_queen_finder()
alien_queen_finder.hud = src
infodisplay += alien_queen_finder
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = 'icons/hud/screen_alien.dmi'
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_movement
pull_icon.hud = src
hotkeybuttons += pull_icon
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.screen_loc = ui_alien_language_menu
using.hud = src
static_inventory += using
- zone_select = new /obj/screen/zone_sel/alien()
+ zone_select = new /atom/movable/screen/zone_sel/alien()
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
index a91b4244291..ebdadf4ac33 100644
--- a/code/_onclick/hud/blob_overmind.dm
+++ b/code/_onclick/hud/blob_overmind.dm
@@ -1,39 +1,39 @@
-/obj/screen/blob
+/atom/movable/screen/blob
icon = 'icons/hud/blob.dmi'
-/obj/screen/blob/MouseEntered(location,control,params)
+/atom/movable/screen/blob/MouseEntered(location,control,params)
openToolTip(usr,src,params,title = name,content = desc, theme = "blob")
-/obj/screen/blob/MouseExited()
+/atom/movable/screen/blob/MouseExited()
closeToolTip(usr)
-/obj/screen/blob/blob_help
+/atom/movable/screen/blob/blob_help
icon_state = "ui_help"
name = "Blob Help"
desc = "Help on playing blob!"
-/obj/screen/blob/blob_help/Click()
+/atom/movable/screen/blob/blob_help/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.blob_help()
-/obj/screen/blob/jump_to_node
+/atom/movable/screen/blob/jump_to_node
icon_state = "ui_tonode"
name = "Jump to Node"
desc = "Moves your camera to a selected blob node."
-/obj/screen/blob/jump_to_node/Click()
+/atom/movable/screen/blob/jump_to_node/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.jump_to_node()
-/obj/screen/blob/jump_to_core
+/atom/movable/screen/blob/jump_to_core
icon_state = "ui_tocore"
name = "Jump to Core"
desc = "Moves your camera to your blob core."
-/obj/screen/blob/jump_to_core/MouseEntered(location,control,params)
+/atom/movable/screen/blob/jump_to_core/MouseEntered(location,control,params)
if(hud?.mymob && isovermind(hud.mymob))
var/mob/camera/blob/B = hud.mymob
if(!B.placed)
@@ -44,59 +44,59 @@
desc = initial(desc)
..()
-/obj/screen/blob/jump_to_core/Click()
+/atom/movable/screen/blob/jump_to_core/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
if(!B.placed)
B.place_blob_core(0)
B.transport_core()
-/obj/screen/blob/blobbernaut
+/atom/movable/screen/blob/blobbernaut
icon_state = "ui_blobbernaut"
name = "Produce Blobbernaut (40)"
desc = "Produces a strong, smart blobbernaut from a factory blob for 40 resources.
The factory blob used will become fragile and unable to produce spores."
-/obj/screen/blob/blobbernaut/Click()
+/atom/movable/screen/blob/blobbernaut/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.create_blobbernaut()
-/obj/screen/blob/resource_blob
+/atom/movable/screen/blob/resource_blob
icon_state = "ui_resource"
name = "Produce Resource Blob (40)"
desc = "Produces a resource blob for 40 resources.
Resource blobs will give you resources every few seconds."
-/obj/screen/blob/resource_blob/Click()
+/atom/movable/screen/blob/resource_blob/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.create_resource()
-/obj/screen/blob/node_blob
+/atom/movable/screen/blob/node_blob
icon_state = "ui_node"
name = "Produce Node Blob (50)"
desc = "Produces a node blob for 50 resources.
Node blobs will expand and activate nearby resource and factory blobs."
-/obj/screen/blob/node_blob/Click()
+/atom/movable/screen/blob/node_blob/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.create_node()
-/obj/screen/blob/factory_blob
+/atom/movable/screen/blob/factory_blob
icon_state = "ui_factory"
name = "Produce Factory Blob (60)"
desc = "Produces a factory blob for 60 resources.
Factory blobs will produce spores every few seconds."
-/obj/screen/blob/factory_blob/Click()
+/atom/movable/screen/blob/factory_blob/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.create_factory()
-/obj/screen/blob/readapt_strain
+/atom/movable/screen/blob/readapt_strain
icon_state = "ui_chemswap"
name = "Readapt Strain (40)"
desc = "Allows you to choose a new strain from 4 random choices for 40 resources."
-/obj/screen/blob/readapt_strain/MouseEntered(location,control,params)
+/atom/movable/screen/blob/readapt_strain/MouseEntered(location,control,params)
if(hud?.mymob && isovermind(hud.mymob))
var/mob/camera/blob/B = hud.mymob
if(B.free_strain_rerolls)
@@ -107,26 +107,26 @@
desc = initial(desc)
..()
-/obj/screen/blob/readapt_strain/Click()
+/atom/movable/screen/blob/readapt_strain/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.strain_reroll()
-/obj/screen/blob/relocate_core
+/atom/movable/screen/blob/relocate_core
icon_state = "ui_swap"
name = "Relocate Core (80)"
desc = "Swaps a node and your core for 80 resources."
-/obj/screen/blob/relocate_core/Click()
+/atom/movable/screen/blob/relocate_core/Click()
if(isovermind(usr))
var/mob/camera/blob/B = usr
B.relocate_core()
/datum/hud/blob_overmind/New(mob/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- blobpwrdisplay = new /obj/screen()
+ blobpwrdisplay = new /atom/movable/screen()
blobpwrdisplay.name = "blob power"
blobpwrdisplay.icon_state = "block"
blobpwrdisplay.screen_loc = ui_health
@@ -136,51 +136,51 @@
blobpwrdisplay.hud = src
infodisplay += blobpwrdisplay
- healths = new /obj/screen/healths/blob()
+ healths = new /atom/movable/screen/healths/blob()
healths.hud = src
infodisplay += healths
- using = new /obj/screen/blob/blob_help()
+ using = new /atom/movable/screen/blob/blob_help()
using.screen_loc = "WEST:6,NORTH:-3"
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/jump_to_node()
+ using = new /atom/movable/screen/blob/jump_to_node()
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/jump_to_core()
+ using = new /atom/movable/screen/blob/jump_to_core()
using.screen_loc = ui_zonesel
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/blobbernaut()
+ using = new /atom/movable/screen/blob/blobbernaut()
using.screen_loc = ui_belt
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/resource_blob()
+ using = new /atom/movable/screen/blob/resource_blob()
using.screen_loc = ui_back
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/node_blob()
+ using = new /atom/movable/screen/blob/node_blob()
using.screen_loc = ui_hand_position(2)
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/factory_blob()
+ using = new /atom/movable/screen/blob/factory_blob()
using.screen_loc = ui_hand_position(1)
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/readapt_strain()
+ using = new /atom/movable/screen/blob/readapt_strain()
using.screen_loc = ui_storage1
using.hud = src
static_inventory += using
- using = new /obj/screen/blob/relocate_core()
+ using = new /atom/movable/screen/blob/relocate_core()
using.screen_loc = ui_storage2
using.hud = src
static_inventory += using
diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm
index ed45d5b1f6f..430e8e81e7f 100644
--- a/code/_onclick/hud/blobbernauthud.dm
+++ b/code/_onclick/hud/blobbernauthud.dm
@@ -2,10 +2,10 @@
/datum/hud/blobbernaut/New(mob/owner)
..()
- blobpwrdisplay = new /obj/screen/healths/blob/naut/core()
+ blobpwrdisplay = new /atom/movable/screen/healths/blob/naut/core()
blobpwrdisplay.hud = src
infodisplay += blobpwrdisplay
- healths = new /obj/screen/healths/blob/naut()
+ healths = new /atom/movable/screen/healths/blob/naut()
healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm
index 075c6cb1669..bee898ea489 100644
--- a/code/_onclick/hud/constructs.dm
+++ b/code/_onclick/hud/constructs.dm
@@ -3,13 +3,13 @@
/datum/hud/constructs/New(mob/owner)
..()
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_construct_pull
pull_icon.hud = src
static_inventory += pull_icon
- healths = new /obj/screen/healths/construct()
+ healths = new /atom/movable/screen/healths/construct()
healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm
index 31ea453d4a6..974f1583236 100644
--- a/code/_onclick/hud/credits.dm
+++ b/code/_onclick/hud/credits.dm
@@ -18,7 +18,7 @@
for(var/I in credit_order_for_this_round)
if(!credits)
return
- _credits += new /obj/screen/credit(null, I, src, credits_icon)
+ _credits += new /atom/movable/screen/credit(null, I, src, credits_icon)
sleep(CREDIT_SPAWN_SPEED)
sleep(CREDIT_ROLL_SPEED - CREDIT_SPAWN_SPEED)
remove_verb(src, /client/proc/ClearCredits)
@@ -31,7 +31,7 @@
QDEL_LIST(credits)
credits = null
-/obj/screen/credit
+/atom/movable/screen/credit
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
alpha = 0
screen_loc = "12,1"
@@ -39,7 +39,7 @@
var/client/parent
var/matrix/target
-/obj/screen/credit/Initialize(mapload, credited, client/P, icon/I)
+/atom/movable/screen/credit/Initialize(mapload, credited, client/P, icon/I)
. = ..()
icon = I
parent = P
@@ -57,7 +57,7 @@
QDEL_IN(src, CREDIT_ROLL_SPEED)
P.screen += src
-/obj/screen/credit/Destroy()
+/atom/movable/screen/credit/Destroy()
var/client/P = parent
P.screen -= src
icon = null
@@ -65,5 +65,5 @@
parent = null
return ..()
-/obj/screen/credit/proc/FadeOut()
+/atom/movable/screen/credit/proc/FadeOut()
animate(src, alpha = 0, transform = target, time = CREDIT_EASE_DURATION)
diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm
index a17040ec2ae..06d6e239df7 100644
--- a/code/_onclick/hud/drones.dm
+++ b/code/_onclick/hud/drones.dm
@@ -1,8 +1,8 @@
/datum/hud/dextrous/drone/New(mob/owner)
..()
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/inventory/inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "internal storage"
inv_box.icon = ui_style
inv_box.icon_state = "suit_storage"
@@ -12,7 +12,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "head/mask"
inv_box.icon = ui_style
inv_box.icon_state = "mask"
@@ -22,7 +22,7 @@
inv_box.hud = src
static_inventory += inv_box
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
diff --git a/code/_onclick/hud/families.dm b/code/_onclick/hud/families.dm
index a4e74753c70..0232e0dab2d 100644
--- a/code/_onclick/hud/families.dm
+++ b/code/_onclick/hud/families.dm
@@ -1,4 +1,4 @@
-/obj/screen/wanted
+/atom/movable/screen/wanted
name = "Space Police Alertness"
desc = "Shows the current level of hostility the space police is planning to rain down on you. Better be careful."
icon = 'icons/obj/gang/wanted_160x32.dmi'
@@ -9,19 +9,19 @@
/// Boolean, have the cops arrived? If so, the icon stops changing and remains the same.
var/cops_arrived = 0
-/obj/screen/wanted/New()
+/atom/movable/screen/wanted/New()
return ..()
-/obj/screen/wanted/Initialize()
+/atom/movable/screen/wanted/Initialize()
. = ..()
update_icon()
-/obj/screen/wanted/MouseEntered(location,control,params)
+/atom/movable/screen/wanted/MouseEntered(location,control,params)
openToolTip(usr,src,params,title = name,content = desc, theme = "alerttooltipstyle")
-/obj/screen/wanted/MouseExited()
+/atom/movable/screen/wanted/MouseExited()
closeToolTip(usr)
-/obj/screen/wanted/update_icon_state()
+/atom/movable/screen/wanted/update_icon_state()
. = ..()
icon_state = "wanted_[level][cops_arrived ? "_active" : ""]"
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index e5ab8a5bb36..14b95e421c3 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -1,5 +1,5 @@
/mob/proc/overlay_fullscreen(category, type, severity)
- var/obj/screen/fullscreen/screen = screens[category]
+ var/atom/movable/screen/fullscreen/screen = screens[category]
if (!screen || screen.type != type)
// needs to be recreated
clear_fullscreen(category, FALSE)
@@ -17,7 +17,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
@@ -31,7 +31,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)
@@ -47,7 +47,7 @@
/mob/proc/reload_fullscreen()
if(client)
- var/obj/screen/fullscreen/screen
+ var/atom/movable/screen/fullscreen/screen
for(var/category in screens)
screen = screens[category]
if(screen.should_show_to(src))
@@ -56,7 +56,7 @@
else
client.screen -= screen
-/obj/screen/fullscreen
+/atom/movable/screen/fullscreen
icon = 'icons/hud/screen_full.dmi'
icon_state = "default"
screen_loc = "CENTER-7,CENTER-7"
@@ -67,84 +67,84 @@
var/severity = 0
var/show_when_dead = FALSE
-/obj/screen/fullscreen/proc/update_for_view(client_view)
+/atom/movable/screen/fullscreen/proc/update_for_view(client_view)
if (screen_loc == "CENTER-7,CENTER-7" && view != client_view)
var/list/actualview = getviewsize(client_view)
view = client_view
transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0)
-/obj/screen/fullscreen/proc/should_show_to(mob/mymob)
+/atom/movable/screen/fullscreen/proc/should_show_to(mob/mymob)
if(!show_when_dead && mymob.stat == DEAD)
return FALSE
return TRUE
-/obj/screen/fullscreen/Destroy()
+/atom/movable/screen/fullscreen/Destroy()
severity = 0
. = ..()
-/obj/screen/fullscreen/brute
+/atom/movable/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/fullscreen/oxy
+/atom/movable/screen/fullscreen/oxy
icon_state = "oxydamageoverlay"
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/fullscreen/crit
+/atom/movable/screen/fullscreen/crit
icon_state = "passage"
layer = CRIT_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/fullscreen/crit/vision
+/atom/movable/screen/fullscreen/crit/vision
icon_state = "oxydamageoverlay"
layer = BLIND_LAYER
-/obj/screen/fullscreen/blind
+/atom/movable/screen/fullscreen/blind
icon_state = "blackimageoverlay"
layer = BLIND_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/fullscreen/curse
+/atom/movable/screen/fullscreen/curse
icon_state = "curse"
layer = CURSE_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/fullscreen/impaired
+/atom/movable/screen/fullscreen/impaired
icon_state = "impairedoverlay"
-/obj/screen/fullscreen/flash
+/atom/movable/screen/fullscreen/flash
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
-/obj/screen/fullscreen/flash/static
+/atom/movable/screen/fullscreen/flash/static
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "noise"
-/obj/screen/fullscreen/high
+/atom/movable/screen/fullscreen/high
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "druggy"
-/obj/screen/fullscreen/color_vision
+/atom/movable/screen/fullscreen/color_vision
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
alpha = 80
-/obj/screen/fullscreen/color_vision/green
+/atom/movable/screen/fullscreen/color_vision/green
color = "#00ff00"
-/obj/screen/fullscreen/color_vision/red
+/atom/movable/screen/fullscreen/color_vision/red
color = "#ff0000"
-/obj/screen/fullscreen/color_vision/blue
+/atom/movable/screen/fullscreen/color_vision/blue
color = "#0000ff"
-/obj/screen/fullscreen/cinematic_backdrop
+/atom/movable/screen/fullscreen/cinematic_backdrop
icon = 'icons/hud/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "flash"
@@ -153,7 +153,7 @@
color = "#000000"
show_when_dead = TRUE
-/obj/screen/fullscreen/lighting_backdrop
+/atom/movable/screen/fullscreen/lighting_backdrop
icon = 'icons/hud/screen_gen.dmi'
icon_state = "flash"
transform = matrix(200, 0, 0, 0, 200, 0)
@@ -162,18 +162,18 @@
show_when_dead = TRUE
//Provides darkness to the back of the lighting plane
-/obj/screen/fullscreen/lighting_backdrop/lit
+/atom/movable/screen/fullscreen/lighting_backdrop/lit
invisibility = INVISIBILITY_LIGHTING
layer = BACKGROUND_LAYER+21
color = "#000"
show_when_dead = TRUE
//Provides whiteness in case you don't see lights so everything is still visible
-/obj/screen/fullscreen/lighting_backdrop/unlit
+/atom/movable/screen/fullscreen/lighting_backdrop/unlit
layer = BACKGROUND_LAYER+20
show_when_dead = TRUE
-/obj/screen/fullscreen/see_through_darkness
+/atom/movable/screen/fullscreen/see_through_darkness
icon_state = "nightvision"
plane = LIGHTING_PLANE
layer = LIGHTING_LAYER
diff --git a/code/_onclick/hud/generic_dextrous.dm b/code/_onclick/hud/generic_dextrous.dm
index 7708512ffcf..beeacbbccb4 100644
--- a/code/_onclick/hud/generic_dextrous.dm
+++ b/code/_onclick/hud/generic_dextrous.dm
@@ -1,15 +1,15 @@
//Used for normal mobs that have hands.
/datum/hud/dextrous/New(mob/living/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/drop()
+ using = new /atom/movable/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drone_drop
using.hud = src
static_inventory += using
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_drone_pull
@@ -18,14 +18,14 @@
build_hand_slots()
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1_m"
using.screen_loc = ui_swaphand_position(owner,1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
@@ -35,29 +35,29 @@
if(mymob.possible_a_intents)
if(mymob.possible_a_intents.len == 4)
// All possible intents - full intent selector
- action_intent = new /obj/screen/act_intent/segmented
+ action_intent = new /atom/movable/screen/act_intent/segmented
else
- action_intent = new /obj/screen/act_intent
+ action_intent = new /atom/movable/screen/act_intent
action_intent.icon = ui_style
action_intent.icon_state = mymob.a_intent
action_intent.hud = src
static_inventory += action_intent
- zone_select = new /obj/screen/zone_sel()
+ zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
- using = new /obj/screen/area_creator
+ using = new /atom/movable/screen/area_creator
using.icon = ui_style
using.hud = src
static_inventory += using
mymob.client.screen = list()
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
index 52da6258c7c..7499d32d0d7 100644
--- a/code/_onclick/hud/ghost.dm
+++ b/code/_onclick/hud/ghost.dm
@@ -1,92 +1,92 @@
-/obj/screen/ghost
+/atom/movable/screen/ghost
icon = 'icons/hud/screen_ghost.dmi'
-/obj/screen/ghost/MouseEntered()
+/atom/movable/screen/ghost/MouseEntered()
flick(icon_state + "_anim", src)
-/obj/screen/ghost/jumptomob
+/atom/movable/screen/ghost/jumptomob
name = "Jump to mob"
icon_state = "jumptomob"
-/obj/screen/ghost/jumptomob/Click()
+/atom/movable/screen/ghost/jumptomob/Click()
var/mob/dead/observer/G = usr
G.jumptomob()
-/obj/screen/ghost/orbit
+/atom/movable/screen/ghost/orbit
name = "Orbit"
icon_state = "orbit"
-/obj/screen/ghost/orbit/Click()
+/atom/movable/screen/ghost/orbit/Click()
var/mob/dead/observer/G = usr
G.follow()
-/obj/screen/ghost/reenter_corpse
+/atom/movable/screen/ghost/reenter_corpse
name = "Reenter corpse"
icon_state = "reenter_corpse"
-/obj/screen/ghost/reenter_corpse/Click()
+/atom/movable/screen/ghost/reenter_corpse/Click()
var/mob/dead/observer/G = usr
G.reenter_corpse()
-/obj/screen/ghost/teleport
+/atom/movable/screen/ghost/teleport
name = "Teleport"
icon_state = "teleport"
-/obj/screen/ghost/teleport/Click()
+/atom/movable/screen/ghost/teleport/Click()
var/mob/dead/observer/G = usr
G.dead_tele()
-/obj/screen/ghost/pai
+/atom/movable/screen/ghost/pai
name = "pAI Candidate"
icon_state = "pai"
-/obj/screen/ghost/pai/Click()
+/atom/movable/screen/ghost/pai/Click()
var/mob/dead/observer/G = usr
G.register_pai()
-/obj/screen/ghost/mafia
+/atom/movable/screen/ghost/mafia
name = "Mafia Signup"
icon_state = "mafia"
-/obj/screen/ghost/mafia/Click()
+/atom/movable/screen/ghost/mafia/Click()
var/mob/dead/observer/G = usr
G.mafia_signup()
/datum/hud/ghost/New(mob/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/ghost/jumptomob()
+ using = new /atom/movable/screen/ghost/jumptomob()
using.screen_loc = ui_ghost_jumptomob
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/orbit()
+ using = new /atom/movable/screen/ghost/orbit()
using.screen_loc = ui_ghost_orbit
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/reenter_corpse()
+ using = new /atom/movable/screen/ghost/reenter_corpse()
using.screen_loc = ui_ghost_reenter_corpse
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/teleport()
+ using = new /atom/movable/screen/ghost/teleport()
using.screen_loc = ui_ghost_teleport
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/pai()
+ using = new /atom/movable/screen/ghost/pai()
using.screen_loc = ui_ghost_pai
using.hud = src
static_inventory += using
- using = new /obj/screen/ghost/mafia()
+ using = new /atom/movable/screen/ghost/mafia()
using.screen_loc = ui_ghost_mafia
using.hud = src
static_inventory += using
- using = new /obj/screen/language_menu
+ using = new /atom/movable/screen/language_menu
using.icon = ui_style
using.hud = src
static_inventory += using
diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm
index 9fe7822bf34..1c5bcd4362c 100644
--- a/code/_onclick/hud/guardian.dm
+++ b/code/_onclick/hud/guardian.dm
@@ -3,25 +3,25 @@
/datum/hud/guardian/New(mob/living/simple_animal/hostile/guardian/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_living_pull
pull_icon.hud = src
static_inventory += pull_icon
- healths = new /obj/screen/healths/guardian()
+ healths = new /atom/movable/screen/healths/guardian()
healths.hud = src
infodisplay += healths
- using = new /obj/screen/guardian/manifest()
+ using = new /atom/movable/screen/guardian/manifest()
using.screen_loc = ui_hand_position(2)
using.hud = src
static_inventory += using
- using = new /obj/screen/guardian/recall()
+ using = new /atom/movable/screen/guardian/recall()
using.screen_loc = ui_hand_position(1)
using.hud = src
static_inventory += using
@@ -31,23 +31,23 @@
using.hud = src
static_inventory += using
- using = new /obj/screen/guardian/toggle_light()
+ using = new /atom/movable/screen/guardian/toggle_light()
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
- using = new /obj/screen/guardian/communicate()
+ using = new /atom/movable/screen/guardian/communicate()
using.screen_loc = ui_back
using.hud = src
static_inventory += using
/datum/hud/dextrous/guardian/New(mob/living/simple_animal/hostile/guardian/owner) //for a dextrous guardian
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
if(istype(owner, /mob/living/simple_animal/hostile/guardian/dextrous))
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/inventory/inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "internal storage"
inv_box.icon = ui_style
inv_box.icon_state = "suit_storage"
@@ -56,35 +56,35 @@
inv_box.hud = src
static_inventory += inv_box
- using = new /obj/screen/guardian/communicate()
+ using = new /atom/movable/screen/guardian/communicate()
using.screen_loc = ui_sstore1
using.hud = src
static_inventory += using
else
- using = new /obj/screen/guardian/communicate()
+ using = new /atom/movable/screen/guardian/communicate()
using.screen_loc = ui_id
using.hud = src
static_inventory += using
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = 'icons/hud/guardian.dmi'
pull_icon.update_icon()
pull_icon.screen_loc = ui_living_pull
pull_icon.hud = src
static_inventory += pull_icon
- healths = new /obj/screen/healths/guardian()
+ healths = new /atom/movable/screen/healths/guardian()
healths.hud = src
infodisplay += healths
- using = new /obj/screen/guardian/manifest()
+ using = new /atom/movable/screen/guardian/manifest()
using.screen_loc = ui_belt
using.hud = src
static_inventory += using
- using = new /obj/screen/guardian/recall()
+ using = new /atom/movable/screen/guardian/recall()
using.screen_loc = ui_back
using.hud = src
static_inventory += using
@@ -94,7 +94,7 @@
using.hud = src
static_inventory += using
- using = new /obj/screen/guardian/toggle_light()
+ using = new /atom/movable/screen/guardian/toggle_light()
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
@@ -115,65 +115,65 @@
..()
-/obj/screen/guardian
+/atom/movable/screen/guardian
icon = 'icons/hud/guardian.dmi'
-/obj/screen/guardian/manifest
+/atom/movable/screen/guardian/manifest
icon_state = "manifest"
name = "Manifest"
desc = "Spring forth into battle!"
-/obj/screen/guardian/manifest/Click()
+/atom/movable/screen/guardian/manifest/Click()
if(isguardian(usr))
var/mob/living/simple_animal/hostile/guardian/G = usr
G.Manifest()
-/obj/screen/guardian/recall
+/atom/movable/screen/guardian/recall
icon_state = "recall"
name = "Recall"
desc = "Return to your user."
-/obj/screen/guardian/recall/Click()
+/atom/movable/screen/guardian/recall/Click()
if(isguardian(usr))
var/mob/living/simple_animal/hostile/guardian/G = usr
G.Recall()
-/obj/screen/guardian/toggle_mode
+/atom/movable/screen/guardian/toggle_mode
icon_state = "toggle"
name = "Toggle Mode"
desc = "Switch between ability modes."
-/obj/screen/guardian/toggle_mode/Click()
+/atom/movable/screen/guardian/toggle_mode/Click()
if(isguardian(usr))
var/mob/living/simple_animal/hostile/guardian/G = usr
G.ToggleMode()
-/obj/screen/guardian/toggle_mode/inactive
+/atom/movable/screen/guardian/toggle_mode/inactive
icon_state = "notoggle" //greyed out so it doesn't look like it'll work
-/obj/screen/guardian/toggle_mode/assassin
+/atom/movable/screen/guardian/toggle_mode/assassin
icon_state = "stealth"
name = "Toggle Stealth"
desc = "Enter or exit stealth."
-/obj/screen/guardian/communicate
+/atom/movable/screen/guardian/communicate
icon_state = "communicate"
name = "Communicate"
desc = "Communicate telepathically with your user."
-/obj/screen/guardian/communicate/Click()
+/atom/movable/screen/guardian/communicate/Click()
if(isguardian(usr))
var/mob/living/simple_animal/hostile/guardian/G = usr
G.Communicate()
-/obj/screen/guardian/toggle_light
+/atom/movable/screen/guardian/toggle_light
icon_state = "light"
name = "Toggle Light"
desc = "Glow like star dust."
-/obj/screen/guardian/toggle_light/Click()
+/atom/movable/screen/guardian/toggle_light/Click()
if(isguardian(usr))
var/mob/living/simple_animal/hostile/guardian/G = usr
G.ToggleLight()
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 1b47dd9adfb..5b9d9d70080 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -26,39 +26,39 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
var/inventory_shown = FALSE //Equipped item inventory
var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons)
- var/obj/screen/ling/chems/lingchemdisplay
- var/obj/screen/ling/sting/lingstingdisplay
+ var/atom/movable/screen/ling/chems/lingchemdisplay
+ var/atom/movable/screen/ling/sting/lingstingdisplay
- var/obj/screen/blobpwrdisplay
+ var/atom/movable/screen/blobpwrdisplay
- var/obj/screen/alien_plasma_display
- var/obj/screen/alien_queen_finder
+ var/atom/movable/screen/alien_plasma_display
+ var/atom/movable/screen/alien_queen_finder
- var/obj/screen/action_intent
- var/obj/screen/zone_select
- var/obj/screen/pull_icon
- var/obj/screen/rest_icon
- var/obj/screen/throw_icon
- var/obj/screen/module_store_icon
+ var/atom/movable/screen/action_intent
+ var/atom/movable/screen/zone_select
+ var/atom/movable/screen/pull_icon
+ var/atom/movable/screen/rest_icon
+ var/atom/movable/screen/throw_icon
+ var/atom/movable/screen/module_store_icon
var/list/static_inventory = list() //the screen objects which are static
var/list/toggleable_inventory = list() //the screen objects which can be hidden
- var/list/obj/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys
+ var/list/atom/movable/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys
var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...)
var/list/screenoverlays = list() //the screen objects used as whole screen overlays (flash, damageoverlay, etc...)
- var/list/inv_slots[SLOTS_AMT] // /obj/screen/inventory objects, ordered by their slot ID.
- var/list/hand_slots // /obj/screen/inventory/hand objects, assoc list of "[held_index]" = object
- var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
+ var/list/inv_slots[SLOTS_AMT] // /atom/movable/screen/inventory objects, ordered by their slot ID.
+ var/list/hand_slots // /atom/movable/screen/inventory/hand objects, assoc list of "[held_index]" = object
+ var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object
- var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle
+ var/atom/movable/screen/movable/action_button/hide_toggle/hide_actions_toggle
var/action_buttons_hidden = FALSE
- var/obj/screen/healths
- var/obj/screen/healthdoll
- var/obj/screen/internals
- var/obj/screen/wanted/wanted_lvl
- var/obj/screen/spacesuit
+ var/atom/movable/screen/healths
+ var/atom/movable/screen/healthdoll
+ var/atom/movable/screen/internals
+ var/atom/movable/screen/wanted/wanted_lvl
+ var/atom/movable/screen/spacesuit
// subtypes can override this to force a specific UI style
var/ui_style
@@ -76,12 +76,12 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
hand_slots = list()
- for(var/mytype in subtypesof(/obj/screen/plane_master))
- var/obj/screen/plane_master/instance = new mytype()
+ for(var/mytype in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/plane_master/instance = new mytype()
plane_masters["[instance.plane]"] = instance
instance.backdrop(mymob)
- owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness)
+ owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness)
/datum/hud/Destroy()
if(mymob.hud_used == src)
@@ -172,7 +172,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
//These ones are a part of 'static_inventory', 'toggleable_inventory' or 'hotkeybuttons' but we want them to stay
for(var/h in hand_slots)
- var/obj/screen/hand = hand_slots[h]
+ var/atom/movable/screen/hand = hand_slots[h]
if(hand)
screenmob.client.screen += hand
if(action_intent)
@@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
/datum/hud/proc/plane_masters_update()
// Plane masters are always shown to OUR mob, never to observers
for(var/thing in plane_masters)
- var/obj/screen/plane_master/PM = plane_masters[thing]
+ var/atom/movable/screen/plane_master/PM = plane_masters[thing]
PM.backdrop(mymob)
mymob.client.screen += PM
@@ -264,13 +264,13 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
//9/10 this is only called once per mob and only for 2 hands
/datum/hud/proc/build_hand_slots()
for(var/h in hand_slots)
- var/obj/screen/inventory/hand/H = hand_slots[h]
+ var/atom/movable/screen/inventory/hand/H = hand_slots[h]
if(H)
static_inventory -= H
hand_slots = list()
- var/obj/screen/inventory/hand/hand_box
+ var/atom/movable/screen/inventory/hand/hand_box
for(var/i in 1 to mymob.held_items.len)
- hand_box = new /obj/screen/inventory/hand()
+ hand_box = new /atom/movable/screen/inventory/hand()
hand_box.name = mymob.get_held_index_name(i)
hand_box.icon = ui_style
hand_box.icon_state = "hand_[mymob.held_index_to_dir(i)]"
@@ -282,10 +282,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
hand_box.update_icon()
var/i = 1
- for(var/obj/screen/swap_hand/SH in static_inventory)
+ for(var/atom/movable/screen/swap_hand/SH in static_inventory)
SH.screen_loc = ui_swaphand_position(mymob,!(i % 2) ? 2: 1)
i++
- for(var/obj/screen/human/equip/E in static_inventory)
+ for(var/atom/movable/screen/human/equip/E in static_inventory)
E.screen_loc = ui_equip_position(mymob)
if(ismob(mymob) && mymob.hud_used == src)
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index b5d9dd08256..11f1a3cfa15 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -1,11 +1,11 @@
-/obj/screen/human
+/atom/movable/screen/human
icon = 'icons/hud/screen_midnight.dmi'
-/obj/screen/human/toggle
+/atom/movable/screen/human/toggle
name = "toggle"
icon_state = "toggle"
-/obj/screen/human/toggle/Click()
+/atom/movable/screen/human/toggle/Click()
var/mob/targetmob = usr
@@ -23,31 +23,31 @@
targetmob.hud_used.hidden_inventory_update(usr)
-/obj/screen/human/equip
+/atom/movable/screen/human/equip
name = "equip"
icon_state = "act_equip"
-/obj/screen/human/equip/Click()
+/atom/movable/screen/human/equip/Click()
if(ismecha(usr.loc)) // stops inventory actions in a mech
return TRUE
var/mob/living/carbon/human/H = usr
H.quick_equip()
-/obj/screen/ling
+/atom/movable/screen/ling
icon = 'icons/hud/screen_changeling.dmi'
invisibility = INVISIBILITY_ABSTRACT
-/obj/screen/ling/sting
+/atom/movable/screen/ling/sting
name = "current sting"
screen_loc = ui_lingstingdisplay
-/obj/screen/ling/sting/Click()
+/atom/movable/screen/ling/sting/Click()
if(isobserver(usr))
return
var/mob/living/carbon/U = usr
U.unset_sting()
-/obj/screen/ling/chems
+/atom/movable/screen/ling/chems
name = "chemical storage"
icon_state = "power_display"
screen_loc = ui_lingchemdisplay
@@ -59,48 +59,48 @@
if(owner.client?.prefs?.widescreenpref)
widescreen_layout = TRUE
- var/obj/screen/using
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/using
+ var/atom/movable/screen/inventory/inv_box
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.icon = ui_style
if(!widescreen_layout)
using.screen_loc = UI_BOXLANG
using.hud = src
static_inventory += using
- using = new/obj/screen/skills
+ using = new/atom/movable/screen/skills
using.icon = ui_style
if(!widescreen_layout)
using.screen_loc = UI_BOXLANG
static_inventory += using
- using = new /obj/screen/area_creator
+ using = new /atom/movable/screen/area_creator
using.icon = ui_style
if(!widescreen_layout)
using.screen_loc = UI_BOXAREA
using.hud = src
static_inventory += using
- action_intent = new /obj/screen/act_intent/segmented
+ action_intent = new /atom/movable/screen/act_intent/segmented
action_intent.icon_state = mymob.a_intent
action_intent.hud = src
static_inventory += action_intent
- using = new /obj/screen/mov_intent
+ using = new /atom/movable/screen/mov_intent
using.icon = ui_style
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
using.hud = src
static_inventory += using
- using = new /obj/screen/drop()
+ using = new /atom/movable/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "i_clothing"
inv_box.icon = ui_style
inv_box.slot_id = ITEM_SLOT_ICLOTHING
@@ -109,7 +109,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "o_clothing"
inv_box.icon = ui_style
inv_box.slot_id = ITEM_SLOT_OCLOTHING
@@ -120,21 +120,21 @@
build_hand_slots()
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "id"
inv_box.icon = ui_style
inv_box.icon_state = "id"
@@ -143,7 +143,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "mask"
inv_box.icon = ui_style
inv_box.icon_state = "mask"
@@ -152,7 +152,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "neck"
inv_box.icon = ui_style
inv_box.icon_state = "neck"
@@ -161,7 +161,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "back"
inv_box.icon = ui_style
inv_box.icon_state = "back"
@@ -170,7 +170,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "storage1"
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
@@ -179,7 +179,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "storage2"
inv_box.icon = ui_style
inv_box.icon_state = "pocket"
@@ -188,7 +188,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "suit storage"
inv_box.icon = ui_style
inv_box.icon_state = "suit_storage"
@@ -197,25 +197,25 @@
inv_box.hud = src
static_inventory += inv_box
- using = new /obj/screen/resist()
+ using = new /atom/movable/screen/resist()
using.icon = ui_style
using.screen_loc = ui_above_intent
using.hud = src
hotkeybuttons += using
- using = new /obj/screen/human/toggle()
+ using = new /atom/movable/screen/human/toggle()
using.icon = ui_style
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
- using = new /obj/screen/human/equip()
+ using = new /atom/movable/screen/human/equip()
using.icon = ui_style
using.screen_loc = ui_equip_position(mymob)
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "gloves"
inv_box.icon = ui_style
inv_box.icon_state = "gloves"
@@ -224,7 +224,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "eyes"
inv_box.icon = ui_style
inv_box.icon_state = "glasses"
@@ -233,7 +233,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "ears"
inv_box.icon = ui_style
inv_box.icon_state = "ears"
@@ -242,7 +242,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "head"
inv_box.icon = ui_style
inv_box.icon_state = "head"
@@ -251,7 +251,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "shoes"
inv_box.icon = ui_style
inv_box.icon_state = "shoes"
@@ -260,7 +260,7 @@
inv_box.hud = src
toggleable_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "belt"
inv_box.icon = ui_style
inv_box.icon_state = "belt"
@@ -270,56 +270,56 @@
inv_box.hud = src
static_inventory += inv_box
- throw_icon = new /obj/screen/throw_catch()
+ throw_icon = new /atom/movable/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
throw_icon.hud = src
hotkeybuttons += throw_icon
- rest_icon = new /obj/screen/rest()
+ rest_icon = new /atom/movable/screen/rest()
rest_icon.icon = ui_style
rest_icon.screen_loc = ui_above_movement
rest_icon.hud = src
static_inventory += rest_icon
- internals = new /obj/screen/internals()
+ internals = new /atom/movable/screen/internals()
internals.hud = src
infodisplay += internals
- spacesuit = new /obj/screen/spacesuit
+ spacesuit = new /atom/movable/screen/spacesuit
spacesuit.hud = src
infodisplay += spacesuit
- healths = new /obj/screen/healths()
+ healths = new /atom/movable/screen/healths()
healths.hud = src
infodisplay += healths
- healthdoll = new /obj/screen/healthdoll()
+ healthdoll = new /atom/movable/screen/healthdoll()
healthdoll.hud = src
infodisplay += healthdoll
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_intent
pull_icon.hud = src
static_inventory += pull_icon
- lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay = new /atom/movable/screen/ling/chems()
lingchemdisplay.hud = src
infodisplay += lingchemdisplay
- lingstingdisplay = new /obj/screen/ling/sting()
+ lingstingdisplay = new /atom/movable/screen/ling/sting()
lingstingdisplay.hud = src
infodisplay += lingstingdisplay
- zone_select = new /obj/screen/zone_sel()
+ zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
@@ -334,7 +334,7 @@
if(!istype(H) || !H.dna.species)
return
var/datum/species/S = H.dna.species
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
if(inv.slot_id in S.no_equip)
inv.alpha = 128
diff --git a/code/_onclick/hud/living.dm b/code/_onclick/hud/living.dm
index 1ac06c264c6..331b443ead4 100644
--- a/code/_onclick/hud/living.dm
+++ b/code/_onclick/hud/living.dm
@@ -4,7 +4,7 @@
/datum/hud/living/New(mob/living/owner)
..()
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_living_pull
@@ -12,6 +12,6 @@
static_inventory += pull_icon
//mob health doll! assumes whatever sprite the mob is
- healthdoll = new /obj/screen/healthdoll/living()
+ healthdoll = new /atom/movable/screen/healthdoll/living()
healthdoll.hud = src
infodisplay += healthdoll
diff --git a/code/_onclick/hud/map_popups.dm b/code/_onclick/hud/map_popups.dm
index 768b4ed1b4c..f711e4af1cc 100644
--- a/code/_onclick/hud/map_popups.dm
+++ b/code/_onclick/hud/map_popups.dm
@@ -2,7 +2,7 @@
* A screen object, which acts as a container for turfs and other things
* you want to show on the map, which you usually attach to "vis_contents".
*/
-/obj/screen/map_view
+/atom/movable/screen/map_view
// Map view has to be on the lowest plane to enable proper lighting
layer = GAME_PLANE
plane = GAME_PLANE
@@ -12,7 +12,7 @@
* It is also implicitly used to allocate a rectangle on the map, which will
* be used for auto-scaling the map.
*/
-/obj/screen/background
+/atom/movable/screen/background
name = "background"
icon = 'icons/hud/map_backgrounds.dmi'
icon_state = "clear"
@@ -25,7 +25,7 @@
*
* If applicable, "assigned_map" has to be assigned before this proc call.
*/
-/obj/screen/proc/set_position(x, y, px = 0, py = 0)
+/atom/movable/screen/proc/set_position(x, y, px = 0, py = 0)
if(assigned_map)
screen_loc = "[assigned_map]:[x]:[px],[y]:[py]"
else
@@ -36,7 +36,7 @@
*
* If applicable, "assigned_map" has to be assigned before this proc call.
*/
-/obj/screen/proc/fill_rect(x1, y1, x2, y2)
+/atom/movable/screen/proc/fill_rect(x1, y1, x2, y2)
if(assigned_map)
screen_loc = "[assigned_map]:[x1],[y1] to [x2],[y2]"
else
@@ -46,7 +46,7 @@
* Registers screen obj with the client, which makes it visible on the
* assigned map, and becomes a part of the assigned map's lifecycle.
*/
-/client/proc/register_map_obj(obj/screen/screen_obj)
+/client/proc/register_map_obj(atom/movable/screen/screen_obj)
if(!screen_obj.assigned_map)
CRASH("Can't register [screen_obj] without 'assigned_map' property.")
if(!screen_maps[screen_obj.assigned_map])
@@ -68,7 +68,7 @@
/client/proc/clear_map(map_name)
if(!map_name || !(map_name in screen_maps))
return FALSE
- for(var/obj/screen/screen_obj in screen_maps[map_name])
+ for(var/atom/movable/screen/screen_obj in screen_maps[map_name])
screen_maps[map_name] -= screen_obj
if(screen_obj.del_on_map_removal)
qdel(screen_obj)
@@ -122,7 +122,7 @@
var/y_value = world.icon_size * tilesize * height
var/map_name = create_popup(popup_name, x_value, y_value)
- var/obj/screen/background/background = new
+ var/atom/movable/screen/background/background = new
background.assigned_map = map_name
background.fill_rect(1, 1, width, height)
if(bg_icon)
diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm
index 23da9c28172..5e945a363bf 100644
--- a/code/_onclick/hud/monkey.dm
+++ b/code/_onclick/hud/monkey.dm
@@ -1,28 +1,28 @@
/datum/hud/monkey/New(mob/living/carbon/monkey/owner)
..()
- var/obj/screen/using
- var/obj/screen/inventory/inv_box
+ var/atom/movable/screen/using
+ var/atom/movable/screen/inventory/inv_box
- action_intent = new /obj/screen/act_intent()
+ action_intent = new /atom/movable/screen/act_intent()
action_intent.icon = ui_style
action_intent.icon_state = mymob.a_intent
action_intent.screen_loc = ui_acti
action_intent.hud = src
static_inventory += action_intent
- using = new /obj/screen/mov_intent()
+ using = new /atom/movable/screen/mov_intent()
using.icon = ui_style
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
using.hud = src
static_inventory += using
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.icon = ui_style
using.hud = src
static_inventory += using
- using = new /obj/screen/drop()
+ using = new /atom/movable/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
using.hud = src
@@ -30,21 +30,21 @@
build_hand_slots()
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1_m" //extra wide!
using.screen_loc = ui_swaphand_position(owner,1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swap_hand()
+ using = new /atom/movable/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
using.hud = src
static_inventory += using
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "mask"
inv_box.icon = ui_style
inv_box.icon_state = "mask"
@@ -54,7 +54,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "neck"
inv_box.icon = ui_style
inv_box.icon_state = "neck"
@@ -64,7 +64,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "head"
inv_box.icon = ui_style
inv_box.icon_state = "head"
@@ -74,7 +74,7 @@
inv_box.hud = src
static_inventory += inv_box
- inv_box = new /obj/screen/inventory()
+ inv_box = new /atom/movable/screen/inventory()
inv_box.name = "back"
inv_box.icon = ui_style
inv_box.icon_state = "back"
@@ -83,37 +83,37 @@
inv_box.hud = src
static_inventory += inv_box
- throw_icon = new /obj/screen/throw_catch()
+ throw_icon = new /atom/movable/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
throw_icon.hud = src
hotkeybuttons += throw_icon
- internals = new /obj/screen/internals()
+ internals = new /atom/movable/screen/internals()
internals.hud = src
infodisplay += internals
- healths = new /obj/screen/healths()
+ healths = new /atom/movable/screen/healths()
healths.hud = src
infodisplay += healths
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_above_movement
pull_icon.hud = src
static_inventory += pull_icon
- lingchemdisplay = new /obj/screen/ling/chems()
+ lingchemdisplay = new /atom/movable/screen/ling/chems()
lingchemdisplay.hud = src
infodisplay += lingchemdisplay
- lingstingdisplay = new /obj/screen/ling/sting()
+ lingstingdisplay = new /atom/movable/screen/ling/sting()
lingstingdisplay.hud = src
infodisplay += lingstingdisplay
- zone_select = new /obj/screen/zone_sel()
+ zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
zone_select.update_icon()
@@ -121,13 +121,13 @@
mymob.client.screen = list()
- using = new /obj/screen/resist()
+ using = new /atom/movable/screen/resist()
using.icon = ui_style
using.screen_loc = ui_above_intent
using.hud = src
hotkeybuttons += using
- for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
+ for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[TOBITSHIFT(inv.slot_id) + 1] = inv
diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 3ea53daf254..261d898777a 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -8,7 +8,7 @@
//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
var/locked = FALSE
@@ -18,11 +18,11 @@
//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)
if(locked) //no! I am locked! begone!
return
var/list/PM = params2list(params)
@@ -56,7 +56,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"
@@ -75,7 +75,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/ooze.dm b/code/_onclick/hud/ooze.dm
index 9a0e37ec27d..a43515b1051 100644
--- a/code/_onclick/hud/ooze.dm
+++ b/code/_onclick/hud/ooze.dm
@@ -2,17 +2,17 @@
/datum/hud/ooze/New(mob/living/owner)
. = ..()
- zone_select = new /obj/screen/zone_sel()
+ zone_select = new /atom/movable/screen/zone_sel()
zone_select.icon = ui_style
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
- alien_plasma_display = new /obj/screen/ooze_nutrition_display //Just going to use the alien plasma display because making new vars for each object is braindead.
+ alien_plasma_display = new /atom/movable/screen/ooze_nutrition_display //Just going to use the alien plasma display because making new vars for each object is braindead.
alien_plasma_display.hud = src
infodisplay += alien_plasma_display
-/obj/screen/ooze_nutrition_display
+/atom/movable/screen/ooze_nutrition_display
icon = 'icons/hud/screen_alien.dmi'
icon_state = "power_display"
name = "nutrition"
diff --git a/code/_onclick/hud/pai.dm b/code/_onclick/hud/pai.dm
index 265e219030b..86256d9ce0e 100644
--- a/code/_onclick/hud/pai.dm
+++ b/code/_onclick/hud/pai.dm
@@ -1,10 +1,10 @@
#define PAI_MISSING_SOFTWARE_MESSAGE "You must download the required software to use this."
-/obj/screen/pai
+/atom/movable/screen/pai
icon = 'icons/hud/screen_pai.dmi'
var/required_software
-/obj/screen/pai/Click()
+/atom/movable/screen/pai/Click()
if(isobserver(usr) || usr.incapacitated())
return FALSE
var/mob/living/silicon/pai/pAI = usr
@@ -13,21 +13,21 @@
return FALSE
return TRUE
-/obj/screen/pai/software
+/atom/movable/screen/pai/software
name = "Software Interface"
icon_state = "pai"
-/obj/screen/pai/software/Click()
+/atom/movable/screen/pai/software/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.paiInterface()
-/obj/screen/pai/shell
+/atom/movable/screen/pai/shell
name = "Toggle Holoform"
icon_state = "pai_holoform"
-/obj/screen/pai/shell/Click()
+/atom/movable/screen/pai/shell/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
@@ -36,53 +36,53 @@
else
pAI.fold_out()
-/obj/screen/pai/chassis
+/atom/movable/screen/pai/chassis
name = "Holochassis Appearance Composite"
icon_state = "pai_chassis"
-/obj/screen/pai/chassis/Click()
+/atom/movable/screen/pai/chassis/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.choose_chassis()
-/obj/screen/pai/rest
+/atom/movable/screen/pai/rest
name = "Rest"
icon_state = "pai_rest"
-/obj/screen/pai/rest/Click()
+/atom/movable/screen/pai/rest/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.toggle_resting()
-/obj/screen/pai/light
+/atom/movable/screen/pai/light
name = "Toggle Integrated Lights"
icon_state = "light"
-/obj/screen/pai/light/Click()
+/atom/movable/screen/pai/light/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.toggle_integrated_light()
-/obj/screen/pai/newscaster
+/atom/movable/screen/pai/newscaster
name = "pAI Newscaster"
icon_state = "newscaster"
required_software = "newscaster"
-/obj/screen/pai/newscaster/Click()
+/atom/movable/screen/pai/newscaster/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.newscaster.ui_interact(usr)
-/obj/screen/pai/host_monitor
+/atom/movable/screen/pai/host_monitor
name = "Host Health Scan"
icon_state = "host_monitor"
required_software = "host scan"
-/obj/screen/pai/host_monitor/Click()
+/atom/movable/screen/pai/host_monitor/Click()
. = ..()
if(!.)
return
@@ -93,77 +93,77 @@
to_chat(src, "You are not being carried by anyone!")
return FALSE
-/obj/screen/pai/crew_manifest
+/atom/movable/screen/pai/crew_manifest
name = "Crew Manifest"
icon_state = "manifest"
required_software = "crew manifest"
-/obj/screen/pai/crew_manifest/Click()
+/atom/movable/screen/pai/crew_manifest/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.ai_roster()
-/obj/screen/pai/state_laws
+/atom/movable/screen/pai/state_laws
name = "State Laws"
icon_state = "state_laws"
-/obj/screen/pai/state_laws/Click()
+/atom/movable/screen/pai/state_laws/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.checklaws()
-/obj/screen/pai/pda_msg_send
+/atom/movable/screen/pai/pda_msg_send
name = "PDA - Send Message"
icon_state = "pda_send"
required_software = "digital messenger"
-/obj/screen/pai/pda_msg_send/Click()
+/atom/movable/screen/pai/pda_msg_send/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.cmd_send_pdamesg(usr)
-/obj/screen/pai/pda_msg_show
+/atom/movable/screen/pai/pda_msg_show
name = "PDA - Show Message Log"
icon_state = "pda_receive"
required_software = "digital messenger"
-/obj/screen/pai/pda_msg_show/Click()
+/atom/movable/screen/pai/pda_msg_show/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.cmd_show_message_log(usr)
-/obj/screen/pai/image_take
+/atom/movable/screen/pai/image_take
name = "Take Image"
icon_state = "take_picture"
required_software = "photography module"
-/obj/screen/pai/image_take/Click()
+/atom/movable/screen/pai/image_take/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.aicamera.toggle_camera_mode(usr)
-/obj/screen/pai/image_view
+/atom/movable/screen/pai/image_view
name = "View Images"
icon_state = "view_images"
required_software = "photography module"
-/obj/screen/pai/image_view/Click()
+/atom/movable/screen/pai/image_view/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
pAI.aicamera.viewpictures(usr)
-/obj/screen/pai/radio
+/atom/movable/screen/pai/radio
name = "radio"
icon = 'icons/hud/screen_cyborg.dmi'
icon_state = "radio"
-/obj/screen/pai/radio/Click()
+/atom/movable/screen/pai/radio/Click()
if(!..())
return
var/mob/living/silicon/pai/pAI = usr
@@ -171,80 +171,80 @@
/datum/hud/pai/New(mob/living/silicon/pai/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
// Software menu
- using = new /obj/screen/pai/software
+ using = new /atom/movable/screen/pai/software
using.screen_loc = ui_pai_software
static_inventory += using
// Holoform
- using = new /obj/screen/pai/shell
+ using = new /atom/movable/screen/pai/shell
using.screen_loc = ui_pai_shell
static_inventory += using
// Chassis Select Menu
- using = new /obj/screen/pai/chassis
+ using = new /atom/movable/screen/pai/chassis
using.screen_loc = ui_pai_chassis
static_inventory += using
// Rest
- using = new /obj/screen/pai/rest
+ using = new /atom/movable/screen/pai/rest
using.screen_loc = ui_pai_rest
static_inventory += using
// Integrated Light
- using = new /obj/screen/pai/light
+ using = new /atom/movable/screen/pai/light
using.screen_loc = ui_pai_light
static_inventory += using
// Newscaster
- using = new /obj/screen/pai/newscaster
+ using = new /atom/movable/screen/pai/newscaster
using.screen_loc = ui_pai_newscaster
static_inventory += using
// Language menu
- using = new /obj/screen/language_menu
+ using = new /atom/movable/screen/language_menu
using.screen_loc = ui_borg_language_menu
static_inventory += using
// Host Monitor
- using = new /obj/screen/pai/host_monitor()
+ using = new /atom/movable/screen/pai/host_monitor()
using.screen_loc = ui_pai_host_monitor
static_inventory += using
// Crew Manifest
- using = new /obj/screen/pai/crew_manifest()
+ using = new /atom/movable/screen/pai/crew_manifest()
using.screen_loc = ui_pai_crew_manifest
static_inventory += using
// Laws
- using = new /obj/screen/pai/state_laws()
+ using = new /atom/movable/screen/pai/state_laws()
using.screen_loc = ui_pai_state_laws
static_inventory += using
// PDA message
- using = new /obj/screen/pai/pda_msg_send()
+ using = new /atom/movable/screen/pai/pda_msg_send()
using.screen_loc = ui_pai_pda_send
static_inventory += using
// PDA log
- using = new /obj/screen/pai/pda_msg_show()
+ using = new /atom/movable/screen/pai/pda_msg_show()
using.screen_loc = ui_pai_pda_log
static_inventory += using
// Take image
- using = new /obj/screen/pai/image_take()
+ using = new /atom/movable/screen/pai/image_take()
using.screen_loc = ui_pai_take_picture
static_inventory += using
// View images
- using = new /obj/screen/pai/image_view()
+ using = new /atom/movable/screen/pai/image_view()
using.screen_loc = ui_pai_view_images
static_inventory += using
// Radio
- using = new /obj/screen/pai/radio()
+ using = new /atom/movable/screen/pai/radio()
using.screen_loc = ui_borg_radio
static_inventory += using
@@ -252,7 +252,7 @@
/datum/hud/pai/proc/update_software_buttons()
var/mob/living/silicon/pai/owner = mymob
- for(var/obj/screen/pai/button in static_inventory)
+ for(var/atom/movable/screen/pai/button in static_inventory)
if(button.required_software)
button.color = owner.software.Find(button.required_software) ? null : "#808080"
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index b2e94d6e15d..99e3c393d71 100755
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -7,12 +7,12 @@
if(!length(C.parallax_layers_cached))
C.parallax_layers_cached = list()
- C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view)
- C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view)
- C.parallax_layers_cached += new /obj/screen/parallax_layer/planet(null, C.view)
+ C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view)
+ C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view)
+ C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view)
if(SSparallax.random_layer)
C.parallax_layers_cached += new SSparallax.random_layer
- C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view)
+ C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view)
C.parallax_layers = C.parallax_layers_cached.Copy()
@@ -20,9 +20,9 @@
C.parallax_layers.len = C.parallax_layers_max
C.screen |= (C.parallax_layers)
- var/obj/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
+ var/atom/movable/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
if(screenmob != mymob)
- C.screen -= locate(/obj/screen/plane_master/parallax_white) in C.screen
+ C.screen -= locate(/atom/movable/screen/plane_master/parallax_white) in C.screen
C.screen += PM
PM.color = list(
0, 0, 0, 0,
@@ -37,9 +37,9 @@
var/mob/screenmob = viewmob || mymob
var/client/C = screenmob.client
C.screen -= (C.parallax_layers_cached)
- var/obj/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
+ var/atom/movable/screen/plane_master/PM = screenmob.hud_used.plane_masters["[PLANE_SPACE]"]
if(screenmob != mymob)
- C.screen -= locate(/obj/screen/plane_master/parallax_white) in C.screen
+ C.screen -= locate(/atom/movable/screen/plane_master/parallax_white) in C.screen
C.screen += PM
PM.color = initial(PM.color)
C.parallax_layers = null
@@ -90,7 +90,7 @@
if(new_parallax_movedir == FALSE)
var/animate_time = 0
for(var/thing in C.parallax_layers)
- var/obj/screen/parallax_layer/L = thing
+ var/atom/movable/screen/parallax_layer/L = thing
L.icon_state = initial(L.icon_state)
L.update_o(C.view)
var/T = PARALLAX_LOOP_TIME / L.speed
@@ -113,7 +113,7 @@
var/shortesttimer
if(!skip_windups)
for(var/thing in C.parallax_layers)
- var/obj/screen/parallax_layer/L = thing
+ var/atom/movable/screen/parallax_layer/L = thing
var/T = PARALLAX_LOOP_TIME / L.speed
if (isnull(shortesttimer))
@@ -141,7 +141,7 @@
return
C.parallax_animate_timer = FALSE
for(var/thing in C.parallax_layers)
- var/obj/screen/parallax_layer/L = thing
+ var/atom/movable/screen/parallax_layer/L = thing
if (!new_parallax_movedir)
animate(L)
continue
@@ -188,7 +188,7 @@
C.last_parallax_shift = world.time
for(var/thing in C.parallax_layers)
- var/obj/screen/parallax_layer/L = thing
+ var/atom/movable/screen/parallax_layer/L = thing
L.update_status(mymob)
if (L.view_sized != C.view)
L.update_o(C.view)
@@ -233,7 +233,7 @@
var/area/areaobj = get_area(client.eye)
hud_used.set_parallax_movedir(areaobj.parallax_movedir, TRUE)
-/obj/screen/parallax_layer
+/atom/movable/screen/parallax_layer
icon = 'icons/effects/parallax.dmi'
var/speed = 1
var/offset_x = 0
@@ -246,13 +246,13 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/parallax_layer/Initialize(mapload, view)
+/atom/movable/screen/parallax_layer/Initialize(mapload, view)
. = ..()
if (!view)
view = world.view
update_o(view)
-/obj/screen/parallax_layer/proc/update_o(view)
+/atom/movable/screen/parallax_layer/proc/update_o(view)
if (!view)
view = world.view
@@ -271,52 +271,52 @@
add_overlay(new_overlays)
view_sized = view
-/obj/screen/parallax_layer/proc/update_status(mob/M)
+/atom/movable/screen/parallax_layer/proc/update_status(mob/M)
return
-/obj/screen/parallax_layer/layer_1
+/atom/movable/screen/parallax_layer/layer_1
icon_state = "layer1"
speed = 0.6
layer = 1
-/obj/screen/parallax_layer/layer_2
+/atom/movable/screen/parallax_layer/layer_2
icon_state = "layer2"
speed = 1
layer = 2
-/obj/screen/parallax_layer/layer_3
+/atom/movable/screen/parallax_layer/layer_3
icon_state = "layer3"
speed = 1.4
layer = 3
-/obj/screen/parallax_layer/random
+/atom/movable/screen/parallax_layer/random
blend_mode = BLEND_OVERLAY
speed = 3
layer = 3
-/obj/screen/parallax_layer/random/space_gas
+/atom/movable/screen/parallax_layer/random/space_gas
icon_state = "space_gas"
-/obj/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
+/atom/movable/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
. = ..()
src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
-/obj/screen/parallax_layer/random/asteroids
+/atom/movable/screen/parallax_layer/random/asteroids
icon_state = "asteroids"
-/obj/screen/parallax_layer/planet
+/atom/movable/screen/parallax_layer/planet
icon_state = "planet"
blend_mode = BLEND_OVERLAY
absolute = TRUE //Status of seperation
speed = 3
layer = 30
-/obj/screen/parallax_layer/planet/update_status(mob/M)
+/atom/movable/screen/parallax_layer/planet/update_status(mob/M)
var/client/C = M.client
var/turf/posobj = get_turf(C.eye)
if(!posobj)
return
invisibility = is_station_level(posobj.z) ? 0 : INVISIBILITY_ABSTRACT
-/obj/screen/parallax_layer/planet/update_o()
+/atom/movable/screen/parallax_layer/planet/update_o()
return //Shit won't move
diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm
index 0e890871598..e5e5cfe8ff4 100644
--- a/code/_onclick/hud/picture_in_picture.dm
+++ b/code/_onclick/hud/picture_in_picture.dm
@@ -1,4 +1,4 @@
-/obj/screen/movable/pic_in_pic
+/atom/movable/screen/movable/pic_in_pic
name = "Picture-in-picture"
screen_loc = "CENTER"
plane = FLOOR_PLANE
@@ -7,17 +7,17 @@
var/height = 0
var/list/shown_to = list()
var/list/viewing_turfs = list()
- var/obj/screen/component_button/button_x
- var/obj/screen/component_button/button_expand
- var/obj/screen/component_button/button_shrink
+ var/atom/movable/screen/component_button/button_x
+ var/atom/movable/screen/component_button/button_expand
+ var/atom/movable/screen/component_button/button_shrink
var/mutable_appearance/standard_background
-/obj/screen/movable/pic_in_pic/Initialize()
+/atom/movable/screen/movable/pic_in_pic/Initialize()
. = ..()
make_backgrounds()
-/obj/screen/movable/pic_in_pic/Destroy()
+/atom/movable/screen/movable/pic_in_pic/Destroy()
for(var/C in shown_to)
unshow_to(C)
QDEL_NULL(button_x)
@@ -25,7 +25,7 @@
QDEL_NULL(button_expand)
return ..()
-/obj/screen/movable/pic_in_pic/component_click(obj/screen/component_button/component, params)
+/atom/movable/screen/movable/pic_in_pic/component_click(atom/movable/screen/component_button/component, params)
if(component == button_x)
qdel(src)
else if(component == button_expand)
@@ -33,13 +33,13 @@
else if(component == button_shrink)
set_view_size(width-1, height-1)
-/obj/screen/movable/pic_in_pic/proc/make_backgrounds()
+/atom/movable/screen/movable/pic_in_pic/proc/make_backgrounds()
standard_background = new /mutable_appearance()
standard_background.icon = 'icons/misc/pic_in_pic.dmi'
standard_background.icon_state = "background"
standard_background.layer = SPACE_LAYER
-/obj/screen/movable/pic_in_pic/proc/add_buttons()
+/atom/movable/screen/movable/pic_in_pic/proc/add_buttons()
var/static/mutable_appearance/move_tab
if(!move_tab)
move_tab = new /mutable_appearance()
@@ -54,7 +54,7 @@
add_overlay(move_tab)
if(!button_x)
- button_x = new /obj/screen/component_button(null, src)
+ button_x = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "close"
MA.icon = 'icons/misc/pic_in_pic.dmi'
@@ -67,7 +67,7 @@
vis_contents += button_x
if(!button_expand)
- button_expand = new /obj/screen/component_button(null, src)
+ button_expand = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "expand"
MA.icon = 'icons/misc/pic_in_pic.dmi'
@@ -80,7 +80,7 @@
vis_contents += button_expand
if(!button_shrink)
- button_shrink = new /obj/screen/component_button(null, src)
+ button_shrink = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "shrink"
MA.icon = 'icons/misc/pic_in_pic.dmi'
@@ -92,7 +92,7 @@
button_shrink.transform = M
vis_contents += button_shrink
-/obj/screen/movable/pic_in_pic/proc/add_background()
+/atom/movable/screen/movable/pic_in_pic/proc/add_background()
if((width > 0) && (height > 0))
var/matrix/M = matrix()
M.Scale(width + 0.5, height + 0.5)
@@ -102,7 +102,7 @@
// maximum number of dimensions is 10
-/obj/screen/movable/pic_in_pic/proc/set_view_size(width, height, do_refresh = TRUE)
+/atom/movable/screen/movable/pic_in_pic/proc/set_view_size(width, height, do_refresh = TRUE)
width = clamp(width, 0, 10)
height = clamp(height, 0, 10)
src.width = width
@@ -116,19 +116,19 @@
if(do_refresh)
refresh_view()
-/obj/screen/movable/pic_in_pic/proc/set_view_center(atom/target, do_refresh = TRUE)
+/atom/movable/screen/movable/pic_in_pic/proc/set_view_center(atom/target, do_refresh = TRUE)
center = target
if(do_refresh)
refresh_view()
-/obj/screen/movable/pic_in_pic/proc/refresh_view()
+/atom/movable/screen/movable/pic_in_pic/proc/refresh_view()
vis_contents -= viewing_turfs
if(!width || !height)
return
viewing_turfs = get_visible_turfs()
vis_contents += viewing_turfs
-/obj/screen/movable/pic_in_pic/proc/get_visible_turfs()
+/atom/movable/screen/movable/pic_in_pic/proc/get_visible_turfs()
var/turf/T = get_turf(center)
if(!T)
return list()
@@ -136,12 +136,12 @@
var/turf/upperright = locate(min(world.maxx, lowerleft.x + width - 1), min(world.maxy, lowerleft.y + height - 1), lowerleft.z)
return block(lowerleft, upperright)
-/obj/screen/movable/pic_in_pic/proc/show_to(client/C)
+/atom/movable/screen/movable/pic_in_pic/proc/show_to(client/C)
if(C)
shown_to[C] = 1
C.screen += src
-/obj/screen/movable/pic_in_pic/proc/unshow_to(client/C)
+/atom/movable/screen/movable/pic_in_pic/proc/unshow_to(client/C)
if(C)
shown_to -= C
C.screen -= src
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
index e3812b9c906..c80abe9267c 100644
--- a/code/_onclick/hud/plane_master.dm
+++ b/code/_onclick/hud/plane_master.dm
@@ -1,4 +1,4 @@
-/obj/screen/plane_master
+/atom/movable/screen/plane_master
screen_loc = "CENTER"
icon_state = "blank"
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
@@ -6,59 +6,59 @@
var/show_alpha = 255
var/hide_alpha = 0
-/obj/screen/plane_master/proc/Show(override)
+/atom/movable/screen/plane_master/proc/Show(override)
alpha = override || show_alpha
-/obj/screen/plane_master/proc/Hide(override)
+/atom/movable/screen/plane_master/proc/Hide(override)
alpha = override || hide_alpha
//Why do plane masters need a backdrop sometimes? Read https://secure.byond.com/forum/?post=2141928
//Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
-/obj/screen/plane_master/proc/backdrop(mob/mymob)
+/atom/movable/screen/plane_master/proc/backdrop(mob/mymob)
///Things rendered on "openspace"; holes in multi-z
-/obj/screen/plane_master/openspace
+/atom/movable/screen/plane_master/openspace
name = "open space plane master"
plane = OPENSPACE_BACKDROP_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_MULTIPLY
alpha = 255
-/obj/screen/plane_master/openspace/Initialize()
+/atom/movable/screen/plane_master/openspace/Initialize()
. = ..()
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -10)
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -15)
filters += filter(type = "drop_shadow", color = "#04080FAA", size = -20)
-/obj/screen/plane_master/proc/outline(_size, _color)
+/atom/movable/screen/plane_master/proc/outline(_size, _color)
filters += filter(type = "outline", size = _size, color = _color)
-/obj/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA")
+/atom/movable/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA")
filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset)
-/obj/screen/plane_master/proc/clear_filters()
+/atom/movable/screen/plane_master/proc/clear_filters()
filters = list()
///Contains just the floor
-/obj/screen/plane_master/floor
+/atom/movable/screen/plane_master/floor
name = "floor plane master"
plane = FLOOR_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
-/obj/screen/plane_master/floor/backdrop(mob/mymob)
+/atom/movable/screen/plane_master/floor/backdrop(mob/mymob)
filters = list()
if(istype(mymob) && mymob.eye_blurry)
filters += GAUSSIAN_BLUR(clamp(mymob.eye_blurry*0.1,0.6,3))
///Contains most things in the game world
-/obj/screen/plane_master/game_world
+/atom/movable/screen/plane_master/game_world
name = "game world plane master"
plane = GAME_PLANE
appearance_flags = PLANE_MASTER //should use client color
blend_mode = BLEND_OVERLAY
-/obj/screen/plane_master/game_world/backdrop(mob/mymob)
+/atom/movable/screen/plane_master/game_world/backdrop(mob/mymob)
filters = list()
if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
filters += AMBIENT_OCCLUSION
@@ -67,17 +67,17 @@
///Contains all lighting objects
-/obj/screen/plane_master/lighting
+/atom/movable/screen/plane_master/lighting
name = "lighting plane master"
plane = LIGHTING_PLANE
blend_mode = BLEND_MULTIPLY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/plane_master/lighting/backdrop(mob/mymob)
- mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit)
- mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit)
+/atom/movable/screen/plane_master/lighting/backdrop(mob/mymob)
+ mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/lighting_backdrop/lit)
+ mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/lighting_backdrop/unlit)
-/obj/screen/plane_master/lighting/Initialize()
+/atom/movable/screen/plane_master/lighting/Initialize()
. = ..()
filters += filter(type="alpha", render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)
filters += filter(type="alpha", render_source = EMISSIVE_UNBLOCKABLE_RENDER_TARGET, flags = MASK_INVERSE)
@@ -89,13 +89,13 @@
* Gets masked by blocking plane. Use for things that you want blocked by
* mobs, items, etc.
*/
-/obj/screen/plane_master/emissive
+/atom/movable/screen/plane_master/emissive
name = "emissive plane master"
plane = EMISSIVE_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_target = EMISSIVE_RENDER_TARGET
-/obj/screen/plane_master/emissive/Initialize()
+/atom/movable/screen/plane_master/emissive/Initialize()
. = ..()
filters += filter(type="alpha", render_source=EMISSIVE_BLOCKER_RENDER_TARGET, flags=MASK_INVERSE)
@@ -105,7 +105,7 @@
* Always masks the light plane, isn't blocked by anything. Use for on mob glows,
* magic stuff, etc.
*/
-/obj/screen/plane_master/emissive_unblockable
+/atom/movable/screen/plane_master/emissive_unblockable
name = "unblockable emissive plane master"
plane = EMISSIVE_UNBLOCKABLE_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -116,37 +116,37 @@
*
* You really shouldn't be directly using this, use atom helpers instead
*/
-/obj/screen/plane_master/emissive_blocker
+/atom/movable/screen/plane_master/emissive_blocker
name = "emissive blocker plane master"
plane = EMISSIVE_BLOCKER_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_target = EMISSIVE_BLOCKER_RENDER_TARGET
///Contains space parallax
-/obj/screen/plane_master/parallax
+/atom/movable/screen/plane_master/parallax
name = "parallax plane master"
plane = PLANE_SPACE_PARALLAX
blend_mode = BLEND_MULTIPLY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/plane_master/parallax_white
+/atom/movable/screen/plane_master/parallax_white
name = "parallax whitifier plane master"
plane = PLANE_SPACE
-/obj/screen/plane_master/camera_static
+/atom/movable/screen/plane_master/camera_static
name = "camera static plane master"
plane = CAMERA_STATIC_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
-/obj/screen/plane_master/excited_turfs
+/atom/movable/screen/plane_master/excited_turfs
name = "atmos excited turfs"
plane = ATMOS_GROUP_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
alpha = 0
-/obj/screen/plane_master/o_light_visual
+/atom/movable/screen/plane_master/o_light_visual
name = "overlight light visual plane master"
layer = O_LIGHTING_VISUAL_LAYER
plane = O_LIGHTING_VISUAL_PLANE
@@ -154,13 +154,13 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
blend_mode = BLEND_MULTIPLY
-/obj/screen/plane_master/runechat
+/atom/movable/screen/plane_master/runechat
name = "runechat plane master"
plane = RUNECHAT_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
-/obj/screen/plane_master/runechat/backdrop(mob/mymob)
+/atom/movable/screen/plane_master/runechat/backdrop(mob/mymob)
filters = list()
if(istype(mymob) && mymob.client?.prefs?.ambientocclusion)
filters += AMBIENT_OCCLUSION
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index cb33fa18494..d302b93c079 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -3,50 +3,50 @@
GLOBAL_LIST_EMPTY(radial_menus)
-/obj/screen/radial
+/atom/movable/screen/radial
icon = 'icons/hud/radial.dmi'
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
var/datum/radial_menu/parent
-/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
@@ -58,8 +58,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
@@ -121,7 +121,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
@@ -153,14 +153,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.cut_overlays()
E.alpha = 0
E.name = "None"
@@ -169,7 +169,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)
diff --git a/code/_onclick/hud/radial_persistent.dm b/code/_onclick/hud/radial_persistent.dm
index 0b5e8dc3561..e7f7c664ad7 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"
@@ -25,7 +25,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
diff --git a/code/_onclick/hud/revenanthud.dm b/code/_onclick/hud/revenanthud.dm
index 947b7cbc74a..0e7b7959655 100644
--- a/code/_onclick/hud/revenanthud.dm
+++ b/code/_onclick/hud/revenanthud.dm
@@ -4,13 +4,13 @@
/datum/hud/revenant/New(mob/owner)
..()
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon()
pull_icon.screen_loc = ui_living_pull
pull_icon.hud = src
static_inventory += pull_icon
- healths = new /obj/screen/healths/revenant()
+ healths = new /atom/movable/screen/healths/revenant()
healths.hud = src
infodisplay += healths
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index bdf1da8a809..7c10db2b5db 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -1,15 +1,15 @@
-/obj/screen/robot
+/atom/movable/screen/robot
icon = 'icons/hud/screen_cyborg.dmi'
-/obj/screen/robot/module
+/atom/movable/screen/robot/module
name = "cyborg module"
icon_state = "nomod"
-/obj/screen/robot/Click()
+/atom/movable/screen/robot/Click()
if(isobserver(usr))
return 1
-/obj/screen/robot/module/Click()
+/atom/movable/screen/robot/module/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
@@ -18,51 +18,51 @@
return 1
R.pick_module()
-/obj/screen/robot/module1
+/atom/movable/screen/robot/module1
name = "module1"
icon_state = "inv1"
-/obj/screen/robot/module1/Click()
+/atom/movable/screen/robot/module1/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
R.toggle_module(1)
-/obj/screen/robot/module2
+/atom/movable/screen/robot/module2
name = "module2"
icon_state = "inv2"
-/obj/screen/robot/module2/Click()
+/atom/movable/screen/robot/module2/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
R.toggle_module(2)
-/obj/screen/robot/module3
+/atom/movable/screen/robot/module3
name = "module3"
icon_state = "inv3"
-/obj/screen/robot/module3/Click()
+/atom/movable/screen/robot/module3/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
R.toggle_module(3)
-/obj/screen/robot/radio
+/atom/movable/screen/robot/radio
name = "radio"
icon_state = "radio"
-/obj/screen/robot/radio/Click()
+/atom/movable/screen/robot/radio/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
R.radio.interact(R)
-/obj/screen/robot/store
+/atom/movable/screen/robot/store
name = "store"
icon_state = "store"
-/obj/screen/robot/store/Click()
+/atom/movable/screen/robot/store/Click()
if(..())
return
var/mob/living/silicon/robot/R = usr
@@ -75,35 +75,35 @@
..()
// i, Robit
var/mob/living/silicon/robot/robit = mymob
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new/obj/screen/language_menu
+ using = new/atom/movable/screen/language_menu
using.screen_loc = ui_borg_language_menu
static_inventory += using
//Radio
- using = new /obj/screen/robot/radio()
+ using = new /atom/movable/screen/robot/radio()
using.screen_loc = ui_borg_radio
using.hud = src
static_inventory += using
//Module select
if(!robit.inv1)
- robit.inv1 = new /obj/screen/robot/module1()
+ robit.inv1 = new /atom/movable/screen/robot/module1()
robit.inv1.screen_loc = ui_inv1
robit.inv1.hud = src
static_inventory += robit.inv1
if(!robit.inv2)
- robit.inv2 = new /obj/screen/robot/module2()
+ robit.inv2 = new /atom/movable/screen/robot/module2()
robit.inv2.screen_loc = ui_inv2
robit.inv2.hud = src
static_inventory += robit.inv2
if(!robit.inv3)
- robit.inv3 = new /obj/screen/robot/module3()
+ robit.inv3 = new /atom/movable/screen/robot/module3()
robit.inv3.screen_loc = ui_inv3
robit.inv3.hud = src
@@ -111,60 +111,60 @@
//End of module select
- using = new /obj/screen/robot/lamp()
+ using = new /atom/movable/screen/robot/lamp()
using.screen_loc = ui_borg_lamp
using.hud = src
static_inventory += using
robit.lampButton = using
- var/obj/screen/robot/lamp/lampscreen = using
+ var/atom/movable/screen/robot/lamp/lampscreen = using
lampscreen.robot = robit
//Photography stuff
- using = new /obj/screen/ai/image_take()
+ using = new /atom/movable/screen/ai/image_take()
using.screen_loc = ui_borg_camera
using.hud = src
static_inventory += using
//Borg Integrated Tablet
- using = new /obj/screen/robot/modPC()
+ using = new /atom/movable/screen/robot/modPC()
using.screen_loc = ui_borg_tablet
using.hud = src
static_inventory += using
robit.interfaceButton = using
if(robit.modularInterface)
using.vis_contents += robit.modularInterface
- var/obj/screen/robot/modPC/tabletbutton = using
+ var/atom/movable/screen/robot/modPC/tabletbutton = using
tabletbutton.robot = robit
//Alerts
- using = new /obj/screen/robot/alerts()
+ using = new /atom/movable/screen/robot/alerts()
using.screen_loc = ui_borg_alerts
using.hud = src
static_inventory += using
//Intent
- action_intent = new /obj/screen/act_intent/robot()
+ action_intent = new /atom/movable/screen/act_intent/robot()
action_intent.icon_state = mymob.a_intent
action_intent.hud = src
static_inventory += action_intent
//Health
- healths = new /obj/screen/healths/robot()
+ healths = new /atom/movable/screen/healths/robot()
healths.hud = src
infodisplay += healths
//Installed Module
- robit.hands = new /obj/screen/robot/module()
+ robit.hands = new /atom/movable/screen/robot/module()
robit.hands.screen_loc = ui_borg_module
robit.hands.hud = src
static_inventory += robit.hands
//Store
- module_store_icon = new /obj/screen/robot/store()
+ module_store_icon = new /atom/movable/screen/robot/store()
module_store_icon.screen_loc = ui_borg_store
module_store_icon.hud = src
- pull_icon = new /obj/screen/pull()
+ pull_icon = new /atom/movable/screen/pull()
pull_icon.icon = 'icons/hud/screen_cyborg.dmi'
pull_icon.screen_loc = ui_borg_pull
pull_icon.hud = src
@@ -172,7 +172,7 @@
hotkeybuttons += pull_icon
- zone_select = new /obj/screen/zone_sel/robot()
+ zone_select = new /atom/movable/screen/zone_sel/robot()
zone_select.hud = src
zone_select.update_icon()
static_inventory += zone_select
@@ -270,41 +270,41 @@
for(var/obj/item/I in R.held_items)
screenmob.client.screen -= I
-/obj/screen/robot/lamp
+/atom/movable/screen/robot/lamp
name = "headlamp"
icon_state = "lamp_off"
var/mob/living/silicon/robot/robot
-/obj/screen/robot/lamp/Click()
+/atom/movable/screen/robot/lamp/Click()
. = ..()
if(.)
return
robot?.toggle_headlamp()
update_icon()
-/obj/screen/robot/lamp/update_icon()
+/atom/movable/screen/robot/lamp/update_icon()
if(robot?.lamp_enabled)
icon_state = "lamp_on"
else
icon_state = "lamp_off"
-/obj/screen/robot/modPC
+/atom/movable/screen/robot/modPC
name = "Modular Interface"
icon_state = "template"
var/mob/living/silicon/robot/robot
-/obj/screen/robot/modPC/Click()
+/atom/movable/screen/robot/modPC/Click()
. = ..()
if(.)
return
robot.modularInterface?.interact(robot)
-/obj/screen/robot/alerts
+/atom/movable/screen/robot/alerts
name = "Alert Panel"
icon = 'icons/hud/screen_ai.dmi'
icon_state = "alerts"
-/obj/screen/robot/alerts/Click()
+/atom/movable/screen/robot/alerts/Click()
. = ..()
if(.)
return
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index cce3d18ae55..cc50bc4140d 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -6,15 +6,19 @@
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/hud/screen_gen.dmi'
layer = HUD_LAYER
plane = HUD_PLANE
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ animate_movement = SLIDE_STEPS
+ speech_span = SPAN_ROBOT
+ vis_flags = VIS_INHERIT_PLANE
appearance_flags = APPEARANCE_UI
- 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.
+ /// A reference to the object in the slot. Grabs or items, generally.
+ var/obj/master = null
+ /// A reference to the owner HUD, if any.
+ var/datum/hud/hud = null
/**
* Map name assigned to this object.
* Automatically set by /client/proc/add_obj_to_map.
@@ -29,24 +33,21 @@
*/
var/del_on_map_removal = TRUE
-/obj/screen/take_damage()
- return
-
-/obj/screen/Destroy()
+/atom/movable/screen/Destroy()
master = null
hud = null
return ..()
-/obj/screen/examine(mob/user)
+/atom/movable/screen/examine(mob/user)
return list()
-/obj/screen/orbit()
+/atom/movable/screen/orbit()
return
-/obj/screen/proc/component_click(obj/screen/component_button/component, params)
+/atom/movable/screen/proc/component_click(atom/movable/screen/component_button/component, params)
return
-/obj/screen/text
+/atom/movable/screen/text
icon = null
icon_state = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
@@ -54,12 +55,12 @@
maptext_height = 480
maptext_width = 480
-/obj/screen/swap_hand
+/atom/movable/screen/swap_hand
layer = HUD_LAYER
plane = HUD_PLANE
name = "swap hand"
-/obj/screen/swap_hand/Click()
+/atom/movable/screen/swap_hand/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(world.time <= usr.next_move)
@@ -73,30 +74,30 @@
M.swap_hand()
return 1
-/obj/screen/skills
+/atom/movable/screen/skills
name = "skills"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "skills"
screen_loc = ui_skill_menu
-/obj/screen/skills/Click()
+/atom/movable/screen/skills/Click()
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
H.mind.print_levels(H)
-/obj/screen/craft
+/atom/movable/screen/craft
name = "crafting menu"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "craft"
screen_loc = ui_crafting
-/obj/screen/area_creator
+/atom/movable/screen/area_creator
name = "create new area"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "area_edit"
screen_loc = ui_building
-/obj/screen/area_creator/Click()
+/atom/movable/screen/area_creator/Click()
if(usr.incapacitated() || (isobserver(usr) && !isAdminGhostAI(usr)))
return TRUE
var/area/A = get_area(usr)
@@ -105,18 +106,18 @@
return TRUE
create_area(usr)
-/obj/screen/language_menu
+/atom/movable/screen/language_menu
name = "language menu"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "talk_wheel"
screen_loc = ui_language_menu
-/obj/screen/language_menu/Click()
+/atom/movable/screen/language_menu/Click()
var/mob/M = usr
var/datum/language_holder/H = M.get_language_holder()
H.open_language_menu(usr)
-/obj/screen/inventory
+/atom/movable/screen/inventory
/// The identifier for the slot. It has nothing to do with ID cards.
var/slot_id
/// Icon when empty. For now used only by humans.
@@ -128,7 +129,7 @@
layer = HUD_LAYER
plane = HUD_PLANE
-/obj/screen/inventory/Click(location, control, params)
+/atom/movable/screen/inventory/Click(location, control, params)
// 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(world.time <= usr.next_move)
@@ -148,16 +149,16 @@
usr.update_inv_hands()
return TRUE
-/obj/screen/inventory/MouseEntered()
+/atom/movable/screen/inventory/MouseEntered()
..()
add_overlays()
-/obj/screen/inventory/MouseExited()
+/atom/movable/screen/inventory/MouseExited()
..()
cut_overlay(object_overlay)
QDEL_NULL(object_overlay)
-/obj/screen/inventory/update_icon_state()
+/atom/movable/screen/inventory/update_icon_state()
if(!icon_empty)
icon_empty = icon_state
@@ -167,7 +168,7 @@
else
icon_state = icon_empty
-/obj/screen/inventory/proc/add_overlays()
+/atom/movable/screen/inventory/proc/add_overlays()
var/mob/user = hud?.mymob
if(!user || !slot_id)
@@ -190,12 +191,12 @@
object_overlay = item_overlay
add_overlay(object_overlay)
-/obj/screen/inventory/hand
+/atom/movable/screen/inventory/hand
var/mutable_appearance/handcuff_overlay
var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/hud/screen_gen.dmi', "blocked")
var/held_index = 0
-/obj/screen/inventory/hand/update_overlays()
+/atom/movable/screen/inventory/hand/update_overlays()
. = ..()
if(!handcuff_overlay)
@@ -218,7 +219,7 @@
. += "hand_active"
-/obj/screen/inventory/hand/Click(location, control, params)
+/atom/movable/screen/inventory/hand/Click(location, control, params)
// 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
var/mob/user = hud?.mymob
@@ -239,41 +240,41 @@
user.swap_hand(held_index)
return TRUE
-/obj/screen/close
+/atom/movable/screen/close
name = "close"
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
icon_state = "backpack_close"
-/obj/screen/close/Initialize(mapload, new_master)
+/atom/movable/screen/close/Initialize(mapload, new_master)
. = ..()
master = new_master
-/obj/screen/close/Click()
+/atom/movable/screen/close/Click()
var/datum/component/storage/S = master
S.hide_from(usr)
return TRUE
-/obj/screen/drop
+/atom/movable/screen/drop
name = "drop"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "act_drop"
layer = HUD_LAYER
plane = HUD_PLANE
-/obj/screen/drop/Click()
+/atom/movable/screen/drop/Click()
if(usr.stat == CONSCIOUS)
usr.dropItemToGround(usr.get_active_held_item())
-/obj/screen/act_intent
+/atom/movable/screen/act_intent
name = "intent"
icon_state = "help"
screen_loc = ui_acti
-/obj/screen/act_intent/Click(location, control, params)
+/atom/movable/screen/act_intent/Click(location, control, params)
usr.a_intent_change(INTENT_HOTKEY_RIGHT)
-/obj/screen/act_intent/segmented/Click(location, control, params)
+/atom/movable/screen/act_intent/segmented/Click(location, control, params)
if(usr.client.prefs.toggles & INTENT_STYLE)
var/_x = text2num(params2list(params)["icon-x"])
var/_y = text2num(params2list(params)["icon-y"])
@@ -292,20 +293,20 @@
else
return ..()
-/obj/screen/act_intent/alien
+/atom/movable/screen/act_intent/alien
icon = 'icons/hud/screen_alien.dmi'
screen_loc = ui_movi
-/obj/screen/act_intent/robot
+/atom/movable/screen/act_intent/robot
icon = 'icons/hud/screen_cyborg.dmi'
screen_loc = ui_borg_intents
-/obj/screen/internals
+/atom/movable/screen/internals
name = "toggle internals"
icon_state = "internal0"
screen_loc = ui_internal
-/obj/screen/internals/Click()
+/atom/movable/screen/internals/Click()
if(!iscarbon(usr))
return
var/mob/living/carbon/C = usr
@@ -360,72 +361,72 @@
return
C.update_action_buttons_icon()
-/obj/screen/spacesuit
+/atom/movable/screen/spacesuit
name = "Space suit cell status"
icon_state = "spacesuit_0"
screen_loc = ui_spacesuit
-/obj/screen/mov_intent
+/atom/movable/screen/mov_intent
name = "run/walk toggle"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "running"
-/obj/screen/mov_intent/Click()
+/atom/movable/screen/mov_intent/Click()
toggle(usr)
-/obj/screen/mov_intent/update_icon_state()
+/atom/movable/screen/mov_intent/update_icon_state()
switch(hud?.mymob?.m_intent)
if(MOVE_INTENT_WALK)
icon_state = "walking"
if(MOVE_INTENT_RUN)
icon_state = "running"
-/obj/screen/mov_intent/proc/toggle(mob/user)
+/atom/movable/screen/mov_intent/proc/toggle(mob/user)
if(isobserver(user))
return
user.toggle_move_intent(user)
-/obj/screen/pull
+/atom/movable/screen/pull
name = "stop pulling"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "pull"
-/obj/screen/pull/Click()
+/atom/movable/screen/pull/Click()
if(isobserver(usr))
return
usr.stop_pulling()
-/obj/screen/pull/update_icon_state()
+/atom/movable/screen/pull/update_icon_state()
if(hud?.mymob?.pulling)
icon_state = "pull"
else
icon_state = "pull0"
-/obj/screen/resist
+/atom/movable/screen/resist
name = "resist"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "act_resist"
layer = HUD_LAYER
plane = HUD_PLANE
-/obj/screen/resist/Click()
+/atom/movable/screen/resist/Click()
if(isliving(usr))
var/mob/living/L = usr
L.resist()
-/obj/screen/rest
+/atom/movable/screen/rest
name = "rest"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "act_rest"
layer = HUD_LAYER
plane = HUD_PLANE
-/obj/screen/rest/Click()
+/atom/movable/screen/rest/Click()
if(isliving(usr))
var/mob/living/L = usr
L.toggle_resting()
-/obj/screen/rest/update_icon_state()
+/atom/movable/screen/rest/update_icon_state()
var/mob/living/user = hud?.mymob
if(!istype(user))
return
@@ -434,18 +435,18 @@
else
icon_state = "act_rest0"
-/obj/screen/storage
+/atom/movable/screen/storage
name = "storage"
icon_state = "block"
screen_loc = "7,7 to 10,8"
layer = HUD_LAYER
plane = HUD_PLANE
-/obj/screen/storage/Initialize(mapload, new_master)
+/atom/movable/screen/storage/Initialize(mapload, new_master)
. = ..()
master = new_master
-/obj/screen/storage/Click(location, control, params)
+/atom/movable/screen/storage/Click(location, control, params)
if(world.time <= usr.next_move)
return TRUE
if(usr.incapacitated())
@@ -458,17 +459,17 @@
master.attackby(null, I, usr, params)
return TRUE
-/obj/screen/throw_catch
+/atom/movable/screen/throw_catch
name = "throw/catch"
icon = 'icons/hud/screen_midnight.dmi'
icon_state = "act_throw_off"
-/obj/screen/throw_catch/Click()
+/atom/movable/screen/throw_catch/Click()
if(iscarbon(usr))
var/mob/living/carbon/C = usr
C.toggle_throw_mode()
-/obj/screen/zone_sel
+/atom/movable/screen/zone_sel
name = "damage zone"
icon_state = "zone_sel"
screen_loc = ui_zonesel
@@ -476,7 +477,7 @@
var/static/list/hover_overlays_cache = list()
var/hovering
-/obj/screen/zone_sel/Click(location, control,params)
+/atom/movable/screen/zone_sel/Click(location, control,params)
if(isobserver(usr))
return
@@ -489,10 +490,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
@@ -521,12 +522,12 @@
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
-/obj/screen/zone_sel/MouseExited(location, control, params)
+/atom/movable/screen/zone_sel/MouseExited(location, control, params)
if(!isobserver(usr) && hovering)
vis_contents -= hover_overlays_cache[hovering]
hovering = 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 9) //Legs
switch(icon_x)
@@ -564,7 +565,7 @@
return BODY_ZONE_PRECISE_EYES
return BODY_ZONE_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(user != hud?.mymob)
return
@@ -574,20 +575,20 @@
return TRUE
-/obj/screen/zone_sel/update_overlays()
+/atom/movable/screen/zone_sel/update_overlays()
. = ..()
if(!hud?.mymob)
return
. += mutable_appearance(overlay_icon, "[hud.mymob.zone_selected]")
-/obj/screen/zone_sel/alien
+/atom/movable/screen/zone_sel/alien
icon = 'icons/hud/screen_alien.dmi'
overlay_icon = 'icons/hud/screen_alien.dmi'
-/obj/screen/zone_sel/robot
+/atom/movable/screen/zone_sel/robot
icon = 'icons/hud/screen_cyborg.dmi'
-/obj/screen/flash
+/atom/movable/screen/flash
name = "flash"
icon_state = "blank"
blend_mode = BLEND_ADD
@@ -595,7 +596,7 @@
layer = FLASH_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/damageoverlay
+/atom/movable/screen/damageoverlay
icon = 'icons/hud/screen_full.dmi'
icon_state = "oxydamageoverlay0"
name = "dmg"
@@ -605,73 +606,73 @@
layer = UI_DAMAGE_LAYER
plane = FULLSCREEN_PLANE
-/obj/screen/healths
+/atom/movable/screen/healths
name = "health"
icon_state = "health0"
screen_loc = ui_health
-/obj/screen/healths/alien
+/atom/movable/screen/healths/alien
icon = 'icons/hud/screen_alien.dmi'
screen_loc = ui_alien_health
-/obj/screen/healths/robot
+/atom/movable/screen/healths/robot
icon = 'icons/hud/screen_cyborg.dmi'
screen_loc = ui_borg_health
-/obj/screen/healths/blob
+/atom/movable/screen/healths/blob
name = "blob health"
icon_state = "block"
screen_loc = ui_internal
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/healths/blob/naut
+/atom/movable/screen/healths/blob/naut
name = "health"
icon = 'icons/hud/blob.dmi'
icon_state = "nauthealth"
-/obj/screen/healths/blob/naut/core
+/atom/movable/screen/healths/blob/naut/core
name = "overmind health"
icon_state = "corehealth"
screen_loc = ui_health
-/obj/screen/healths/guardian
+/atom/movable/screen/healths/guardian
name = "summoner health"
icon = 'icons/mob/guardian.dmi'
icon_state = "base"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/healths/revenant
+/atom/movable/screen/healths/revenant
name = "essence"
icon = 'icons/mob/actions/backgrounds.dmi'
icon_state = "bg_revenant"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/healths/construct
+/atom/movable/screen/healths/construct
icon = 'icons/hud/screen_construct.dmi'
icon_state = "artificer_health0"
screen_loc = ui_construct_health
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/screen/healthdoll
+/atom/movable/screen/healthdoll
name = "health doll"
screen_loc = ui_healthdoll
-/obj/screen/healthdoll/Click()
+/atom/movable/screen/healthdoll/Click()
if (iscarbon(usr))
var/mob/living/carbon/C = usr
C.check_self_for_injuries()
-/obj/screen/healthdoll/living
+/atom/movable/screen/healthdoll/living
icon_state = "fullhealth0"
screen_loc = ui_living_healthdoll
var/filtered = FALSE //so we don't repeatedly create the mask of the mob every update
-/obj/screen/mood
+/atom/movable/screen/mood
name = "mood"
icon_state = "mood5"
screen_loc = ui_mood
-/obj/screen/splash
+/atom/movable/screen/splash
icon = 'icons/blank_title.png'
icon_state = ""
screen_loc = "1,1"
@@ -679,7 +680,7 @@
plane = SPLASHSCREEN_PLANE
var/client/holder
-/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE, except its not easy
+/atom/movable/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE, except its not easy
. = ..()
holder = C
@@ -698,7 +699,7 @@
holder.screen += src
-/obj/screen/splash/proc/Fade(out, qdel_after = TRUE)
+/atom/movable/screen/splash/proc/Fade(out, qdel_after = TRUE)
if(QDELETED(src))
return
if(out)
@@ -709,20 +710,20 @@
if(qdel_after)
QDEL_IN(src, 30)
-/obj/screen/splash/Destroy()
+/atom/movable/screen/splash/Destroy()
if(holder)
holder.screen -= src
holder = null
return ..()
-/obj/screen/component_button
- var/obj/screen/parent
+/atom/movable/screen/component_button
+ var/atom/movable/screen/parent
-/obj/screen/component_button/Initialize(mapload, obj/screen/parent)
+/atom/movable/screen/component_button/Initialize(mapload, atom/movable/screen/parent)
. = ..()
src.parent = parent
-/obj/screen/component_button/Click(params)
+/atom/movable/screen/component_button/Click(params)
if(parent)
parent.component_click(src, params)
diff --git a/code/_onclick/hud/swarmer.dm b/code/_onclick/hud/swarmer.dm
index 0217d77ed6b..bf7605bc644 100644
--- a/code/_onclick/hud/swarmer.dm
+++ b/code/_onclick/hud/swarmer.dm
@@ -1,96 +1,96 @@
-/obj/screen/swarmer
+/atom/movable/screen/swarmer
icon = 'icons/hud/swarmer.dmi'
-/obj/screen/swarmer/fabricate_trap
+/atom/movable/screen/swarmer/fabricate_trap
icon_state = "ui_trap"
name = "Create trap (Costs 4 Resources)"
desc = "Creates a trap that will nonlethally shock any non-swarmer that attempts to cross it. (Costs 4 resources)"
-/obj/screen/swarmer/fabricate_trap/Click()
+/atom/movable/screen/swarmer/fabricate_trap/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.create_trap()
-/obj/screen/swarmer/barricade
+/atom/movable/screen/swarmer/barricade
icon_state = "ui_barricade"
name = "Create barricade (Costs 4 Resources)"
desc = "Creates a destructible barricade that will stop any non swarmer from passing it. Also allows disabler beams to pass through. (Costs 4 resources)"
-/obj/screen/swarmer/barricade/Click()
+/atom/movable/screen/swarmer/barricade/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.create_barricade()
-/obj/screen/swarmer/replicate
+/atom/movable/screen/swarmer/replicate
icon_state = "ui_replicate"
name = "Replicate (Costs 20 Resources)"
desc = "Creates a drone."
-/obj/screen/swarmer/replicate/Click()
+/atom/movable/screen/swarmer/replicate/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.create_swarmer()
-/obj/screen/swarmer/repair_self
+/atom/movable/screen/swarmer/repair_self
icon_state = "ui_self_repair"
name = "Repair self"
desc = "Repairs damage to our body."
-/obj/screen/swarmer/repair_self/Click()
+/atom/movable/screen/swarmer/repair_self/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.repair_self()
-/obj/screen/swarmer/toggle_light
+/atom/movable/screen/swarmer/toggle_light
icon_state = "ui_light"
name = "Toggle light"
desc = "Toggles our inbuilt light on or off."
-/obj/screen/swarmer/toggle_light/Click()
+/atom/movable/screen/swarmer/toggle_light/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.toggle_light()
-/obj/screen/swarmer/contact_swarmers
+/atom/movable/screen/swarmer/contact_swarmers
icon_state = "ui_contact_swarmers"
name = "Contact swarmers"
desc = "Sends a message to all other swarmers, should they exist."
-/obj/screen/swarmer/contact_swarmers/Click()
+/atom/movable/screen/swarmer/contact_swarmers/Click()
if(isswarmer(usr))
var/mob/living/simple_animal/hostile/swarmer/S = usr
S.contact_swarmers()
/datum/hud/swarmer/New(mob/owner)
..()
- var/obj/screen/using
+ var/atom/movable/screen/using
- using = new /obj/screen/swarmer/fabricate_trap()
+ using = new /atom/movable/screen/swarmer/fabricate_trap()
using.screen_loc = ui_hand_position(2)
using.hud = src
static_inventory += using
- using = new /obj/screen/swarmer/barricade()
+ using = new /atom/movable/screen/swarmer/barricade()
using.screen_loc = ui_hand_position(1)
using.hud = src
static_inventory += using
- using = new /obj/screen/swarmer/replicate()
+ using = new /atom/movable/screen/swarmer/replicate()
using.screen_loc = ui_zonesel
using.hud = src
static_inventory += using
- using = new /obj/screen/swarmer/repair_self()
+ using = new /atom/movable/screen/swarmer/repair_self()
using.screen_loc = ui_storage1
using.hud = src
static_inventory += using
- using = new /obj/screen/swarmer/toggle_light()
+ using = new /atom/movable/screen/swarmer/toggle_light()
using.screen_loc = ui_back
using.hud = src
static_inventory += using
- using = new /obj/screen/swarmer/contact_swarmers()
+ using = new /atom/movable/screen/swarmer/contact_swarmers()
using.screen_loc = ui_inventory
using.hud = src
static_inventory += using
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 7224c4b5b03..257d98e528e 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -538,7 +538,7 @@ GLOBAL_LIST_EMPTY(colored_images)
#else
data["display_max"] = FALSE
#endif
- var/obj/screen/plane_master/plane = user.hud_used.plane_masters["[ATMOS_GROUP_PLANE]"]
+ var/atom/movable/screen/plane_master/plane = user.hud_used.plane_masters["[ATMOS_GROUP_PLANE]"]
data["showing_user"] = (plane.alpha == 255)
return data
@@ -577,7 +577,7 @@ GLOBAL_LIST_EMPTY(colored_images)
group.hide_turfs()
return TRUE
if("toggle_user_display")
- var/obj/screen/plane_master/plane = ui.user.hud_used.plane_masters["[ATMOS_GROUP_PLANE]"]
+ var/atom/movable/screen/plane_master/plane = ui.user.hud_used.plane_masters["[ATMOS_GROUP_PLANE]"]
if(!plane.alpha)
if(ui.user.client)
ui.user.client.images += GLOB.colored_images
diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm
index 7acb779dcc3..c15addc3de9 100644
--- a/code/controllers/subsystem/parallax.dm
+++ b/code/controllers/subsystem/parallax.dm
@@ -15,7 +15,7 @@ SUBSYSTEM_DEF(parallax)
/datum/controller/subsystem/parallax/PreInit()
. = ..()
if(prob(70)) //70% chance to pick a special extra layer
- random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids)
+ random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids)
random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color.
planet_y_offset = rand(100, 160)
planet_x_offset = rand(100, 160)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 357e2bbfdf1..a3ea0934daf 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -408,7 +408,7 @@ SUBSYSTEM_DEF(ticker)
qdel(player)
living.notransform = TRUE
if(living.client)
- var/obj/screen/splash/S = new(living.client, TRUE)
+ var/atom/movable/screen/splash/S = new(living.client, TRUE)
S.Fade(TRUE)
living.client.init_verbs()
livings += living
diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index 03c30887bae..ce5d1d4dde2 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(title)
for(var/thing in GLOB.clients)
if(!thing)
continue
- var/obj/screen/splash/S = new(thing, FALSE)
+ var/atom/movable/screen/splash/S = new(thing, FALSE)
S.Fade(FALSE,FALSE)
/datum/controller/subsystem/title/Recover()
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 274e2fdc1da..3dd4f6810b1 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -9,7 +9,7 @@
var/obj/target = null
var/check_flags = NONE
var/processing = FALSE
- var/obj/screen/movable/action_button/button = null
+ var/atom/movable/screen/movable/action_button/button = null
var/buttontooltipstyle = ""
var/transparent_when_unavailable = TRUE
@@ -133,7 +133,7 @@
button.color = rgb(255,255,255,255)
return 1
-/datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button, force = FALSE)
+/datum/action/proc/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force = FALSE)
if(icon_icon && button_icon_state && ((current_button.button_icon_state != button_icon_state) || force))
current_button.cut_overlays(TRUE)
current_button.add_overlay(mutable_appearance(icon_icon, button_icon_state))
@@ -172,7 +172,7 @@
I.ui_action_click(owner, src)
return TRUE
-/datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button, force)
+/datum/action/item_action/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
if(button_icon && button_icon_state)
// If set, use the custom icon that we set instead
// of the item appearence
@@ -741,7 +741,7 @@
icon_icon = 'icons/mob/actions/actions_items.dmi'
button_icon_state = "storage_gather_switch"
-/datum/action/item_action/storage_gather_mode/ApplyIcon(obj/screen/movable/action_button/current_button)
+/datum/action/item_action/storage_gather_mode/ApplyIcon(atom/movable/screen/movable/action_button/current_button)
. = ..()
var/old_layer = target.layer
var/old_plane = target.plane
diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm
index 57e968c4b5c..a72428b1534 100644
--- a/code/datums/brain_damage/hypnosis.dm
+++ b/code/datums/brain_damage/hypnosis.dm
@@ -31,7 +31,7 @@
"These words keep echoing in your mind. You find yourself completely fascinated by them.")]")
to_chat(owner, "You've been hypnotized by this sentence. You must follow these words. If it isn't a clear order, you can freely interpret how to do so,\
as long as you act like the words are your highest priority.")
- var/obj/screen/alert/hypnosis/hypno_alert = owner.throw_alert("hypnosis", /obj/screen/alert/hypnosis)
+ var/atom/movable/screen/alert/hypnosis/hypno_alert = owner.throw_alert("hypnosis", /atom/movable/screen/alert/hypnosis)
hypno_alert.desc = "\"[hypnotic_phrase]\"... your mind seems to be fixated on this concept."
..()
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 410a592bf54..883e9fb99de 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -18,7 +18,7 @@
playing.play(watcher)
qdel(playing)
-/obj/screen/cinematic
+/atom/movable/screen/cinematic
icon = 'icons/effects/station_explosion.dmi'
icon_state = "station_intact"
plane = SPLASHSCREEN_PLANE
@@ -32,7 +32,7 @@
var/list/watching = list() //List of clients watching this
var/list/locked = list() //Who had notransform set during the cinematic
var/is_global = FALSE //Global cinematics will override mob-specific ones
- var/obj/screen/cinematic/screen
+ var/atom/movable/screen/cinematic/screen
var/datum/callback/special_callback //For special effects synced with animation (explosions after the countdown etc)
var/cleanup_time = 300 //How long for the final screen to remain
var/stop_ooc = TRUE //Turns off ooc when played globally.
@@ -74,7 +74,7 @@
ooc_toggled = TRUE
toggle_ooc(FALSE)
- //Place /obj/screen/cinematic into everyone's screens, prevent them from moving
+ //Place /atom/movable/screen/cinematic into everyone's screens, prevent them from moving
for(var/MM in watchers)
var/mob/M = MM
show_to(M, M.client)
@@ -101,7 +101,7 @@
if(!C)
return
watching += C
- M.overlay_fullscreen("cinematic",/obj/screen/fullscreen/cinematic_backdrop)
+ M.overlay_fullscreen("cinematic",/atom/movable/screen/fullscreen/cinematic_backdrop)
C.screen += screen
//Sound helper
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index e1b732c1e35..10eee99eddf 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -6,7 +6,7 @@
SIGNAL_HANDLER
var/datum/hud/H = user.hud_used
- var/obj/screen/craft/C = new()
+ var/atom/movable/screen/craft/C = new()
C.icon = H.ui_style
H.static_inventory += C
CL.screen += C
@@ -321,7 +321,7 @@
container.emptyStorage()
qdel(DL)
-/datum/component/personal_crafting/proc/component_ui_interact(obj/screen/craft/image, location, control, params, user)
+/datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user)
SIGNAL_HANDLER_DOES_SLEEP
if(user == parent)
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index a1aade5615e..b84c43d4de2 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -91,7 +91,7 @@
var/damage = weapon.throwforce
if(harmful)
- victim.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
+ victim.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject)
playsound(victim,'sound/weapons/bladeslice.ogg', 40)
weapon.add_mob_blood(victim)//it embedded itself in you, of course it's bloody!
damage += weapon.w_class * impact_pain_mult
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index e3db0cf7570..b6cb7dca52e 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -10,7 +10,7 @@
var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
var/list/datum/mood_event/mood_events = list()
var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
- var/obj/screen/mood/screen_obj
+ var/atom/movable/screen/mood/screen_obj
/datum/component/mood/Initialize()
if(!isliving(parent))
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 3d175503b28..cf1b005ebc9 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -34,8 +34,8 @@
var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number.
- var/obj/screen/storage/boxes //storage display object
- var/obj/screen/close/closer //close button object
+ var/atom/movable/screen/storage/boxes //storage display object
+ var/atom/movable/screen/close/closer //close button object
var/allow_big_nesting = FALSE //allow storage objects of the same or greater size.
@@ -567,14 +567,14 @@
// this must come before the screen objects only block, dunno why it wasn't before
if(over_object == M)
user_show_to_mob(M)
- if(!istype(over_object, /obj/screen))
+ if(!istype(over_object, /atom/movable/screen))
dump_content_at(over_object, M)
return
if(A.loc != M)
return
playsound(A, "rustle", 50, TRUE, -5)
- if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(A, H.held_index)
return
A.add_fingerprint(M)
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index 7fa10a52a52..5de4f0ad2f4 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -387,7 +387,7 @@
user.emote("scream")
user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed!
shake_camera(user, 7, 7)
- user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 4.5)
if(97 to 98)
@@ -403,7 +403,7 @@
playsound(user, 'sound/effects/splat.ogg', 70, TRUE)
user.emote("gurgle")
shake_camera(user, 7, 7)
- user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 4.5)
if(93 to 96)
@@ -414,7 +414,7 @@
user.gain_trauma_type(BRAIN_TRAUMA_MILD)
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
shake_camera(user, 6, 6)
- user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 3.5)
if(86 to 92)
@@ -427,7 +427,7 @@
user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8)
user.Knockdown(40)
shake_camera(user, 5, 5)
- user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash)
+ user.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash)
user.clear_fullscreen("flash", 2.5)
if(68 to 85)
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 434b63106cd..7f7bc35d0c2 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -4,16 +4,16 @@
id = "his_grace"
duration = -1
tick_interval = 4
- alert_type = /obj/screen/alert/status_effect/his_grace
+ alert_type = /atom/movable/screen/alert/status_effect/his_grace
var/bloodlust = 0
-/obj/screen/alert/status_effect/his_grace
+/atom/movable/screen/alert/status_effect/his_grace
name = "His Grace"
desc = "His Grace hungers, and you must feed Him."
icon_state = "his_grace"
alerttooltipstyle = "hisgrace"
-/obj/screen/alert/status_effect/his_grace/MouseEntered(location,control,params)
+/atom/movable/screen/alert/status_effect/his_grace/MouseEntered(location,control,params)
desc = initial(desc)
var/datum/status_effect/his_grace/HG = attached_effect
desc += "
Current Bloodthirst: [HG.bloodlust]\
@@ -54,7 +54,7 @@
/datum/status_effect/wish_granters_gift //Fully revives after ten seconds.
id = "wish_granters_gift"
duration = 50
- alert_type = /obj/screen/alert/status_effect/wish_granters_gift
+ alert_type = /atom/movable/screen/alert/status_effect/wish_granters_gift
/datum/status_effect/wish_granters_gift/on_apply()
to_chat(owner, "Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...")
@@ -66,7 +66,7 @@
owner.visible_message("[owner] appears to wake from the dead, having healed all wounds!", "You have regenerated.")
-/obj/screen/alert/status_effect/wish_granters_gift
+/atom/movable/screen/alert/status_effect/wish_granters_gift
name = "Wish Granter's Immortality"
desc = "You are being resurrected!"
icon_state = "wish_granter"
@@ -104,9 +104,9 @@
id = "blooddrunk"
duration = 10
tick_interval = 0
- alert_type = /obj/screen/alert/status_effect/blooddrunk
+ alert_type = /atom/movable/screen/alert/status_effect/blooddrunk
-/obj/screen/alert/status_effect/blooddrunk
+/atom/movable/screen/alert/status_effect/blooddrunk
name = "Blood-Drunk"
desc = "You are drunk on blood! Your pulse thunders in your ears! Nothing can harm you!" //not true, and the item description mentions its actual effect
icon_state = "blooddrunk"
@@ -177,7 +177,7 @@
/datum/status_effect/fleshmend
id = "fleshmend"
duration = 100
- alert_type = /obj/screen/alert/status_effect/fleshmend
+ alert_type = /atom/movable/screen/alert/status_effect/fleshmend
/datum/status_effect/fleshmend/tick()
if(owner.on_fire)
@@ -193,7 +193,7 @@
var/mob/living/carbon/C = owner
QDEL_LIST(C.all_scars)
-/obj/screen/alert/status_effect/fleshmend
+/atom/movable/screen/alert/status_effect/fleshmend
name = "Fleshmend"
desc = "Our wounds are rapidly healing. This effect is prevented if we are on fire."
icon_state = "fleshmend"
@@ -327,7 +327,7 @@
owner.set_confusion(max(0, owner.get_confusion() - 1))
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "goodmusic", /datum/mood_event/goodmusic)
-/obj/screen/alert/status_effect/regenerative_core
+/atom/movable/screen/alert/status_effect/regenerative_core
name = "Regenerative Core Tendrils"
desc = "You can move faster than your broken body could normally handle!"
icon_state = "regenerative_core"
@@ -336,7 +336,7 @@
id = "Regenerative Core"
duration = 1 MINUTES
status_type = STATUS_EFFECT_REPLACE
- alert_type = /obj/screen/alert/status_effect/regenerative_core
+ alert_type = /atom/movable/screen/alert/status_effect/regenerative_core
/datum/status_effect/regenerative_core/on_apply()
ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id)
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 34f0a5a55c9..12ed6d42eeb 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -115,7 +115,7 @@
//SLEEPING
/datum/status_effect/incapacitating/sleeping
id = "sleeping"
- alert_type = /obj/screen/alert/status_effect/asleep
+ alert_type = /atom/movable/screen/alert/status_effect/asleep
needs_update_stat = TRUE
tick_interval = 2 SECONDS
var/mob/living/carbon/carbon_owner
@@ -189,7 +189,7 @@
if(prob(10) && owner.health > owner.crit_threshold)
owner.emote("snore")
-/obj/screen/alert/status_effect/asleep
+/atom/movable/screen/alert/status_effect/asleep
name = "Asleep"
desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
icon_state = "asleep"
@@ -199,7 +199,7 @@
id = "stasis"
duration = -1
tick_interval = 10
- alert_type = /obj/screen/alert/status_effect/stasis
+ alert_type = /atom/movable/screen/alert/status_effect/stasis
var/last_dead_time
/datum/status_effect/grouped/stasis/proc/update_time_of_death()
@@ -243,7 +243,7 @@
update_time_of_death()
return ..()
-/obj/screen/alert/status_effect/stasis
+/atom/movable/screen/alert/status_effect/stasis
name = "Stasis"
desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
icon_state = "stasis"
@@ -254,7 +254,7 @@
/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
id = "strandling"
status_type = STATUS_EFFECT_UNIQUE
- alert_type = /obj/screen/alert/status_effect/strandling
+ alert_type = /atom/movable/screen/alert/status_effect/strandling
/datum/status_effect/strandling/on_apply()
ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
@@ -264,13 +264,13 @@
REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
return ..()
-/obj/screen/alert/status_effect/strandling
+/atom/movable/screen/alert/status_effect/strandling
name = "Choking strand"
desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
icon_state = "his_grace"
alerttooltipstyle = "hisgrace"
-/obj/screen/alert/status_effect/strandling/Click(location, control, params)
+/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
. = ..()
if(usr != owner)
return
@@ -305,9 +305,9 @@
id = "his_wrath"
duration = -1
tick_interval = 4
- alert_type = /obj/screen/alert/status_effect/his_wrath
+ alert_type = /atom/movable/screen/alert/status_effect/his_wrath
-/obj/screen/alert/status_effect/his_wrath
+/atom/movable/screen/alert/status_effect/his_wrath
name = "His Wrath"
desc = "You fled from His Grace instead of feeding Him, and now you suffer."
icon_state = "his_grace"
@@ -569,7 +569,7 @@
/datum/status_effect/necropolis_curse/proc/apply_curse(set_curse)
curse_flags |= set_curse
if(curse_flags & CURSE_BLINDING)
- owner.overlay_fullscreen("curse", /obj/screen/fullscreen/curse, 1)
+ owner.overlay_fullscreen("curse", /atom/movable/screen/fullscreen/curse, 1)
/datum/status_effect/necropolis_curse/proc/remove_curse(remove_curse)
if(remove_curse & CURSE_BLINDING)
@@ -647,9 +647,9 @@
tick_interval = 10
examine_text = "SUBJECTPRONOUN seems slow and unfocused."
var/stun = TRUE
- alert_type = /obj/screen/alert/status_effect/trance
+ alert_type = /atom/movable/screen/alert/status_effect/trance
-/obj/screen/alert/status_effect/trance
+/atom/movable/screen/alert/status_effect/trance
name = "Trance"
desc = "Everything feels so distant, and you can feel your thoughts forming loops inside your head..."
icon_state = "high"
@@ -754,7 +754,7 @@
id = "convulsing"
duration = 150
status_type = STATUS_EFFECT_REFRESH
- alert_type = /obj/screen/alert/status_effect/convulsing
+ alert_type = /atom/movable/screen/alert/status_effect/convulsing
/datum/status_effect/convulsing/on_creation(mob/living/zappy_boy)
. = ..()
@@ -768,7 +768,7 @@
H.visible_message("[H]'s hand convulses, and they drop their [I.name]!","Your hand convulses violently, and you drop what you were holding!")
H.jitteriness += 5
-/obj/screen/alert/status_effect/convulsing
+/atom/movable/screen/alert/status_effect/convulsing
name = "Shaky Hands"
desc = "You've been zapped with something and your hands can't stop shaking! You can't seem to hold on to anything."
icon_state = "convulsing"
@@ -777,7 +777,7 @@
id = "dna_melt"
duration = 600
status_type = STATUS_EFFECT_REPLACE
- alert_type = /obj/screen/alert/status_effect/dna_melt
+ alert_type = /atom/movable/screen/alert/status_effect/dna_melt
var/kill_either_way = FALSE //no amount of removing mutations is gonna save you now
/datum/status_effect/dna_melt/on_creation(mob/living/new_owner, set_duration)
@@ -791,7 +791,7 @@
var/mob/living/carbon/human/H = owner
H.something_horrible(kill_either_way)
-/obj/screen/alert/status_effect/dna_melt
+/atom/movable/screen/alert/status_effect/dna_melt
name = "Genetic Breakdown"
desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
icon_state = "dna_melt"
@@ -801,7 +801,7 @@
duration = 100
status_type = STATUS_EFFECT_REPLACE
tick_interval = 1
- alert_type = /obj/screen/alert/status_effect/go_away
+ alert_type = /atom/movable/screen/alert/status_effect/go_away
var/direction
/datum/status_effect/go_away/on_creation(mob/living/new_owner, set_duration)
@@ -814,7 +814,7 @@
var/turf/T = get_step(owner, direction)
owner.forceMove(T)
-/obj/screen/alert/status_effect/go_away
+/atom/movable/screen/alert/status_effect/go_away
name = "TO THE STARS AND BEYOND!"
desc = "I must go, my people need me!"
icon_state = "high"
diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm
index 8519fc99a03..eb706ce513b 100644
--- a/code/datums/status_effects/gas.dm
+++ b/code/datums/status_effects/gas.dm
@@ -2,11 +2,11 @@
id = "frozen"
duration = 100
status_type = STATUS_EFFECT_UNIQUE
- alert_type = /obj/screen/alert/status_effect/freon
+ alert_type = /atom/movable/screen/alert/status_effect/freon
var/icon/cube
var/can_melt = TRUE
-/obj/screen/alert/status_effect/freon
+/atom/movable/screen/alert/status_effect/freon
name = "Frozen Solid"
desc = "You're frozen inside an ice cube, and cannot move! You can still do stuff, like shooting. Resist out of the cube!"
icon_state = "frozen"
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 0115416b209..d911f000a31 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -39,7 +39,7 @@
get_kill()
. = ..()
-/obj/screen/alert/status_effect/in_love
+/atom/movable/screen/alert/status_effect/in_love
name = "In Love"
desc = "You feel so wonderfully in love!"
icon_state = "in_love"
@@ -48,7 +48,7 @@
id = "in_love"
duration = -1
status_type = STATUS_EFFECT_UNIQUE
- alert_type = /obj/screen/alert/status_effect/in_love
+ alert_type = /atom/movable/screen/alert/status_effect/in_love
var/mob/living/date
/datum/status_effect/in_love/on_creation(mob/living/new_owner, mob/living/love_interest)
@@ -116,9 +116,9 @@
duration = -1
tick_interval = -1
status_type = STATUS_EFFECT_MULTIPLE
- alert_type = /obj/screen/alert/status_effect/heldup
+ alert_type = /atom/movable/screen/alert/status_effect/heldup
-/obj/screen/alert/status_effect/heldup
+/atom/movable/screen/alert/status_effect/heldup
name = "Held Up"
desc = "Making any sudden moves would probably be a bad idea!"
icon_state = "aimed"
@@ -129,9 +129,9 @@
duration = -1
tick_interval = -1
status_type = STATUS_EFFECT_UNIQUE
- alert_type = /obj/screen/alert/status_effect/holdup
+ alert_type = /atom/movable/screen/alert/status_effect/holdup
-/obj/screen/alert/status_effect/holdup
+/atom/movable/screen/alert/status_effect/holdup
name = "Holding Up"
desc = "You're currently pointing a gun at someone."
icon_state = "aimed"
@@ -183,7 +183,7 @@
/// Hook up the specified carbon mob for possible high-fiving, give them the alert and signals and all
/datum/status_effect/high_fiving/proc/register_candidate(mob/living/carbon/possible_candidate)
- var/obj/screen/alert/highfive/G = possible_candidate.throw_alert("[owner]", /obj/screen/alert/highfive)
+ var/atom/movable/screen/alert/highfive/G = possible_candidate.throw_alert("[owner]", /atom/movable/screen/alert/highfive)
if(!G)
return
LAZYADD(possible_takers, possible_candidate)
diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
index 3130dd9a749..a6efdd097c1 100644
--- a/code/datums/status_effects/status_effect.dm
+++ b/code/datums/status_effects/status_effect.dm
@@ -10,8 +10,8 @@
var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another
var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
- var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
- var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
+ var/alert_type = /atom/movable/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
+ var/atom/movable/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists
/datum/status_effect/New(list/arguments)
on_creation(arglist(arguments))
@@ -28,7 +28,7 @@
duration = world.time + duration
tick_interval = world.time + tick_interval
if(alert_type)
- var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
+ var/atom/movable/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
A.attached_effect = src //so the alert can reference us, if it needs to
linked_alert = A //so we can reference the alert, if we need to
if(duration > 0 || initial(tick_interval) > 0) //don't process if we don't care
@@ -84,7 +84,7 @@
// ALERT HOOK //
////////////////
-/obj/screen/alert/status_effect
+/atom/movable/screen/alert/status_effect
name = "Curse of Mundanity"
desc = "You don't feel any different..."
var/datum/status_effect/attached_effect
diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm
index 1d9892764f1..5ea22249291 100644
--- a/code/datums/status_effects/wound_effects.dm
+++ b/code/datums/status_effects/wound_effects.dm
@@ -1,13 +1,13 @@
// The shattered remnants of your broken limbs fill you with determination!
-/obj/screen/alert/status_effect/determined
+/atom/movable/screen/alert/status_effect/determined
name = "Determined"
desc = "The serious wounds you've sustained have put your body into fight-or-flight mode! Now's the time to look for an exit!"
icon_state = "regenerative_core"
/datum/status_effect/determined
id = "determined"
- alert_type = /obj/screen/alert/status_effect/determined
+ alert_type = /atom/movable/screen/alert/status_effect/determined
/datum/status_effect/determined/on_apply()
. = ..()
@@ -21,7 +21,7 @@
id = "limp"
status_type = STATUS_EFFECT_REPLACE
tick_interval = 10
- alert_type = /obj/screen/alert/status_effect/limp
+ alert_type = /atom/movable/screen/alert/status_effect/limp
var/msg_stage = 0//so you dont get the most intense messages immediately
/// The left leg of the limping person
var/obj/item/bodypart/l_leg/left
@@ -48,7 +48,7 @@
/datum/status_effect/limp/on_remove()
UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB))
-/obj/screen/alert/status_effect/limp
+/atom/movable/screen/alert/status_effect/limp
name = "Limping"
desc = "One or more of your legs has been wounded, slowing down steps with that leg! Get it fixed, or at least splinted!"
@@ -102,11 +102,11 @@
/////////////////////////
// wound alert
-/obj/screen/alert/status_effect/wound
+/atom/movable/screen/alert/status_effect/wound
name = "Wounded"
desc = "Your body has sustained serious damage, click here to inspect yourself."
-/obj/screen/alert/status_effect/wound/Click()
+/atom/movable/screen/alert/status_effect/wound/Click()
var/mob/living/carbon/C = usr
C.check_self_for_injuries()
diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm
index 8f9d9fa4f47..cc76a5119e5 100644
--- a/code/datums/wounds/_wounds.dm
+++ b/code/datums/wounds/_wounds.dm
@@ -137,7 +137,7 @@
linked_status_effect = victim.apply_status_effect(status_effect_type, src)
SEND_SIGNAL(victim, COMSIG_CARBON_GAIN_WOUND, src, limb)
if(!victim.alerts["wound"]) // only one alert is shared between all of the wounds
- victim.throw_alert("wound", /obj/screen/alert/status_effect/wound)
+ victim.throw_alert("wound", /atom/movable/screen/alert/status_effect/wound)
var/demoted
if(old_wound)
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 5f4784ac819..5cdad8b7178 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -465,7 +465,7 @@
/obj/machinery/camera/get_remote_view_fullscreens(mob/user)
if(view_range == short_range) //unfocused
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
/obj/machinery/camera/update_remote_sight(mob/living/user)
user.see_invisible = SEE_INVISIBLE_LIVING //can't see ghosts through cameras
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index da14dcbff6f..718beceee39 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -16,10 +16,10 @@
// Stuff needed to render the map
var/map_name
- var/obj/screen/map_view/cam_screen
+ var/atom/movable/screen/map_view/cam_screen
/// All the plane masters that need to be applied.
var/list/cam_plane_masters
- var/obj/screen/background/cam_background
+ var/atom/movable/screen/background/cam_background
interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_SET_MACHINE | INTERACT_MACHINE_REQUIRES_SIGHT
@@ -40,8 +40,8 @@
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
- for(var/plane in subtypesof(/obj/screen/plane_master))
- var/obj/screen/instance = new plane()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/instance = new plane()
instance.assigned_map = map_name
instance.del_on_map_removal = FALSE
instance.screen_loc = "[map_name]:CENTER"
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 8d4c6ede790..d47a0fb9d5c 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -297,7 +297,7 @@
if(final)
playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
remote_eye.setLoc(get_turf(final))
- C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
else
playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE)
diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 0abc1c3ffac..3ebf1161499 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -103,7 +103,7 @@
M.set_buckled(src)
M.setDir(dir)
buckled_mobs |= M
- M.throw_alert("buckled", /obj/screen/alert/restrained/buckled)
+ M.throw_alert("buckled", /atom/movable/screen/alert/restrained/buckled)
M.set_glide_size(glide_size)
post_buckle_mob(M)
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 36c2fce3940..213a3e04e69 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -107,8 +107,8 @@
. = ..()
if(ismob(loc))
var/mob/M = loc
- if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
/obj/item/defibrillator/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index c2d5aeb1254..0cc4e3e34dd 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -103,7 +103,7 @@
/obj/item/multitool/ai_detect/proc/show_hud(mob/user)
if(user && hud_type)
- var/obj/screen/plane_master/camera_static/PM = user.hud_used.plane_masters["[CAMERA_STATIC_PLANE]"]
+ var/atom/movable/screen/plane_master/camera_static/PM = user.hud_used.plane_masters["[CAMERA_STATIC_PLANE]"]
PM.alpha = 150
var/datum/atom_hud/H = GLOB.huds[hud_type]
if(!H.hudusers[user])
@@ -113,7 +113,7 @@
/obj/item/multitool/ai_detect/proc/remove_hud(mob/user)
if(user && hud_type)
- var/obj/screen/plane_master/camera_static/PM = user.hud_used.plane_masters["[CAMERA_STATIC_PLANE]"]
+ var/atom/movable/screen/plane_master/camera_static/PM = user.hud_used.plane_masters["[CAMERA_STATIC_PLANE]"]
PM.alpha = 255
var/datum/atom_hud/H = GLOB.huds[hud_type]
H.remove_hud_from(user)
diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
index 7b78b1c092c..3f538623473 100644
--- a/code/game/objects/items/devices/portable_chem_mixer.dm
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -133,8 +133,8 @@
. = ..()
if(ismob(loc))
var/mob/M = loc
- if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(!M.incapacitated() && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm
index e2641f3c793..88230c397c7 100644
--- a/code/game/objects/items/devices/spyglasses.dm
+++ b/code/game/objects/items/devices/spyglasses.dm
@@ -48,7 +48,7 @@
desc = "An advanced piece of espionage equipment in the shape of a pocket protector. It has a built in 360 degree camera for all your \"admirable\" needs. Microphone not included."
var/obj/item/clothing/glasses/sunglasses/spy/linked_glasses
- var/obj/screen/map_view/cam_screen
+ var/atom/movable/screen/map_view/cam_screen
var/list/cam_plane_masters
// Ranges higher than one can be used to see through walls.
var/cam_range = 1
@@ -69,8 +69,8 @@
// NOT apply to map popups. If there's ever a way to make planesmasters
// omnipresent, then this wouldn't be needed.
cam_plane_masters = list()
- for(var/plane in subtypesof(/obj/screen/plane_master))
- var/obj/screen/instance = new plane()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/instance = new plane()
instance.assigned_map = "spypopup_map"
instance.del_on_map_removal = FALSE
instance.screen_loc = "spypopup_map:CENTER"
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 5b8ac9ed9eb..aca43256254 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -84,8 +84,8 @@
/obj/item/watertank/MouseDrop(obj/over_object)
var/mob/M = loc
- if(istype(M) && istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(istype(M) && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
return ..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index ea3638dc0d8..38cd53f0b3c 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -778,8 +778,8 @@
M.put_in_hands(src)
to_chat(usr, "You pick up the deck.")
- else if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ else if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
to_chat(usr, "You pick up the deck.")
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index b1e98427a4f..bd66565d212 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -303,7 +303,7 @@
return
/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user)
- if(!istype(O) || O.anchored || istype(O, /obj/screen))
+ if(!istype(O) || O.anchored || istype(O, /atom/movable/screen))
return
if(!istype(user) || user.incapacitated() || user.body_position == LYING_DOWN)
return
@@ -479,7 +479,7 @@
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
/obj/structure/closet/emp_act(severity)
. = ..()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 26f4c03efb9..021fe3a1c22 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
/obj/structure/bodycontainer/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
/*
* Morgue
*/
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index b0c4de8b254..7ef620a88ba 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -61,7 +61,7 @@
message_admins("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]")
log_game("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]")
update_gland_hud()
- var/obj/screen/alert/mind_control/mind_alert = owner.throw_alert("mind_control", /obj/screen/alert/mind_control)
+ var/atom/movable/screen/alert/mind_control/mind_alert = owner.throw_alert("mind_control", /atom/movable/screen/alert/mind_control)
mind_alert.command = command
addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration)
return TRUE
diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
index 94faf7ced2c..9a8cb1d1991 100644
--- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
@@ -44,7 +44,7 @@
message_admins("[key_name(user)] broadcasted an abductor mind control message from [key_name(owner)] to [key_name(H)]: [command]")
log_game("[key_name(user)] broadcasted an abductor mind control message from [key_name(owner)] to [key_name(H)]: [command]")
- var/obj/screen/alert/mind_control/mind_alert = H.throw_alert("mind_control", /obj/screen/alert/mind_control)
+ var/atom/movable/screen/alert/mind_control/mind_alert = H.throw_alert("mind_control", /atom/movable/screen/alert/mind_control)
mind_alert.command = command
if(LAZYLEN(broadcasted_mobs))
diff --git a/code/modules/antagonists/abductor/equipment/glands/quantum.dm b/code/modules/antagonists/abductor/equipment/glands/quantum.dm
index a15fe1d0471..5f49d17b9a9 100644
--- a/code/modules/antagonists/abductor/equipment/glands/quantum.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/quantum.dm
@@ -35,7 +35,7 @@
if(entangled_mob && ishuman(entangled_mob) && (entangled_mob.stat < DEAD))
to_chat(entangled_mob, "You suddenly feel an irresistible compulsion to follow an order...")
to_chat(entangled_mob, "[command]")
- var/obj/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /obj/screen/alert/mind_control)
+ var/atom/movable/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /atom/movable/screen/alert/mind_control)
mind_alert.command = command
message_admins("[key_name(owner)] mirrored an abductor mind control message to [key_name(entangled_mob)]: [command]")
log_game("[key_name(owner)] mirrored an abductor mind control message to [key_name(entangled_mob)]: [command]")
diff --git a/code/modules/antagonists/blob/structures/factory.dm b/code/modules/antagonists/blob/structures/factory.dm
index 756d1b03fab..138a359e72e 100644
--- a/code/modules/antagonists/blob/structures/factory.dm
+++ b/code/modules/antagonists/blob/structures/factory.dm
@@ -26,7 +26,7 @@
if(naut)
naut.factory = null
to_chat(naut, "Your factory was destroyed! You feel yourself dying!")
- naut.throw_alert("nofactory", /obj/screen/alert/nofactory)
+ naut.throw_alert("nofactory", /atom/movable/screen/alert/nofactory)
spores = null
return ..()
diff --git a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
index 07ec2b3ade9..5980993958b 100644
--- a/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
+++ b/code/modules/antagonists/changeling/powers/pheromone_receptors.dm
@@ -28,7 +28,7 @@
//Modified IA pinpointer - Points to the NEAREST changeling, but will only get you within a few tiles of the target.
//You'll still have to rely on intuition and observation to make the identification. Lings can 'hide' in public places.
/datum/status_effect/agent_pinpointer/changeling
- alert_type = /obj/screen/alert/status_effect/agent_pinpointer/changeling
+ alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer/changeling
minimum_range = CHANGELING_PHEROMONE_MIN_DISTANCE
tick_interval = CHANGELING_PHEROMONE_PING_TIME
range_fuzz_factor = 0
@@ -53,6 +53,6 @@
scan_target = null
-/obj/screen/alert/status_effect/agent_pinpointer/changeling
+/atom/movable/screen/alert/status_effect/agent_pinpointer/changeling
name = "Pheromone Scent"
desc = "The nose always knows."
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 0b030b5e9fb..28a0f1636b4 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -112,7 +112,7 @@
communion.Grant(current)
if(ishuman(current))
magic.Grant(current)
- current.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
+ current.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
if(cult_team.cult_risen)
cult_team.rise(current)
if(cult_team.cult_ascendent)
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index d20a8480fe5..20809041f57 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -208,7 +208,7 @@
add_antag_hud(antag_hud_type, antag_hud_name, M)
if(M.hud_used)
var/datum/hud/H = M.hud_used
- var/obj/screen/wanted/giving_wanted_lvl = new /obj/screen/wanted()
+ var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted()
H.wanted_lvl = giving_wanted_lvl
giving_wanted_lvl.hud = H
H.infodisplay += giving_wanted_lvl
diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm
index c60a5a0ffac..8dac215a5b9 100644
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -98,7 +98,7 @@
add_antag_hud(antag_hud_type, antag_hud_name, M)
if(M.hud_used)
var/datum/hud/H = M.hud_used
- var/obj/screen/wanted/giving_wanted_lvl = new /obj/screen/wanted()
+ var/atom/movable/screen/wanted/giving_wanted_lvl = new /atom/movable/screen/wanted()
H.wanted_lvl = giving_wanted_lvl
giving_wanted_lvl.hud = H
H.infodisplay += giving_wanted_lvl
diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm
index ac275aebc4c..e3bb1402e5f 100644
--- a/code/modules/antagonists/morph/morph.dm
+++ b/code/modules/antagonists/morph/morph.dm
@@ -36,7 +36,7 @@
var/eat_while_disguised = FALSE
var/atom/movable/form = null
var/static/list/blacklist_typecache = typecacheof(list(
- /obj/screen,
+ /atom/movable/screen,
/obj/singularity,
/mob/living/simple_animal/hostile/morph,
/obj/effect))
diff --git a/code/modules/antagonists/traitor/IAA/internal_affairs.dm b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
index 48330e6de07..ac3a8c5921d 100644
--- a/code/modules/antagonists/traitor/IAA/internal_affairs.dm
+++ b/code/modules/antagonists/traitor/IAA/internal_affairs.dm
@@ -52,14 +52,14 @@
id = "agent_pinpointer"
duration = -1
tick_interval = PINPOINTER_PING_TIME
- alert_type = /obj/screen/alert/status_effect/agent_pinpointer
+ alert_type = /atom/movable/screen/alert/status_effect/agent_pinpointer
var/minimum_range = PINPOINTER_MINIMUM_RANGE
var/range_fuzz_factor = PINPOINTER_EXTRA_RANDOM_RANGE
var/mob/scan_target = null
var/range_mid = 8
var/range_far = 16
-/obj/screen/alert/status_effect/agent_pinpointer
+/atom/movable/screen/alert/status_effect/agent_pinpointer
name = "Internal Affairs Integrated Pinpointer"
desc = "Even stealthier than a normal implant."
icon = 'icons/obj/device.dmi'
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 97bf0d851ab..397b8b085e2 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -280,7 +280,7 @@
var/datum/action/innate/seek_master/SM = new()
SM.Grant(newstruct)
newstruct.key = target.key
- var/obj/screen/alert/bloodsense/BS
+ var/atom/movable/screen/alert/bloodsense/BS
if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker?.mode)
SSticker.mode.add_cultist(newstruct.mind, 0)
if(iscultist(stoner) || cultoverride)
@@ -288,7 +288,7 @@
else if(stoner)
to_chat(newstruct, "You are still bound to serve your creator, [stoner], follow [stoner.p_their()] orders and help [stoner.p_them()] complete [stoner.p_their()] goals at all costs.")
newstruct.clear_alert("bloodsense")
- BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
+ BS = newstruct.throw_alert("bloodsense", /atom/movable/screen/alert/bloodsense)
if(BS)
BS.Cviewer = newstruct
newstruct.cancel_camera()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index af6ced8710d..f36067155fc 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -492,7 +492,7 @@ GLOBAL_VAR_INIT(cryo_overlay_cover_off, mutable_appearance('icons/obj/cryogenics
return // we don't see the pipe network while inside cryo.
/obj/machinery/atmospherics/components/unary/cryo_cell/get_remote_view_fullscreens(mob/user)
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
/obj/machinery/atmospherics/components/unary/cryo_cell/can_crawl_through()
return // can't ventcrawl in or out of cryo.
diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm
index 735c2a4c045..e0703201a13 100644
--- a/code/modules/buildmode/buildmode.dm
+++ b/code/modules/buildmode/buildmode.dm
@@ -17,10 +17,10 @@
var/switch_state = BM_SWITCHSTATE_NONE
var/switch_width = 5
// modeswitch UI
- var/obj/screen/buildmode/mode/modebutton
+ var/atom/movable/screen/buildmode/mode/modebutton
var/list/modeswitch_buttons = list()
// dirswitch UI
- var/obj/screen/buildmode/bdir/dirbutton
+ var/atom/movable/screen/buildmode/bdir/dirbutton
var/list/dirswitch_buttons = list()
/datum/buildmode/New(client/c)
@@ -63,16 +63,16 @@
/datum/buildmode/proc/create_buttons()
// keep a reference so we can update it upon mode switch
- modebutton = new /obj/screen/buildmode/mode(src)
+ modebutton = new /atom/movable/screen/buildmode/mode(src)
buttons += modebutton
- buttons += new /obj/screen/buildmode/help(src)
+ buttons += new /atom/movable/screen/buildmode/help(src)
// keep a reference so we can update it upon dir switch
- dirbutton = new /obj/screen/buildmode/bdir(src)
+ dirbutton = new /atom/movable/screen/buildmode/bdir(src)
buttons += dirbutton
- buttons += new /obj/screen/buildmode/quit(src)
+ buttons += new /atom/movable/screen/buildmode/quit(src)
// build the lists of switching buttons
- build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /obj/screen/buildmode/modeswitch)
- build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /obj/screen/buildmode/dirswitch)
+ build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /atom/movable/screen/buildmode/modeswitch)
+ build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /atom/movable/screen/buildmode/dirswitch)
// this creates a nice offset grid for choosing between buildmode options,
// because going "click click click ah hell" sucks.
@@ -81,7 +81,7 @@
for(var/thing in elements)
var/x = pos_idx % switch_width
var/y = FLOOR(pos_idx / switch_width, 1)
- var/obj/screen/buildmode/B = new buttontype(src, thing)
+ var/atom/movable/screen/buildmode/B = new buttontype(src, thing)
// extra .5 for a nice offset look
B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]"
buttonslist += B
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 6901a0e42e0..5c5c0000d1b 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -1,23 +1,23 @@
-/obj/screen/buildmode
+/atom/movable/screen/buildmode
icon = 'icons/misc/buildmode.dmi'
var/datum/buildmode/bd
// If we don't do this, we get occluded by item action buttons
layer = ABOVE_HUD_LAYER
-/obj/screen/buildmode/New(bld)
+/atom/movable/screen/buildmode/New(bld)
bd = bld
return ..()
-/obj/screen/buildmode/Destroy()
+/atom/movable/screen/buildmode/Destroy()
bd = null
return ..()
-/obj/screen/buildmode/mode
+/atom/movable/screen/buildmode/mode
name = "Toggle Mode"
icon_state = "buildmode_basic"
screen_loc = "NORTH,WEST"
-/obj/screen/buildmode/mode/Click(location, control, params)
+/atom/movable/screen/buildmode/mode/Click(location, control, params)
var/list/pa = params2list(params)
if(pa.Find("left"))
@@ -27,63 +27,63 @@
update_icon()
return 1
-/obj/screen/buildmode/mode/update_icon_state()
+/atom/movable/screen/buildmode/mode/update_icon_state()
icon_state = bd.mode.get_button_iconstate()
-/obj/screen/buildmode/help
+/atom/movable/screen/buildmode/help
icon_state = "buildhelp"
screen_loc = "NORTH,WEST+1"
name = "Buildmode Help"
-/obj/screen/buildmode/help/Click(location, control, params)
+/atom/movable/screen/buildmode/help/Click(location, control, params)
bd.mode.show_help(usr.client)
return 1
-/obj/screen/buildmode/bdir
+/atom/movable/screen/buildmode/bdir
icon_state = "build"
screen_loc = "NORTH,WEST+2"
name = "Change Dir"
-/obj/screen/buildmode/bdir/update_icon_state()
+/atom/movable/screen/buildmode/bdir/update_icon_state()
dir = bd.build_dir
-/obj/screen/buildmode/bdir/Click()
+/atom/movable/screen/buildmode/bdir/Click()
bd.toggle_dirswitch()
update_icon()
return 1
// used to switch between modes
-/obj/screen/buildmode/modeswitch
+/atom/movable/screen/buildmode/modeswitch
var/datum/buildmode_mode/modetype
-/obj/screen/buildmode/modeswitch/New(bld, mt)
+/atom/movable/screen/buildmode/modeswitch/New(bld, mt)
modetype = mt
icon_state = "buildmode_[initial(modetype.key)]"
name = initial(modetype.key)
return ..(bld)
-/obj/screen/buildmode/modeswitch/Click()
+/atom/movable/screen/buildmode/modeswitch/Click()
bd.change_mode(modetype)
return 1
// used to switch between dirs
-/obj/screen/buildmode/dirswitch
+/atom/movable/screen/buildmode/dirswitch
icon_state = "build"
-/obj/screen/buildmode/dirswitch/New(bld, dir)
+/atom/movable/screen/buildmode/dirswitch/New(bld, dir)
src.dir = dir
name = dir2text(dir)
return ..(bld)
-/obj/screen/buildmode/dirswitch/Click()
+/atom/movable/screen/buildmode/dirswitch/Click()
bd.change_dir(dir)
return 1
-/obj/screen/buildmode/quit
+/atom/movable/screen/buildmode/quit
icon_state = "buildquit"
screen_loc = "NORTH,WEST+3"
name = "Quit Buildmode"
-/obj/screen/buildmode/quit/Click()
+/atom/movable/screen/buildmode/quit/Click()
bd.quit()
return 1
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index 3f894606d7e..43fb70694e5 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -51,9 +51,9 @@
var/obj/structure/closet/supplypod/centcompod/temp_pod //The temporary pod that is modified by this datum, then cloned. The buildObject() clone of this pod is what is launched
// Stuff needed to render the map
var/map_name
- var/obj/screen/map_view/cam_screen
+ var/atom/movable/screen/map_view/cam_screen
var/list/cam_plane_masters
- var/obj/screen/background/cam_background
+ var/atom/movable/screen/background/cam_background
var/tabIndex = 1
var/renderLighting = FALSE
@@ -92,8 +92,8 @@
cam_screen.del_on_map_removal = TRUE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
- for(var/plane in subtypesof(/obj/screen/plane_master))
- var/obj/screen/instance = new plane()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/instance = new plane()
if (!renderLighting && instance.plane == LIGHTING_PLANE)
instance.alpha = 100
instance.assigned_map = map_name
@@ -148,7 +148,7 @@
data["damageChoice"] = damageChoice //Damage that occurs to any mob under the pod when it lands. Can be no damage (0), custom damage (1), or gib+5000dmg (2)
data["delays"] = temp_pod.delays
data["rev_delays"] = temp_pod.reverse_delays
- data["custom_rev_delay"] = temp_pod.custom_rev_delay
+ data["custom_rev_delay"] = temp_pod.custom_rev_delay
data["styleChoice"] = temp_pod.style //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
data["effectShrapnel"] = temp_pod.effectShrapnel //If true, creates a cloud of shrapnel of a decided type and magnitude on landing
data["shrapnelType"] = "[temp_pod.shrapnel_type]" //Path2String
@@ -581,7 +581,7 @@
var/left_click = pa.Find("left")
if (launcherActivated)
//Clicking on UI elements shouldn't launch a pod
- if(istype(target,/obj/screen))
+ if(istype(target,/atom/movable/screen))
return FALSE
. = TRUE
@@ -616,7 +616,7 @@
sleep(rand()*2) //looks cooler than them all appearing at once. Gives the impression of burst fire.
else if (picking_dropoff_turf)
//Clicking on UI elements shouldn't pick a dropoff turf
- if(istype(target,/obj/screen))
+ if(istype(target,/atom/movable/screen))
return FALSE
. = TRUE
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 4b3de98c4b7..becec13f370 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -72,7 +72,7 @@
preload_rsc = PRELOAD_RSC
- var/obj/screen/click_catcher/void
+ var/atom/movable/screen/click_catcher/void
///used to make a special mouse cursor, this one for mouse up icon
var/mouse_up_icon = null
@@ -109,7 +109,7 @@
///these persist between logins/logouts during the same round.
var/datum/player_details/player_details
- ///Should only be a key-value list of north/south/east/west = obj/screen.
+ ///Should only be a key-value list of north/south/east/west = atom/movable/screen.
var/list/char_render_holders
///Amount of keydowns in the last keysend checking interval
@@ -177,7 +177,7 @@
* Assoc list with all the active maps - when a screen obj is added to
* a map, it's put in here as well.
*
- * Format: list( = list(/obj/screen))
+ * Format: list( = list(/atom/movable/screen))
*/
var/list/screen_maps = list()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 3a8654bcdbc..d05df2c80ba 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -981,7 +981,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/pos = 0
for(var/D in GLOB.cardinals)
pos++
- var/obj/screen/O = LAZYACCESS(char_render_holders, "[D]")
+ var/atom/movable/screen/O = LAZYACCESS(char_render_holders, "[D]")
if(!O)
O = new
LAZYSET(char_render_holders, "[D]", O)
@@ -992,7 +992,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
/client/proc/clear_character_previews()
for(var/index in char_render_holders)
- var/obj/screen/S = char_render_holders[index]
+ var/atom/movable/screen/S = char_render_holders[index]
screen -= S
qdel(S)
char_render_holders = null
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 8461184702a..d9df67a58ce 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1796,7 +1796,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if("ambientocclusion")
ambientocclusion = !ambientocclusion
if(parent?.screen && parent.screen.len)
- var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
+ var/atom/movable/screen/plane_master/game_world/PM = locate(/atom/movable/screen/plane_master/game_world) in parent.screen
PM.backdrop(parent.mob)
if("auto_fit_viewport")
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 318c9ac00c5..43fb3b25631 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -72,8 +72,8 @@
if(ismecha(M.loc)) // stops inventory actions in a mech
return
- if(!M.incapacitated() && loc == M && istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(!M.incapacitated() && loc == M && istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
if(M.putItemFromInventoryInHandIfPossible(src, H.held_index))
add_fingerprint(usr)
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 18a89225e82..98f4be11299 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -20,7 +20,7 @@
///How long it takes to lace/unlace these shoes
var/lace_time = 5 SECONDS
///any alerts we have active
- var/obj/screen/alert/our_alert
+ var/atom/movable/screen/alert/our_alert
/obj/item/clothing/shoes/suicide_act(mob/living/carbon/user)
if(rand(2)>1)
@@ -69,7 +69,7 @@
user.update_inv_shoes()
equipped_before_drop = TRUE
if(can_be_tied && tied == SHOES_UNTIED)
- our_alert = user.throw_alert("shoealert", /obj/screen/alert/shoes/untied)
+ our_alert = user.throw_alert("shoealert", /atom/movable/screen/alert/shoes/untied)
RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE)
/obj/item/clothing/shoes/proc/restore_offsets(mob/user)
@@ -118,7 +118,7 @@
UnregisterSignal(src, COMSIG_SHOES_STEP_ACTION)
else
if(tied == SHOES_UNTIED && our_guy && user == our_guy)
- our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/untied) // if we're the ones unknotting our own laces, of course we know they're untied
+ our_alert = our_guy.throw_alert("shoealert", /atom/movable/screen/alert/shoes/untied) // if we're the ones unknotting our own laces, of course we know they're untied
RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE)
/**
@@ -201,7 +201,7 @@
our_guy.Knockdown(10)
our_guy.visible_message("[our_guy] trips on [our_guy.p_their()] knotted shoelaces and falls! What a klutz!", "You trip on your knotted shoelaces and fall over!")
SEND_SIGNAL(our_guy, COMSIG_ADD_MOOD_EVENT, "trip", /datum/mood_event/tripped) // well we realized they're knotted now!
- our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/knotted)
+ our_alert = our_guy.throw_alert("shoealert", /atom/movable/screen/alert/shoes/knotted)
else if(tied == SHOES_UNTIED)
var/wiser = TRUE // did we stumble and realize our laces are undone?
@@ -233,7 +233,7 @@
wiser = FALSE
if(wiser)
SEND_SIGNAL(our_guy, COMSIG_ADD_MOOD_EVENT, "untied", /datum/mood_event/untied) // well we realized they're untied now!
- our_alert = our_guy.throw_alert("shoealert", /obj/screen/alert/shoes/untied)
+ our_alert = our_guy.throw_alert("shoealert", /atom/movable/screen/alert/shoes/untied)
/obj/item/clothing/shoes/attack_hand(mob/living/carbon/human/user)
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 00e71fc0d6a..0f197adc659 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -251,7 +251,7 @@
var/mob/holder
var/phase_time = 0
var/phase_time_length = 3
- var/obj/screen/chronos_target/target_ui
+ var/atom/movable/screen/chronos_target/target_ui
var/obj/item/clothing/suit/space/chronos/chronosuit
/obj/effect/chronos_cam/singularity_act()
@@ -311,13 +311,13 @@
holder.unset_machine()
return ..()
-/obj/screen/chronos_target
+/atom/movable/screen/chronos_target
name = "target display"
screen_loc = "CENTER,CENTER"
color = list(1,0,0,0, 0,1,0,0.8, 0,0,1,0.933, 0,0,0,0, 0,0,0,0)
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE
-/obj/screen/chronos_target/Initialize(mapload, mob/living/carbon/human/user)
+/atom/movable/screen/chronos_target/Initialize(mapload, mob/living/carbon/human/user)
if(user)
vis_contents += user
else
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 2ce498c4164..9169f8b05e3 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -941,46 +941,46 @@ GLOBAL_LIST_INIT(hallucination_list, list(
feedback_details += "Type: [alert_type]"
switch(alert_type)
if("not_enough_oxy")
- target.throw_alert(alert_type, /obj/screen/alert/not_enough_oxy, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_oxy, override = TRUE)
if("not_enough_tox")
- target.throw_alert(alert_type, /obj/screen/alert/not_enough_tox, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_tox, override = TRUE)
if("not_enough_co2")
- target.throw_alert(alert_type, /obj/screen/alert/not_enough_co2, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/not_enough_co2, override = TRUE)
if("too_much_oxy")
- target.throw_alert(alert_type, /obj/screen/alert/too_much_oxy, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_oxy, override = TRUE)
if("too_much_co2")
- target.throw_alert(alert_type, /obj/screen/alert/too_much_co2, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_co2, override = TRUE)
if("too_much_tox")
- target.throw_alert(alert_type, /obj/screen/alert/too_much_tox, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/too_much_tox, override = TRUE)
if("nutrition")
if(prob(50))
- target.throw_alert(alert_type, /obj/screen/alert/fat, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/fat, override = TRUE)
else
- target.throw_alert(alert_type, /obj/screen/alert/starving, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/starving, override = TRUE)
if("gravity")
- target.throw_alert(alert_type, /obj/screen/alert/weightless, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/weightless, override = TRUE)
if("fire")
- target.throw_alert(alert_type, /obj/screen/alert/fire, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/fire, override = TRUE)
if("temphot")
alert_type = "temp"
- target.throw_alert(alert_type, /obj/screen/alert/hot, 3, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/hot, 3, override = TRUE)
if("tempcold")
alert_type = "temp"
- target.throw_alert(alert_type, /obj/screen/alert/cold, 3, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/cold, 3, override = TRUE)
if("pressure")
if(prob(50))
- target.throw_alert(alert_type, /obj/screen/alert/highpressure, 2, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/highpressure, 2, override = TRUE)
else
- target.throw_alert(alert_type, /obj/screen/alert/lowpressure, 2, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/lowpressure, 2, override = TRUE)
//BEEP BOOP I AM A ROBOT
if("newlaw")
- target.throw_alert(alert_type, /obj/screen/alert/newlaw, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/newlaw, override = TRUE)
if("locked")
- target.throw_alert(alert_type, /obj/screen/alert/locked, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/locked, override = TRUE)
if("hacked")
- target.throw_alert(alert_type, /obj/screen/alert/hacked, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/hacked, override = TRUE)
if("charge")
- target.throw_alert(alert_type, /obj/screen/alert/emptycell, override = TRUE)
+ target.throw_alert(alert_type, /atom/movable/screen/alert/emptycell, override = TRUE)
sleep(duration)
target.clear_alert(alert_type, clear_override = TRUE)
qdel(src)
@@ -1189,7 +1189,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if(target.client)
target.client.images += fire_overlay
to_chat(target, "You're set on fire!")
- target.throw_alert("fire", /obj/screen/alert/fire, override = TRUE)
+ target.throw_alert("fire", /atom/movable/screen/alert/fire, override = TRUE)
sleep(20)
for(var/i in 1 to 3)
if(target.fire_stacks <= 0)
@@ -1211,7 +1211,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
target.clear_alert("temp", clear_override = TRUE)
else
target.clear_alert("temp", clear_override = TRUE)
- target.throw_alert("temp", /obj/screen/alert/hot, stage, override = TRUE)
+ target.throw_alert("temp", /atom/movable/screen/alert/hot, stage, override = TRUE)
/datum/hallucination/fire/proc/clear_fire()
if(!active)
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 1dca1c7d993..d0f6244b5af 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -82,7 +82,7 @@ INITIALIZE_IMMEDIATE(/mob/dead)
var/client/C = client
to_chat(C, "Sending you to [pick].")
- new /obj/screen/splash(C)
+ new /atom/movable/screen/splash(C)
notransform = TRUE
sleep(29) //let the animation play
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 66f16e01589..fd9eba3efda 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -19,7 +19,7 @@
/mob/dead/new_player/Initialize()
if(client && SSticker.state == GAME_STATE_STARTUP)
- var/obj/screen/splash/S = new(client, TRUE, TRUE)
+ var/atom/movable/screen/splash/S = new(client, TRUE, TRUE)
S.Fade(TRUE)
if(length(GLOB.newplayer_start))
@@ -325,7 +325,7 @@
if(job && !job.override_latejoin_spawn(character))
SSjob.SendToLateJoin(character)
if(!arrivals_docked)
- var/obj/screen/splash/Spl = new(character.client, TRUE)
+ var/atom/movable/screen/splash/Spl = new(character.client, TRUE)
Spl.Fade(TRUE)
character.playsound_local(get_turf(character), 'sound/voice/ApproachingTG.ogg', 25)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f64a88f5940..ca0bf906777 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -392,7 +392,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(message)
to_chat(src, "[message]")
if(source)
- var/obj/screen/alert/A = throw_alert("[REF(source)]_notify_cloning", /obj/screen/alert/notify_cloning)
+ var/atom/movable/screen/alert/A = throw_alert("[REF(source)]_notify_cloning", /atom/movable/screen/alert/notify_cloning)
if(A)
if(client && client.prefs && client.prefs.UI_style)
A.icon = ui_style2icon(client.prefs.UI_style)
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index b76ff32e8a6..36642bd0c26 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -54,7 +54,7 @@
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
//Body temperature is too hot.
- throw_alert("alien_fire", /obj/screen/alert/alien_fire)
+ throw_alert("alien_fire", /atom/movable/screen/alert/alien_fire)
switch(bodytemperature)
if(360 to 400)
apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index 6490484b7e0..6c004bbc074 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -4,7 +4,7 @@
maxHealth = 125
health = 125
icon_state = "alienh"
- var/obj/screen/leap_icon = null
+ var/atom/movable/screen/leap_icon = null
/mob/living/carbon/alien/humanoid/hunter/create_internal_organs()
internal_organs += new /obj/item/organ/alien/plasmavessel/small
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index fec41173585..0dc31d8b5e1 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -22,7 +22,7 @@
if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
adjustPlasma(breath_gases[/datum/gas/plasma][MOLES]*250)
- throw_alert("alien_tox", /obj/screen/alert/alien_tox)
+ throw_alert("alien_tox", /atom/movable/screen/alert/alien_tox)
toxins_used = breath_gases[/datum/gas/plasma][MOLES]
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 3e9becdddb6..54f76d343cb 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -137,7 +137,7 @@
owner.stuttering += 30
recent_queen_death = TRUE
- owner.throw_alert("alien_noqueen", /obj/screen/alert/alien_vulnerable)
+ owner.throw_alert("alien_noqueen", /atom/movable/screen/alert/alien_vulnerable)
addtimer(CALLBACK(src, .proc/clear_queen_death), QUEEN_DEATH_DEBUFF_DURATION)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c81091fa626..da1fa1469b6 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -34,7 +34,7 @@
var/oindex = active_hand_index
active_hand_index = held_index
if(hud_used)
- var/obj/screen/inventory/hand/H
+ var/atom/movable/screen/inventory/hand/H
H = hud_used.hand_slots["[oindex]"]
if(H)
H.update_icon()
@@ -133,7 +133,7 @@
throw_mode_off()
if(!target || !isturf(loc))
return
- if(istype(target, /obj/screen))
+ if(istype(target, /atom/movable/screen))
return
var/atom/movable/thrown_thing
@@ -643,7 +643,7 @@
become_blind(EYES_COVERED)
else if(tinttotal >= TINT_DARKENED)
cure_blind(EYES_COVERED)
- overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
+ overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, 2)
else
cure_blind(EYES_COVERED)
clear_fullscreen("tint", 0)
@@ -718,10 +718,10 @@
visionseverity = 9
if(-INFINITY to -24)
visionseverity = 10
- overlay_fullscreen("critvision", /obj/screen/fullscreen/crit/vision, visionseverity)
+ overlay_fullscreen("critvision", /atom/movable/screen/fullscreen/crit/vision, visionseverity)
else
clear_fullscreen("critvision")
- overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
+ overlay_fullscreen("crit", /atom/movable/screen/fullscreen/crit, severity)
else
clear_fullscreen("crit")
clear_fullscreen("critvision")
@@ -744,7 +744,7 @@
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")
@@ -765,7 +765,7 @@
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")
@@ -843,7 +843,7 @@
if(handcuffed)
drop_all_held_items()
stop_pulling()
- throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
+ throw_alert("handcuffed", /atom/movable/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "handcuffed", /datum/mood_event/handcuffed)
else
clear_alert("handcuffed")
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index 49a74cdb352..da5ab0cb185 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -111,7 +111,7 @@
return
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1])
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_MASK) + 1]
inv.update_icon()
if(wear_mask)
@@ -125,7 +125,7 @@
remove_overlay(NECK_LAYER)
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
inv.update_icon()
if(wear_neck)
@@ -139,7 +139,7 @@
remove_overlay(BACK_LAYER)
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1])
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1]
inv.update_icon()
if(back)
@@ -155,7 +155,7 @@
return
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1])
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]
inv.update_icon()
if(head)
@@ -178,7 +178,7 @@
/mob/living/carbon/proc/update_hud_handcuffed()
if(hud_used)
for(var/hand in hud_used.hand_slots)
- var/obj/screen/inventory/hand/H = hud_used.hand_slots[hand]
+ var/atom/movable/screen/inventory/hand/H = hud_used.hand_slots[hand]
if(H)
H.update_icon()
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 0d3e6ad7b27..5d50ce74b4f 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -101,7 +101,7 @@ There are several things that need to be remembered:
remove_overlay(UNIFORM_LAYER)
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ICLOTHING) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ICLOTHING) + 1]
inv.update_icon()
if(istype(w_uniform, /obj/item/clothing/under))
@@ -145,7 +145,7 @@ There are several things that need to be remembered:
remove_overlay(ID_LAYER)
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ID) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_ID) + 1]
inv.update_icon()
var/mutable_appearance/id_overlay = overlays_standing[ID_LAYER]
@@ -170,7 +170,7 @@ There are several things that need to be remembered:
remove_overlay(GLOVES_LAYER)
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1])
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1]
inv.update_icon()
if(!gloves && blood_in_hands)
@@ -206,7 +206,7 @@ There are several things that need to be remembered:
return
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EYES) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EYES) + 1]
inv.update_icon()
if(glasses)
@@ -234,7 +234,7 @@ There are several things that need to be remembered:
return
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EARS) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_EARS) + 1]
inv.update_icon()
if(ears)
@@ -259,7 +259,7 @@ There are several things that need to be remembered:
return
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_FEET) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_FEET) + 1]
inv.update_icon()
if(shoes)
@@ -282,7 +282,7 @@ There are several things that need to be remembered:
remove_overlay(SUIT_STORE_LAYER)
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_SUITSTORE) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_SUITSTORE) + 1]
inv.update_icon()
if(s_store)
@@ -315,7 +315,7 @@ There are several things that need to be remembered:
remove_overlay(BELT_LAYER)
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BELT) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BELT) + 1]
inv.update_icon()
if(belt)
@@ -338,7 +338,7 @@ There are several things that need to be remembered:
remove_overlay(SUIT_LAYER)
if(client && hud_used)
- var/obj/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_OCLOTHING) + 1]
+ var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_OCLOTHING) + 1]
inv.update_icon()
if(istype(wear_suit, /obj/item/clothing/suit))
@@ -361,7 +361,7 @@ There are several things that need to be remembered:
/mob/living/carbon/human/update_inv_pockets()
if(client && hud_used)
- var/obj/screen/inventory/inv
+ var/atom/movable/screen/inventory/inv
inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_LPOCKET) + 1]
inv.update_icon()
@@ -411,7 +411,7 @@ There are several things that need to be remembered:
if(legcuffed)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
- throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
+ throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
/proc/wear_female_version(t_color, icon, layer, type)
var/index = t_color
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 1b128824f11..39558ff275e 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -239,7 +239,7 @@
update_tint()
if(G.vision_correction)
if(HAS_TRAIT(src, TRAIT_NEARSIGHT))
- overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1)
if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
update_sight()
if(!QDELETED(src))
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 8a5a45a72c6..8e17fa6bcf2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -90,13 +90,13 @@
var/datum/species/S = dna.species
if(S.breathid == "o2")
- throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
else if(S.breathid == "tox")
- throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
else if(S.breathid == "co2")
- throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2)
else if(S.breathid == "n2")
- throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+ throw_alert("not_enough_nitro", /atom/movable/screen/alert/not_enough_nitro)
return FALSE
else
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 77c34a751ca..b294c1bbeba 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1209,13 +1209,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
switch(H.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
- H.throw_alert("nutrition", /obj/screen/alert/fat)
+ H.throw_alert("nutrition", /atom/movable/screen/alert/fat)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FULL)
H.clear_alert("nutrition")
if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
- H.throw_alert("nutrition", /obj/screen/alert/hungry)
+ H.throw_alert("nutrition", /atom/movable/screen/alert/hungry)
if(0 to NUTRITION_LEVEL_STARVING)
- H.throw_alert("nutrition", /obj/screen/alert/starving)
+ H.throw_alert("nutrition", /atom/movable/screen/alert/starving)
/datum/species/proc/update_health_hud(mob/living/carbon/human/H)
return FALSE
@@ -1636,11 +1636,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if (burn_damage)
switch(burn_damage)
if(0 to 2)
- H.throw_alert("temp", /obj/screen/alert/hot, 1)
+ H.throw_alert("temp", /atom/movable/screen/alert/hot, 1)
if(2 to 4)
- H.throw_alert("temp", /obj/screen/alert/hot, 2)
+ H.throw_alert("temp", /atom/movable/screen/alert/hot, 2)
else
- H.throw_alert("temp", /obj/screen/alert/hot, 3)
+ H.throw_alert("temp", /atom/movable/screen/alert/hot, 3)
// Apply species and physiology modifiers to heat damage
burn_damage = burn_damage * heatmod * H.physiology.heat_mod
@@ -1663,13 +1663,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
// Apply more damage based on how cold you are
switch(H.bodytemperature)
if(200 to bodytemp_cold_damage_limit)
- H.throw_alert("temp", /obj/screen/alert/cold, 1)
+ H.throw_alert("temp", /atom/movable/screen/alert/cold, 1)
H.apply_damage(COLD_DAMAGE_LEVEL_1 * coldmod * H.physiology.cold_mod, BURN)
if(120 to 200)
- H.throw_alert("temp", /obj/screen/alert/cold, 2)
+ H.throw_alert("temp", /atom/movable/screen/alert/cold, 2)
H.apply_damage(COLD_DAMAGE_LEVEL_2 * coldmod * H.physiology.cold_mod, BURN)
else
- H.throw_alert("temp", /obj/screen/alert/cold, 3)
+ H.throw_alert("temp", /atom/movable/screen/alert/cold, 3)
H.apply_damage(COLD_DAMAGE_LEVEL_3 * coldmod * H.physiology.cold_mod, BURN)
// We are not to hot or cold, remove status and moods
@@ -1692,13 +1692,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(!HAS_TRAIT(H, TRAIT_RESISTHIGHPRESSURE))
H.adjustBruteLoss(min(((adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 ) * \
PRESSURE_DAMAGE_COEFFICIENT, MAX_HIGH_PRESSURE_DAMAGE) * H.physiology.pressure_mod)
- H.throw_alert("pressure", /obj/screen/alert/highpressure, 2)
+ H.throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2)
else
H.clear_alert("pressure")
// High pressure, show an alert
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
- H.throw_alert("pressure", /obj/screen/alert/highpressure, 1)
+ H.throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1)
// No pressure issues here clear pressure alerts
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
@@ -1710,7 +1710,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(HAS_TRAIT(H, TRAIT_RESISTLOWPRESSURE))
H.clear_alert("pressure")
else
- H.throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
+ H.throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1)
// Very low pressure, show an alert and take damage
else
@@ -1719,7 +1719,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
H.clear_alert("pressure")
else
H.adjustBruteLoss(LOW_PRESSURE_DAMAGE * H.physiology.pressure_mod)
- H.throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
+ H.throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2)
/**
* Used to stabilize the body temperature back to normal on living mobs
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index bfc82d47f6b..9d074f1240b 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -141,21 +141,21 @@
brutemod = 1.25
switch(get_charge(H))
if(ETHEREAL_CHARGE_NONE)
- H.throw_alert("ethereal_charge", /obj/screen/alert/etherealcharge, 3)
+ H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 3)
if(ETHEREAL_CHARGE_NONE to ETHEREAL_CHARGE_LOWPOWER)
- H.throw_alert("ethereal_charge", /obj/screen/alert/etherealcharge, 2)
+ H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 2)
if(H.health > 10.5)
apply_damage(0.65, TOX, null, null, H)
brutemod = 1.75
if(ETHEREAL_CHARGE_LOWPOWER to ETHEREAL_CHARGE_NORMAL)
- H.throw_alert("ethereal_charge", /obj/screen/alert/etherealcharge, 1)
+ H.throw_alert("ethereal_charge", /atom/movable/screen/alert/etherealcharge, 1)
brutemod = 1.5
if(ETHEREAL_CHARGE_FULL to ETHEREAL_CHARGE_OVERLOAD)
- H.throw_alert("ethereal_overcharge", /obj/screen/alert/ethereal_overcharge, 1)
+ H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 1)
apply_damage(0.2, TOX, null, null, H)
brutemod = 1.5
if(ETHEREAL_CHARGE_OVERLOAD to ETHEREAL_CHARGE_DANGEROUS)
- H.throw_alert("ethereal_overcharge", /obj/screen/alert/ethereal_overcharge, 2)
+ H.throw_alert("ethereal_overcharge", /atom/movable/screen/alert/ethereal_overcharge, 2)
apply_damage(0.65, TOX, null, null, H)
brutemod = 1.75
if(prob(10)) //10% each tick for ethereals to explosively release excess energy if it reaches dangerous levels
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index d5b283c1cdd..efd2475c717 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -493,7 +493,7 @@
button_icon_state = "slimeeject"
..()
-/datum/action/innate/integrate_extract/ApplyIcon(obj/screen/movable/action_button/current_button, force)
+/datum/action/innate/integrate_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
..(current_button, TRUE)
if(species?.current_extract)
current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
@@ -547,7 +547,7 @@
return TRUE
return FALSE
-/datum/action/innate/use_extract/ApplyIcon(obj/screen/movable/action_button/current_button, force)
+/datum/action/innate/use_extract/ApplyIcon(atom/movable/screen/movable/action_button/current_button, force)
..(current_button, TRUE)
if(species?.current_extract)
current_button.add_overlay(mutable_appearance(species.current_extract.icon, species.current_extract.icon_state))
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index a1015884be9..5fb0192f80d 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -183,7 +183,7 @@
if(!C.can_hold_items())
continue
- var/obj/screen/alert/give/G = C.throw_alert("[src]", /obj/screen/alert/give)
+ var/atom/movable/screen/alert/give/G = C.throw_alert("[src]", /atom/movable/screen/alert/give)
if(!G)
continue
G.setup(C, src, receiving)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index e1d4106df1f..1f24269722d 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -152,7 +152,7 @@
adjustOxyLoss(1)
failed_last_breath = TRUE
- throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
return FALSE
var/safe_oxy_min = 16
@@ -182,7 +182,7 @@
else
adjustOxyLoss(3)
failed_last_breath = TRUE
- throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
else //Enough oxygen
failed_last_breath = FALSE
@@ -213,7 +213,7 @@
if(Toxins_partialpressure > safe_tox_max)
var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_tox_max) * 10
adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
- throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
else
clear_alert("too_much_tox")
@@ -231,7 +231,7 @@
if(SA_partialpressure > safe_tox_max*3)
var/ratio = (breath_gases[/datum/gas/nitrous_oxide][MOLES]/safe_tox_max)
adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
- throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
else
clear_alert("too_much_tox")
else
@@ -512,7 +512,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(prob(25))
slurring += 2
jitteriness = max(jitteriness - 3, 0)
- throw_alert("drunk", /obj/screen/alert/drunk)
+ throw_alert("drunk", /atom/movable/screen/alert/drunk)
else
SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "drunk")
clear_alert("drunk")
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index f39903603fd..9da1206e2c8 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -73,13 +73,13 @@
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT))
switch(bodytemperature)
if(360 to 400)
- throw_alert("temp", /obj/screen/alert/hot, 1)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 1)
apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
if(400 to 460)
- throw_alert("temp", /obj/screen/alert/hot, 2)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 2)
apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
if(460 to INFINITY)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
if(on_fire)
apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
else
@@ -89,13 +89,13 @@
if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
switch(bodytemperature)
if(200 to 260)
- throw_alert("temp", /obj/screen/alert/cold, 1)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 1)
apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
if(120 to 200)
- throw_alert("temp", /obj/screen/alert/cold, 2)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 2)
apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
if(-INFINITY to 120)
- throw_alert("temp", /obj/screen/alert/cold, 3)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 3)
apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
else
clear_alert("temp")
@@ -110,16 +110,16 @@
switch(adjusted_pressure)
if(HAZARD_HIGH_PRESSURE to INFINITY)
adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
- throw_alert("pressure", /obj/screen/alert/highpressure, 2)
+ throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2)
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
- throw_alert("pressure", /obj/screen/alert/highpressure, 1)
+ throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1)
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
clear_alert("pressure")
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
- throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
+ throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1)
else
adjustBruteLoss( LOW_PRESSURE_DAMAGE )
- throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
+ throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2)
return
diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm
index 47073befbf9..cd626e8b2b6 100644
--- a/code/modules/mob/living/carbon/status_procs.dm
+++ b/code/modules/mob/living/carbon/status_procs.dm
@@ -24,8 +24,8 @@
/mob/living/carbon/adjust_drugginess(amount)
druggy = max(druggy+amount, 0)
if(druggy)
- overlay_fullscreen("high", /obj/screen/fullscreen/high)
- throw_alert("high", /obj/screen/alert/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/high)
+ throw_alert("high", /atom/movable/screen/alert/high)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "high", /datum/mood_event/high)
else
clear_fullscreen("high")
@@ -35,8 +35,8 @@
/mob/living/carbon/set_drugginess(amount)
druggy = max(amount, 0)
if(druggy)
- overlay_fullscreen("high", /obj/screen/fullscreen/high)
- throw_alert("high", /obj/screen/alert/high)
+ overlay_fullscreen("high", /atom/movable/screen/fullscreen/high)
+ throw_alert("high", /atom/movable/screen/alert/high)
else
clear_fullscreen("high")
clear_alert("high")
diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm
index bb5165f9d85..dd16fb39c28 100644
--- a/code/modules/mob/living/init_signals.dm
+++ b/code/modules/mob/living/init_signals.dm
@@ -177,6 +177,6 @@
/mob/living/proc/update_succumb_action()
SIGNAL_HANDLER
if (CAN_SUCCUMB(src))
- throw_alert("succumb", /obj/screen/alert/succumb)
+ throw_alert("succumb", /atom/movable/screen/alert/succumb)
else
clear_alert("succumb")
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5a03268ea7f..f67d026a74d 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -587,7 +587,7 @@
var/severity = 0
var/healthpercent = (health/maxHealth) * 100
if(hud_used?.healthdoll) //to really put you in the boots of a simplemob
- var/obj/screen/healthdoll/living/livingdoll = hud_used.healthdoll
+ var/atom/movable/screen/healthdoll/living/livingdoll = hud_used.healthdoll
switch(healthpercent)
if(100 to INFINITY)
severity = 0
@@ -613,7 +613,7 @@
livingdoll.filters += filter(type="alpha", icon = mob_mask)
livingdoll.filters += filter(type="drop_shadow", size = -1)
if(severity > 0)
- overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+ overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity)
else
clear_fullscreen("brute")
@@ -929,11 +929,11 @@
clear_alert("gravity")
else
if(has_gravity >= GRAVITY_DAMAGE_TRESHOLD)
- throw_alert("gravity", /obj/screen/alert/veryhighgravity)
+ throw_alert("gravity", /atom/movable/screen/alert/veryhighgravity)
else
- throw_alert("gravity", /obj/screen/alert/highgravity)
+ throw_alert("gravity", /atom/movable/screen/alert/highgravity)
else
- throw_alert("gravity", /obj/screen/alert/weightless)
+ throw_alert("gravity", /atom/movable/screen/alert/weightless)
if(!override && !is_flying())
float(!has_gravity)
@@ -1172,7 +1172,7 @@
src.visible_message("[src] catches fire!", \
"You're set on fire!")
new/obj/effect/dummy/lighting_obj/moblight/fire(src)
- throw_alert("fire", /obj/screen/alert/fire)
+ throw_alert("fire", /atom/movable/screen/alert/fire)
update_fire()
SEND_SIGNAL(src, COMSIG_LIVING_IGNITED,src)
return TRUE
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index d08fbb57ee3..9e6e23b6b91 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -379,7 +379,7 @@
return TRUE
//called when the mob receives a bright flash
-/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash)
+/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash)
if(HAS_TRAIT(src, TRAIT_NOFLASH))
return FALSE
if(get_eye_protection() < intensity && (override_blindness_check || !is_blind()))
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 713ff857c24..943bbcedce2 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -91,7 +91,7 @@
var/chnotify = 0
var/multicam_on = FALSE
- var/obj/screen/movable/pic_in_pic/ai/master_multicam
+ var/atom/movable/screen/movable/pic_in_pic/ai/master_multicam
var/list/multicam_screens = list()
var/list/all_eyes = list()
var/max_multicams = 6
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
index a848b64b4d5..8ed811e9265 100644
--- a/code/modules/mob/living/silicon/ai/multicam.dm
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -1,34 +1,34 @@
//Picture in picture
-/obj/screen/movable/pic_in_pic/ai
+/atom/movable/screen/movable/pic_in_pic/ai
var/mob/living/silicon/ai/ai
var/mutable_appearance/highlighted_background
var/highlighted = FALSE
var/mob/camera/ai_eye/pic_in_pic/aiEye
-/obj/screen/movable/pic_in_pic/ai/Initialize()
+/atom/movable/screen/movable/pic_in_pic/ai/Initialize()
. = ..()
aiEye = new /mob/camera/ai_eye/pic_in_pic()
aiEye.screen = src
-/obj/screen/movable/pic_in_pic/ai/Destroy()
+/atom/movable/screen/movable/pic_in_pic/ai/Destroy()
set_ai(null)
QDEL_NULL(aiEye)
return ..()
-/obj/screen/movable/pic_in_pic/ai/Click()
+/atom/movable/screen/movable/pic_in_pic/ai/Click()
..()
if(ai)
ai.select_main_multicam_window(src)
-/obj/screen/movable/pic_in_pic/ai/make_backgrounds()
+/atom/movable/screen/movable/pic_in_pic/ai/make_backgrounds()
..()
highlighted_background = new /mutable_appearance()
highlighted_background.icon = 'icons/misc/pic_in_pic.dmi'
highlighted_background.icon_state = "background_highlight"
highlighted_background.layer = SPACE_LAYER
-/obj/screen/movable/pic_in_pic/ai/add_background()
+/atom/movable/screen/movable/pic_in_pic/ai/add_background()
if((width > 0) && (height > 0))
var/matrix/M = matrix()
M.Scale(width + 0.5, height + 0.5)
@@ -37,35 +37,35 @@
standard_background.transform = M
add_overlay(highlighted ? highlighted_background : standard_background)
-/obj/screen/movable/pic_in_pic/ai/set_view_size(width, height, do_refresh = TRUE)
+/atom/movable/screen/movable/pic_in_pic/ai/set_view_size(width, height, do_refresh = TRUE)
aiEye.static_visibility_range = (round(max(width, height) / 2) + 1)
if(ai)
ai.camera_visibility(aiEye)
..()
-/obj/screen/movable/pic_in_pic/ai/set_view_center(atom/target, do_refresh = TRUE)
+/atom/movable/screen/movable/pic_in_pic/ai/set_view_center(atom/target, do_refresh = TRUE)
..()
aiEye.setLoc(get_turf(target))
-/obj/screen/movable/pic_in_pic/ai/refresh_view()
+/atom/movable/screen/movable/pic_in_pic/ai/refresh_view()
..()
aiEye.setLoc(get_turf(center))
-/obj/screen/movable/pic_in_pic/ai/proc/highlight()
+/atom/movable/screen/movable/pic_in_pic/ai/proc/highlight()
if(highlighted)
return
highlighted = TRUE
cut_overlay(standard_background)
add_overlay(highlighted_background)
-/obj/screen/movable/pic_in_pic/ai/proc/unhighlight()
+/atom/movable/screen/movable/pic_in_pic/ai/proc/unhighlight()
if(!highlighted)
return
highlighted = FALSE
cut_overlay(highlighted_background)
add_overlay(standard_background)
-/obj/screen/movable/pic_in_pic/ai/proc/set_ai(mob/living/silicon/ai/new_ai)
+/atom/movable/screen/movable/pic_in_pic/ai/proc/set_ai(mob/living/silicon/ai/new_ai)
if(ai)
ai.multicam_screens -= src
ai.all_eyes -= aiEye
@@ -120,7 +120,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
invisibility = INVISIBILITY_OBSERVER
mouse_opacity = MOUSE_OPACITY_ICON
icon_state = "ai_pip_camera"
- var/obj/screen/movable/pic_in_pic/ai/screen
+ var/atom/movable/screen/movable/pic_in_pic/ai/screen
var/list/cameras_telegraphed = list()
var/telegraph_cameras = TRUE
var/telegraph_range = 7
@@ -204,7 +204,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
if(!silent)
to_chat(src, "Cannot place more than [max_multicams] multicamera windows.")
return
- var/obj/screen/movable/pic_in_pic/ai/C = new /obj/screen/movable/pic_in_pic/ai()
+ var/atom/movable/screen/movable/pic_in_pic/ai/C = new /atom/movable/screen/movable/pic_in_pic/ai()
C.set_view_size(3, 3, FALSE)
C.set_view_center(get_turf(eyeobj))
C.set_ai(src)
@@ -235,7 +235,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
reset_perspective(GLOB.ai_camera_room_landmark)
if(client)
for(var/V in multicam_screens)
- var/obj/screen/movable/pic_in_pic/P = V
+ var/atom/movable/screen/movable/pic_in_pic/P = V
P.show_to(client)
/mob/living/silicon/ai/proc/end_multicam()
@@ -245,13 +245,13 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
select_main_multicam_window(null)
if(client)
for(var/V in multicam_screens)
- var/obj/screen/movable/pic_in_pic/P = V
+ var/atom/movable/screen/movable/pic_in_pic/P = V
P.unshow_to(client)
reset_perspective()
to_chat(src, "Multiple-camera viewing mode deactivated.")
-/mob/living/silicon/ai/proc/select_main_multicam_window(obj/screen/movable/pic_in_pic/ai/P)
+/mob/living/silicon/ai/proc/select_main_multicam_window(atom/movable/screen/movable/pic_in_pic/ai/P)
if(master_multicam == P)
return
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index d557392110d..3521728e4ac 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -11,7 +11,7 @@
deadchat_broadcast("'s laws were changed. View", "[src]", follow_target=src, message_type=DEADCHAT_LAWCHANGE)
/mob/living/silicon/proc/post_lawchange(announce = TRUE)
- throw_alert("newlaw", /obj/screen/alert/newlaw)
+ throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
if(announce && last_lawchange_announce != world.time)
to_chat(src, "Your laws have been changed.")
// lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 57570e60975..1934fe22c99 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -59,15 +59,15 @@
if(0.75 to INFINITY)
clear_alert("charge")
if(0.5 to 0.75)
- throw_alert("charge", /obj/screen/alert/lowcell, 1)
+ throw_alert("charge", /atom/movable/screen/alert/lowcell, 1)
if(0.25 to 0.5)
- throw_alert("charge", /obj/screen/alert/lowcell, 2)
+ throw_alert("charge", /atom/movable/screen/alert/lowcell, 2)
if(0.01 to 0.25)
- throw_alert("charge", /obj/screen/alert/lowcell, 3)
+ throw_alert("charge", /atom/movable/screen/alert/lowcell, 3)
else
- throw_alert("charge", /obj/screen/alert/emptycell)
+ throw_alert("charge", /atom/movable/screen/alert/emptycell)
else
- throw_alert("charge", /obj/screen/alert/nocell)
+ throw_alert("charge", /atom/movable/screen/alert/nocell)
//Robots on fire
/mob/living/silicon/robot/handle_fire()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 0e8f0207c12..2d1f0677311 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -30,13 +30,13 @@
var/previous_health
//Hud stuff
- var/obj/screen/inv1 = null
- var/obj/screen/inv2 = null
- var/obj/screen/inv3 = null
- var/obj/screen/hands = null
+ var/atom/movable/screen/inv1 = null
+ var/atom/movable/screen/inv2 = null
+ var/atom/movable/screen/inv3 = null
+ var/atom/movable/screen/hands = null
var/shown_robot_modules = 0 //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
//3 Modules can be activated at any one time.
var/obj/item/robot_module/module = null
@@ -87,14 +87,14 @@
///Lamp brightness. Starts at 3, but can be 1 - 5.
var/lamp_intensity = 3
///Lamp button reference
- var/obj/screen/robot/lamp/lampButton
+ var/atom/movable/screen/robot/lamp/lampButton
var/sight_mode = 0
hud_possible = list(ANTAG_HUD, DIAG_STAT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_TRACK_HUD)
///The reference to the built-in tablet that borgs carry.
var/obj/item/modular_computer/tablet/integrated/modularInterface
- var/obj/screen/robot/modPC/interfaceButton
+ var/atom/movable/screen/robot/modPC/interfaceButton
var/list/upgrades = list()
@@ -123,9 +123,9 @@
robot_modules_background.layer = HUD_LAYER //Objects that appear on screen are on layer ABOVE_HUD_LAYER, UI should be just below it.
robot_modules_background.plane = HUD_PLANE
- inv1 = new /obj/screen/robot/module1()
- inv2 = new /obj/screen/robot/module2()
- inv3 = new /obj/screen/robot/module3()
+ inv1 = new /atom/movable/screen/robot/module1()
+ inv2 = new /atom/movable/screen/robot/module2()
+ inv3 = new /atom/movable/screen/robot/module3()
ident = rand(1, 999)
@@ -493,7 +493,7 @@
if(wires.is_cut(WIRE_LOCKDOWN))
state = TRUE
if(state)
- throw_alert("locked", /obj/screen/alert/locked)
+ throw_alert("locked", /atom/movable/screen/alert/locked)
else
clear_alert("locked")
set_lockcharge(state)
@@ -518,7 +518,7 @@
module.rebuild_modules()
update_icons()
if(emagged)
- throw_alert("hacked", /obj/screen/alert/hacked)
+ throw_alert("hacked", /atom/movable/screen/alert/hacked)
else
clear_alert("hacked")
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index c9f0796f7c9..57e3ac5c8e7 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -125,6 +125,6 @@
Proj.on_hit(src)
return BULLET_ACT_HIT
-/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/static)
+/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash/static)
if(affect_silicon)
return ..()
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 8f745afb80f..bd14cccf61b 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -56,7 +56,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/cooldown = 0
var/mob/living/summoner
var/range = 10 //how far from the user the spirit can be
- var/toggle_button_type = /obj/screen/guardian/toggle_mode/inactive //what sort of toggle button the hud uses
+ var/toggle_button_type = /atom/movable/screen/guardian/toggle_mode/inactive //what sort of toggle button the hud uses
var/playstyle_string = "You are a Guardian without any type. You shouldn't exist!"
var/magic_fluff_string = "You draw the Coder, symbolizing bugs and errors. This shouldn't happen! Submit a bug report!"
var/tech_fluff_string = "BOOT SEQUENCE COMPLETE. ERROR MODULE LOADED. THIS SHOULDN'T HAPPEN. Submit a bug report!"
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
index 62cf875ea93..6d22a0871e7 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
@@ -11,11 +11,11 @@
tech_fluff_string = "Boot sequence complete. Assassin modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! Caught one! It's an assassin carp! Just when you thought it was safe to go back to the water... which is unhelpful, because we're in space."
miner_fluff_string = "You encounter... Glass, a sharp, fragile attacker."
- toggle_button_type = /obj/screen/guardian/toggle_mode/assassin
+ toggle_button_type = /atom/movable/screen/guardian/toggle_mode/assassin
var/toggle = FALSE
var/stealthcooldown = 160
- var/obj/screen/alert/canstealthalert
- var/obj/screen/alert/instealthalert
+ var/atom/movable/screen/alert/canstealthalert
+ var/atom/movable/screen/alert/instealthalert
/mob/living/simple_animal/hostile/guardian/assassin/Initialize()
. = ..()
@@ -85,12 +85,12 @@
if(stealthcooldown <= world.time)
if(toggle)
if(!instealthalert)
- instealthalert = throw_alert("instealth", /obj/screen/alert/instealth)
+ instealthalert = throw_alert("instealth", /atom/movable/screen/alert/instealth)
clear_alert("canstealth")
canstealthalert = null
else
if(!canstealthalert)
- canstealthalert = throw_alert("canstealth", /obj/screen/alert/canstealth)
+ canstealthalert = throw_alert("canstealth", /atom/movable/screen/alert/canstealth)
clear_alert("instealth")
instealthalert = null
else
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 93b0c555fbe..67ea439df01 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -13,13 +13,13 @@
carp_fluff_string = "CARP CARP CARP! Caught one! It's a charger carp, that likes running at people. But it doesn't have any legs..."
miner_fluff_string = "You encounter... Titanium, a lightweight, agile fighter."
var/charging = 0
- var/obj/screen/alert/chargealert
+ var/atom/movable/screen/alert/chargealert
/mob/living/simple_animal/hostile/guardian/charger/Life()
. = ..()
if(ranged_cooldown <= world.time)
if(!chargealert)
- chargealert = throw_alert("charge", /obj/screen/alert/cancharge)
+ chargealert = throw_alert("charge", /atom/movable/screen/alert/cancharge)
else
clear_alert("charge")
chargealert = null
diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
index 8de0c5229d6..22252c5ed52 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
@@ -9,7 +9,7 @@
tech_fluff_string = "Boot sequence complete. Protector modules loaded. Holoparasite swarm online."
carp_fluff_string = "CARP CARP CARP! You caught one! Wait, no... it caught you! The fisher has become the fishy."
miner_fluff_string = "You encounter... Uranium, a very resistant guardian."
- toggle_button_type = /obj/screen/guardian/toggle_mode
+ toggle_button_type = /atom/movable/screen/guardian/toggle_mode
var/toggle = FALSE
/mob/living/simple_animal/hostile/guardian/protector/ex_act(severity)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
index e2aa31323bc..d959e51bc3d 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm
@@ -25,7 +25,7 @@
miner_fluff_string = "You encounter... Diamond, a powerful projectile thrower."
see_invisible = SEE_INVISIBLE_LIVING
see_in_dark = 8
- toggle_button_type = /obj/screen/guardian/toggle_mode
+ toggle_button_type = /atom/movable/screen/guardian/toggle_mode
var/list/snares = list()
var/toggle = FALSE
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
index 4ec8a5c4680..610f35df816 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm
@@ -12,7 +12,7 @@
carp_fluff_string = "CARP CARP CARP! You caught a support carp. It's a kleptocarp!"
tech_fluff_string = "Boot sequence complete. Support modules active. Holoparasite swarm online."
miner_fluff_string = "You encounter... Bluespace, the master of support."
- toggle_button_type = /obj/screen/guardian/toggle_mode
+ toggle_button_type = /atom/movable/screen/guardian/toggle_mode
var/obj/structure/receiving_pad/beacon
var/beacon_cooldown = 0
var/toggle = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index aa90769ffa6..2d2908d436d 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -150,10 +150,10 @@
/mob/living/simple_animal/hostile/alien/handle_temperature_damage()
if(bodytemperature < minbodytemp)
adjustBruteLoss(2)
- throw_alert("temp", /obj/screen/alert/cold, 1)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 1)
else if(bodytemperature > maxbodytemp)
adjustBruteLoss(20)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
else
clear_alert("temp")
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 703256101a6..5eb3eaa2ad3 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -555,10 +555,10 @@
/mob/living/simple_animal/hostile/poison/giant_spider/handle_temperature_damage()
if(bodytemperature < minbodytemp)
adjustBruteLoss(20)
- throw_alert("temp", /obj/screen/alert/cold, 3)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 3)
else if(bodytemperature > maxbodytemp)
adjustBruteLoss(20)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
else
clear_alert("temp")
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
index 8e20b79a229..bd05d2ffb85 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -70,7 +70,7 @@
status_type = STATUS_EFFECT_MULTIPLE
alert_type = null
tick_interval = 1
- var/obj/screen/seedling/seedling_screen_object
+ var/atom/movable/screen/seedling/seedling_screen_object
var/atom/target
@@ -82,7 +82,7 @@
/datum/status_effect/seedling_beam_indicator/on_apply()
if(owner.client)
- seedling_screen_object = new /obj/screen/seedling()
+ seedling_screen_object = new /atom/movable/screen/seedling()
owner.client.screen += seedling_screen_object
tick()
return ..()
@@ -99,7 +99,7 @@
final.Turn(target_angle)
seedling_screen_object.transform = final
-/obj/screen/seedling
+/atom/movable/screen/seedling
icon = 'icons/mob/jungle/arachnid.dmi'
icon_state = "seedling_beam_indicator"
screen_loc = "CENTER:-16,CENTER:-16"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 3b05fa93355..ad6d89ee28d 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -367,11 +367,11 @@ Difficulty: Extremely Hard
id = "ice_block_talisman"
duration = 40
status_type = STATUS_EFFECT_REFRESH
- alert_type = /obj/screen/alert/status_effect/ice_block_talisman
+ alert_type = /atom/movable/screen/alert/status_effect/ice_block_talisman
/// Stored icon overlay for the hit mob, removed when effect is removed
var/icon/cube
-/obj/screen/alert/status_effect/ice_block_talisman
+/atom/movable/screen/alert/status_effect/ice_block_talisman
name = "Frozen Solid"
desc = "You're frozen inside an ice cube, and cannot move!"
icon_state = "frozen"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 60bb88299a5..f604fac9256 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -63,9 +63,9 @@
/mob/living/simple_animal/hostile/asteroid/handle_temperature_damage()
if(bodytemperature < minbodytemp)
adjustBruteLoss(2)
- throw_alert("temp", /obj/screen/alert/cold, 1)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 1)
else if(bodytemperature > maxbodytemp)
adjustBruteLoss(20)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
else
clear_alert("temp")
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index d9792890b10..f653821d4a1 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -41,10 +41,10 @@
/mob/living/simple_animal/hostile/retaliate/clown/handle_temperature_damage()
if(bodytemperature < minbodytemp)
adjustBruteLoss(10)
- throw_alert("temp", /obj/screen/alert/cold, 2)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 2)
else if(bodytemperature > maxbodytemp)
adjustBruteLoss(15)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
else
clear_alert("temp")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index e0faab6af91..c3e41f60ad2 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -354,7 +354,7 @@
if(!environment_air_is_safe())
adjustHealth(unsuitable_atmos_damage)
if(unsuitable_atmos_damage > 0)
- throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
else
clear_alert("not_enough_oxy")
@@ -365,20 +365,20 @@
adjustHealth(unsuitable_atmos_damage)
switch(unsuitable_atmos_damage)
if(1 to 5)
- throw_alert("temp", /obj/screen/alert/cold, 1)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 1)
if(5 to 10)
- throw_alert("temp", /obj/screen/alert/cold, 2)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 2)
if(10 to INFINITY)
- throw_alert("temp", /obj/screen/alert/cold, 3)
+ throw_alert("temp", /atom/movable/screen/alert/cold, 3)
else if(bodytemperature > maxbodytemp)
adjustHealth(unsuitable_atmos_damage)
switch(unsuitable_atmos_damage)
if(1 to 5)
- throw_alert("temp", /obj/screen/alert/hot, 1)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 1)
if(5 to 10)
- throw_alert("temp", /obj/screen/alert/hot, 2)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 2)
if(10 to INFINITY)
- throw_alert("temp", /obj/screen/alert/hot, 3)
+ throw_alert("temp", /atom/movable/screen/alert/hot, 3)
else
clear_alert("temp")
@@ -625,7 +625,7 @@
var/oindex = active_hand_index
active_hand_index = hand_index
if(hud_used)
- var/obj/screen/inventory/hand/H
+ var/atom/movable/screen/inventory/hand/H
H = hud_used.hand_slots["[hand_index]"]
if(H)
H.update_icon()
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 4fe6209c98e..187f24bea88 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -428,7 +428,7 @@
/mob/living/proc/become_nearsighted(source)
if(!HAS_TRAIT(src, TRAIT_NEARSIGHT))
- overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1)
ADD_TRAIT(src, TRAIT_NEARSIGHT, source)
/mob/living/proc/cure_husk(source)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c4698a3b70b..c5c9d0ac445 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1156,7 +1156,7 @@
///Set the lighting plane hud alpha to the mobs lighting_alpha var
/mob/proc/sync_lighting_plane_alpha()
if(hud_used)
- var/obj/screen/plane_master/lighting/L = hud_used.plane_masters["[LIGHTING_PLANE]"]
+ var/atom/movable/screen/plane_master/lighting/L = hud_used.plane_masters["[LIGHTING_PLANE]"]
if (L)
L.alpha = lighting_alpha
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 17f13f98db2..0069d702f5f 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -207,7 +207,7 @@
var/memory_throttle_time = 0
- /// Contains [/obj/screen/alert] only.
+ /// Contains [/atom/movable/screen/alert] only.
///
/// On [/mob] so clientless mobs will throw alerts properly.
var/list/alerts = list()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 0f8021d2733..a2c1c7c820d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -352,7 +352,7 @@
if(flashwindow)
window_flash(O.client)
if(source)
- var/obj/screen/alert/notify_action/A = O.throw_alert("[REF(source)]_notify_action", /obj/screen/alert/notify_action)
+ var/atom/movable/screen/alert/notify_action/A = O.throw_alert("[REF(source)]_notify_action", /atom/movable/screen/alert/notify_action)
if(A)
if(O.client.prefs && O.client.prefs.UI_style)
A.icon = ui_style2icon(O.client.prefs.UI_style)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index b5a5466d948..db3ad278654 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -342,7 +342,7 @@
///Validate the client's mob has a valid zone selected
/client/proc/check_has_body_select()
- return mob && mob.hud_used && mob.hud_used.zone_select && istype(mob.hud_used.zone_select, /obj/screen/zone_sel)
+ return mob && mob.hud_used && mob.hud_used.zone_select && istype(mob.hud_used.zone_select, /atom/movable/screen/zone_sel)
/**
* Hidden verb to set the target zone of a mob to the head
@@ -365,7 +365,7 @@
else
next_in_line = BODY_ZONE_HEAD
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line, mob)
///Hidden verb to target the right arm, bound to 4
@@ -376,7 +376,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_R_ARM, mob)
///Hidden verb to target the chest, bound to 5
@@ -387,7 +387,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_CHEST, mob)
///Hidden verb to target the left arm, bound to 6
@@ -398,7 +398,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_L_ARM, mob)
///Hidden verb to target the right leg, bound to 1
@@ -409,7 +409,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_R_LEG, mob)
///Hidden verb to target the groin, bound to 2
@@ -420,7 +420,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_PRECISE_GROIN, mob)
///Hidden verb to target the left leg, bound to 3
@@ -431,7 +431,7 @@
if(!check_has_body_select())
return
- var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
+ var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(BODY_ZONE_L_LEG, mob)
///Verb to toggle the walk or run status
@@ -453,7 +453,7 @@
else
m_intent = MOVE_INTENT_RUN
if(hud_used?.static_inventory)
- for(var/obj/screen/mov_intent/selector in hud_used.static_inventory)
+ for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory)
selector.update_icon()
///Moves a mob upwards in z level
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 78f130f9dc0..871594de7fa 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -48,7 +48,7 @@
switch(stat)
if(CONSCIOUS, SOFT_CRIT)
if(HAS_TRAIT(src, TRAIT_BLIND) || eye_blind)
- throw_alert("blind", /obj/screen/alert/blind)
+ throw_alert("blind", /atom/movable/screen/alert/blind)
do_set_blindness(TRUE)
else
do_set_blindness(FALSE)
@@ -61,7 +61,7 @@
///Proc that handles adding and removing the blindness overlays.
/mob/proc/do_set_blindness(now_blind)
if(now_blind)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind)
// You are blind why should you be able to make out details like color, only shapes near you
add_client_colour(/datum/client_colour/monochrome/blind)
else
@@ -94,8 +94,8 @@
/mob/proc/update_eye_blur()
if(!client)
return
- var/obj/screen/plane_master/floor/OT = locate(/obj/screen/plane_master/floor) in client.screen
- var/obj/screen/plane_master/game_world/GW = locate(/obj/screen/plane_master/game_world) in client.screen
+ var/atom/movable/screen/plane_master/floor/OT = locate(/atom/movable/screen/plane_master/floor) in client.screen
+ var/atom/movable/screen/plane_master/game_world/GW = locate(/atom/movable/screen/plane_master/game_world) in client.screen
GW.backdrop(src)
OT.backdrop(src)
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index cd1b38a9757..223777e7fca 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -122,7 +122,7 @@
/obj/item/modular_computer/MouseDrop(obj/over_object, src_location, over_location)
var/mob/M = usr
- if((!istype(over_object, /obj/screen)) && usr.canUseTopic(src, BE_CLOSE))
+ if((!istype(over_object, /atom/movable/screen)) && usr.canUseTopic(src, BE_CLOSE))
return attack_self(M)
return ..()
diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
index 9bf0cd5a3ec..2f7ff827a2e 100644
--- a/code/modules/modular_computers/computers/item/laptop.dm
+++ b/code/modules/modular_computers/computers/item/laptop.dm
@@ -65,8 +65,8 @@
if(over_object == usr || over_object == src)
try_toggle_open(usr)
return
- if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
var/mob/M = usr
if(M.stat != CONSCIOUS || HAS_TRAIT(M, TRAIT_HANDS_BLOCKED))
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index 78e72640edd..92275b1e8b6 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -21,10 +21,10 @@
// Stuff needed to render the map
var/map_name
- var/obj/screen/map_view/cam_screen
+ var/atom/movable/screen/map_view/cam_screen
/// All the plane masters that need to be applied.
var/list/cam_plane_masters
- var/obj/screen/background/cam_background
+ var/atom/movable/screen/background/cam_background
/datum/computer_file/program/secureye/New()
. = ..()
@@ -42,8 +42,8 @@
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = list()
- for(var/plane in subtypesof(/obj/screen/plane_master))
- var/obj/screen/instance = new plane()
+ for(var/plane in subtypesof(/atom/movable/screen/plane_master))
+ var/atom/movable/screen/instance = new plane()
instance.assigned_map = map_name
instance.del_on_map_removal = FALSE
instance.screen_loc = "[map_name]:CENTER"
diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm
index bb530368655..7e28f1a1541 100644
--- a/code/modules/paperwork/paper_cutter.dm
+++ b/code/modules/paperwork/paper_cutter.dm
@@ -100,8 +100,8 @@
if(over_object == M)
M.put_in_hands(src)
- else if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ else if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
add_fingerprint(M)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index b0ac9265d67..e4e09e5b817 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -49,8 +49,8 @@
if(over_object == M)
M.put_in_hands(src)
- else if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ else if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
add_fingerprint(M)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index cad0ef88305..2dc33342dfb 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1056,8 +1056,8 @@
malf.malfhack = src
malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE)
- var/obj/screen/alert/hackingapc/A
- A = malf.throw_alert("hackingapc", /obj/screen/alert/hackingapc)
+ var/atom/movable/screen/alert/hackingapc/A
+ A = malf.throw_alert("hackingapc", /atom/movable/screen/alert/hackingapc)
A.target = src
/obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf)
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 99fb725fea3..60ba5a89cb8 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -69,8 +69,8 @@
if(!M.incapacitated())
- if(istype(over_object, /obj/screen/inventory/hand))
- var/obj/screen/inventory/hand/H = over_object
+ if(istype(over_object, /atom/movable/screen/inventory/hand))
+ var/atom/movable/screen/inventory/hand/H = over_object
M.putItemFromInventoryInHandIfPossible(src, H.held_index)
diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index 4221a6c67ae..23b94a5e43c 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -279,7 +279,7 @@
/obj/item/gun/energy/beam_rifle/onMouseDown(object, location, params, mob/mob)
if(istype(mob))
set_user(mob)
- if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
+ if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
if((object in mob.contents) || (object == mob))
return
@@ -287,7 +287,7 @@
return ..()
/obj/item/gun/energy/beam_rifle/onMouseUp(object, location, params, mob/M)
- if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
+ if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
process_aim()
if(aiming_time_left <= aiming_time_fire_threshold && check_user())
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 7f844424d54..e036472286f 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -421,7 +421,7 @@
/obj/machinery/disposal/bin/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2)
//Delivery Chute
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 261888d430a..68292bddd6f 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -1,4 +1,4 @@
-/obj/screen/alert/status_effect/rainbow_protection
+/atom/movable/screen/alert/status_effect/rainbow_protection
name = "Rainbow Protection"
desc = "You are defended from harm, but so are those you might seek to injure!"
icon_state = "slime_rainbowshield"
@@ -6,7 +6,7 @@
/datum/status_effect/rainbow_protection
id = "rainbow_protection"
duration = 100
- alert_type = /obj/screen/alert/status_effect/rainbow_protection
+ alert_type = /atom/movable/screen/alert/status_effect/rainbow_protection
var/originalcolor
/datum/status_effect/rainbow_protection/on_apply()
@@ -28,7 +28,7 @@
owner.visible_message("[owner] stops glowing, the rainbow light fading away.",
"You no longer feel protected...")
-/obj/screen/alert/status_effect/slimeskin
+/atom/movable/screen/alert/status_effect/slimeskin
name = "Adamantine Slimeskin"
desc = "You are covered in a thick, non-neutonian gel."
icon_state = "slime_stoneskin"
@@ -36,7 +36,7 @@
/datum/status_effect/slimeskin
id = "slimeskin"
duration = 300
- alert_type = /obj/screen/alert/status_effect/slimeskin
+ alert_type = /atom/movable/screen/alert/status_effect/slimeskin
var/originalcolor
/datum/status_effect/slimeskin/on_apply()
@@ -88,14 +88,14 @@
old_location.visible_message("[owner] disappears in a flurry of sparks!")
to_chat(owner, "The unknown force snatches briefly you from reality, and deposits you next to [target]!")
-/obj/screen/alert/status_effect/freon/stasis
+/atom/movable/screen/alert/status_effect/freon/stasis
desc = "You're frozen inside of a protective ice cube! While inside, you can't do anything, but are immune to harm! Resist to get out."
/datum/status_effect/frozenstasis
id = "slime_frozen"
status_type = STATUS_EFFECT_UNIQUE
duration = -1 //Will remove self when block breaks.
- alert_type = /obj/screen/alert/status_effect/freon/stasis
+ alert_type = /atom/movable/screen/alert/status_effect/freon/stasis
var/obj/structure/ice_stasis/cube
/datum/status_effect/frozenstasis/on_apply()
@@ -157,7 +157,7 @@
clone.unequip_everything()
qdel(clone)
-/obj/screen/alert/status_effect/clone_decay
+/atom/movable/screen/alert/status_effect/clone_decay
name = "Clone Decay"
desc = "You are simply a construct, and cannot maintain this form forever. You will be returned to your original body if you should fall."
icon_state = "slime_clonedecay"
@@ -166,7 +166,7 @@
id = "slime_clonedecay"
status_type = STATUS_EFFECT_UNIQUE
duration = -1
- alert_type = /obj/screen/alert/status_effect/clone_decay
+ alert_type = /atom/movable/screen/alert/status_effect/clone_decay
/datum/status_effect/slime_clone_decay/tick()
owner.adjustToxLoss(1, 0)
@@ -175,7 +175,7 @@
owner.adjustFireLoss(1, 0)
owner.color = "#007BA7"
-/obj/screen/alert/status_effect/bloodchill
+/atom/movable/screen/alert/status_effect/bloodchill
name = "Bloodchilled"
desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!"
icon_state = "bloodchill"
@@ -183,7 +183,7 @@
/datum/status_effect/bloodchill
id = "bloodchill"
duration = 100
- alert_type = /obj/screen/alert/status_effect/bloodchill
+ alert_type = /atom/movable/screen/alert/status_effect/bloodchill
/datum/status_effect/bloodchill/on_apply()
owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
@@ -199,7 +199,7 @@
/datum/status_effect/bonechill
id = "bonechill"
duration = 80
- alert_type = /obj/screen/alert/status_effect/bonechill
+ alert_type = /atom/movable/screen/alert/status_effect/bonechill
/datum/status_effect/bonechill/on_apply()
owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
@@ -213,7 +213,7 @@
/datum/status_effect/bonechill/on_remove()
owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
-/obj/screen/alert/status_effect/bonechill
+/atom/movable/screen/alert/status_effect/bonechill
name = "Bonechilled"
desc = "You feel a shiver down your spine after hearing the haunting noise of bone rattling. You'll move slower and get frostbite for a while!"
icon_state = "bloodchill"
@@ -633,7 +633,7 @@
H.physiology.hunger_mod /= 0.8
//Bluespace has an icon because it's kinda active.
-/obj/screen/alert/status_effect/bluespaceslime
+/atom/movable/screen/alert/status_effect/bluespaceslime
name = "Stabilized Bluespace Extract"
desc = "You shouldn't see this, since we set it to change automatically!"
icon_state = "slime_bluespace_on"
@@ -646,7 +646,7 @@
/datum/status_effect/stabilized/bluespace
id = "stabilizedbluespace"
colour = "bluespace"
- alert_type = /obj/screen/alert/status_effect/bluespaceslime
+ alert_type = /atom/movable/screen/alert/status_effect/bluespaceslime
var/healthcheck
/datum/status_effect/stabilized/bluespace/tick()
diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
index 745eba4ae08..44d79c6bf74 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -321,7 +321,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
to_chat(user, "You peak through the door's bluespace peephole...")
user.reset_perspective(parentSphere)
var/datum/action/peephole_cancel/PHC = new
- user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+ user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
PHC.Grant(user)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, /atom/.proc/check_eye, user)
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index d818e982854..41aa197f567 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -389,7 +389,7 @@
playsound(console, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE)
remote_eye.setLoc(T)
to_chat(target, "Jumped to [selected].")
- C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
+ C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/static)
C.clear_fullscreen("flash", 3)
else
playsound(console, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index c7f2c778f07..9d1501ed1ee 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -235,7 +235,7 @@
C.set_handcuffed(null)
C.update_handcuffed()
if(C.hud_used)
- var/obj/screen/inventory/hand/R = C.hud_used.hand_slots["[held_index]"]
+ var/atom/movable/screen/inventory/hand/R = C.hud_used.hand_slots["[held_index]"]
if(R)
R.update_icon()
if(C.gloves)
@@ -253,7 +253,7 @@
C.set_handcuffed(null)
C.update_handcuffed()
if(C.hud_used)
- var/obj/screen/inventory/hand/L = C.hud_used.hand_slots["[held_index]"]
+ var/atom/movable/screen/inventory/hand/L = C.hud_used.hand_slots["[held_index]"]
if(L)
L.update_icon()
if(C.gloves)
@@ -340,7 +340,7 @@
if(C.dna.species.mutanthands && !is_pseudopart)
C.put_in_hand(new C.dna.species.mutanthands(), held_index)
if(C.hud_used)
- var/obj/screen/inventory/hand/hand = C.hud_used.hand_slots["[held_index]"]
+ var/atom/movable/screen/inventory/hand/hand = C.hud_used.hand_slots["[held_index]"]
if(hand)
hand.update_icon()
C.update_inv_gloves()
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 3523c060c49..f8c873b5a94 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -124,7 +124,7 @@
owner.set_usable_hands(owner.usable_hands + 1)
if(owner.hud_used)
- var/obj/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
+ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
hand_screen_object?.update_icon()
@@ -220,7 +220,7 @@
owner.set_usable_hands(owner.usable_hands + 1)
if(owner.hud_used)
- var/obj/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
+ var/atom/movable/screen/inventory/hand/hand_screen_object = owner.hud_used.hand_slots["[held_index]"]
hand_screen_object?.update_icon()
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index e949c91a0c4..c2ed56ebbdd 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -75,9 +75,9 @@
if((organ_flags & ORGAN_FAILING))
C.become_blind(EYE_DAMAGE)
else if(damage > 30)
- C.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 2)
+ C.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/impaired, 2)
else
- C.overlay_fullscreen("eye_damage", /obj/screen/fullscreen/impaired, 1)
+ C.overlay_fullscreen("eye_damage", /atom/movable/screen/fullscreen/impaired, 1)
//called once since we don't want to keep clearing the screen of eye damage for people who are below 20 damage
else if(damaged)
damaged = FALSE
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 05b886833e3..500be423af3 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -94,13 +94,13 @@
H.failed_last_breath = TRUE
if(safe_oxygen_min)
- H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ H.throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
else if(safe_toxins_min)
- H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ H.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
else if(safe_co2_min)
- H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ H.throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2)
else if(safe_nitro_min)
- H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+ H.throw_alert("not_enough_nitro", /atom/movable/screen/alert/not_enough_nitro)
return FALSE
var/gas_breathed = 0
@@ -139,7 +139,7 @@
if(O2_pp > safe_oxygen_max)
var/ratio = (breath_gases[/datum/gas/oxygen][MOLES]/safe_oxygen_max) * 10
H.apply_damage_type(clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
- H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+ H.throw_alert("too_much_oxy", /atom/movable/screen/alert/too_much_oxy)
else
H.clear_alert("too_much_oxy")
@@ -147,7 +147,7 @@
if(safe_oxygen_min)
if(O2_pp < safe_oxygen_min)
gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases[/datum/gas/oxygen][MOLES])
- H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ H.throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy)
else
H.failed_last_breath = FALSE
if(H.health >= H.crit_threshold)
@@ -167,7 +167,7 @@
if(N2_pp > safe_nitro_max)
var/ratio = (breath_gases[/datum/gas/nitrogen][MOLES]/safe_nitro_max) * 10
H.apply_damage_type(clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
- H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
+ H.throw_alert("too_much_nitro", /atom/movable/screen/alert/too_much_nitro)
else
H.clear_alert("too_much_nitro")
@@ -175,7 +175,7 @@
if(safe_nitro_min)
if(N2_pp < safe_nitro_min)
gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases[/datum/gas/nitrogen][MOLES])
- H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro)
+ H.throw_alert("nitro", /atom/movable/screen/alert/not_enough_nitro)
else
H.failed_last_breath = FALSE
if(H.health >= H.crit_threshold)
@@ -200,7 +200,7 @@
H.apply_damage_type(3, co2_damage_type) // Lets hurt em a little, let them know we mean business
if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
H.apply_damage_type(8, co2_damage_type)
- H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2)
+ H.throw_alert("too_much_co2", /atom/movable/screen/alert/too_much_co2)
if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
H.emote("cough")
@@ -212,7 +212,7 @@
if(safe_co2_min)
if(CO2_pp < safe_co2_min)
gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases[/datum/gas/carbon_dioxide][MOLES])
- H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ H.throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2)
else
H.failed_last_breath = FALSE
if(H.health >= H.crit_threshold)
@@ -233,7 +233,7 @@
if(Toxins_pp > safe_toxins_max)
var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_toxins_max) * 10
H.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
- H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ H.throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
else
H.clear_alert("too_much_tox")
@@ -242,7 +242,7 @@
if(safe_toxins_min)
if(Toxins_pp < safe_toxins_min)
gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases[/datum/gas/plasma][MOLES])
- H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ H.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox)
else
H.failed_last_breath = FALSE
if(H.health >= H.crit_threshold)
@@ -276,7 +276,7 @@
if(safe_toxins_max && SA_pp > safe_toxins_max*3)
var/ratio = (breath_gases[/datum/gas/nitrous_oxide][MOLES]/safe_toxins_max)
H.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
- H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ H.throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox)
else
H.clear_alert("too_much_tox")
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index ed62f999429..e7d862f26a8 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -84,13 +84,13 @@
H.clear_alert("disgust")
SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "disgust")
if(DISGUST_LEVEL_GROSS to DISGUST_LEVEL_VERYGROSS)
- H.throw_alert("disgust", /obj/screen/alert/gross)
+ H.throw_alert("disgust", /atom/movable/screen/alert/gross)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/gross)
if(DISGUST_LEVEL_VERYGROSS to DISGUST_LEVEL_DISGUSTED)
- H.throw_alert("disgust", /obj/screen/alert/verygross)
+ H.throw_alert("disgust", /atom/movable/screen/alert/verygross)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/verygross)
if(DISGUST_LEVEL_DISGUSTED to INFINITY)
- H.throw_alert("disgust", /obj/screen/alert/disgusted)
+ H.throw_alert("disgust", /atom/movable/screen/alert/disgusted)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "disgust", /datum/mood_event/disgusted)
/obj/item/organ/stomach/Remove(mob/living/carbon/M, special = 0)
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index d06131801de..3b77894f679 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -13,7 +13,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)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index f26818da2a3..62110e83052 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -446,22 +446,22 @@
if(0.75 to INFINITY)
occupant.clear_alert("charge")
if(0.5 to 0.75)
- occupant.throw_alert("charge", /obj/screen/alert/lowcell, 1)
+ occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 1)
if(0.25 to 0.5)
- occupant.throw_alert("charge", /obj/screen/alert/lowcell, 2)
+ occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 2)
if(0.01 to 0.25)
- occupant.throw_alert("charge", /obj/screen/alert/lowcell, 3)
+ occupant.throw_alert("charge", /atom/movable/screen/alert/lowcell, 3)
else
- occupant.throw_alert("charge", /obj/screen/alert/emptycell)
+ occupant.throw_alert("charge", /atom/movable/screen/alert/emptycell)
var/integrity = obj_integrity/max_integrity*100
switch(integrity)
if(30 to 45)
- occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 1)
+ occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 1)
if(15 to 35)
- occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 2)
+ occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 2)
if(-INFINITY to 15)
- occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 3)
+ occupant.throw_alert("mech damage", /atom/movable/screen/alert/low_mech_integrity, 3)
else
occupant.clear_alert("mech damage")
var/atom/checking = occupant.loc