Merge branch 'master' into TrilbyTraitTypos

code/datums/components/storage/concrete/rped.dm

@@ -5,7 +5,7 @@
 	click_gather = TRUE
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 100
-	max_items = 75
+	max_items = 100
 	display_numerical_stacking = TRUE
 
 /datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
@@ -22,7 +22,7 @@
 	click_gather = TRUE
 	max_w_class = WEIGHT_CLASS_BULKY  // can fit vending refills
 	max_combined_w_class = 800
-	max_items = 325
+	max_items = 350
 	display_numerical_stacking = TRUE
 
 /datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
@@ -31,3 +31,6 @@
 		if (!stop_messages)
 			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
 		return FALSE
+
+/datum/component/storage/concrete/cyborg/rped
+	max_items = 150

code/datums/traits/negative.dm

@@ -278,21 +278,20 @@
 	var/mob/living/carbon/human/H = quirk_holder
 	phobia = new
 	H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY)
-
- /datum/quirk/mute
+  
+/datum/quirk/mute
 	name = "Mute"
 	desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak."
-
-		value = -2 //HALP MAINTS
+	value = -2 //HALP MAINTS
 	gain_text = "<span class='danger'>You find yourself unable to speak!</span>"
 	lose_text = "<span class='notice'>You feel a growing strength in your vocal chords.</span>"
 	medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
 	var/datum/brain_trauma/severe/mute
 
- /datum/quirk/mute/add()
+/datum/quirk/mute/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY)
 
- /datum/quirk/mute/on_process()
+/datum/quirk/mute/on_process()
 	if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
-		to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to return.</span>")
+		to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to return.</span>")

code/datums/weather/weather_types/ash_storm.dm

@@ -93,6 +93,10 @@
 /datum/weather/ash_storm/weather_act(mob/living/L)
 	if(is_ash_immune(L))
 		return
+	if(is_species(L, /datum/species/lizard/ashwalker))
+		if(L.getStaminaLoss() <= STAMINA_SOFTCRIT)
+			L.adjustStaminaLossBuffered(4)
+		return
 	L.adjustFireLoss(4)