Merge branch 'master' into wound-port

code/modules/projectiles/projectile/energy/misc.dm

@@ -13,3 +13,13 @@
 	damage_type = TOX
 	knockdown = 100
 	range = 7
+
+/obj/item/projectile/energy/pickle //projectile for adminspawn only gun
+	name = "pickle-izing beam"
+	icon_state = "declone"
+
+/obj/item/projectile/energy/pickle/on_hit(atom/target)
+	//we don't care if they blocked it, they're turning into a pickle
+	if(isliving(target))
+		var/mob/living/living_target = target
+		living_target.turn_into_pickle() //yes this is a real proc

code/modules/projectiles/projectile/magic.dm

@@ -207,7 +207,8 @@
 							/mob/living/simple_animal/pet/fox,
 							/mob/living/simple_animal/butterfly,
 							/mob/living/simple_animal/pet/cat/cak,
-							/mob/living/simple_animal/chick)
+							/mob/living/simple_animal/chick,
+							/mob/living/simple_animal/pickle)
 			new_mob = new path(M.loc)
 
 		if("humanoid")