Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks

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

@@ -34,6 +34,7 @@
 	var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
 
 	var/co2overloadtime = null
+	var/o2overloadtime = null	//for Ash walker's weaker lungs, and future atmosia hazards
 	var/temperature_resistance = T0C+75
 	var/obj/item/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab
 

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

@@ -341,8 +341,13 @@
 	else if(isobserver(user) && traitstring)
 		msg += "<span class='info'><b>Traits:</b> [traitstring]</span><br>"
 
-	if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
-		msg += "[print_flavor_text()]\n"
+	if(print_flavor_text())
+		if(get_visible_name() == "Unknown")	//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
+			msg += "...?<br>"
+		else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either.
+			msg += "...?<br>"
+		else
+			msg += "[print_flavor_text()]\n"
 	msg += "*---------*</span>"
 
 	to_chat(user, msg)

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

@@ -84,7 +84,7 @@
 		var/obj/item/clothing/suit/space/space_ninja/SN = wear_suit
 		if(statpanel("SpiderOS"))
 			stat("SpiderOS Status:","[SN.s_initialized ? "Initialized" : "Disabled"]")
-			stat("Current Time:", "[station_time_timestamp()]")
+			stat("Current Time:", "[STATION_TIME_TIMESTAMP("hh:mm:ss")]")
 			if(SN.s_initialized)
 				//Suit gear
 				stat("Energy Charge:", "[round(SN.cell.charge/100)]%")
@@ -438,7 +438,7 @@
 														return
 													else if(!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
 														return
-													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp())
+													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, STATION_TIME_TIMESTAMP("hh:mm:ss"))
 													GLOB.data_core.addMinorCrime(R.fields["id"], crime)
 													investigate_log("New Minor Crime: <strong>[t1]</strong>: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
 													to_chat(usr, "<span class='notice'>Successfully added a minor crime.</span>")
@@ -454,7 +454,7 @@
 														return
 													else if (!istype(H.glasses, /obj/item/clothing/glasses/hud/security) && !istype(H.getorganslot(ORGAN_SLOT_HUD), /obj/item/organ/cyberimp/eyes/hud/security))
 														return
-													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, station_time_timestamp())
+													var/crime = GLOB.data_core.createCrimeEntry(t1, t2, allowed_access, STATION_TIME_TIMESTAMP("hh:mm:ss"))
 													GLOB.data_core.addMajorCrime(R.fields["id"], crime)
 													investigate_log("New Major Crime: <strong>[t1]</strong>: [t2] | Added to [R.fields["name"]] by [key_name(usr)]", INVESTIGATE_RECORDS)
 													to_chat(usr, "<span class='notice'>Successfully added a major crime.</span>")
@@ -487,7 +487,7 @@
 											var/counter = 1
 											while(R.fields[text("com_[]", counter)])
 												counter++
-											R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []<BR>[]", allowed_access, station_time_timestamp(), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1)
+											R.fields[text("com_[]", counter)] = text("Made by [] on [] [], []<BR>[]", allowed_access, STATION_TIME_TIMESTAMP("hh:mm:ss"), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1)
 											to_chat(usr, "<span class='notice'>Successfully added comment.</span>")
 											return
 							to_chat(usr, "<span class='warning'>Unable to locate a data core entry for this person.</span>")

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

@@ -4,7 +4,9 @@
 
 	if(def_zone)
 		if(isbodypart(def_zone))
-			return checkarmor(def_zone, type)
+			var/obj/item/bodypart/bp = def_zone
+			if(bp.body_part)
+				return checkarmor(def_zone, type)
 		var/obj/item/bodypart/affecting = get_bodypart(ran_zone(def_zone))
 		return checkarmor(affecting, type)
 		//If a specific bodypart is targetted, check how that bodypart is protected and return the value.

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

@@ -724,10 +724,10 @@ 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
 
@@ -774,11 +774,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,7 +1142,15 @@ 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
@@ -1653,13 +1660,19 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 	var/obj/item/bodypart/BP = null
 	if(isbodypart(def_zone))
-		BP = def_zone
+		if(damagetype == STAMINA && istype(def_zone, /obj/item/bodypart/head))
+			BP = H.get_bodypart(check_zone(BODY_ZONE_CHEST))
+		else
+			BP = def_zone
 	else
 		if(!def_zone)
 			def_zone = ran_zone(def_zone)
+		if(damagetype == STAMINA && def_zone == BODY_ZONE_HEAD)
+			def_zone = BODY_ZONE_CHEST
 		BP = H.get_bodypart(check_zone(def_zone))
-		if(!BP)
-			BP = H.bodyparts[1]
+
+	if(!BP)
+		BP = H.bodyparts[1]
 
 	switch(damagetype)
 		if(BRUTE)

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

@@ -91,6 +91,7 @@
 	id = "ashlizard"
 	limbs_id = "lizard"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
-	inherent_traits = list(TRAIT_NOGUNS,TRAIT_NOBREATH)
+	inherent_traits = list(TRAIT_NOGUNS)
+	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
 	brutemod = 0.9

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

@@ -141,6 +141,7 @@
 		return 0
 
 	var/safe_oxy_min = 16
+	var/safe_oxy_max = 50
 	var/safe_co2_max = 10
 	var/safe_tox_max = 0.05
 	var/SA_para_min = 1
@@ -156,6 +157,19 @@
 
 
 	//OXYGEN
+	if(O2_partialpressure > safe_oxy_max) // Too much Oxygen - blatant CO2 effect copy/pasta
+		if(!o2overloadtime)
+			o2overloadtime = world.time
+		else if(world.time - o2overloadtime > 120)
+			Dizzy(10)	// better than a minute of you're fucked KO, but certainly a wake up call. Honk.
+			adjustOxyLoss(3)
+			if(world.time - o2overloadtime > 300)
+				adjustOxyLoss(8)
+		if(prob(20))
+			emote("cough")
+		throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+		SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "suffocation", /datum/mood_event/suffocation)
+
 	if(O2_partialpressure < safe_oxy_min) //Not enough oxygen
 		if(prob(20))
 			emote("gasp")
@@ -172,6 +186,7 @@
 
 	else //Enough oxygen
 		failed_last_breath = 0
+		o2overloadtime = 0 //reset our counter for this too
 		if(health >= crit_threshold)
 			adjustOxyLoss(-5)
 		oxygen_used = breath_gases[/datum/gas/oxygen][MOLES]

code/modules/mob/living/death.dm

@@ -8,6 +8,8 @@
 
 	spill_organs(no_brain, no_organs, no_bodyparts)
 
+	release_vore_contents(silent = TRUE) // return of the bomb safe internals.
+
 	if(!no_bodyparts)
 		spread_bodyparts(no_brain, no_organs)
 
@@ -36,6 +38,7 @@
 		buckled.unbuckle_mob(src, force = TRUE)
 
 	dust_animation()
+	release_vore_contents(silent = TRUE) //technically grief protection, I guess? if they're SM'd it doesn't matter seconds after anyway.
 	spawn_dust(just_ash)
 	QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.
 
@@ -50,7 +53,7 @@
 	stat = DEAD
 	unset_machine()
 	timeofdeath = world.time
-	tod = station_time_timestamp()
+	tod = STATION_TIME_TIMESTAMP("hh:mm:ss")
 	var/turf/T = get_turf(src)
 	for(var/obj/item/I in contents)
 		I.on_mob_death(src, gibbed)

code/modules/mob/living/living.dm

@@ -312,7 +312,8 @@
 	return TRUE
 
 /mob/living/verb/succumb(whispered as null)
-	set hidden = TRUE
+	set name = "Succumb"
+	set category = "IC"
 	if (InCritical())
 		log_message("Has [whispered ? "whispered his final words" : "succumbed to death"] while in [InFullCritical() ? "hard":"soft"] critical with [round(health, 0.1)] points of health!", LOG_ATTACK)
 		adjustOxyLoss(health - HEALTH_THRESHOLD_DEAD)

code/modules/mob/living/living_defense.dm

@@ -127,8 +127,18 @@
 	IgniteMob()
 
 /mob/living/proc/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src || anchored || !isturf(user.loc))
+	if(user == anchored || !isturf(user.loc))
 		return FALSE
+
+	if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
+		if(ismob(user.pulling))
+			var/mob/P = user.pulling
+			user.vore_attack(user, P, src) // User, Pulled, Predator target (which can be user, pulling, or src)
+			return
+
+	if(user == src) //we want to be able to self click if we're voracious
+		return FALSE
+
 	if(!user.pulling || user.pulling != src)
 		user.start_pulling(src, supress_message)
 		return
@@ -163,6 +173,8 @@
 				return 0
 			if(!user.pulling || user.pulling != src || user.grab_state != old_grab_state || user.a_intent != INTENT_GRAB)
 				return 0
+			if(user.voremode && user.grab_state == GRAB_AGGRESSIVE)
+				return 0
 		user.grab_state++
 		switch(user.grab_state)
 			if(GRAB_AGGRESSIVE)

code/modules/mob/living/login.dm

@@ -22,4 +22,6 @@
 		to_chat(src, "<span class='notice'>You can ventcrawl! Use alt+click on vents to quickly travel about the station.</span>")
 
 	if(ranged_ability)
-		ranged_ability.add_ranged_ability(src, "<span class='notice'>You currently have <b>[ranged_ability]</b> active!</span>")
+		ranged_ability.add_ranged_ability(src, "<span class='notice'>You currently have <b>[ranged_ability]</b> active!</span>")
+	if(vore_init && !vorepref_init) //Vore's been initialized, voreprefs haven't. If this triggers then that means that voreprefs failed to load due to the client being missing.
+		apply_vore_prefs()

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -63,6 +63,9 @@
 	..()
 
 /mob/living/simple_animal/mouse/handle_automated_action()
+	if(isbelly(loc))
+		return
+
 	if(prob(chew_probability))
 		var/turf/open/floor/F = get_turf(src)
 		if(istype(F) && !F.intact)

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

@@ -100,7 +100,7 @@
 	if(!target || !isturf(target.loc) || !isturf(loc) || stat == DEAD)
 		return
 	var/target_dir = get_dir(src,target)
-	
+
 	var/static/list/cardinal_sidestep_directions = list(-90,-45,0,45,90)
 	var/static/list/diagonal_sidestep_directions = list(-45,0,45)
 	var/chosen_dir = 0
@@ -202,6 +202,8 @@
 
 	if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
 		return FALSE
+	if(isbelly(the_target.loc)) //Target's inside a gut, forget about it too
+		return FALSE
 	if(search_objects < 2)
 		if(isliving(the_target))
 			var/mob/living/L = the_target
@@ -301,7 +303,7 @@
 		if(target)
 			if(targets_from && isturf(targets_from.loc) && target.Adjacent(targets_from)) //If they're next to us, attack
 				MeleeAction()
-			else 
+			else
 				if(rapid_melee > 1 && target_distance <= melee_queue_distance)
 					MeleeAction(FALSE)
 				in_melee = FALSE //If we're just preparing to strike do not enter sidestep mode

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

@@ -83,18 +83,12 @@
 		if(L.stat != DEAD)
 			if(!client && ranged && ranged_cooldown <= world.time)
 				OpenFire()
-
-		else if(L.stat >= SOFT_CRIT)
-			if(vore_active == TRUE && L.devourable == TRUE)
-				if(isliving(target) && !target.Adjacent(targets_from))
-					return
-				else
+			if(L.Adjacent(src) && (L.stat != CONSCIOUS))
+				if(vore_active && L.devourable == TRUE)
 					dragon_feeding(src,L)
-					if(L.loc == src.contents)
-						LoseTarget()
-						return 0
-			else
-				devour(L)
+					LoseTarget()
+		else
+			devour(L)
 
 /mob/living/simple_animal/hostile/megafauna/proc/devour(mob/living/L)
 	if(!L)

code/modules/mob/living/status_procs.dm

@@ -284,5 +284,5 @@
 		emote("deathgasp")
 	add_trait(TRAIT_FAKEDEATH, source)
 	add_trait(TRAIT_DEATHCOMA, source)
-	tod = station_time_timestamp()
+	tod = STATION_TIME_TIMESTAMP("hh:mm:ss")
 	update_stat()