More Bugfixes (#18838)

Fixes #18227 and #18172
Fixes the Tempest SMG not using its wielded icon state.
Fixes exoplanet plants looking for the wrong number of growth stages and
constantly runtiming.
This commit is contained in:
RustingWithYou
2024-04-05 22:26:15 +00:00
committed by GitHub
parent 6107724fe1
commit 18de68f654
12 changed files with 69 additions and 17 deletions
+3
View File
@@ -620,6 +620,9 @@ var/list/mineral_can_smooth_with = list(
color = "#6fb1b5"
mined_turf = /turf/simulated/floor/exoplanet/basalt
/turf/simulated/mineral/lava
mined_turf = /turf/simulated/floor/exoplanet/basalt
/**********************Asteroid**************************/
// Setting icon/icon_state initially will use these values when the turf is built on/replaced.
@@ -28,6 +28,7 @@
color = get_random_colour(0,75,190)
S.set_trait(TRAIT_PLANT_COLOUR,color)
adapt_seed(S)
S.update_growth_stages()
small_flora_seeds += S
if(has_trees)
@@ -46,6 +47,7 @@
S.set_trait(TRAIT_LEAVES_COLOUR,color)
S.chems[/singleton/reagent/woodpulp] = list(1)
adapt_seed(S)
S.update_growth_stages()
big_flora_seeds += S
/obj/effect/landmark/exoplanet_spawn/plant
@@ -1,7 +1,7 @@
/datum/exoplanet_theme/barren
name = "Barren"
surface_turfs = list(
/turf/simulated/mineral,
/turf/simulated/mineral/planet,
/turf/simulated/floor/exoplanet/barren
)
possible_biomes = list(
@@ -23,7 +23,7 @@
/datum/exoplanet_theme/barren/raskara
name = "Raskara"
surface_turfs = list(
/turf/simulated/mineral,
/turf/simulated/mineral/planet,
/turf/simulated/floor/exoplanet/barren/raskara
)
possible_biomes = list(
@@ -50,7 +50,7 @@
/datum/exoplanet_theme/barren/asteroid/ice
name = "Ice Asteroid"
surface_turfs = list(
/turf/simulated/mineral,
/turf/simulated/mineral/planet,
/turf/simulated/floor/exoplanet/ice,
/turf/simulated/floor/exoplanet/ice/dark
)
@@ -1,7 +1,7 @@
/datum/exoplanet_theme/crystal
name = "Crystalline"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
perlin_zoom = 21
@@ -1,7 +1,7 @@
/datum/exoplanet_theme/desert
name = "Desert"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
possible_biomes = list(
BIOME_POLAR = list(
@@ -2,7 +2,7 @@
name = "Grasslands" // Not gm_flatgrass, but pretty close
surface_turfs = list(
/turf/simulated/floor/exoplanet/grass,
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.9
possible_biomes = list(
@@ -42,7 +42,7 @@
/datum/exoplanet_theme/grass/marsh
name = "Fungal Marsh"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
possible_biomes = list(
BIOME_WARM = list(
@@ -2,7 +2,7 @@
// Welcome to the
name = "Jungle"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.8
possible_biomes = list(
@@ -38,7 +38,7 @@
/datum/exoplanet_theme/konyang
name = "Konyang"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.6
possible_biomes = list(
@@ -73,7 +73,7 @@
/datum/exoplanet_theme/konyang/uncharted
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.8
possible_biomes = list(
@@ -108,7 +108,7 @@
/datum/exoplanet_theme/konyang/ocean
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 1
possible_biomes = list(
@@ -143,7 +143,7 @@
/datum/exoplanet_theme/konyang/underground//more cave biomes TBD
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.35
possible_biomes = list(
@@ -179,7 +179,7 @@
/datum/exoplanet_theme/konyang/abandoned
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
mountain_threshold = 0.8
possible_biomes = list(
@@ -1,7 +1,7 @@
/datum/exoplanet_theme/volcanic
name = "Volcanic"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/lava
)
perlin_zoom = 21
@@ -1,7 +1,7 @@
/datum/exoplanet_theme/snow
name = "Boreal Forest"
surface_turfs = list(
/turf/simulated/mineral
/turf/simulated/mineral/planet
)
possible_biomes = list(
BIOME_POLAR = list(
@@ -34,6 +34,9 @@
/datum/exoplanet_theme/snow/adhomai
name = "Adhomai"
surface_turfs = list(
/turf/simulated/mineral/adhomai
)
mountain_threshold = 0.6
mountain_biome = /singleton/biome/mountain/adhomai
possible_biomes = list(