Macros, generic skill implementations.

code/datums/mind.dm

@@ -67,7 +67,7 @@
 	var/datum/skill_holder/skill_holder
 
 /datum/mind/New(var/key)
-	skill_holder = new
+	skill_holder = new(src)
 	src.key = key
 	soulOwner = src
 	martial_art = default_martial_art
@@ -80,6 +80,7 @@
 			if(antag_datum.delete_on_mind_deletion)
 				qdel(i)
 		antag_datums = null
+	QDEL_NULL(skill_holder)
 	return ..()
 
 /datum/mind/proc/get_language_holder()

code/datums/skills/_skill.dm

@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
+GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 
 /proc/init_skill_datums()
 	. = list()
@@ -10,12 +10,12 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 		.[S.type] = S
 
 /proc/sanitize_skill_value(path, value)
-	var/datum/skill/S = GET_SKILL_DATUM(path)
+	var/datum/skill/S = GLOB.skill_datums[path]
 	// don't check, if we runtime let it happen.
 	return S.sanitize_value(value)
 
 /proc/is_skill_value_greater(path, existing, new_value)
-	var/datum/skill/S = GET_SKILL_DATUM(path)
+	var/datum/skill/S = GLOB.skill_datums[path]
 	// don't check, if we runtime let it happen.
 	return S.is_value_greater(existing, new_value)
 
@@ -33,6 +33,10 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 	var/progression_type
 	/// Abstract type
 	var/abstract_type = /datum/skill
+	/// skill threshold used in generic skill modifiers calculations.
+	var/list/competency_thresholds = list(0, 0, 0)
+	/// Multiplier of the difference of the holder skill value and the selected threshold.
+	var/list/competency_mults = list(0, 0, 0)
 
 /**
   * Ensures what someone's setting as a value for this skill is valid.
@@ -44,7 +48,7 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
   * Sets the new value of this skill in the holder skills list.
   * As well as possible feedback messages or secondary effects on value change, that's on you.
   */
-/datum/skill/proc/set_skill(datum/skill_holder/H, value, mob/owner)
+/datum/skill/proc/set_skill_value(datum/skill_holder/H, value, mob/owner)
 	H.skills[type] = value
 
 /**
@@ -67,6 +71,8 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /datum/skill/binary
 	abstract_type = /datum/skill/binary
 	progression_type = SKILL_PROGRESSION_BINARY
+	competency_thresholds = list(FALSE, TRUE, TRUE)
+	competency_mults = list(0.5, 0.5, 0.5)
 
 /datum/skill/binary/sanitize_value(new_value)
 	return new_value? TRUE : FALSE
@@ -103,22 +109,23 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /**
   * Classing r p g styled skills, tiered by lvl, and current/nextlvl experience.
   */
-/datum/skill/experience
-	abstract_type = /datum/skill/experience
+/datum/skill/level
+	abstract_type = /datum/skill/level
+	progression_type = SKILL_PROGRESSION_LEVEL
 	var/standard_xp_lvl_up = STD_XP_LVL_UP //the standard required to level up. def: 100
 	var/xp_lvl_multiplier = STD_XP_LVL_UP //standard required level up exp multiplier. def: 2 (100, 200, 400, 800 etc.)
-	var/max_lvl = STD_MAX_LVL
+	var/max_levels = STD_MAX_LVL
 	var/level_up_method = STANDARD_LEVEL_UP //how levels are calculated.
 	var/list/levels = list() //level thresholds, if associative, these will be preceded by tiers such as "novice" or "trained"
 	var/associative = FALSE //See above.
 	var/unskilled_tier = "Unskilled" //Only relevant for associative experience levels
 
 //Builds the levels list.
-/datum/skill/experience/New()
+/datum/skill/level/New()
 	. = ..()
 	var/max_assoc = ""
 	var/max_assoc_start = 1
-	for(var/lvl in 1 to max_lvl)
+	for(var/lvl in 1 to max_levels)
 		var/value
 		switch(level_up_method)
 			if(STANDARD_LEVEL_UP)
@@ -143,41 +150,57 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 			levels["[max_assoc] +[max_assoc_start++]"] = value
 		levels[key] = value
 
+/datum/skill/level/sanitize_value(new_value)
+	return max(new_value, 0)
 
-/datum/skill/experience/sanitize_value(new_value)
-	return round(max(new_value, 0))
-
-/datum/skill/experience/set_skill(datum/skill_holder/H, value, mob/owner)
-	var/old_value = H.skills[type]
+/datum/skill/level/set_skill_value(datum/skill_holder/H, value, datum/mind/M, silent = FALSE)
 	H.skills[type] = value
-	if(value > old_value)
+	var/new_level
+	for(var/k in levels)
+		if(value < (associative ? levels[k] : k))
+			break
+		new_level++
+	var/old_level = LAZYACCESS(H.skill_levels, type)
+	LAZYSET(H.skill_levels, type, new_level)
+	. = new_level - old_level
+	if(silent || !(M?.current))
+		return
+	if(. > 0)
+		to_chat(M.current, "<span class='nicegreen'>I feel like I've become more proficient at [name]!</span>")
+	else if(. < 0)
+		to_chat(M.current, "<span class='warning'>I feel like I've become worse at [name]!</span>")
 
-/datum/skill/experience/standard_render_value(value)
+/datum/skill/level/standard_render_value(value)
 	var/current_lvl = associative ? unskilled_tier : 0
 	var/current_lvl_xp_sum = 0
 	var/next_lvl_xp_sum
-	for(var/lvl in 1 to max_lvl)
+	for(var/lvl in 1 to max_levels)
 		next_lvl_xp_sum = associative ? levels[levels[lvl]] : levels[lvl]
 		if(value < next_lvl_xp_sum)
 			break
 		current_lvl_xp_sum = next_lvl_xp_sum
-		current_lvl = associative ? levels[lvl] : current_lvl+1
+		current_lvl = associative ? levels[lvl] : lvl+1
 
 	return "[associative ? current_lvl : "Lvl. [current_lvl]"] ([value - current_lvl_xp_sum]/[next_lvl_xp_sum])[value > next_lvl_xp_sum ? " \[MAX!\]" : ""]"
 
-/datum/skill/experience/job
-	levels = ("Basic", "Trained", "Experienced", "Master")
+/datum/skill/level/job
+	levels = list("Basic", "Trained", "Experienced", "Master")
+	competency_thresholds = list(JOB_SKILL_TRAINED, JOB_SKILL_EXPERT, JOB_SKILL_MASTER)
+	competency_mults = list(0.15, 0.1, 0.1)
 	associative = TRUE
 
 //quite the reference, no?
-/datum/skill/experience/dwarfy
-	abstract_type = /datum/skill/experience/dwarfy
+/datum/skill/level/dwarfy
+	abstract_type = /datum/skill/level/dwarfy
 	standard_xp_lvl_up = DORF_XP_LVL_UP
 	xp_lvl_multiplier = DORF_XP_LVL_MULTI
-	max_lvl = DORF_MAX_LVL
+	max_levels = DORF_MAX_LVL
+	level_up_method = DWARFY_LEVEL_UP
 	levels = list("Novice", "Adequate", "Competent", "Skilled",
 				"Proficient", "Talented", "Adept", "Expert",
 				"Professional", "Accomplished", "Great", "Master",
 				"High Master", "Grand Master", "Legendary")
+	competency_thresholds = list(DORF_SKILL_COMPETENT, DORF_SKILL_EXPERT, DORF_SKILL_MASTER)
+	competency_mults = list(0.15, 0.1, 0.08)
 	associative = TRUE
 	unskilled_tier = "Dabbling"

code/datums/skills/_skill_holder.dm

@@ -2,10 +2,18 @@
   * Skill holder datums
   */
 /datum/skill_holder
+	var/datum/mind/owner
 	/// Our list of skills and values. Lazylist. Associative. Keys are datum typepaths to the skill.
 	var/list/skills
 	/// Same as [skills] but affinities, which are multiplied to increase amount when gaining skills.
 	var/list/skill_affinities
+	/// Let's say we want to get a specific skill "level" without looping through a proc everytime.
+	/// Only supported by skills with tiers or levels.
+	var/list/skill_levels
+
+/datum/skill_holder/New(datum/mind/M)
+	. = ..()
+	owner = M
 
 /**
   * Grabs the value of a skill.
@@ -17,6 +25,16 @@
 		return null
 	return skills[skill]
 
+/**
+  * Grabs the level of a skill. Only supported by skills with tiers or levels.
+  */
+/datum/skill_holder/proc/get_skill_level(skill)
+	if(!ispath(skill))
+		CRASH("Invalid get_skill_value call. Use typepaths.")		//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
+	if(!skill_levels)
+		return 0
+	return skill_levels[skill]
+
 /**
   * Grabs our affinity for a skill. !!This is a multiplier!!
   */
@@ -33,37 +51,42 @@
 /**
   * Sets the value of a skill.
   */
-/datum/skill_holder/proc/set_skill_value(skill, value, owner)
+/datum/skill_holder/proc/set_skill_value(skill, value, silent = FALSE)
 	if(!ispath(skill, /datum/skill))
 		CRASH("Invalid set_skill_value call. Use typepaths.")		//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
-	var/datum/skill/S = GET_SKILL_DATUM(path)
+	var/datum/skill/S = GLOB.skill_datums[skill]
 	value = S.sanitize_value(value)
 	if(!isnull(value))
 		LAZYINITLIST(skills)
-		S.set_skill(src, value, owner)
+		S.set_skill_value(src, value, owner, silent)
 		return TRUE
 	return FALSE
 
 /**
   * Boosts a skill to a value if not aobve
   */
-/datum/skill_holder/proc/boost_skill_value_to(skill, value, mob/owner)
+/datum/skill_holder/proc/boost_skill_value_to(skill, value, silent = FALSE)
 	var/current = get_skill_value(skill)
 	if(!is_skill_value_greater(skill, current, value))
 		return FALSE
-	set_skill_value(skill, value, owner)
+	set_skill_value(skill, value, silent)
 	return TRUE
 
 /**
   * Automatic skill increase, multiplied by skill affinity if existing.
   * Only works if skill is numerical.
   */
-/datum/skill_holder/proc/auto_gain_experience(skill, value, mob/owner)
+/datum/skill_holder/proc/auto_gain_experience(skill, value, maximum, silent = FALSE)
 	if(!ispath(skill, /datum/skill/numerical))
 		CRASH("You cannot auto increment a non numerical skill!")
 	var/current = get_skill_value(skill)
 	var/affinity = get_skill_affinity(skill)
-	boost_skill_value_to(skill, current + (value * affinity), owner)
+	var/target_value = current + (value * affinity)
+	if(maximum)
+		target_value = max(target_value, maximum)
+		if(target_value == maximum) //no more experience to gain, early return.
+			return
+	boost_skill_value_to(skill, target_value, silent)
 
 /**
   * Generates a HTML readout of our skills.

code/datums/skills/engineering.dm

@@ -1,3 +1,4 @@
-/datum/skill/experience/job/wiring
+/datum/skill/level/job/wiring
 	name = "Wiring"
 	desc = "How proficient and knowledged you are at wiring beyond laying cables on the floor."
+	competency_thresholds = list(JOB_SKILL_BASIC, JOB_SKILL_EXPERT, JOB_SKILL_MASTER)

code/datums/skills/medical.dm

@@ -1,3 +1,4 @@
 /datum/skill/numerical/surgery
 	name = "Surgery"
 	desc = "How proficient you are at doing surgery."
+	competency_mults = list(0.025, 0.025, 0.025) // 60% surgery speed up at max value of 100.

code/datums/wires/_wires.dm

@@ -33,6 +33,9 @@
 	var/list/assemblies = list() // List of attached assemblies.
 	var/randomize = 0 // If every instance of these wires should be random.
 					  // Prevents wires from showing up in station blueprints
+	var/req_knowledge = INFINITY //wiring skill level on which the functions are revealed.
+	var/req_skill = JOB_SKILL_BASIC //used in user's cutting/pulsing/mending speed calculations.
+	var/list/current_users //list of untrained people currently interacting with this set of wires.
 
 /datum/wires/New(atom/holder)
 	..()
@@ -130,8 +133,20 @@
 		cut_wires += wire
 		on_cut(wire, mend = FALSE)
 
-/datum/wires/proc/cut_color(color)
+/datum/wires/proc/cut_color(color, mob/living/user)
+	LAZYINITLIST(current_users)
+	if(current_users[user])
+		return FALSE
+	if(req_skill && user?.mind)
+		var/level_diff = req_skill - user.mind.skill_holder.get_skill_level(/datum/skill/level/job/wiring)
+		if(level_diff > 0)
+			to_chat(user, "<span class='notice'>You begin cutting [holder]'s [color] wire...</span>")
+			if(!do_after(user, 1.5 SECONDS * level_diff, target = holder) || !interactable(user))
+				return FALSE
+			user.mind?.skill_holder.auto_gain_experience(/datum/skill/level/job/wiring, DEF_SKILL_GAIN*level_diff)
+	to_chat(user, "<span class='notice'>You cut [holder]'s [color] wire.</span>")
 	cut(get_wire(color))
+	return TRUE
 
 /datum/wires/proc/cut_random()
 	cut(wires[rand(1, wires.len)])
@@ -146,7 +161,19 @@
 	on_pulse(wire, user)
 
 /datum/wires/proc/pulse_color(color, mob/living/user)
+	LAZYINITLIST(current_users)
+	if(current_users[user])
+		return FALSE
+	if(req_skill && user?.mind)
+		var/level_diff = req_skill - user.mind.skill_holder.get_skill_level(/datum/skill/level/job/wiring)
+		if(level_diff > 0)
+			to_chat(user, "<span class='notice'>You begin pulsing [holder]'s [color] wire...</span>")
+			if(!do_after(user, 1.5 SECONDS * level_diff, target = holder) || !interactable(user))
+				return FALSE
+			user.mind?.skill_holder.auto_gain_experience(/datum/skill/level/job/wiring, DEF_SKILL_GAIN*level_diff)
+	to_chat(user, "<span class='notice'>You pulse [holder]'s [color] wire.</span>")
 	pulse(get_wire(color), user)
+	return TRUE
 
 /datum/wires/proc/pulse_assembly(obj/item/assembly/S)
 	for(var/color in assemblies)
@@ -224,7 +251,7 @@
 	var/reveal_wires = FALSE
 
 	// Admin ghost can see a purpose of each wire.
-	if(IsAdminGhost(user))
+	if(IsAdminGhost(user) || user.mind.skill_holder.get_skill_level(/datum/skill/level/job/wiring) >= req_knowledge)
 		reveal_wires = TRUE
 
 	// Same for anyone with an abductor multitool.
@@ -259,18 +286,16 @@
 		if("cut")
 			I = L.is_holding_tool_quality(TOOL_WIRECUTTER)
 			if(I || IsAdminGhost(usr))
-				if(I && holder)
+				if(cut_color(target_wire) && I && holder)
 					I.play_tool_sound(holder, 20)
-				cut_color(target_wire)
 				. = TRUE
 			else
 				to_chat(L, "<span class='warning'>You need wirecutters!</span>")
 		if("pulse")
 			I = L.is_holding_tool_quality(TOOL_MULTITOOL)
 			if(I || IsAdminGhost(usr))
-				if(I && holder)
+				if(pulse_color(target_wire, L) && I && holder)
 					I.play_tool_sound(holder, 20)
-				pulse_color(target_wire, L)
 				. = TRUE
 			else
 				to_chat(L, "<span class='warning'>You need a multitool!</span>")

code/datums/wires/airalarm.dm

@@ -1,6 +1,7 @@
 /datum/wires/airalarm
 	holder_type = /obj/machinery/airalarm
 	proper_name = "Air Alarm"
+	req_knowledge = JOB_SKILL_MASTER
 
 /datum/wires/airalarm/New(atom/holder)
 	wires = list(

code/datums/wires/airlock.dm

@@ -52,10 +52,11 @@
 
 /datum/wires/airlock/interactable(mob/user)
 	var/obj/machinery/door/airlock/A = holder
+	if(!A.panel_open)
+		return FALSE
 	if(!A.hasSiliconAccessInArea(user) && A.isElectrified() && A.shock(user, 100))
 		return FALSE
-	if(A.panel_open)
-		return TRUE
+	return TRUE
 
 /datum/wires/airlock/get_status()
 	var/obj/machinery/door/airlock/A = holder

code/datums/wires/apc.dm

@@ -1,6 +1,7 @@
 /datum/wires/apc
 	holder_type = /obj/machinery/power/apc
 	proper_name = "APC"
+	req_knowledge = JOB_SKILL_MASTER
 
 /datum/wires/apc/New(atom/holder)
 	wires = list(

code/datums/wires/autolathe.dm

@@ -1,6 +1,7 @@
 /datum/wires/autolathe
 	holder_type = /obj/machinery/autolathe
 	proper_name = "Autolathe"
+	req_knowledge = JOB_SKILL_EXPERT
 
 /datum/wires/autolathe/New(atom/holder)
 	wires = list(

code/datums/wires/emitter.dm

@@ -1,6 +1,8 @@
 
 /datum/wires/emitter
 	holder_type = /obj/machinery/power/emitter
+	req_knowledge = JOB_SKILL_TRAINED
+	req_skill = JOB_SKILL_UNTRAINED
 
 /datum/wires/emitter/New(atom/holder)
 	wires = list(WIRE_ZAP,WIRE_HACK)

code/datums/wires/explosive.dm

@@ -15,6 +15,7 @@
 /datum/wires/explosive/c4
 	holder_type = /obj/item/grenade/plastic/c4
 	randomize = TRUE	//Same behaviour since no wire actually disarms it
+	req_skill = JOB_SKILL_UNTRAINED
 
 /datum/wires/explosive/c4/interactable(mob/user)
 	var/obj/item/grenade/plastic/c4/P = holder
@@ -29,6 +30,7 @@
 /datum/wires/explosive/pizza
 	holder_type = /obj/item/pizzabox
 	randomize = TRUE
+	req_skill = JOB_SKILL_MASTER
 
 /datum/wires/explosive/pizza/New(atom/holder)
 	wires = list(

code/datums/wires/microwave.dm

@@ -1,6 +1,8 @@
 /datum/wires/microwave
 	holder_type = /obj/machinery/microwave
 	proper_name = "Microwave"
+	req_knowledge = JOB_SKILL_TRAINED
+	req_skill = JOB_SKILL_UNTRAINED
 
 /datum/wires/microwave/New(atom/holder)
 	wires = list(

code/datums/wires/mulebot.dm

@@ -1,6 +1,7 @@
 /datum/wires/mulebot
 	holder_type = /mob/living/simple_animal/bot/mulebot
 	randomize = TRUE
+	req_knowledge = JOB_SKILL_MASTER
 
 /datum/wires/mulebot/New(atom/holder)
 	wires = list(

code/datums/wires/particle_accelerator.dm

@@ -1,6 +1,8 @@
 /datum/wires/particle_accelerator/control_box
 	holder_type = /obj/machinery/particle_accelerator/control_box
 	proper_name = "Particle Accelerator"
+	req_knowledge = JOB_SKILL_EXPERT
+	req_skill = JOB_SKILL_TRAINED
 
 /datum/wires/particle_accelerator/control_box/New(atom/holder)
 	wires = list(

code/datums/wires/r_n_d.dm

@@ -1,6 +1,7 @@
 /datum/wires/rnd
 	holder_type = /obj/machinery/rnd
 	randomize = TRUE
+	req_knowledge = JOB_SKILL_EXPERT
 
 /datum/wires/rnd/New(atom/holder)
 	wires = list(

code/datums/wires/radio.dm

@@ -1,6 +1,8 @@
 /datum/wires/radio
 	holder_type = /obj/item/radio
 	proper_name = "Radio"
+	req_knowledge = JOB_SKILL_TRAINED
+	req_skill = JOB_SKILL_UNTRAINED
 
 /datum/wires/radio/New(atom/holder)
 	wires = list(

code/datums/wires/robot.dm

@@ -1,6 +1,8 @@
 /datum/wires/robot
 	holder_type = /mob/living/silicon/robot
 	randomize = TRUE
+	req_knowledge = JOB_SKILL_MASTER
+	req_skill = JOB_SKILL_TRAINED
 
 /datum/wires/robot/New(atom/holder)
 	wires = list(

code/datums/wires/suit_storage_unit.dm

@@ -1,6 +1,8 @@
 /datum/wires/suit_storage_unit
 	holder_type = /obj/machinery/suit_storage_unit
 	proper_name = "Suit Storage Unit"
+	req_knowledge = JOB_SKILL_TRAINED
+	req_skill = JOB_SKILL_UNTRAINED
 
 /datum/wires/suit_storage_unit/New(atom/holder)
 	wires = list(

code/datums/wires/syndicatebomb.dm

@@ -1,6 +1,8 @@
 /datum/wires/syndicatebomb
 	holder_type = /obj/machinery/syndicatebomb
 	randomize = TRUE
+	req_skill = JOB_SKILL_EXPERT //good luck, wannabe hero.
+
 
 /datum/wires/syndicatebomb/New(atom/holder)
 	wires = list(

code/datums/wires/tesla_coil.dm

@@ -2,6 +2,7 @@
 /datum/wires/tesla_coil
 	randomize = 1	//Only one wire don't need blueprints
 	holder_type = /obj/machinery/power/tesla_coil
+	req_knowledge = JOB_SKILL_TRAINED
 
 /datum/wires/tesla_coil/New(atom/holder)
 	wires = list(WIRE_ZAP)

code/datums/wires/vending.dm

@@ -1,6 +1,7 @@
 /datum/wires/vending
 	holder_type = /obj/machinery/vending
 	proper_name = "Vending Unit"
+	req_knowledge = JOB_SKILL_EXPERT
 
 /datum/wires/vending/New(atom/holder)
 	wires = list(