diff --git a/maps/~map_system/funny_name.dm b/maps/~map_system/funny_name.dm
index 75da7154990..9ec858659bd 100644
--- a/maps/~map_system/funny_name.dm
+++ b/maps/~map_system/funny_name.dm
@@ -3,20 +3,28 @@
 		"Aggro",
 		"Breathless",
 		"Calm",
+		"Crunchy",
 		"Dauntless",
 		"Daunted",
 		"Dubious",
+		"Enormous",
 		"Enraged",
 		"Enthusiastic",
+		"Grimey",
 		"Gronchy",
 		"Gwumpy",
 		"Immense",
 		"Incredible",
 		"Leggy",
+		"Long",
 		"Machismo",
+		"Miniscule",
 		"Mischievous",
+		"Moist",
 		"Pensive",
 		"Powerful",
+		"Qwunchy",
+		"Radical",
 		"Rascally",
 		"Rogue",
 		"Scrungly",
@@ -24,22 +32,48 @@
 		"Soft",
 		"Space",
 		"Tranquil",
+		"Voracious",
 		"Weary",
-		"Wise"
+		"Wise",
+		"Zesty"
 	)
 	var/list/sub = list(
+		"Bunnies",
+		"Catboys",
+		"Catgirls",
+		"Cheese Puffs",
+		"Doglins",
 		"Doofs",
 		"Dreamers",
-		"Cheese Puffs",
+		"Dwellers",
+		"Experiments",
+		"Fish",
+		"Ghosts",
+		"Gobs",
+		"Goblins",
 		"Goobers",
 		"Gremlins",
 		"Kin",
+		"Kitsunes",
+		"Kobs",
+		"Kobolds",
 		"Mischief",
+		"Monsters",
 		"Peebs",
+		"Pocket Men",
 		"Rascals",
 		"Rogues",
+		"Schemers",
+		"Smoochers",
+		"Snowglobe Dwellers",
+		"Sparkledogs",
+		"Squirrels",
+		"Stars",
 		"Station",
-		"Teppi"
+		"Teppi",
+		"Vorers",
+		"Wizards",
+		"Wiznerds"
 	)
 
 	var/list/suf = list(
@@ -57,7 +91,24 @@
 		"in Toyland",
 		"of Terror",
 		"from Outer Space",
-		"across the 13th Dimension"
+		"across the 13th Dimension",
+		"within the Vorelands",
+		"in a Tummy",
+		"in Rogue Space",
+		"of the Empty Path",
+		"of the Second Dimension",
+		"Lost in Bunny Space",
+		"Across the Universe",
+		"to the Moon",
+		"Causing Problems on Purpose",
+		"Causing Problems Without Knowing",
+		"Solving Problems with Kindness",
+		"Solving Problems with Softness",
+		"With Too Many Tails",
+		"With Too Many Tentacles",
+		"Wrapped in Vines",
+		"Under Spider Occupation",
+		"Hiding Nuts for Squirrels"
 	)