Wilderness atmos fix (#1826)

* Atmos and mob faction fix

Should reduce lag substantially and stop planetary phoron fires.

* Active Edges

* fuck you Travis you unhelpful shit

* Testing probable problem area.

* Is THIS it?!

* Long shot, but let's try it.

* Just to kick Travis again

* oops
This commit is contained in:
Spades
2017-07-07 01:09:42 -04:00
committed by GitHub
parent 728a1bc266
commit 1c6e63cd51
5 changed files with 613 additions and 632 deletions
+9 -3
View File
@@ -179,9 +179,15 @@
icon_state = "x"
spawn_nothing_percentage = 10
/obj/random/outside_mob/item_to_spawn()
return pick(prob(20);/mob/living/simple_animal/hostile/scarybat,
/obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction.
var/mob = pick(prob(20);/mob/living/simple_animal/hostile/scarybat,
prob(10);/mob/living/simple_animal/hostile/dino,
prob(5);/mob/living/simple_animal/otie/feral,
prob(5);/mob/living/simple_animal/hostile/bear,
prob(1);/mob/living/simple_animal/hostile/dragon)
prob(1);/mob/living/simple_animal/hostile/dragon)
if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this.
var/mob/living/simple_animal/this_mob = mob
this_mob.faction = "wild animal"
return this_mob
else
return mob
@@ -1,20 +0,0 @@
/*/turf/simulated/floor/outdoors/grass/sif
var/mob_chance = 0 // 0 by default, so we don't have angry things on the main map!
var/list/mob_types = list()
/turf/simulated/floor/outdoors/grass/sif/New()
if(tree_chance && prob(tree_chance))
new /obj/structure/flora/tree/sif(src)
else if (mob_chance && prob(mob_chance))
var/temp_type = pick(mob_types)
if (istype(mob_types, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into the mob_types list.
var/mob/living/simple_animal/new_mob = new temp_type(loc)
new_mob.faction = "wild animal"
..()*/
/turf/simulated/floor/outdoors/grass/sif/forest/dense
tree_chance = 20
/turf/simulated/floor/outdoors/grass/sif/forest/border
name = "impassible growth"
tree_chance = 100
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -301,5 +301,4 @@ datum/weather/virgo3b
light_color = "#FF0000"
transition_chances = list(
WEATHER_BLOODMOON = 100
)
)
-1
View File
@@ -1117,7 +1117,6 @@
#include "code\game\turfs\simulated\water.dm"
#include "code\game\turfs\simulated\outdoors\dirt.dm"
#include "code\game\turfs\simulated\outdoors\grass.dm"
#include "code\game\turfs\simulated\outdoors\grass_vr.dm"
#include "code\game\turfs\simulated\outdoors\outdoors.dm"
#include "code\game\turfs\simulated\outdoors\snow.dm"
#include "code\game\turfs\snow\snow.dm"