Merge branch 'master' of github.com:Monkestation/Monkestation2.0 into modlinks-except-i-didnt-fuck-it-up-this-time

Author: Absolucy

code/__DEFINES/computers.dm

@@ -13,3 +13,6 @@
 #define CATEGORY_BITRUNNING_TECH "Tech"
 #define CATEGORY_BITRUNNING_COMBAT_GEAR "Combat gear" // monkeystation addition: bitrunning tech split up
 #define CATEGORY_BITRUNNING_ABILITIES "Abilities" // monkeystation addition: bitrunning tech split up
+
+///Helper macro for record computers' preview views, used to ensure consistency in all use cases.
+#define USER_PREVIEW_ASSIGNED_VIEW(user_ckey) "preview_[user_ckey]_[REF(src)]_records"

code/__DEFINES/dcs/signals/signals_tgui.dm

@@ -0,0 +1,2 @@
+/// Window is fully visible and we can make fragile calls
+#define COMSIG_TGUI_WINDOW_VISIBLE "tgui_window_visible"

code/_onclick/hud/map_popups.dm

@@ -19,17 +19,6 @@
 /atom/movable/screen/proc/set_position(x, y, px = 0, py = 0)
 	if(assigned_map)
 		screen_loc = "[assigned_map]:[x]:[px],[y]:[py]"
-		ASYNC
-			// HACK: This fixes the character creator in 516 being small and relying on other byondui things (like cameras) to open in order to update and refresh.
-			// This also will fix the camera console screen being offset, Gateway, and admin pod panel.
-			// Adding 100 then setting it back seemed to do the trick!
-			// Why the fuck does this work? This is some byond bug and I honestly have no fucking clue why this works.
-			// I don't think plane master will be affected, I hope.
-			// We're stuck in the belly of this awful machine.
-			sleep(0.5 SECONDS) // If it's too fast, it has a chance to fail? Idk. This seems like a good number.
-			screen_loc = "[assigned_map]:[x+100]:[px],[y+100]:[py]"
-			sleep(0.5 SECONDS)
-			screen_loc = "[assigned_map]:[x]:[px],[y]:[py]"
 	else
 		screen_loc = "[x]:[px],[y]:[py]"
 

code/_onclick/hud/map_view.dm

@@ -16,10 +16,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
 
 /atom/movable/screen/map_view/Destroy()
 	for(var/datum/weakref/client_ref in viewers_to_huds)
-		var/client/our_client = client_ref.resolve()
-		if(!istype(our_client) || QDELING(our_client))
-			continue
-		hide_from(our_client.mob)
+		hide_from_client(client_ref.resolve())
 
 	return ..()
 
@@ -31,42 +28,66 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/map_view)
 	assigned_map = map_key
 	set_position(1, 1)
 
-/atom/movable/screen/map_view/proc/display_to(mob/show_to)
-	if(QDELETED(show_to) || QDELETED(show_to.client))
-		return
-	show_to.client?.register_map_obj(src)
+/**
+ * Generates and displays the map view to a client
+ * Make sure you at least try to pass tgui_window if map view needed on UI,
+ * so it will wait a signal from TGUI, which tells windows is fully visible.
+ *
+ * If you use map view not in TGUI, just call it as usualy.
+ * If UI needs planes, call display_to_client.
+ *
+ * * show_to - Mob which needs map view
+ * * window - Optional. TGUI window which needs map view
+ */
+/atom/movable/screen/map_view/proc/display_to(mob/show_to, datum/tgui_window/window)
+	if(window && !window.visible)
+		RegisterSignal(window, COMSIG_TGUI_WINDOW_VISIBLE, PROC_REF(display_on_ui_visible))
+	else
+		display_to_client(show_to.client)
+
+/atom/movable/screen/map_view/proc/display_on_ui_visible(datum/tgui_window/window, client/show_to)
+	SIGNAL_HANDLER
+	display_to_client(show_to)
+	UnregisterSignal(window, COMSIG_TGUI_WINDOW_VISIBLE)
+
+/atom/movable/screen/map_view/proc/display_to_client(client/show_to)
+	show_to.register_map_obj(src)
 	// We need to add planesmasters to the popup, otherwise
 	// blending fucks up massively. Any planesmaster on the main screen does
 	// NOT apply to map popups. If there's ever a way to make planesmasters
 	// omnipresent, then this wouldn't be needed.
 	// We lazy load this because there's no point creating all these if none's gonna see em
 
 	// Store this info in a client -> hud pattern, so ghosts closing the window nukes the right group
-	var/datum/weakref/client_ref = WEAKREF(show_to.client)
+	var/datum/weakref/client_ref = WEAKREF(show_to)
 
 	var/datum/weakref/hud_ref = viewers_to_huds[client_ref]
 	var/datum/hud/our_hud = hud_ref?.resolve()
-	if(!QDELETED(our_hud))
+	if(our_hud)
 		return our_hud.get_plane_group(PLANE_GROUP_POPUP_WINDOW(src))
 
 	// Generate a new plane group for this case
 	var/datum/plane_master_group/popup/pop_planes = new(PLANE_GROUP_POPUP_WINDOW(src), assigned_map)
-	viewers_to_huds[client_ref] = WEAKREF(show_to.hud_used)
-	pop_planes.attach_to(show_to.hud_used)
+	viewers_to_huds[client_ref] = WEAKREF(show_to.mob.hud_used)
+	pop_planes.attach_to(show_to.mob.hud_used)
 
 	return pop_planes
 
 /atom/movable/screen/map_view/proc/hide_from(mob/hide_from)
-	if(QDELETED(hide_from) || QDELETED(hide_from.canon_client))
+	hide_from_client(hide_from?.canon_client)
+
+/atom/movable/screen/map_view/proc/hide_from_client(client/hide_from)
+	if(!hide_from)
 		return
-	hide_from?.canon_client.clear_map(assigned_map)
-	var/client_ref = WEAKREF(hide_from?.canon_client)
+	hide_from.clear_map(assigned_map)
 
+	var/datum/weakref/client_ref = WEAKREF(hide_from)
 	// Make sure we clear the *right* hud
 	var/datum/weakref/hud_ref = viewers_to_huds[client_ref]
 	viewers_to_huds -= client_ref
+
 	var/datum/hud/clear_from = hud_ref?.resolve()
-	if(QDELETED(clear_from))
+	if(!clear_from)
 		return
 
 	var/datum/plane_master_group/popup/pop_planes = clear_from.get_plane_group(PLANE_GROUP_POPUP_WINDOW(src))

code/controllers/subsystem/tgui.dm

@@ -26,12 +26,24 @@ SUBSYSTEM_DEF(tgui)
 
 /datum/controller/subsystem/tgui/PreInit()
 	basehtml = file2text('tgui/public/tgui.html')
+
+	// Inject inline helper functions
+	var/helpers = file2text('tgui/public/helpers.min.js')
+	helpers = "<script type='text/javascript'>\n[helpers]\n</script>"
+	basehtml = replacetextEx(basehtml, "<!-- tgui:helpers -->", helpers)
+
+	// Inject inline ntos-error styles
+	var/ntos_error = file2text('tgui/public/ntos-error.min.css')
+	ntos_error = "<style type='text/css'>\n[ntos_error]\n</style>"
+	basehtml = replacetextEx(basehtml, "<!-- tgui:ntos-error -->", ntos_error)
+
 	// Inject inline polyfills
 	var/polyfill = file2text('tgui/public/tgui-polyfill.min.js')
-	polyfill = "<script>\n[polyfill]\n</script>"
+	polyfill = "<script type='text/javascript'>\n[polyfill]\n</script>"
 	basehtml = replacetextEx(basehtml, "<!-- tgui:inline-polyfill -->", polyfill)
 	basehtml = replacetextEx(basehtml, "<!-- tgui:nt-copyright -->", "Nanotrasen (c) 2525-[CURRENT_STATION_YEAR]")
 
+
 /datum/controller/subsystem/tgui/Shutdown()
 	close_all_uis()
 

code/game/machinery/computer/camera.dm

@@ -15,9 +15,7 @@
 	var/list/concurrent_users = list()
 
 	// Stuff needed to render the map
-	var/atom/movable/screen/map_view/cam_screen
-	/// All the plane masters that need to be applied.
-	var/atom/movable/screen/background/cam_background
+	var/atom/movable/screen/map_view/camera/cam_screen
 
 	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON|INTERACT_MACHINE_SET_MACHINE|INTERACT_MACHINE_REQUIRES_SIGHT
 
@@ -34,13 +32,9 @@
 	// Initialize map objects
 	cam_screen = new
 	cam_screen.generate_view(map_name)
-	cam_background = new
-	cam_background.assigned_map = map_name
-	cam_background.del_on_map_removal = FALSE
 
 /obj/machinery/computer/security/Destroy()
 	QDEL_NULL(cam_screen)
-	QDEL_NULL(cam_background)
 	return ..()
 
 /obj/machinery/computer/security/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
@@ -67,12 +61,11 @@
 		if(length(concurrent_users) == 1 && is_living)
 			playsound(src, 'sound/machines/terminal_on.ogg', 25, FALSE)
 			use_power(active_power_usage)
-		// Register map objects
-		cam_screen.display_to(user)
-		user.client.register_map_obj(cam_background)
 		// Open UI
 		ui = new(user, src, "CameraConsole", name)
 		ui.open()
+		// Register map objects
+		cam_screen.display_to(user, ui.window)
 
 /obj/machinery/computer/security/ui_status(mob/user)
 	. = ..()
@@ -126,7 +119,7 @@
 /obj/machinery/computer/security/proc/update_active_camera_screen()
 	// Show static if can't use the camera
 	if(!active_camera?.can_use())
-		show_camera_static()
+		cam_screen.show_camera_static()
 		return
 
 	var/list/visible_turfs = list()
@@ -154,9 +147,7 @@
 	var/size_x = bbox[3] - bbox[1] + 1
 	var/size_y = bbox[4] - bbox[2] + 1
 
-	cam_screen.vis_contents = visible_turfs
-	cam_background.icon_state = "clear"
-	cam_background.fill_rect(1, 1, size_x, size_y)
+	cam_screen.show_camera(visible_turfs, size_x, size_y)
 
 /obj/machinery/computer/security/ui_close(mob/user)
 	. = ..()
@@ -173,13 +164,35 @@
 		playsound(src, 'sound/machines/terminal_off.ogg', 25, FALSE)
 		use_power(0)
 
-/obj/machinery/computer/security/proc/show_camera_static()
-	cam_screen.vis_contents.Cut()
+/atom/movable/screen/map_view/camera
+	/// All the plane masters that need to be applied.
+	var/atom/movable/screen/background/cam_background
+
+/atom/movable/screen/map_view/camera/Destroy()
+	QDEL_NULL(cam_background)
+	return ..()
+
+/atom/movable/screen/map_view/camera/generate_view(map_key)
+	. = ..()
+	cam_background = new
+	cam_background.del_on_map_removal = FALSE
+	cam_background.assigned_map = assigned_map
+
+/atom/movable/screen/map_view/camera/display_to_client(client/show_to)
+	show_to.register_map_obj(cam_background)
+	. = ..()
+
+/atom/movable/screen/map_view/camera/proc/show_camera(list/visible_turfs, size_x, size_y)
+	vis_contents = visible_turfs
+	cam_background.icon_state = "clear"
+	cam_background.fill_rect(1, 1, size_x, size_y)
+
+/atom/movable/screen/map_view/camera/proc/show_camera_static()
+	vis_contents.Cut()
 	cam_background.icon_state = "scanline2"
 	cam_background.fill_rect(1, 1, DEFAULT_MAP_SIZE, DEFAULT_MAP_SIZE)
 
 // SECURITY MONITORS
-
 /obj/machinery/computer/security/wooden_tv
 	name = "security camera monitor"
 	desc = "An old TV hooked into the station's camera network."

code/game/machinery/computer/records/medical.dm

@@ -32,7 +32,6 @@
 		return
 	ui = SStgui.try_update_ui(user, src, ui)
 	if (!ui)
-		create_character_preview_view(user)
 		ui = new(user, src, "MedicalRecords")
 		ui.set_autoupdate(FALSE)
 		ui.open()

code/game/machinery/computer/records/records.dm

@@ -13,11 +13,17 @@
 	if(!has_access)
 		return data
 
-	data["assigned_view"] = "preview_[user.ckey]_[REF(src)]_records"
+	data["assigned_view"] = USER_PREVIEW_ASSIGNED_VIEW(user.ckey)
 	data["station_z"] = !!(z && is_station_level(z))
 
 	return data
 
+/obj/machinery/computer/records/ui_close(mob/user)
+	. = ..()
+	user.client?.screen_maps -= USER_PREVIEW_ASSIGNED_VIEW(user.ckey)
+	if((LAZYLEN(open_uis) <= 1) && character_preview_view) //only delete the preview if we're the last one to close the console.
+		QDEL_NULL(character_preview_view)
+
 /obj/machinery/computer/records/ui_act(action, list/params, datum/tgui/ui)
 	. = ..()
 	if(.)
@@ -95,29 +101,31 @@
 				return FALSE
 
 			playsound(src, "sound/machines/terminal_button0[rand(1, 8)].ogg", 50, TRUE)
-			update_preview(user, params["assigned_view"], target)
+			update_preview(user, params["assigned_view"], target, ui.window)
 			return TRUE
 
 	return FALSE
 
 /// Creates a character preview view for the UI.
-/obj/machinery/computer/records/proc/create_character_preview_view(mob/user)
-	var/assigned_view = "preview_[user.ckey]_[REF(src)]_records"
+/obj/machinery/computer/records/proc/create_character_preview_view(mob/user, datum/tgui_window/window)
+	var/assigned_view = USER_PREVIEW_ASSIGNED_VIEW(user.ckey)
 	if(user.client?.screen_maps[assigned_view])
 		return
 
 	var/atom/movable/screen/map_view/char_preview/new_view = new(null, src)
 	new_view.generate_view(assigned_view)
-	new_view.display_to(user)
+	new_view.display_to(user, window)
+	return new_view
 
 /// Takes a record and updates the character preview view to match it.
-/obj/machinery/computer/records/proc/update_preview(mob/user, assigned_view, datum/record/crew/target)
+/obj/machinery/computer/records/proc/update_preview(mob/user, assigned_view, datum/record/crew/target, datum/tgui_window/window)
 	var/mutable_appearance/preview = new(target.character_appearance)
 	preview.underlays += mutable_appearance('icons/effects/effects.dmi', "static_base", alpha = 20)
 	preview.add_overlay(mutable_appearance(generate_icon_alpha_mask('icons/effects/effects.dmi', "scanline"), alpha = 20))
 
 	var/atom/movable/screen/map_view/char_preview/old_view = user.client?.screen_maps[assigned_view]?[1]
 	if(!old_view)
+		character_preview_view = create_character_preview_view(user, window)
 		return
 
 	old_view.appearance = preview.appearance

code/game/machinery/computer/records/security.dm

@@ -80,7 +80,6 @@
 		return
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		character_preview_view = create_character_preview_view(user)
 		ui = new(user, src, "SecurityRecords")
 		ui.set_autoupdate(FALSE)
 		ui.open()

code/game/objects/items.dm

@@ -96,7 +96,7 @@
 	///How large is the object, used for stuff like whether it can fit in backpacks or not
 	var/w_class = WEIGHT_CLASS_NORMAL
 	///This is used to determine on which slots an item can fit.
-	var/slot_flags = 0
+	var/slot_flags = NONE
 	pass_flags = PASSTABLE
 	pressure_resistance = 4
 	/// This var exists as a weird proxy "owner" ref
@@ -897,31 +897,7 @@
 	if(!ismob(loc))
 		return
 	var/mob/owner = loc
-	var/flags = slot_flags
-	if(flags & ITEM_SLOT_OCLOTHING)
-		owner.update_worn_oversuit()
-	if(flags & ITEM_SLOT_ICLOTHING)
-		owner.update_worn_undersuit()
-	if(flags & ITEM_SLOT_GLOVES)
-		owner.update_worn_gloves()
-	if(flags & ITEM_SLOT_EYES)
-		owner.update_worn_glasses()
-	if(flags & ITEM_SLOT_EARS)
-		owner.update_inv_ears()
-	if(flags & ITEM_SLOT_MASK)
-		owner.update_worn_mask()
-	if(flags & ITEM_SLOT_HEAD)
-		owner.update_worn_head()
-	if(flags & ITEM_SLOT_FEET)
-		owner.update_worn_shoes()
-	if(flags & ITEM_SLOT_ID)
-		owner.update_worn_id()
-	if(flags & ITEM_SLOT_BELT)
-		owner.update_worn_belt()
-	if(flags & ITEM_SLOT_BACK)
-		owner.update_worn_back()
-	if(flags & ITEM_SLOT_NECK)
-		owner.update_worn_neck()
+	owner.update_clothing(slot_flags | owner.get_slot_by_item(src))
 
 ///Returns the temperature of src. If you want to know if an item is hot use this proc.
 /obj/item/proc/get_temperature()

code/game/objects/items/devices/spyglasses.dm

@@ -20,7 +20,7 @@
 
 /obj/item/clothing/glasses/hud/security/sunglasses/normal/spy/proc/on_screen_clear(client/source, window)
 	SIGNAL_HANDLER
-	linked_bug.cam_screen.hide_from(source.mob)
+	linked_bug.cam_screen.hide_from_client(source)
 
 /obj/item/clothing/glasses/hud/security/sunglasses/normal/spy/equipped(mob/user, slot)
 	. = ..()

code/modules/admin/view_variables/color_matrix_editor.dm

@@ -25,7 +25,6 @@
 
 	proxy_view.appearance = view
 	proxy_view.color = current_color
-	proxy_view.display_to(owner.mob)
 
 /datum/color_matrix_editor/Destroy(force)
 	QDEL_NULL(proxy_view)
@@ -51,6 +50,7 @@
 	if(!ui)
 		ui = new(user, src, "ColorMatrixEditor")
 		ui.open()
+		proxy_view.display_to(owner.mob, ui.window)
 
 /datum/color_matrix_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
 	. = ..()