cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Roundstart Active Turfs (#36756)

Browse Source 
* River AT fix

* Roundstart AT fix

* simpler

* Wait simpler is bad

* Webediting

* more weebediting

* Remove ashwalker active turfs

* Swarmer Crash has lavaland atmos

* Removed redundant checks
This commit is contained in:
Robustin
2018-04-06 10:23:01 -04:00
committed by Nich
parent a732d378ed
commit 16ec77201c
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
View File

@@ -1033,7 +1033,7 @@
/obj/structure/table/wood,
/obj/item/twohanded/spear,
/obj/item/storage/belt,
/turf/open/indestructible/boss/air,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cI" = (
/obj/structure/stone_tile/cracked{
@@ -1075,7 +1075,7 @@
/obj/structure/table/wood,
/obj/item/twohanded/spear,
/obj/item/scythe,
/turf/open/indestructible/boss/air,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cM" = (
/obj/structure/stone_tile/block{

8
_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
View File

@@ -9,7 +9,9 @@
/turf/closed/wall/mineral/plastitanium,
/area/ruin/unpowered)
"d" = (
/turf/open/floor/mineral/plastitanium,
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
"e" = (
/obj/structure/shuttle/engine/propulsion{
@@ -19,7 +21,9 @@
/area/ruin/unpowered)
"f" = (
/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon,
/turf/open/floor/mineral/plastitanium,
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/unpowered)
(1,1,1) = {"

7
code/game/turfs/simulated/floor/plating/asteroid.dm
View File

@@ -1,6 +1,4 @@
/**********************Asteroid**************************/
/turf/open/floor/plating/asteroid //floor piece
@@ -211,6 +209,9 @@
if(istype(tunnel))
// Small chance to have forks in our tunnel; otherwise dig our tunnel.
if(i > 3 && prob(20))
if(istype(tunnel.loc, /area/mine/explored) || (istype(tunnel.loc, /area/lavaland/surface/outdoors) && !istype(tunnel.loc, /area/lavaland/surface/outdoors/unexplored)))
sanity = 0
break
var/turf/open/floor/plating/asteroid/airless/cave/C = tunnel.ChangeTurf(data_having_type, null, CHANGETURF_IGNORE_AIR)
C.going_backwards = FALSE
C.produce_tunnel_from_data(rand(10, 15), dir)
@@ -229,7 +230,7 @@
/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
for(var/S in RANGE_TURFS(1, src))
var/turf/NT = S
if(!NT || isspaceturf(NT) || istype(NT.loc, /area/mine/explored) || istype(NT.loc, /area/lavaland/surface/outdoors/explored))
if(!NT || isspaceturf(NT) || istype(NT.loc, /area/mine/explored) || (istype(NT.loc, /area/lavaland/surface/outdoors) && !istype(NT.loc, /area/lavaland/surface/outdoors/unexplored)))
sanity = 0
break
if(!sanity)

2
code/game/turfs/simulated/river.dm
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/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)
/proc/spawn_rivers(target_z, nodes = 4, turf_type = /turf/open/lava/smooth/lava_land_surface, whitelist_area = /area/lavaland/surface/outdoors/unexplored, 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
var/list/possible_locs = block(locate(min_x, min_y, target_z), locate(max_x, max_y, target_z))