diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm
index c29e8b4155..45f6b77ec8 100644
--- a/code/_helpers/global_lists.dm
+++ b/code/_helpers/global_lists.dm
@@ -137,7 +137,7 @@ GLOBAL_LIST_EMPTY(mannequins)
 /////Initial Building/////
 //////////////////////////
 
-/proc/makeDatumRefLists()
+/proc/make_datum_reference_lists()
 	var/list/paths
 
 	//Hair - Initialise all /datum/sprite_accessory/hair into an list indexed by hair-style name
@@ -320,8 +320,11 @@ GLOBAL_LIST_EMPTY(mannequins)
 	for(var/species_name in whitelisted_icons)
 		GLOB.custom_species_bases += species_name
 
-	return 1 // Hooks must return 1
+	// Create frame types.
+	populate_frame_types()
 
+	// Create robolimbs for chargen.
+	populate_robolimb_list()
 
 /// Inits the crafting recipe list, sorting crafting recipe requirements in the process.
 /proc/init_crafting_recipes(list/crafting_recipes)
diff --git a/code/game/world.dm b/code/game/world.dm
index 61dfc7bc09..2fc75d763e 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -140,7 +140,7 @@ GLOBAL_VAR(restart_counter)
 	if(NO_INIT_PARAMETER in params)
 		return
 
-	makeDatumRefLists()
+	make_datum_reference_lists()
 
 	var servername = CONFIG_GET(string/servername)
 	if(config && servername != null && CONFIG_GET(flag/server_suffix) && world.port > 0)
@@ -175,11 +175,6 @@ GLOBAL_VAR(restart_counter)
 	log_test("Unit Tests Enabled. This will destroy the world when testing is complete.")
 	log_test("If you did not intend to enable this please check code/__defines/unit_testing.dm")
 #endif
-	// Create frame types.
-	populate_frame_types()
-
-	// Create robolimbs for chargen.
-	populate_robolimb_list()
 
 	GLOB.master_controller = new /datum/controller/game_controller()
 	Master.Initialize(10, FALSE, TRUE) // VOREStation Edit