From b7dda0080d6b9499c4afbe0f609dcfe1f9419663 Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 3 Mar 2020 15:40:53 +0100
Subject: [PATCH 1/2] Fixes cargo passive point gen (ergo making it 125 a
 minute and not 1000+)

---
 code/controllers/subsystem/shuttle.dm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index bcbe2bb49b..e86ad67961 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -113,11 +113,8 @@ SUBSYSTEM_DEF(shuttle)
 				qdel(T, force=TRUE)
 	CheckAutoEvac()
 
-	//Cargo stuff start
-	var/fire_time_diff = max(0, world.time - last_fire)		//Don't want this to be below 0, seriously.
-	var/point_gain = (fire_time_diff / 600) * passive_supply_points_per_minute
-	points += point_gain
-	//Cargo stuff end
+	if(!(times_fired % (600/wait)))
+		points += passive_supply_points_per_minute
 
 	var/esETA = emergency?.getModeStr()
 	emergency_shuttle_stat_text = "[esETA? "[esETA] [emergency.getTimerStr()]" : ""]"

From d3185250788b9df9c9b48c3073ee6083bad1489e Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Tue, 3 Mar 2020 15:43:10 +0100
Subject: [PATCH 2/2] Update shuttle.dm

---
 code/controllers/subsystem/shuttle.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index e86ad67961..fc31a22a13 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -113,7 +113,7 @@ SUBSYSTEM_DEF(shuttle)
 				qdel(T, force=TRUE)
 	CheckAutoEvac()
 
-	if(!(times_fired % (600/wait)))
+	if(!(times_fired % CEILING(600/wait, 1)))
 		points += passive_supply_points_per_minute
 
 	var/esETA = emergency?.getModeStr()