cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into diagonal-movement

Browse Source
This commit is contained in:
Couls
2019-06-02 21:59:58 -04:00
parent cdb867456e
commit 5979166f54
526 changed files with 97898 additions and 5530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/procedural_mapping/mapGenerators/asteroid.dm
+1 -1
View File
@@ -1,6 +1,6 @@
//Asteroid turfs
/datum/mapGeneratorModule/bottomLayer/asteroidTurfs
spawnableTurfs = list(/turf/simulated/floor/plating/airless/asteroid = 100)
spawnableTurfs = list(/turf/simulated/floor/plating/asteroid/airless = 100)
/datum/mapGeneratorModule/bottomLayer/asteroidWalls
spawnableTurfs = list(/turf/simulated/mineral = 100)
code/modules/procedural_mapping/mapGenerators/lava_river.dm
+25
View File
@@ -0,0 +1,25 @@
/datum/mapGenerator/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)
/datum/mapGenerator/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)
max_x = max(Start.x,End.x)
max_y = max(Start.y,End.y)
..()
/datum/mapGeneratorModule/river
var/river_type = /turf/simulated/floor/plating/lava/smooth
var/river_nodes = 4
/datum/mapGeneratorModule/river/generate()
var/datum/mapGenerator/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
+29
View File
@@ -0,0 +1,29 @@
/datum/mapGeneratorModule/bottomLayer/lavaland_default
spawnableTurfs = list(/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface = 100)
/datum/mapGeneratorModule/bottomLayer/lavaland_mineral
spawnableTurfs = list(/turf/simulated/mineral/random/volcanic = 100)
/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense
spawnableTurfs = list(/turf/simulated/mineral/random/high_chance/volcanic = 100)
/datum/mapGeneratorModule/splatterLayer/lavalandMonsters
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
spawnableTurfs = list()
spawnableAtoms = list(/mob/living/simple_animal/hostile/spawner/lavaland/goliath = 5,
/mob/living/simple_animal/hostile/spawner/lavaland/legion = 5,
/mob/living/simple_animal/hostile/spawner/lavaland/goliath = 5)
/datum/mapGenerator/lavaland/ground_only
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_default)
/datum/mapGenerator/lavaland/dense_ores
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral/dense)
/datum/mapGenerator/lavaland/normal_ores
modules = list(/datum/mapGeneratorModule/bottomLayer/lavaland_mineral)