Merge pull request #8099 from mwerezak/gun-rewrite

Gun rewrite

code/modules/power/antimatter/control.dm

@@ -127,7 +127,7 @@
 
 
 /obj/machinery/power/am_control_unit/bullet_act(var/obj/item/projectile/Proj)
-	if(Proj.flag != "bullet")
+	if(Proj.check_armour != "bullet")
 		stability -= Proj.force
 	return 0
 

code/modules/power/antimatter/shielding.dm

@@ -117,7 +117,7 @@ proc/cardinalrange(var/center)
 
 
 /obj/machinery/am_shielding/bullet_act(var/obj/item/projectile/Proj)
-	if(Proj.flag != "bullet")
+	if(Proj.check_armour != "bullet")
 		stability -= Proj.force/2
 	return 0
 

code/modules/power/cell.dm

@@ -128,7 +128,7 @@
 		rigged = 1 //broken batterys are dangerous
 
 /obj/item/weapon/cell/emp_act(severity)
-	charge -= 1000 / severity
+	charge -= maxcharge / severity
 	if (charge < 0)
 		charge = 0
 	if(reliability != 100 && prob(50/severity))

code/modules/power/rust/virtual_particle_catcher.dm

@@ -42,7 +42,7 @@
 		name = "collector [mysize] OFF"
 
 /obj/effect/rust_particle_catcher/bullet_act(var/obj/item/projectile/Proj)
-	if(Proj.flag != "bullet" && parent)
+	if(Proj.check_armour != "bullet" && parent)
 		parent.AddEnergy(Proj.damage * 20, 0, 1)
 		update_icon()
 	return 0