diff --git a/mpq/arr/flingy.datex b/mpq/arr/flingy.datex
index 8f9e2d3e..3fe8e226 100644
Binary files a/mpq/arr/flingy.datex and b/mpq/arr/flingy.datex differ
diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index 56fc5f40..efc2c94e 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -468,7 +468,7 @@ Spirtith Colony
 Skortrith Colony
 Empress Plasma
 Engram
-Extended Flingy #262
+Hammerfall Beacon
 Extended Flingy #263
 Extended Flingy #264
 Extended Flingy #265
diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index 4dce01cb..a95c61e5 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index 6345847c..6826aaee 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -1714,7 +1714,7 @@ Zerg Unit Rubble (Small)
 Zerg Unit Rubble (Tiny)
 Engram
 Engram Shadow
-Extended Image #714
+Hammerfall Beacon
 Extended Image #715
 Extended Image #716
 Extended Image #717
diff --git a/mpq/arr/sprites.datex b/mpq/arr/sprites.datex
index 134974ca..ab8b1f8e 100644
Binary files a/mpq/arr/sprites.datex and b/mpq/arr/sprites.datex differ
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index 61aeb311..2a4959e7 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -850,7 +850,7 @@ Zerg Unit Rubble (Medium)
 Zerg Unit Rubble (Small)
 Zerg Unit Rubble (Tiny)
 Engram
-Extended Sprite #1
+Hammerfall Beacon
 Extended Sprite #1
 Extended Sprite #1
 Extended Sprite #1
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index a97d5248..efb19e0b 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 4b26a016..270bd676 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -51954,4 +51954,43 @@ Engines_MultiGlowHeader_OmniInit:
 	wait              	1
 	engframe			0x20
 	wait              	1
-	goto              	Engines_MultiGlowHeader_OmniInit
\ No newline at end of file
+	goto              	Engines_MultiGlowHeader_OmniInit
+	
+# ----------------------------------------------------------------------------- #
+# This header is used by images.dat entries:
+# 532 Hammerfall Beacon (bullet\grenade.grp)
+.headerstart
+IsId          	731
+Type          	2
+Init          	HammerfallBeaconInit
+Death         	HammerfallBeaconDeath
+GndAttkInit   	HammerfallBeaconGndAttkInit
+AirAttkInit   	[NONE]
+.headerend
+# ----------------------------------------------------------------------------- #
+
+HammerfallBeaconInit:
+	playfram          	0x00
+	playsnd           	106 # Bullet\tvuFir00.wav
+	wait              	1
+	sigorder          	1
+	wait              	1
+HammerfallBeaconGndAttkInit:
+	sprol             	310 0 0 # Grenade Shot Smoke (thingy\GreSmoke.grp)
+	wait              	1
+HammerfallBeaconLocal00:
+	playfram          	0x00
+	wait              	2
+	playfram          	1
+	wait              	2
+	playfram          	2
+	wait              	2
+	playfram          	3
+	wait              	2
+	goto              	FragmentationGrenadeLocal00
+
+HammerfallBeaconDeath:
+	imgol             	440 0 0 # Fragmentation Grenade Hit (thingy\efgHit.grp)
+	domissiledmg
+	wait              	1
+	end
\ No newline at end of file
diff --git a/patchnotes.md b/patchnotes.md
index 4be3a8d2..26a0ff71 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -12,6 +12,7 @@ Continuing March Madness into April, tweaking the economic pacing some more, and
 
 ## Bugfixes
 - Maelstrom hits from dead Mind Tyrants no longer crash (c. Veeq7)
+- Basic workers should no longer freeze in place (c. DarkenedFantasies)
 - Burrowed units are no longer displaced by Striga Fleeting Focus or Magnetar Law of Attraction
 - Player color randomization now ignores the colors of witness players (c. Veeq7)
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index d7d74a9c..a5576f28 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ