Merge branch 'master' into upstream-merge-37597

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

@@ -110,7 +110,7 @@
 	fire_sound = 'sound/weapons/laser.ogg'
 	mag_type = /obj/item/ammo_box/magazine/internal/minigun
 	casing_ejector = FALSE
-	flags_2 = SLOWS_WHILE_IN_HAND_2
+	item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
 	var/obj/item/minigunpack/ammo_pack
 
 /obj/item/gun/ballistic/minigun/Initialize()
@@ -145,5 +145,3 @@
 
 /obj/item/gun/ballistic/minigun/dropped(mob/living/user)
 	ammo_pack.attach_gun(user)
-
-

code/modules/projectiles/guns/magic/staff.dm

@@ -2,7 +2,7 @@
 	slot_flags = ITEM_SLOT_BACK
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
-	flags_2 = NO_MAT_REDEMPTION_2
+	item_flags = NEEDS_PERMIT | NO_MAT_REDEMPTION
 
 /obj/item/gun/magic/staff/change
 	name = "staff of change"