Crashed Vulpkanin Ship - Lavaland Ruin (#32110)

* Charon's Revolver

* Dog tags

* Ash Whelps

* Ash walkers and resist adjustment

* Some providence stuff

* Minor wording adjustment

* Desc change

* Ruin, salvage, and ruin assets

* linters

* Mo linters

* quick

* Various fixes

* Variety of fixes

* Update

* Naming

* FIX

code/game/objects/effects/landmarks.dm

@@ -654,6 +654,26 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
 		mobtype = /mob/living/basic/mining/goliath/ancient
 	. = ..()
 
+/obj/effect/landmark/mob_spawner/ash_whelp
+	mobtype = /mob/living/basic/mining/ash_whelp
+
+/obj/effect/landmark/mob_spawner/ash_whelp/Initialize(mapload)
+	if(prob(2))
+		mobtype = /mob/living/basic/mining/ash_whelp/ice
+	. = ..()
+
+/obj/effect/landmark/mob_spawner/ashwalker_npc
+	mobtype = /mob/living/basic/ash_walker
+
+/obj/effect/landmark/mob_spawner/ashwalker_npc/Initialize(mapload)
+	if(prob(40))
+		mobtype = /mob/living/basic/ash_walker/tough
+	else if(prob(15))
+		mobtype = /mob/living/basic/ash_walker/veteran
+	else if(prob(1))
+		mobtype = /mob/living/basic/ash_walker/elite
+	. = ..()
+
 /obj/effect/landmark/mob_spawner/legion
 	mobtype = /mob/living/basic/mining/hivelord/legion
 

code/game/objects/effects/spawners/random/pool/lavaland_pools.dm

@@ -37,8 +37,10 @@
 
 		list(
 			/obj/effect/landmark/mob_spawner/abandoned_minebot,
+			/obj/effect/landmark/mob_spawner/ashwalker_npc,
 			/obj/effect/landmark/mob_spawner/goldgrub,
 			/obj/effect/landmark/mob_spawner/gutlunch,
+			/obj/effect/landmark/mob_spawner/ash_whelp,
 		) = 1,
 	)
 

code/game/objects/items/salvage.dm

@@ -71,6 +71,13 @@
 	pickup_sound =  sound('sound/hallucinations/im_here2.ogg', 10)
 	drop_sound = sound('sound/hallucinations/look_up2.ogg', 10)
 
+/obj/item/salvage/ruin/broken_rifle
+	name = "broken rifle"
+	desc = "A battered, broken rifle. All but useless as a weapon, however it can be sold for scrap or dismantled for materials."
+	icon_state = "broken_rifle"
+	value = 50
+	materials = list(MAT_METAL = 2000, MAT_PLATINUM = 2000, MAT_IRIDIUM = 2000, MAT_PALLADIUM = 2000)
+
 /// Loot salvage, gained from fighting space simplemobs.
 /obj/item/salvage/loot/pirate
 	name = "stolen jewellery"
@@ -104,3 +111,20 @@
 	pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
 	drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
 	value = 125 // Mobs that drop this are fairly dangerous, so let's give it some value
+
+/obj/item/salvage/loot/dogtags
+	name = "dog tags"
+	desc = "Dog tags belonging to an unnamed soldier or mercenary. Someone is likely willing to pay good credits to see them returned."
+	icon_state = "dogtag"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/salvage/loot/dogtags/officer
+	name = "officer's dog tags"
+	desc = "Dog tags belonging to an unnamed high-ranking soldier or mercenary. Someone is likely willing to pay good credits to see them returned."
+	icon_state = "dogtag_officer"
+	value = 250
+
+/obj/item/salvage/loot/dogtags/captain
+	name = "captain's dog tags"
+	desc = "Dog tags belonging to an unnamed captain of a soldier or mercenary group. Someone is likely willing to pay good credits to see them returned."
+	value = 400