diff --git a/_maps/map_files/generic/lavaland.dmm b/_maps/map_files/generic/lavaland.dmm index d5fd0117bad..b6568748081 100644 --- a/_maps/map_files/generic/lavaland.dmm +++ b/_maps/map_files/generic/lavaland.dmm @@ -50,7 +50,7 @@ "aX" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/mine/living_quarters) "aY" = (/obj/structure/sign/xeno_warning_mining,/turf/simulated/wall{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/mine/living_quarters) "aZ" = (/obj/machinery/door/airlock/maintenance{name = "Mining Station Maintenance"; req_access_txt = "48"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/mine/living_quarters) -"ba" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "mining_away"; name = "lavaland mine"; turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface; width = 7},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"ba" = (/obj/docking_port/stationary{area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 3; height = 5; id = "mining_away"; name = "lavaland mine"; turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface; width = 7},/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "bb" = (/obj/machinery/door/airlock/external{name = "Mining External Airlock"; req_access_txt = "54"},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/mine/living_quarters) "bc" = (/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/mine/living_quarters) "bd" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{baseturf = /turf/simulated/floor/plating/asteroid/basalt},/area/mine/living_quarters) diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm index 35eb9a821ff..4e5ded6d903 100644 --- a/code/modules/mining/lavaland/weather.dm +++ b/code/modules/mining/lavaland/weather.dm @@ -34,7 +34,7 @@ update_areas() for(var/mob/M in player_list) if(M.z == target_z) - M << start_up_message + M << "[start_up_message]" sleep(start_up_time) stage = MAIN_STAGE @@ -45,7 +45,7 @@ update_areas() for(var/mob/M in player_list) if(M.z == target_z) - M << "[duration_message]" + M << "[duration_message]" if(purely_aesthetic) sleep(duration*10) else //Storm effects @@ -64,7 +64,7 @@ update_areas() for(var/mob/M in player_list) if(M.z == target_z) - M << wind_down_message + M << "[wind_down_message]" sleep(wind_down) diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm index 1c33d9e19f0..ee08aeb2cb2 100644 --- a/code/modules/mining/lavaland/weather_types.dm +++ b/code/modules/mining/lavaland/weather_types.dm @@ -64,7 +64,7 @@ name = "ash storm" start_up_time = 300 //30 seconds start_up_message = "The wind begins to pick up. Seek shelter." - duration_lower = 60 //1.5 minutes + duration_lower = 60 //1 minute duration_upper = 180 //3 minutes duration_message = "An ash storm has started! Get inside!" wind_down = 300 // 30 seconds diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index cb61d278fd8..cc863ecbb43 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -737,7 +737,7 @@ var/global/list/rockTurfEdgeCache environment_type = "basalt" turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface - mineralChance = 4 + mineralChance = 5 mineralSpawnChanceList = list( "Uranium" = 5, "Diamond" = 1, "Gold" = 10, "Silver" = 12, "Plasma" = 20, "Iron" = 40, diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 9cb255fe225..3a11487e5b8 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -28,7 +28,7 @@ if(ongoing_weather || weather_cooldown > world.time) return ongoing_weather = TRUE - weather_cooldown = world.time + rand(2000, 5000) + weather_cooldown = world.time + rand(3500, 8000) var/datum/weather/ash_storm/LAVA = new /datum/weather/ash_storm LAVA.weather_start_up() ongoing_weather = FALSE