Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite

code/modules/projectiles/guns/energy.dm

@@ -76,7 +76,13 @@
 /obj/item/weapon/gun/energy/update_icon()
 	if(charge_meter)
 		var/ratio = power_supply.charge / power_supply.maxcharge
-		ratio = round(ratio, 0.25) * 100
+		
+		//make sure that rounding down will not give us the empty state even if we have charge for a shot left.
+		if(power_supply.charge < charge_cost)
+			ratio = 0
+		else
+			ratio = max(round(ratio, 0.25) * 100, 25)
+		
 		if(modifystate)
 			icon_state = "[modifystate][ratio]"
 		else

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

@@ -2,9 +2,10 @@
 	name = "ion rifle"
 	desc = "A man portable anti-armor weapon designed to disable mechanical threats"
 	icon_state = "ionrifle"
+	item_state = "ionrifle"
 	fire_sound = 'sound/weapons/Laser.ogg'
 	origin_tech = "combat=2;magnets=4"
-	w_class = 4.0
+	w_class = 4
 	force = 10
 	flags =  CONDUCT
 	slot_flags = SLOT_BACK
@@ -16,6 +17,13 @@
 		return //so it doesn't EMP itself, I guess
 	..()
 
+/obj/item/weapon/gun/energy/ionrifle/update_icon()
+	..()
+	if(power_supply.charge < charge_cost)
+		item_state = "ionrifle-empty"
+	else
+		item_state = initial(item_state)
+
 /obj/item/weapon/gun/energy/decloner
 	name = "biological demolecularisor"
 	desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."

code/modules/projectiles/guns/projectile/sniper.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/heavysniper
 	name = "\improper PTRS-7 rifle"
-	desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
+	desc = "A portable anti-armour rifle fitted with a scope. Originally designed to used against armoured exosuits, it is capable of punching through windows and non-reinforced walls with ease. Fires armor piercing 14.5mm shells."
 	icon_state = "heavysniper"
 	item_state = "shotgun"
 	w_class = 4