diff --git a/code/__DEFINES/_unit_tests.dm b/code/__DEFINES/_unit_tests.dm
index 9f8e6e39327..f08c7f42f27 100644
--- a/code/__DEFINES/_unit_tests.dm
+++ b/code/__DEFINES/_unit_tests.dm
@@ -93,3 +93,15 @@
 #else
 #define TEST_OUTPUT_YELLOW(text) (text)
 #endif
+
+/**
+ * To be used in procs that involve calculus methods (either seconds_per_tick or delta_time).
+ * This enforces that said proc MUST have a valid seconds_per_tick given to it by all callers.
+ */
+#ifdef UNIT_TEST // REMOVE BEFORE FLIGHT
+#define ENFORCE_CALCULUS(seconds_per_tick) \
+	if (seconds_per_tick <= 0)\
+		CRASH("[caller.name] called [callee.name] without passing in seconds_per_tick (or gave a negative time). This proc MUST be given a positive and non-zero seconds_per_tick value.");
+#else
+#define ENFORCE_CALCULUS(seconds_per_tick)
+#endif
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index f50b7f27083..d175fb42c53 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -204,6 +204,8 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
 		die()
 
 /obj/item/organ/proc/tick_surge_damage(seconds_per_tick)
+	ENFORCE_CALCULUS(seconds_per_tick)
+
 	if(!surge_damage)
 		clear_surge_effects()
 		return
diff --git a/html/changelogs/hellfirejag-remove-before-flight.yml b/html/changelogs/hellfirejag-remove-before-flight.yml
new file mode 100644
index 00000000000..b02c58c63c1
--- /dev/null
+++ b/html/changelogs/hellfirejag-remove-before-flight.yml
@@ -0,0 +1,4 @@
+author: Hellfirejag
+delete-after: True
+changes:
+  - code_imp: "Added an ENFORCE_CALCULUS(seconds_per_tick) macro to help spot bugs in procs that use calculus methods."