[MIRROR] clean up flags (Requires #11623 Merged First) (#11637)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/__defines/admin_verb.dm

@@ -86,6 +86,9 @@ _ADMIN_VERB(verb_path_name, verb_permissions, verb_name, verb_desc, verb_categor
 
 // Special categories that are separated
 #define ADMIN_CATEGORY_DEBUG "Debug"
+#define ADMIN_CATEGORY_DEBUG_INVESTIGATE "Debug.Investigate"
+#define ADMIN_CATEGORY_DEBUG_DANGEROUS "Debug.Dangerous"
+#define ADMIN_CATEGORY_DEBUG_GAME "Debug.Game"
 #define ADMIN_CATEGORY_SERVER "Server"
 #define ADMIN_CATEGORY_OBJECT "Object"
 #define ADMIN_CATEGORY_MAPPING "Mapping"

code/controllers/admin.dm

@@ -42,7 +42,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
 	usr.client.debug_variables(target)
 	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")
 
-ADMIN_VERB(restart_controller, R_DEBUG, "Restart Controller", "Restart one of the various periodic loop controllers for the game (be careful!)", ADMIN_CATEGORY_DEBUG, controller in list("Master", "Failsafe"))
+ADMIN_VERB(restart_controller, R_DEBUG, "Restart Controller", "Restart one of the various periodic loop controllers for the game (be careful!)", ADMIN_CATEGORY_DEBUG_GAME, controller in list("Master", "Failsafe"))
 	switch(controller)
 		if("Master")
 			Recreate_MC()
@@ -53,13 +53,13 @@ ADMIN_VERB(restart_controller, R_DEBUG, "Restart Controller", "Restart one of th
 
 	message_admins("Admin [key_name_admin(user)] has restarted the [controller] controller.")
 
-ADMIN_VERB(debug_antagonist_template, R_DEBUG, "Debug Antagonist", "Debug an antagonist template", ADMIN_CATEGORY_DEBUG, antag_type in GLOB.all_antag_types)
+ADMIN_VERB(debug_antagonist_template, R_DEBUG, "Debug Antagonist", "Debug an antagonist template", ADMIN_CATEGORY_DEBUG_GAME, antag_type in GLOB.all_antag_types)
 	var/datum/antagonist/antag = GLOB.all_antag_types[antag_type]
 	if(antag)
 		user.debug_variables(antag)
 		message_admins("Admin [key_name_admin(user)] is debugging the [antag.role_text] template.")
 
-ADMIN_VERB(debug_controller, R_DEBUG, "Debug Controller", "Debug the various periodic loop controllers for the game (be careful!)", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(debug_controller, R_DEBUG, "Debug Controller", "Debug the various periodic loop controllers for the game (be careful!)", ADMIN_CATEGORY_DEBUG_GAME)
 	var/list/options = list()
 	options["MC"] = Master
 	options["Failsafe"] = Failsafe

code/controllers/master.dm

@@ -145,7 +145,7 @@ GLOBAL_REAL(Master, /datum/controller/master)
 		ss.Shutdown()
 	log_world("Shutdown complete")
 
-ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "View the current states of the Subsystem Controllers.", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "View the current states of the Subsystem Controllers.", ADMIN_CATEGORY_DEBUG_INVESTIGATE)
 	Master.tgui_interact(user.mob)
 
 /datum/controller/master/tgui_status(mob/user, datum/tgui_state/state)

code/controllers/subsystems/timer.dm

@@ -611,7 +611,7 @@ SUBSYSTEM_DEF(timer)
  * * flags flags for this timer, see: code\__DEFINES\subsystems.dm
  * * timer_subsystem the subsystem to insert this timer into
  */
-/proc/_addtimer(datum/callback/callback, wait = 0, flags = 0, datum/controller/subsystem/timer/timer_subsystem, file, line)
+/proc/_addtimer(datum/callback/callback, wait = 0, flags = NONE, datum/controller/subsystem/timer/timer_subsystem, file, line)
 	ASSERT(istype(callback), "addtimer called [callback ? "with an invalid callback ([callback])" : "without a callback"]")
 	ASSERT(isnum(wait), "addtimer called with a non-numeric wait ([wait])")
 

code/datums/components/antags/changeling/powers/armor.dm

@@ -36,7 +36,7 @@
 	name = "flesh mass"
 	icon_state = "lingspacesuit"
 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
-	flags = 0	//Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it,
+	flags = NONE	//Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it,
 				//it still ends up in your blood. (also balance but muh fluff)
 	item_flags = THICKMATERIAL | DROPDEL | NOSTRIP
 	allowed = list(POCKET_GENERIC, POCKET_ALL_TANKS)

code/datums/outfits/jobs/special_vr.dm

@@ -41,7 +41,7 @@
 	backpack_contents = list(/obj/item/stamp/clown = 1, /obj/item/bikehorn = 1)
 	id_type = /obj/item/card/id/civilian/clown
 	pda_type = /obj/item/pda/clown
-	flags = 0
+	flags = NONE
 
 /decl/hierarchy/outfit/job/mime
 	name = OUTFIT_JOB_NAME(JOB_MIME)

code/game/antagonist/antagonist.dm

@@ -51,7 +51,7 @@
 	var/bantype = JOB_SYNDICATE             // Ban to check when spawning this antag.
 	var/minimum_player_age = 7            	// Players need to be at least minimum_player_age days old before they are eligable for auto-spawning
 	var/suspicion_chance = 50               // Prob of being on the initial Command report
-	var/flags = 0                           // Various runtime options.
+	var/flags = NONE                           // Various runtime options.
 
 	// Used for setting appearance.
 	var/list/valid_species =       list(SPECIES_UNATHI,SPECIES_TAJARAN,SPECIES_SKRELL,SPECIES_HUMAN,SPECIES_DIONA,SPECIES_TESHARI)

code/game/antagonist/station/loyalist.dm

@@ -15,7 +15,7 @@ var/datum/antagonist/loyalists/loyalists
 	victory_feedback_tag = "win - rev heads killed"
 	loss_feedback_tag = "loss - heads killed"
 	antaghud_indicator = "hudloyalist"
-	flags = 0
+	flags = NONE
 
 	hard_cap = 2
 	hard_cap_round = 4

code/game/atom/_atom.dm

@@ -7,7 +7,7 @@
 /atom
 	layer = TURF_LAYER //This was here when I got here. Why though?
 	var/level = 2
-	var/flags = 0
+	var/flags = NONE
 	var/was_bloodied
 	var/blood_color
 	var/pass_flags = 0

code/game/objects/items/contraband.dm

@@ -16,7 +16,7 @@
 	starts_with = list(/obj/item/reagent_containers/pill/zoom = 7)
 
 /obj/item/reagent_containers/glass/beaker/vial/random
-	flags = 0
+	flags = NONE
 	var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list(REAGENT_ID_CLEANER = 15) = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/random/toxin

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -82,7 +82,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	origin_tech = list(TECH_BIO = 1)
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/herb.ogg'
@@ -116,7 +116,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/wooden.ogg'
 	pickup_sound = 'sound/items/pickup/wooden.ogg'
@@ -164,7 +164,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
@@ -344,7 +344,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	no_variants = FALSE
 	can_weld = FALSE
 
@@ -357,7 +357,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	no_variants = FALSE
 	can_weld = TRUE
 	welds_into = /obj/item/stack/material/marble
@@ -371,7 +371,7 @@
 	throwforce = 15.0
 	throw_speed = 5
 	throw_range = 20
-	flags = 0
+	flags = NONE
 	no_variants = FALSE
 	can_weld = TRUE
 	welds_into = /obj/item/stack/material/marble

code/game/objects/structures/ledges.dm

@@ -16,7 +16,7 @@
 
 /obj/structure/ledge_corner
 	icon_state = "ledge-corner"
-	flags = 0
+	flags = NONE
 	name = "rock ledge"
 	desc = "An easily scaleable rocky ledge."
 	icon = 'icons/obj/ledges.dmi'

code/game/objects/structures/low_wall.dm

@@ -397,7 +397,7 @@
 	icon_state = "preview_glass"
 	basestate = "window"
 	alpha = 180
-	flags = 0
+	flags = NONE
 	fulltile = TRUE
 	maxhealth = 24
 	glasstype = /obj/item/stack/material/glass

code/game/objects/structures/window.dm

@@ -448,7 +448,7 @@
 		icon_state = "[basestate]"
 		return
 	else
-		flags = 0 // Removes ON_BORDER and OPPOSITE_OPACITY
+		flags = NONE // Removes ON_BORDER and OPPOSITE_OPACITY
 	var/list/dirs = list()
 	if(anchored)
 		for(var/obj/structure/window/W in orange(src,1))
@@ -494,7 +494,7 @@
 	icon_state = "window-full"
 	maxhealth = 24
 	fulltile = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/structure/window/phoronbasic
 	name = "phoron window"
@@ -512,7 +512,7 @@
 	icon_state = "phoronwindow-full"
 	maxhealth = 80
 	fulltile = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/structure/window/phoronreinforced
 	name = "reinforced borosilicate window"
@@ -531,7 +531,7 @@
 	icon_state = "phoronrwindow-full"
 	maxhealth = 160
 	fulltile = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/structure/window/reinforced
 	name = "reinforced window"
@@ -549,7 +549,7 @@
 	icon_state = "rwindow-full"
 	maxhealth = 80
 	fulltile = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/structure/window/reinforced/tinted
 	name = "tinted window"
@@ -587,7 +587,7 @@
 	icon_state = "rwindow-full"
 	maxhealth = 80
 	fulltile = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/structure/window/reinforced/polarized/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/multitool) && !anchored) // Only allow programming if unanchored!

code/game/turfs/flooring/flooring.dm

@@ -138,7 +138,7 @@ var/list/flooring_types
 /decl/flooring/grass/sif // Subtype for Sif's grass.
 	name = "growth"
 	desc = "A natural moss that has adapted to the sheer cold climate."
-	flags = 0
+	flags = NONE
 	icon = 'icons/turf/outdoors.dmi'
 	icon_base = "grass_sif"
 	build_type = null
@@ -148,7 +148,7 @@ var/list/flooring_types
 /decl/flooring/grass/sif/forest
 	name = "thick growth"
 	desc = "A natural moss that has adapted to the sheer cold climate."
-	flags = 0
+	flags = NONE
 	icon = 'icons/turf/outdoors.dmi'
 	icon_base = "grass_sif_dark"
 	build_type = /obj/item/stack/tile/grass/sif/forest
@@ -228,7 +228,7 @@ var/list/flooring_types
 	name = "snowy plating"
 	desc = "Steel plating coated with a light layer of snow."
 	icon_base = "snowyplating"
-	flags = null
+	flags = NONE
 
 /decl/flooring/snow/ice
 	name = "ice"

code/game/turfs/flooring/flooring_vr.dm

@@ -19,7 +19,7 @@
 	icon_base = "flesh_floor"
 
 /decl/flooring/grass/outdoors
-	flags = 0
+	flags = NONE
 	build_type = null
 
 /decl/flooring/grass/outdoors/forest

code/modules/admin/admin_verbs.dm

@@ -142,11 +142,11 @@ ADMIN_VERB(list_signalers, R_ADMIN, "List Signalers", "View all signalers.", ADM
 	user.holder.list_signalers()
 	//BLACKBOX_LOG_ADMIN_VERB("List Signalers")
 
-ADMIN_VERB(list_law_changes, R_ADMIN, "List Law Changes", "View all AI law changes.", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(list_law_changes, R_ADMIN, "List Law Changes", "View all AI law changes.", ADMIN_CATEGORY_DEBUG_INVESTIGATE)
 	user.holder.list_law_changes()
 	//BLACKBOX_LOG_ADMIN_VERB("List Law Changes")
 
-ADMIN_VERB(show_manifest, R_ADMIN, "Show Manifest", "View the shift's Manifest.", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(show_manifest, R_ADMIN, "Show Manifest", "View the shift's Manifest.", ADMIN_CATEGORY_DEBUG_GAME)
 	user.holder.show_manifest()
 	//BLACKBOX_LOG_ADMIN_VERB("Show Manifest")
 

code/modules/admin/callproc/callproc.dm

@@ -92,7 +92,7 @@ GLOBAL_PROTECT(AdminProcCallHandler)
 	usr = lastusr
 	handler.remove_caller(user)
 
-ADMIN_VERB(advanced_proc_call, R_DEBUG, "Advanced ProcCall", "Call a proc on any datum in the server.", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(advanced_proc_call, R_DEBUG, "Advanced ProcCall", "Call a proc on any datum in the server.", ADMIN_CATEGORY_DEBUG_GAME)
 	user.callproc_blocking()
 
 /client/proc/callproc_blocking(list/get_retval)

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -187,7 +187,7 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT
 		state = SDQL2_STATE_ERROR;\
 		CRASH("SDQL2 fatal error");};
 
-ADMIN_VERB(sdql2_query, R_DEBUG, "SDQL2 Query", "Run a SDQL2 query.", ADMIN_CATEGORY_DEBUG, query_text as message)
+ADMIN_VERB(sdql2_query, R_DEBUG, "SDQL2 Query", "Run a SDQL2 query.", ADMIN_CATEGORY_DEBUG_GAME, query_text as message)
 	var/prompt = tgui_alert(user, "Run SDQL2 Query?", "SDQL2", list("Yes", "Cancel"))
 	if (prompt != "Yes")
 		return

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -3,7 +3,7 @@
 /proc/_abs(A)
 	return abs(A)
 
-/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
+/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = NONE)
 	var/mutable_appearance/MA = new()
 	for(var/v in set_vars)
 		MA.vars[v] = set_vars[v]

code/modules/admin/verbs/debug.dm

@@ -624,7 +624,7 @@ ADMIN_VERB(cmd_assume_direct_control, (R_DEBUG|R_ADMIN|R_EVENT), "Assume Direct
 	else
 		tgui_alert_async(usr, "Invalid mob")
 
-ADMIN_VERB(view_runtimes, R_DEBUG, "View Runtimes", "Opens the runtime viewer.", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(view_runtimes, R_DEBUG, "View Runtimes", "Opens the runtime viewer.", ADMIN_CATEGORY_DEBUG_INVESTIGATE)
 	GLOB.error_cache.show_to(user)
 
 	// The runtime viewer has the potential to crash the server if there's a LOT of runtimes

code/modules/admin/verbs/fps.dm

@@ -1,5 +1,5 @@
 ADMIN_VERB_VISIBILITY(set_server_fps, ADMIN_VERB_VISIBLITY_FLAG_MAPPING_DEBUG)
-ADMIN_VERB(set_server_fps, R_DEBUG, "Set Server FPS", "Sets game speed in frames-per-second. Can potentially break the game", ADMIN_CATEGORY_DEBUG)
+ADMIN_VERB(set_server_fps, R_DEBUG, "Set Server FPS", "Sets game speed in frames-per-second. Can potentially break the game", ADMIN_CATEGORY_DEBUG_DANGEROUS)
 	var/cfg_fps = CONFIG_GET(number/fps)
 	var/new_fps = round(tgui_input_number(user, "Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps))
 

code/modules/asset_cache/assets/tgfont.dm

@@ -1,6 +1,5 @@
 /datum/asset/simple/namespaced/tgfont
 	assets = list(
-		"tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"),
 		"tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"),
 	)
 	parents = list(

code/modules/clothing/glasses/glasses.dm

@@ -582,7 +582,7 @@ BLIND     // can't see anything
 	item_state_slots = list(slot_r_hand_str = "sunglasses", slot_l_hand_str = "sunglasses")
 	toggleable = 1
 	actions_types = list(/datum/action/item_action/toggle_monocle)
-	flags = null //doesn't protect eyes because it's a monocle, duh
+	flags = NONE //doesn't protect eyes because it's a monocle, duh
 
 	body_parts_covered = 0
 

code/modules/clothing/glasses/hud.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/glasses/hud
 	name = DEVELOPER_WARNING_NAME
 	desc = "A heads-up display that provides important info in (almost) real time."
-	flags = 0 //doesn't protect eyes because it's a monocle, duh
+	flags = NONE //doesn't protect eyes because it's a monocle, duh
 	origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 2)
 
 /obj/item/clothing/glasses/hud/health

code/modules/food/food/cans.dm

@@ -1,7 +1,7 @@
 /obj/item/reagent_containers/food/drinks/cans
 	volume = 40 //just over one and a half cups
 	amount_per_transfer_from_this = 5
-	flags = 0 //starts closed
+	flags = NONE //starts closed
 	drop_sound = 'sound/items/drop/soda.ogg'
 	pickup_sound = 'sound/items/pickup/soda.ogg'
 	cant_chance = 1 //arbitrarily high for april fools; if it's not reverted in its entirety I suggest rolling it down to 2% or something

code/modules/food/food/drinks/bottle.dm

@@ -698,7 +698,7 @@
 /obj/item/reagent_containers/food/drinks/bottle/small
 	volume = 50
 	smash_duration = 1
-	flags = 0 //starts closed
+	flags = NONE //starts closed
 	rag_underlay = "rag_small"
 
 /obj/item/reagent_containers/food/drinks/bottle/small/beer

code/modules/food/food/snacks.dm

@@ -2082,7 +2082,7 @@
 /obj/item/reagent_containers/food/snacks/monkeycube/wrapped
 	desc = "Still wrapped in some paper."
 	icon_state = "monkeycubewrap"
-	flags = 0
+	flags = NONE
 	wrapped = 1
 
 /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
@@ -2116,7 +2116,7 @@
 /obj/item/reagent_containers/food/snacks/monkeycube/pet/wrapped
 	desc = "Still wrapped in some paper."
 	icon_state = "monkeycubewrap"
-	flags = 0
+	flags = NONE
 	wrapped = 1
 
 /obj/item/reagent_containers/food/snacks/monkeycube/pet/Expand()

code/modules/food/glass/bottle.dm

@@ -9,7 +9,7 @@
 	item_state = "atoxinbottle"
 	amount_per_transfer_from_this = 10
 	max_transfer_amount = 60
-	flags = 0
+	flags = NONE
 	volume = 60
 	drop_sound = 'sound/items/drop/bottle.ogg'
 	pickup_sound = 'sound/items/pickup/bottle.ogg'

code/modules/food/kitchen/microwave.dm

@@ -1,3 +1,5 @@
+#define MICROWAVE_FLAGS (OPENCONTAINER | NOREACT)
+
 /obj/machinery/microwave
 	name = "Microwave"
 	desc = "Studies are inconclusive on whether pressing your face against the glass is harmful."
@@ -12,7 +14,7 @@
 	active_power_usage = 2000
 	clicksound = "button"
 	clickvol = "30"
-	flags = OPENCONTAINER | NOREACT
+	flags = MICROWAVE_FLAGS
 	circuit = /obj/item/circuitboard/microwave
 	var/operating = 0 // Is it on?
 	var/dirty = 0 // = {0..100} Does it need cleaning?
@@ -96,7 +98,7 @@
 				src.icon_state = "mw"
 				src.broken = 0 // Fix it!
 				src.dirty = 0 // just to be sure
-				src.flags = OPENCONTAINER | NOREACT
+				src.flags |= MICROWAVE_FLAGS
 		else
 			to_chat(user, span_warning("It's broken!"))
 			return 1
@@ -115,7 +117,7 @@
 				src.dirty = 0 // It's clean!
 				src.broken = 0 // just to be sure
 				src.icon_state = "mw"
-				src.flags = OPENCONTAINER | NOREACT
+				src.flags |= MICROWAVE_FLAGS
 				SStgui.update_uis(src)
 		else //Otherwise bad luck!!
 			to_chat(user, span_warning("It's dirty!"))
@@ -512,7 +514,7 @@
 /obj/machinery/microwave/proc/muck_finish()
 	src.visible_message(span_warning("The microwave gets covered in muck!"))
 	src.dirty = 100 // Make it dirty so it can't be used util cleaned
-	src.flags = null //So you can't add condiments
+	src.flags &= ~MICROWAVE_FLAGS //So you can't add condiments
 	src.icon_state = "mwbloody0" // Make it look dirty too
 	src.operating = 0 // Turn it off again aferwards
 	SStgui.update_uis(src)
@@ -526,7 +528,7 @@
 	src.icon_state = "mwb" // Make it look all busted up and shit
 	src.visible_message(span_warning("The microwave breaks!")) //Let them know they're stupid
 	src.broken = 2 // Make it broken so it can't be used util fixed
-	src.flags = null //So you can't add condiments
+	src.flags &= ~MICROWAVE_FLAGS //So you can't add condiments
 	src.operating = 0 // Turn it off again aferwards
 	SStgui.update_uis(src)
 	soundloop.stop()
@@ -633,3 +635,5 @@
 		if(istype(M, circuit)) // Yes, we remove circuit twice. Yes, it's necessary. Yes, it's stupid.
 			workingList -= M
 	return workingList
+
+#undef MICROWAVE_FLAGS

code/modules/materials/materials/_materials.dm

@@ -192,7 +192,7 @@ var/list/name_to_material
 	var/name	                          // Unique name for use in indexing the list.
 	var/display_name                      // Prettier name for display.
 	var/use_name
-	var/flags = 0                         // Various status modifiers.
+	var/flags = NONE                         // Various status modifiers.
 	var/sheet_singular_name = "sheet"
 	var/sheet_plural_name = "sheets"
 	var/sheet_collective_name = "stack"

code/modules/materials/sheets/_sheets.dm

@@ -75,8 +75,9 @@
 
 /obj/item/stack/material/use(var/used)
 	. = ..()
+	if(QDELETED(src))
+		return
 	update_strings()
-	return
 
 /obj/item/stack/material/transfer_to(obj/item/stack/S, var/tamount=null, var/type_verified)
 	var/obj/item/stack/material/M = S

code/modules/mob/_modifiers/modifiers.dm

@@ -13,7 +13,7 @@
 	var/on_expired_text = null			// Text to show to holder when it expires.
 	var/hidden = FALSE					// If true, it will not show up on the HUD in the Future(tm)
 	var/stacks = MODIFIER_STACK_FORBID	// If true, attempts to add a second instance of this type will refresh expire_at instead.
-	var/flags = 0						// Flags for the modifier, see mobs.dm defines for more details.
+	var/flags = NONE						// Flags for the modifier, see mobs.dm defines for more details.
 
 	var/light_color = null				// If set, the mob possessing the modifier will glow in this color.  Not implemented yet.
 	var/light_range = null				// How far the light for the above var goes. Not implemented yet.

code/modules/mob/language/language.dm

@@ -15,7 +15,7 @@
 	var/signlang_verb_understood = list("signs")  // snowflake bs, used only for echo
 	var/colour = "body"               // CSS style to use for strings in this language.
 	var/key = "x"                     // Character used to speak in language eg. :o for Unathi.
-	var/flags = 0                     // Various language flags.
+	var/flags = NONE                     // Various language flags.
 	var/native                        // If set, non-native speakers will have trouble speaking.
 	var/list/syllables                // Used when scrambling text for a non-speaker.
 	var/list/space_chance = 55        // Likelihood of getting a space in the random scramble string

code/modules/mob/language/station_vr.dm

@@ -201,17 +201,17 @@
 	speaker.say_signlang(format_message(message), pick(signlang_verb), pick(signlang_verb_understood), src, 2)
 
 /datum/language/unathi
-	flags = 0
+	flags = NONE
 /datum/language/tajaran
-	flags = 0
+	flags = NONE
 /datum/language/skrell
-	flags = 0
+	flags = NONE
 /datum/language/teshari
-	flags = 0
+	flags = NONE
 /datum/language/zaddat
-	flags = 0
+	flags = NONE
 /datum/language/human
-	flags = 0
+	flags = NONE
 /datum/language/gutter
 	machine_understands = FALSE
 	desc = "A dialect of Tradeband not uncommon amongst traders in the Free Trade Union. The language is often difficult to translate due to changing frequently and being highly colloquial."

code/modules/mob/living/carbon/human/species/species.dm

@@ -216,7 +216,7 @@
 	var/has_fine_manipulation = 1							// Can use small items.
 	var/siemens_coefficient = 1								// The lower, the thicker the skin and better the insulation.
 	var/darksight = 2										// Native darksight distance.
-	var/flags = 0											// Various specific features.
+	var/flags = NONE											// Various specific features.
 	var/appearance_flags = 0								// Appearance/display related features.
 	var/spawn_flags = 0										// Flags that specify who can spawn as this species
 

code/modules/mob/living/silicon/ai/ai.dm

@@ -848,7 +848,7 @@ var/list/ai_verbs_default = list(
 	to_chat(src, span_filter_notice("Your hologram will [hologram_follow ? "follow" : "no longer follow"] you now."))
 
 
-/mob/living/silicon/ai/proc/check_unable(var/flags = 0, var/feedback = 1)
+/mob/living/silicon/ai/proc/check_unable(var/flags = NONE, var/feedback = 1)
 	if(stat == DEAD)
 		if(feedback)
 			to_chat(src, span_warning("You are dead!"))

code/modules/reagents/reagent_containers/unidentified_hypospray.dm

@@ -7,102 +7,102 @@
 // The good.
 /obj/item/reagent_containers/hypospray/autoinjector/bonemed/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/clonemed/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/brute/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/burn/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/toxin/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/oxy/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/purity/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/pain/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/organ/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 // The somewhat bad.
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/psilocybin/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/soporific/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 // The very bad.
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cyanide/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/impedrezene/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/defective_nanites/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/contaminated/unidentified
 	init_hide_identity = TRUE
-	flags = 0
+	flags = NONE

code/modules/vore/fluffstuff/custom_clothes_vr.dm

@@ -1942,7 +1942,7 @@ Departamental Swimsuits, for general use
 /obj/item/clothing/suit/fluff/nikki //see /obj/item/rig/nikki
 	name = "cape"
 	desc = "Snazzy!"
-	flags = null
+	flags = NONE
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) // It's not armor, it's a dorky frickin cape
 	body_parts_covered = null // Cape ain't gonna cover a THING
 	cold_protection = CHEST|ARMS // It will keep you toasty tho, it's more than big enough to help with that! Just wrap the thing around you when on the surface, idk

code/modules/xgm/xgm_gas_data.dm

@@ -47,7 +47,7 @@ GLOBAL_DATUM_INIT(gas_data, /datum/xgm_gas_data, new())
 	var/tile_overlay = null
 	var/overlay_limit = null
 
-	var/flags = 0
+	var/flags = NONE
 
 /atom/movable/gas_visuals
 	icon = 'icons/effects/tile_effects.dmi'

maps/common/common_areas.dm

@@ -139,12 +139,12 @@
 /area/offmap/aerostat/inside/northchamb
 	name = "North Chamber"
 	icon_state = "orablacir"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/offmap/aerostat/inside/southchamb
 	name = "South Chamber"
 	icon_state = "orablacir"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/offmap/aerostat/inside/drillstorage
 	name = "Drill Storage"
@@ -157,7 +157,7 @@
 /area/offmap/aerostat/inside/lobby
 	name = "Lobby"
 	icon_state = "orablacir"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/offmap/aerostat/inside/xenobiolab
 	name = "Xenobiology Lab"

maps/redgate/fantasy_items.dm

@@ -362,7 +362,7 @@
 	src.icon_state = "cookingpotb" // Make it look all busted up and shit
 	src.visible_message(span_warning("The cooking pot breaks!")) //Let them know they're stupid
 	src.broken = 2 // Make it broken so it can't be used util fixed
-	src.flags = null //So you can't add condiments
+	src.flags = NONE //So you can't add condiments
 	src.operating = 0 // Turn it off again aferwards
 	SStgui.update_uis(src)
 	soundloop.stop()
@@ -385,7 +385,7 @@
 /obj/machinery/microwave/cookingpot/muck_finish()
 	src.visible_message(span_warning("The cooking pot gets covered in muck!"))
 	src.dirty = 100 // Make it dirty so it can't be used util cleaned
-	src.flags = null //So you can't add condiments
+	src.flags = NONE //So you can't add condiments
 	src.icon_state = "cookingpotbloody0" // Make it look dirty too
 	src.operating = 0 // Turn it off again aferwards
 	SStgui.update_uis(src)

maps/stellar_delight/stellar_delight_areas.dm

@@ -293,13 +293,13 @@
 
 /area/stellardelight/deck1/exterior
 	name = "Deck One Exterior"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 /area/stellardelight/deck2/exterior
 	name = "Deck Two Exterior"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 /area/stellardelight/deck3/exterior
 	name = "Deck Three Exterior"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/stellardelight/deck1/entrepreneur
 	name = "\improper Shared Office"

maps/tether/tether_areas.dm

@@ -65,12 +65,12 @@
 /area/vacant/vacant_restaurant_upper
 	name = "\improper Vacant Restaurant"
 	icon_state = "vacant_site"
-	flags = null
+	flags = NONE
 
 /area/vacant/vacant_restaurant_lower
 	name = "\improper Vacant Restaurant"
 	icon_state = "vacant_site"
-	flags = null
+	flags = NONE
 
 /area/engineering/engineering_airlock
 	name = "\improper Engineering Airlock"
@@ -144,7 +144,7 @@
 /area/tether/surfacebase/outside
 	name = "Outside - Surface"
 	sound_env = SOUND_ENVIRONMENT_MOUNTAINS
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 /area/tether/surfacebase/outside/outside1
 	icon_state = "outside1"
 /area/tether/surfacebase/outside/outside2
@@ -163,12 +163,12 @@
 /area/tether/surfacebase/temple
 	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
 	icon_state = "red"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/tether/surfacebase/crash
 	name = "Outside - Wilderness" // ToDo: Make a way to hide spoiler areas off the list of areas ghosts can jump to.
 	icon_state = "yellow"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/tether/surfacebase/tram
 	name = "\improper Tram Station"
@@ -242,7 +242,7 @@
 	icon_state = "dk_yellow"
 /area/vacant/vacant_site/east
 	name = "\improper East Base Vacant Site"
-	flags = null
+	flags = NONE
 /area/vacant/vacant_library
 	name = "\improper Atrium Construction Site"
 /area/vacant/vacant_bar
@@ -801,7 +801,7 @@
 /area/rnd/research/testingrange
 	name = "\improper Weapons Testing Range"
 	icon_state = "firingrange"
-	flags = 0 // To allow shelter capsules to activate here specifically
+	flags = NONE // To allow shelter capsules to activate here specifically
 
 /area/rnd/research/researchdivision
 	name = "\improper Research Division"
@@ -959,7 +959,7 @@
 	flags = RAD_SHIELDED
 /area/tether/surfacebase/vacant_site
 	name = "\improper Vacant Site"
-	flags = null
+	flags = NONE
 /area/crew_quarters/freezer
 	name = "\improper Kitchen Freezer"
 /area/crew_quarters/panic_shelter

maps/~map_system/maps.dm

@@ -307,7 +307,7 @@ var/list/all_maps = list()
 /datum/map_z_level
 	var/z = 0				// Actual z-index of the zlevel. This had better be right!
 	var/name				// Friendly name of the zlevel
-	var/flags = 0			// Bitflag of which *_levels lists this z should be put into.
+	var/flags = NONE			// Bitflag of which *_levels lists this z should be put into.
 	var/turf/base_turf		// Type path of the base turf for this z
 	var/transit_chance = 0	// Percentile chance this z will be chosen for map-edge space transit.
 

modular_chomp/maps/~map_system/maps.dm

@@ -307,7 +307,7 @@ var/list/all_maps = list()
 /datum/map_z_level
 	var/z = 0				// Actual z-index of the zlevel. This had better be right!
 	var/name				// Friendly name of the zlevel
-	var/flags = 0			// Bitflag of which *_levels lists this z should be put into.
+	var/flags = NONE		// Bitflag of which *_levels lists this z should be put into.
 	var/turf/base_turf		// Type path of the base turf for this z
 	var/transit_chance = 0	// Percentile chance this z will be chosen for map-edge space transit.
 

tgui/packages/tgui-dev-server/link/retrace.ts

@@ -52,8 +52,12 @@ export function retrace(stack: string): string | undefined {
         return frame;
       }
       // Find the correct source map
+      const frameFile = path.basename(frame.file);
       const sourceMap = sourceMaps.find((sourceMap) => {
-        return frame.file!.includes(sourceMap.file);
+        const mapTargetFile = path
+          .basename(sourceMap.file)
+          .replace(/\.map$/, '');
+        return frameFile.startsWith(mapTargetFile);
       });
       if (!sourceMap) {
         return frame;

tgui/packages/tgui/sanitize.ts

@@ -60,13 +60,13 @@ const defAttr = ['class', 'style', 'background'];
  * @param forbidAttr - List of forbidden HTML attributes
  * @param advTags - List of advanced HTML tags allowed for trusted sources
  */
-export const sanitizeText = (
+export function sanitizeText(
   input: string,
   advHtml = false,
   tags = defTag,
   forbidAttr = defAttr,
   advTags = advTag,
-) => {
+) {
   // This is VERY important to think first if you NEED
   // the tag you put in here.  We are pushing all this
   // though dangerouslySetInnerHTML and even though
@@ -79,4 +79,4 @@ export const sanitizeText = (
     ALLOWED_TAGS: tags,
     FORBID_ATTR: forbidAttr,
   });
-};
+}

tgui/packages/tgui/stories/ByondUi.stories.tsx

@@ -54,12 +54,7 @@ function Story() {
           </Button>
         }
       >
-        <TextArea
+        <TextArea fluid height="10em" onChange={setCode}>
-          as="textarea"
-          width="100%"
-          height="10em"
-          onChange={(value) => setCode(value)}
-        >
           {code}
         </TextArea>
       </Section>