cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace

Browse Source
This commit is contained in:
datlo
2019-06-13 13:58:56 +01:00
parent a8ec4a4528 8026fcbd3c
commit 8894d88a82
186 changed files with 2259 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/mapping.dm
+1 -1
View File
@@ -30,7 +30,7 @@ SUBSYSTEM_DEF(mapping)
var/mining_type = MINETYPE
if (mining_type == "lavaland")
// Spawn Lavaland ruins and rivers.
seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors, lava_ruins_templates)
seedRuins(list(level_name_to_num(MINING)), config.lavaland_budget, /area/lavaland/surface/outdoors/unexplored, lava_ruins_templates)
spawn_rivers()
else
// Populate mining Z-level hidden rooms
code/controllers/subsystem/ticker.dm
+2
View File
@@ -523,3 +523,5 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/HasRoundStarted()
return current_state >= GAME_STATE_PLAYING
/datum/controller/subsystem/ticker/proc/IsRoundInProgress()
return current_state == GAME_STATE_PLAYING