Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

This commit is contained in:
Roxy
2025-10-23 17:38:23 -04:00
453 changed files with 20635 additions and 15897 deletions
+10 -8
View File
@@ -26,11 +26,12 @@
///Note that this spawn list is also in the lavaland generator
weighted_feature_spawn_list = list(
/obj/structure/geyser/hollowwater = 10,
/obj/structure/geyser/plasma_oxide = 10,
/obj/structure/geyser/protozine = 10,
/obj/structure/geyser/hollowwater = 8,
/obj/structure/geyser/plasma_oxide = 8,
/obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
/obj/structure/geyser/wittel = 10,
/obj/structure/geyser/wittel = 8,
/obj/structure/geyser/chiral_buffer = 8,
/obj/structure/ore_vent/boss/icebox = 1,
)
@@ -45,11 +46,12 @@
feature_spawn_chance = 0.15
weighted_feature_spawn_list = list(
/obj/structure/geyser/hollowwater = 10,
/obj/structure/geyser/plasma_oxide = 10,
/obj/structure/geyser/protozine = 10,
/obj/structure/geyser/hollowwater = 8,
/obj/structure/geyser/plasma_oxide = 8,
/obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
/obj/structure/geyser/wittel = 10,
/obj/structure/geyser/wittel = 8,
/obj/structure/geyser/chiral_buffer = 8,
)
weighted_flora_spawn_list = list(
@@ -29,11 +29,12 @@
///Note that this spawn list is also in the icemoon generator
weighted_feature_spawn_list = list(
/obj/structure/geyser/hollowwater = 10,
/obj/structure/geyser/plasma_oxide = 10,
/obj/structure/geyser/protozine = 10,
/obj/structure/geyser/hollowwater = 8,
/obj/structure/geyser/plasma_oxide = 8,
/obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
/obj/structure/geyser/wittel = 10,
/obj/structure/geyser/wittel = 8,
/obj/structure/geyser/chiral_buffer = 8,
/obj/structure/ore_vent/boss = 1,
)