diff --git a/mpq/arr/sfxdata.dat b/mpq/arr/sfxdata.dat
index 2b30c7e7..ccfe778b 100644
Binary files a/mpq/arr/sfxdata.dat and b/mpq/arr/sfxdata.dat differ
diff --git a/mpq/arr/sfxdata.txt b/mpq/arr/sfxdata.txt
index a21e41d3..16462b55 100644
--- a/mpq/arr/sfxdata.txt
+++ b/mpq/arr/sfxdata.txt
@@ -2916,7 +2916,7 @@ Artemis Advisor Tech 01
 Artemis Advisor No Vespene 01
 Artemis Advisor No Vespene 02
 Artemis Advisor Warp 01
-Extended Sound #1
+Stimpack Inject 01
 Extended Sound #1
 Extended Sound #1
 Extended Sound #1
diff --git a/mpq/arr/sounds.txt b/mpq/arr/sounds.txt
index 08162c0b..9991d15f 100644
--- a/mpq/arr/sounds.txt
+++ b/mpq/arr/sounds.txt
@@ -2915,4 +2915,5 @@ cm\advisors\artemis\artemisad_nowarp-01.wav
 cm\advisors\artemis\artemisad_tech-01.wav
 cm\advisors\artemis\artemisad_vespene-01.wav
 cm\advisors\artemis\artemisad_vespene-02.wav
-cm\advisors\artemis\artemisad_warp-01.wav
\ No newline at end of file
+cm\advisors\artemis\artemisad_warp-01.wav
+cm\t\maverick\stimpack-inject-01.wav
\ No newline at end of file
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 5c2f6525..78838321 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/sound/cm/t/maverick/stimpack-inject-01.wav b/mpq/sound/cm/t/maverick/stimpack-inject-01.wav
new file mode 100644
index 00000000..1d74f5b9
Binary files /dev/null and b/mpq/sound/cm/t/maverick/stimpack-inject-01.wav differ
diff --git a/mpq/sound/terran/marine/tmaSti00.wav b/mpq/sound/terran/marine/tmaSti00.wav
new file mode 100644
index 00000000..c4b100bd
Binary files /dev/null and b/mpq/sound/terran/marine/tmaSti00.wav differ
diff --git a/mpq/sound/terran/marine/tmaSti01.wav b/mpq/sound/terran/marine/tmaSti01.wav
new file mode 100644
index 00000000..8a7d3ed8
Binary files /dev/null and b/mpq/sound/terran/marine/tmaSti01.wav differ
diff --git a/patchnotes.md b/patchnotes.md
index 073b3222..f915a40a 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -29,6 +29,7 @@ Patch goals include:
 	- Skibact Scab (formerly Skithrok Scab)
 	- Tethvith Swamp (formerly Bactith Swamp)
 - **Internals:**
+	- Removed implicit order timer, making order handling much more responsive (c. Veeq7)
 	- Updated hotloading to fix some cases where file updates didn't prompt mpq regeneration (c. Veeq7)
 	- Tilde and ESC are now always used as shortcuts for closing the console
 	- Custom trigger recolor accuracy has been improved (c. Veeq7)
@@ -126,6 +127,10 @@ Patch goals include:
 	- Increased Hachirosk request count within most Zerg build orders
 
 ## Terran
+- [Maverick](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/maverick):
+	- Inject Stimpack:
+		- Now grants the buff 2 seconds after activation
+		- Still damages immediately on use
 - [Trojan](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/trojan):
 	- Increased turn rate to improve responsivity of load/unload commands
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index a828c4d3..c5549bab 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ