Merge branch 'yogstation13:master' into tgui_changelog

Author: ToasterBiome

code/__DEFINES/skills.dm

@@ -25,3 +25,6 @@
 
 /// Experience required to increase your skills by one level. Increases exponentially the higher your level already is.
 #define EXPERIENCE_PER_LEVEL 500
+
+/// Calculates how much experience is required to reach a given level.
+#define EXP_REQ_CALC(level) (EXPERIENCE_PER_LEVEL * (((2**(level + 1)) / 2) - 1))

code/_onclick/hud/screen_objects.dm

@@ -155,7 +155,7 @@
 	data["skills"] = skill_data
 	data["skill_points"] = user.mind.skill_points
 	data["allocated_points"] = allocated_points
-	data["exceptional_skill"] = HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
+	data["skill_cap"] = EXP_MASTER + HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
 	return data
 
 /atom/movable/screen/skill_menu/ui_static_data(mob/user)
@@ -199,7 +199,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_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)))
+			if(allocated_skills[params["skill"]] + params["amount"] + user.get_skill(params["skill"]) > (EXP_MASTER + HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)))
 				return TRUE
 			if(allocated_skills[params["skill"]] + params["amount"] < 0)
 				return TRUE

code/_onclick/telekinesis.dm

@@ -19,7 +19,7 @@
 	if(user.stat || !tkMaxRangeCheck(user, src))
 		return
 	new /obj/effect/temp_visual/telekinesis(get_turf(src))
-	user.UnarmedAttack(src,0) // attack_hand, attack_paw, etc
+	user.UnarmedAttack(src, FALSE, list()) // attack_hand, attack_paw, etc
 	add_hiddenprint(user)
 	return
 

code/datums/mind.dm

@@ -59,7 +59,7 @@
 		SKILL_FITNESS = EXP_NONE,
 	)
 
-	/// Progress towards increasing their skill level
+	/// Progress towards increasing their skill level.
 	var/list/exp_progress = list(
 		SKILL_PHYSIOLOGY = 0,
 		SKILL_MECHANICAL = 0,
@@ -68,6 +68,9 @@
 		SKILL_FITNESS = 0,
 	)
 
+	/// One-time experience gains that have already been acquired.
+	var/list/exp_sources = list()
+
 	/// Free skill points to allocate
 	var/skill_points = 0
 
@@ -118,6 +121,7 @@
 	key = _key
 	soulOwner = src
 	martial_art = default_martial_art
+	RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_EXCEPTIONAL_SKILL), PROC_REF(update_skills))
 
 /datum/mind/Destroy()
 	SSticker.minds -= src
@@ -804,25 +808,47 @@
 		return FALSE
 	return (mind.skills[skill] >= amount)
 
-/// Adds progress towards increasing skill level. Returns TRUE if it improved the skill.
-/mob/proc/add_exp(skill, amount)
+/// Adds progress towards increasing skill level. Returns TRUE if it added progress. Adding a source prevents gaining exp from that source again.
+/mob/proc/add_exp(skill, amount, source)
 	if(!mind)
 		return FALSE
-	if(mind.skill_points > 0)
+	if(!amount)
 		return FALSE
-	var/exp_required = EXPERIENCE_PER_LEVEL * (2**mind.skills[skill]) // exp required scales exponentially
-	if(mind.exp_progress[skill] + amount >= exp_required)
-		var/levels_gained = round(log(2, 1 + (mind.exp_progress[skill] + amount) / exp_required)) // in case you gained so much you go up more than one level
-		var/levels_allocated = hud_used?.skill_menu ? hud_used.skill_menu.allocated_skills[skill] : 0
-		if(levels_allocated > 0) // adjust any already allocated skills to prevent shenanigans (you know who you are)
-			hud_used.skill_menu.allocated_points -= min(levels_gained, levels_allocated)
-			hud_used.skill_menu.allocated_skills[skill] -= min(levels_gained, levels_allocated)
-		mind.exp_progress[skill] += amount - exp_required * (2**(levels_gained - 1))
-		adjust_skill(skill, levels_gained)
-		to_chat(src, span_boldnotice("Your [skill] skill is now level [get_skill(skill)]!"))
-		return TRUE
+	if(source && (source in mind.exp_sources))
+		return FALSE
+	mind.exp_sources.Add(source)
 	mind.exp_progress[skill] += amount
-	return FALSE
+	var/levels_gained = check_exp(skill)
+	if(levels_gained) // remove an equal amount of unallocated skill points to prevent exploits
+		mind.skill_points = max(mind.skill_points - levels_gained, 0)
+	return TRUE
+
+/// Levels up a skill if it has enough experience to do so.
+/mob/proc/check_exp(skill)
+	if(!mind)
+		return FALSE
+	var/current_level = get_skill(skill)
+	var/exp_required = EXPERIENCE_PER_LEVEL * (2**current_level) // exp required scales exponentially
+	if(mind.exp_progress[skill] < exp_required)
+		return FALSE
+	var/skill_cap = EXP_MASTER + HAS_MIND_TRAIT(src, TRAIT_EXCEPTIONAL_SKILL)
+	var/levels_gained = min(round(log(2, 1 + (mind.exp_progress[skill] / exp_required))), max(skill_cap - current_level)) // in case you gained so much you go up more than one level
+	if(levels_gained < 1)
+		return FALSE
+	var/levels_allocated = hud_used?.skill_menu ? hud_used.skill_menu.allocated_skills[skill] : 0
+	if(levels_allocated > 0) // adjust any already allocated skills to prevent shenanigans (you know who you are)
+		hud_used.skill_menu.allocated_points -= min(levels_gained, levels_allocated)
+		hud_used.skill_menu.allocated_skills[skill] -= min(levels_gained, levels_allocated)
+	mind.exp_progress[skill] -= exp_required * (((2**round(levels_gained + 1)) / 2) - 1)
+	adjust_skill(skill, levels_gained, max_skill = skill_cap)
+	to_chat(src, span_boldnotice("Your [skill] skill is now level [get_skill(skill)]!"))
+	return levels_gained
+
+/// Returns whether experience has been gained from a given source.
+/mob/proc/has_exp(source)
+	if(!mind)
+		return FALSE
+	return (source in mind.exp_sources) ? TRUE : FALSE
 
 /// Adds skill points to be allocated at will.
 /mob/proc/add_skill_points(amount)
@@ -831,6 +857,14 @@
 	mind.skill_points += amount
 	throw_alert("skill points", /atom/movable/screen/alert/skill_up)
 
+/// Called when [TRAIT_EXCEPTIONAL_SKILL] is added to the mob.
+/datum/mind/proc/update_skills(datum/source)
+	SIGNAL_HANDLER
+	if(!current)
+		return
+	for(var/skill in skills)
+		current.check_exp(skill)
+
 /datum/mind/proc/has_martialart(string)
 	if(martial_art && martial_art.id == string)
 		return martial_art

code/datums/wires/_wires.dm

@@ -184,13 +184,15 @@
 		return TRUE
 	return FALSE
 
-/datum/wires/proc/cut(wire)
+/datum/wires/proc/cut(wire, mob/user)
 	if(is_cut(wire))
 		cut_wires -= wire
 		on_cut(wire, mend = TRUE)
 	else
 		cut_wires += wire
 		on_cut(wire, mend = FALSE)
+	if(user)
+		user.add_exp(SKILL_TECHNICAL, 50, "[wire]_[type]")
 
 /datum/wires/proc/cut_color(color)
 	cut(get_wire(color))
@@ -202,10 +204,12 @@
 	for(var/wire in wires)
 		cut(wire)
 
-/datum/wires/proc/pulse(wire, user)
+/datum/wires/proc/pulse(wire, mob/user)
 	if(is_cut(wire))
 		return
 	on_pulse(wire, user)
+	if(user)
+		user.add_exp(SKILL_TECHNICAL, 50, "[wire]_[type]")
 
 /datum/wires/proc/pulse_color(color, mob/living/user)
 	pulse(get_wire(color), user)

code/game/machinery/_machinery.dm

@@ -299,10 +299,6 @@ Class Procs:
 
 		return user.can_interact_with(src) //AIs don't care about petty mortal concerns like needing to be next to a machine to use it, but borgs do care somewhat
 
-	. = ..()
-	if(!.)
-		return FALSE
-
 	if(panel_open && !(interaction_flags_machine & INTERACT_MACHINE_OPEN))
 		return FALSE
 
@@ -395,6 +391,10 @@ Class Procs:
 		return FALSE
 	return _try_interact(user, modifiers)
 
+/obj/machinery/attack_tk(mob/user, modifiers)
+	new /obj/effect/temp_visual/telekinesis(get_turf(src))
+	return attack_hand(user, modifiers)
+
 /obj/machinery/attack_ai(mob/user, modifiers)
 	if(!(interaction_flags_machine & INTERACT_MACHINE_ALLOW_SILICON) && !IsAdminGhost(user))
 		return FALSE

code/game/mecha/mecha.dm

@@ -1380,6 +1380,6 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
 	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
+	if(HAS_TRAIT(pilot, TRAIT_SKILLED_PILOT) || HAS_MIND_TRAIT(pilot, TRAIT_SKILLED_PILOT))
+		effective_skill += EXP_LOW
+	return 1 + (2 - effective_skill) * 0.075

code/game/objects/items/granters/_granters.dm

@@ -8,6 +8,8 @@
 	unique = 1
 	/// Flavor messages displayed to mobs reading the granter
 	var/list/remarks = list()
+	/// Whether to display the remarks in order.
+	var/ordered_remarks = FALSE
 	/// Controls how long a mob must keep the book in his hand to actually successfully learn
 	var/pages_to_mastery = 3
 	/// Sanity, whether it's currently being read
@@ -40,7 +42,7 @@
 	on_reading_start(user)
 	reading = TRUE
 	for(var/i in 1 to pages_to_mastery)
-		if(!turn_page(user))
+		if(!turn_page(user, i))
 			on_reading_stopped()
 			reading = FALSE
 			return
@@ -64,13 +66,13 @@
 	to_chat(user, span_notice("You finish reading [name]!"))
 
 /// The actual "turning over of the page" flavor bit that happens while someone is reading the granter.
-/obj/item/book/granter/proc/turn_page(mob/living/user)
+/obj/item/book/granter/proc/turn_page(mob/living/user, current_page = 1)
 	playsound(user, pick(book_sounds), 30, TRUE)
 
 	if(!do_after(user, 5 SECONDS, src))
 		return FALSE
 
-	to_chat(user, span_notice("[length(remarks) ? pick_n_take(remarks) : "You keep reading..."]"))
+	to_chat(user, span_notice("[ordered_remarks ? "[remarks[current_page]]" : (length(remarks) ? pick_n_take(remarks) : "You keep reading...")]"))
 	return TRUE
 
 /// Effects that occur whenever the book is read when it has no uses left.

code/game/objects/items/granters/martial_arts/racial.dm

@@ -101,6 +101,7 @@
 	icon = 'icons/obj/module.dmi'
 	icon_state = "cyborg_upgrade"
 	remarks = list("MANKIND IS DEAD.", "BLOOD IS FUEL.", "HELL IS FULL.")
+	ordered_remarks = TRUE
 
 /obj/item/book/granter/martial/ultra_violence/on_reading_start(mob/user)
 	to_chat(user, span_notice("You plug \the [src] in and begin loading PRG$[martial_name]."))

code/game/objects/items/granters/mech_piloting.dm

@@ -14,4 +14,4 @@
 
 /obj/item/book/granter/mechpiloting/on_reading_finished(mob/user)
 	. = ..()
-	user.adjust_skill(SKILL_TECHNICAL, EXP_MID, max_skill = EXP_GENIUS)
+	ADD_TRAIT(user.mind, TRAIT_SKILLED_PILOT, type)