Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026

# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/compile_changelogs.yml
#	.github/workflows/stale.yml
#	SQL/database_changelog.md
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	code/__DEFINES/atom_hud.dm
#	code/__DEFINES/inventory.dm
#	code/__DEFINES/mobs.dm
#	code/__DEFINES/species_clothing_paths.dm
#	code/__DEFINES/subsystems.dm
#	code/__DEFINES/surgery.dm
#	code/__HELPERS/global_lists.dm
#	code/_globalvars/lists/maintenance_loot.dm
#	code/_globalvars/traits/_traits.dm
#	code/controllers/subsystem/minor_mapping.dm
#	code/controllers/subsystem/processing/quirks.dm
#	code/controllers/subsystem/shuttle.dm
#	code/datums/components/palette.dm
#	code/datums/components/surgery_initiator.dm
#	code/datums/diseases/advance/advance.dm
#	code/datums/hud.dm
#	code/datums/mood.dm
#	code/datums/mutations/chameleon.dm
#	code/datums/quirks/negative_quirks/nyctophobia.dm
#	code/datums/status_effects/debuffs/debuffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/slime/slime_leech.dm
#	code/datums/weather/weather.dm
#	code/game/data_huds.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/frog_statue.dm
#	code/game/objects/items/rcd/RLD.dm
#	code/game/objects/items/robot/items/hypo.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/items/stacks/wrap.dm
#	code/game/objects/items/storage/garment.dm
#	code/game/objects/items/tools/medical/defib.dm
#	code/game/objects/items/weaponry.dm
#	code/game/objects/items/weaponry/melee/misc.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/curtains.dm
#	code/game/objects/structures/dresser.dm
#	code/game/objects/structures/girders.dm
#	code/game/objects/structures/maintenance.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/admin/greyscale_modify_menu.dm
#	code/modules/admin/verbs/light_debug.dm
#	code/modules/antagonists/ashwalker/ashwalker.dm
#	code/modules/antagonists/heretic/knowledge/starting_lore.dm
#	code/modules/antagonists/ninja/ninjaDrainAct.dm
#	code/modules/art/paintings.dm
#	code/modules/client/preferences.dm
#	code/modules/client/verbs/ooc.dm
#	code/modules/clothing/head/wig.dm
#	code/modules/events/disease_outbreak.dm
#	code/modules/holodeck/holo_effect.dm
#	code/modules/jobs/job_types/head_of_security.dm
#	code/modules/jobs/job_types/security_officer.dm
#	code/modules/library/skill_learning/generic_skillchips/point.dm
#	code/modules/mining/lavaland/ash_flora.dm
#	code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/basic/guardian/guardian.dm
#	code/modules/mob/living/basic/space_fauna/space_dragon/space_dragon.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defines.dm
#	code/modules/mob/living/carbon/life.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mod/mod_control.dm
#	code/modules/mod/modules/modules_general.dm
#	code/modules/modular_computers/computers/item/computer_ui.dm
#	code/modules/paperwork/paper.dm
#	code/modules/paperwork/paperbin.dm
#	code/modules/power/lighting/light.dm
#	code/modules/projectiles/guns/energy/kinetic_accelerator.dm
#	code/modules/projectiles/projectile.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/food_reagents.dm
#	code/modules/reagents/chemistry/reagents/other_reagents.dm
#	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
#	code/modules/research/xenobiology/crossbreeding/_clothing.dm
#	code/modules/research/xenobiology/crossbreeding/prismatic.dm
#	code/modules/surgery/advanced/brainwashing.dm
#	code/modules/surgery/advanced/lobotomy.dm
#	code/modules/surgery/amputation.dm
#	code/modules/surgery/blood_filter.dm
#	code/modules/surgery/bodyparts/_bodyparts.dm
#	code/modules/surgery/brain_surgery.dm
#	code/modules/surgery/cavity_implant.dm
#	code/modules/surgery/coronary_bypass.dm
#	code/modules/surgery/gastrectomy.dm
#	code/modules/surgery/healing.dm
#	code/modules/surgery/limb_augmentation.dm
#	code/modules/surgery/organ_manipulation.dm
#	code/modules/surgery/revival.dm
#	code/modules/surgery/sleeper_protocol.dm
#	code/modules/surgery/surgery_helpers.dm
#	code/modules/surgery/surgery_step.dm
#	code/modules/unit_tests/_unit_tests.dm
#	code/modules/unit_tests/designs.dm
#	code/modules/unit_tests/icon_state_worn.dm
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_cultist.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png
#	code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png
#	code/modules/unit_tests/screenshots/screenshot_husk_body.png
#	code/modules/unit_tests/screenshots/screenshot_husk_body_missing_limbs.png
#	icons/map_icons/clothing/head/_head.dmi
#	icons/map_icons/clothing/shoes.dmi
#	icons/map_icons/items/_item.dmi
#	icons/mob/huds/hud.dmi
#	icons/mob/inhands/64x64_lefthand.dmi
#	icons/mob/inhands/64x64_righthand.dmi
#	icons/obj/machines/computer.dmi
#	tgui/packages/tgui/interfaces/OperatingComputer.jsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/MainPage.tsx
#	tgui/packages/tgui/interfaces/PreferencesMenu/types.ts
#	tgui/packages/tgui/interfaces/SurgeryInitiator.tsx
#	tools/icon_cutter/check.py

code/modules/bitrunning/components/bitrunning_points.dm

@@ -32,9 +32,5 @@
 	var/turf/tile = parent
 	var/obj/structure/closet/crate/secure/bitrunning/encrypted/crate = new()
 	crate.forceMove(tile) // Triggers any on-move effects on that turf
-
-	var/datum/effect_system/spark_spread/quantum/sparks = new(tile)
-	sparks.set_up(number = 5, location = tile)
-	sparks.start()
-
+	do_sparks(5, FALSE, tile, spark_type = /datum/effect_system/basic/spark_spread/quantum)
 	qdel(src)

code/modules/bitrunning/components/glitch.dm

@@ -1,35 +1,35 @@
 /datum/component/glitch
 	/// Ref of the spawning forge
 	var/datum/weakref/forge_ref
+	var/datum/weakref/distort_component
 
 /datum/component/glitch/Initialize(obj/machinery/quantum_server/server, obj/machinery/byteforge/forge)
 	if(!isliving(parent))
 		return COMPONENT_INCOMPATIBLE
 
-	RegisterSignal(forge, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_forge_power_restored))
-	RegisterSignals(forge, list(COMSIG_MACHINERY_BROKEN, COMSIG_MACHINERY_POWER_LOST), PROC_REF(on_forge_broken))
-	forge_ref = WEAKREF(forge)
-
 	var/mob/living/owner = parent
-	server.remove_threat(owner) // so the server doesn't dust us
+	var/health_boost = 0
 
-	owner.faction.Cut()
-	owner.faction += list(ROLE_GLITCH)
+	if (forge)
+		RegisterSignal(forge, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_forge_power_restored))
+		RegisterSignals(forge, list(COMSIG_MACHINERY_BROKEN, COMSIG_MACHINERY_POWER_LOST), PROC_REF(on_forge_broken))
+		forge_ref = WEAKREF(forge)
+		server.remove_threat(owner) // so the server doesn't dust us
+		health_boost = ROUND_UP(server.threat * 0.2)
 
-	var/current_max = owner.maxHealth + ROUND_UP(server.threat * 0.2)
-	owner.maxHealth = clamp(current_max, 200, 500)
+	owner.set_faction(list(ROLE_GLITCH))
+
+	owner.maxHealth = clamp(owner.maxHealth + health_boost, 200, 500)
 	owner.fully_heal()
+	owner.create_digital_aura()
 
-	var/atom/thing = owner
-	thing.create_digital_aura()
+/datum/component/glitch/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_death))
+	distort_component = WEAKREF(parent.AddComponent(/datum/component/holographic_nature))
 
-/// Sakujo
-/datum/component/glitch/proc/dust_mob()
-	if(QDELETED(parent))
-		return
-
-	var/mob/living/owner = parent
-	owner.dust()
+/datum/component/glitch/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_LIVING_DEATH)
+	QDEL_NULL(distort_component)
 
 /// We don't want digital entities just lingering around as corpses.
 /datum/component/glitch/proc/on_death()
@@ -41,10 +41,10 @@
 	var/mob/living/owner = parent
 	to_chat(owner, span_userdanger("You feel a strange sensation..."))
 
-	var/obj/machinery/byteforge/forge = forge_ref.resolve()
+	var/obj/machinery/byteforge/forge = forge_ref?.resolve()
 	forge?.setup_particles()
 
-	addtimer(CALLBACK(src, PROC_REF(dust_mob)), 2 SECONDS, TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_STOPPABLE)
+	owner.fade_into_nothing(3 SECONDS, 2 SECONDS)
 
 /// If the forge breaks, we take a massive slowdown
 /datum/component/glitch/proc/on_forge_broken(datum/source)

code/modules/bitrunning/components/npc_friendly.dm

@@ -1,7 +1,7 @@
 /// Makes a mob friendly with most NPC factions
 /datum/component/npc_friendly
 	/// The list of factions to add to the player
-	var/list/npc_factions = list(
+	var/static/list/npc_factions = list(
 		FACTION_BOSS,
 		FACTION_CARP,
 		FACTION_HIVEBOT,
@@ -15,7 +15,7 @@
 		ROLE_SYNDICATE,
 	)
 	/// List of factions previously held by the player
-	var/list/previous_factions = list()
+	var/list/previous_factions
 
 /datum/component/npc_friendly/Initialize()
 	. = ..()
@@ -25,13 +25,11 @@
 
 	var/mob/living/player = parent
 
-	previous_factions.Add(player.faction)
-	player.faction |= npc_factions
+	previous_factions = player.get_faction()
+	player.add_faction(npc_factions)
 
 /datum/component/npc_friendly/Destroy(force)
-	. = ..()
-
 	var/mob/living/player = parent
-
-	player.faction.Cut()
-	player.faction.Add(previous_factions)
+	if(!QDELETED(parent))
+		player.set_faction(previous_factions)
+	return ..()