shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lava is no longer a plating subtype (#2138)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-26 02:05:53 -05:00
committed by kevinz000
parent 986549df26
commit 147bd4cf97
55 changed files with 2811 additions and 5382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_helpers/fabrication_helpers.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/turf/open/floor/plating/ashplanet/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
return FALSE
/turf/open/floor/plating/lava/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
/turf/open/lava/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
return FALSE
/turf/open/floor/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
code/game/gamemodes/cult/cult_structures.dm
+1 -1
View File
@@ -175,7 +175,7 @@
/turf/closed,
/turf/open/floor/engine/cult,
/turf/open/space,
/turf/open/floor/plating/lava,
/turf/open/lava,
/turf/open/chasm))
if(is_type_in_typecache(T, blacklisted_pylon_turfs))
continue
code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+1 -1
View File
@@ -229,7 +229,7 @@
/obj/structure/flora/swarmer_act()
return FALSE
/turf/open/floor/plating/lava/swarmer_act()
/turf/open/lava/swarmer_act()
if(!is_safe())
new /obj/structure/lattice/catwalk/swarmer_catwalk(src)
return FALSE
code/game/objects/effects/effect_system/effects_foam.dm
+1 -1
View File
@@ -21,7 +21,7 @@
var/static/list/blacklisted_turfs = typecacheof(list(
/turf/open/space/transit,
/turf/open/chasm,
/turf/open/floor/plating/lava))
/turf/open/lava))
/obj/effect/particle_effect/foam/metal
code/game/objects/effects/glowshroom.dm
+1 -1
View File
@@ -16,7 +16,7 @@
var/spreadIntoAdjacentChance = 60
var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom
var/static/list/blacklisted_glowshroom_turfs = typecacheof(list(
/turf/open/floor/plating/lava,
/turf/open/lava,
/turf/open/floor/plating/beach/water))
/obj/structure/glowshroom/glowcap
code/game/objects/structures/aliens.dm
+1 -1
View File
@@ -133,7 +133,7 @@
blacklisted_turfs = typecacheof(list(
/turf/open/space,
/turf/open/chasm,
/turf/open/floor/plating/lava))
/turf/open/lava))
last_expand = world.time + rand(growth_cooldown_low, growth_cooldown_high)
code/game/turfs/simulated/floor/plating/asteroid.dm
+2 -2
View File
@@ -118,7 +118,7 @@
floor_variance = 15
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
baseturf = /turf/open/floor/plating/lava/smooth
baseturf = /turf/open/lava/smooth
/turf/open/floor/plating/asteroid/basalt/airless
initial_gas_mix = "TEMP=2.7"
@@ -145,7 +145,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/open/lava/smooth/lava_land_surface
code/game/turfs/simulated/floor/plating/lava.dm → code/game/turfs/simulated/lava.dm
+36 -42
View File
@@ -1,64 +1,75 @@
///LAVA
/turf/open/floor/plating/lava
/turf/open/lava
name = "lava"
icon_state = "lava"
gender = PLURAL //"That's some lava."
baseturf = /turf/open/floor/plating/lava //lava all the way down
baseturf = /turf/open/lava //lava all the way down
slowdown = 2
light_range = 2
light_power = 0.75
light_color = LIGHT_COLOR_LAVA
/turf/open/floor/plating/lava/ex_act(severity, target)
/turf/open/lava/ex_act(severity, target)
contents_explosion(severity, target)
/turf/open/floor/plating/lava/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0)
/turf/open/lava/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0)
return
/turf/open/floor/plating/lava/MakeDry(wet_setting = TURF_WET_WATER)
/turf/open/lava/MakeDry(wet_setting = TURF_WET_WATER)
return
/turf/open/floor/plating/lava/airless
/turf/open/lava/airless
initial_gas_mix = "TEMP=2.7"
/turf/open/floor/plating/lava/Entered(atom/movable/AM)
/turf/open/lava/Entered(atom/movable/AM)
if(burn_stuff(AM))
START_PROCESSING(SSobj, src)
/turf/open/floor/plating/lava/hitby(atom/movable/AM)
/turf/open/lava/hitby(atom/movable/AM)
if(burn_stuff(AM))
START_PROCESSING(SSobj, src)
/turf/open/floor/plating/lava/process()
/turf/open/lava/process()
if(!burn_stuff())
STOP_PROCESSING(SSobj, src)
/turf/open/floor/plating/lava/singularity_act()
/turf/open/lava/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
return FALSE
/turf/open/lava/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "<span class='notice'>You build a floor.</span>")
ChangeTurf(/turf/open/floor/plating)
return TRUE
return FALSE
/turf/open/lava/singularity_act()
return
/turf/open/floor/plating/lava/singularity_pull(S, current_size)
/turf/open/lava/singularity_pull(S, current_size)
return
/turf/open/floor/plating/lava/make_plating()
return
/turf/open/floor/plating/lava/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
/turf/open/lava/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
underlay_appearance.icon = 'icons/turf/floors.dmi'
underlay_appearance.icon_state = "basalt"
return TRUE
/turf/open/floor/plating/lava/GetHeatCapacity()
/turf/open/lava/GetHeatCapacity()
. = 700000
/turf/open/floor/plating/lava/GetTemperature()
/turf/open/lava/GetTemperature()
. = 5000
/turf/open/floor/plating/lava/TakeTemperature(temp)
/turf/open/lava/TakeTemperature(temp)
/turf/open/floor/plating/lava/proc/is_safe()
/turf/open/lava/proc/is_safe()
//if anything matching this typecache is found in the lava, we don't burn things
var/static/list/lava_safeties_typecache = typecacheof(list(/obj/structure/lattice/catwalk, /obj/structure/stone_tile))
var/list/found_safeties = typecache_filter_list(contents, lava_safeties_typecache)
@@ -68,7 +79,7 @@
return LAZYLEN(found_safeties)
/turf/open/floor/plating/lava/proc/burn_stuff(AM)
/turf/open/lava/proc/burn_stuff(AM)
. = 0
if(is_safe())
@@ -115,35 +126,18 @@
L.adjust_fire_stacks(20)
L.IgniteMob()
/turf/open/floor/plating/lava/attackby(obj/item/C, mob/user, params) //Lava isn't a good foundation to build on
return
/turf/open/floor/plating/lava/break_tile()
return
/turf/open/floor/plating/lava/pry_tile()
return
/turf/open/floor/plating/lava/try_replace_tile()
return
/turf/open/floor/plating/lava/burn_tile()
return
/turf/open/floor/plating/lava/smooth
/turf/open/lava/smooth
name = "lava"
baseturf = /turf/open/floor/plating/lava/smooth
baseturf = /turf/open/lava/smooth
icon = 'icons/turf/floors/lava.dmi'
icon_state = "unsmooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/plating/lava/smooth)
canSmoothWith = list(/turf/open/lava/smooth)
/turf/open/floor/plating/lava/smooth/lava_land_surface
/turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturf = /turf/open/chasm/straight_down/lava_land_surface
/turf/open/floor/plating/lava/smooth/airless
/turf/open/lava/smooth/airless
initial_gas_mix = "TEMP=2.7"
code/game/turfs/simulated/minerals.dm
+4 -4
View File
@@ -178,7 +178,7 @@
/turf/closed/mineral/random/high_chance/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
mineralSpawnChanceList = list(
@@ -199,7 +199,7 @@
/turf/closed/mineral/random/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
@@ -221,7 +221,7 @@
/turf/closed/mineral/random/labormineral/volcanic
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
defer_change = 1
mineralSpawnChanceList = list(
@@ -361,7 +361,7 @@
/turf/closed/mineral/volcanic/lava_land_surface
environment_type = "basalt"
turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/open/lava/smooth/lava_land_surface
defer_change = 1
/turf/closed/mineral/ash_rock //wall piece
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 = 5, nodes = 4, turf_type = /turf/open/floor/plating/lava/smooth/lava_land_surface, 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)
/proc/spawn_rivers(target_z = 5, nodes = 4, turf_type = /turf/open/lava/smooth/lava_land_surface, 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)
var/list/river_nodes = list()
var/num_spawned = 0
while(num_spawned < nodes)