cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lava is no longer a plating + all lava is smooth (#23482)

Browse Source 
* woohoo

* sirryan review

* accept incoming and stuff

* fuck
This commit is contained in:
Contrabang
2023-12-16 11:47:44 +00:00
committed by GitHub
parent 6a84d32190
commit 09dd7309ad
32 changed files with 8490 additions and 8492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+1 -1
View File
@@ -1156,7 +1156,7 @@
/turf/simulated/floor/light,
/area/ruin/powered/clownplanet)
"ye" = (
/turf/simulated/floor/plating/lava/smooth,
/turf/simulated/floor/lava,
/area/ruin/powered/clownplanet)
"CB" = (
/obj/item/paper/crumpled/bloody/ruins/lavaland/clown_planet/hope,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm
+4 -4
View File
@@ -26,7 +26,7 @@
/area/ruin/unpowered/althland_processing)
"af" = (
/obj/structure/lattice/lava,
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"ap" = (
/obj/effect/mapping_helpers/no_lava,
@@ -102,7 +102,7 @@
},
/area/ruin/unpowered/althland_processing)
"bT" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"bU" = (
/obj/effect/mapping_helpers/no_lava,
@@ -443,7 +443,7 @@
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"jY" = (
/obj/effect/decal/cleanable/dirt,
@@ -1747,7 +1747,7 @@
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"Ta" = (
/obj/item/chair{
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+9 -9
View File
@@ -224,11 +224,11 @@
/obj/structure/stone_tile/surrounding_tile{
dir = 8
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aI" = (
/obj/structure/stone_tile/block/cracked,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aJ" = (
/obj/structure/stone_tile/surrounding_tile/cracked,
@@ -239,7 +239,7 @@
/obj/structure/stone_tile/surrounding_tile{
dir = 8
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aK" = (
/obj/structure/stone_tile/block/cracked{
@@ -311,17 +311,17 @@
/obj/structure/stone_tile/block/cracked{
dir = 4
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aU" = (
/obj/structure/lavaland/ash_walker,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aV" = (
/obj/structure/stone_tile/block{
dir = 8
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"aW" = (
/obj/structure/stone_tile/block{
@@ -390,13 +390,13 @@
/obj/structure/stone_tile/surrounding_tile{
dir = 1
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"be" = (
/obj/structure/stone_tile/block{
dir = 1
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"bf" = (
/obj/structure/stone_tile/surrounding_tile/cracked{
@@ -409,7 +409,7 @@
/obj/structure/stone_tile/surrounding_tile{
dir = 4
},
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"bg" = (
/obj/structure/stone_tile/block{
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_blooddrunk1.dmm
+5 -5
View File
@@ -108,7 +108,7 @@
/obj/structure/stone_tile{
dir = 1
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"r" = (
/obj/structure/stone_tile/block{
@@ -122,7 +122,7 @@
/obj/structure/stone_tile/cracked{
dir = 4
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"t" = (
/obj/structure/stone_tile/surrounding/cracked{
@@ -131,14 +131,14 @@
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner{
dir = 1
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"u" = (
/obj/structure/stone_tile{
dir = 1
},
/obj/structure/stone_tile/block/cracked,
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"v" = (
/obj/structure/stone_tile{
@@ -153,7 +153,7 @@
/obj/structure/stone_tile/block/cracked{
dir = 8
},
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"x" = (
/obj/structure/stone_tile{
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/simulated/floor/engine/cult/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"c" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/ruin/unpowered/misc_lavaruin)
"d" = (
/turf/simulated/wall/cult,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm
+2 -2
View File
@@ -39,7 +39,7 @@
/turf/simulated/floor/clockwork/lavaland_air,
/area/lavaland/surface/outdoors/unexplored)
"l" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/unexplored)
"m" = (
/obj/item/clockwork/alloy_shards/medium,
@@ -59,7 +59,7 @@
/area/lavaland/surface/outdoors/unexplored)
"q" = (
/obj/structure/lattice/catwalk/clockwork,
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors/unexplored)
"r" = (
/obj/structure/lattice/clockwork,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"d" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm
+2 -2
View File
@@ -6,14 +6,14 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"d" = (
/obj/effect/baseturf_helper/lava_land/surface,
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/gluttony)
"e" = (
/turf/simulated/floor/plating/lava/smooth,
/turf/simulated/floor/lava,
/area/ruin/powered/gluttony)
"f" = (
/obj/item/dnainjector/eatmut,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"d" = (
/obj/effect/baseturf_helper/lava_land/surface,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm
+1 -1
View File
@@ -8,7 +8,7 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"m" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"r" = (
/obj/effect/mapping_helpers/no_lava,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
/turf/simulated/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"c" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"d" = (
/obj/effect/baseturf_helper/lava_land/surface,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm
+1 -1
View File
@@ -3,7 +3,7 @@
/turf/simulated/wall/indestructible/riveted,
/area/ruin/unpowered/misc_lavaruin)
"b" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/ruin/unpowered/misc_lavaruin)
"c" = (
/obj/item/paper/fluff/stations/lavaland/sloth/note,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
+1 -1
View File
@@ -124,7 +124,7 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"G" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/lavaland/surface/outdoors)
"H" = (
/obj/structure/alien/weeds,
_maps/map_files/generic/Lavaland.dmm
+8387 -8387
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/centcomm.dmm
+5 -5
View File
@@ -7717,7 +7717,7 @@
/area/centcom/suppy)
"Bv" = (
/obj/structure/stone_tile/slab/cracked,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/space/bubblegum_arena)
"Bw" = (
/obj/structure/ninjatele{
@@ -8729,7 +8729,7 @@
/area/centcom/control)
"Fk" = (
/obj/structure/stone_tile/slab/burnt,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/space/bubblegum_arena)
"Fm" = (
/obj/structure/chair/sofa/corp{
@@ -10693,7 +10693,7 @@
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"LV" = (
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/space/bubblegum_arena)
"LX" = (
/obj/structure/chair/sofa/corp/left{
@@ -13165,7 +13165,7 @@
},
/area/holodeck/source_knightarena)
"UJ" = (
/turf/simulated/floor/plating/lava/smooth/mapping_lava,
/turf/simulated/floor/lava/mapping_lava,
/area/wizard_station)
"UK" = (
/turf/simulated/floor/holofloor/carpet,
@@ -13502,7 +13502,7 @@
/obj/structure/stone_tile/surrounding/burnt,
/obj/structure/stone_tile/center/burnt,
/obj/effect/landmark/spawner/bubblegum,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/turf/simulated/floor/lava/lava_land_surface,
/area/ruin/space/bubblegum_arena)
"Wh" = (
/turf/simulated/floor/plasteel{
code/__DEFINES/icon_smoothing_defines.dm
+1 -1
View File
@@ -40,7 +40,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
#define SMOOTH_GROUP_TURF S_TURF(0) ///turf/simulated
#define SMOOTH_GROUP_TURF_CHASM S_TURF(1) ///turf/simulated/chasm, /turf/simulated/floor/fakepit
#define SMOOTH_GROUP_FLOOR_LAVA S_TURF(2) ///turf/simulated/lava/smooth
#define SMOOTH_GROUP_FLOOR_LAVA S_TURF(2) ///turf/simulated/floor/lava
#define SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS S_TURF(3) ///turf/simulated/transparent/glass
#define SMOOTH_GROUP_FLOOR S_TURF(4) ///turf/simulated/floor
code/__DEFINES/is_helpers.dm
+1 -1
View File
@@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
#define ismineralturf(A) istype(A, /turf/simulated/mineral)
#define islava(A) (istype(A, /turf/simulated/floor/plating/lava))
#define islava(A) (istype(A, /turf/simulated/floor/lava))
#define ischasm(A) (istype(A, /turf/simulated/floor/chasm))
code/controllers/subsystem/non_firing/SSmapping.dm
+4 -4
View File
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(mapping)
F << next_map.type
/datum/controller/subsystem/mapping/Initialize()
lavaland_theme = pick(/turf/simulated/floor/plating/lava/smooth/lava_land_surface, /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma, /turf/simulated/floor/chasm/straight_down/lava_land_surface)
lavaland_theme = pick(/turf/simulated/floor/lava/lava_land_surface, /turf/simulated/floor/lava/lava_land_surface/plasma, /turf/simulated/floor/chasm/straight_down/lava_land_surface)
log_startup_progress("We're in the mood for [initial(lavaland_theme.name)] today...") //We load this first. In the event some nerd ever makes a surface map, and we don't have it in lavaland in the event lavaland is disabled.
cave_theme = pick(BLOCKED_BURROWS, CLASSIC_CAVES, DEADLY_DEEPROCK)
log_startup_progress("We feel like [cave_theme] today...")
@@ -72,13 +72,13 @@ SUBSYSTEM_DEF(mapping)
var/lavaland_setup_timer = start_watch()
seedRuins(list(level_name_to_num(MINING)), GLOB.configuration.ruins.lavaland_ruin_budget, /area/lavaland/surface/outdoors/unexplored, GLOB.lava_ruins_templates)
switch(lavaland_theme)
if(/turf/simulated/floor/plating/lava/smooth/lava_land_surface)
if(/turf/simulated/floor/lava/lava_land_surface)
spawn_rivers(level_name_to_num(MINING)) //Default spawn, no tweaks needed
if(/turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma) //More rivers, smaller
if(/turf/simulated/floor/lava/lava_land_surface/plasma) //More rivers, smaller
spawn_rivers(level_name_to_num(MINING), nodes = 2)
spawn_rivers(level_name_to_num(MINING), nodes = 2)
if(/turf/simulated/floor/chasm/straight_down/lava_land_surface) //Thiner chasms, bridges, reaches to edge of map.
spawn_rivers(level_name_to_num(MINING), nodes = 6, turf_type = /turf/simulated/floor/plating/lava/smooth/mapping_lava, whitelist_area = /area/lavaland/surface/outdoors, min_x = 50, min_y = 7, max_x = 250, max_y = 225, prob = 10, prob_loss = 5)
spawn_rivers(level_name_to_num(MINING), nodes = 6, turf_type = /turf/simulated/floor/lava/mapping_lava, whitelist_area = /area/lavaland/surface/outdoors, min_x = 50, min_y = 7, max_x = 250, max_y = 225, prob = 10, prob_loss = 5)
var/time_spent = stop_watch(lavaland_setup_timer)
log_startup_progress("Successfully populated lavaland in [time_spent]s.")
else
code/game/gamemodes/cult/cult_structures.dm
+1 -1
View File
@@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
/turf/simulated/floor/engine/cult,
/turf/space,
/turf/simulated/wall/indestructible,
/turf/simulated/floor/plating/lava,
/turf/simulated/floor/lava,
/turf/simulated/floor/chasm,
/turf/simulated/wall/cult,
/turf/simulated/wall/cult/artificer
code/game/turfs/simulated/floor.dm
-1
View File
@@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
var/icon_plating = "plating"
thermal_conductivity = 0.020
heat_capacity = 100000
var/lava = 0
var/broken = FALSE
var/burnt = FALSE
var/current_overlay = null
code/game/turfs/simulated/floor/asteroid_floors.dm
+4 -4
View File
@@ -111,7 +111,7 @@
digResult = /obj/item/stack/ore/glass/basalt
/turf/simulated/floor/plating/asteroid/basalt/lava //lava underneath
baseturf = /turf/simulated/floor/plating/lava/smooth
baseturf = /turf/simulated/floor/lava
/turf/simulated/floor/plating/asteroid/basalt/airless
temperature = TCMB
@@ -149,7 +149,7 @@
nitrogen = 23
temperature = 300
planetary_atmos = TRUE
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface_hard
oxygen = 14
@@ -157,7 +157,7 @@
temperature = 300
planetary_atmos = TRUE
color = COLOR_FLOOR_HARD_ROCK
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
/turf/simulated/floor/plating/asteroid/airless
temperature = TCMB
@@ -315,7 +315,7 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
SpawnFloor(NT, 50) //Room has higher probabilty.
if(prob(25))
tempradius = round(tempradius / 3)
var/turf/oasis_lake = pickweight(list(/turf/simulated/floor/plating/lava/smooth/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma = 4, /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4, /turf/simulated/floor/plating/lava/smooth/mapping_lava = 6, /turf/simulated/floor/beach/away/water/lavaland_air = 1, /turf/simulated/floor/plating/asteroid = 1))
var/turf/oasis_lake = pickweight(list(/turf/simulated/floor/lava/lava_land_surface = 4, /turf/simulated/floor/lava/lava_land_surface/plasma = 4, /turf/simulated/floor/chasm/straight_down/lava_land_surface = 4, /turf/simulated/floor/lava/mapping_lava = 6, /turf/simulated/floor/beach/away/water/lavaland_air = 1, /turf/simulated/floor/plating/asteroid = 1))
if(oasis_lake == /turf/simulated/floor/plating/asteroid)
new /obj/effect/spawner/oasisrock(T, tempradius)
for(var/turf/oasis in circlerangeturfs(T, tempradius))
code/game/turfs/simulated/floor/lava.dm
+41 -45
View File
@@ -1,8 +1,15 @@
/turf/simulated/floor/plating/lava
/**
* Lava turf, burns things that are on it.
* Currently a subtype of floor so that footsteps work on it.
* Perhaps we could move it down to /turf/simulated/lava someday, as I dont think footsteps over lava are very important.
*/
/turf/simulated/floor/lava
name = "lava"
icon_state = "lava"
icon = 'icons/turf/floors/lava.dmi'
icon_state = "lava-255"
base_icon_state = "lava"
gender = PLURAL //"That's some lava."
baseturf = /turf/simulated/floor/plating/lava //lava all the way down
baseturf = /turf/simulated/floor/lava //lava all the way down
slowdown = 2
light_range = 2
light_power = 0.75
@@ -11,32 +18,36 @@
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_FLOOR_LAVA)
canSmoothWith = list(SMOOTH_GROUP_FLOOR_LAVA)
intact = FALSE
floor_tile = null
real_layer = PLATING_LAYER
/turf/simulated/floor/plating/lava/ex_act()
/turf/simulated/floor/lava/ex_act()
return
/turf/simulated/floor/plating/lava/acid_act(acidpwr, acid_volume)
/turf/simulated/floor/lava/acid_act(acidpwr, acid_volume)
return
/turf/simulated/floor/plating/lava/airless
temperature = TCMB
/turf/simulated/floor/plating/lava/Entered(atom/movable/AM)
/turf/simulated/floor/lava/Entered(atom/movable/AM)
if(burn_stuff(AM))
START_PROCESSING(SSprocessing, src)
/turf/simulated/floor/plating/lava/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
/turf/simulated/floor/lava/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(burn_stuff(AM))
START_PROCESSING(SSprocessing, src)
/turf/simulated/floor/plating/lava/process()
/turf/simulated/floor/lava/process()
if(!burn_stuff())
STOP_PROCESSING(SSprocessing, src)
/turf/simulated/floor/plating/lava/singularity_act()
/turf/simulated/floor/lava/singularity_act()
return
/turf/simulated/floor/plating/lava/singularity_pull(S, current_size)
/turf/simulated/floor/lava/singularity_pull(S, current_size)
return
/turf/simulated/floor/plating/lava/make_plating()
@@ -50,12 +61,12 @@
underlay_appearance.icon_state = "basalt"
return TRUE
/turf/simulated/floor/plating/lava/is_safe()
/turf/simulated/floor/lava/is_safe()
if(find_safeties() && ..())
return TRUE
return FALSE
/turf/simulated/floor/plating/lava/proc/burn_stuff(AM)
/turf/simulated/floor/lava/proc/burn_stuff(AM)
. = FALSE
if(find_safeties())
@@ -108,7 +119,7 @@
L.IgniteMob()
/turf/simulated/floor/plating/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
/turf/simulated/floor/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
if(istype(C, /obj/item/stack/rods/lava))
var/obj/item/stack/rods/lava/R = C
var/obj/structure/lattice/lava/H = locate(/obj/structure/lattice/lava, src)
@@ -136,57 +147,42 @@
else
to_chat(user, "<span class='warning'>You need one floor tile to build a floor!</span>")
/turf/simulated/floor/plating/lava/screwdriver_act()
/turf/simulated/floor/lava/screwdriver_act()
return
/turf/simulated/floor/plating/lava/welder_act()
/turf/simulated/floor/lava/welder_act()
return
/turf/simulated/floor/plating/lava/break_tile()
/turf/simulated/floor/lava/break_tile()
return
/turf/simulated/floor/plating/lava/burn_tile()
/turf/simulated/floor/lava/burn_tile()
return
/turf/simulated/floor/plating/lava/smooth
name = "lava"
baseturf = /turf/simulated/floor/plating/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
icon_state = "lava-255"
base_icon_state = "lava"
smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_FLOOR_LAVA)
canSmoothWith = list(SMOOTH_GROUP_FLOOR_LAVA)
/turf/simulated/floor/plating/lava/smooth/lava_land_surface
/turf/simulated/floor/lava/lava_land_surface
temperature = 300
oxygen = 14
nitrogen = 23
planetary_atmos = TRUE
baseturf = /turf/simulated/floor/chasm/straight_down/lava_land_surface
/turf/simulated/floor/plating/lava/smooth/airless
temperature = TCMB
oxygen = 0
nitrogen = 0
/turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma
/turf/simulated/floor/lava/lava_land_surface/plasma
name = "liquid plasma"
desc = "A flowing stream of chilled liquid plasma. You probably shouldn't get in."
icon = 'icons/turf/floors/liquidplasma.dmi'
icon_state = "liquidplasma-255"
base_icon_state = "liquidplasma"
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma
baseturf = /turf/simulated/floor/lava/lava_land_surface/plasma
light_range = 3
light_power = 0.75
light_color = LIGHT_COLOR_PINK
/turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma/examine(mob/user)
/turf/simulated/floor/lava/lava_land_surface/plasma/examine(mob/user)
. = ..()
. += "<span class='info'>Some <b>liquid plasma<b> could probably be scooped up with a <b>container</b>.</span>"
/turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma/attackby(obj/item/I, mob/user, params)
/turf/simulated/floor/lava/lava_land_surface/plasma/attackby(obj/item/I, mob/user, params)
if(!I.is_open_container())
return ..()
if(!I.reagents.add_reagent("plasma", 10))
@@ -194,7 +190,7 @@
return
to_chat(user, "<span class='notice'>You scoop out some plasma from the [src] using [I].</span>")
/turf/simulated/floor/plating/lava/smooth/lava_land_surface/plasma/burn_stuff(AM)
/turf/simulated/floor/lava/lava_land_surface/plasma/burn_stuff(AM)
. = FALSE
if(find_safeties())
return FALSE
@@ -255,22 +251,22 @@
burn_human.adjustToxLoss(15) //Cold mutagen is bad for you, more at 11.
burn_human.adjustFireLoss(15)
/turf/simulated/floor/plating/lava/smooth/mapping_lava
/turf/simulated/floor/lava/mapping_lava
name = "Adaptive lava / chasm / plasma"
icon_state = "mappinglava"
base_icon_state = "mappinglava"
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
temperature = 300
oxygen = 14
nitrogen = 23
planetary_atmos = TRUE
/turf/simulated/floor/plating/lava/smooth/mapping_lava/Initialize(mapload)
/turf/simulated/floor/lava/mapping_lava/Initialize(mapload)
. = ..()
return INITIALIZE_HINT_LATELOAD //Lateload is needed, otherwise atmos does not setup right on the turf roundstart, leading it to be vacume. This is bad.
/turf/simulated/floor/plating/lava/smooth/mapping_lava/LateInitialize()
/turf/simulated/floor/lava/mapping_lava/LateInitialize()
. = ..()
ChangeTurf(SSmapping.lavaland_theme, ignore_air = TRUE)
code/game/turfs/simulated/minerals.dm
+4 -4
View File
@@ -277,7 +277,7 @@
/turf/simulated/mineral/random/high_chance/volcanic
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
oxygen = 14
nitrogen = 23
temperature = 300
@@ -297,7 +297,7 @@
/turf/simulated/mineral/random/volcanic
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
oxygen = 14
nitrogen = 23
temperature = 300
@@ -319,7 +319,7 @@
/turf/simulated/mineral/random/labormineral/volcanic
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
oxygen = 14
nitrogen = 23
temperature = 300
@@ -493,7 +493,7 @@
/turf/simulated/mineral/volcanic/lava_land_surface
environment_type = "basalt"
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
defer_change = 1
//gibtonite state defines
code/game/turfs/simulated/river.dm
+1 -1
View File
@@ -4,7 +4,7 @@
#define RANDOM_LOWER_X 50
#define RANDOM_LOWER_Y 50
/proc/spawn_rivers(target_z, nodes = 4, turf_type = /turf/simulated/floor/plating/lava/smooth/mapping_lava, whitelist_area = /area/lavaland/surface/outdoors, min_x = RANDOM_LOWER_X, min_y = RANDOM_LOWER_Y, max_x = RANDOM_UPPER_X, max_y = RANDOM_UPPER_Y, prob = 25, prob_loss = 11)
/proc/spawn_rivers(target_z, nodes = 4, turf_type = /turf/simulated/floor/lava/mapping_lava, whitelist_area = /area/lavaland/surface/outdoors, min_x = RANDOM_LOWER_X, min_y = RANDOM_LOWER_Y, max_x = RANDOM_UPPER_X, max_y = RANDOM_UPPER_Y, prob = 25, prob_loss = 11)
var/list/river_nodes = list()
var/num_spawned = 0
var/list/possible_locs = block(locate(min_x, min_y, target_z), locate(max_x, max_y, target_z))
code/modules/mapping/mapping_helpers.dm
+2 -2
View File
@@ -48,11 +48,11 @@
/obj/effect/baseturf_helper/lava
name = "lava baseturf editor"
baseturf = /turf/simulated/floor/plating/lava/smooth
baseturf = /turf/simulated/floor/lava
/obj/effect/baseturf_helper/lava_land/surface
name = "lavaland baseturf editor"
baseturf = /turf/simulated/floor/plating/lava/smooth/mapping_lava
baseturf = /turf/simulated/floor/lava/mapping_lava
/obj/effect/mapping_helpers
icon = 'icons/effects/mapping_helpers.dmi'
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+1 -1
View File
@@ -213,7 +213,7 @@
hitsound = 'sound/weapons/sear.ogg'
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
needs_permit = TRUE
var/turf_type = /turf/simulated/floor/plating/lava/smooth
var/turf_type = /turf/simulated/floor/lava
var/transform_string = "lava"
var/reset_turf_type = /turf/simulated/floor/plating/asteroid/basalt
var/reset_string = "basalt"
code/modules/mining/lavaland/loot/tendril_loot.dm
+1 -1
View File
@@ -135,7 +135,7 @@
var/turf/next = get_step(src, direction)
var/turf/current = get_turf(src)
if(istype(next, /turf/simulated/floor/plating/lava/smooth) || istype(current, /turf/simulated/floor/plating/lava/smooth)) //We can move from land to lava, or lava to land, but not from land to land
if(istype(next, /turf/simulated/floor/lava) || istype(current, /turf/simulated/floor/lava)) //We can move from land to lava, or lava to land, but not from land to land
..()
else
if(last_message_time + 1 SECONDS < world.time)
code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+1 -1
View File
@@ -456,7 +456,7 @@ Difficulty: Medium
// changes turf to lava temporarily
if(!T.density && !islava(T))
var/lava_turf = /turf/simulated/floor/plating/lava/smooth
var/lava_turf = /turf/simulated/floor/lava
var/reset_turf = T.type
T.ChangeTurf(lava_turf)
sleep(reset_time)
code/modules/mod/modules/modules_supply.dm
+1 -1
View File
@@ -324,7 +324,7 @@
))
if(!keep_turfs)
keep_turfs = typecacheof(list(
/turf/simulated/floor/plating/lava,
/turf/simulated/floor/lava,
/turf/simulated/floor/indestructible/hierophant,
/turf/simulated/floor/indestructible/necropolis
))
code/modules/reagents/chemistry/reagents/misc_reagents.dm
+1 -1
View File
@@ -246,7 +246,7 @@
taste_description = "a carpet...what?"
/datum/reagent/carpet/reaction_turf(turf/simulated/T, volume)
if((istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)) && !islava(T))
if((istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel)))
var/turf/simulated/floor/F = T
F.ChangeTurf(/turf/simulated/floor/carpet)
..()
code/modules/shuttle/shuttle.dm
+1 -1
View File
@@ -547,7 +547,7 @@
unlockPortDoors(S1)
/obj/docking_port/mobile/proc/is_turf_blacklisted_for_transit(turf/T)
var/static/list/blacklisted_turf_types = typecacheof(list(/turf/space, /turf/simulated/floor/chasm, /turf/simulated/floor/plating/lava, /turf/simulated/floor/plating/asteroid))
var/static/list/blacklisted_turf_types = typecacheof(list(/turf/space, /turf/simulated/floor/chasm, /turf/simulated/floor/lava, /turf/simulated/floor/plating/asteroid))
return is_type_in_typecache(T, blacklisted_turf_types)
tools/UpdatePaths/Scripts/23482_lava_repathing.txt
+3
View File
@@ -0,0 +1,3 @@
/turf/simulated/floor/plating/lava/smooth/@SUBTYPES : /turf/simulated/floor/lava/@SUBTYPES{@OLD}
/turf/simulated/floor/plating/lava/@SUBTYPES : /turf/simulated/floor/lava/@SUBTYPES{@OLD}
/turf/simulated/lava/@SUBTYPES : /turf/simulated/floor/lava/@SUBTYPES{@OLD}