minor refactor + rebalance

Author: SapphicOverload

code/__HELPERS/mobs.dm

@@ -345,7 +345,7 @@ GLOBAL_LIST_EMPTY(species_list)
 	if(!(timed_action_flags & IGNORE_SLOWDOWNS))
 		delay *= user.action_speed_modifier * user.do_after_coefficent() //yogs: darkspawn
 
-	if(skill_check && user.mind)
+	if(skill_check && user.mind && !(timed_action_flags & IGNORE_SKILL_DELAY))
 		delay *= (12 - user.get_skill(skill_check)) / 10
 
 	var/datum/progressbar/progbar

code/_onclick/hud/screen_objects.dm

@@ -152,7 +152,7 @@
 	data["skills"] = skill_data
 	data["skill_points"] = user.mind.skill_points
 	data["allocated_points"] = allocated_points
-	data["exceptional_skill"] = HAS_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
+	data["exceptional_skill"] = HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
 	return data
 
 /atom/movable/screen/skill_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -190,7 +190,7 @@
 				return TRUE
 			if(allocated_points + params["amount"] < 0)
 				return TRUE
-			if(allocated_skills[params["skill"]] + params["amount"] + user.get_skill(params["skill"]) > (4 + HAS_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)))
+			if(allocated_skills[params["skill"]] + params["amount"] + user.get_skill(params["skill"]) > (4 + HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)))
 				return TRUE
 			if(allocated_skills[params["skill"]] + params["amount"] < 0)
 				return TRUE

code/datums/components/crafting/crafting.dm

@@ -169,9 +169,10 @@
 	if(!check_skills(a, R))
 		return ", inadequate skills."
 	var/timer = R.time
+	var/mob/user_mob
 	if(ismob(a))
-		var/mob/mob = a
-		timer *= (10 - (mob.get_skill(SKILL_MECHANICAL) + HAS_TRAIT(mob, TRAIT_CRAFTY)*2)) / 10
+		user_mob = a
+		timer *= (10 - (user_mob.get_skill(SKILL_MECHANICAL) + HAS_TRAIT(user_mob, TRAIT_CRAFTY)*2)) / 10
 	if(!do_after(a, timer, a, IGNORE_SKILL_DELAY, skill_check = SKILL_MECHANICAL))
 		return "."
 	contents = get_surroundings(a, R.blacklist) // Double checking since items could no longer be there after the do_after().
@@ -182,6 +183,9 @@
 	var/list/parts = del_reqs(R, a)
 	var/atom/movable/I = new R.result(get_turf(a.loc))
 	I.CheckParts(parts, R)
+	if(user_mob && R.skill_requirements.len)
+		for(var/skill in R.skill_requirements)
+			user_mob.add_exp(skill, R.skill_requirements[skill] * 10)
 	if(send_feedback)
 		SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)
 	return I

code/datums/mind.dm

@@ -290,7 +290,7 @@
 		return
 
 	traitor_mob.add_skill_points(EXP_LOW) // one extra skill point
-	ADD_TRAIT(traitor_mob, TRAIT_EXCEPTIONAL_SKILL, type)
+	ADD_TRAIT(src, TRAIT_EXCEPTIONAL_SKILL, type)
 
 	var/list/all_contents = traitor_mob.get_all_contents()
 	var/obj/item/modular_computer/PDA = locate() in all_contents

code/modules/antagonists/brother/brother.dm

@@ -35,7 +35,7 @@
 	qdel(W)
 
 	brother.add_skill_points(EXP_HIGH) // extra skills
-	ADD_TRAIT(brother, TRAIT_EXCEPTIONAL_SKILL, type)
+	ADD_TRAIT(owner, TRAIT_EXCEPTIONAL_SKILL, type)
 
 	if(istype(brother))
 		var/obj/item/storage/box/bloodbrother/T = new()

code/modules/antagonists/ert/ert.dm

@@ -262,7 +262,7 @@
 		return
 	H.equipOutfit(outfit)
 	H.add_skill_points(EXP_GENIUS) // 5 skill points to allocate, you can put it all into fitness or specialize as a medic or pilot
-	ADD_TRAIT(H, TRAIT_EXCEPTIONAL_SKILL, type) // allowed to allocate 5 points into a single skill
+	ADD_TRAIT(owner, TRAIT_EXCEPTIONAL_SKILL, type) // allowed to allocate 5 points into a single skill
 
 /datum/antagonist/ert/greet()
 	if(!ert_team)

code/modules/antagonists/nukeop/nukeop.dm

@@ -39,7 +39,7 @@
 
 	H.adjust_skill(SKILL_FITNESS, EXP_MID, max_skill = EXP_GENIUS) // base amount of fitness skill all operatives need to have
 	H.add_skill_points(EXP_GENIUS) // 5 skill points to allocate, you can put it all into fitness or specialize as a medic or pilot
-	ADD_TRAIT(H, TRAIT_EXCEPTIONAL_SKILL, ROLE_OPERATIVE) // allowed to allocate 5 points into a single skill
+	ADD_TRAIT(owner, TRAIT_EXCEPTIONAL_SKILL, ROLE_OPERATIVE) // allowed to allocate 5 points into a single skill
 	return TRUE
 
 /datum/antagonist/nukeop/greet()

code/modules/awaymissions/corpse.dm

@@ -216,8 +216,8 @@
 	for(var/skill in base_skills)
 		H.adjust_skill(skill, base_skills[skill])
 	H.add_skill_points(skill_points)
-	if(exceptional_skill)
-		ADD_TRAIT(H, TRAIT_EXCEPTIONAL_SKILL, assignedrole)
+	if(exceptional_skill && H.mind)
+		ADD_TRAIT(H.mind, TRAIT_EXCEPTIONAL_SKILL, assignedrole)
 	H.update_hair()
 	H.update_body()
 	if(outfit)

code/modules/jobs/job_types/bartender.dm

@@ -20,6 +20,15 @@
 	display_order = JOB_DISPLAY_ORDER_BARTENDER
 	minimal_character_age = 21 //I shouldn't have to explain this one
 
+	base_skills = list(
+		SKILL_PHYSIOLOGY = EXP_NONE,
+		SKILL_MECHANICAL = EXP_NONE,
+		SKILL_TECHNICAL = EXP_NONE,
+		SKILL_SCIENCE = EXP_NONE,
+		SKILL_FITNESS = EXP_MID,
+	)
+	skill_points = 2
+
 	departments_list = list(
 		/datum/job_department/service,
 	)

code/modules/jobs/job_types/botanist.dm

@@ -24,7 +24,7 @@
 		SKILL_MECHANICAL = EXP_NONE,
 		SKILL_TECHNICAL = EXP_NONE,
 		SKILL_SCIENCE = EXP_MID,
-		SKILL_FITNESS = EXP_LOW,
+		SKILL_FITNESS = EXP_NONE,
 	)
 	skill_points = 3