Merge branch 'CHOMPStation2:master' into BaseBlep

modular_chomp/code/modules/mob/living/living.dm

@@ -11,6 +11,8 @@
 	var/species_sounds = "None" // By default, we have nothing.
 	var/death_sound_override = null
 	var/virtual_reality_mob = FALSE // gross boolean for keeping VR mobs in VR
+	var/datum/looping_sound/mob/on_fire/firesoundloop
+	// var/datum/looping_sound/mob/stunned/stunnedloop
 	/* // Not sure if needed, screams aren't a carbon thing rn.
 	var/scream_sound = null
 	var/female_scream_sound = null
@@ -22,11 +24,23 @@
 	. = ..()
 
 	deaf_loop = new(list(src), FALSE)
+	firesoundloop = new(list(src), FALSE)
+	// stunnedloop = new(list(src), FALSE)
+	if(firesoundloop) // Partly safety, partly so we can have different probs for randomization
+		if(prob(40)) // Randomize our end_sound. Can't really do this easily in looping_sound without some work
+			if(prob(30))
+				firesoundloop.end_sound = 'sound/effects/mob_effects/on_fire/fire_extinguish2.ogg'
+			else if(prob(20))
+				firesoundloop.end_sound = 'sound/effects/mob_effects/on_fire/fire_extinguish3.ogg'
+			else
+				firesoundloop.end_sound = 'sound/effects/mob_effects/on_fire/fire_extinguish4.ogg'
 
 /mob/living/Destroy()
 	. = ..()
 
 	QDEL_NULL(deaf_loop)
+	QDEL_NULL(firesoundloop)
+	// QDEL_NULL(stunnedloop)
 
 /mob/living/proc/vs_animate(var/belly_to_animate)
   return

modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -23,7 +23,7 @@
 		/obj/item/weapon/circuitboard,
 		/obj/item/weapon/smes_coil,
 		/obj/item/weapon/fuel_assembly,
-		/obj/item/weapon/ore/bluespace_crystal
+		/obj/item/weapon/bluespace_crystal
 		) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
 
 	var/obj/item/wrapped = null // Item currently being held.

modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm

@@ -29,7 +29,8 @@
 	vore_bump_chance = 20
 	size_multiplier = 1.10
 	faction = "demon"
-	damage_fatigue_mult = 0
+	damage_fatigue_mult = 0.5 // We don't want to give them a flat, huge boost to attack speed, but at the same time, make them fight harder the closer they are to dying.
+	injury_enrages = TRUE
 
 	armor_soak = list(
 		"melee" = 5,
@@ -371,4 +372,4 @@
 	spawn_mob_type = /mob/living/simple_mob/vore/demonAI
 
 /obj/item/capture_crystal/wendigo
-	spawn_mob_type = /mob/living/simple_mob/vore/demonAI/wendigo
+	spawn_mob_type = /mob/living/simple_mob/vore/demonAI/wendigo

modular_chomp/code/modules/mob/new_player/sprite_accessories.dm

@@ -0,0 +1,8 @@
+/datum/sprite_accessory/marking/vox/vox_alt_eyes
+	icon = 'modular_chomp/icons/mob/human_races/markings_vox.dmi'
+
+/datum/sprite_accessory/marking/vox/vox_underbeak
+	name = "Vox Underbeak"
+	icon = 'modular_chomp/icons/mob/human_races/markings_vox.dmi'
+	icon_state = "vox_underbeak"
+	body_parts = list(BP_HEAD)