diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm
index 79933f733d7..3dbb483e465 100644
--- a/code/modules/clothing/factions/dominia.dm
+++ b/code/modules/clothing/factions/dominia.dm
@@ -49,6 +49,7 @@
 	icon_override = null
 	contained_sprite = TRUE
 	var/cape_backing_state = "cape_backing"
+	protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/poncho/dominia_cape/white
 	name = "white dominian cape"
@@ -498,6 +499,9 @@
 	name = "black zhao noble dress"
 	house = "zhao"
 
+/obj/item/clothing/accessory/poncho/dominia
+	protects_against_weather = FALSE
+
 /obj/item/clothing/accessory/poncho/dominia/red/surcoat
 	name = "tribunalist surcoat"
 	desc = "A simple red surcoat commonly worn by Dominian clergy members."
diff --git a/code/modules/clothing/factions/goldendeep.dm b/code/modules/clothing/factions/goldendeep.dm
index 9467bb6070a..4c0a8bccd49 100644
--- a/code/modules/clothing/factions/goldendeep.dm
+++ b/code/modules/clothing/factions/goldendeep.dm
@@ -130,6 +130,7 @@
 	icon = 'icons/clothing/suits/capes/golden_cape.dmi'
 	contained_sprite = TRUE
 	icon_override = null
+	protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/poncho/goldendeep/flowingcloak
 	name = "flowing cloak"
diff --git a/code/modules/clothing/head/xenos/unathi.dm b/code/modules/clothing/head/xenos/unathi.dm
index 743d359ab92..084f2407ca3 100644
--- a/code/modules/clothing/head/xenos/unathi.dm
+++ b/code/modules/clothing/head/xenos/unathi.dm
@@ -5,6 +5,7 @@
 	icon_state = "ronin_hat"
 	item_state = "ronin_hat"
 	contained_sprite = TRUE
+	protects_against_weather = TRUE
 
 /obj/item/clothing/head/unathi/deco
 	name = "decorated straw hat"
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index b203aa0db1a..65914b72f61 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -158,6 +158,7 @@
 	item_state = "nature_scarf"
 	icon_override = null
 	contained_sprite = TRUE
+	protects_against_weather = FALSE
 
 // Techno Outfit
 /obj/item/clothing/head/wizard/techno
diff --git a/code/modules/clothing/suits/xeno/unathi.dm b/code/modules/clothing/suits/xeno/unathi.dm
index 5fcd64600f2..efa3f6b1744 100644
--- a/code/modules/clothing/suits/xeno/unathi.dm
+++ b/code/modules/clothing/suits/xeno/unathi.dm
@@ -8,6 +8,7 @@
 	desc = "A traditional Unathi garment."
 	icon_state = "roughspun_robe"
 	item_state = "roughspun_robe"
+	protects_against_weather = TRUE
 
 /obj/item/clothing/suit/unathi/robe/beige
 	color = "#DBC684"
@@ -57,6 +58,7 @@
 	flags_inv = HIDEJUMPSUIT|HIDETAIL
 	species_restricted = list(BODYTYPE_UNATHI)
 	contained_sprite = TRUE
+	protects_against_weather = TRUE
 
 /obj/item/clothing/suit/armor/unathi/ancient
 	name = "ancient bronze armor"
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index c311073fc01..e1fa7e82920 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -22,6 +22,7 @@
 	sprite_sheets = list(
 		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/accessories.dmi'
 	)
+	var/protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/Destroy()
 	on_removed()
@@ -400,6 +401,7 @@
 	slot = ACCESSORY_SLOT_CAPE
 	contained_sprite = TRUE
 	var/allow_tail_hiding = TRUE //in case if you want to allow someone to switch the HIDETAIL var or not
+	protects_against_weather = TRUE
 
 /obj/item/clothing/accessory/poncho/verb/toggle_hide_tail()
 	set name = "Toggle Tail Coverage"
@@ -666,6 +668,7 @@
 	item_state = "starcape"
 	flippable = TRUE
 	contained_sprite = FALSE
+	protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/poncho/shouldercape/star
 	name = "star cape"
@@ -744,6 +747,7 @@
 	item_state = "trinary_cape"
 	overlay_state = "trinary_cape"
 	contained_sprite = FALSE
+	protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/poncho/trinary/pellegrina
 	name = "trinary perfection pellegrina"
diff --git a/code/modules/clothing/under/accessories/xeno/unathi.dm b/code/modules/clothing/under/accessories/xeno/unathi.dm
index 51d32f41268..23e081a6ec6 100644
--- a/code/modules/clothing/under/accessories/xeno/unathi.dm
+++ b/code/modules/clothing/under/accessories/xeno/unathi.dm
@@ -10,6 +10,7 @@
 	contained_sprite = TRUE
 	action_button_name = "Adjust Hood"
 	var/up = TRUE
+	protects_against_weather = TRUE
 
 /obj/item/clothing/accessory/sinta_hood/get_ear_examine_text(var/mob/user, var/ear_text = "left")
 	return "on [user.get_pronoun("his")] head"
@@ -64,6 +65,7 @@
 	item_state = "maxtlatl"
 	icon_override = null
 	contained_sprite = TRUE
+	protects_against_weather = FALSE
 
 /obj/item/clothing/accessory/poncho/unathimantle
 	name = "desert hide mantle"
@@ -205,3 +207,4 @@
 	build_from_parts = TRUE
 	worn_overlay =  "chain"
 	has_accents = TRUE
+	protects_against_weather = FALSE
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index 62c87a52225..e4fa81b84bc 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/code/modules/mob/living/carbon/human/human_species.dm
@@ -66,6 +66,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin)
 
 /mob/living/carbon/human/stok/moghes
 	faction = "Moghes"
+	resists_weather = TRUE
 
 /mob/living/carbon/human/bug/Initialize(mapload)
 	. = ..(mapload, SPECIES_MONKEY_VAURCA)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 4c99b36b6e3..29b4cf4e628 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -77,3 +77,6 @@
 
 	///what icon the mob uses for speechbubbles
 	var/bubble_icon = "default"
+
+	///If true, ignores weather effects
+	var/resists_weather = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/moghes.dm b/code/modules/mob/living/simple_animal/friendly/moghes.dm
index 997f103c56d..57b99535e98 100644
--- a/code/modules/mob/living/simple_animal/friendly/moghes.dm
+++ b/code/modules/mob/living/simple_animal/friendly/moghes.dm
@@ -35,6 +35,7 @@
 		bullet = ARMOR_BALLISTIC_MINOR,
 		bomb = ARMOR_BOMB_MINOR
 	)
+	resists_weather = TRUE
 	sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with passiveness and domestication")
 
 /mob/living/simple_animal/threshbeast/saddle
@@ -85,6 +86,7 @@
 		laser = ARMOR_LASER_MINOR,
 		bomb = ARMOR_BOMB_MINOR
 	)
+	resists_weather = TRUE
 	sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with domestication", "Intracellular keratin synthesis present")
 
 /mob/living/simple_animal/hostile/retaliate/hegeranzi/saddle
@@ -98,6 +100,7 @@
 	name = "orszi fish"
 	desc = "A small fish native to the rivers and seas of the planet Moghes, the orzsi or 'swarm fish' is a common food source for noble and common Unathi alike."
 	faction = "Moghes"
+	resists_weather = TRUE
 
 /mob/living/simple_animal/otzek
 	name = "otzek"
@@ -127,6 +130,7 @@
 	butchering_products = list(/obj/item/stack/material/animalhide/lizard = 4)
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
 	meat_amount = 16
+	resists_weather = TRUE
 	sample_data = list("Cellular biochemistry geared towards the use of plant-based nutrition", "Genetic biomarkers identified linked with high reproductive rates", "Intracellular keratin synthesis present")
 
 /mob/living/simple_animal/miervesh
@@ -155,6 +159,7 @@
 	butchering_products = list(/obj/item/stack/material/animalhide = 1)
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
 	meat_amount = 1
+	resists_weather = TRUE
 	sample_data = list("Cellular biochemistry shows signs of rapid respiration", "Genetic biomarkers identified linked with passiveness and domestication", "Extracellular gas detection present")
 	var/chosen_icon
 
diff --git a/code/modules/mob/living/simple_animal/hostile/moghes.dm b/code/modules/mob/living/simple_animal/hostile/moghes.dm
index 150c8b74c8c..321ff552a48 100644
--- a/code/modules/mob/living/simple_animal/hostile/moghes.dm
+++ b/code/modules/mob/living/simple_animal/hostile/moghes.dm
@@ -35,6 +35,7 @@
 
 	faction = "Moghes"
 	butchering_products = list(/obj/item/stack/material/animalhide/lizard = 20)
+	resists_weather = TRUE
 	sample_data = list("Cellular biochemistry shows high metabolic capacity", "Tissue sample contains high muscle content", "Genetic biomarkers identified linked with aggressiveness", "Intracellular keratin synthesis present")
 	var/is_devouring = FALSE
 
@@ -164,6 +165,7 @@
 	meat_type = /obj/item/reagent_containers/food/snacks/meat/moghes
 	meat_amount = 10
 	faction = "Moghes"
+	resists_weather = TRUE
 	sample_data = list("Cellular structures adapted to provide strong resonance protection", "Genetic biomarkers identified linked with agressiveness")
 	var/shriek_time = 0
 
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 5a59df579fd..824eafd0f72 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1459,6 +1459,11 @@
 		var/obj/item/clothing/suit/check_body = get_equipped_item(slot_wear_suit_str)
 		if(!istype(check_body) || !check_body.protects_against_weather)
 			return
+		for(var/obj/item/clothing/clothing in list(w_uniform, wear_suit, head))
+			for(var/obj/item/clothing/accessory/check_accessory in clothing)
+				if(!istype(check_accessory) || !check_accessory.protects_against_weather)
+					continue
+				LAZYADD(., check_accessory)
 		LAZYADD(., check_head)
 		LAZYADD(., check_body)
 
diff --git a/code/modules/weather/weather_fsm_state_transitions.dm b/code/modules/weather/weather_fsm_state_transitions.dm
index 92cd095050b..c8099d1f914 100644
--- a/code/modules/weather/weather_fsm_state_transitions.dm
+++ b/code/modules/weather/weather_fsm_state_transitions.dm
@@ -30,6 +30,10 @@
 	target = /singleton/state/weather/rain/hail
 	likelihood_weighting = 20
 
+/singleton/state_transition/weather/sandstorm
+	target = /singleton/state/weather/sandstorm
+	likelihood_weighting = 20
+
 //weather for planets
 
 //snow planets
@@ -68,7 +72,7 @@
 //arctic planets
 
 /singleton/state_transition/weather/calm/arctic_planet
-	target = /singleton/state/weather/calm/lava_planet
+	target = /singleton/state/weather/calm/arctic_planet
 
 /singleton/state_transition/weather/hail/arctic_planet
 	target = /singleton/state/weather/rain/hail/arctic_planet
@@ -78,6 +82,8 @@
 /singleton/state_transition/weather/calm/desert_planet
 	target = /singleton/state/weather/calm/desert_planet
 
+/singleton/state_transition/weather/sandfall/desert_planet
+	target = /singleton/state/weather/sandfall/desert_planet
+
 /singleton/state_transition/weather/sandstorm/desert_planet
 	target = /singleton/state/weather/sandstorm/desert_planet
-	likelihood_weighting = 20
diff --git a/code/modules/weather/weather_fsm_states.dm b/code/modules/weather/weather_fsm_states.dm
index 85cf2c2ff88..d9bc8c8e2e5 100644
--- a/code/modules/weather/weather_fsm_states.dm
+++ b/code/modules/weather/weather_fsm_states.dm
@@ -181,7 +181,7 @@
 
 /singleton/state/weather/rain/hail/handle_exposure_effects(var/mob/living/M, var/obj/abstract/weather_system/weather)
 	to_chat(M, SPAN_DANGER("You are pelted by a shower of hail!"))
-	M.adjustBruteLoss(rand(1,3))
+	M.apply_damage(rand(1,3), DAMAGE_BRUTE)
 
 /singleton/state/weather/ash
 	name =  "Ash"
@@ -190,6 +190,14 @@
 	cosmetic_span_class = "warning"
 	cosmetic_messages = list("Drifts of ash fall from the sky.")
 
+/singleton/state/weather/sandfall
+	name =  "Sand"
+	icon_state = "sand_light"
+	descriptor = "The wind rises, stirring up gusts of sand."
+	cosmetic_span_class = "warning"
+	cosmetic_messages = list("Scattered gusts of sand fall from the sky.")
+	transitions = list(/singleton/state_transition/weather/sandstorm)
+
 /singleton/state/weather/sandstorm
 	name = "Sandstorm"
 	icon_state = "sandstorm"
@@ -199,12 +207,37 @@
 		"The wind howls around you.",
 		"Swirling sand obscures your vision."
 	)
-	protected_messages = list("Stinging sand blows against $ITEM$.")
+	protected_messages = list("$ITEM$ shields you from the howling sandstorm.")
 	ambient_sounds = list('sound/effects/weather/sandstorm.ogg')
 
 /singleton/state/weather/sandstorm/handle_exposure_effects(mob/living/M, obj/abstract/weather_system/weather)
-	to_chat(M, SPAN_DANGER("You are blasted by a gust of stinging sand!"))
-	M.adjustBruteLoss(rand(1,5))
+	if(M.resists_weather) //Not realistic that they're just immune, but we don't have AI for simplemobs seeking shelter from storms.
+		return
+	else if(isvaurca(M)) //Bugs have sealed carapaces
+		to_chat(M, SPAN_WARNING("Your carapace protects you from the stinging sand!"))
+	else if(isipc(M) || issilicon(M)) //Metal is more durable than meat
+		to_chat(M, SPAN_DANGER("Your chassis is scratched by a gust of stinging sand!"))
+		M.apply_damage(1, DAMAGE_BRUTE)
+	else
+		to_chat(M, SPAN_DANGER("You are blasted by a gust of stinging sand!"))
+		M.apply_damage(rand(1,3), DAMAGE_BRUTE)
+
+	if(ishuman(M) && prob(50)) //only a 50% chance of getting in the eyes to avoid being too punishing
+		var/mob/living/carbon/human/H = M
+		var/obj/item/organ/internal/eyes/E = H.get_eyes()
+		if(!E) //No eyes, no problem
+			return
+		if (istype(E) && (E.status & (ORGAN_ROBOT|ORGAN_ADV_ROBOT)))
+			to_chat(H, SPAN_WARNING("Your mechanical eyes are immune to the sandstorm!"))
+			return
+		for(var/obj/item/clothing/C in list(H.wear_mask, H.head, H.glasses))
+			if(C.body_parts_covered & EYES)
+				to_chat(H, SPAN_WARNING("\The [C] shields your eyes from the sand."))
+				return
+		to_chat(H, SPAN_DANGER("The stinging sand gets in your eyes!"))
+		H.eye_blurry = max(H.eye_blurry, 15)
+		H.eye_blind = max(H.eye_blind, 5)
+		H.apply_effect(rand(5,10), DAMAGE_PAIN)
 
 //planet weathers
 
@@ -258,10 +291,19 @@
 /singleton/state/weather/rain/hail/arctic_planet
 	transitions = list(/singleton/state_transition/weather/calm/arctic_planet)
 
-//desert planet - only calm or sandstorm
+//desert planet - only calm, sandfall, or sandstorm
 
 /singleton/state/weather/calm/desert_planet
-	transitions = list(/singleton/state_transition/weather/sandstorm/desert_planet)
+	transitions = list(/singleton/state_transition/weather/sandfall/desert_planet)
+
+/singleton/state/weather/sandfall/desert_planet
+	transitions = list(
+		/singleton/state_transition/weather/calm/desert_planet,
+		/singleton/state_transition/weather/sandstorm/desert_planet
+	)
 
 /singleton/state/weather/sandstorm/desert_planet
-	transitions = list(/singleton/state_transition/weather/calm/desert_planet)
+	transitions = list(
+		/singleton/state_transition/weather/calm/desert_planet,
+		/singleton/state_transition/weather/sandfall/desert_planet
+	)
diff --git a/html/changelogs/RustingWithYou - sandstorm.yml b/html/changelogs/RustingWithYou - sandstorm.yml
new file mode 100644
index 00000000000..2c409ad61c3
--- /dev/null
+++ b/html/changelogs/RustingWithYou - sandstorm.yml	
@@ -0,0 +1,61 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - qol: "Ponchos, hoods, and straw hats now protect against weather."
+  - qol: "Makes sandstorms less dangerous to IPCs and Vaurcae."
+  - rscadd: "Sandstorms can now disrupt vision if eyes aren't covered."
+  - qol: "Gives Wasteland ghostroles gear to protect against sandstorms."
diff --git a/icons/effects/weather.dmi b/icons/effects/weather.dmi
index 361244db06d..a62df56efca 100644
Binary files a/icons/effects/weather.dmi and b/icons/effects/weather.dmi differ
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_dead_guwandi.dm b/maps/random_ruins/exoplanets/moghes/moghes_dead_guwandi.dm
index d1fe0ff0bb1..73a6ac44de0 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_dead_guwandi.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_dead_guwandi.dm
@@ -43,6 +43,7 @@
 	corpseuniform = /obj/item/clothing/under/unathi
 	corpseshoes = /obj/item/clothing/shoes/sandals/caligae
 	corpsesuit = /obj/item/clothing/accessory/poncho/unathimantle
+	corpseglasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 
 /obj/effect/landmark/corpse/moghes_dead_raider/do_extra_customization(mob/living/carbon/human/M)
 	M.ChangeToHusk()
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_bikers.dm b/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_bikers.dm
index 09d6f3959e2..c96d32abab1 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_bikers.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_bikers.dm
@@ -96,6 +96,7 @@
 	suit = /obj/item/clothing/suit/armor/unathi
 	backpack_contents = list(/obj/item/ammo_magazine/spitterpistol = 1, /obj/item/melee/hammer/powered = 1)
 	head = /obj/item/clothing/head/helmet/unathi
+	suit_accessory = /obj/item/clothing/accessory/poncho
 	belt = /obj/item/material/knife/tacknife
 
 /obj/outfit/admin/moghes_gawgaryn/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_guwandi.dm b/maps/random_ruins/exoplanets/moghes/moghes_guwandi.dm
index 39256798027..129c869b4fe 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_guwandi.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_guwandi.dm
@@ -43,6 +43,7 @@
 	id = null
 	belt = /obj/item/material/sword/longsword
 	head = /obj/item/clothing/accessory/sinta_hood
+	glasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 	l_hand = /obj/item/martial_manual/swordsmanship
 
 /obj/outfit/admin/moghes_guwandi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dm b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dm
index 887f4fb5591..5a55a8e31f5 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_kataphract_wasteland.dm
@@ -68,7 +68,9 @@
 	extra_languages = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA)
 
 /obj/outfit/admin/kataphract/wasteland
+	glasses = /obj/item/clothing/glasses/safety/goggles/tactical/generic
 	l_ear = null
 
 /obj/outfit/admin/kataphract/knight/wasteland
+	glasses = /obj/item/clothing/glasses/safety/goggles/tactical/generic
 	l_ear = null
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm
index d31fe845654..101add6833f 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_siakh.dm
@@ -49,13 +49,18 @@
 /obj/outfit/admin/moghes_siakh
 	name = "Si'akh Knight"
 	uniform = list(/obj/item/clothing/under/unathi, /obj/item/clothing/under/unathi/zazali)
-	suit = /obj/item/clothing/suit/armor/unathi
-	head = /obj/item/clothing/head/helmet/unathi
+	suit = /obj/item/clothing/accessory/poncho/unathimantle
+	glasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 	back = /obj/item/storage/backpack/satchel/leather
 	shoes = /obj/item/clothing/shoes/sandals/caligae
 	accessory = /obj/item/clothing/accessory/holster/hip
 	accessory_contents = list(/obj/item/gun/projectile/pistol/spitter = 1)
-	backpack_contents = list(/obj/item/ammo_magazine/spitterpistol = 1, /obj/item/device/versebook/siakh = 1)
+	backpack_contents = list(
+		/obj/item/ammo_magazine/spitterpistol = 1,
+		/obj/item/device/versebook/siakh = 1,
+		/obj/item/clothing/suit/armor/unathi = 1,
+		/obj/item/clothing/head/helmet/unathi = 1
+	)
 	belt = /obj/random/sword
 	id = null
 	l_ear = null
@@ -65,3 +70,5 @@
 		return
 	if(H.w_uniform)
 		H.w_uniform.color = pick("#42330f", "#DBC684")
+	if(H.wear_suit)
+		H.wear_suit.color = pick("#42330f", "#DBC684")
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dm
index 335af18e14c..8b7d8a87af1 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_dorviza.dm
@@ -68,6 +68,7 @@
 /obj/outfit/admin/moghes_dorviza
 	uniform = list(/obj/item/clothing/under/unathi, /obj/item/clothing/under/unathi/himation)
 	suit = list(/obj/item/clothing/suit/unathi/robe, /obj/item/clothing/suit/unathi/robe/kilt)
+	glasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 	shoes = /obj/item/clothing/shoes/sandals/caligae
 	l_ear = null
 	id = null
@@ -85,3 +86,4 @@
 	uniform = /obj/item/clothing/under/gearharness
 	suit = /obj/item/clothing/accessory/poncho/green
 	shoes = null
+	glasses = null
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm
index f60e7765754..84d78c88528 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_izweski.dmm
@@ -151,6 +151,9 @@
 /obj/item/clothing/shoes/sandals/caligae,
 /obj/item/clothing/head/unathi/deco/dark/blue,
 /obj/item/device/versebook/thakh,
+/obj/item/clothing/accessory/poncho/red,
+/obj/item/clothing/accessory/poncho/red,
+/obj/item/clothing/accessory/poncho,
 /turf/simulated/floor/exoplanet/concrete/square{
 	temperature = 303.15
 	},
@@ -1064,6 +1067,7 @@
 /obj/item/device/versebook/skakh,
 /obj/item/clothing/shoes/sandals/caligae,
 /obj/item/clothing/under/unathi/mogazali/green,
+/obj/item/clothing/accessory/poncho,
 /turf/simulated/floor/exoplanet/concrete/square{
 	temperature = 303.15
 	},
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm
index 6ea46e001f7..63040aced4d 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_mikuetz.dm
@@ -45,6 +45,7 @@
 	uniform = list(/obj/item/clothing/under/unathi, /obj/item/clothing/under/vaurca)
 	suit = /obj/item/clothing/suit/vaurca/brown
 	shoes = /obj/item/clothing/shoes/vaurca
+	head = /obj/item/clothing/head/shroud/brown
 	back = null
 	l_ear = null
 	id = null
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm
index f20b848d074..0b81ba90316 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_ozeuoi.dmm
@@ -133,6 +133,18 @@
 /area/moghes_ozeuoi)
 "oJ" = (
 /obj/structure/closet/crate,
+/obj/item/clothing/accessory/poncho/unathimantle{
+	color = "#42330f"
+	},
+/obj/item/clothing/accessory/poncho/unathimantle{
+	color = "#42330f"
+	},
+/obj/item/clothing/suit/unathi/robe/kilt{
+	color = "#DBC684"
+	},
+/obj/item/clothing/suit/unathi/robe/kilt{
+	color = "#DBC684"
+	},
 /turf/simulated/floor/exoplanet/tiled{
 	temperature = 315.15
 	},
@@ -168,6 +180,14 @@
 	temperature = 315.15
 	},
 /area/moghes_ozeuoi)
+"ui" = (
+/obj/structure/closet/crate,
+/obj/item/clothing/accessory/poncho,
+/obj/item/clothing/accessory/poncho/green,
+/turf/simulated/floor/exoplanet/tiled{
+	temperature = 315.15
+	},
+/area/moghes_ozeuoi)
 "uE" = (
 /obj/structure/bed/stool/bar,
 /obj/machinery/light{
@@ -1542,7 +1562,7 @@ xo
 xo
 ly
 xo
-oJ
+ui
 zx
 oJ
 xo
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
index 8a3ec4be5e4..88e1b51dbe0 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
@@ -92,12 +92,20 @@
 	},
 /area/moghes_wasteland_priests)
 "v" = (
-/obj/item/bedsheet/black,
-/obj/effect/ghostspawpoint{
-	name = "igs - moghes_wasteland_guard";
-	identifier = "moghes_wasteland_guard"
+/obj/structure/closet/crate/weapon/alt,
+/obj/item/material/sword/longsword,
+/obj/item/material/sword/axe,
+/obj/item/projectile/beam/pistol/hegemony,
+/obj/item/projectile/beam/pistol/hegemony,
+/obj/item/gun/energy/rifle/hegemony,
+/obj/item/clothing/suit/armor/unathi/hegemony,
+/obj/item/clothing/accessory/poncho/unathimantle/med{
+	color = "#42330f"
 	},
-/turf/simulated/floor/exoplanet/carpet/rubber{
+/obj/item/clothing/accessory/poncho/unathimantle/med{
+	color = "#42330f"
+	},
+/turf/simulated/floor/exoplanet/foundation{
 	temperature = 315.15
 	},
 /area/moghes_wasteland_priests)
@@ -116,15 +124,13 @@
 	temperature = 315.15
 	},
 /area/moghes_wasteland_priests)
-"D" = (
-/obj/structure/closet/crate/weapon/alt,
-/obj/item/material/sword/longsword,
-/obj/item/material/sword/axe,
-/obj/item/projectile/beam/pistol/hegemony,
-/obj/item/projectile/beam/pistol/hegemony,
-/obj/item/gun/energy/rifle/hegemony,
-/obj/item/clothing/suit/armor/unathi/hegemony,
-/turf/simulated/floor/exoplanet/foundation{
+"C" = (
+/obj/item/bedsheet/black,
+/obj/effect/ghostspawpoint{
+	name = "igs - moghes_wasteland_guard";
+	identifier = "moghes_wasteland_guard"
+	},
+/turf/simulated/floor/exoplanet/carpet/rubber{
 	temperature = 315.15
 	},
 /area/moghes_wasteland_priests)
@@ -466,7 +472,7 @@ a
 a
 F
 F
-D
+v
 s
 Y
 H
@@ -524,7 +530,7 @@ Y
 Y
 s
 H
-v
+C
 p
 a
 a
@@ -551,7 +557,7 @@ Y
 Y
 Y
 H
-v
+C
 p
 a
 a
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimer.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimer.dm
index 957b03d2a85..a388791fdb6 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimer.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_reclaimer.dm
@@ -46,6 +46,11 @@
 	uniform = /obj/item/clothing/under/unathi
 	accessory = /obj/item/clothing/accessory/storage/overalls/engineer
 	belt = /obj/item/storage/belt/utility
+	suit = list(
+		/obj/item/clothing/accessory/poncho,
+		/obj/item/clothing/suit/unathi/robe/beige,
+		/obj/item/clothing/suit/unathi/robe/kilt
+	)
 	glasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 	gloves = /obj/item/clothing/gloves/yellow/specialu
 	shoes = list(/obj/item/clothing/shoes/sandals/caligae, /obj/item/clothing/shoes/workboots/toeless)
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dm
index c260dd3cc6d..54fac18bdbf 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dm
@@ -99,6 +99,7 @@
 		/obj/item/clothing/shoes/footwraps
 	)
 	back = /obj/item/storage/backpack/satchel/leather
+	glasses = /obj/item/clothing/glasses/safety/goggles/wasteland
 	r_pocket = /obj/item/reagent_containers/food/drinks/waterbottle
 	l_pocket = /obj/item/storage/wallet/random
 	suit = list(