Merge branch 'master' into fuckatmos

code/modules/mob/living/carbon/alien/special/facehugger.dm

@@ -21,6 +21,7 @@
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
 	layer = MOB_LAYER
 	max_integrity = 100
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
 

code/modules/mob/living/carbon/human/dummy.dm

@@ -2,6 +2,7 @@
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH
+	mouse_drag_pointer = MOUSE_INACTIVE_POINTER
 	var/in_use = FALSE
 
 INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

code/modules/mob/living/carbon/human/emote.dm

@@ -39,6 +39,19 @@
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
 
+/datum/emote/living/carbon/human/mawp
+	key = "mawp"
+	key_third_person = "mawps"
+	message = "mawps annoyingly."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/carbon/human/mawp/run_emote(mob/living/user, params)
+	. = ..()
+	if(.)
+		if(ishuman(user))
+			if(prob(10))
+				user.adjustEarDamage(-5, -5)
+
 /datum/emote/living/carbon/human/mumble
 	key = "mumble"
 	key_third_person = "mumbles"

code/modules/mob/living/carbon/human/examine.dm

@@ -18,6 +18,16 @@
 	var/list/obscured = check_obscured_slots()
 	var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE))
 
+	if(ishuman(src)) //user just returned, y'know, the user's own species. dumb.
+		var/mob/living/carbon/human/H = src
+		var/datum/species/pref_species = H.dna.species
+		if(get_visible_name() == "Unknown") // same as flavor text, but hey it works.
+			msg += "You can't make out what species they are.\n"
+		else if(skipface)
+			msg += "You can't make out what species they are.\n"
+		else
+			msg += "[t_He] [t_is] a [H.dna.custom_species ? H.dna.custom_species : pref_species.name]!\n"
+
 	//uniform
 	if(w_uniform && !(SLOT_W_UNIFORM in obscured))
 		//accessory

code/modules/mob/living/carbon/human/human_defines.dm

@@ -47,6 +47,8 @@
 
 	var/nameless = FALSE //For drones of both the insectoid and robotic kind. And other types of nameless critters.
 
+	var/custom_species = null
+
 	var/datum/personal_crafting/handcrafting
 	var/datum/physiology/physiology
 

code/modules/mob/living/carbon/human/say.dm

@@ -1,9 +1,14 @@
 /mob/living/carbon/human/say_mod(input, message_mode)
 	verb_say = dna.species.say_mod
-	if(slurring)
-		return "slurs"
-	else
-		. = ..()
+	switch(slurring)
+		if(10 to 25)
+			return "jumbles"
+		if(25 to 50)
+			return "slurs"
+		if(50 to INFINITY)
+			return "garbles"
+		else
+			. = ..()
 
 /mob/living/carbon/human/treat_message(message)
 	message = dna.species.handle_speech(message,src)

code/modules/mob/living/carbon/human/species.dm

@@ -300,6 +300,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	else
 		if(C.client)
 			C.canbearoused = C.client.prefs.arousable
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(NOGENITALS in H.dna.species.species_traits)
+			H.give_genitals(TRUE) //call the clean up proc to delete anything on the mob then return.
+
 // EDIT ENDS
 
 /datum/species/proc/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
@@ -557,7 +562,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			bodyparts_to_add -= "waggingspines"
 
 	if("snout" in mutant_bodyparts) //Take a closer look at that snout!
-		if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC)
+		if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "snout"
 
 	if("frills" in mutant_bodyparts)
@@ -569,7 +574,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			bodyparts_to_add -= "horns"
 
 	if("ears" in mutant_bodyparts)
-		if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+		if(!H.dna.features["ears"] || H.dna.features["ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "ears"
 
 	if("wings" in mutant_bodyparts)
@@ -607,11 +612,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			bodyparts_to_add -= "mam_waggingtail"
 
 	if("mam_ears" in mutant_bodyparts)
-		if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
+		if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEEARS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEEARS)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "mam_ears"
 
 	if("mam_snouts" in mutant_bodyparts) //Take a closer look at that snout!
-		if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC)
+		if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "mam_snouts"
 
 	if("taur" in mutant_bodyparts)
@@ -691,8 +696,29 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					S = GLOB.moth_wings_list[H.dna.features["moth_wings"]]
 				if("caps")
 					S = GLOB.caps_list[H.dna.features["caps"]]
-				else
-					S = citadel_mutant_bodyparts(bodypart, H)
+				if("ipc_screen")
+					S = GLOB.ipc_screens_list[H.dna.features["ipc_screen"]]
+				if("ipc_antenna")
+					S = GLOB.ipc_antennas_list[H.dna.features["ipc_antenna"]]
+				if("mam_tail")
+					S = GLOB.mam_tails_list[H.dna.features["mam_tail"]]
+				if("mam_waggingtail")
+					S = GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]]
+				if("mam_body_markings")
+					S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]]
+				if("mam_ears")
+					S = GLOB.mam_ears_list[H.dna.features["mam_ears"]]
+				if("mam_snouts")
+					S = GLOB.mam_snouts_list[H.dna.features["mam_snouts"]]
+				if("taur")
+					S = GLOB.taur_list[H.dna.features["taur"]]
+				if("xenodorsal")
+					S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]]
+				if("xenohead")
+					S = GLOB.xeno_head_list[H.dna.features["xenohead"]]
+				if("xenotail")
+					S = GLOB.xeno_tail_list[H.dna.features["xenotail"]]
+
 			if(!S || S.icon_state == "none")
 				continue
 
@@ -703,9 +729,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			//A little rename so we don't have to use tail_lizard or tail_human when naming the sprites.
 			if(bodypart == "tail_lizard" || bodypart == "tail_human" || bodypart == "mam_tail" || bodypart == "xenotail")
 				bodypart = "tail"
-			else if(bodypart == "waggingtail_lizard" || bodypart == "waggingtail_human")
+			else if(bodypart == "waggingtail_lizard")
 				bodypart = "waggingtail"
-			if(bodypart == "mam_waggingtail")
+			if(bodypart == "mam_waggingtail" || bodypart == "waggingtail_human")
 				bodypart = "tailwag"
 			if(bodypart == "mam_ears" || bodypart == "ears")
 				bodypart = "ears"
@@ -724,16 +750,18 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 			var/list/colorlist = list()
 			colorlist.Cut()
-			colorlist += ReadRGB(H.dna.features["mcolor"])
-			colorlist += ReadRGB(H.dna.features["mcolor2"])
-			colorlist += ReadRGB(H.dna.features["mcolor3"])
-			colorlist += list(0,0,0)
+			colorlist += ReadRGB("[H.dna.features["mcolor"]]0")
+			colorlist += ReadRGB("[H.dna.features["mcolor2"]]0")
+			colorlist += ReadRGB("[H.dna.features["mcolor3"]]0")
+			colorlist += list(0,0,0, hair_alpha)
 			for(var/index=1, index<=colorlist.len, index++)
 				colorlist[index] = colorlist[index]/255
 
 			if(!(H.has_trait(TRAIT_HUSK)))
 				if(!forced_colour)
 					switch(S.color_src)
+						if(SKINTONE)
+							accessory_overlay.color = "#[skintone2hex(H.skin_tone)]"
 						if(MUTCOLORS)
 							if(fixed_mut_color)
 								accessory_overlay.color = "#[fixed_mut_color]"
@@ -774,11 +802,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					husklist += ReadRGB("#a3a3a3")
 					husklist += ReadRGB("#a3a3a3")
 					husklist += ReadRGB("#a3a3a3")
-					husklist += list(0,0,0)
+					husklist += list(0,0,0, hair_alpha)
 					for(var/index=1, index<=husklist.len, index++)
 						husklist[index] = husklist[index]/255
 					accessory_overlay.color = husklist
-
 			standing += accessory_overlay
 
 			if(S.hasinner)
@@ -1143,15 +1170,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			H.add_trait(TRAIT_FAT, OBESITY)
 			H.update_inv_w_uniform()
 			H.update_inv_wear_suit()
-	
-	if(H.noisy && H.nutrition <= NUTRITION_LEVEL_STARVING)
-		if(prob(10))
-			playsound(get_turf(H),"hunger_sounds",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
-			
-	else if(H.noisy && H.nutrition <= NUTRITION_LEVEL_HUNGRY)
-		if(prob(10))
-			playsound(get_turf(H),"hunger_sounds",15,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
- 
+
 	// nutrition decrease and satiety
 	if (H.nutrition > 0 && H.stat != DEAD && !H.has_trait(TRAIT_NOHUNGER))
 		// THEY HUNGER
@@ -1437,25 +1456,52 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			target.forcesay(GLOB.hit_appends)
 
 /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
-	// CITADEL EDIT slap mouthy gits
-	var/aim_for_mouth  = user.zone_selected == "mouth"
-	var/target_on_help_and_unarmed = target.a_intent == INTENT_HELP && !target.get_active_held_item()
+	// CITADEL EDIT slap mouthy gits and booty
+	var/aim_for_mouth = user.zone_selected == "mouth"
+	var/target_on_help = target.a_intent == INTENT_HELP
 	var/target_aiming_for_mouth = target.zone_selected == "mouth"
 	var/target_restrained = target.restrained()
-	if(aim_for_mouth && ( target_on_help_and_unarmed || target_restrained || target_aiming_for_mouth))
-		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
-		user.visible_message("<span class='danger'>[user] slaps [target] in the face!</span>",
-			"<span class='notice'>You slap [target] in the face! </span>",\
-		"You hear a slap.")
-		stop_wagging_tail(target)
-		return FALSE
-	else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
-		to_chat(user, "<span class='warning'>You're too exhausted.</span>")
-		return FALSE
-	else if(target.check_block()) //END EDIT
+	var/same_dir = (target.dir & user.dir)
+	var/aim_for_groin  = user.zone_selected == "groin"
+	var/target_aiming_for_groin = target.zone_selected == "groin"
+
+	if(target.check_block()) //END EDIT
 		target.visible_message("<span class='warning'>[target] blocks [user]'s disarm attempt!</span>")
 		return 0
-	if(attacker_style && attacker_style.disarm_act(user,target))
+	else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		to_chat(user, "<span class='warning'>You're too exhausted!</span>")
+		return FALSE
+
+	else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth))
+		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
+
+		user.visible_message(
+			"<span class='danger'>[user] slaps [target] in the face!</span>",
+			"<span class='notice'>You slap [user == target ? "yourself" : target] in the face! </span>",\
+			"You hear a slap."
+		)
+		if (!target.has_trait(TRAIT_NYMPHO))
+			stop_wagging_tail(target)
+		user.do_attack_animation(target, ATTACK_EFFECT_FACE_SLAP)
+		user.adjustStaminaLossBuffered(3)
+		return FALSE
+	else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
+		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
+		user.visible_message(
+			"<span class='danger'>[user] slaps [target]'s ass!</span>",
+			"<span class='notice'>You slap [user == target ? "your" : target + "'s"] ass! </span>",\
+			"You hear a slap."
+		)
+		if (target.canbearoused)
+			target.adjustArousalLoss(5)
+		if (target.getArousalLoss() >= 100 && ishuman(target) && target.has_trait(TRAIT_NYMPHO) && target.has_dna())
+			target.mob_climax(forced_climax=TRUE)
+		if (!target.has_trait(TRAIT_NYMPHO))
+			stop_wagging_tail(target)
+		user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
+		user.adjustStaminaLossBuffered(3)
+		return FALSE
+	else if(attacker_style && attacker_style.disarm_act(user,target))
 		return 1
 	else
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)

code/modules/mob/living/carbon/human/species_types/abductors.dm

@@ -3,7 +3,7 @@
 	id = "abductor"
 	say_mod = "gibbers"
 	sexes = FALSE
-	species_traits = list(NOBLOOD,NOEYES)
+	species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_NOGUNS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
 	mutanttongue = /obj/item/organ/tongue/abductor
 	var/scientist = FALSE // vars to not pollute spieces list with castes

code/modules/mob/living/carbon/human/species_types/android.dm

@@ -2,7 +2,7 @@
 	name = "Android"
 	id = "android"
 	say_mod = "states"
-	species_traits = list(NOBLOOD)
+	species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
 	inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
 	meat = null

code/modules/mob/living/carbon/human/species_types/corporate.dm

@@ -15,6 +15,6 @@
 	attack_sound = 'sound/weapons/resonator_blast.ogg'
 	blacklisted = 1
 	use_skintones = 0
-	species_traits = list(NOBLOOD,EYECOLOR)
+	species_traits = list(NOBLOOD,EYECOLOR,NOGENITALS)
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER)
 	sexes = 0

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -2,7 +2,7 @@
 	// Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
 	name = "Golem"
 	id = "iron golem"
-	species_traits = list(NOBLOOD,MUTCOLORS,NO_UNDERWEAR)
+	species_traits = list(NOBLOOD,MUTCOLORS,NO_UNDERWEAR,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
 	inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID)
 	mutant_organs = list(/obj/item/organ/adamantine_resonator)

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -3,8 +3,8 @@
 	id = "human"
 	default_color = "FFFFFF"
 	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS_PARTSONLY)
-	mutant_bodyparts = list("mam_ears", "mam_tail", "wings", "taur") // CITADEL EDIT gives humans snowflake parts
-	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "wings" = "None", "taur" = "None")
+	mutant_bodyparts = list("ears", "tail_human", "wings", "taur") // CITADEL EDIT gives humans snowflake parts
+	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF","tail_human" = "None", "ears" = "None", "wings" = "None", "taur" = "None")
 	use_skintones = 1
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	disliked_food = GROSS | RAW

code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -5,8 +5,8 @@
 	default_color = "00FF90"
 	say_mod = "chirps"
 	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
-	mutant_bodyparts = list("mam_tail", "mam_ears", "taur") //CIT CHANGE
-	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None") //CIT CHANGE
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur") //CIT CHANGE
+	default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None") //CIT CHANGE
 	inherent_traits = list(TRAIT_TOXINLOVER)
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
 	exotic_blood = "slimejelly"

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -94,4 +94,9 @@
 	inherent_traits = list(TRAIT_NOGUNS)
 	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
-	brutemod = 0.9
+	brutemod = 0.9
+
+/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
+	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
+		C.dna.features["tail"] = "Smooth"
+	return ..()

code/modules/mob/living/carbon/human/species_types/mushpeople.dm

@@ -9,7 +9,7 @@
 	nojumpsuit = TRUE
 
 	say_mod = "poofs" //what does a mushroom sound like
-	species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR)
+	species_traits = list(MUTCOLORS, NOEYES, NO_UNDERWEAR,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_NOBREATH)
 	speedmod = 1.5 //faster than golems but not by much
 

code/modules/mob/living/carbon/human/species_types/plasmamen.dm

@@ -4,7 +4,7 @@
 	say_mod = "rattles"
 	sexes = 0
 	meat = /obj/item/stack/sheet/mineral/plasma
-	species_traits = list(NOBLOOD,NOTRANSSTING)
+	species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS)
 	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOHUNGER)
 	inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID)
 	mutantlungs = /obj/item/organ/lungs/plasmaman

code/modules/mob/living/carbon/human/species_types/podpeople.dm

@@ -12,6 +12,11 @@
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
 	disliked_food = MEAT | DAIRY
 	liked_food = VEGETABLES | FRUIT | GRAIN
+	var/light_nutrition_gain_factor = 10
+	var/light_toxheal = 1
+	var/light_oxyheal = 1
+	var/light_burnheal = 1
+	var/light_bruteheal = 1
 
 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -30,13 +35,13 @@
 	if(isturf(H.loc)) //else, there's considered to be no light
 		var/turf/T = H.loc
 		light_amount = min(1,T.get_lumcount()) - 0.5
-		H.nutrition += light_amount * 10
+		H.nutrition += light_amount * light_nutrition_gain_factor
 		if(H.nutrition > NUTRITION_LEVEL_FULL)
 			H.nutrition = NUTRITION_LEVEL_FULL
 		if(light_amount > 0.2) //if there's enough light, heal
-			H.heal_overall_damage(1,1)
-			H.adjustToxLoss(-1)
-			H.adjustOxyLoss(-1)
+			H.heal_overall_damage(light_bruteheal, light_burnheal)
+			H.adjustToxLoss(-light_toxheal)
+			H.adjustOxyLoss(-light_oxyheal)
 
 	if(H.nutrition < NUTRITION_LEVEL_STARVING + 50)
 		H.take_overall_damage(2,0)
@@ -64,3 +69,11 @@
 				H.show_message("<span class='userdanger'>The radiation beam singes you!</span>")
 		if(/obj/item/projectile/energy/florayield)
 			H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
+
+/datum/species/pod/pseudo_weak
+	id = "podweak"
+	limbs_id = "pod"
+	light_nutrition_gain_factor = 7.5
+	light_bruteheal = 0.2
+	light_burnheal = 0.2
+	light_toxheal = 0.7

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -38,7 +38,7 @@
 	burnmod = 1.5
 	blacklisted = TRUE
 	no_equip = list(SLOT_WEAR_MASK, SLOT_WEAR_SUIT, SLOT_GLOVES, SLOT_SHOES, SLOT_W_UNIFORM, SLOT_S_STORE)
-	species_traits = list(NOBLOOD,NO_UNDERWEAR,NO_DNA_COPY,NOTRANSSTING,NOEYES)
+	species_traits = list(NOBLOOD,NO_UNDERWEAR,NO_DNA_COPY,NOTRANSSTING,NOEYES,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_NOBREATH,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER)
 	mutanteyes = /obj/item/organ/eyes/night_vision/nightmare
 	mutant_organs = list(/obj/item/organ/heart/nightmare)

code/modules/mob/living/carbon/human/species_types/skeletons.dm

@@ -6,7 +6,7 @@
 	blacklisted = 1
 	sexes = 0
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
-	species_traits = list(NOBLOOD)
+	species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH)
 	inherent_biotypes = list(MOB_UNDEAD, MOB_HUMANOID)
 	mutanttongue = /obj/item/organ/tongue/bone

code/modules/mob/living/carbon/human/species_types/synths.dm

@@ -3,7 +3,7 @@
 	id = "synth"
 	say_mod = "beep boops" //inherited from a user's real species
 	sexes = 0
-	species_traits = list(NOTRANSSTING) //all of these + whatever we inherit from the real species
+	species_traits = list(NOTRANSSTING,NOGENITALS,NOAROUSAL) //all of these + whatever we inherit from the real species
 	inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOHUNGER,TRAIT_NOBREATH)
 	inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
 	dangerous_existence = 1

code/modules/mob/living/carbon/human/update_icons.dm

@@ -324,13 +324,22 @@ There are several things that need to be remembered:
 /mob/living/carbon/human/update_inv_head()
 	..()
 	update_mutant_bodyparts()
-	var/mutable_appearance/head_overlay = overlays_standing[HEAD_LAYER]
-	if(head_overlay)
+	if(head)
 		remove_overlay(HEAD_LAYER)
+		var/obj/item/clothing/head/H = head
+		if(H.mutantrace_variation)
+			if(H.muzzle_var == ALT_STYLE)
+				H.alternate_worn_icon = 'modular_citadel/icons/mob/muzzled_helmet.dmi'
+			else
+				H.alternate_worn_icon = null
+
+		overlays_standing[HEAD_LAYER] = H.build_worn_icon(state = H.icon_state, default_layer = HEAD_LAYER, default_icon_file = ((head.alternate_worn_icon) ? H.alternate_worn_icon : 'icons/mob/head.dmi'))
+		var/mutable_appearance/head_overlay = overlays_standing[HEAD_LAYER]
+
 		if(OFFSET_HEAD in dna.species.offset_features)
 			head_overlay.pixel_x += dna.species.offset_features[OFFSET_HEAD][1]
 			head_overlay.pixel_y += dna.species.offset_features[OFFSET_HEAD][2]
-			overlays_standing[HEAD_LAYER] = head_overlay
+		overlays_standing[HEAD_LAYER] = head_overlay
 	apply_overlay(HEAD_LAYER)
 
 /mob/living/carbon/human/update_inv_belt()
@@ -429,13 +438,22 @@ There are several things that need to be remembered:
 
 /mob/living/carbon/human/update_inv_wear_mask()
 	..()
-	var/mutable_appearance/mask_overlay = overlays_standing[FACEMASK_LAYER]
-	if(mask_overlay)
+	if(wear_mask)
+		var/obj/item/clothing/mask/M = wear_mask
 		remove_overlay(FACEMASK_LAYER)
+		if(M.mutantrace_variation)
+			if(M.muzzle_var == ALT_STYLE)
+				M.alternate_worn_icon = 'modular_citadel/icons/mob/muzzled_mask.dmi'
+			else
+				M.alternate_worn_icon = null
+
+		overlays_standing[FACEMASK_LAYER] = M.build_worn_icon(state = wear_mask.icon_state, default_layer = FACEMASK_LAYER, default_icon_file = ((wear_mask.alternate_worn_icon) ? M.alternate_worn_icon : 'icons/mob/mask.dmi'))
+		var/mutable_appearance/mask_overlay = overlays_standing[FACEMASK_LAYER]
+
 		if(OFFSET_FACEMASK in dna.species.offset_features)
 			mask_overlay.pixel_x += dna.species.offset_features[OFFSET_FACEMASK][1]
 			mask_overlay.pixel_y += dna.species.offset_features[OFFSET_FACEMASK][2]
-			overlays_standing[FACEMASK_LAYER] = mask_overlay
+		overlays_standing[FACEMASK_LAYER] = mask_overlay
 		apply_overlay(FACEMASK_LAYER)
 	update_mutant_bodyparts() //e.g. upgate needed because mask now hides lizard snout
 

code/modules/mob/living/carbon/life.dm

@@ -529,8 +529,8 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 	if(stuttering)
 		stuttering = max(stuttering-1, 0)
 
-	if(slurring)
-		slurring = max(slurring-1,0)
+	if(slurring || drunkenness)
+		slurring = max(slurring-1,0,drunkenness)
 
 	if(cultslurring)
 		cultslurring = max(cultslurring-1, 0)
@@ -548,16 +548,11 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 		drunkenness = max(drunkenness - (drunkenness * 0.04), 0)
 		if(drunkenness >= 6)
 			SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "drunk", /datum/mood_event/drunk)
-			if(prob(25))
-				slurring += 2
 			jitteriness = max(jitteriness - 3, 0)
 			if(has_trait(TRAIT_DRUNK_HEALING))
 				adjustBruteLoss(-0.12, FALSE)
 				adjustFireLoss(-0.06, FALSE)
 
-		if(drunkenness >= 11 && slurring < 5)
-			slurring += 1.2
-
 		if(mind && (mind.assigned_role == "Scientist" || mind.assigned_role == "Research Director"))
 			if(SSresearch.science_tech)
 				if(drunkenness >= 12.9 && drunkenness <= 13.8)

code/modules/mob/living/say.dm

@@ -334,7 +334,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		message = stutter(message)
 
 	if(slurring)
-		message = slur(message)
+		message = slur(message,slurring)
 
 	if(cultslurring)
 		message = cultslur(message)

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -505,3 +505,33 @@
 				to_chat(user, "<span class='notice'>You unbolt [src]'s energy swords</span>")
 				for(var/IS in 1 to swordamt)
 					new /obj/item/melee/transforming/energy/sword/saber(Tsec)
+
+//Firebot Assembly
+/obj/item/bot_assembly/firebot
+	name = "incomplete firebot assembly"
+	desc = "A fire extinguisher with an arm attached to it."
+	icon_state = "firebot_arm"
+	created_name = "Firebot"
+
+/obj/item/bot_assembly/firebot/attackby(obj/item/I, mob/user, params)
+	..()
+	switch(build_step)
+		if(ASSEMBLY_FIRST_STEP)
+			if(istype(I, /obj/item/clothing/head/hardhat/red))
+				if(!user.temporarilyRemoveItemFromInventory(I))
+					return
+				to_chat(user,"<span class='notice'>You add the [I] to [src]!</span>")
+				icon_state = "firebot_helmet"
+				desc = "An incomplete firebot assembly with a fire helmet."
+				qdel(I)
+				build_step++
+
+		if(ASSEMBLY_SECOND_STEP)
+			if(isprox(I))
+				if(!can_finish_build(I, user))
+					return
+				to_chat(user, "<span class='notice'>You add the [I] to [src]! Beep Boop!</span>")
+				var/mob/living/simple_animal/bot/firebot/F = new(drop_location())
+				F.name = created_name
+				qdel(I)
+				qdel(src)

code/modules/mob/living/simple_animal/bot/firebot.dm

@@ -0,0 +1,325 @@
+//Firebot
+
+#define SPEECH_INTERVAL 300  // Time between idle speeches
+#define DETECTED_VOICE_INTERVAL 300  // Time between fire detected callouts
+#define FOAM_INTERVAL 50  // Time between deployment of fire fighting foam
+
+/mob/living/simple_animal/bot/firebot
+	name = "\improper Firebot"
+	desc = "A little fire extinguishing bot. He looks rather anxious."
+	icon = 'icons/mob/aibots.dmi'
+	icon_state = "firebot"
+	density = FALSE
+	anchored = FALSE
+	health = 25
+	maxHealth = 25
+	spacewalk = TRUE
+
+	radio_key = /obj/item/encryptionkey/headset_eng
+	radio_channel = "Engineering"
+	bot_type = FIRE_BOT
+	model = "Firebot"
+	bot_core = /obj/machinery/bot_core/firebot
+	window_id = "autoextinguisher"
+	window_name = "Mobile Fire Extinguisher v1.0"
+	path_image_color = "#FFA500"
+
+	var/atom/target_fire
+	var/atom/old_target_fire
+
+	var/obj/item/extinguisher/internal_ext
+
+	var/last_found = 0
+
+	var/speech_cooldown = 0
+	var/detected_cooldown = 0
+	var/foam_cooldown = 0
+
+	var/extinguish_people = TRUE
+	var/extinguish_fires = TRUE
+	var/stationary_mode = FALSE
+
+/mob/living/simple_animal/bot/firebot/Initialize()
+	. = ..()
+	update_icon()
+	var/datum/job/engineer/J = new/datum/job/engineer
+	access_card.access += J.get_access()
+	prev_access = access_card.access
+
+	create_extinguisher()
+
+/mob/living/simple_animal/bot/firebot/bot_reset()
+	create_extinguisher()
+
+/mob/living/simple_animal/bot/firebot/proc/create_extinguisher()
+	internal_ext = new /obj/item/extinguisher(src)
+	internal_ext.safety = FALSE
+	internal_ext.precision = TRUE
+	internal_ext.max_water = INFINITY
+	internal_ext.refill()
+
+/mob/living/simple_animal/bot/firebot/UnarmedAttack(atom/A)
+	if(!on)
+		return
+	if(internal_ext)
+		internal_ext.afterattack(A, src)
+	else
+		return ..()
+
+/mob/living/simple_animal/bot/firebot/RangedAttack(atom/A)
+	if(!on)
+		return
+	if(internal_ext)
+		internal_ext.afterattack(A, src)
+	else
+		return ..()
+
+/mob/living/simple_animal/bot/firebot/turn_on()
+	. = ..()
+	update_icon()
+
+/mob/living/simple_animal/bot/firebot/turn_off()
+	..()
+	update_icon()
+
+/mob/living/simple_animal/bot/firebot/bot_reset()
+	..()
+	target_fire = null
+	old_target_fire = null
+	ignore_list = list()
+	anchored = FALSE
+	update_icon()
+
+/mob/living/simple_animal/bot/firebot/proc/soft_reset()
+	path = list()
+	target_fire = null
+	mode = BOT_IDLE
+	last_found = world.time
+	update_icon()
+
+/mob/living/simple_animal/bot/firebot/set_custom_texts()
+	text_hack = "You corrupt [name]'s safety protocols."
+	text_dehack = "You detect errors in [name] and reset his programming."
+	text_dehack_fail = "[name] is not responding to reset commands!"
+
+/mob/living/simple_animal/bot/firebot/get_controls(mob/user)
+	var/dat
+	dat += hack(user)
+	dat += showpai(user)
+	dat += "<TT><B>Mobile Fire Extinguisher v1.0</B></TT><BR><BR>"
+	dat += "Status: <A href='?src=[REF(src)];power=1'>[on ? "On" : "Off"]</A><BR>"
+	dat += "Maintenance panel panel is [open ? "opened" : "closed"]<BR>"
+
+	dat += "Behaviour controls are [locked ? "locked" : "unlocked"]<BR>"
+	if(!locked || issilicon(user) || IsAdminGhost(user))
+		dat += "Extinguish Fires: <A href='?src=[REF(src)];operation=extinguish_fires'>[extinguish_fires ? "Yes" : "No"]</A><BR>"
+		dat += "Extinguish People: <A href='?src=[REF(src)];operation=extinguish_people'>[extinguish_people ? "Yes" : "No"]</A><BR>"
+		dat += "Patrol Station: <A href='?src=[REF(src)];operation=patrol'>[auto_patrol ? "Yes" : "No"]</A><BR>"
+		dat += "Stationary Mode: <a href='?src=[REF(src)];operation=stationary_mode'>[stationary_mode ? "Yes" : "No"]</a><br>"
+
+	return dat
+
+/mob/living/simple_animal/bot/firebot/emag_act(mob/user)
+	..()
+	if(emagged == 1)
+		if(user)
+			to_chat(user, "<span class='danger'>[src] buzzes and beeps.</span>")
+		audible_message("<span class='danger'>[src] buzzes oddly!</span>")
+		playsound(src, "sparks", 75, TRUE)
+		if(user)
+			old_target_fire = user
+		extinguish_fires = FALSE
+		extinguish_people = TRUE
+
+		internal_ext.chem = "clf3" //Refill the internal extinguisher with liquid fire
+		internal_ext.power = 3
+		internal_ext.safety = FALSE
+		internal_ext.precision = FALSE
+		internal_ext.max_water = INFINITY
+		internal_ext.refill()
+
+/mob/living/simple_animal/bot/firebot/Topic(href, href_list)
+	if(..())
+		return TRUE
+
+	switch(href_list["operation"])
+		if("extinguish_fires")
+			extinguish_fires = !extinguish_fires
+		if("extinguish_people")
+			extinguish_people = !extinguish_people
+		if("stationary_mode")
+			stationary_mode = !stationary_mode
+
+	update_controls()
+	update_icon()
+
+/mob/living/simple_animal/bot/firebot/proc/is_burning(atom/target)
+	if(ismob(target))
+		var/mob/living/M = target
+		if(M.on_fire || (emagged == 1 && !M.on_fire))
+			return TRUE
+
+	else if(isturf(target))
+		var/turf/open/T = target
+		if(T.active_hotspot)
+			return TRUE
+
+	return FALSE
+
+/mob/living/simple_animal/bot/firebot/handle_automated_action()
+	if(!..())
+		return
+
+	if(IsStun())
+		old_target_fire = target_fire
+		target_fire = null
+		mode = BOT_IDLE
+		return
+
+	if(prob(1) && target_fire == null)
+		var/list/messagevoice = list("No fires detected." = 'sound/voice/firebot/nofires.ogg',
+		"Only you can prevent station fires." = 'sound/voice/firebot/onlyyou.ogg',
+		"Temperature nominal." = 'sound/voice/firebot/tempnominal.ogg',
+		"Keep it cool." = 'sound/voice/firebot/keepitcool.ogg')
+		var/message = pick(messagevoice)
+		speak(message)
+		playsound(src, messagevoice[message], 50)
+
+	// Couldn't reach the target, reset and try again ignoring the old one
+	if(frustration > 8)
+		old_target_fire = target_fire
+		soft_reset()
+
+	// We extinguished our target or it was deleted
+	if(QDELETED(target_fire) || !is_burning(target_fire) || isdead(target_fire))
+		target_fire = null
+		var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE)
+
+		if(extinguish_people)
+			target_fire = scan(/mob/living, old_target_fire, scan_range) // Scan for burning humans first
+
+		if(target_fire == null && extinguish_fires)
+			target_fire = scan(/turf/open, old_target_fire, scan_range) // Scan for burning turfs second
+
+		old_target_fire = target_fire
+
+	// Target reached ENGAGE WATER CANNON
+	if(target_fire && (get_dist(src, target_fire) <= (emagged == 1 ? 1 : 2))) // Make the bot spray water from afar when not emagged
+		if((speech_cooldown + SPEECH_INTERVAL) < world.time)
+			if(ishuman(target_fire))
+				speak("Stop, drop and roll!")
+				playsound(src, "sound/voice/firebot/stopdropnroll.ogg", 50, 0)
+			else
+				speak("Extinguishing!")
+				playsound(src, "sound/voice/firebot/extinguishing.ogg", 50, 0)
+			speech_cooldown = world.time
+
+			flick("firebot1_use", src)
+			spray_water(target_fire, src)
+
+		soft_reset()
+
+	// Target ran away
+	else if(target_fire && path.len && (get_dist(target_fire,path[path.len]) > 2))
+		path = list()
+		mode = BOT_IDLE
+		last_found = world.time
+
+	else if(target_fire && stationary_mode)
+		soft_reset()
+		return
+
+	if(target_fire && (get_dist(src, target_fire) > 2))
+
+		path = get_path_to(src, get_turf(target_fire), /turf/proc/Distance_cardinal, 0, 30, 1, id=access_card)
+		mode = BOT_MOVING
+		if(!path.len)
+			soft_reset()
+
+	if(path.len > 0 && target_fire)
+		if(!bot_move(path[path.len]))
+			old_target_fire = target_fire
+			soft_reset()
+		return
+
+	// We got a target but it's too far away from us
+	if(path.len > 8 && target_fire)
+		frustration++
+
+	if(auto_patrol && !target_fire && !stationary_mode)
+		if(mode == BOT_IDLE || mode == BOT_START_PATROL)
+			start_patrol()
+
+		if(mode == BOT_PATROL)
+			bot_patrol()
+
+
+//Look for burning people or turfs around the bot
+/mob/living/simple_animal/bot/firebot/process_scan(atom/scan_target)
+	var/result
+
+	if(scan_target == src)
+		return result
+
+	if(is_burning(scan_target))
+		if((detected_cooldown + DETECTED_VOICE_INTERVAL) < world.time)
+			speak("Fire detected!")
+			playsound(src, "sound/voice/firebot/detected.ogg", 50, 0)
+			detected_cooldown = world.time
+		result = scan_target
+
+	return result
+
+/mob/living/simple_animal/bot/firebot/temperature_expose(datum/gas_mixture/air, temperature, volume)
+	if((temperature > T0C + 200 || temperature < BODYTEMP_COLD_DAMAGE_LIMIT) && foam_cooldown + FOAM_INTERVAL < world.time)
+		new /obj/effect/particle_effect/foam/firefighting(loc)
+		foam_cooldown = world.time
+	..()
+
+/mob/living/simple_animal/bot/firebot/proc/spray_water(atom/target, mob/user)
+	if(stationary_mode)
+		flick("firebots_use", user)
+	else
+		flick("firebot1_use", user)
+	internal_ext.afterattack(target, user, null)
+
+/mob/living/simple_animal/bot/firebot/update_icon()
+	if(!on)
+		icon_state = "firebot0"
+		return
+	if(IsStun())
+		icon_state = "firebots1"
+	else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
+		icon_state = "firebots1"
+	else
+		icon_state = "firebot1"
+
+
+/mob/living/simple_animal/bot/firebot/explode()
+	on = FALSE
+	visible_message("<span class='boldannounce'>[src] blows apart!</span>")
+
+	var/atom/Tsec = drop_location()
+
+	new /obj/item/assembly/prox_sensor(Tsec)
+	new /obj/item/clothing/head/hardhat/red(Tsec)
+
+	var/turf/T = get_turf(Tsec)
+
+	if(isopenturf(T))
+		var/turf/open/theturf = T
+		theturf.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
+
+	if(prob(50))
+		drop_part(robot_arm, Tsec)
+
+	do_sparks(3, TRUE, src)
+	..()
+
+/obj/machinery/bot_core/firebot
+	req_one_access = list(ACCESS_CONSTRUCTION, ACCESS_ROBOTICS)
+
+#undef SPEECH_INTERVAL
+#undef DETECTED_VOICE_INTERVAL
+#undef FOAM_INTERVAL
+

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -345,7 +345,20 @@
 
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
 	in_melee = TRUE
-	return target.attack_animal(src)
+	if(vore_active)
+		if(isliving(target))
+			var/mob/living/L = target
+			if(L.Adjacent(src) && L.devourable) // aggressive check to ensure vore attacks can be made
+				if(prob(voracious_chance))
+					vore_attack(src,L,src)
+				else
+					return L.attack_animal(src)
+			else
+				return L.attack_animal(src) //literally every single fucking one of these need this I guess.
+		else
+			return target.attack_animal(src)
+	else
+		return target.attack_animal(src)
 
 /mob/living/simple_animal/hostile/proc/Aggro()
 	vision_range = aggro_vision_range

code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm

@@ -8,8 +8,6 @@
 	var/obj/belly/megafauna/dragon/maw/maw = new(src)
 	var/obj/belly/megafauna/dragon/gullet/gullet = new(src)
 	var/obj/belly/megafauna/dragon/gut/gut = new(src)
-//	for(var/obj/belly/X in list(maw, gullet, gut))
-//		vore_organs[X.name] = X
 	// Connect 'stomachs' together
 	maw.transferlocation = gullet
 	gullet.transferlocation = gut
@@ -49,6 +47,6 @@
 	vore_sound = "Tauric Swallow"
 	desc = "With a rush of burning ichor greeting you, you're introduced to the Drake's stomach. Wrinkled walls greedily grind against you, acidic slimes working into your body as you become fuel and nutriton for a superior predator. All that's left is your body's willingness to resist your destiny."
 	digest_mode = DM_DRAGON
-	digest_burn = 5
+	digest_burn = 2
 	swallow_time = 100  // costs extra time to eat directly to here
 	escapechance = 0

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -85,7 +85,7 @@
 				OpenFire()
 			if(L.Adjacent(src) && (L.stat != CONSCIOUS))
 				if(vore_active && L.devourable == TRUE)
-					dragon_feeding(src,L)
+					vore_attack(src,L,src)
 					LoseTarget()
 		else
 			devour(L)

code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm

@@ -187,12 +187,12 @@
 		var/mob/living/carbon/C = L
 		var/obj/item/clothing/S = C.get_item_by_slot(SLOT_WEAR_SUIT)
 		if(S && S.resistance_flags & GOLIATH_RESISTANCE)
-			L.Stun(75)
+			L.Stun(25)
 		else if(S && S.resistance_flags & GOLIATH_WEAKNESS)
-			L.Stun(125)
+			L.Stun(115)
 		else
-			L.Stun(100)
-		L.adjustBruteLoss(rand(10,15))
+			L.Stun(75)
+		L.adjustBruteLoss(rand(15,20)) // Less stun more harm
 		latched = TRUE
 	if(!latched)
 		retract()

code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm

@@ -290,7 +290,7 @@
 			gloves = /obj/item/clothing/gloves/color/black
 			mask = /obj/item/clothing/mask/gas/explorer
 			if(prob(20))
-				suit = pickweight(list(/obj/item/clothing/suit/hooded/explorer = 6, /obj/item/clothing/suit/hooded/cloak/goliath = 2, /obj/item/clothing/suit/hooded/exo = 6, /obj/item/clothing/suit/hooded/seva = 6))
+				suit = pickweight(list(/obj/item/clothing/suit/hooded/explorer/standard = 6, /obj/item/clothing/suit/hooded/cloak/goliath = 2, /obj/item/clothing/suit/hooded/explorer/exo = 6, /obj/item/clothing/suit/hooded/explorer/seva = 6))
 			if(prob(30))
 				r_pocket = pickweight(list(/obj/item/stack/marker_beacon = 20, /obj/item/stack/spacecash/c1000 = 7, /obj/item/reagent_containers/hypospray/medipen/survival = 2, /obj/item/borg/upgrade/modkit/damage = 1 ))
 			if(prob(10))

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -130,7 +130,7 @@
 /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
 	if(!Proj)
 		return
-	if(prob(50))
+	if(prob(25))
 		return ..()
 	else
 		visible_message("<span class='danger'>[src] blocks [Proj] with its shield!</span>")

code/modules/mob/living/simple_animal/simple_animal_vr.dm

@@ -1,21 +1,29 @@
+#define VORACIOUS_CHANCE 40
+#define VORE_SWALLOW_TIME 50
+
 /mob/living/simple_animal
-	// List of targets excluded (for now) from being eaten by this mob.
-	var/list/prey_exclusions = list()
-	devourable = FALSE //insurance because who knows.
-	digestable = TRUE	//I mean, if it's devourable it should also be digestible
-	var/vore_active = FALSE				// If vore behavior is enabled for this mob
+	//Specific vore behaviors
+	var/vore_active = FALSE						// If vore behavior is enabled for this mob
+	var/isPredator = FALSE 						//Are they capable of performing and pre-defined vore actions for their species?
+	var/swallowTime = VORE_SWALLOW_TIME 		//How long it takes to eat Human and other Simple_animal prey in 1/10 of a second. The default is 5 seconds.
+	var/list/prey_excludes = list()				//For excluding people from being eaten.
+	var/voracious_chance = VORACIOUS_CHANCE		//Mob AI Engagement probability when rolling between regular melee strike and a vore attempt, default 40%
 
-	var/vore_default_mode = DM_DIGEST	// Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB)
-	var/vore_digest_chance = 25			// Chance to switch to digest mode if resisted
-	var/vore_escape_chance = 25			// Chance of resisting out of mob
-	var/vore_absorb_chance = 0			// chance of absorbtion by mob
+	// Vore belly interactions
+	// Most mobs are only going to have the one gut. Multi-gut set ups should refer to Ash Drake's dragon_vore.dm for set up.
 
-	var/vore_stomach_name				// The name for the first belly if not "stomach"
-	var/vore_stomach_flavor				// The flavortext for the first belly if not the default
-
-	var/vore_fullness = 0				// How "full" the belly is (controls icons)
-	var/list/living_mobs = list()
+	var/vore_default_sound = "Gulp"				// Default vore sound
+	var/vore_default_release = "Splatter" 		// Default release sound
+	var/vore_wetness = TRUE						// Default for a wet belly
+	var/vore_default_mode = DM_DIGEST			// Default bellymode (DM_DIGEST, DM_HOLD, DM_ABSORB)
+	var/vore_digest_chance = VORACIOUS_CHANCE	// Chance to switch to digest mode if resisted, default 40%
+	var/vore_escape_chance = VORACIOUS_CHANCE	// Chance of resisting out of mob, default 40%
+	var/vore_absorb_chance = 0					// chance of absorbtion by mob, default 0%
+	var/vore_stomach_name						// The name for the first belly if not "stomach"
+	var/vore_stomach_flavor						// The flavortext for the first belly if not the default
 
+	//Icon Memes
+	var/vore_fullness = 0					// How "full" the belly is (controls icons)
 
 // Release belly contents before being gc'd!
 /mob/living/simple_animal/Destroy()
@@ -34,35 +42,19 @@
 
 	vore_fullness = new_fullness
 
-/*
-/mob/living/simple_animal/proc/swallow_check()
-	for(var/I in vore_organs)
-		var/obj/belly/B = vore_organs[I]
-		if(vore_active)
-			update_fullness()
-			if(!vore_fullness)
-				// Nothing
-				return
-			else
-				addtimer(CALLBACK(src, .proc/swallow_mob), B.swallow_time)
-
-/mob/living/simple_animal/proc/swallow_mob()
-	for(var/I in vore_organs)
-		var/obj/belly/B = vore_organs[I]
-		for(var/mob/living/M in B.contents)
-			B.transfer_contents(M, transferlocation)
-*/
-
 /mob/living/simple_animal/death()
 	release_vore_contents(silent = TRUE)
 	. = ..()
 
 // Simple animals have only one belly.  This creates it (if it isn't already set up)
-/mob/living/simple_animal/proc/init_belly()
+/mob/living/simple_animal/init_vore()
+	vore_init = TRUE
 	if(vore_organs.len)
 		return
 	if(no_vore) //If it can't vore, let's not give it a stomach.
 		return
+	if(vore_active && !IsAdvancedToolUser()) //vore active, but doesn't have thumbs to grab people with.
+		verbs |= /mob/living/simple_animal/proc/animal_nom
 
 	var/obj/belly/B = new /obj/belly(src)
 	vore_selected = B
@@ -70,6 +62,9 @@
 	B.name = vore_stomach_name ? vore_stomach_name : "stomach"
 	B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]."
 	B.digest_mode = vore_default_mode
+	B.vore_sound = vore_default_sound
+	B.release_sound = vore_default_release
+	B.is_wet = vore_wetness
 	B.escapable = vore_escape_chance > 0
 	B.escapechance = vore_escape_chance
 	B.digestchance = vore_digest_chance
@@ -97,21 +92,41 @@
 		"The juices pooling beneath you sizzle against your sore skin.",
 		"The churning walls slowly pulverize you into meaty nutrients.",
 		"The stomach glorps and gurgles as it tries to work you into slop.")
-/*	B.emote_lists[DM_ITEMWEAK] = list(
-		"The burning acids eat away at your form.",
-		"The muscular stomach flesh grinds harshly against you.",
-		"The caustic air stings your chest when you try to breathe.",
-		"The slimy guts squeeze inward to help the digestive juices soften you up.",
-		"The onslaught against your body doesn't seem to be letting up; you're food now.",
-		"The predator's body ripples and crushes against you as digestive enzymes pull you apart.",
-		"The juices pooling beneath you sizzle against your sore skin.",
-		"The churning walls slowly pulverize you into meaty nutrients.",
-		"The stomach glorps and gurgles as it tries to work you into slop.")*/
 
-//Grab = Nomf
-/*
-/mob/living/simple_animal/UnarmedAttack(var/atom/A, var/proximity)
-	. = ..()
+//
+// Simple proc for animals to have their digestion toggled on/off externally
+//
+/mob/living/simple_animal/verb/toggle_digestion()
+	set name = "Toggle Animal's Digestion"
+	set desc = "Enables digestion on this mob for 20 minutes."
+	set category = "Object"
+	set src in oview(1)
 
-	if(a_intent == I_GRAB && isliving(A) && !has_hands)
-		animal_nom(A)*/
+	var/mob/living/carbon/human/user = usr
+	if(!istype(user) || user.stat) return
+
+	if(vore_selected.digest_mode == DM_HOLD)
+		var/confirm = alert(usr, "Enabling digestion on [name] will cause it to digest all stomach contents. Using this to break OOC prefs is against the rules. Digestion will disable itself after 20 minutes.", "Enabling [name]'s Digestion", "Enable", "Cancel")
+		if(confirm == "Enable")
+			vore_selected.digest_mode = DM_DIGEST
+			sleep(20 MINUTES)
+			vore_selected.digest_mode = vore_default_mode
+	else
+		var/confirm = alert(usr, "This mob is currently set to digest all stomach contents. Do you want to disable this?", "Disabling [name]'s Digestion", "Disable", "Cancel")
+		if(confirm == "Disable")
+			vore_selected.digest_mode = DM_HOLD
+
+//
+// Simple nom proc for if you get ckey'd into a simple_animal mob! Avoids grabs.
+//
+/mob/living/simple_animal/proc/animal_nom(var/mob/living/T in oview(1))
+	set name = "Animal Nom"
+	set category = "Vore"
+	set desc = "Since you can't grab, you get a verb!"
+
+	if (stat != CONSCIOUS)
+		return
+	if (T.devourable == FALSE)
+		to_chat(usr, "<span class='warning'>You can't eat this!</span>")
+		return
+	return vore_attack(usr,T,usr)

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -61,6 +61,8 @@
 	var/mood = "" // To show its face
 	var/mutator_used = FALSE //So you can't shove a dozen mutators into a single slime
 	var/force_stasis = FALSE
+	
+	do_footstep = TRUE
 
 	var/static/regex/slime_name_regex = new("\\w+ (baby|adult) slime \\(\\d+\\)")
 	///////////TIME FOR SUBSPECIES