Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220

2019-10-30 14:46:42 +01:00
parent b95f910a4e d249a38489
commit b17346a44e
2045 changed files with 85542 additions and 70698 deletions
@@ -71,9 +71,3 @@
 	projectile_type = /obj/item/projectile/beam/mindflayer
 	select_name = "MINDFUCK"
 	fire_sound = 'sound/weapons/laser.ogg'
-
-/obj/item/ammo_casing/energy/laser/weak
-	projectile_type = /obj/item/projectile/beam/weak/minigun
-	e_cost = 10
-	fire_sound = 'sound/weapons/gatling.ogg'
-	click_cooldown_override = 1
@@ -25,3 +25,6 @@
 	fire_sound = 'sound/weapons/taser2.ogg'
 	harmful = FALSE
 	click_cooldown_override = 3.5
+
+/obj/item/ammo_casing/energy/disabler/secborg
+	e_cost = 50