diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index a0b6078747b..22596282ae4 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -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.
diff --git a/code/modules/overmap/exoplanets/exoplanet_flora.dm b/code/modules/overmap/exoplanets/exoplanet_flora.dm
index ee6f41523b6..4c179f979bb 100644
--- a/code/modules/overmap/exoplanets/exoplanet_flora.dm
+++ b/code/modules/overmap/exoplanets/exoplanet_flora.dm
@@ -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
diff --git a/code/modules/overmap/exoplanets/themes/barren.dm b/code/modules/overmap/exoplanets/themes/barren.dm
index fb181063e72..702a8f207c5 100644
--- a/code/modules/overmap/exoplanets/themes/barren.dm
+++ b/code/modules/overmap/exoplanets/themes/barren.dm
@@ -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
 	)
diff --git a/code/modules/overmap/exoplanets/themes/crystal.dm b/code/modules/overmap/exoplanets/themes/crystal.dm
index 2aac8493f35..7d2062750c9 100644
--- a/code/modules/overmap/exoplanets/themes/crystal.dm
+++ b/code/modules/overmap/exoplanets/themes/crystal.dm
@@ -1,7 +1,7 @@
 /datum/exoplanet_theme/crystal
 	name = "Crystalline"
 	surface_turfs = list(
-		/turf/simulated/mineral
+		/turf/simulated/mineral/planet
 	)
 
 	perlin_zoom = 21
diff --git a/code/modules/overmap/exoplanets/themes/desert.dm b/code/modules/overmap/exoplanets/themes/desert.dm
index 3a693c9745e..cdf233fabb0 100644
--- a/code/modules/overmap/exoplanets/themes/desert.dm
+++ b/code/modules/overmap/exoplanets/themes/desert.dm
@@ -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(
diff --git a/code/modules/overmap/exoplanets/themes/grass.dm b/code/modules/overmap/exoplanets/themes/grass.dm
index f365851ee6d..da2708f47b1 100644
--- a/code/modules/overmap/exoplanets/themes/grass.dm
+++ b/code/modules/overmap/exoplanets/themes/grass.dm
@@ -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(
diff --git a/code/modules/overmap/exoplanets/themes/jungle.dm b/code/modules/overmap/exoplanets/themes/jungle.dm
index fa2efacca7c..8a7213ab9a3 100644
--- a/code/modules/overmap/exoplanets/themes/jungle.dm
+++ b/code/modules/overmap/exoplanets/themes/jungle.dm
@@ -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(
diff --git a/code/modules/overmap/exoplanets/themes/lava.dm b/code/modules/overmap/exoplanets/themes/lava.dm
index 2472b7a68f2..b8e71cd3656 100644
--- a/code/modules/overmap/exoplanets/themes/lava.dm
+++ b/code/modules/overmap/exoplanets/themes/lava.dm
@@ -1,7 +1,7 @@
 /datum/exoplanet_theme/volcanic
 	name = "Volcanic"
 	surface_turfs = list(
-		/turf/simulated/mineral
+		/turf/simulated/mineral/lava
 	)
 
 	perlin_zoom = 21
diff --git a/code/modules/overmap/exoplanets/themes/snow.dm b/code/modules/overmap/exoplanets/themes/snow.dm
index eb1e44bdc6a..75916ba3a8a 100644
--- a/code/modules/overmap/exoplanets/themes/snow.dm
+++ b/code/modules/overmap/exoplanets/themes/snow.dm
@@ -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(
diff --git a/html/changelogs/RustingWithYou - morefixes.yml b/html/changelogs/RustingWithYou - morefixes.yml
new file mode 100644
index 00000000000..377f578378f
--- /dev/null
+++ b/html/changelogs/RustingWithYou - morefixes.yml	
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Exoplanet minerals will no longer spawn unsimulated turfs when mined."
+  - bugfix: "Plants will no longer cause runtimes by looking for the wrong number of growth stages."
+  - bugfix: "Tempest SMG will now correctly display its wielded icon state."
+  - bugfix: "Delivery point packages will now correctly generate a destination."
diff --git a/icons/obj/guns/unathi_ballistics.dmi b/icons/obj/guns/unathi_ballistics.dmi
index 1fc7b7e3dce..672fbdc2c85 100644
Binary files a/icons/obj/guns/unathi_ballistics.dmi and b/icons/obj/guns/unathi_ballistics.dmi differ
diff --git a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm
index d96033e73b3..b2757120436 100644
--- a/maps/random_ruins/exoplanets/delivery/delivery_site.dmm
+++ b/maps/random_ruins/exoplanets/delivery/delivery_site.dmm
@@ -101,7 +101,7 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/random/dirt_75,
 /obj/random/dirt_75,
-/obj/item/cargo_package{
+/obj/item/cargo_package/offship{
 	pixel_y = 3
 	},
 /turf/simulated/floor/exoplanet/concrete,
@@ -109,7 +109,7 @@
 "te" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/random/dirt_75,
-/obj/item/cargo_package{
+/obj/item/cargo_package/offship{
 	pixel_y = 3
 	},
 /turf/simulated/floor/exoplanet/concrete,