Converts ALL typepaths to lowercase (#51642)

* Case of lower * More changes * Ruins the nice 420 diff, brainfart when doing the second batch of conversions * More changes * Next batch. I think * Converts even more paths * Restarts bots * Capital Free Zone * Come on travis, do something * Renames areas * Bots, please stop dying * Updates CONTRIBUTING.md and updates a few paths I missed. * APC recgarftzfvas /obj/item/computer_hardware/recharger/apc to /obj/item/computer_hardware/recharger/apc_recharger
2025-12-11 02:01:22 +00:00 · 2020-06-18 01:47:57 +02:00
parent 60f86ea2ff
commit b87f65d95e
278 changed files with 2586 additions and 2582 deletions
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -17,7 +17,7 @@
 //All
 #define CLUSTER_CHECK_ALL				30 //Don't let anything cluster, like, at all

-/datum/mapGenerator
+/datum/map_generator

 	//Map information
 	var/list/map = list()
@@ -27,7 +27,7 @@

 	var/buildmode_name = "Undocumented"

-/datum/mapGenerator/New()
+/datum/map_generator/New()
 	..()
 	if(buildmode_name == "Undocumented")
 		buildmode_name = copytext_char("[type]", 20)	// / d a t u m / m a p g e n e r a t o r / = 20 characters.
@@ -35,7 +35,7 @@

 //Defines the region the map represents, sets map
 //Returns the map
-/datum/mapGenerator/proc/defineRegion(turf/Start, turf/End, replace = 0)
+/datum/map_generator/proc/defineRegion(turf/Start, turf/End, replace = 0)
 	if(!checkRegion(Start, End))
 		return 0

@@ -47,7 +47,7 @@

 //Defines the region the map represents, as a CIRCLE!, sets map
 //Returns the map
-/datum/mapGenerator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0)
+/datum/map_generator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0)
 	if(!checkRegion(Start, End))
 		return 0

@@ -82,13 +82,13 @@


 //Empties the map list, he's dead jim.
-/datum/mapGenerator/proc/undefineRegion()
+/datum/map_generator/proc/undefineRegion()
 	map = list() //bai bai


 //Checks for and Rejects bad region coordinates
 //Returns 1/0
-/datum/mapGenerator/proc/checkRegion(turf/Start, turf/End)
+/datum/map_generator/proc/checkRegion(turf/Start, turf/End)
 	. = 1

 	if(!Start || !End)
@@ -103,27 +103,27 @@


 //Requests the mapGeneratorModule(s) to (re)generate
-/datum/mapGenerator/proc/generate()
+/datum/map_generator/proc/generate()
 	syncModules()
 	if(!modules || !modules.len)
 		return
-	for(var/datum/mapGeneratorModule/mod in modules)
-		INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/generate)
+	for(var/datum/map_generator_module/mod in modules)
+		INVOKE_ASYNC(mod, /datum/map_generator_module.proc/generate)


 //Requests the mapGeneratorModule(s) to (re)generate this one turf
-/datum/mapGenerator/proc/generateOneTurf(turf/T)
+/datum/map_generator/proc/generateOneTurf(turf/T)
 	if(!T)
 		return
 	syncModules()
 	if(!modules || !modules.len)
 		return
-	for(var/datum/mapGeneratorModule/mod in modules)
-		INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/place, T)
+	for(var/datum/map_generator_module/mod in modules)
+		INVOKE_ASYNC(mod, /datum/map_generator_module.proc/place, T)


 //Replaces all paths in the module list with actual module datums
-/datum/mapGenerator/proc/initialiseModules()
+/datum/map_generator/proc/initialiseModules()
 	for(var/path in modules)
 		if(ispath(path))
 			modules.Remove(path)
@@ -132,8 +132,8 @@


 //Sync mapGeneratorModule(s) to mapGenerator
-/datum/mapGenerator/proc/syncModules()
-	for(var/datum/mapGeneratorModule/mod in modules)
+/datum/map_generator/proc/syncModules()
+	for(var/datum/map_generator_module/mod in modules)
 		mod.sync(src)


@@ -146,7 +146,7 @@
 	set name = "Test Nature Map Generator"
 	set category = "Debug"

-	var/datum/mapGenerator/nature/N = new()
+	var/datum/map_generator/nature/N = new()
 	var/startInput = input(usr,"Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null

 	if (isnull(startInput))
@@ -195,7 +195,7 @@
 		theCluster =  CLUSTER_CHECK_NONE

 	if(theCluster)
-		for(var/datum/mapGeneratorModule/M in N.modules)
+		for(var/datum/map_generator_module/M in N.modules)
 			M.clusterCheckFlags = theCluster


--- a/code/modules/procedural_mapping/mapGeneratorModule.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModule.dm
@@ -1,6 +1,6 @@

-/datum/mapGeneratorModule
-	var/datum/mapGenerator/mother = null
+/datum/map_generator_module
+	var/datum/map_generator/mother = null
 	var/list/spawnableAtoms = list()
 	var/list/spawnableTurfs = list()
 	var/clusterMax = 5
@@ -10,14 +10,14 @@


 //Syncs the module up with its mother
-/datum/mapGeneratorModule/proc/sync(datum/mapGenerator/mum)
+/datum/map_generator_module/proc/sync(datum/map_generator/mum)
 	mother = null
 	if(mum)
 		mother = mum


 //Generates its spawnable atoms and turfs
-/datum/mapGeneratorModule/proc/generate()
+/datum/map_generator_module/proc/generate()
 	if(!mother)
 		return
 	var/list/map = mother.map
@@ -26,7 +26,7 @@


 //Place a spawnable atom or turf on this turf
-/datum/mapGeneratorModule/proc/place(turf/T)
+/datum/map_generator_module/proc/place(turf/T)
 	if(!T)
 		return 0

@@ -104,7 +104,7 @@


 //Checks and Rejects dense turfs
-/datum/mapGeneratorModule/proc/checkPlaceAtom(turf/T)
+/datum/map_generator_module/proc/checkPlaceAtom(turf/T)
 	. = 1
 	if(!T)
 		return 0
@@ -128,19 +128,19 @@

 //Settings appropriate for a turf that covers the entire map region, eg a fill colour on a bottom layer in a graphics program.
 //Should only have one of these in your mapGenerator unless you want to waste CPU
-/datum/mapGeneratorModule/bottomLayer
+/datum/map_generator_module/bottom_layer
 	clusterCheckFlags = CLUSTER_CHECK_NONE
 	spawnableAtoms = list()//Recommended: No atoms.
 	spawnableTurfs = list(/turf = 100)

 //Settings appropriate for turfs/atoms that cover SOME of the map region, sometimes referred to as a splatter layer.
-/datum/mapGeneratorModule/splatterLayer
+/datum/map_generator_module/splatter_layer
 	clusterCheckFlags = CLUSTER_CHECK_ALL
 	spawnableAtoms = list(/atom = 30)
 	spawnableTurfs = list(/turf = 30)

 //Settings appropriate for turfs/atoms that cover a lot of the map region, eg a dense forest.
-/datum/mapGeneratorModule/denseLayer
+/datum/map_generator_module/dense_layer
 	clusterCheckFlags = CLUSTER_CHECK_NONE
 	spawnableAtoms = list(/atom = 75)
 	spawnableTurfs = list(/turf = 75)
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -2,11 +2,11 @@


 // Helper to repressurize the area in case it was run in space
-/datum/mapGeneratorModule/bottomLayer/repressurize
+/datum/map_generator_module/bottom_layer/repressurize
 	spawnableAtoms = list()
 	spawnableTurfs = list()

-/datum/mapGeneratorModule/bottomLayer/repressurize/generate()
+/datum/map_generator_module/bottom_layer/repressurize/generate()
 	if(!mother)
 		return
 	var/list/map = mother.map
@@ -17,38 +17,38 @@
 			T.air.copy_from_turf(T)
 		SSair.add_to_active(T)

-/datum/mapGeneratorModule/bottomLayer/massdelete
+/datum/map_generator_module/bottom_layer/massdelete
 	spawnableAtoms = list()
 	spawnableTurfs = list()
 	var/deleteturfs = TRUE	//separate var for the empty type.
 	var/list/ignore_typecache

-/datum/mapGeneratorModule/bottomLayer/massdelete/generate()
+/datum/map_generator_module/bottom_layer/massdelete/generate()
 	if(!mother)
 		return
 	for(var/V in mother.map)
 		var/turf/T = V
 		T.empty(deleteturfs? null : T.type, null, ignore_typecache, CHANGETURF_FORCEOP)

-/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs/New()
+/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs/New()
 	..()
 	ignore_typecache = GLOB.typecache_mob

-/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
+/datum/map_generator_module/bottom_layer/massdelete/leave_turfs
 	deleteturfs = FALSE

-/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete
+/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete
 	deleteturfs = FALSE

-/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New()
+/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete/New()
 	..()
 	ignore_typecache = GLOB.typecache_mob

 //Only places atoms/turfs on area borders
-/datum/mapGeneratorModule/border
+/datum/map_generator_module/border
 	clusterCheckFlags = CLUSTER_CHECK_NONE

-/datum/mapGeneratorModule/border/generate()
+/datum/map_generator_module/border/generate()
 	if(!mother)
 		return
 	var/list/map = mother.map
@@ -56,29 +56,29 @@
 		if(is_border(T))
 			place(T)

-/datum/mapGeneratorModule/border/proc/is_border(turf/T)
+/datum/map_generator_module/border/proc/is_border(turf/T)
 	for(var/direction in list(SOUTH,EAST,WEST,NORTH))
 		if (get_step(T,direction) in mother.map)
 			continue
 		return 1
 	return 0

-/datum/mapGenerator/repressurize
-	modules = list(/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/repressurize
+	modules = list(/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Block: Restore Roundstart Air Contents"

-/datum/mapGenerator/massdelete
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete)
+/datum/map_generator/massdelete
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete)
 	buildmode_name = "Block: Full Mass Deletion"

-/datum/mapGenerator/massdelete/nomob
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs)
+/datum/map_generator/massdelete/nomob
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs)
 	buildmode_name = "Block: Mass Deletion - Leave Mobs"

-/datum/mapGenerator/massdelete/noturf
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs)
+/datum/map_generator/massdelete/noturf
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete/leave_turfs)
 	buildmode_name = "Block: Mass Deletion - Leave Turfs"

-/datum/mapGenerator/massdelete/regen
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete)
+/datum/map_generator/massdelete/regen
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete)
 	buildmode_name = "Block: Mass Deletion - Leave Mobs and Turfs"
--- a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm
@@ -3,18 +3,18 @@


 //Pine Trees
-/datum/mapGeneratorModule/pineTrees
+/datum/map_generator_module/pine_trees
 	spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)

 //Dead Trees
-/datum/mapGeneratorModule/deadTrees
+/datum/map_generator_module/dead_trees
 	spawnableAtoms = list(/obj/structure/flora/tree/dead = 10)

 //Random assortment of bushes
-/datum/mapGeneratorModule/randBushes
+/datum/map_generator_module/rand_bushes
 	spawnableAtoms = list()

-/datum/mapGeneratorModule/randBushes/New()
+/datum/map_generator_module/rand_bushes/New()
 	..()
 	spawnableAtoms = typesof(/obj/structure/flora/ausbushes)
 	for(var/i in spawnableAtoms)
@@ -22,16 +22,16 @@


 //Random assortment of rocks and rockpiles
-/datum/mapGeneratorModule/randRocks
+/datum/map_generator_module/rand_rocks
 	spawnableAtoms = list(/obj/structure/flora/rock = 40, /obj/structure/flora/rock/pile = 20)


 //Grass turfs
-/datum/mapGeneratorModule/bottomLayer/grassTurfs
+/datum/map_generator_module/bottom_layer/grass_turfs
 	spawnableTurfs = list(/turf/open/floor/grass = 100)


 //Grass tufts with a high spawn chance
-/datum/mapGeneratorModule/denseLayer/grassTufts
+/datum/map_generator_module/dense_layer/grass_tufts
 	spawnableTurfs = list()
 	spawnableAtoms = list(/obj/structure/flora/ausbushes/grassybush = 75)
--- a/code/modules/procedural_mapping/mapGeneratorObj.dm
+++ b/code/modules/procedural_mapping/mapGeneratorObj.dm
@@ -1,14 +1,14 @@
-/obj/effect/landmark/mapGenerator
+/obj/effect/landmark/map_generator
 	var/startTurfX = 0
 	var/startTurfY = 0
 	var/startTurfZ = -1
 	var/endTurfX = 0
 	var/endTurfY = 0
 	var/endTurfZ = -1
-	var/mapGeneratorType = /datum/mapGenerator/nature
-	var/datum/mapGenerator/mapGenerator
+	var/mapGeneratorType = /datum/map_generator/nature
+	var/datum/map_generator/mapGenerator

-/obj/effect/landmark/mapGenerator/New()
+/obj/effect/landmark/map_generator/New()
 	..()
 	if(startTurfZ < 0)
 		startTurfZ = z
--- a/code/modules/procedural_mapping/mapGeneratorReadme.dm
+++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm
@@ -38,7 +38,7 @@ mapGenerator:

 	initialiseModules()
 		Example: initialiseModules()
-		Desc: Replaces all typepaths in the modules list with actual /datum/mapGenerator/Module types
+		Desc: Replaces all typepaths in the modules list with actual /datum/map_generator/Module types
 		Existing Calls: mapGenerator/New()

 	syncModules()
@@ -51,7 +51,7 @@ mapGeneratorModule
 	Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists
 	which it will generate on turfs in it's mother's map based on cluster variables

-	sync(var/datum/mapGenerator/mum)
+	sync(var/datum/map_generator/mum)
 		Example: sync(a_mapGenerator_as_a_variable)
 		Desc: Sets the Mother variable to the mum argument
 		Existing Calls: mapGenerator/syncModules()
--- a/code/modules/procedural_mapping/mapGenerators/asteroid.dm
+++ b/code/modules/procedural_mapping/mapGenerators/asteroid.dm
@@ -1,23 +1,23 @@
 //Asteroid turfs
-/datum/mapGeneratorModule/bottomLayer/asteroidTurfs
+/datum/map_generator_module/bottom_layer/asteroid_turfs
 	spawnableTurfs = list(/turf/open/floor/plating/asteroid = 100)

-/datum/mapGeneratorModule/bottomLayer/asteroidWalls
+/datum/map_generator_module/bottom_layer/asteroid_walls
 	spawnableTurfs = list(/turf/closed/mineral = 100)

 //Border walls
-/datum/mapGeneratorModule/border/asteroidWalls
+/datum/map_generator_module/border/asteroid_walls
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/mineral = 100)

 //Random walls
-/datum/mapGeneratorModule/splatterLayer/asteroidWalls
+/datum/map_generator_module/splatter_layer/asteroid_walls
 	clusterCheckFlags = CLUSTER_CHECK_NONE
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/mineral = 30)

 //Monsters
-/datum/mapGeneratorModule/splatterLayer/asteroidMonsters
+/datum/map_generator_module/splatter_layer/asteroid_monsters
 	spawnableTurfs = list()
 	spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/basilisk = 10, \
 		/mob/living/simple_animal/hostile/asteroid/hivelord = 10, \
@@ -26,24 +26,24 @@

 // GENERATORS

-/datum/mapGenerator/asteroid/hollow
-	modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
-		/datum/mapGeneratorModule/border/asteroidWalls)
+/datum/map_generator/asteroid/hollow
+	modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
+		/datum/map_generator_module/border/asteroid_walls)
 	buildmode_name = "Pattern: Asteroid Room \[AIRLESS!\]"

-/datum/mapGenerator/asteroid/hollow/random
-	modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
-		/datum/mapGeneratorModule/border/asteroidWalls, \
-		/datum/mapGeneratorModule/splatterLayer/asteroidWalls)
+/datum/map_generator/asteroid/hollow/random
+	modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
+		/datum/map_generator_module/border/asteroid_walls, \
+		/datum/map_generator_module/splatter_layer/asteroid_walls)
 	buildmode_name = "Pattern: Asteroid Room: Splatter Walls \[AIRLESS!\]"

-/datum/mapGenerator/asteroid/hollow/random/monsters
-	modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
-		/datum/mapGeneratorModule/border/asteroidWalls, \
-		/datum/mapGeneratorModule/splatterLayer/asteroidWalls, \
-		/datum/mapGeneratorModule/splatterLayer/asteroidMonsters)
+/datum/map_generator/asteroid/hollow/random/monsters
+	modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
+		/datum/map_generator_module/border/asteroid_walls, \
+		/datum/map_generator_module/splatter_layer/asteroid_walls, \
+		/datum/map_generator_module/splatter_layer/asteroid_monsters)
 	buildmode_name = "Pattern: Asteroid Room: Splatter Walls + Monsters \[AIRLESS!\]"

-/datum/mapGenerator/asteroid/filled
-	modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
+/datum/map_generator/asteroid/filled
+	modules = list(/datum/map_generator_module/bottom_layer/asteroid_walls)
 	buildmode_name = "Block: Asteroid Walls"
--- a/code/modules/procedural_mapping/mapGenerators/cellular.dm
+++ b/code/modules/procedural_mapping/mapGenerators/cellular.dm
@@ -2,7 +2,7 @@
 // Mostly for better caves
 // Should probably move these up and refactor modules so these can be mixed with other ones

-/datum/mapGenerator/ca
+/datum/map_generator/ca
 	var/list/b_rule = list() // 0 -> 1, 1 -> 1
 	var/list/s_rule = list() // 0 -> 0, 1 -> 1
 	var/iterations = 1
@@ -15,7 +15,7 @@
 	var/list/type_map = list(/turf/open/floor/plating, /turf/closed/wall)
 	var/turf/start = null

-/datum/mapGenerator/ca/defineRegion(turf/Start, turf/End, replace = 0)
+/datum/map_generator/ca/defineRegion(turf/Start, turf/End, replace = 0)
 	. = ..()

 	var/min_x = min(Start.x,End.x)
@@ -28,7 +28,7 @@
 	//We assume 2D everywhere anyway
 	start = locate(min_x,min_y,Start.z)

-/datum/mapGenerator/ca/proc/initialize()
+/datum/map_generator/ca/proc/initialize()
 	old_state = new/list(width)
 	for(var/i = 1,i<=width,i++)
 		old_state[i] = new/list(height)
@@ -37,7 +37,7 @@

 	current_state = old_state.Copy()

-/datum/mapGenerator/ca/generate()
+/datum/map_generator/ca/generate()
 	//Abandon all hope for efficency all who enter here
 	//Maybe some less basic implemetation later, but this is just simple admin tool
 	initialize()
@@ -55,7 +55,7 @@
 			if(T)
 				T.ChangeTurf(type_map[current_state[i][j]+1])

-/datum/mapGenerator/ca/proc/apply_rule(i,j)
+/datum/map_generator/ca/proc/apply_rule(i,j)
 	var/value = 0
 	for(var/dx=-1,dx<=1,dx++)
 		for(var/dy=-1,dy<=1,dy++)
@@ -83,13 +83,13 @@
 		return old_state[i][j]
 	return 0

-/datum/mapGenerator/ca/caves
+/datum/map_generator/ca/caves
 	b_rule = list(5,6,7,8)
 	s_rule = list(4)
 	type_map = list(/turf/open/floor/plating/asteroid/basalt, /turf/closed/mineral/volcanic)
 	iterations = 5

-/datum/mapGenerator/ca/maze
+/datum/map_generator/ca/maze
 	b_rule = list(3)
 	s_rule = list(1,2,3,4,5)
 	iterations = 20
--- a/code/modules/procedural_mapping/mapGenerators/cult.dm
+++ b/code/modules/procedural_mapping/mapGenerators/cult.dm
@@ -1,16 +1,16 @@
-/datum/mapGeneratorModule/bottomLayer/cultFloor
+/datum/map_generator_module/bottom_layer/cult_floor
 	spawnableTurfs = list(/turf/open/floor/engine/cult = 100)

-/datum/mapGeneratorModule/border/cultWalls
+/datum/map_generator_module/border/cult_walls
 	spawnableTurfs = list(/turf/closed/wall/mineral/cult = 100)

-/datum/mapGenerator/cult //walls and floor only
-	modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
-		/datum/mapGeneratorModule/border/cultWalls, \
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/cult //walls and floor only
+	modules = list(/datum/map_generator_module/bottom_layer/cult_floor, \
+		/datum/map_generator_module/border/cult_walls, \
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Cult Room"

-/datum/mapGenerator/cult/floor //floors only
-	modules = list(/datum/mapGeneratorModule/bottomLayer/cultFloor, \
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/cult/floor //floors only
+	modules = list(/datum/map_generator_module/bottom_layer/cult_floor, \
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Block: Cult Floor"
--- a/code/modules/procedural_mapping/mapGenerators/lava_river.dm
+++ b/code/modules/procedural_mapping/mapGenerators/lava_river.dm
@@ -1,14 +1,14 @@

-/datum/mapGenerator/lavaland
+/datum/map_generator/lavaland
 	var/start_z
 	var/min_x = 0
 	var/min_y = 0
 	var/max_x = 0
 	var/max_y = 0
-	modules = list(/datum/mapGeneratorModule/river)
+	modules = list(/datum/map_generator_module/river)
 	buildmode_name = "Pattern: Lava Rivers"

-/datum/mapGenerator/lavaland/defineRegion(turf/Start, turf/End, replace = 0)
+/datum/map_generator/lavaland/defineRegion(turf/Start, turf/End, replace = 0)
 	start_z = Start.z
 	min_x = min(Start.x,End.x)
 	min_y = min(Start.y,End.y)
@@ -16,12 +16,12 @@
 	max_y = max(Start.y,End.y)
 	..()

-/datum/mapGeneratorModule/river
+/datum/map_generator_module/river
 	var/river_type = /turf/open/lava/smooth
 	var/river_nodes = 4

-/datum/mapGeneratorModule/river/generate()
-	var/datum/mapGenerator/lavaland/L = mother
+/datum/map_generator_module/river/generate()
+	var/datum/map_generator/lavaland/L = mother
 	if(!istype(L))
 		return
 	spawn_rivers(L.start_z, river_nodes, river_type, min_x = L.min_x, min_y = L.min_y, max_x = L.max_x, max_y = L.max_y)
--- a/code/modules/procedural_mapping/mapGenerators/lavaland.dm
+++ b/code/modules/procedural_mapping/mapGenerators/lavaland.dm
@@ -1,33 +1,33 @@

-/datum/mapGeneratorModule/bottomLayer/lavaland_default
+/datum/map_generator_module/bottom_layer/lavaland_default
 	spawnableTurfs = list(/turf/open/floor/plating/asteroid/basalt/lava_land_surface = 100)

-/datum/mapGeneratorModule/bottomLayer/lavaland_mineral
+/datum/map_generator_module/bottom_layer/lavaland_mineral
 	spawnableTurfs = list(/turf/closed/mineral/random/volcanic = 100)

-/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense
+/datum/map_generator_module/bottom_layer/lavaland_mineral/dense
 	spawnableTurfs = list(/turf/closed/mineral/random/high_chance/volcanic = 100)

-/datum/mapGeneratorModule/splatterLayer/lavalandMonsters
+/datum/map_generator_module/splatter_layer/lavaland_monsters
 	spawnableTurfs = list()
 	spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast = 10,
 	/mob/living/simple_animal/hostile/asteroid/hivelord/legion = 10,
 	/mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 10)

-/datum/mapGeneratorModule/splatterLayer/lavalandTendrils
+/datum/map_generator_module/splatter_layer/lavaland_tendrils
 	spawnableTurfs = list()
 	spawnableAtoms = list(/obj/structure/spawner/lavaland = 5,
 	/obj/structure/spawner/lavaland/legion = 5,
 	/obj/structure/spawner/lavaland/goliath = 5)

-/datum/mapGenerator/lavaland/ground_only
-	modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_default)
+/datum/map_generator/lavaland/ground_only
+	modules = list(/datum/map_generator_module/bottom_layer/lavaland_default)
 	buildmode_name = "Block: Lavaland Floor"

-/datum/mapGenerator/lavaland/dense_ores
-	modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense)
+/datum/map_generator/lavaland/dense_ores
+	modules = list(/datum/map_generator_module/bottom_layer/lavaland_mineral/dense)
 	buildmode_name = "Block: Lavaland Ores: Dense"

-/datum/mapGenerator/lavaland/normal_ores
-	modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral)
+/datum/map_generator/lavaland/normal_ores
+	modules = list(/datum/map_generator_module/bottom_layer/lavaland_mineral)
 	buildmode_name = "Block: Lavaland Ores"
--- a/code/modules/procedural_mapping/mapGenerators/nature.dm
+++ b/code/modules/procedural_mapping/mapGenerators/nature.dm
@@ -1,11 +1,11 @@

 //Exists primarily as a test type.

-/datum/mapGenerator/nature
-	modules = list(/datum/mapGeneratorModule/bottomLayer/grassTurfs, \
-	/datum/mapGeneratorModule/pineTrees, \
-	/datum/mapGeneratorModule/deadTrees, \
-	/datum/mapGeneratorModule/randBushes, \
-	/datum/mapGeneratorModule/randRocks, \
-	/datum/mapGeneratorModule/denseLayer/grassTufts)
+/datum/map_generator/nature
+	modules = list(/datum/map_generator_module/bottom_layer/grass_turfs, \
+	/datum/map_generator_module/pine_trees, \
+	/datum/map_generator_module/dead_trees, \
+	/datum/map_generator_module/rand_bushes, \
+	/datum/map_generator_module/rand_rocks, \
+	/datum/map_generator_module/dense_layer/grass_tufts)
 	buildmode_name = "Pattern: Nature"
--- a/code/modules/procedural_mapping/mapGenerators/repair.dm
+++ b/code/modules/procedural_mapping/mapGenerators/repair.dm
@@ -1,25 +1,25 @@
-/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel
+/datum/map_generator_module/bottom_layer/repair_floor_plasteel
 	spawnableTurfs = list(/turf/open/floor/plasteel = 100)
 	var/ignore_wall = FALSE
 	allowAtomsOnSpace = TRUE

-/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/place(turf/T)
+/datum/map_generator_module/bottom_layer/repair_floor_plasteel/place(turf/T)
 	if(isclosedturf(T) && !ignore_wall)
 		return FALSE
 	return ..()

-/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten
+/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten
 	ignore_wall = TRUE

-/datum/mapGeneratorModule/border/normalWalls
+/datum/map_generator_module/border/normal_walls
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/wall = 100)
 	allowAtomsOnSpace = TRUE

-/datum/mapGeneratorModule/reload_station_map/generate()
-	if(!istype(mother, /datum/mapGenerator/repair/reload_station_map))
+/datum/map_generator_module/reload_station_map/generate()
+	if(!istype(mother, /datum/map_generator/repair/reload_station_map))
 		return
-	var/datum/mapGenerator/repair/reload_station_map/mother1 = mother
+	var/datum/map_generator/repair/reload_station_map/mother1 = mother
 	GLOB.reloading_map = TRUE
 	// This is kind of finicky on multi-Z maps but the reader would need to be
 	// changed to allow Z cropping and that's a mess
@@ -54,42 +54,42 @@
 	SSair.setup_template_machinery(atmos_machines)
 	GLOB.reloading_map = FALSE

-/datum/mapGenerator/repair
-	modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel,
-	/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/repair
+	modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel,
+	/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Repair: Floor"

-/datum/mapGenerator/repair/delete_walls
-	modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten,
-	/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/repair/delete_walls
+	modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten,
+	/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Repair: Floor: Flatten Walls"

-/datum/mapGenerator/repair/enclose_room
-	modules = list(/datum/mapGeneratorModule/bottomLayer/repairFloorPlasteel/flatten,
-	/datum/mapGeneratorModule/border/normalWalls,
-	/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/repair/enclose_room
+	modules = list(/datum/map_generator_module/bottom_layer/repair_floor_plasteel/flatten,
+	/datum/map_generator_module/border/normal_walls,
+	/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Repair: Generate Aired Room"

-/datum/mapGenerator/repair/reload_station_map
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs)
+/datum/map_generator/repair/reload_station_map
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete/no_delete_mobs)
 	var/x_low = 0
 	var/x_high = 0
 	var/y_low = 0
 	var/y_high = 0
 	var/z = 0
 	var/cleanload = FALSE
-	var/datum/mapGeneratorModule/reload_station_map/loader
+	var/datum/map_generator_module/reload_station_map/loader
 	buildmode_name = "Repair: Reload Block \[DO NOT USE\]"

-/datum/mapGenerator/repair/reload_station_map/clean
+/datum/map_generator/repair/reload_station_map/clean
 	buildmode_name = "Repair: Reload Block - Mass Delete"
 	cleanload = TRUE

-/datum/mapGenerator/repair/reload_station_map/clean/in_place
-	modules = list(/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete)
+/datum/map_generator/repair/reload_station_map/clean/in_place
+	modules = list(/datum/map_generator_module/bottom_layer/massdelete/regeneration_delete)
 	buildmode_name = "Repair: Reload Block - Mass Delete - In Place"

-/datum/mapGenerator/repair/reload_station_map/defineRegion(turf/start, turf/end)
+/datum/map_generator/repair/reload_station_map/defineRegion(turf/start, turf/end)
 	. = ..()
 	if(!is_station_level(start.z) || !is_station_level(end.z))
 		return
@@ -101,7 +101,7 @@

 GLOBAL_VAR_INIT(reloading_map, FALSE)

-/datum/mapGenerator/repair/reload_station_map/generate(clean = cleanload)
+/datum/map_generator/repair/reload_station_map/generate(clean = cleanload)
 	if(!loader)
 		loader = new
 	if(cleanload)
--- a/code/modules/procedural_mapping/mapGenerators/shuttle.dm
+++ b/code/modules/procedural_mapping/mapGenerators/shuttle.dm
@@ -1,17 +1,17 @@
-/datum/mapGeneratorModule/bottomLayer/shuttleFloor
+/datum/map_generator_module/bottom_layer/shuttle_floor
 	spawnableTurfs = list(/turf/open/floor/plasteel/shuttle = 100)

-/datum/mapGeneratorModule/border/shuttleWalls
+/datum/map_generator_module/border/shuttle_walls
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/wall/mineral/titanium = 100)
 // Generators

-/datum/mapGenerator/shuttle/full
-	modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor, \
-		/datum/mapGeneratorModule/border/shuttleWalls,\
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/shuttle/full
+	modules = list(/datum/map_generator_module/bottom_layer/shuttle_floor, \
+		/datum/map_generator_module/border/shuttle_walls,\
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Shuttle Room"

-/datum/mapGenerator/shuttle/floor
-	modules = list(/datum/mapGeneratorModule/bottomLayer/shuttleFloor)
+/datum/map_generator/shuttle/floor
+	modules = list(/datum/map_generator_module/bottom_layer/shuttle_floor)
 	buildmode_name = "Block: Shuttle Floor"
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -4,22 +4,22 @@
 /turf/open/floor/plasteel/shuttle/red/syndicate
 	name = "floor" //Not Brig Floor

-/datum/mapGeneratorModule/bottomLayer/syndieFloor
+/datum/map_generator_module/bottom_layer/syndie_floor
 	spawnableTurfs = list(/turf/open/floor/plasteel/shuttle/red/syndicate = 100)

-/datum/mapGeneratorModule/border/syndieWalls
+/datum/map_generator_module/border/syndie_walls
 	spawnableAtoms = list()
 	spawnableTurfs = list(/turf/closed/wall/r_wall = 100)


-/datum/mapGeneratorModule/syndieFurniture
+/datum/map_generator_module/syndie_furniture
 	clusterCheckFlags = CLUSTER_CHECK_ALL
 	spawnableTurfs = list()
 	spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
 		/obj/structure/frame/computer = 15, /obj/item/storage/toolbox/syndicate = 15 ,\
 		/obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)

-/datum/mapGeneratorModule/splatterLayer/syndieMobs
+/datum/map_generator_module/splatter_layer/syndie_mobs
 	spawnableAtoms = list(/mob/living/simple_animal/hostile/syndicate = 30, \
 		/mob/living/simple_animal/hostile/syndicate/melee = 20, \
 		/mob/living/simple_animal/hostile/syndicate/ranged = 20, \
@@ -28,30 +28,30 @@

 // Generators

-/datum/mapGenerator/syndicate/empty //walls and floor only
-	modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
-		/datum/mapGeneratorModule/border/syndieWalls,\
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/syndicate/empty //walls and floor only
+	modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
+		/datum/map_generator_module/border/syndie_walls,\
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Shuttle Room: Syndicate"

-/datum/mapGenerator/syndicate/mobsonly
-	modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
-		/datum/mapGeneratorModule/border/syndieWalls,\
-		/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/syndicate/mobsonly
+	modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
+		/datum/map_generator_module/border/syndie_walls,\
+		/datum/map_generator_module/splatter_layer/syndie_mobs, \
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Shuttle Room: Syndicate: Mobs"

-/datum/mapGenerator/syndicate/furniture
-	modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
-		/datum/mapGeneratorModule/border/syndieWalls,\
-		/datum/mapGeneratorModule/syndieFurniture, \
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/syndicate/furniture
+	modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
+		/datum/map_generator_module/border/syndie_walls,\
+		/datum/map_generator_module/syndie_furniture, \
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Shuttle Room: Syndicate: Furniture"

-/datum/mapGenerator/syndicate/full
-	modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
-		/datum/mapGeneratorModule/border/syndieWalls,\
-		/datum/mapGeneratorModule/syndieFurniture, \
-		/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
-		/datum/mapGeneratorModule/bottomLayer/repressurize)
+/datum/map_generator/syndicate/full
+	modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
+		/datum/map_generator_module/border/syndie_walls,\
+		/datum/map_generator_module/syndie_furniture, \
+		/datum/map_generator_module/splatter_layer/syndie_mobs, \
+		/datum/map_generator_module/bottom_layer/repressurize)
 	buildmode_name = "Pattern: Shuttle Room: Syndicate: All"