/obj/screen --> /atom/movable/screen

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"
@@ -53,7 +53,7 @@
 	inv_box.slot_id = SLOT_WEAR_MASK
 	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"
@@ -62,7 +62,7 @@
 	inv_box.slot_id = SLOT_NECK
 	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"
@@ -71,7 +71,7 @@
 	inv_box.slot_id = SLOT_HEAD
 	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"
@@ -79,37 +79,37 @@
 	inv_box.slot_id = SLOT_BACK
 	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.screen_loc = ui_pull_resist
 	pull_icon.hud = src
 	pull_icon.update_icon()
 	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()
@@ -117,13 +117,13 @@
 
 	mymob.client.screen = list()
 
-	using = new /obj/screen/resist()
+	using = new /atom/movable/screen/resist()
 	using.icon = ui_style
 	using.screen_loc = ui_pull_resist
 	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[inv.slot_id] = inv