cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46950 from YPOQ/bubblegumspawnfix

Browse Source 
Fixes bubblegum spawn
This commit is contained in:
Rob Bailey
2019-10-12 03:30:37 -07:00
committed by GitHub
parent 0bdd890ab6 6b5a0c0a4d
commit e41d8a24ff
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor/plating/asteroid.dm
+3 -3
View File
@@ -270,8 +270,6 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
var/maybe_boss = pickweight(megafauna_spawn_list)
if(megafauna_spawn_list[maybe_boss])
randumb = maybe_boss
if(ispath(maybe_boss, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
megafauna_spawn_list.Remove(maybe_boss)
else //this is not danger, don't spawn a boss, spawn something else
randumb = pickweight(mob_spawn_list)
@@ -283,8 +281,10 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me
if((ispath(randumb, /obj/structure/spawner/lavaland) || istype(H, /obj/structure/spawner/lavaland)) && get_dist(src, H) <= 2)
return //prevents tendrils spawning in each other's collapse range
if(ispath(randumb, /mob/living/simple_animal/hostile/megafauna/bubblegum)) //there can be only one bubblegum, so don't waste spawns on it
megafauna_spawn_list.Remove(randumb)
new randumb(T)
return
#undef SPAWN_MEGAFAUNA
#undef SPAWN_BUBBLEGUM