cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts ALL typepaths to lowercase (#51642)

Browse Source 
* 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
This commit is contained in:
nemvar
2020-06-17 20:47:57 -03:00
committed by GitHub
parent 60f86ea2ff
commit b87f65d95e
278 changed files with 2586 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/procedural_mapping/mapGenerators/asteroid.dm
+19 -19
View File
@@ -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"
code/modules/procedural_mapping/mapGenerators/cellular.dm
+7 -7
View File
@@ -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
code/modules/procedural_mapping/mapGenerators/cult.dm
+9 -9
View File
@@ -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"
code/modules/procedural_mapping/mapGenerators/lava_river.dm
+6 -6
View File
@@ -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)
code/modules/procedural_mapping/mapGenerators/lavaland.dm
+11 -11
View File
@@ -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"
code/modules/procedural_mapping/mapGenerators/nature.dm
+7 -7
View File
@@ -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"
code/modules/procedural_mapping/mapGenerators/repair.dm
+25 -25
View File
@@ -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)
code/modules/procedural_mapping/mapGenerators/shuttle.dm
+8 -8
View File
@@ -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"
code/modules/procedural_mapping/mapGenerators/syndicate.dm
+24 -24
View File
@@ -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"