Everything else through the door (#19358)

code/modules/projectiles/guns/energy.dm

@@ -96,7 +96,7 @@
 	if(ammo_type.len > 1)
 		select_fire(user)
 		update_icon()
-		if(istype(user,/mob/living/carbon/human)) //This has to be here or else if you toggle modes by clicking the gun in hand
+		if(ishuman(user)) //This has to be here or else if you toggle modes by clicking the gun in hand
 			var/mob/living/carbon/human/H = user //Otherwise the mob icon doesn't update, blame shitty human update_icons() code
 			H.update_inv_l_hand()
 			H.update_inv_r_hand()

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

@@ -674,7 +674,7 @@
 			item_state = "tempgun_0"
 	icon_state = item_state
 
-	if(istype(loc,/mob/living/carbon))
+	if(iscarbon(loc))
 		var/mob/living/carbon/M = loc
 		M.update_inv_back()
 		M.update_inv_l_hand()