Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck

Conflicts:
	code/game/turfs/simulated/walls.dm

code/modules/projectiles/guns/energy.dm

@@ -10,9 +10,8 @@
 	var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next.
 
 /obj/item/weapon/gun/energy/emp_act(severity)
-	power_supply.use(round(power_supply.maxcharge / severity))
+	power_supply.use(round(power_supply.charge / severity))
 	update_icon()
-	..()
 
 
 /obj/item/weapon/gun/energy/New()

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

@@ -60,6 +60,8 @@ obj/item/weapon/gun/energy/laser/retro
 				chambered.newshot()
 	return
 
+/obj/item/weapon/gun/energy/laser/cyborg/emp_act()
+	return
 
 /obj/item/weapon/gun/energy/laser/scatter
 	name = "scatter laser gun"

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

@@ -2,6 +2,7 @@
 	name = "ion rifle"
 	desc = "A man portable anti-armor weapon designed to disable mechanical threats"
 	icon_state = "ionrifle"
+	item_state = null	//so the human update icon uses the icon_state instead.
 	origin_tech = "combat=2;magnets=4"
 	w_class = 5
 	flags =  CONDUCT