diff --git a/mod/common/weapons/flak.qc b/mod/common/weapons/flak.qc
index e33d2e5f5..3e4ebb446 100644
--- a/mod/common/weapons/flak.qc
+++ b/mod/common/weapons/flak.qc
@@ -9,7 +9,7 @@ MUTATOR_HOOKFUNCTION(flak_rockets, FilterItem)
 {
 	entity item = M_ARGV(0, entity);
 
-	if((STAT(WEAPONS, item) & WepSet_FromWeapon(WEP_FLAK)) && !GetResource(item, RES_ROCKETS) && !Item_IsLoot(item))
+	if((STAT(WEAPONS, item) & WepSet_FromWeapon(WEP_FLAK)) && !GetResource(item, RES_ROCKETS) && !ITEM_IS_LOOT(item))
 		SetResource(item, RES_ROCKETS, cvar("g_pickup_rockets_weapon"));
 }
 
diff --git a/mod/server/mutators/akimbo.qc b/mod/server/mutators/akimbo.qc
index d07cab58d..9f18a020e 100644
--- a/mod/server/mutators/akimbo.qc
+++ b/mod/server/mutators/akimbo.qc
@@ -13,7 +13,7 @@ MUTATOR_HOOKFUNCTION(akimbo, ItemTouch)
 	entity item = M_ARGV(0, entity);
 	entity player = M_ARGV(1, entity);
 
-	if((Item_IsLoot(item) || autocvar_g_akimbo_atspawns) && item.weapon && 
+	if((ITEM_IS_LOOT(item) || autocvar_g_akimbo_atspawns) && item.weapon && 
 							(STAT(WEAPONS, player) & item.itemdef.m_weapon.m_wepset) && item.owner != player && !(item.itemdef.m_weapon.spawnflags & WEP_FLAG_NODUAL))
 		PS(player).dual_weapons |= item.itemdef.m_weapon.m_wepset; // dual it up!
 }
@@ -22,6 +22,6 @@ MUTATOR_HOOKFUNCTION(akimbo, FilterItem)
 {
 	entity item = M_ARGV(0, entity);
 
-	if((Item_IsLoot(item) || autocvar_g_akimbo_atspawns) && item.weapon && item.owner && IS_PLAYER(item.owner))
+	if((ITEM_IS_LOOT(item) || autocvar_g_akimbo_atspawns) && item.weapon && item.owner && IS_PLAYER(item.owner))
 		PS(item.owner).dual_weapons &= ~item.itemdef.m_weapon.m_wepset; // no longer akimbo'd (we don't check blacklist here, no need)
 }
diff --git a/mod/server/mutators/piggyback.qc b/mod/server/mutators/piggyback.qc
index 1b467633f..b84800d2c 100644
--- a/mod/server/mutators/piggyback.qc
+++ b/mod/server/mutators/piggyback.qc
@@ -133,7 +133,7 @@ void pb_FixPBEnt(entity p)
 
 bool pb_GiveItem(entity to, entity item)
 {
-	if (Item_IsExpiring(item))
+	if (ITEM_IS_EXPIRING(item))
 	{
 		item.strength_finished = max(0, item.strength_finished - time);
 		item.invincible_finished = max(0, item.invincible_finished - time);
@@ -144,7 +144,7 @@ bool pb_GiveItem(entity to, entity item)
 	bool gave = (it && it.instanceOfPickup) ? ITEM_HANDLE(Pickup, it, item, to) : Item_GiveTo(item, to);
 	if (!gave)
 	{
-		if (Item_IsExpiring(item))
+		if (ITEM_IS_EXPIRING(item))
 		{
 			// undo what we did above
 			item.strength_finished += time;
@@ -156,7 +156,7 @@ bool pb_GiveItem(entity to, entity item)
 		return false;
 	}
 
-	if (Item_IsExpiring(item))
+	if (ITEM_IS_EXPIRING(item))
 	{
 		// undo it anyway
 		item.strength_finished += time;
diff --git a/xonotic b/xonotic
index c2c16160d..623d1fa05 160000
--- a/xonotic
+++ b/xonotic
@@ -1 +1 @@
-Subproject commit c2c16160d15c51e7e355c096998a06cb6537c292
+Subproject commit 623d1fa05b286a0f6ef97e9b61908b3cccb2b9c1