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/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
+1 -1
View File
@@ -31,7 +31,7 @@
var/turf/T = loc
if(istype(T))
if(istype(T, /turf/open/floor/plating/lava))
if(istype(T, /turf/open/lava))
environment_temperature = 5000
else if(T.blocks_air)
environment_temperature = T.temperature
code/modules/mining/lavaland/necropolis_chests.dm
+1 -1
View File
@@ -835,7 +835,7 @@
damtype = BURN
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
hitsound = 'sound/weapons/sear.ogg'
var/turf_type = /turf/open/floor/plating/lava/smooth
var/turf_type = /turf/open/lava/smooth
var/transform_string = "lava"
var/reset_turf_type = /turf/open/floor/plating/asteroid/basalt
var/reset_string = "basalt"
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+2 -2
View File
@@ -93,7 +93,7 @@ Difficulty: Medium
return ..()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Move(atom/newloc)
if(dashing || (newloc && newloc.z == z && (istype(newloc, /turf/open/floor/plating/lava) || istype(newloc, /turf/open/chasm)))) //we're not stupid!
if(dashing || (newloc && newloc.z == z && (istype(newloc, /turf/open/lava) || istype(newloc, /turf/open/chasm)))) //we're not stupid!
return FALSE
return ..()
@@ -186,7 +186,7 @@ Difficulty: Medium
var/turf_dist_to_target = 0
if(!QDELETED(dash_target))
turf_dist_to_target += get_dist(dash_target, O)
if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !istype(O, /turf/open/floor/plating/lava) && !istype(O, /turf/open/chasm))
if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !istype(O, /turf/open/lava) && !istype(O, /turf/open/chasm))
var/valid = TRUE
for(var/turf/T in getline(own_turf, O))
if(is_blocked_turf(T, TRUE))
code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+2 -2
View File
@@ -137,8 +137,8 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
/mob/living/simple_animal/hostile/swarmer/ai/Move(atom/newloc)
if(newloc)
if(newloc.z == z) //so these actions are Z-specific
if(istype(newloc, /turf/open/floor/plating/lava))
var/turf/open/floor/plating/lava/L = newloc
if(istype(newloc, /turf/open/lava))
var/turf/open/lava/L = newloc
if(!L.is_safe())
StartAction(20)
new /obj/structure/lattice/catwalk/swarmer_catwalk(newloc)
code/modules/procedural_mapping/mapGenerators/lava_river.dm
+1 -1
View File
@@ -15,7 +15,7 @@
..()
/datum/mapGeneratorModule/river
var/river_type = /turf/open/floor/plating/lava/smooth
var/river_type = /turf/open/lava/smooth
var/river_nodes = 4
var/start_z = 5
code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+1 -1
View File
@@ -258,7 +258,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
if(falling || fallen)
return
var/turf/T = get_turf(src)
if(!istype(T, /turf/open/floor/plating/lava) && !istype(T, /turf/open/chasm)) //nothing to sink or fall into
if(!istype(T, /turf/open/lava) && !istype(T, /turf/open/chasm)) //nothing to sink or fall into
return
var/obj/item/I
if(istype(AM, /obj/item))
code/modules/ruins/objects_and_mobs/ruin_mapping_aids.dm
+2 -1
View File
@@ -4,7 +4,8 @@
name = "lava baseturf editor"
icon = 'icons/obj/weapons.dmi'
icon_state = "syndballoon"
var/baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
var/baseturf = /turf/open/lava/smooth/lava_land_surface
layer = POINT_LAYER
/obj/effect/baseturf_helper/Initialize()
. = ..()