defines, helpers, onclick

code/_onclick/hud/parallax.dm

@@ -310,8 +310,3 @@
 
 /obj/screen/parallax_layer/planet/update_o()
 	return //Shit wont move
-
-#undef LOOP_NONE
-#undef LOOP_NORMAL
-#undef LOOP_REVERSE
-#undef LOOP_TIME

code/_onclick/hud/screen_objects.dm

@@ -180,13 +180,18 @@
 
 /obj/screen/close
 	name = "close"
+	layer = ABOVE_HUD_LAYER
+	plane = ABOVE_HUD_PLANE
+	icon_state = "backpack_close"
+
+/obj/screen/close/Initialize(mapload, new_master)
+	. = ..()
+	master = new_master
 
 /obj/screen/close/Click()
-	if(istype(master, /obj/item/storage))
-		var/obj/item/storage/S = master
-		S.close(usr)
-	return 1
-
+	var/datum/component/storage/S = master
+	S.hide_from(usr)
+	return TRUE
 
 /obj/screen/drop
 	name = "drop"
@@ -346,19 +351,27 @@
 
 /obj/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)
+	. = ..()
+	master = new_master
 
 /obj/screen/storage/Click(location, control, params)
 	if(world.time <= usr.next_move)
-		return 1
+		return TRUE
 	if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun())
-		return 1
+		return TRUE
 	if (ismecha(usr.loc)) // stops inventory actions in a mech
-		return 1
+		return TRUE
 	if(master)
 		var/obj/item/I = usr.get_active_held_item()
 		if(I)
 			master.attackby(I, usr, params)
-	return 1
+	return TRUE
 
 /obj/screen/throw_catch
 	name = "throw/catch"