Fix Fulcrum addon collision; Fix another nullsprite crash

mpq/arr/flingy.txt

@@ -89,7 +89,7 @@ Seraph (Turret)
 Vulture
 Spider Mine
 Fountainhead
-Barracks
+Stockade
 Atelier
 Comsat Station
 Ministry
@@ -342,7 +342,7 @@ Iron Foundry
 Mineral Field 1 Christmas
 Mineral Field 2 Christmas
 Mineral Field 3 Christmas
-Medbay
+Vestry
 Heracles
 Pazuzu
 Astral Blaster Impact

mpq/arr/images.txt

@@ -264,8 +264,8 @@ Seraph Shadow
 Fountainhead
 Fountainhead Overlay
 Fountainhead Shadow
-Barracks
+Stockade
-Barracks Shadow
+Stockade Shadow
 Atelier
 Atelier Overlay
 Atelier Shadow
@@ -1322,9 +1322,9 @@ Mineral Field 3 Christmas
 Mineral Field 3 Christmas Shadow
 Mineral Chunk Christmas
 Mineral Chunk Depleted Christmas
-Medbay
+Vestry
-Medbay Shadow
+Vestry Shadow
-Medbay Connector
+Vestry Connector
 Protoss Warp Fade
 Heracles
 Heracles Shadow

mpq/arr/sprites.txt

@@ -247,7 +247,7 @@ Spider Mine
 Seraph (Base)
 Seraph (Turret)
 Fountainhead
-Barracks
+Stockade
 Atelier
 Comsat Station
 Ministry
@@ -673,7 +673,7 @@ Iron Foundry
 Mineral Field 01 (Christmas)
 Mineral Field 02 (Christmas)
 Mineral Field 03 (Christmas)
-Medbay
+Vestry
 Heracles
 Pazuzu
 Astral Blaster Hit

mpq/arr/units.txt

@@ -109,7 +109,7 @@ Terran Comsat Station
 Terran Missile Silo
 Terran Supply Depot
 Terran Reservoir
-Terran Barracks
+Terran Stockade
 Zerg Liiralisk
 Terran Fulcrum
 Terran Starport
@@ -117,8 +117,8 @@ Terran Commandment
 Terran Daedala
 Terran Covert Ops
 Terran Magnetar
-Terran Medbay
+Terran Vestry
-Terran Machine Shop
+Terran Palladium
 Terran Rotary
 Terran Atlas
 Zerg Sovroleth

mpq/samase/unitdef.txt

@@ -103,7 +103,7 @@ building comsat_station = 107
 building missile_silo = 108
 building supply_depot = 109
 building reservoir = 110
-building barracks = 111
+building stockade = 111
 building fulcrum = 113
 building starport = 114
 building commandment = 115
@@ -115,7 +115,7 @@ building watchdog = 124
 building anchor = 125
 
 # Terran NGS buildings
-building medbay = 119
+building vestry = 119
 building rotary = 121
 building diadem = 127
 building guildhall = 147

mpq/scripts/iscript.txt

@@ -47976,7 +47976,7 @@ SpecialState1 	[NONE]
 # ----------------------------------------------------------------------------- #
 
 CyprianInit:
-	imgul             	1587 0 0 # Cyprian Shadow (cm\terran\cyprian.grp)
+	imgul             	1587 0 -2 # Cyprian Shadow (cm\terran\cyprian.grp)
 CyprianWalkingToIdle:
 	playfram			0x00
 	goto				CyprianLocal00

patchnotes.md

@@ -28,7 +28,12 @@ Much of this update is targeted at bringing AI back up to snuff, to complement t
 	- Madrigal (Imperioso weaponhit)
 	- Aion (weaponhit)
 - New names for:
+	- Stockade (formerly Barracks)
+	- Vestry (formerly Medbay)
 	- Covenant (formerly Covert Ops)
+- Improved collision for:
+	- Scrapyard
+	- Palladium
 
 ## Factions
 - Futurist Federation now enables: