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
@@ -290,7 +290,7 @@

 /obj/item/gun/energy/vv_edit_var(var_name, var_value)
 	switch(var_name)
-		if("selfcharge")
+		if(NAMEOF(src, selfcharge))
 			if(var_value)
 				START_PROCESSING(SSobj, src)
 			else
@@ -329,3 +329,11 @@
 		add_overlay("emitter_carbine_empty")
 	else
 		add_overlay("emitter_carbine")
+
+//the pickle ray
+/obj/item/gun/energy/pickle_gun
+	name = "pickle ray"
+	desc = "funniest shit i've ever seen"
+	icon_state = "decloner"
+	no_pin_required = TRUE
+	ammo_type = list(/obj/item/ammo_casing/energy/pickle)
@@ -83,6 +83,6 @@

 /obj/item/gun/magic/vv_edit_var(var_name, var_value)
 	. = ..()
-	switch (var_name)
-		if ("charges")
+	switch(var_name)
+		if(NAMEOF(src, charges))
 			recharge_newshot()
@@ -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
@@ -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")