diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index bba752ea6bb..e2ce8735182 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -145,7 +145,7 @@ proc/wabbajack(mob/living/M)
 
 			var/mob/living/new_mob
 
-			var/randomize = pick("monkey","robot","slime","xeno","human","beast","helpless animal")
+			var/randomize = pick("monkey","robot","slime","xeno","human","animal")
 			switch(randomize)
 				if("monkey")
 					new_mob = new /mob/living/carbon/monkey(M.loc)
@@ -176,28 +176,27 @@ proc/wabbajack(mob/living/M)
 						if("Drone")		new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc)
 						else			new_mob = new /mob/living/carbon/alien/larva(M.loc)
 					new_mob.universal_speak = 1*/
-				if("beast")
-					var/beast = pick("carp","bear","mushroom","statue")
-					switch(beast)
-						if("carp")		new_mob = new /mob/living/simple_animal/hostile/carp(M.loc)
-						if("bear")		new_mob = new /mob/living/simple_animal/hostile/bear(M.loc)
-						if("mushroom")	new_mob = new /mob/living/simple_animal/hostile/mushroom(M.loc)
-						if("statue")	new_mob = new /mob/living/simple_animal/hostile/statue(M.loc)
-					new_mob.universal_speak = 1
-				if("helpless animal")
-					var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick")
-					switch(animal)
-						if("parrot")	new_mob = new /mob/living/simple_animal/parrot(M.loc)
-						if("corgi")		new_mob = new /mob/living/simple_animal/corgi(M.loc)
-						if("crab")		new_mob = new /mob/living/simple_animal/crab(M.loc)
-//						if("pug")		new_mob = new /mob/living/simple_animal/pug(M.loc)
-						if("cat")		new_mob = new /mob/living/simple_animal/cat(M.loc)
-						if("tomato")	new_mob = new /mob/living/simple_animal/tomato(M.loc)
-						if("mouse")		new_mob = new /mob/living/simple_animal/mouse(M.loc)
-						if("chicken")	new_mob = new /mob/living/simple_animal/chicken(M.loc)
-						if("cow")		new_mob = new /mob/living/simple_animal/cow(M.loc)
-						if("lizard")	new_mob = new /mob/living/simple_animal/lizard(M.loc)
-						else			new_mob = new /mob/living/simple_animal/chick(M.loc)
+				if("animal")
+					if(prob(50))
+						var/beast = pick("carp","bear","mushroom","statue")
+						switch(beast)
+							if("carp")		new_mob = new /mob/living/simple_animal/hostile/carp(M.loc)
+							if("bear")		new_mob = new /mob/living/simple_animal/hostile/bear(M.loc)
+							if("mushroom")	new_mob = new /mob/living/simple_animal/hostile/mushroom(M.loc)
+							if("statue")	new_mob = new /mob/living/simple_animal/hostile/statue(M.loc)
+					else
+						var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick")
+						switch(animal)
+							if("parrot")	new_mob = new /mob/living/simple_animal/parrot(M.loc)
+							if("corgi")		new_mob = new /mob/living/simple_animal/corgi(M.loc)
+							if("crab")		new_mob = new /mob/living/simple_animal/crab(M.loc)
+							if("cat")		new_mob = new /mob/living/simple_animal/cat(M.loc)
+							if("tomato")	new_mob = new /mob/living/simple_animal/tomato(M.loc)
+							if("mouse")		new_mob = new /mob/living/simple_animal/mouse(M.loc)
+							if("chicken")	new_mob = new /mob/living/simple_animal/chicken(M.loc)
+							if("cow")		new_mob = new /mob/living/simple_animal/cow(M.loc)
+							if("lizard")	new_mob = new /mob/living/simple_animal/lizard(M.loc)
+							else			new_mob = new /mob/living/simple_animal/chick(M.loc)
 					new_mob.universal_speak = 1
 				if("human")
 					new_mob = new /mob/living/carbon/human/human(M.loc)
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
new file mode 100644
index 00000000000..07b236e1abc
Binary files /dev/null and b/icons/obj/janitor.dmi differ