Merge branch 'master' into various-fixes

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

@@ -8,6 +8,7 @@
 	var/t_is = p_are()
 	var/obscure_name
 	var/dispSize = round(12*size_multiplier) // gets the character's sprite size percent and converts it to the nearest half foot
+	var/output = ""
 
 	if(isliving(user))
 		var/mob/living/L = user
@@ -23,11 +24,16 @@
 	if (vassDesc != "")
 		. += vassDesc
 
+	output = "<center>"
 	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
+		if(gender)
+			output += "[icon2html('hyperstation/icons/chat/gender.dmi', world, gender)]"
+
+		output += "<b>[src.name]</b>"
 		var/datum/species/pref_species = H.dna.species
 		if(get_visible_name() == "Unknown") // same as flavor text, but hey it works.
 			. += "You can't make out what species they are."
@@ -35,6 +41,8 @@
 			. += "You can't make out what species they are."
 		else
 			. += "[t_He] [t_is] a [H.dna.custom_species ? H.dna.custom_species : pref_species.name]!"
+			output += "([H.dna.custom_species ? H.dna.custom_species : pref_species.name])"
+	output += "</center>"
 
 	//uniform
 	if(w_uniform && !(SLOT_W_UNIFORM in obscured))
@@ -408,16 +416,30 @@
 	else if(isobserver(user) && traitstring)
 		. += "<span class='info'><b>Traits:</b> [traitstring]</span>"
 
+
 	if(print_flavor_text())
+		output += "<br><b>General</b>"
 		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.
 			. += "...?"
+			output += "<br>...?"
 		else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either.
 			. += "...?"
+			output += "<br>...?"
 		else
 			. += "[print_flavor_text()]"
+			output += "<br>[url_encode(flavor_text)]"
+			if(ooc_text)
+				output += "<br><br><i><b>OOC</b>"
+				output += "<br>[url_encode(ooc_text)]"
+
 	SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, msg)
 	. += "*---------*</span>"
 
+	//stat panel
+	if(ishuman(src))
+		user.client << output(output, "statbrowser:update_examine") //open the examine window
+		user.client << output(null, "statbrowser:create_mobexamine") //open the examine window
+
 /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects!
 	var/list/dat = list()
 	if(!pronoun_replacement)

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

@@ -29,9 +29,6 @@
 
 	. = ..()
 
-	if(CONFIG_GET(flag/disable_stambuffer))
-		togglesprint()
-
 	AddComponent(/datum/component/redirect, list(COMSIG_COMPONENT_CLEAN_ACT = CALLBACK(src, /mob/living/carbon/human/clean_blood)))
 
 

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

@@ -24,6 +24,9 @@
 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
 	var/lip_color = "white"
 
+	var/nail_style = null
+	var/nail_color = "white"
+
 	var/age = 30		//Player's age
 
 	var/underwear = "Nude"	//Which underwear the player wants
@@ -70,3 +73,4 @@
 	var/last_fire_update
 	var/account_id
 	can_be_held = "micro"
+	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE

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

@@ -81,7 +81,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/fixed_mut_color2 = ""
 	var/fixed_mut_color3 = ""
 	var/whitelisted = 0 		//Is this species restricted to certain players?
-	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666", "SeeALiggerPullTheTrigger") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
+	var/whitelist = list() 		//List the ckeys that can use this species, if it's whitelisted.: list("John Doe", "poopface666") Spaces & capitalization can be included or ignored entirely for each key as it checks for both.
 
 	var/icon_limbs //Overrides the icon used for the limbs of this species. Mainly for downstream, and also because hardcoded icons disgust me. Implemented and maintained as a favor in return for a downstream's implementation of synths.
 
@@ -550,6 +550,12 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						MA.color = "#[H.socks_color]"
 					standing += MA
 
+		// nail paint (hyper)
+		if(H.nail_style)
+			var/mutable_appearance/nail_overlay = mutable_appearance('hyperstation/icons/mobs/nails.dmi', "nails", -HANDS_PART_LAYER)
+			nail_overlay.color = H.nail_color
+			standing += nail_overlay
+
 	if(standing.len)
 		H.overlays_standing[BODY_LAYER] = standing
 

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

@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 /mob/living/carbon/handle_status_effects()
 	..()
 	if(getStaminaLoss() && !combatmode)//CIT CHANGE - prevents stamina regen while combat mode is active
-		adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5)//CIT CHANGE - decreases adjuststaminaloss to stop stamina damage from being such a joke
+		adjustStaminaLoss(resting ? (recoveringstam ? -7.5 : -3) : -1.5)
 
 	if(!recoveringstam && incomingstammult != 1)
 		incomingstammult = max(0.01, incomingstammult)

code/modules/mob/living/living_defense.dm

@@ -105,7 +105,7 @@
 	return
 
 /mob/living/proc/can_embed(obj/item/I)
-	return FALSE	
+	return FALSE
 
 /mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
 	var/obj/item/I
@@ -126,22 +126,10 @@
 			return TRUE
 		var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
 		var/dtype = BRUTE
-		var/volume = I.get_volume_by_throwforce_and_or_w_class()
+
 		SEND_SIGNAL(I, COMSIG_MOVABLE_IMPACT_ZONE, src, zone)
 		dtype = I.damtype
 
-		if (I.throwforce > 0) //If the weapon's throwforce is greater than zero...
-			if (I.throwhitsound) //...and throwhitsound is defined...
-				playsound(loc, I.throwhitsound, volume, 1, -1) //...play the weapon's throwhitsound.
-			else if(I.hitsound) //Otherwise, if the weapon's hitsound is defined...
-				playsound(loc, I.hitsound, volume, 1, -1) //...play the weapon's hitsound.
-			else if(!I.throwhitsound) //Otherwise, if throwhitsound isn't defined...
-				playsound(loc, 'sound/weapons/genhit.ogg',volume, 1, -1) //...play genhit.ogg.
-
-		else if(!I.throwhitsound && I.throwforce > 0) //Otherwise, if the item doesn't have a throwhitsound and has a throwforce greater than zero...
-			playsound(loc, 'sound/weapons/genhit.ogg', volume, 1, -1)//...play genhit.ogg
-		if(!I.throwforce)// Otherwise, if the item's throwforce is 0...
-			playsound(loc, 'sound/weapons/throwtap.ogg', 1, volume, -1)//...play throwtap.ogg.
 		if(!blocked)
 			visible_message("<span class='danger'>[src] has been hit by [I].</span>", \
 							"<span class='userdanger'>[src] has been hit by [I].</span>")
@@ -397,7 +385,7 @@
 		if (INTENT_GRAB)
 			grabbedby(M)
 			return FALSE
-		if(INTENT_HARM)	
+		if(INTENT_HARM)
 			if(HAS_TRAIT(M, TRAIT_PACIFISM))
 				to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
 				return FALSE

code/modules/mob/living/say.dm

@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if (client?.prefs.chat_on_map && stat != UNCONSCIOUS && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear())
 		create_chat_message(speaker, message_language, raw_message, spans, message_mode)
 	if (client?.prefs.radiosounds && stat != UNCONSCIOUS && can_hear() && radio_freq)
-		playsound_local(src,'sound/voice/radio.ogg', 30, 1)
+		playsound_local(src,'sound/voice/radio.ogg', 30, 0)
 
 	// Recompose message for AI hrefs, language incomprehension.
 	message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode, FALSE, source)

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

@@ -85,7 +85,7 @@
 	ranged = 1
 	retreat_distance = 5
 	minimum_distance = 5
-	move_to_delay = 4
+	move_to_delay = 7
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 4,
 							/obj/item/stack/sheet/animalhide/xeno = 1)
 	projectiletype = /obj/item/projectile/neurotox
@@ -133,7 +133,7 @@
 	icon_living = "alienq"
 	icon_dead = "alienq_dead"
 	bubble_icon = "alienroyal"
-	move_to_delay = 4
+	move_to_delay = 7
 	maxHealth = 400
 	health = 400
 	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 10,

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

@@ -30,7 +30,7 @@
 	health = 10
 	spacewalk = TRUE
 	faction = list("hostile")
-	move_to_delay = 0
+	move_to_delay = 1
 	obj_damage = 0
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	mouse_opacity = MOUSE_OPACITY_OPAQUE

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

@@ -87,7 +87,7 @@
 	melee_damage_lower += rand(4, 10)
 	melee_damage_upper += rand(10,20)
 	maxHealth += rand(40,60)
-	move_to_delay = rand(3,7)
+	move_to_delay = rand(5,8)
 
 /mob/living/simple_animal/hostile/carp/cayenne
 	name = "Cayenne"

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

@@ -40,7 +40,7 @@
 	faction = list("spiders")
 	var/busy = SPIDER_IDLE
 	pass_flags = PASSTABLE
-	move_to_delay = 6
+	move_to_delay = 7
 	ventcrawler = VENTCRAWLER_ALWAYS
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'
@@ -140,7 +140,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 20
 	poison_per_bite = 5
-	move_to_delay = 5
+	move_to_delay = 7
 
 //vipers are the rare variant of the hunter, no IMMEDIATE damage but so much poison medical care will be needed fast.
 /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper
@@ -154,7 +154,7 @@
 	melee_damage_lower = 1
 	melee_damage_upper = 1
 	poison_per_bite = 12
-	move_to_delay = 4
+	move_to_delay = 5
 	poison_type = /datum/reagent/toxin/venom //all in venom, glass cannon. you bite 5 times and they are DEFINITELY dead, but 40 health and you are extremely obvious. Ambush, maybe?
 	speed = 1
 	gold_core_spawnable = NO_SPAWN
@@ -171,7 +171,7 @@
 	melee_damage_lower = 35
 	melee_damage_upper = 40
 	poison_per_bite = 0
-	move_to_delay = 8
+	move_to_delay = 10
 	speed = 7
 	status_flags = NONE
 	mob_size = MOB_SIZE_LARGE

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

@@ -17,7 +17,7 @@
 	var/projectiletype	//set ONLY it and NULLIFY casingtype var, if we have ONLY projectile
 	var/projectilesound
 	var/casingtype		//set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING
-	var/move_to_delay = 3 //delay for the automated movement.
+	var/move_to_delay = 5 //delay for the automated movement.
 	var/list/friends = list()
 	var/list/emote_taunt = list()
 	var/taunt_chance = 0

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

@@ -33,7 +33,7 @@ Difficulty: Medium
 	movement_type = GROUND
 	speak_emote = list("roars")
 	speed = 1
-	move_to_delay = 2
+	move_to_delay = 4
 	projectiletype = /obj/item/projectile/kinetic/miner
 	projectilesound = 'sound/weapons/kenetic_accel.ogg'
 	ranged = 1

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

@@ -40,7 +40,7 @@ Difficulty: Hard
 	melee_damage_lower = 40
 	melee_damage_upper = 40
 	speed = 1
-	move_to_delay = 10
+	move_to_delay = 15
 	ranged_cooldown_time = 10
 	ranged = 1
 	pixel_x = -32

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

@@ -38,7 +38,7 @@ Difficulty: Very Hard
 	melee_damage_lower = 40
 	melee_damage_upper = 40
 	speed = 1
-	move_to_delay = 10
+	move_to_delay = 14
 	ranged = 1
 	pixel_x = -32
 	del_on_death = 1
@@ -64,7 +64,7 @@ Difficulty: Very Hard
 		ranged_cooldown = world.time + 30
 		telegraph()
 		dir_shots(GLOB.alldirs)
-		move_to_delay = 3
+		move_to_delay = 5
 		return
 	else
 		move_to_delay = initial(move_to_delay)

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

@@ -48,7 +48,7 @@ Difficulty: Medium
 	melee_damage_lower = 40
 	melee_damage_upper = 40
 	speed = 1
-	move_to_delay = 5
+	move_to_delay = 8
 	ranged = 1
 	pixel_x = -16
 	crusher_loot = list(/obj/structure/closet/crate/necropolis/dragon/crusher)
@@ -138,7 +138,7 @@ Difficulty: Medium
 /mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir)
 	var/list/hit_things = list(src)
 	var/turf/E = get_edge_target_turf(src, dir)
-	var/range = 10
+	var/range = 8
 	var/turf/previousturf = get_turf(src)
 	for(var/turf/J in getline(src,E))
 		if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])))

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

@@ -52,7 +52,7 @@ Difficulty: Normal
 	melee_damage_upper = 20
 	blood_volume = 0
 	speed = 1
-	move_to_delay = 11
+	move_to_delay = 15
 	ranged = 1
 	ranged_cooldown_time = 40
 	aggro_vision_range = 21 //so it can see to one side of the arena to the other
@@ -66,9 +66,9 @@ Difficulty: Normal
 
 	var/burst_range = 3 //range on burst aoe
 	var/beam_range = 5 //range on cross blast beams
-	var/chaser_speed = 2 //how fast chasers are currently
+	var/chaser_speed = 1 //how fast chasers are currently
 	var/chaser_cooldown = 50 //base cooldown/cooldown var between spawning chasers
-	var/major_attack_cooldown = 40 //base cooldown for major attacks
+	var/major_attack_cooldown = 60 //base cooldown for major attacks
 	var/arena_cooldown = 200 //base cooldown/cooldown var for creating an arena
 	var/blinking = FALSE //if we're doing something that requires us to stand still and not attack
 	var/obj/effect/hierophant/spawned_beacon //the beacon we teleport back to

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

@@ -32,7 +32,7 @@ Difficulty: Medium
 	melee_damage_lower = 25
 	melee_damage_upper = 25
 	speed = 1
-	move_to_delay = 2
+	move_to_delay = 4
 	ranged = 1
 	del_on_death = 1
 	retreat_distance = 5
@@ -88,7 +88,7 @@ Difficulty: Medium
 			retreat_distance = 0
 			minimum_distance = 0
 			speed = 0
-			move_to_delay = 1
+			move_to_delay = 2
 			charging = 1
 			addtimer(CALLBACK(src, .proc/reset_charge), 50)
 
@@ -97,7 +97,7 @@ Difficulty: Medium
 	retreat_distance = 5
 	minimum_distance = 5
 	speed = 1
-	move_to_delay = 2
+	move_to_delay = 4
 	charging = 0
 
 /mob/living/simple_animal/hostile/megafauna/legion/death()

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

@@ -7,7 +7,7 @@
 	icon_aggro = "curseblob"
 	mob_biotypes = MOB_SPIRIT
 	movement_type = FLYING
-	move_to_delay = 5
+	move_to_delay = 7
 	vision_range = 20
 	aggro_vision_range = 20
 	maxHealth = 40 //easy to kill, but oh, will you be seeing a lot of them.

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

@@ -11,7 +11,7 @@
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	vision_range = 2
 	aggro_vision_range = 9
-	move_to_delay = 5
+	move_to_delay = 7
 	friendly = "harmlessly rolls into"
 	maxHealth = 45
 	health = 45

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

@@ -65,7 +65,7 @@
 	icon_dead = "Hivelordbrood"
 	icon_gib = "syndicate_gib"
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
-	move_to_delay = 1
+	move_to_delay = 3
 	friendly = "buzzes near"
 	vision_range = 10
 	speed = 3

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

@@ -10,7 +10,7 @@
 	icon_gib = "syndicate_gib"
 	mob_biotypes = MOB_ORGANIC|MOB_BEAST
 	mouse_opacity = MOUSE_OPACITY_ICON
-	move_to_delay = 5
+	move_to_delay = 8
 	friendly = "floats near"
 	speak_emote = list("puffs")
 	vision_range = 5
@@ -88,7 +88,7 @@
 	F.throw_message = "is absorbed by the girth of the"
 	F.retreat_distance = null
 	F.minimum_distance = 1
-	F.move_to_delay = 6
+	F.move_to_delay = 8
 	F.environment_smash = ENVIRONMENT_SMASH_WALLS
 	F.mob_size = MOB_SIZE_LARGE
 	F.speed = 1
@@ -106,7 +106,7 @@
 		throw_message = "is avoided by the"
 		retreat_distance = 9
 		minimum_distance = 9
-		move_to_delay = 2
+		move_to_delay = 3
 		inflate_cooldown = 4
 		environment_smash = ENVIRONMENT_SMASH_NONE
 		mob_size = MOB_SIZE_SMALL

code/modules/mob/mob_defines.dm

@@ -130,6 +130,7 @@
 	var/updating_glide_size = TRUE
 
 	var/flavor_text = ""
+	var/ooc_text = ""
 	var/flavor_text_2 = "" //version of the above that only lasts for the current round.
 
 	///////TYPING INDICATORS///////
@@ -141,3 +142,5 @@
 	var/typing_indicator_timerid
 	/// Current state of our typing indicator. Used for cut overlay, DO NOT RUNTIME ASSIGN OTHER THAN FROM SHOW/CLEAR. Used to absolutely ensure we do not get stuck overlays.
 	var/mutable_appearance/typing_indicator_current
+
+	vis_flags = VIS_INHERIT_PLANE //when this be added to vis_contents of something it inherit something.plane, important for visualisation of mob in openspace.

code/modules/mob/mob_movement.dm

@@ -108,7 +108,7 @@
 	. = ..()
 
 	if((direct & (direct - 1)) && mob.loc == n) //moved diagonally successfully
-		add_delay *= 2
+		add_delay *= 1.66
 	move_delay += add_delay
 	mob.set_glide_size(DELAY_TO_GLIDE_SIZE(add_delay))
 	if(.) // If mob is null here, we deserve the runtime

code/modules/mob/say_vr.dm

@@ -6,7 +6,7 @@
 	set src in usr
 	if(usr != src)
 		to_chat(usr, "No.")
-	var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", html_decode(flavor_text), MAX_MESSAGE_LEN, TRUE)
+	var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. IC only!", "Flavor Text", html_decode(flavor_text), MAX_MESSAGE_LEN, TRUE)
 
 	if(msg)
 		flavor_text = html_encode(msg)