cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2025-12-10 15:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lavaland Edges and Weather Fix

Browse Source
This commit is contained in:
Captain277
2022-03-07 21:38:25 -08:00
parent 766e6b2df1
commit 77f628f41b
8 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
_maps/map_levels/140x140/lavaland.dmm
View File

@@ -163,7 +163,7 @@
/area/lavaland/central/base/common)
"eY" = (
/obj/machinery/door/blast/shutters{
dir = 4;
dir = 8;
id = "ll_cent_shutter_east";
name = "East Transit Shutter"
},
@@ -219,7 +219,7 @@
/area/lavaland/central/base/common)
"fw" = (
/mob/living/simple_mob/construct/shade/surt,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/explored)
"fX" = (
/obj/machinery/light/small{
@@ -268,7 +268,7 @@
/turf/simulated/floor/plating,
/area/lavaland/central/base/common)
"gy" = (
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/explored)
"gE" = (
/obj/effect/floor_decal/industrial/warning{
@@ -393,7 +393,7 @@
/area/lavaland/central/base/common)
"ix" = (
/mob/living/simple_mob/animal/space/bats/surt,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/unexplored)
"iz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -690,7 +690,7 @@
name = "\improper MEMETIC HAZARD";
pixel_x = 32
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/explored)
"oC" = (
/obj/structure/closet/secure_closet/personal,
@@ -831,7 +831,7 @@
/obj/machinery/atmospherics/unary/outlet_injector{
dir = 4
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/base/common)
"qc" = (
/obj/machinery/atmospherics/binary/circulator{
@@ -1095,7 +1095,7 @@
name = "\improper MEMETIC HAZARD";
pixel_x = -32
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/base/common)
"ui" = (
/obj/machinery/door/airlock{
@@ -1649,7 +1649,7 @@
/turf/simulated/floor/tiled,
/area/lavaland/central/base/common)
"Ft" = (
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/unexplored)
"FF" = (
/obj/machinery/door/firedoor/multi_tile{
@@ -1846,7 +1846,7 @@
id = "ll_cent_shutter_east";
pixel_x = 25
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/explored)
"Jl" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -2266,7 +2266,7 @@
pixel_y = -4
},
/obj/effect/map_helper/airlock/sensor/ext_sensor,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/central/base/common)
"RJ" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{

38
_maps/map_levels/140x140/lavaland_east.dmm
View File

@@ -22,7 +22,7 @@
/area/lavaland/east/colony)
"ak" = (
/mob/living/simple_mob/animal/space/bats/surt,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/unexplored)
"al" = (
/obj/structure/girder,
@@ -152,7 +152,7 @@
pixel_x = -25;
pixel_y = -1
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/explored)
"bL" = (
/turf/simulated/floor/tiled/dark/lavaland,
@@ -172,7 +172,7 @@
/area/lavaland/east/colony)
"cH" = (
/obj/machinery/door/blast/shutters{
dir = 8;
dir = 4;
id = "ll_east_shutter";
name = "East Transit Shutter"
},
@@ -210,7 +210,7 @@
name = "\improper MEMETIC HAZARD";
pixel_x = -32
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/explored)
"dk" = (
/obj/effect/floor_decal/rust,
@@ -408,7 +408,7 @@
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/colony)
"ix" = (
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/explored)
"iL" = (
/obj/effect/floor_decal/industrial/warning/dust{
@@ -526,7 +526,7 @@
/area/lavaland/east/explored)
"kL" = (
/obj/structure/fence/corner,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"kQ" = (
/obj/structure/toilet{
@@ -918,7 +918,7 @@
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/colony)
"rS" = (
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"rX" = (
/obj/effect/gibspawner/human,
@@ -1146,7 +1146,7 @@
/area/lavaland/east/colony)
"vS" = (
/obj/structure/fence,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"wn" = (
/obj/effect/gibspawner/human,
@@ -1199,7 +1199,7 @@
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/colony)
"wP" = (
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/unexplored)
"wQ" = (
/obj/structure/bed/chair/backed_red{
@@ -1230,7 +1230,7 @@
/obj/machinery/light{
dir = 8
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"xk" = (
/obj/structure/table/steel_reinforced,
@@ -1352,7 +1352,7 @@
/area/lavaland/east/colony)
"zg" = (
/obj/structure/barricade,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"zl" = (
/obj/machinery/door/airlock/glass_medical{
@@ -1432,7 +1432,7 @@
/area/lavaland/east/colony)
"AY" = (
/mob/living/simple_mob/animal/space/bats/surt,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/explored)
"Be" = (
/obj/structure/grille,
@@ -1560,7 +1560,7 @@
/obj/structure/fence/cut/large{
dir = 4
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"DB" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -1574,7 +1574,7 @@
dir = 1
},
/obj/structure/fence,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"DF" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -1854,7 +1854,7 @@
/obj/structure/fence/cut/medium{
dir = 4
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"Ld" = (
/obj/effect/floor_decal/corner/red/diagonal,
@@ -1933,7 +1933,7 @@
/obj/machinery/light{
dir = 8
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"Ns" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -1946,7 +1946,7 @@
/area/lavaland/east/colony)
"NB" = (
/obj/structure/fence/cut/large,
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"NF" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -2262,7 +2262,7 @@
/obj/structure/fence/cut/medium{
dir = 1
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"Tl" = (
/obj/structure/bed/chair/wood,
@@ -2525,7 +2525,7 @@
/obj/structure/fence{
dir = 4
},
/turf/simulated/mineral/floor/ignore_mapgen/lavaland/lavaland,
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/colony)
"XW" = (
/obj/machinery/door/airlock{

1
code/game/turfs/flooring/flooring.dm
View File

@@ -538,7 +538,6 @@ var/list/flooring_types
desc = "Soft and ominous."
icon = 'icons/turf/flooring/asteroid.dmi'
icon_base = "asteroid"
flags = TURF_HAS_EDGES
footstep_sounds = list("human" = list(
'sound/effects/footstep/asteroid1.ogg',
'sound/effects/footstep/asteroid2.ogg',

8
code/modules/maps/triumph/levels/lavaland.dm
View File

@@ -25,7 +25,7 @@ LAVALAND_TURF_CREATE(/turf/simulated/floor/outdoors/beach/sand/desert)
LAVALAND_TURF_CREATE(/turf/simulated/floor/outdoors/grass)
LAVALAND_TURF_CREATE(/turf/simulated/floor/water)
LAVALAND_TURF_CREATE(/turf/simulated/floor/outdoors/lava)
LAVALAND_TURF_CREATE(/turf/simulated/floor/outdoors/lavaland)
LAVALAND_TURF_CREATE(/turf/simulated/floor/outdoors)
LAVALAND_TURF_CREATE(/turf/simulated/floor/water/deep)
LAVALAND_TURF_CREATE(/turf/simulated/floor/water/shoreline)
LAVALAND_TURF_CREATE(/turf/simulated/floor/water/shoreline/corner)
@@ -48,9 +48,9 @@ LAVALAND_TURF_CREATE(/turf/simulated/floor/carpet/bcarpet)
LAVALAND_TURF_CREATE(/turf/simulated/floor/carpet/blucarpet)
LAVALAND_TURF_CREATE(/turf/simulated/floor/carpet/purcarpet)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/ignore_mapgen)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor/lavaland)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor/cave/lavaland)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen/lavaland)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor/cave)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/triumph)
LAVALAND_TURF_CREATE(/turf/simulated/mineral/rich/triumph)
LAVALAND_TURF_CREATE(/turf/simulated/floor/bluegrid)

1
code/modules/mining/mine_turfs.dm
View File

@@ -21,6 +21,7 @@ var/list/mining_overlay_cache = list()
density = 1
blocks_air = 1
can_dirty = FALSE
edge_blending_priority = 0
var/datum/ore/mineral
var/sand_dug

BIN
icons/turf/outdoors_edge.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 28 KiB

10
maps/nsv_triumph/lavaland.dm
View File

@@ -7,7 +7,7 @@ var/datum/planet/lavaland/planet_lavaland = null
name = "Lava Land"
desc = "The fabled."
current_time = new /datum/time/lavaland()
expected_z_levels = list(21) // Debug testing.
expected_z_levels = list(21, 22) // Debug testing.
/datum/planet/lavaland/New()
..()
@@ -157,11 +157,11 @@ var/datum/planet/lavaland/planet_lavaland = null
wind_low = 3
flight_failure_modifier = 50
sky_visible = FALSE
timer_low_bound = 1 // How long this weather must run before it tries to change, in minutes
timer_high_bound = 1 // How long this weather can run before it tries to change, in minutes
timer_low_bound = 2 // How long this weather must run before it tries to change, in minutes
timer_high_bound = 10 // How long this weather can run before it tries to change, in minutes
transition_chances = list(
WEATHER_ASH_STORM = 5,
WEATHER_CLEAR = 95
WEATHER_ASH_STORM = 15,
WEATHER_CLEAR = 85
)
observed_message = "All that can be seen is black smoldering ash."
transition_messages = list(

5
maps/nsv_triumph/submaps/lavaland/_lavaland.dm
View File

@@ -89,6 +89,7 @@
AM.forceMove(T)
// Lava Land turfs
/turf/simulated/floor/outdoors/lavaland
name = "ash sand"
desc = "Soft and ominous."
@@ -96,9 +97,9 @@
icon_state = "asteroid"
outdoors = 1
flags = TURF_HAS_EDGES
edge_blending_priority = 2
edge_blending_priority = 3
base_icon_state = "asteroid"
turf_layers = list(/turf/simulated/floor/outdoors/rocks)
turf_layers = list(/turf/simulated/mineral/floor/lavaland)
initial_flooring = /decl/flooring/outdoors/lavaland
// This is a special subtype of the thing that generates ores on a map