Merge branch 'master' into Projectile_Rework

code/modules/projectiles/guns/ballistic/toy.dm

@@ -140,6 +140,6 @@
 	recoil = 0.1
 	inaccuracy_modifier = 0.25
 	dualwield_spread_mult = 1.4
-	slot_flags = SLOT_BELT
+	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM

code/modules/projectiles/guns/energy/laser_gatling.dm

@@ -32,7 +32,7 @@
 /obj/item/minigunpack/on_attack_hand(var/mob/living/carbon/user)
 	if(src.loc == user)
 		if(!armed)
-			if(user.get_item_by_slot(SLOT_BACK) == src)
+			if(user.get_item_by_slot(ITEM_SLOT_BACK) == src)
 				armed = 1
 				if(!user.put_in_hands(gun))
 					armed = 0