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/modules/projectiles/ammunition/ammo_boxes.dm

@@ -14,6 +14,14 @@
 	multi_sprite_step = 1
 	icon_state = "357_box"
 
+/obj/item/ammo_box/huntsman32
+	name = "speed loader (.32 Huntsman)"
+	desc = "A small device designed to quickly reload revolvers. Seven round capacity."
+	materials = list()
+	ammo_type = /obj/item/ammo_casing/huntsman32
+	multi_sprite_step = 1 // see: /obj/item/ammo_box/update_icon()
+	icon_state = "357"
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	desc = "An ammunition box filled with 9mm pistol cartridges, commonly used in handguns and submachine guns."

code/modules/projectiles/ammunition/ammo_casings.dm

@@ -7,6 +7,15 @@
 	muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
 	muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
 
+/obj/item/ammo_casing/huntsman32
+	name = ".32 huntsman round"
+	desc = "A .32 caliber round. The bullet is scored and designed to fragment on hit, dealing large amounts of damage to large creatures."
+	icon_state = "magnum_steel"
+	caliber = "32"
+	projectile_type = /obj/projectile/bullet
+	muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
+	muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
+
 /obj/item/ammo_casing/rubber9mm
 	name = "9mm rubber round"
 	desc = "A 9mm pistol cartridge. This one has a rubber tip for less-lethal takedowns."
@@ -19,7 +28,7 @@
 	desc = "A 7.62mm rifle cartridge, often used in Soviet rifles."
 	icon_state = "rifle_brass"
 	caliber = "a762"
-	projectile_type = /obj/projectile/bullet
+	projectile_type = /obj/projectile/bullet/huntsman32
 	muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_STRONG
 	muzzle_flash_range = MUZZLE_FLASH_RANGE_STRONG
 

code/modules/projectiles/ammunition/magazines.dm

@@ -57,6 +57,10 @@
 
 	return 0
 
+/obj/item/ammo_box/magazine/internal/cylinder/charons_special
+	ammo_type = /obj/item/ammo_casing/huntsman32
+	caliber = "32"
+
 /obj/item/ammo_box/magazine/internal/cylinder/rev38/invisible
 	name = "finger gun cylinder"
 	desc = "Wait, what?"

code/modules/projectiles/guns/projectile/revolver.dm

@@ -132,6 +132,14 @@
 	options["Fancy"] = "revolver-fancy"
 	options["Rose Gold Finish"] = "revolver-rose"
 
+/// Special revolver found in the vulpkanin ship lavaland ruin
+/obj/item/gun/projectile/revolver/charons_special
+	name = "Charon's Modified Revolver"
+	desc = "A bog-standard service revolver, modified to fire special .32 caliber \"Huntsman\" rounds. The barrel is engraved with a captain's insignia and a pair of wings."
+	icon_state = "charons-special"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/charons_special
+	origin_tech = "combat=6;materials=5"
+
 /// Summoned by the Finger Gun spell, from advanced mimery traitor item
 /obj/item/gun/projectile/revolver/fingergun
 	name = "finger gun"

code/modules/projectiles/projectile/bullets.dm

@@ -52,6 +52,15 @@
 	stamina = 30
 	icon_state = "bullet-r"
 
+/obj/projectile/bullet/huntsman32
+	damage = 20
+
+/obj/projectile/bullet/huntsman32/on_hit(atom/target, blocked = 0)
+	if(..(target, blocked) && isliving(target))
+		var/mob/living/L = target
+		if(L.mob_size >= MOB_SIZE_LARGE)
+			L.apply_damage(80, BRUTE)
+
 /obj/projectile/bullet/toxinbullet
 	damage = 15
 	damage_type = TOX