Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr

Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
2020-04-29 12:01:33 -07:00
parent 619609f5ff 087f5d731a
commit 3d116f5e7e
9 changed files with 29 additions and 31 deletions
@@ -3,6 +3,10 @@
 	select_name = "ion"
 	fire_sound = 'sound/weapons/ionrifle.ogg'

+/obj/item/ammo_casing/energy/ion/hos
+	projectile_type = /obj/item/projectile/ion/weak
+	e_cost = 300
+
 /obj/item/ammo_casing/energy/declone
 	projectile_type = /obj/item/projectile/energy/declone
 	select_name = "declone"
@@ -16,9 +16,6 @@
 	fire_sound = 'sound/weapons/gunshot.ogg'
 	e_cost = 100

-/obj/item/ammo_casing/energy/electrode/hos
-	projectile_type = /obj/item/projectile/energy/electrode/security/hos
-	e_cost = 200

 /obj/item/ammo_casing/energy/electrode/old
 	e_cost = 1000