Merge branch 'master' into wound-port

2020-07-18 21:45:24 +01:00
parent fe79c53f04 e165524763
commit 974b80a2fd
993 changed files with 34775 additions and 40981 deletions
@@ -75,4 +75,9 @@
 /obj/item/ammo_casing/energy/shrink
 	projectile_type = /obj/item/projectile/beam/shrink
 	select_name = "shrink ray"
-	e_cost = 200
+	e_cost = 200
+
+/obj/item/ammo_casing/energy/pickle //ammo for an adminspawn gun
+	projectile_type = /obj/item/projectile/energy/pickle
+	select_name = "pickle ray"
+	e_cost = 0