Merge pull request #6845 from VOREStation/aro-sectors

Sector tweaks
This commit is contained in:
Aronai Sieyes
2020-03-18 09:53:20 -04:00
committed by GitHub
14 changed files with 67910 additions and 5268 deletions
+10 -7
View File
@@ -9,24 +9,27 @@
/area/awaymission/proc/EvalValidSpawnTurfs()
//Adds turfs to the valid)turfs list, used for spawning.
for(var/turf/simulated/floor/F in src)
valid_spawn_turfs |= F
for(var/turf/unsimulated/floor/F in src)
valid_spawn_turfs |= F
if(mobcountmax || floracountmax)
for(var/turf/simulated/floor/F in src)
valid_spawn_turfs += F
for(var/turf/unsimulated/floor/F in src)
valid_spawn_turfs += F
/area/awaymission/LateInitialize()
..()
EvalValidSpawnTurfs()
if(!valid_spawn_turfs.len)
if(!valid_spawn_turfs.len && (mobcountmax || floracountmax))
to_world_log("Error! [src] does not have any turfs!")
return TRUE
//Handles random mob placement for mobcountmax, as defined/randomized in initialize of each individual area.
spawn_mob_on_turf()
if(mobcountmax)
spawn_mob_on_turf()
//Handles random flora placement for floracountmax, as defined/randomized in initialize of each individual area.
spawn_flora_on_turf()
if(floracountmax)
spawn_flora_on_turf()
to_world("Away mission spawning done.")
+16
View File
@@ -219,6 +219,21 @@
//////////////////////////////////////////////////////////////////////////////////////
// Gateway submaps go here
/obj/effect/overmap/visitable/sector/tether_gateway
name = "Unknown"
desc = "Approach and perform a scan to obtain further information."
icon_state = "object" //or "globe" for planetary stuff
known = FALSE
//initial_generic_waypoints = list("don't forget waypoints!")
var/true_name = "The scanned name goes here"
var/true_desc = "The scanned desc goes here"
/obj/effect/overmap/visitable/sector/tether_gateway/get_scan_data(mob/user)
name = true_name
desc = true_desc
return ..()
/datum/map_template/tether_lateload/gateway
name = "Gateway Submap"
desc = "Please do not use this."
@@ -263,6 +278,7 @@
desc = "Asteroid-bound mercenary listening post"
mappath = 'gateway/listeningpost.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination
//////////////////////////////////////////////////////////////////////////////////////
// Admin-use z-levels for loading whenever an admin feels like
#if AWAY_MISSION_TEST
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+3 -5
View File
@@ -1,9 +1,7 @@
/obj/effect/overmap/visitable/sector/carpfarm
name = "Unknown Facility"
desc = "Seems to be a carp farm of some sort."
icon_state = "object"
known = FALSE
/obj/effect/overmap/visitable/sector/tether_gateway/carpfarm
initial_generic_waypoints = list("tether_excursion_carpfarm")
true_name = "Carp-Infested Outpost"
true_desc = "Scans indicate this outpost has many instances of 'space carp' moving around, along with an assortment of equipment that appears human in origin."
/area/awaymission/carpfarm
icon_state = "blank"
+2 -12
View File
@@ -763,18 +763,8 @@
},
/turf/simulated/floor/airless,
/area/space)
"sI" = (
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
flags = 2;
landmark_tag = "tether_excursion_carpfarm";
name = "Outside Facility (SW)"
},
/turf/space,
/area/space)
"Fi" = (
/obj/effect/overmap/visitable/sector/carpfarm,
/obj/effect/overmap/visitable/sector/tether_gateway/carpfarm,
/turf/space,
/area/space)
@@ -4593,7 +4583,7 @@ aa
aa
aa
aa
sI
aa
aa
aa
aa
+3 -5
View File
@@ -1,9 +1,7 @@
/obj/effect/overmap/visitable/sector/listeningpost
name = "Unknown Facility"
desc = "High levels of radio frequency emissions."
icon_state = "object"
known = FALSE
/obj/effect/overmap/visitable/sector/tether_gateway/listeningpost
initial_generic_waypoints = list("tether_excursion_listeningpost")
true_name = "Strange Asteroid"
true_desc = "Scans indicate this asteroid is emitting large amounts of radio-frequency energy, and has indications of life being present."
/obj/item/weapon/paper/listneningpost/mission
name = "\improper Operation: Watchtower"
@@ -310,7 +310,7 @@
/turf/simulated/floor/greengrid,
/area/mine/explored)
"W" = (
/obj/effect/overmap/visitable/sector/listeningpost,
/obj/effect/overmap/visitable/sector/tether_gateway/listeningpost,
/turf/space,
/area/space)
"Y" = (
+29 -24
View File
@@ -1,29 +1,24 @@
/obj/effect/overmap/visitable/sector/snowoutpost
name = "Unknown Facility"
desc = "Low surface activity and temperature detected."
icon_state = "globe"
known = FALSE
/obj/effect/overmap/visitable/sector/tether_gateway/snowoutpost
initial_generic_waypoints = list("tether_excursion_snow_outpost")
true_name = "Snowy Outpost"
true_desc = "Scans indicate this planetoid has a very cold atmosphere and almost perpetual snow. There are signs of habitation on the surface."
// -- Areas -- //
/area/awaymission/snow_outpost
icon_state = "blank"
requires_power = 0
mobcountmax = 0
floracountmax = 0
base_turf = /turf/snow/snow2
ambience = list('sound/music/main.ogg', 'sound/ambience/maintenance/maintenance4.ogg', 'sound/ambience/sif/sif1.ogg', 'sound/ambience/ruins/ruins1.ogg')
base_turf = /turf/simulated/floor/snow/snow2
/area/awaymission/snow_outpost/outside
icon_state = "away1"
requires_power = 1
always_unpowered = 1
dynamic_lighting = 1
power_light = 0
power_equip = 0
power_environ = 0
mobcountmax = 100
floracountmax = 7000
dynamic_lighting = 0
mobcountmax = 50
floracountmax = 300
valid_mobs = list(/mob/living/simple_mob/animal/sif/savik, /mob/living/simple_mob/animal/wolf, /mob/living/simple_mob/animal/sif/shantak,
/mob/living/simple_mob/animal/sif/kururak, /mob/living/simple_mob/animal/sif/frostfly)
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
@@ -32,17 +27,27 @@
/obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/genericbush, /obj/structure/flora/ausbushes/pointybush,
/obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass)
/area/awaymission/snow_outpost/restricted // No mob spawns!
icon_state = "red"
mobcountmax = 1 // Hacky fix.
floracountmax = 100
valid_mobs = list(/obj/structure/flora/tree/pine) // Hacky fix.
valid_flora = list(/obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine, /obj/structure/flora/tree/pine,
/obj/structure/flora/tree/dead, /obj/structure/flora/grass/brown, /obj/structure/flora/grass/green,
/obj/structure/flora/grass/both, /obj/structure/flora/bush, /obj/structure/flora/ausbushes/grassybush,
/obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/ausbushes/genericbush, /obj/structure/flora/ausbushes/pointybush,
/obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass)
/area/awaymission/snow_outpost/outside/EvalValidSpawnTurfs()
..()
if(mobcountmax || floracountmax)
for(var/turf/simulated/floor/water/W in src)
valid_spawn_turfs -= W
for(var/turf/simulated/floor/outdoors/ice/I in src)
valid_spawn_turfs -= I
/area/awaymission/snow_outpost/outpost
/area/awaymission/snow_outpost/dark
icon_state = "red"
requires_power = 1
always_unpowered = 1
dynamic_lighting = 1
/area/awaymission/snow_outpost/outside/nospawn
icon_state = "away2"
mobcountmax = 0
floracountmax = 0
/area/awaymission/snow_outpost/powered
requires_power = 0
dynamic_lighting = 1
icon_state = "away"
ambience = list('sound/ambience/chapel/chapel1.ogg', 'sound/ambience/ruins/ruins5.ogg', 'sound/ambience/ruins/ruins1.ogg') // Rykka was here. <3
File diff suppressed because it is too large Load Diff
+3 -5
View File
@@ -1,9 +1,7 @@
/obj/effect/overmap/visitable/sector/snowfield
name = "Unknown Facility"
desc = "Wet, boring, and cold."
icon_state = "globe"
known = FALSE
/obj/effect/overmap/visitable/sector/tether_gateway/snowfield
initial_generic_waypoints = list("tether_excursion_snowfield")
true_name = "Snowy Field"
true_desc = "Scans indicate this planetoid has a very cold atmosphere and almost perpetual snow."
// -- Areas -- //
+2 -14
View File
@@ -1683,20 +1683,8 @@
temperature = 243.15
},
/area/awaymission/snowfield/base)
"tn" = (
/obj/effect/shuttle_landmark{
base_area = /area/awaymission/snowfield/outside;
base_turf = /turf/simulated/floor/outdoors/snow;
landmark_tag = "tether_excursion_snowfield"
},
/turf/simulated/floor/outdoors/snow{
nitrogen = 93.7835;
oxygen = 20.7263;
temperature = 243.15
},
/area/awaymission/snowfield/outside)
"Bw" = (
/obj/effect/overmap/visitable/sector/snowfield,
/obj/effect/overmap/visitable/sector/tether_gateway/snowfield,
/turf/simulated/floor/outdoors/snow{
nitrogen = 93.7835;
oxygen = 20.7263;
@@ -7331,7 +7319,7 @@ ad
ad
ad
ad
tn
ad
ad
ad
ad
+1 -1
View File
@@ -141,7 +141,7 @@
)
lateload_single_pick = list(
//list("Snow Outpost"), // Unplayable mapgen,
list("Snow Outpost"),
//list("Zoo"), // Too big. way, way too big
list("Carp Farm"),
list("Snow Field"),