From 828b6315703100e6b9de3d0d4bcd5ce77523e196 Mon Sep 17 00:00:00 2001
From: Tupinambis <spacemostnb@gmail.com>
Date: Sat, 15 Dec 2018 15:33:19 -0600
Subject: [PATCH] Increased Ash Walker resistances, makes them ash proof.
 Improves the Base.

---
 .../lavaland_surface_ash_walker1.dmm          | 24 ++++++++++++++++---
 .../datums/weather/weather_types/ash_storm.dm |  4 ++++
 .../human/species_types/lizardpeople.dm       |  2 ++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index 7ad773e601..63d2acdf46 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -173,6 +173,7 @@
 /obj/structure/stone_tile{
 	dir = 4
 	},
+/obj/item/t_scanner/adv_mining_scanner/lesser,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "aC" = (
@@ -186,6 +187,7 @@
 	},
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid/ancient,
 /obj/item/reagent_containers/blood/random,
 /obj/item/reagent_containers/blood/lizard,
 /obj/item/reagent_containers/blood/lizard,
@@ -269,6 +271,7 @@
 /area/ruin/unpowered/ash_walkers)
 "aP" = (
 /obj/structure/stone_tile,
+/obj/item/shard,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "aQ" = (
@@ -575,6 +578,7 @@
 /obj/item/stack/sheet/mineral/wood,
 /obj/item/stack/sheet/mineral/wood,
 /obj/item/seeds/tower,
+/obj/item/seeds/tower,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "bx" = (
@@ -1086,7 +1090,7 @@
 	dir = 8
 	},
 /obj/structure/table/wood,
-/obj/item/twohanded/spear,
+/obj/item/kitchen/knife/combat/bone,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "cN" = (
@@ -1142,6 +1146,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
+/obj/item/surgical_drapes,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/ash_walkers)
 "cX" = (
@@ -1301,6 +1306,7 @@
 	},
 /obj/structure/stone_tile/center,
 /obj/effect/mapping_helpers/no_lava,
+/obj/item/hatchet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "du" = (
@@ -1392,6 +1398,18 @@
 	},
 /turf/closed/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
+"nS" = (
+/obj/item/toy/cards/deck/syndicate,
+/turf/closed/mineral/volcanic/lava_land_surface,
+/area/lavaland/surface/outdoors)
+"Bv" = (
+/obj/structure/stone_tile{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/no_lava,
+/obj/item/cultivator,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 
 (1,1,1) = {"
 aa
@@ -1407,7 +1425,7 @@ ah
 ah
 aa
 aa
-ah
+nS
 ah
 ah
 ah
@@ -1558,7 +1576,7 @@ ba
 bn
 bz
 ak
-cb
+Bv
 df
 bX
 co
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 173f7e6b33..345212cc1b 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/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)
 
 
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 617e62773d..e3164e0dcb 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -92,3 +92,5 @@
 	limbs_id = "lizard"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
 	inherent_traits = list(TRAIT_NOGUNS,TRAIT_NOBREATH)
+	burnmod = 0.9
+	brutemod = 0.9
\ No newline at end of file