cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mob spawners/spawns

Browse Source
This commit is contained in:
Chompstation Bot
2021-09-24 03:22:28 +00:00
parent a0f76219c3
commit 5ca0ff4c15
7 changed files with 131 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/objects/effects/semirandom_mobs_vr.dm
View File

@@ -291,7 +291,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/vore/sect_queen = 1
),
list(/mob/living/simple_mob/vore/solargrub),
list(/mob/living/simple_mob/vore/woof)
list(/mob/living/simple_mob/vore/woof),
list(/mob/living/simple_mob/vore/alienanimals/teppi)
)
/obj/random/mob/semirandom_mob_spawner/item_to_spawn()
@@ -405,8 +406,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/animal/sif/shantak/leader = 1
) = 5,
list(/mob/living/simple_mob/animal/sif/siffet) = 5,
list(/mob/living/simple_mob/animal/sif/tymisian) = 5
list(/mob/living/simple_mob/animal/sif/tymisian) = 5,
list(/mob/living/simple_mob/vore/alienanimals/teppi) = 10
)
/obj/random/mob/semirandom_mob_spawner/monster
@@ -499,7 +500,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
list(
/mob/living/simple_mob/vore/oregrub = 5,
/mob/living/simple_mob/vore/oregrub/lava = 1
) = 15
) = 15,
list(/mob/living/simple_mob/vore/alienanimals/teppi) = 15
)
/obj/random/mob/semirandom_mob_spawner/humanoid
@@ -738,7 +740,8 @@ var/global/list/semirandom_mob_spawner_decisions = list()
/mob/living/simple_mob/vore/sect_queen = 1
) = 50,
list(/mob/living/simple_mob/vore/solargrub) = 100,
list(/mob/living/simple_mob/vore/woof) = 1
list(/mob/living/simple_mob/vore/woof) = 1,
list(/mob/living/simple_mob/vore/alienanimals/teppi) = 25
)
/obj/random/mob/semirandom_mob_spawner/sus

64
maps/tether/submaps/tether_plains.dmm
View File

@@ -113,6 +113,10 @@
"at" = (
/turf/unsimulated/wall/planetary/virgo3b,
/area/tether/outpost/exploration_shed)
"au" = (
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/outpost/exploration_plains)
"bj" = (
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -123,14 +127,6 @@
"Al" = (
/turf/simulated/mineral/virgo3b,
/area/mine/explored)
"BE" = (
/mob/living/simple_mob/animal/space/goose/virgo3b,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/outpost/exploration_plains)
"Em" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/outpost/exploration_plains)
"ID" = (
/turf/simulated/mineral/virgo3b,
/area/tether/outpost/exploration_shed)
@@ -1824,7 +1820,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -2669,7 +2665,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -2767,7 +2763,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -3006,7 +3002,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -3028,7 +3024,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -3266,7 +3262,7 @@ ad
ab
ab
ab
BE
au
ab
ab
ab
@@ -3350,7 +3346,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -5253,7 +5249,7 @@ Al
ad
ab
ab
Em
au
ab
ab
ab
@@ -7353,7 +7349,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -7386,7 +7382,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -8435,7 +8431,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -9242,7 +9238,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -9413,7 +9409,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -10799,7 +10795,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -11722,7 +11718,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -14129,7 +14125,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -14644,7 +14640,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -14872,7 +14868,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -15900,8 +15896,16 @@ ac
(112,1,1) = {"
as
Al
<<<<<<< HEAD
ad
BE
||||||| parent of 086f935e85... Merge pull request #11526 from Very-Soft/spawner
uw
BE
=======
uw
au
>>>>>>> 086f935e85... Merge pull request #11526 from Very-Soft/spawner
ab
ab
ab
@@ -15924,7 +15928,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -16248,7 +16252,7 @@ ab
ab
ab
ab
BE
au
ab
ab
ab
@@ -17587,7 +17591,7 @@ ab
ab
ab
ab
Em
au
ab
ab
ab
@@ -17606,7 +17610,7 @@ as
Al
ad
ab
Em
au
ab
ab
ab

2
maps/tether/tether-01-surface1.dmm
View File

@@ -5770,7 +5770,7 @@
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"ajK" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside1)
"ajL" = (

78
maps/tether/tether-03-surface3.dmm
View File

@@ -14299,6 +14299,7 @@
},
/turf/simulated/floor/tiled,
/area/rnd/research)
<<<<<<< HEAD
"axb" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -14325,6 +14326,13 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
||||||| parent of 086f935e85... Merge pull request #11526 from Very-Soft/spawner
=======
"axb" = (
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/tether/surfacebase/outside/outside3)
>>>>>>> 086f935e85... Merge pull request #11526 from Very-Soft/spawner
"axc" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -302394,6 +302402,68 @@ aab
aab
aab
aab
<<<<<<< HEAD
||||||| parent of 086f935e85... Merge pull request #11526 from Very-Soft/spawner
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
=======
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
axb
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
aac
>>>>>>> 086f935e85... Merge pull request #11526 from Very-Soft/spawner
aab
aab
aab
@@ -304386,7 +304456,7 @@ aac
aac
aac
aac
aac
axb
aac
aac
aac
@@ -305547,7 +305617,7 @@ aac
aac
aac
aac
aac
axb
aac
aac
aac
@@ -307058,7 +307128,7 @@ aac
aac
aac
aac
aac
axb
aac
aac
aac
@@ -315496,7 +315566,7 @@ aac
aac
aac
aac
aac
axb
aac
aac
aac

2
maps/tether/tether-06-mining.dmm
View File

@@ -1139,7 +1139,7 @@
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/outpost/mining_main/drill_equipment)
"cu" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"cv" = (

6
maps/tether/tether-07-solars.dmm
View File

@@ -217,7 +217,7 @@
/turf/simulated/floor/virgo3b_indoors,
/area/tether/outpost/solars_shed)
"aw" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
"ax" = (
@@ -628,7 +628,7 @@
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored)
"br" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/tether/outpost/solars_outside)
"bs" = (
@@ -802,7 +802,7 @@
/turf/simulated/floor/virgo3b,
/area/mine/explored)
"bJ" = (
/mob/living/simple_mob/animal/passive/gaslamp,
/obj/tether_away_spawner/tether_outside,
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/mine/explored)
"bK" = (

10
maps/tether/tether_things.dm
View File

@@ -466,3 +466,13 @@ var/global/list/latejoin_tram = list()
layer = ABOVE_WINDOW_LAYER
/obj/structure/noticeboard
layer = ABOVE_WINDOW_LAYER
/obj/tether_away_spawner/tether_outside
name = "Tether Outside Spawner"
prob_spawn = 75
prob_fall = 50
mobs_to_pick_from = list(
/mob/living/simple_mob/animal/passive/gaslamp = 300,
/mob/living/simple_mob/animal/space/goose/virgo3b = 100,
/mob/living/simple_mob/vore/alienanimals/teppi = 5
)