Merge pull request #12121 from Ghommie/Ghommie-cit723

Generic skills support for items, level based skill type. Wiring skill.
2020-05-08 01:24:44 -07:00
parent 43dc1319d9 3dfef3c393
commit 61692f290a
74 changed files with 630 additions and 200 deletions
@@ -43,6 +43,7 @@
 #define COLOR_RED_GRAY         "#B4696A"
 #define COLOR_PALE_BLUE_GRAY   "#98C5DF"
 #define COLOR_PALE_GREEN_GRAY  "#B7D993"
+#define COLOR_PALE_ORANGE      "#FFC066"
 #define COLOR_PALE_RED_GRAY    "#D59998"
 #define COLOR_PALE_PURPLE_GRAY "#CBB1CA"
 #define COLOR_PURPLE_GRAY      "#AE8CA8"
@@ -248,6 +248,15 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define TOTAL_MASS_MEDIEVAL_WEAPON	3.6 //very, very generic average sword/warpick/etc. weight in pounds.
 #define TOTAL_MASS_TOY_SWORD 1.5

+//stamina cost defines.
+#define STAM_COST_ATTACK_OBJ_MULT	1.2
+#define STAM_COST_ATTACK_MOB_MULT	0.8
+#define STAM_COST_BATON_MOB_MULT	1
+#define STAM_COST_NO_COMBAT_MULT	1.25
+#define STAM_COST_W_CLASS_MULT		1.25
+#define STAM_COST_THROW_MULT		2
+
+
 //bullet_act() return values
 #define BULLET_ACT_HIT				"HIT"		//It's a successful hit, whatever that means in the context of the thing it's hitting.
 #define BULLET_ACT_BLOCK			"BLOCK"		//It's a blocked hit, whatever that means in the context of the thing it's hitting.
@@ -183,7 +183,28 @@
 //	#define SPEECH_FORCED 7
 #define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain"			//from base of /datum/antagonist/on_gain(): (antag_datum)

-#define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast"			//called from base of /obj/effect/proc_holder/spell/can_cast(): (spell)
+#define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast"			//from base of /obj/effect/proc_holder/spell/can_cast(): (spell)
+
+#define COMSIG_MOB_ACTION_SKILL_MOD "mob_action_skill_mod"		//from base of /datum/skill_holder/action_skills_mod() : (proc args list, list/mod_values)
+	#define ACTION_SKILL_MOD_SKILL 1 //redundancy.
+	#define ACTION_SKILL_MOD_VALUE 2
+	#define ACTION_SKILL_MOD_THRESHOLD 3
+	#define ACTION_SKILL_MOD_IS_MULTI 4
+	//other mod values, kept separate from the args
+	#define MOD_VALUES_SKILL_MOD 1
+
+#define COMSIG_MOB_ITEM_ACTION_SKILLS_MOD "mob_item_action_skills_mod"	//from base of /datum/skill_holder/item_action_skills_mod() : (proc args list, mod_values)
+	#define ITEM_SKILLS_MOD_ITEM 1 //redundancy
+	#define ITEM_SKILLS_MOD_VALUE 2
+	#define ITEM_SKILLS_MOD_FLAGS 3
+	#define ITEM_SKILLS_MOD_BAD_FLAGS 4
+	#define ITEM_SKILLS_MOD_IS_MULTI 5
+	//other mod values, kept separate from the args
+	#define MOD_VALUES_ITEM_SKILLS_SUM 1
+	#define MOD_VALUES_ITEM_SKILLS_DIV 2
+	#define MOD_VALUES_ITEM_SKILLS_CHECKED 3
+
+#define COMSIG_MOB_SKILL_GET_AFFINITY "mob_skill_get_affinity"	//from base of /datum/skill_holder/get_skill_affinity(): (skill_path, list/return_value)

 // /mob/living signals
 #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs"	//from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)
@@ -138,6 +138,7 @@
 #define MOOD_LEVEL_SAD4 -25

 //Sanity levels for humans
+#define SANITY_AMAZING 150
 #define SANITY_GREAT 125
 #define SANITY_NEUTRAL 100
 #define SANITY_DISTURBED 75
@@ -0,0 +1,77 @@
+
+/// true/false
+#define SKILL_PROGRESSION_BINARY				1
+/// numerical
+#define SKILL_PROGRESSION_NUMERICAL				2
+/// Enum
+#define SKILL_PROGRESSION_ENUM					3
+/// Levels
+#define SKILL_PROGRESSION_LEVEL					4
+
+
+/// Max value of skill for numerical skills
+#define SKILL_NUMERICAL_MAX			100
+/// Min value of skill for numerical skills
+#define SKILL_NUMERICAL_MIN			0
+
+// Standard values for job starting skills
+
+#define STARTING_SKILL_SURGERY_MEDICAL		35		//out of SKILL_NUMERICAL_MAX
+
+// Standard values for job starting skill affinities
+
+#define STARTING_SKILL_AFFINITY_SURGERY_MEDICAL			1.2
+
+#define STARTING_SKILL_AFFINITY_WIRING_ENGI_ROBO		1.2
+
+// Standard values for skill gain (this is multiplied by affinity)
+
+#define DEF_SKILL_GAIN					1
+#define SKILL_GAIN_SURGERY_PER_STEP		0.25
+
+#define SKILL_AFFINITY_MOOD_BONUS 		1.25
+
+///Items skill_flags and other defines
+#define SKILL_USE_TOOL			(1<<0)
+#define SKILL_TRAINING_TOOL		(1<<1)
+#define SKILL_ATTACK_MOB		(1<<2)
+#define SKILL_TRAIN_ATTACK_MOB	(1<<3)
+#define SKILL_ATTACK_OBJ		(1<<4)
+#define SKILL_TRAIN_ATTACK_OBJ	(1<<5)
+#define SKILL_STAMINA_COST		(1<<6) //Influences the stamina cost from weapon usage.
+#define SKILL_THROW_STAM_COST	(1<<7)
+#define SKILL_COMBAT_MODE		(1<<8) //The user must have combat mode on.
+#define SKILL_USE_MOOD			(1<<9) //Is the skill negatively affected by bad mood.
+#define SKILL_TRAIN_MOOD		(1<<10) //Is this skill training affected by good mood.
+
+///competency_threshold index defines
+#define THRESHOLD_COMPETENT	1
+#define THRESHOLD_EXPERT	2
+#define THRESHOLD_MASTER	3
+
+/// Level/Experience skills defines.
+#define STD_XP_LVL_UP 100
+#define STD_XP_LVL_MULTI 2
+#define STD_MAX_LVL 4
+
+#define RPG_MAX_LVL 100
+
+#define DORF_XP_LVL_UP 400
+#define DORF_XP_LVL_MULTI 100
+#define DORF_MAX_LVL 20 // Dabbling, novice, adequate, [...], legendary +3, legendary +4, legendary +5
+
+//level up methods defines
+#define STANDARD_LEVEL_UP "standard_level_up"
+#define DWARFY_LEVEL_UP "dwarfy_level_up"
+
+//job skill level defines
+#define JOB_SKILL_UNTRAINED	0
+#define JOB_SKILL_BASIC		1
+#define JOB_SKILL_TRAINED	2
+#define JOB_SKILL_EXPERT	3
+#define JOB_SKILL_MASTER	4
+
+//other skill level defines, not an exhaustive catalogue, only contains be most relevant ones.
+#define DORF_SKILL_COMPETENT	3
+#define DORF_SKILL_EXPERT		8
+#define DORF_SKILL_MASTER		12
@@ -0,0 +1,8 @@
+
+//How experience levels are calculated.
+#define XP_LEVEL(std, multi, lvl) (std*((multi**lvl)/(multi-1))-std/(multi-1)) //don't use 1 as multi, you'll get division by zero errors
+#define DORF_XP_LEVEL(std, extra, lvl) (std*lvl+extra*(lvl*(lvl/2+0.5)))
+
+//More experience value getter macros
+#define GET_STANDARD_LVL(lvl) XP_LEVEL(STD_XP_LVL_UP, STD_XP_LVL_MULTI, lvl)
+#define GET_DORF_LVL(lvl) DORF_XP_LEVEL(DORF_XP_LVL_UP, DORF_XP_LVL_MULTI, lvl)
@@ -1,28 +0,0 @@
-/// true/false
-#define SKILL_PROGRESSION_BINARY				1
-/// numerical
-#define SKILL_PROGRESSION_NUMERICAL				2
-/// Enum
-#define SKILL_PROGRESSION_ENUM					3
-
-/// Max value of skill for numerical skills
-#define SKILL_NUMERICAL_MAX			100
-/// Min value of skill for numerical skills
-#define SKILL_NUMERICAL_MIN			0
-
-// Standard values for job starting skills
-
-#define STARTING_SKILL_SURGERY_MEDICAL		35		//out of SKILL_NUMERICAL_MAX
-
-// Standard values for job starting skill affinities
-
-#define STARTING_SKILL_AFFINITY_SURGERY_MEDICAL			1.2
-
-// Standard values for skill gain (this is multiplied by affinity)
-
-#define SKILL_GAIN_SURGERY_PER_STEP			0.25
-
-// Misc
-
-/// 40% speedup at 100 skill
-#define SURGERY_SKILL_SPEEDUP_NUMERICAL_SCALE(number)			clamp(number / 250, 1, 2)
@@ -91,7 +91,7 @@
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)

-	user.adjustStaminaLossBuffered(getweight()*0.8)//CIT CHANGE - makes attacking things cause stamina loss
+	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_MOB_MULT))//CIT CHANGE - makes attacking things cause stamina loss

 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
@@ -102,7 +102,7 @@
 	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
 		return // CIT CHANGE - ditto
-	user.adjustStaminaLossBuffered(getweight()*1.2)//CIT CHANGE - makes attacking things cause stamina loss
+	user.adjustStaminaLossBuffered(getweight(user, STAM_COST_ATTACK_OBJ_MULT))//CIT CHANGE - makes attacking things cause stamina loss
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(O)
 	O.attacked_by(src, user)
@@ -111,26 +111,32 @@
 	return

 /obj/attacked_by(obj/item/I, mob/living/user)
-	if(I.force)
+	var/totitemdamage = I.force
+	var/bad_flag = NONE
+	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && iscarbon(user))
+		totitemdamage *= 0.5
+		bad_flag |= SKILL_COMBAT_MODE //blacklist combat skills.
+	if(I.used_skills && user.mind)
+		if(totitemdamage)
+			totitemdamage = user.mind.skill_holder.item_action_skills_mod(I, totitemdamage, I.skill_difficulty, SKILL_ATTACK_OBJ, bad_flag)
+		for(var/skill in I.used_skills)
+			if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_OBJ))
+				continue
+			user.mind.skill_holder.auto_gain_experience(skill, I.skill_gain)
+	if(totitemdamage)
 		visible_message("<span class='danger'>[user] has hit [src] with [I]!</span>", null, null, COMBAT_MESSAGE_RANGE)
 		//only witnesses close by and the victim see a hit message.
 		log_combat(user, src, "attacked", I)
-	take_damage(I.force, I.damtype, "melee", 1)
+	take_damage(totitemdamage, I.damtype, "melee", 1)

 /mob/living/attacked_by(obj/item/I, mob/living/user)
-	//CIT CHANGES START HERE - combatmode and resting checks
-	var/totitemdamage = I.force
-	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
-		totitemdamage *= 0.5
-	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-		totitemdamage *= 0.5
-	//CIT CHANGES END HERE
+	var/totitemdamage = pre_attacked_by(I, user)
 	if((user != src) && run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user) & BLOCK_SUCCESS)
 		return FALSE
 	send_item_attack_message(I, user)
-	I.do_stagger_action(src, user)
+	I.do_stagger_action(src, user, totitemdamage)
 	if(I.force)
-		apply_damage(totitemdamage, I.damtype) //CIT CHANGE - replaces I.force with totitemdamage
+		apply_damage(totitemdamage, I.damtype)
 		if(I.damtype == BRUTE)
 			if(prob(33))
 				I.add_mob_blood(src)
@@ -146,6 +152,28 @@
 	else
 		return ..()

+/mob/living/proc/pre_attacked_by(obj/item/I, mob/living/user)
+	. = I.force
+	var/bad_flag = NONE
+	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && iscarbon(user))
+		. *= 0.5
+		bad_flag |= SKILL_COMBAT_MODE //blacklist combat skills.
+	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
+		. *= 0.5
+	if(!user.mind || !I.used_skills)
+		return
+	if(.)
+		. = user.mind.skill_holder.item_action_skills_mod(., I.skill_difficulty, SKILL_ATTACK_MOB, bad_flag)
+	for(var/skill in I.used_skills)
+		if(!(I.used_skills[skill] & SKILL_TRAIN_ATTACK_MOB))
+			continue
+		user.mind.skill_holder.auto_gain_experience(skill, I.skill_gain)
+
+/mob/living/carbon/pre_attacked_by(obj/item/I, mob/living/user)
+	. = ..()
+	if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+		. *= 1.5
+
 // Proximity_flag is 1 if this afterattack was called on something adjacent, in your square, or on your person.
 // Click parameters is the params string from byond Click() code, see that documentation.
 /obj/item/proc/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
@@ -179,22 +207,30 @@
 	return 1

 /// How much stamina this takes to swing this is not for realism purposes hecc off.
-/obj/item/proc/getweight()
-	return total_mass || w_class * 1.25
+/obj/item/proc/getweight(mob/living/user, multiplier = 1, flags = SKILL_STAMINA_COST)
+	. = (total_mass || w_class * STAM_COST_W_CLASS_MULT) * multiplier
+	if(!user)
+		return
+	var/bad_flag = NONE
+	if(iscarbon(user) && !(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+		. *= STAM_COST_NO_COMBAT_MULT
+		bad_flag |= SKILL_COMBAT_MODE
+	if(used_skills && user.mind)
+		. = user.mind.skill_holder.item_action_skills_mod(., skill_difficulty, flags, bad_flag, FALSE)

 /// How long this staggers for. 0 and negatives supported.
-/obj/item/proc/melee_stagger_duration()
+/obj/item/proc/melee_stagger_duration(force_override)
 	if(!isnull(stagger_force))
 		return stagger_force
 	/// totally not an untested, arbitrary equation.
-	return clamp((1.5 + (w_class/7.5)) * (force / 2), 0, 10 SECONDS)
+	return clamp((1.5 + (w_class/7.5)) * ((force_override || force) / 2), 0, 10 SECONDS)

-/obj/item/proc/do_stagger_action(mob/living/target, mob/living/user)
+/obj/item/proc/do_stagger_action(mob/living/target, mob/living/user, force_override)
 	if(!CHECK_BITFIELD(target.status_flags, CANSTAGGER))
 		return FALSE
 	if(target.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE)
 		target.do_staggered_animation()
-	var/duration = melee_stagger_duration()
+	var/duration = melee_stagger_duration(force_override)
 	if(!duration)		//0
 		return FALSE
 	else if(duration > 0)
@@ -1,5 +1,6 @@
 #define MINOR_INSANITY_PEN 5
 #define MAJOR_INSANITY_PEN 10
+#define MOOD_INSANITY_MALUS 0.0054 // per point of sanity below SANITY_DISTURBED, a 40% debuff to skills at rock bottom depression.

 /datum/component/mood
 	var/mood //Real happiness
@@ -22,7 +23,6 @@
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
 	RegisterSignal(parent, COMSIG_MODIFY_SANITY, .proc/modify_sanity)
 	RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
-
 	RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
 	var/mob/living/owner = parent
 	if(owner.hud_used)
@@ -150,7 +150,7 @@
 		if(8)
 			setSanity(sanity+0.25, maximum=SANITY_GREAT)
 		if(9)
-			setSanity(sanity+0.4, maximum=SANITY_GREAT)
+			setSanity(sanity+0.4, maximum=SANITY_AMAZING)

 	HandleNutrition(owner)

@@ -166,6 +166,7 @@
 	else if(sanity > maximum && amount > sanity - 0.5)
 		amount = sanity - 0.5

+	var/old_sanity = sanity
 	// Disturbed stops you from getting any more sane
 	if(HAS_TRAIT(master, TRAIT_UNSTABLE))
 		sanity = min(amount,sanity)
@@ -197,6 +198,12 @@
 			setInsanityEffect(0)
 			master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
 			sanity_level = 1
+
+	if(old_sanity > 1 && sanity == 1)
+		RegisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY, .proc/on_get_skill_affinity)
+	else if(old_sanity == 1 && sanity > 1)
+		UnregisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY)
+
 	//update_mood_icon()

 /datum/component/mood/proc/setInsanityEffect(newval)//More code so that the previous proc works
@@ -205,8 +212,13 @@
 	//var/mob/living/master = parent
 	//master.crit_threshold = (master.crit_threshold - insanity_effect) + newval
 	insanity_effect = newval
+	if(insanity_effect)
+		RegisterSignal(parent, COMSIG_MOB_ACTION_SKILL_MOD, .proc/on_mob_action_skill_mod)
+		RegisterSignal(parent, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD, .proc/on_item_action_skills_mod)
+	else
+		UnregisterSignal(parent, list(COMSIG_MOB_ACTION_SKILL_MOD, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD))

-/datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = -INFINITY, maximum = INFINITY)
+/datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = SANITY_INSANE, maximum = SANITY_AMAZING)
 	setSanity(sanity + amount, minimum, maximum)

 /datum/component/mood/proc/add_event(datum/source, category, type, param) //Category will override any events in the same category, should be unique unless the event is based on the same thing like hunger.
@@ -288,5 +300,39 @@
 	remove_temp_moods()
 	setSanity(initial(sanity))

+/datum/component/mood/proc/on_mob_action_skill_mod(mob/source, list/skill_args, list/mod_values)
+	var/datum/skill/S = GLOB.skill_datums[skill_args[ACTION_SKILL_MOD_SKILL]]
+	if(!(S.skill_flags & SKILL_USE_MOOD))
+		return
+	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS
+	mod_values[MOD_VALUES_SKILL_MOD] *= skill_args[ACTION_SKILL_MOD_IS_MULTI] ? debuff : 1/debuff
+
+/datum/component/mood/proc/on_item_action_skills_mod(mob/source, list/skill_args, list/mod_values)
+	if(skill_args[ITEM_SKILLS_MOD_BAD_FLAGS] & SKILL_USE_MOOD)
+		return
+	var/divisor = mod_values[MOD_VALUES_ITEM_SKILLS_DIV]
+	if(!divisor)
+		return
+	var/obj/item/I = skill_args[ITEM_SKILLS_MOD_ITEM]
+	var/list/L = mod_values[MOD_VALUES_ITEM_SKILLS_CHECKED]
+	var/skills_len = length(L)
+	var/affected_skills = skills_len
+	for(var/k in L)
+		var/datum/skill/S = k
+		var/our_flags = I.used_skills[S.type]|S.skill_flags
+		if(!(our_flags & SKILL_USE_MOOD))
+			affected_skills--
+	if(!affected_skills)
+		return
+	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS * (affected_skills/skills_len)
+	mod_values[MOD_VALUES_ITEM_SKILLS_SUM] *= skill_args[ITEM_SKILLS_MOD_IS_MULTI] ? debuff : 1/debuff
+
+/datum/component/mood/proc/on_get_skill_affinity(mob/source, skill_path, list/return_value)
+	var/datum/skill/S = GLOB.skill_datums[skill_path]
+	if(!S || !(S.skill_flags & SKILL_TRAIN_MOOD))
+		return
+	return_value[1] *= SKILL_AFFINITY_MOOD_BONUS
+
 #undef MINOR_INSANITY_PEN
 #undef MAJOR_INSANITY_PEN
+#undef MOOD_INSANITY_MALUS
@@ -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()
@@ -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()
@@ -9,16 +9,13 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 		S = new path
 		.[S.type] = S

-/proc/get_skill_datum(path)
-	return GLOB.skill_datums[path]
-
 /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)

@@ -30,10 +27,18 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 	var/name
 	/// Our description
 	var/desc
+	/// Color of the name as shown in the html readout
+	var/name_color = "#F0F0F0" // White on dark surface.
 	/// Our progression type
 	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)
+	/// In which way this skil can affect or be affected through actions.
+	var/skill_flags = SKILL_USE_MOOD|SKILL_TRAIN_MOOD

 /**
  * Ensures what someone's setting as a value for this skill is valid.
@@ -41,6 +46,13 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /datum/skill/proc/sanitize_value(new_value)
 	return new_value

+/**
+  * 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_value(datum/skill_holder/H, value, mob/owner)
+	H.skills[type] = value
+
 /**
  * Checks if a value is greater
  */
@@ -52,7 +64,7 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /**
  * Standard value "render"
  */
-/datum/skill/proc/standard_render_value(value)
+/datum/skill/proc/standard_render_value(value, level)
 	return value

 // Just saying, the choice to use different sub-parent-types is to force coders to resolve issues as I won't be implementing custom procs to grab skill levels in a certain context.
@@ -61,11 +73,13 @@ 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

-/datum/skill/binary/standard_render_value(value)
+/datum/skill/binary/standard_render_value(value, level)
 	return value? "Yes" : "No"

 /datum/skill/numerical
@@ -81,7 +95,7 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /datum/skill/numerical/sanitize_value(new_value)
 	return clamp(new_value, min_value, max_value)

-/datum/skill/numerical/standard_render_value(value)
+/datum/skill/numerical/standard_render_value(value, level)
 	return display_as_percent? "[round(value/max_value/100, 0.01)]%" : "[value] / [max_value]"

 /datum/skill/enum
@@ -93,3 +107,102 @@ GLOBAL_LIST_INIT(skill_datums, init_skill_datums())
 /datum/skill/enum/sanitize_value(new_value)
 	if(new_value in valid_values)
 		return new_value
+
+/**
+  * Classing r p g styled skills, tiered by lvl, and current/nextlvl 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_MULTI //standard required level up exp multiplier. def: 2 (100, 200, 400, 800 etc.)
+	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/level/New()
+	. = ..()
+	var/max_assoc = ""
+	var/max_assoc_start = 1
+	for(var/lvl in 1 to max_levels)
+		var/value
+		switch(level_up_method)
+			if(STANDARD_LEVEL_UP)
+				value = XP_LEVEL(standard_xp_lvl_up, xp_lvl_multiplier, lvl)
+			if(DWARFY_LEVEL_UP)
+				value = DORF_XP_LEVEL(standard_xp_lvl_up, xp_lvl_multiplier, lvl)
+		value = round(value, 1)
+		if(!associative)
+			levels += value
+			continue
+		if(max_assoc)
+			levels["[max_assoc] +[max_assoc_start++]"] = value
+			continue
+		var/key = LAZYACCESS(levels, lvl)
+		if(!key)
+			if(lvl == 1) //You dun goof it.
+				stack_trace("Skill datum [src] was set to have an associative levels list despite the latter having no key value.")
+				associative = FALSE
+				levels += value
+				continue
+			max_assoc = levels[lvl-1]
+			levels["[max_assoc] +[max_assoc_start++]"] = value
+		levels[key] = value
+
+/datum/skill/level/sanitize_value(new_value)
+	return max(new_value, 0)
+
+/datum/skill/level/set_skill_value(datum/skill_holder/H, value, datum/mind/M, silent = FALSE)
+	H.skills[type] = 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/level/standard_render_value(value, level)
+	var/current_lvl = associative ? (!level ? unskilled_tier : levels[level]) : level
+	var/current_lvl_xp_sum = 0
+	if(level)
+		current_lvl_xp_sum = associative ? levels[levels[level]] : levels[level]
+	var/next_index = max(max_levels, level+1)
+	var/next_lvl_xp = associative ? levels[levels[next_index]] : levels[next_index]
+	if(next_lvl_xp > current_lvl_xp_sum)
+		next_lvl_xp -= current_lvl_xp_sum
+
+
+	return "[associative ? current_lvl : "Lvl. [current_lvl]"] ([value - current_lvl_xp_sum]/[next_lvl_xp])[level == max_levels ? " \[MAX!\]" : ""]"
+
+/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/level/dwarfy
+	abstract_type = /datum/skill/level/dwarfy
+	standard_xp_lvl_up = DORF_XP_LVL_UP
+	xp_lvl_multiplier = DORF_XP_LVL_MULTI
+	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"
@@ -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.
@@ -15,54 +23,139 @@
 		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(!skills)
 		return null
-	return LAZYACCESS(skills, skill)
+	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, /datum/skill))
+		CRASH("Invalid get_skill_value call. Use skill 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!!
  */
 /datum/skill_holder/proc/get_skill_affinity(skill)
-	if(!ispath(skill))
-		CRASH("Invalid get_skill_affinity call. Use typepaths.")		//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
-	if(!skills)
-		return 1
+	. = 1
+	if(!ispath(skill, /datum/skill))
+		CRASH("Invalid get_skill_affinity call. Use skill typepaths.")	//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
 	var/affinity = LAZYACCESS(skill_affinities, skill)
-	if(isnull(affinity))
-		return 1
-	return affinity
+	if(!isnull(affinity))
+		. = affinity
+	var/list/wrapped = list(.)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_SKILL_GET_AFFINITY, skill, wrapped)
+	. = wrapped[1]
+

 /**
  * Sets the value of a skill.
  */
-/datum/skill_holder/proc/set_skill_value(skill, value)
-	if(!ispath(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.
-	LAZYINITLIST(skills)
-	value = sanitize_skill_value(skill, value)
+/datum/skill_holder/proc/set_skill_value(skill, value, silent = FALSE)
+	if(!ispath(skill, /datum/skill))
+		CRASH("Invalid set_skill_value call. Use skill typepaths.")	//until a time when we somehow need text ids for dynamic skills, I'm enforcing this.
+	var/datum/skill/S = GLOB.skill_datums[skill]
+	value = S.sanitize_value(value)
 	if(!isnull(value))
-		LAZYSET(skills, skill, value)
+		LAZYINITLIST(skills)
+		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)
+/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)
+	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)
-	if(!ispath(skill, /datum/skill/numerical))
-		CRASH("You cannot auto increment a non numerical skill!")
+/datum/skill_holder/proc/auto_gain_experience(skill, value, maximum, silent = FALSE)
+	if(!ispath(skill, /datum/skill))
+		CRASH("Invalid set_skill_value call. Use skill typepaths.")
+	var/datum/skill/S = GLOB.skill_datums[skill]
+	if(S.progression_type != SKILL_PROGRESSION_NUMERICAL && S.progression_type != SKILL_PROGRESSION_LEVEL)
+		CRASH("You cannot auto increment a non numerical(experience skill!")
 	var/current = get_skill_value(skill)
 	var/affinity = get_skill_affinity(skill)
-	boost_skill_value_to(skill, current + (value * affinity))
+	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)
+
+/**
+  * Generic value modifier proc that uses one skill.
+  * Args:
+  * * value : the value to modify, may be a delay, damage, probability.
+  * * threshold : The difficulty of the action, in short. Refer to __DEFINES/skills/defines.dm for the defines.
+  * * modifier_is_multiplier : wheter the modifier is a multiplier or a divisor.
+  */
+/datum/skill_holder/proc/action_skills_mod(skill, value, threshold, modifier_is_multiplier = TRUE)
+	var/mod
+	var/datum/skill/S = GLOB.skill_datums[skill]
+	if(!S)
+		return
+	switch(S.progression_type)
+		if(SKILL_PROGRESSION_LEVEL)
+			mod = LAZYACCESS(skill_levels, S.type)
+		else
+			mod = LAZYACCESS(skills, S.type)
+	mod = (1+(mod-S.competency_thresholds[threshold])*S.competency_mults[threshold])
+
+	var/list/comsig_values = list(mod)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_ACTION_SKILL_MOD, args, comsig_values)
+	mod = comsig_values[MOD_VALUES_SKILL_MOD]
+
+	. = modifier_is_multiplier ? value*mod : value/mod
+
+/**
+  * Generic value modifier proc that uses several skills, intended for items.
+  * Args:
+  * * item/I : the item used in this action. its used_skills list variable contains the skills exercised with it.
+  * * value : the value to modify, may be a delay, damage, probability.
+  * * flags : the required flags that each skill (either in I.used_skills or the skill datum skill_flags) must have to influence
+  * * 			the value.
+  * * bad_flags : the opposite of the above, skills that must not be present to impact the value.
+  * * modifier_is_multiplier : wheter the modifier is a multiplier or a divisor.
+  */
+/datum/skill_holder/proc/item_action_skills_mod(obj/item/I, value, flags = NONE, bad_flags = NONE, modifier_is_multiplier = TRUE)
+	. = value
+	var/sum = 0
+	var/divisor = 0
+	var/list/checked_skills
+	for(var/k in I.used_skills)
+		var/datum/skill/S = GLOB.skill_datums[k]
+		if(!S)
+			continue
+		var/our_flags = (I.used_skills[k]|S.skill_flags)
+		if((flags && !(our_flags & flags)) || (bad_flags && our_flags & bad_flags))
+			continue
+		var/mod
+		switch(S.progression_type)
+			if(SKILL_PROGRESSION_LEVEL)
+				mod = LAZYACCESS(skill_levels, S.type)
+			else
+				mod = LAZYACCESS(skills, S.type)
+		sum += 1+(mod - S.competency_thresholds[I.skill_difficulty])*S.competency_mults[I.skill_difficulty]
+		LAZYADD(checked_skills, S)
+
+	var/list/comsig_values = list(sum, divisor, checked_skills)
+	SEND_SIGNAL(owner.current, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD, args, comsig_values)
+	sum = comsig_values[MOD_VALUES_ITEM_SKILLS_SUM]
+	divisor = comsig_values[MOD_VALUES_ITEM_SKILLS_DIV]
+
+	if(divisor)
+		. = modifier_is_multiplier ? value*(sum/divisor) : value/(sum/divisor)

 /**
  * Generates a HTML readout of our skills.
@@ -73,6 +166,6 @@
 	out += "<table style=\"width:100%\"><tr><th><b>Skill</b><th><b>Value</b></tr>"
 	for(var/path in skills)
 		var/datum/skill/S = GLOB.skill_datums[path]
-		out += "<tr><td>[S.name]</td><td>[S.standard_render_value(skills[path])]</td></tr>"
+		out += "<tr><td><font color='[S.name_color]'>[S.name]</font></td><td>[S.standard_render_value(skills[path], LAZYACCESS(skill_levels, path) || 0)]</td></tr>"
 	out += "</table>"
 	return out.Join("")
@@ -0,0 +1,6 @@
+/datum/skill/level/job/wiring
+	name = "Wiring"
+	desc = "How proficient and knowledged you are at wiring beyond laying cables on the floor."
+	name_color = COLOR_PALE_ORANGE
+	competency_thresholds = list(JOB_SKILL_BASIC, JOB_SKILL_EXPERT, JOB_SKILL_MASTER)
+	skill_flags = SKILL_USE_MOOD|SKILL_TRAIN_MOOD|SKILL_USE_TOOL|SKILL_TRAINING_TOOL
@@ -1,3 +1,5 @@
 /datum/skill/numerical/surgery
 	name = "Surgery"
 	desc = "How proficient you are at doing surgery."
+	name_color = COLOR_PALE_BLUE_GRAY
+	competency_mults = list(0.025, 0.025, 0.025) // 60% surgery speed up at max value of 100.
@@ -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,22 @@
 		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)
+			LAZYSET(current_users, user, TRUE)
+			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))
+				LAZYREMOVE(current_users, user)
+				return FALSE
+			LAZYREMOVE(current_users, user)
+	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 +163,21 @@
 	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)
+			LAZYSET(current_users, user, TRUE)
+			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))
+				LAZYREMOVE(current_users, user)
+				return FALSE
+			LAZYREMOVE(current_users, user)
+	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 +255,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 +290,16 @@
 		if("cut")
 			I = L.is_holding_tool_quality(TOOL_WIRECUTTER)
 			if(I || IsAdminGhost(usr))
-				if(I && holder)
+				if(cut_color(target_wire, L) && 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>")
@@ -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(
@@ -1,6 +1,7 @@
 /datum/wires/airlock
 	holder_type = /obj/machinery/door/airlock
 	proper_name = "Generic Airlock"
+	req_skill = JOB_SKILL_UNTRAINED //Training wheel, as per request.
 	var/wiretype

 /datum/wires/airlock/secure
@@ -52,10 +53,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
@@ -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(
@@ -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(
@@ -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)
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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)
@@ -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(
@@ -48,8 +48,7 @@
 		if(2)
 			// State 2
 			if(istype(W, /obj/item/stack/cable_coil))
-				var/obj/item/stack/cable_coil/C = W
-				if(C.use(2))
+				if(W.use_tool(src, user, 0, 2))
 					to_chat(user, "<span class='notice'>You add wires to the assembly.</span>")
 					state = 3
 				else
@@ -83,7 +83,6 @@
 			if(istype(P, /obj/item/stack/cable_coil))
 				if(!P.tool_start_check(user, amount=5))
 					return
-
 				to_chat(user, "<span class='notice'>You start to add cables to the frame...</span>")
 				if(P.use_tool(src, user, 20, volume=50, amount=5))
 					to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
@@ -400,12 +400,11 @@
 									 "<span class='notice'>You begin adding wires to [src]...</span>")
 				playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1)
 				if(do_after(user, 60, target = src))
-					if(constructionStep != CONSTRUCTION_GUTTED || B.get_amount() < 5 || !B)
+					if(constructionStep != CONSTRUCTION_GUTTED || !B.use_tool(src, user, 0, 5))
 						return
 					user.visible_message("<span class='notice'>[user] adds wires to [src].</span>", \
 										 "<span class='notice'>You wire [src].</span>")
 					playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1)
-					B.use(5)
 					constructionStep = CONSTRUCTION_WIRES_EXPOSED
 					update_icon()
 				return
@@ -205,11 +205,9 @@
 					return
 			if(1)
 				if(istype(W, /obj/item/stack/cable_coil))
-					var/obj/item/stack/cable_coil/coil = W
-					if(coil.get_amount() < 5)
+					if(!W.use_tool(src, user, 0, 5))
 						to_chat(user, "<span class='warning'>You need more cable for this!</span>")
 					else
-						coil.use(5)
 						buildstage = 2
 						to_chat(user, "<span class='notice'>You wire \the [src].</span>")
 						update_icon()
@@ -160,10 +160,7 @@
 			to_chat(user, "<span class='warning'>You need one length of cable to repair [src]!</span>")
 			return
 		to_chat(user, "<span class='notice'>You begin to replace the wires...</span>")
-		if(do_after(user, 30, target = src))
-			if(coil.get_amount() < 1)
-				return
-			coil.use(1)
+		if(W.use_tool(src, user, 30, 1))
 			obj_integrity = max_integrity
 			stat &= ~BROKEN
 			to_chat(user, "<span class='notice'>You repair \the [src].</span>")
@@ -220,8 +220,7 @@
 		return
 	else if(istype(W, /obj/item/stack/cable_coil))
 		if(state == 3 && (internal_damage & MECHA_INT_SHORT_CIRCUIT))
-			var/obj/item/stack/cable_coil/CC = W
-			if(CC.use(2))
+			if(W.use_tool(src, user, 0, 2))
 				clearInternalDamage(MECHA_INT_SHORT_CIRCUIT)
 				to_chat(user, "<span class='notice'>You replace the fused wires.</span>")
 			else
@@ -132,6 +132,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
 	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!

+	///Skills vars
+	//list of skill PATHS exercised when using this item. An associated bitfield can be set to indicate additional ways the skill is used by this specific item.
+	var/list/datum/skill/used_skills
+	var/skill_difficulty = THRESHOLD_COMPETENT //how difficult it's to use this item in general.
+	var/skill_gain = DEF_SKILL_GAIN //base skill value gain from using this item.
+
 /obj/item/Initialize()

 	if (attack_verb)
@@ -783,7 +789,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)

 // Called when a mob tries to use the item as a tool.
 // Handles most checks.
-/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks)
+/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks, skill_gain_mult = 1, max_level = INFINITY)
 	// No delay means there is no start message, and no reason to call tool_start_check before use_tool.
 	// Run the start check here so we wouldn't have to call it manually.
 	if(!delay && !tool_start_check(user, amount))
@@ -795,6 +801,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	play_tool_sound(target, volume)

 	if(delay)
+		if(user.mind && used_skills)
+			delay = user.mind.skill_holder.item_action_skills_mod(src, delay, skill_difficulty, SKILL_USE_TOOL, NONE, FALSE)
+
 		// Create a callback with checks that would be called every tick by do_after.
 		var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks)

@@ -819,6 +828,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	if(delay >= MIN_TOOL_SOUND_DELAY)
 		play_tool_sound(target, volume)

+	if(user.mind && used_skills && skill_gain_mult)
+		for(var/skill in used_skills)
+			if(!(used_skills[skill] & SKILL_TRAINING_TOOL))
+				continue
+			user.mind.skill_holder.auto_gain_experience(skill, skill_gain*skill_gain_mult, GET_STANDARD_LVL(max_level))
+
 	return TRUE

 // Called before use_tool if there is a delay, or by use_tool if there isn't.
@@ -97,8 +97,7 @@
 		to_chat(user, "<span class='notice'>You add [A] to the [initial(name)] assembly.</span>")

 	else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = I
-		if (C.use(1))
+		if (I.use_tool(src, user, 0, 1, max_level = JOB_SKILL_BASIC))
 			det_time = 50 // In case the cable_coil was removed and readded.
 			stage_change(WIRED)
 			to_chat(user, "<span class='notice'>You rig the [initial(name)] assembly.</span>")
@@ -325,7 +325,7 @@
 			else
 				target.LAssailant = WEAKREF(user)
 			cooldown_check = world.time + cooldown
-			user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes swinging batons cost stamina
+			user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT))
 		else
 			var/wait_desc = get_wait_description()
 			if(wait_desc)
@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 		if (get_amount() < 1 || CC.get_amount() < 5)
 			to_chat(user, "<span class='warning>You need five lengths of coil and one sheet of glass to make wired glass!</span>")
 			return
-		CC.use(5)
+		CC.use_tool(src, user, 0, 5, max_level = JOB_SKILL_BASIC)
 		use(1)
 		to_chat(user, "<span class='notice'>You attach wire to the [name].</span>")
 		var/obj/item/stack/light_w/new_tile = new(user.loc)
@@ -163,7 +163,7 @@
 	if(status)
 		if(baton_stun(M, user, disarming))
 			user.do_attack_animation(M)
-			user.adjustStaminaLossBuffered(getweight())		//CIT CHANGE - makes stunbatonning others cost stamina
+			user.adjustStaminaLossBuffered(getweight(user, STAM_COST_BATON_MOB_MULT))
 	else if(user.a_intent != INTENT_HARM)			//they'll try to bash in the last proc.
 		M.visible_message("<span class='warning'>[user] has prodded [M] with [src]. Luckily it was off.</span>", \
 						"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
@@ -241,11 +241,13 @@
 		playsound(user, activation_sound, transform_volume, 1)
 		w_class = WEIGHT_CLASS_BULKY
 		AddElement(/datum/element/sword_point)
+		total_mass = total_mass_on
 	else
 		to_chat(user, "<span class='notice'>[deactivation_message]</span>")
 		playsound(user, deactivation_sound, transform_volume, 1)
 		w_class = WEIGHT_CLASS_SMALL
 		RemoveElement(/datum/element/sword_point)
+		total_mass = initial(total_mass)

 	update_icon()
 	add_fingerprint(user)
@@ -287,9 +289,6 @@
 	else
 		return ..()

-/obj/item/toy/sword/getweight()
-	return (active ? total_mass_on : total_mass) || w_class *1.25
-
 /obj/item/toy/sword/cx
 	name = "\improper DX Non-Euplastic LightSword"
 	desc = "A deluxe toy replica of an energy sword. Realistic visuals and sounds! Ages 8 and up."
@@ -131,7 +131,7 @@
 					if(C.get_amount() >= 5)
 						playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
 						to_chat(user, "<span class='notice'>You start to add cables to the frame...</span>")
-						if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use(5))
+						if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use_tool(src, user, 0, 5))
 							to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
 							state = CABLED_CORE
 							update_icon()
@@ -84,7 +84,6 @@
 			panel_open = FALSE

 	else if(istype(I, /obj/item/stack/cable_coil) && panel_open)
-		var/obj/item/stack/cable_coil/C = I
 		if(obj_flags & EMAGGED) //Emagged, not broken by EMP
 			to_chat(user, "<span class='warning'>Sign has been damaged beyond repair!</span>")
 			return
@@ -92,7 +91,7 @@
 			to_chat(user, "<span class='warning'>This sign is functioning properly!</span>")
 			return

-		if(C.use(2))
+		if(I.use_tool(src, user, 0, 2))
 			to_chat(user, "<span class='notice'>You replace the burnt wiring.</span>")
 			broken = FALSE
 		else
@@ -169,8 +169,7 @@
 				if(do_after(user, 40, target = src))
 					if(!src || !anchored || src.state != "01")
 						return
-					var/obj/item/stack/cable_coil/CC = W
-					if(!CC.use(1))
+					if(!W.use_tool(src, user, 0, 1))
 						to_chat(user, "<span class='warning'>You need more cable to do this!</span>")
 						return
 					to_chat(user, "<span class='notice'>You wire the windoor.</span>")
@@ -786,9 +786,8 @@
 					return
 				user.visible_message("[user.name] wires the air alarm.", \
 									"<span class='notice'>You start wiring the air alarm...</span>")
-				if (do_after(user, 20, target = src))
-					if (cable.get_amount() >= 5 && buildstage == 1)
-						cable.use(5)
+				if (W.use_tool(src, user, 20, 5))
+					if (buildstage == 1)
 						to_chat(user, "<span class='notice'>You wire the air alarm.</span>")
 						wires.repair()
 						aidisabled = 0
@@ -32,7 +32,7 @@
 /obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
 	if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/C = I
-		C.use(1)
+		I.use_tool(src, user, 0, 1)
 		has_sensor = HAS_SENSORS
 		to_chat(user,"<span class='notice'>You repair the suit sensors on [src] with [C].</span>")
 		return 1
@@ -392,8 +392,7 @@

 /datum/plant_gene/trait/battery/on_attackby(obj/item/reagent_containers/food/snacks/grown/G, obj/item/I, mob/user)
 	if(istype(I, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = I
-		if(C.use(5))
+		if(I.use_tool(src, user, 0, 5, max_level = JOB_SKILL_EXPERT))
 			to_chat(user, "<span class='notice'>You add some cable to [G] and slide it inside the battery encasing.</span>")
 			var/obj/item/stock_parts/cell/potato/pocell = new /obj/item/stock_parts/cell/potato(user.loc)
 			pocell.icon_state = G.icon_state
@@ -174,7 +174,7 @@
 	if(!starting_skills)
 		return
 	for(var/skill in starting_skills)
-		M.skill_holder.boost_skill_value_to(skill, starting_skills[skill])
+		M.skill_holder.boost_skill_value_to(skill, starting_skills[skill], TRUE) //silent
 	// do wipe affinities though
 	M.skill_holder.skill_affinities = list()
 	for(var/skill in skill_affinities)
@@ -17,6 +17,8 @@
 	var/do_special_check = TRUE
 	threat = 5

+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_BASIC))
+
 /datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null)
 	if(visualsOnly)
 		CRASH("dynamic preview is unsupported")
@@ -17,6 +17,10 @@
 									ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ENGINE,
 									ACCESS_ENGINE_EQUIP, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM)
+
+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_BASIC))
+	skill_affinities = list(/datum/skill/level/job/wiring = STARTING_SKILL_AFFINITY_WIRING_ENGI_ROBO)
+
 	display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN
 	threat = 0.5

@@ -27,6 +27,9 @@
 						ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, ACCESS_MINISAT,
 						ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)

+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_TRAINED))
+	skill_affinities = list(/datum/skill/level/job/wiring = STARTING_SKILL_AFFINITY_WIRING_ENGI_ROBO)
+
 	display_order = JOB_DISPLAY_ORDER_CHIEF_ENGINEER
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/paraplegic, /datum/quirk/insanity)
 	threat = 2
@@ -12,6 +12,8 @@
 	exp_requirements = 120
 	exp_type = EXP_TYPE_CREW

+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_BASIC))
+
 	display_order = JOB_DISPLAY_ORDER_CYBORG

 /datum/job/cyborg/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source = null)
@@ -16,6 +16,10 @@
 	access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY, ACCESS_GENETICS)
 	minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)

+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_TRAINED))
+	skill_affinities = list(/datum/skill/level/job/wiring = STARTING_SKILL_AFFINITY_WIRING_ENGI_ROBO)
+
+
 	display_order = JOB_DISPLAY_ORDER_ROBOTICIST
 	threat = 1

@@ -18,6 +18,9 @@
 	minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
 									ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_TCOMSAT, ACCESS_MINERAL_STOREROOM)

+	starting_skills = list(/datum/skill/level/job/wiring = GET_STANDARD_LVL(JOB_SKILL_TRAINED))
+	skill_affinities = list(/datum/skill/level/job/wiring = STARTING_SKILL_AFFINITY_WIRING_ENGI_ROBO)
+
 	display_order = JOB_DISPLAY_ORDER_STATION_ENGINEER

 	threat = 1
@@ -363,12 +363,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\

 /obj/item/coin/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/CC = W
 		if(string_attached)
 			to_chat(user, "<span class='warning'>There already is a string attached to this coin!</span>")
 			return

-		if (CC.use(1))
+		if (W.use_tool(src, user, 0, 1, max_level = JOB_SKILL_BASIC))
 			add_overlay("coin_string_overlay")
 			string_attached = 1
 			to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
@@ -199,7 +199,7 @@
 			to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
 			return

-		adjustStaminaLossBuffered(I.getweight()*2)//CIT CHANGE - throwing items shall be more tiring than swinging em. Doubly so.
+		adjustStaminaLossBuffered(I.getweight(src, STAM_COST_THROW_MULT, SKILL_THROW_STAM_COST))

 	if(thrown_thing)
 		visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
@@ -9,7 +9,7 @@
 	if(istype(src.glasses, /obj/item/clothing/glasses))		//glasses
 		var/obj/item/clothing/glasses/GFP = src.glasses
 		number += GFP.flash_protect
- 
+
 	if(istype(src.wear_mask, /obj/item/clothing/mask))		//mask
 		var/obj/item/clothing/mask/MFP = src.wear_mask
 		number += MFP.flash_protect
@@ -77,15 +77,13 @@
 	SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)

 /mob/living/carbon/attacked_by(obj/item/I, mob/living/user)
-	//CIT CHANGES START HERE - combatmode and resting checks
-	var/totitemdamage = I.force
+	var/totitemdamage = pre_attacked_by(I, user)
 	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		totitemdamage *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		totitemdamage *= 0.5
 	if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		totitemdamage *= 1.5
-	//CIT CHANGES END HERE
 	var/impacting_zone = (user == src)? check_zone(user.zone_selected) : ran_zone(user.zone_selected)
 	if((user != src) && (run_block(I, totitemdamage, "the [I]", ATTACK_TYPE_MELEE, I.armour_penetration, user, impacting_zone) & BLOCK_SUCCESS))
 		return FALSE
@@ -94,7 +92,7 @@
 		affecting = bodyparts[1]
 	SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
 	send_item_attack_message(I, user, affecting.name)
-	I.do_stagger_action(src, user)
+	I.do_stagger_action(src, user, totitemdamage)
 	if(I.force)
 		apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
@@ -1668,9 +1668,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			disarm(M, H, attacker_style)

 /datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
+	var/totitemdamage = H.pre_attacked_by(I, user)
 	// Allows you to put in item-specific reactions based on species
 	if(user != H)
-		if(H.run_block(I, I.force, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, affecting.body_zone) & BLOCK_SUCCESS)
+		if(H.run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, affecting.body_zone) & BLOCK_SUCCESS)
 			return 0
 	if(H.check_martial_melee_block())
 		H.visible_message("<span class='warning'>[H] blocks [I]!</span>")
@@ -1686,24 +1687,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/armor_block = H.run_armor_check(affecting, "melee", "<span class='notice'>Your armor has protected your [hit_area].</span>", "<span class='notice'>Your armor has softened a hit to your [hit_area].</span>",I.armour_penetration)
 	armor_block = min(90,armor_block) //cap damage reduction at 90%
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
-	//CIT CHANGES START HERE - combatmode and resting checks
-	var/totitemdamage = I.force
-	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
-		totitemdamage *= 0.5
-	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
-		totitemdamage *= 0.5
-	if(istype(H))
-		if(!(H.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
-			totitemdamage *= 1.5
-	//CIT CHANGES END HERE
 	var/weakness = H.check_weakness(I, user)
 	apply_damage(totitemdamage * weakness, I.damtype, def_zone, armor_block, H) //CIT CHANGE - replaces I.force with totitemdamage

 	H.send_item_attack_message(I, user, hit_area)

-	I.do_stagger_action(H, user)
+	I.do_stagger_action(H, user, totitemdamage)

-	if(!I.force)
+	if(!totitemdamage)
 		return 0 //item force is zero

 	//dismemberment
@@ -427,24 +427,23 @@

 	else if(istype(W, /obj/item/stack/cable_coil) && wiresexposed)
 		user.changeNext_move(CLICK_CD_MELEE)
-		var/obj/item/stack/cable_coil/coil = W
 		if (getFireLoss() > 0 || getToxLoss() > 0)
-			if(src == user && coil.use(1))
+			if(src == user)
 				to_chat(user, "<span class='notice'>You start fixing yourself...</span>")
-				if(!do_after(user, 50, target = src))
+				if(!W.use_tool(src, user, 50, 1, max_level = JOB_SKILL_TRAINED))
+					to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
 					return
 				adjustFireLoss(-10)
 				adjustToxLoss(-10)
-			if (coil.use(1))
+			else
 				to_chat(user, "<span class='notice'>You start fixing [src]...</span>")
-				if(!do_after(user, 30, target = src))
+				if(!W.use_tool(src, user, 30, 1))
+					to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
 					return
 				adjustFireLoss(-30)
 				adjustToxLoss(-30)
 				updatehealth()
 				user.visible_message("[user] has fixed some of the burnt wires on [src].", "<span class='notice'>You fix some of the burnt wires on [src].</span>")
-			else
-				to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
 		else
 			to_chat(user, "The wires seem fine, there's no need to fix them.")

@@ -147,9 +147,8 @@
 					to_chat(user, "<span class='warning'>You need one length of cable to wire the ED-209!</span>")
 					return
 				to_chat(user, "<span class='notice'>You start to wire [src]...</span>")
-				if(do_after(user, 40, target = src))
-					if(coil.get_amount() >= 1 && build_step == 6)
-						coil.use(1)
+				if(coil.use_tool(src, user, 40, 1))
+					if(build_step == 6)
 						to_chat(user, "<span class='notice'>You wire [src].</span>")
 						name = "wired ED-209 assembly"
 						build_step++
@@ -41,11 +41,10 @@

 	// Cable coil. Works as repair method, but will probably require multiple applications and more cable.
 	if(istype(I, /obj/item/stack/cable_coil))
-		var/obj/item/stack/S = I
 		if(obj_integrity == max_integrity)
 			to_chat(user, "<span class='warning'>\The [src] doesn't seem to require repairs.</span>")
 			return 1
-		if(S.use(1))
+		if(I.use_tool(src, user, 0, 1))
 			to_chat(user, "<span class='notice'>You patch up \the [src] with a bit of \the [I].</span>")
 			obj_integrity = min(obj_integrity + 10, max_integrity)
 		return 1
@@ -597,19 +597,15 @@
 		user.visible_message("[user.name] adds cables to the APC frame.", \
 							"<span class='notice'>You start adding cables to the APC frame...</span>")
 		playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
-		if(do_after(user, 20, target = src))
-			if (C.get_amount() < 10 || !C)
+		if(C.use_tool(src, user, 20, 10) && !terminal && opened && has_electronics)
+			var/turf/T = get_turf(src)
+			var/obj/structure/cable/N = T.get_cable_node()
+			if (prob(50) && electrocute_mob(usr, N, N, 1, TRUE))
+				do_sparks(5, TRUE, src)
 				return
-			if (C.get_amount() >= 10 && !terminal && opened && has_electronics)
-				var/turf/T = get_turf(src)
-				var/obj/structure/cable/N = T.get_cable_node()
-				if (prob(50) && electrocute_mob(usr, N, N, 1, TRUE))
-					do_sparks(5, TRUE, src)
-					return
-				C.use(10)
-				to_chat(user, "<span class='notice'>You add cables to the APC frame.</span>")
-				make_terminal()
-				terminal.connect_to_network()
+			to_chat(user, "<span class='notice'>You add cables to the APC frame.</span>")
+			make_terminal()
+			terminal.connect_to_network()
 	else if (istype(W, /obj/item/electronics/apc) && opened)
 		if (has_electronics)
 			to_chat(user, "<span class='warning'>There is already a board inside the [src]!</span>")
@@ -510,6 +510,7 @@ By design, d1 is the smallest direction and d2 is the highest
 	full_w_class = WEIGHT_CLASS_SMALL
 	grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
 	usesound = 'sound/items/deconstruct.ogg'
+	used_skills = list(/datum/skill/level/job/wiring)

 /obj/item/stack/cable_coil/cyborg
 	is_cyborg = 1
@@ -591,8 +592,6 @@ By design, d1 is the smallest direction and d2 is the highest
 		amount += extra
 	update_icon()

-
-
 ///////////////////////////////////////////////
 // Cable laying procedures
 //////////////////////////////////////////////
@@ -15,8 +15,7 @@
 		state = FLOODLIGHT_NEEDS_WIRES
 		desc = "A bare metal frame looking vaguely like a floodlight. Requires wiring."
 	else if(istype(O, /obj/item/stack/cable_coil) && (state == FLOODLIGHT_NEEDS_WIRES))
-		var/obj/item/stack/S = O
-		if(S.use(5))
+		if(O.use_tool(src, user, 0, 5))
 			to_chat(user, "<span class='notice'>You wire [src].</span>")
 			name = "wired [name]"
 			desc = "A bare metal frame looking vaguely like a floodlight. Requires securing with a screwdriver."
@@ -118,8 +118,7 @@
 				return

 			if(istype(W, /obj/item/stack/cable_coil))
-				var/obj/item/stack/cable_coil/coil = W
-				if(coil.use(1))
+				if(W.use_tool(src, user, 0, 1, max_level = JOB_SKILL_TRAINED))
 					icon_state = "[fixture_type]-construct-stage2"
 					stage = 2
 					user.visible_message("[user.name] adds wires to [src].", \
@@ -79,8 +79,7 @@
 				construction_state = PA_CONSTRUCTION_UNSECURED
 				did_something = TRUE
 			else if(istype(W, /obj/item/stack/cable_coil))
-				var/obj/item/stack/cable_coil/CC = W
-				if(CC.use(1))
+				if(W.use_tool(src, user, 0, 1))
 					user.visible_message("[user.name] adds wires to the [name].", \
 						"You add some wires.")
 					construction_state = PA_CONSTRUCTION_PANEL_OPEN
@@ -288,8 +288,7 @@
 				construction_state = PA_CONSTRUCTION_UNSECURED
 				did_something = TRUE
 			else if(istype(W, /obj/item/stack/cable_coil))
-				var/obj/item/stack/cable_coil/CC = W
-				if(CC.use(1))
+				if(W.use_tool(src, user, 0, 1))
 					user.visible_message("[user.name] adds wires to the [name].", \
 						"You add some wires.")
 					construction_state = PA_CONSTRUCTION_PANEL_OPEN
@@ -125,15 +125,12 @@
 		to_chat(user, "<span class='notice'>You start building the power terminal...</span>")
 		playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)

-		if(do_after(user, 20, target = src) && C.get_amount() >= 10)
-			if(C.get_amount() < 10 || !C)
-				return
+		if(C.use_tool(src, user, 20, 10))
 			var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
 			if (prob(50) && electrocute_mob(usr, N, N, 1, TRUE)) //animate the electrocution if uncautious and unlucky
 				do_sparks(5, TRUE, src)
 				return

-			C.use(10)
 			user.visible_message(\
 				"[user.name] has built a power terminal.",\
 				"<span class='notice'>You build the power terminal.</span>")
@@ -331,8 +331,7 @@
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
 	..()
 	if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
-		var/obj/item/stack/cable_coil/C = A
-		if(C.use(10))
+		if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC))
 			slot_flags = ITEM_SLOT_BACK
 			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
 			slung = TRUE
@@ -19,7 +19,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_l_arm"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 2
 	burn_reduction = 1

@@ -40,7 +40,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_r_arm"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 2
 	burn_reduction = 1

@@ -61,7 +61,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_l_leg"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 2
 	burn_reduction = 1

@@ -82,7 +82,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_r_leg"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 2
 	burn_reduction = 1

@@ -102,7 +102,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_chest"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 2
 	burn_reduction = 1

@@ -131,8 +131,7 @@
 		if(src.wired)
 			to_chat(user, "<span class='warning'>You have already inserted wire!</span>")
 			return
-		var/obj/item/stack/cable_coil/coil = W
-		if (coil.use(1))
+		if (W.use_tool(src, user, 0, 1))
 			src.wired = 1
 			to_chat(user, "<span class='notice'>You insert the wire.</span>")
 		else
@@ -164,7 +163,7 @@
 	flags_1 = CONDUCT_1
 	icon_state = "borg_head"
 	status = BODYPART_ROBOTIC
-	
+
 	brute_reduction = 5
 	burn_reduction = 4

@@ -58,10 +58,9 @@
 		return FALSE
 	if(tool)
 		speed_mod = tool.toolspeed
-	var/skill_mod = 1
-	if(user?.mind?.skill_holder)
-		skill_mod = SURGERY_SKILL_SPEEDUP_NUMERICAL_SCALE(user.mind.skill_holder.get_skill_value(/datum/skill/numerical/surgery))
-	if(do_after(user, time * speed_mod * skill_mod, target = target))
+	if(user.mind)
+		speed_mod = user.mind.skill_holder.action_skills_mod(/datum/skill/numerical/surgery, speed_mod, THRESHOLD_COMPETENT, FALSE)
+	if(do_after(user, time * speed_mod, target = target))
 		var/prob_chance = 100
 		if(implement_type)	//this means it isn't a require hand or any item step.
 			prob_chance = implements[implement_type]
@@ -69,7 +68,7 @@

 		if((prob(prob_chance) || (iscyborg(user) && !silicons_obey_prob)) && chem_check(target) && !try_to_fail)
 			if(success(user, target, target_zone, tool, surgery))
-				user?.mind?.skill_holder?.auto_gain_experience(/datum/skill/numerical/surgery, SKILL_GAIN_SURGERY_PER_STEP)
+				user.mind?.skill_holder.auto_gain_experience(/datum/skill/numerical/surgery, SKILL_GAIN_SURGERY_PER_STEP)
 				advance = TRUE
 		else
 			if(failure(user, target, target_zone, tool, surgery))
@@ -129,7 +129,8 @@
 #include "code\__DEFINES\misc\return_values.dm"
 #include "code\__DEFINES\mobs\slowdowns.dm"
 #include "code\__DEFINES\research\stock_parts.dm"
-#include "code\__DEFINES\skills\skills.dm"
+#include "code\__DEFINES\skills\defines.dm"
+#include "code\__DEFINES\skills\helpers.dm"
 #include "code\__HELPERS\_cit_helpers.dm"
 #include "code\__HELPERS\_lists.dm"
 #include "code\__HELPERS\_logging.dm"
@@ -582,6 +583,7 @@
 #include "code\datums\skills\_check_skills.dm"
 #include "code\datums\skills\_skill.dm"
 #include "code\datums\skills\_skill_holder.dm"
+#include "code\datums\skills\engineering.dm"
 #include "code\datums\skills\medical.dm"
 #include "code\datums\status_effects\buffs.dm"
 #include "code\datums\status_effects\debuffs.dm"