Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx

code/modules/admin/view_variables/filterrific.dm

@@ -10,7 +10,7 @@
 /datum/filter_editor/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, "Filteriffic")
+		ui = new(user, src, "Filterrific")
 		ui.open()
 
 /datum/filter_editor/ui_static_data(mob/user)
@@ -21,7 +21,14 @@
 /datum/filter_editor/ui_data()
 	var/list/data = list()
 	data["target_name"] = target.name
-	data["target_filter_data"] = target.filter_data
+	var/list/target_filter_data = list()
+	for (var/list/filter_info as anything in target.filter_data)
+		filter_info = deep_copy_list(filter_info)
+		if (filter_info["transform"])
+			var/matrix/filter_transform = filter_info["transform"]
+			filter_info["transform"] = list("a" = filter_transform.a, "b" = filter_transform.b, "c" = filter_transform.c, "d" = filter_transform.d, "e" = filter_transform.e, "f" = filter_transform.f)
+		target_filter_data += list(filter_info)
+	data["target_filter_data"] = target_filter_data
 	return data
 
 /datum/filter_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -68,6 +75,16 @@
 			if(new_icon)
 				target.modify_filter(params["name"], list("icon" = new_icon))
 				. = TRUE
+		if("modify_transform_value")
+			var/list/filter_info = target.get_filter_data(params["name"])
+			if (!filter_info)
+				return
+			var/matrix/new_transform = matrix(filter_info[params["field_name"]])
+			if (!(params["transform_key"] in list("a", "b", "c", "d", "e", "f")))
+				return
+			new_transform.vars[params["transform_key"]] = text2num(params["transform_value"])
+			target.modify_filter(params["name"], list(params["field_name"] = new_transform))
+			. = TRUE
 		if("mass_apply")
 			if(!check_rights_for(usr.client, R_FUN))
 				to_chat(usr, span_userdanger("Stay in your lane, jannie."))

code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm

@@ -4,7 +4,7 @@
  *
  * More than just a completely true statement, this datum is created as a tgui interface
  * allowing you to modify each vector until you know what you're doing.
- * Much like filteriffic, 'nobody wants to learn matrix math' is meant for developers like you and I
+ * Much like filterrific, 'nobody wants to learn matrix math' is meant for developers like you and I
  * to implement interesting matrix transformations without the hassle if needing to know... algebra? Damn, i'm stupid.
  */
 /datum/nobody_wants_to_learn_matrix_math

code/modules/admin/view_variables/topic.dm

@@ -74,23 +74,23 @@
 		var/newamt
 		switch(Text)
 			if("brute")
-				L.adjustBruteLoss(amount, forced = TRUE)
-				newamt = L.getBruteLoss()
+				L.adjust_brute_loss(amount, forced = TRUE)
+				newamt = L.get_brute_loss()
 			if("fire")
-				L.adjustFireLoss(amount, forced = TRUE)
-				newamt = L.getFireLoss()
+				L.adjust_fire_loss(amount, forced = TRUE)
+				newamt = L.get_fire_loss()
 			if("toxin")
-				L.adjustToxLoss(amount, forced = TRUE)
-				newamt = L.getToxLoss()
+				L.adjust_tox_loss(amount, forced = TRUE)
+				newamt = L.get_tox_loss()
 			if("oxygen")
-				L.adjustOxyLoss(amount, forced = TRUE)
-				newamt = L.getOxyLoss()
+				L.adjust_oxy_loss(amount, forced = TRUE)
+				newamt = L.get_oxy_loss()
 			if("brain")
-				L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount)
+				L.adjust_organ_loss(ORGAN_SLOT_BRAIN, amount)
 				newamt = L.get_organ_loss(ORGAN_SLOT_BRAIN)
 			if("stamina")
-				L.adjustStaminaLoss(amount, forced = TRUE)
-				newamt = L.getStaminaLoss()
+				L.adjust_stamina_loss(amount, forced = TRUE)
+				newamt = L.get_stamina_loss()
 			else
 				to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]", confidential = TRUE)
 				return