fixed some stuff

Author: SapphicOverload

code/datums/components/bloodysoles.dm

@@ -1,4 +1,5 @@
-
+#define FOOTPRINT_INDEX_FILE 1
+#define FOOTPRINT_INDEX_STATE 2
 
 //Component for clothing items that can pick up blood from decals and spread it around everywhere when walking, such as shoes or suits with integrated shoes.
 
@@ -253,20 +254,19 @@ Like its parent but can be applied to carbon mobs instead of clothing items
 
 /datum/component/bloodysoles/feet/add_parent_to_footprint(obj/effect/decal/cleanable/blood/footprints/FP)
 	if(ismonkey(wielder))
-		FP.species_types |= "monkey"
+		FP.species_types["monkey"] = list(null, FALSE)
 		return
 
 	if(!ishuman(wielder))
-		FP.species_types |= "unknown"
+		FP.species_types["unknown"] = list(null, FALSE)
 		return
 
-	// Find any leg of our human and add that to the footprint, instead of the default which is to just add the human type
-	for(var/X in wielder.bodyparts)
-		var/obj/item/bodypart/affecting = X
-		if(affecting.body_part == LEG_RIGHT || affecting.body_part == LEG_LEFT)
-			if(!affecting.bodypart_disabled)
-				FP.species_types |= affecting.limb_id
-				break
+	// Our limbs code is horribly out of date and won't work the normal way, so we do it like this
+	for(var/obj/item/bodypart/affecting as anything in wielder.bodyparts)
+		if((affecting.body_part & (LEG_LEFT|LEG_RIGHT)) && !affecting.bodypart_disabled)
+			var/image/limb_icon = affecting.get_limb_icon(FALSE)[1]
+			FP.species_types[affecting.species_id] = list(limb_icon.icon, limb_icon.icon_state)
+			break
 
 
 /datum/component/bloodysoles/feet/is_obscured()

code/game/machinery/computer/dna_console.dm

@@ -495,7 +495,7 @@
 			if((newgene == "J") && (jokerready < world.time))
 				var/truegenes = GET_SEQUENCE(path)
 				newgene = truegenes[genepos]
-				jokerready = world.time + JOKER_TIMEOUT - (JOKER_UPGRADE * (connected_scanner.precision_coeff + user.get_skill(SKILL_SCIENCE) - 1))
+				jokerready = world.time + JOKER_TIMEOUT - (JOKER_UPGRADE * (connected_scanner.precision_coeff + (user.get_skill(SKILL_SCIENCE) / 2) - 1))
 
 			// If the gene is an X, we want to update the default genes with the new
 			//  X to allow highlighting logic to work on the tgui interface.

code/game/mecha/equipment/mecha_equipment.dm

@@ -248,8 +248,8 @@
 	return 0
 
 // Is the occupant wearing a pilot suit?
-/obj/item/mecha_parts/mecha_equipment/proc/check_eva()
-	return chassis?.check_eva()
+/obj/item/mecha_parts/mecha_equipment/proc/check_eva(mob/pilot)
+	return chassis?.check_eva(pilot)
 
 // Some equipment can be used as tools
 /obj/item/mecha_parts/mecha_equipment/tool_use_check(mob/living/user, amount)

code/game/mecha/mecha.dm

@@ -374,7 +374,7 @@
 				. += span_danger("The capacitor did well in preventing too much damage. Repair will be manageable.")
 			if(4)
 				. += span_danger("The capacitor did such a good job in preserving the chassis that you could almost call it functional. But it isn't. Repair should be easy though.")
-		if(repair_hint && capacitor?.rating)
+		if(repair_hint && (capacitor?.rating || user.skill_check(SKILL_TECHNICAL, EXP_GENIUS) || user.skill_check(SKILL_MECHANICAL, EXP_GENIUS)))
 			. += repair_hint
 
 //Armor tag
@@ -1038,7 +1038,7 @@
 
 	visible_message("[user] starts to climb into [name].")
 
-	if(do_after(user, round(enter_delay * (check_eva()**2)), src, skill_check = null))
+	if(do_after(user, round(enter_delay * (check_eva(user)**2)), src, skill_check = null))
 		if(atom_integrity <= 0)
 			to_chat(user, span_warning("You cannot get in the [name], it has been destroyed!"))
 		else if(occupant)
@@ -1157,7 +1157,7 @@
 /obj/mecha/container_resist(mob/living/user)
 	is_currently_ejecting = TRUE
 	to_chat(occupant, "<span class='notice'>You begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.<span>")
-	if(do_after(occupant, exit_delay, src))
+	if(do_after(occupant, round(exit_delay * (check_eva(user)**2)), src))
 		to_chat(occupant, "<span class='notice'>You exit the mech.<span>")
 		go_out()
 	else
@@ -1373,8 +1373,10 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
 			return
 
 // Check the pilot for mech piloting skill
-/obj/mecha/proc/check_eva()
-	var/effective_skill = occupant.get_skill(SKILL_TECHNICAL)
-	if(effective_skill < EXP_MASTER && HAS_TRAIT(occupant, TRAIT_SKILLED_PILOT))
+/obj/mecha/proc/check_eva(mob/pilot)
+	if(!pilot)
+		pilot = occupant
+	var/effective_skill = pilot.get_skill(SKILL_TECHNICAL)
+	if(effective_skill < EXP_MASTER && HAS_TRAIT(pilot, TRAIT_SKILLED_PILOT))
 		effective_skill += EXP_LOW // mech pilot suit adds extra pilot skill, up to EXP_MASTER
 	return (12 - effective_skill) / 10

code/game/objects/effects/decals/cleanable/humans.dm

@@ -284,22 +284,22 @@
 
 /obj/effect/decal/cleanable/blood/footprints/examine(mob/user)
 	. = ..()
-	if((shoe_types.len + species_types.len) > 0)
+	if((species_types.len ||shoe_types.len) && user.skill_check(SKILL_PHYSIOLOGY, EXP_MID))
 		. += "You recognise the [name] as belonging to:"
 		for(var/sole in shoe_types)
 			var/obj/item/clothing/item = sole
 			var/article = initial(item.gender) == PLURAL ? "Some" : "A"
 			. += "[icon2html(initial(item.icon), user, initial(item.icon_state))] [article] <B>[initial(item.name)]</B>."
 		for(var/species in species_types)
 			// god help me
-			if(species == "unknown")
+			if(!species || species == "unknown")
 				. += "Some <B>feet</B>."
 			else if(species == "monkey")
 				. += "[icon2html('icons/mob/monkey.dmi', user, "monkey1")] Some <B>monkey paws</B>."
 			else if(species == SPECIES_HUMAN)
 				. += "[icon2html('icons/mob/human_parts.dmi', user, "default_human_l_leg")] Some <B>human feet</B>."
 			else
-				. += "[icon2html('icons/mob/human_parts.dmi', user, "[species]_l_leg")] Some <B>[species] feet</B>."
+				. += "[icon2html(species_types[species][FOOTPRINT_INDEX_FILE], user, species_types[species][FOOTPRINT_INDEX_STATE])] Some <B>[species] feet</B>."
 
 /obj/effect/decal/cleanable/blood/footprints/replace_decal(obj/effect/decal/cleanable/blood/blood_decal)
 	if(blood_state != blood_decal.blood_state || footprint_sprite != blood_decal.footprint_sprite) //We only replace footprints of the same type as us

code/modules/hydroponics/seeds.dm

@@ -1,7 +1,3 @@
-/// Randomized plant stat with a set amount of inaccuracy
-#define RANDOMIZE_PLANT_STAT(plant_stat, inaccuracy) ((inaccuracy && plant_stat >= round(1 / inaccuracy, 1)) ? \
-	("[plant_stat + rand(inaccuracy)*plant_stat - inaccuracy]-[plant_stat + rand(inaccuracy)*plant_stat]") : plant_stat)
-
 // ********************************************************
 // Here's all the seeds (plants) that can be used in hydro
 // ********************************************************
@@ -304,18 +300,18 @@
 		if(get_gene(/datum/plant_gene/trait/plant_type/alien_properties))
 			text += "- Plant type: [span_warning("UNKNOWN")] \n"
 	if(!check_skills || user.skill_check(SKILL_SCIENCE, EXP_HIGH))
-		var/inaccuracy = check_skills ? (EXP_GENIUS - user.get_skill(SKILL_SCIENCE)) / (EXP_GENIUS * 4) : 0
+		var/inaccuracy = check_skills ? (EXP_GENIUS - user.get_skill(SKILL_SCIENCE)) / (EXP_GENIUS * 2) : 0
 		if(potency != -1)
-			text += "- Potency: [RANDOMIZE_PLANT_STAT(potency, inaccuracy)]\n"
+			text += "- Potency: [randomize_plant_stat(potency, inaccuracy * 100, 0)]\n"
 		if(yield != -1)
-			text += "- Yield: [RANDOMIZE_PLANT_STAT(yield, inaccuracy)]\n"
-		text += "- Maturation speed: [RANDOMIZE_PLANT_STAT(maturation, inaccuracy)]\n"
+			text += "- Yield: [randomize_plant_stat(yield, inaccuracy * 10, 2)]\n"
+		text += "- Maturation speed: [randomize_plant_stat(maturation, inaccuracy * 10, 4)]\n"
 		if(yield != -1)
-			text += "- Production speed: [RANDOMIZE_PLANT_STAT(production, inaccuracy)]\n"
-		text += "- Endurance: [RANDOMIZE_PLANT_STAT(endurance, inaccuracy)]\n"
-		text += "- Lifespan: [RANDOMIZE_PLANT_STAT(lifespan, inaccuracy)]\n"
-		text += "- Weed Growth Rate: [RANDOMIZE_PLANT_STAT(weed_rate, inaccuracy)]\n"
-		text += "- Weed Vulnerability: [RANDOMIZE_PLANT_STAT(weed_chance, inaccuracy)]\n"
+			text += "- Production speed: [randomize_plant_stat(production, inaccuracy * 10, 6)]\n"
+		text += "- Endurance: [randomize_plant_stat(endurance, inaccuracy * 100, 8)]\n"
+		text += "- Lifespan: [randomize_plant_stat(lifespan, inaccuracy * 100, 10)]\n"
+		text += "- Weed Growth Rate: [randomize_plant_stat(weed_rate, inaccuracy * 10, 12)]\n"
+		text += "- Weed Vulnerability: [randomize_plant_stat(weed_chance, inaccuracy * 10, 14)]\n"
 		if(rarity)
 			text += "- Species Discovery Value: [rarity]\n"
 	if(!check_skills || user.skill_check(SKILL_SCIENCE, EXP_MID))
@@ -330,6 +326,18 @@
 
 	return text
 
+/// Randomizes and displays a plant stat.
+/obj/item/seeds/proc/randomize_plant_stat(plant_stat, inaccuracy = 0, hash_offset = 0)
+	if(!inaccuracy)
+		return plant_stat
+	hash_offset += 1 + (GLOB.round_id % 16)
+	var/raw_hash = copytext(md5("[potency]/[yield]/[maturation]/[production]/[endurance]/[lifespan]/[weed_rate]/[weed_chance]/[inaccuracy]/[REF(src)]"), \
+		hash_offset, hash_offset + 2)
+	var/random_offset = round(inaccuracy * hex2num(raw_hash) / 255)
+	if(plant_stat + random_offset - inaccuracy < 0) // keep it in bounds
+		random_offset += -(plant_stat + random_offset - inaccuracy)
+	return "[plant_stat + random_offset - inaccuracy]-[plant_stat + random_offset + inaccuracy]"
+
 /obj/item/seeds/proc/on_chem_reaction(datum/reagents/S)  //in case seeds have some special interaction with special chems
 	return
 

code/modules/jobs/job_types/detective.dm

@@ -27,10 +27,10 @@
 	minimal_character_age = 22 //Understanding of forensics, crime analysis, and theory. Less of a grunt officer and more of an intellectual, theoretically, despite how this is never reflected in-game
 
 	base_skills = list(
-		SKILL_PHYSIOLOGY = EXP_NONE,
+		SKILL_PHYSIOLOGY = EXP_MID,
 		SKILL_MECHANICAL = EXP_NONE,
 		SKILL_TECHNICAL = EXP_NONE,
-		SKILL_SCIENCE = EXP_MID,
+		SKILL_SCIENCE = EXP_NONE,
 		SKILL_FITNESS = EXP_MID,
 	)
 	skill_points = 2

code/modules/jobs/job_types/scientist.dm

@@ -28,7 +28,7 @@
 		SKILL_PHYSIOLOGY = EXP_NONE,
 		SKILL_MECHANICAL = EXP_NONE,
 		SKILL_TECHNICAL = EXP_NONE,
-		SKILL_SCIENCE = EXP_MID,
+		SKILL_SCIENCE = EXP_HIGH,
 		SKILL_FITNESS = EXP_NONE,
 	)
 	skill_points = 3

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

@@ -361,7 +361,7 @@
 
 	if(!appears_dead)
 		if(src != user)
-			if(HAS_TRAIT(user, TRAIT_EMPATH))
+			if(HAS_TRAIT(user, TRAIT_EMPATH) || user.skill_check(SKILL_PHYSIOLOGY, EXP_MID))
 				if (combat_mode)
 					msg += "[t_He] seem[p_s()] to be on guard.\n"
 				if (getOxyLoss() >= 10)