From 2d805c101bbc1636588c8659b5db2d5a7caef252 Mon Sep 17 00:00:00 2001
From: nevimer <77420409+nevimer@users.noreply.github.com>
Date: Sat, 7 Mar 2026 00:33:39 -0500
Subject: [PATCH] home stretch

---
 .../modules/ashwalkers/code/buildings/wormfarm.dm     |  1 -
 .../modules/basic_mobs/code/bananaspider.dm           |  1 -
 .../code/virtual_domains/ancient_milsim/disk.dm       |  6 ------
 modular_skyrat/modules/bongs/code/bong.dm             |  4 ++--
 .../customization/modules/client/augment/limbs.dm     |  2 +-
 .../modules/clothing/~donator/donator_clothing.dm     |  4 ++--
 .../customization/modules/hydroponics/grown/kiri.dm   |  4 ++++
 .../customization/modules/hydroponics/grown/muli.dm   |  6 ++++--
 .../customization/modules/hydroponics/grown/nakati.dm |  6 +++++-
 .../customization/modules/hydroponics/grown/piru.dm   |  4 ++++
 .../modules/hydroponics/grown/tea_coffee.dm           |  3 ++-
 .../code/healing_stack_items.dm                       |  4 +++-
 .../modules/food_replicator/code/medical.dm           |  5 ++++-
 modular_skyrat/modules/goofsec/code/terragov.dm       | 11 +++--------
 .../modules/implants/code/augments_internal.dm        |  1 +
 .../modules/magfed_turret/code/turret_framework.dm    |  3 +--
 modular_skyrat/modules/marines/code/smartgun.dm       |  8 --------
 modular_skyrat/modules/medical/code/wounds/muscle.dm  |  2 +-
 tgstation.dme                                         |  1 -
 19 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/disk.dm

diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm b/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm
index 5664c20847d..bf9a6ace504 100644
--- a/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm
+++ b/modular_skyrat/modules/ashwalkers/code/buildings/wormfarm.dm
@@ -149,7 +149,6 @@
 	desc = "When you fed your worms, you should have expected this."
 	icon = 'modular_skyrat/modules/ashwalkers/icons/misc_tools.dmi'
 	icon_state = "fertilizer"
-	grind_results = list(/datum/reagent/plantnutriment/eznutriment = 3, /datum/reagent/plantnutriment/left4zednutriment = 3, /datum/reagent/plantnutriment/robustharvestnutriment = 3)
 	singular_name = "fertilizer"
 	merge_type = /obj/item/stack/worm_fertilizer
 
diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
index 30dfaec8501..28becc7a1b4 100644
--- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
+++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm
@@ -41,7 +41,6 @@
 	icon_state = "bananaspider_peel"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
 	foodtypes = GORE | MEAT | RAW
-	juice_typepath = /datum/reagent/consumable/banana
 
 /obj/item/food/deadbanana_spider/grind_results()
 	return list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5)
diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/disk.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/disk.dm
deleted file mode 100644
index 4e1eed881ff..00000000000
--- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/disk.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-/obj/item/bitrunning_disk/item/ancient_milsim
-	name = "compiled bitrunning gear: ancient milsim"
-	desc = "A disk containing early access downloadable content. It can be used to preload items into the virtual domain."
-	selectable_items = list(
-		/obj/item/choice_beacon/ancient_milsim,
-	)
diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm
index 8e6cf21bb07..e51f5f2f56e 100644
--- a/modular_skyrat/modules/bongs/code/bong.dm
+++ b/modular_skyrat/modules/bongs/code/bong.dm
@@ -128,11 +128,11 @@
 	name = "lit [name]"
 
 	if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
-		reagent_explode(datum/reagents/reagents)
+		reagent_explode(reagents)
 		qdel(src)
 		return
 	if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
-		reagent_explode(datum/reagents/reagents)
+		reagent_explode(reagents)
 		qdel(src)
 		return
 
diff --git a/modular_skyrat/modules/customization/modules/client/augment/limbs.dm b/modular_skyrat/modules/customization/modules/client/augment/limbs.dm
index d8c68d5e873..3d855176497 100644
--- a/modular_skyrat/modules/customization/modules/client/augment/limbs.dm
+++ b/modular_skyrat/modules/customization/modules/client/augment/limbs.dm
@@ -31,7 +31,7 @@
 			var/chosen_style = GLOB.robotic_styles_list[prefs.augment_limb_styles[slot]]
 			new_limb.set_icon_static(chosen_style)
 			new_limb.current_style = prefs.augment_limb_styles[slot]
-		new_limb.replace_limb(augmented, special = TRUE)
+		new_limb.replace_limb(augmented)
 		qdel(old_limb)
 
 //HEADS
diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
index faff26a6455..412e1d0bc72 100644
--- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
@@ -152,8 +152,8 @@
 			return
 		switch(yesnomaybe)
 			if("Yes")
-				reset_grid()
-				SStgui.update_uis(src)
+/* 				reset_grid() Broken
+ */				SStgui.update_uis(src)
 			if("No")
 				return
 			if("Maybe")
diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/kiri.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/kiri.dm
index a257a9dcb2a..a48f45e59a8 100644
--- a/modular_skyrat/modules/customization/modules/hydroponics/grown/kiri.dm
+++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/kiri.dm
@@ -26,5 +26,9 @@
 	distill_reagent = /datum/reagent/consumable/ethanol/shakiri
 	tastes = list("ultra-sweet jelly" = 1)
 
+/obj/item/food/grown/kiri/grind_results()
+	return list(/datum/reagent/consumable/kiri_jelly = 0.1)
+
+
 /obj/item/food/grown/kiri/make_bakeable()
 	AddComponent(/datum/component/bakeable, /obj/item/food/baked_kiri, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/muli.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/muli.dm
index 7f787804fc6..fde0ed5ab8f 100644
--- a/modular_skyrat/modules/customization/modules/hydroponics/grown/muli.dm
+++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/muli.dm
@@ -22,9 +22,11 @@
 	icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "muli"
 	foodtypes = VEGETABLES
-	juice_typepath = /datum/reagent/consumable/muli_juice
-	grind_results = list(/datum/reagent/consumable/muli_juice = 0.1)
 	tastes = list("mint and savory sweetness" = 1)
 
+/obj/item/food/grown/muli/grind_results()
+	retrun list(/datum/reagent/consumable/muli_juice = 0.1)
+
+
 /obj/item/food/grown/muli/make_bakeable()
 	AddComponent(/datum/component/bakeable, /obj/item/food/baked_muli, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/nakati.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/nakati.dm
index b51bf9ce385..9152d615df1 100644
--- a/modular_skyrat/modules/customization/modules/hydroponics/grown/nakati.dm
+++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/nakati.dm
@@ -23,5 +23,9 @@
 	icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "nakati"
 	foodtypes = VEGETABLES
-	grind_results = list(/datum/reagent/consumable/nakati_spice = 0)
 	tastes = list("overwhelming spicyness" = 1)
+
+/obj/item/food/grown/nakati/grind_results()
+	return list(/datum/reagent/consumable/nakati_spice = 0)
+
+
diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/piru.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/piru.dm
index dbe36e0bb45..3f6f382c0ae 100644
--- a/modular_skyrat/modules/customization/modules/hydroponics/grown/piru.dm
+++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/piru.dm
@@ -25,3 +25,7 @@
 	foodtypes = VEGETABLES
 	grind_results = list(/datum/reagent/consumable/piru_flour = 0)
 	tastes = list("chalky dryness" = 1)
+
+/obj/item/food/grown/piru/grind_results()
+	return list(/datum/reagent/consumable/piru_flour = 0)
+
diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm
index 6adf7a0f79b..7e63b491ff4 100644
--- a/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm
+++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/tea_coffee.dm
@@ -21,6 +21,7 @@
 	icon = 'modular_skyrat/master_files/icons/obj/hydroponics/harvest.dmi'
 	icon_state = "catnip"
 	filling_color = "#4582B4"
-	grind_results = list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
 	distill_reagent = /datum/reagent/consumable/pinkmilk //Don't ask, cats speak in poptart
 
+/obj/item/food/grown/tea/catnip/grind_results()
+	return  list(/datum/reagent/pax/catnip = 2, /datum/reagent/water = 1)
diff --git a/modular_skyrat/modules/deforest_medical_items/code/healing_stack_items.dm b/modular_skyrat/modules/deforest_medical_items/code/healing_stack_items.dm
index 5862b7b8ac2..0649f80801d 100644
--- a/modular_skyrat/modules/deforest_medical_items/code/healing_stack_items.dm
+++ b/modular_skyrat/modules/deforest_medical_items/code/healing_stack_items.dm
@@ -145,10 +145,12 @@
 	heal_brute = 5
 	flesh_regeneration = 5
 	sanitization = 3
-	grind_results = list(/datum/reagent/medicine/oxandrolone = 3)
 	merge_type = /obj/item/stack/medical/ointment/red_sun
 	custom_price = PAYCHECK_LOWER * 1.5
 
+/obj/item/stack/medical/ointment/red_sun/grind_results()
+	return list(/datum/reagent/medicine/oxandrolone = 3)
+
 /obj/item/stack/medical/ointment/red_sun/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user)
 	. = ..()
 	healed_mob.reagents.add_reagent(/datum/reagent/medicine/lidocaine, 2)
diff --git a/modular_skyrat/modules/food_replicator/code/medical.dm b/modular_skyrat/modules/food_replicator/code/medical.dm
index 470a9c481ee..ca2e61c2817 100644
--- a/modular_skyrat/modules/food_replicator/code/medical.dm
+++ b/modular_skyrat/modules/food_replicator/code/medical.dm
@@ -5,9 +5,12 @@
 	icon_state = "hemo_suture"
 	heal_brute = 7
 	stop_bleeding = 1
-	grind_results = list(/datum/reagent/medicine/coagulant = 2)
 	merge_type = /obj/item/stack/medical/suture/bloody
 
+/obj/item/stack/medical/suture/bloody/grind_results()
+	return list(/datum/reagent/medicine/coagulant = 2)
+
+
 /obj/item/stack/medical/suture/bloody/post_heal_effects(amount_healed, mob/living/carbon/healed_mob, mob/user)
 	. = ..()
 	if(healed_mob.blood_volume <= BLOOD_VOLUME_SAFE)
diff --git a/modular_skyrat/modules/goofsec/code/terragov.dm b/modular_skyrat/modules/goofsec/code/terragov.dm
index 936ccff995d..fff8e187be4 100644
--- a/modular_skyrat/modules/goofsec/code/terragov.dm
+++ b/modular_skyrat/modules/goofsec/code/terragov.dm
@@ -829,17 +829,12 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 					message_admins("[ADMIN_LOOKUPFLW(user)] has beamed out [living_user.pulling] alongside them.")
 				var/turf/pulling_turf = get_turf(living_user.pulling)
 				playsound(pulling_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
-				var/datum/effect_system/basic/spark_spread/quantum/sparks = new
-				sparks.set_up(10, 1, pulling_turf)
-				sparks.attach(pulling_turf)
-				sparks.start()
+				var/datum/effect_system/basic/spak_spread/quantum/sparks = new
+				do_sparks(10, 1, pulling_turf)
 				qdel(living_user.pulling)
 			var/turf/user_turf = get_turf(living_user)
 			playsound(user_turf, 'sound/effects/magic/Repulse.ogg', 100, 1)
-			var/datum/effect_system/basic/spark_spread/quantum/sparks = new
-			sparks.set_up(10, 1, user_turf)
-			sparks.attach(user_turf)
-			sparks.start()
+			do_sparks(10, 1, pulling_turf)
 			qdel(user)
 	else
 		user.balloon_alert(user, "beam-out cancelled")
diff --git a/modular_skyrat/modules/implants/code/augments_internal.dm b/modular_skyrat/modules/implants/code/augments_internal.dm
index 8bcf1282b46..61bad092ecb 100644
--- a/modular_skyrat/modules/implants/code/augments_internal.dm
+++ b/modular_skyrat/modules/implants/code/augments_internal.dm
@@ -17,6 +17,7 @@
 	human_owner.AdjustSleeping(-50 * seconds_per_tick, FALSE)
 	to_chat(owner, span_notice("You feel a rush of energy course through your body!"))
 	cooldown = addtimer(CALLBACK(src, PROC_REF(sleepytimerend)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME)
+	. = ..()
 
 /obj/item/organ/cyberimp/brain/anti_sleep/proc/sleepytimerend()
 	to_chat(owner, span_notice("You hear a small beep in your head as your CNS Jumpstarter finishes recharging."))
diff --git a/modular_skyrat/modules/magfed_turret/code/turret_framework.dm b/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
index f702ed23a8c..3e16edc5e2d 100644
--- a/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
+++ b/modular_skyrat/modules/magfed_turret/code/turret_framework.dm
@@ -350,8 +350,6 @@
 	var/datum/weakref/target_override
 	//////Target Assessment System. Whether or not it's targeting according to flags or even ignoring everyone.
 	var/target_assessment = TURRET_FLAG_SHOOT_EVERYONE
-	//////Ally system.
-	var/allies = list()
 	//////Do we want this to shut up? Mostly for testing and debugging purposes purposes.
 	var/claptrap_moment = TRUE
 	////// Do we want it to eject casings?
@@ -787,6 +785,7 @@
 
 /// Handles the firing process. Will need edited for special ammo types like 980.
 /obj/machinery/porta_turret/syndicate/toolbox/mag_fed/proc/handle_firing(obj/item/ammo_casing/casing, atom/movable/target)
+	var/ignored_factions = list()
 	var/obj/projectile/our_projectile = casing.loaded_projectile
 	if(ignore_faction)
 		our_projectile.ignored_factions = (faction + allies)
diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm
index fa9db6185d8..5603c86a5d0 100644
--- a/modular_skyrat/modules/marines/code/smartgun.dm
+++ b/modular_skyrat/modules/marines/code/smartgun.dm
@@ -109,14 +109,6 @@
 
 /obj/item/ammo_casing/smart/Initialize(mapload)
 	. = ..()
-	RegisterSignal(src, COMSIG_CHAMBERED_BULLET_FIRE, PROC_REF(iff_transfer))
-
-/obj/item/ammo_casing/smart/proc/iff_transfer(datum/source, list/iff_factions)
-	SIGNAL_HANDLER
-
-	if(istype(loaded_projectile, /obj/projectile/bullet/smart))
-		var/obj/projectile/bullet/smart/smart_proj = loaded_projectile
-		smart_proj.ignored_factions = iff_factions.Copy()
 
 /obj/item/ammo_casing/smart
 	firing_effect_type = null
diff --git a/modular_skyrat/modules/medical/code/wounds/muscle.dm b/modular_skyrat/modules/medical/code/wounds/muscle.dm
index 60b7d345e3c..9b7baf90a44 100644
--- a/modular_skyrat/modules/medical/code/wounds/muscle.dm
+++ b/modular_skyrat/modules/medical/code/wounds/muscle.dm
@@ -52,7 +52,7 @@
 
 	return ..()
 
-/datum/wound/muscle/remove_wound(ignore_limb, replaced)
+/datum/wound/muscle/remove_wound(ignore_limb, replaced, destroying)
 	limp_slowdown = 0
 	return ..()
 
diff --git a/tgstation.dme b/tgstation.dme
index 7f8ed731bfb..0952e62479e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -7478,7 +7478,6 @@
 #include "modular_skyrat\modules\bitrunning\code\spawners.dm"
 #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\area.dm"
 #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\choice_beacon.dm"
-#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\disk.dm"
 #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fluff.dm"
 #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fog_of_war.dm"
 #include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\ghost_spawner.dm"