Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/datums/brain_damage/magic.dm

@@ -5,6 +5,61 @@
 /datum/brain_trauma/magic
 	resilience = TRAUMA_RESILIENCE_LOBOTOMY
 
+/datum/brain_trauma/magic/lumiphobia
+	name = "Lumiphobia"
+	desc = "Patient has an inexplicable adverse reaction to light."
+	scan_desc = "light hypersensitivity"
+	gain_text = "<span class='warning'>You feel a craving for darkness.</span>"
+	lose_text = "<span class='notice'>Light no longer bothers you.</span>"
+	var/next_damage_warning = 0
+
+/datum/brain_trauma/magic/lumiphobia/on_life()
+	..()
+	var/turf/T = owner.loc
+	if(istype(T))
+		var/light_amount = T.get_lumcount()
+		if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying
+			if(world.time > next_damage_warning)
+				to_chat(owner, "<span class='warning'><b>The light burns you!</b></span>")
+				next_damage_warning = world.time + 100 //Avoid spamming
+			owner.take_overall_damage(0,3)
+
+/datum/brain_trauma/magic/poltergeist
+	name = "Poltergeist"
+	desc = "Patient appears to be targeted by a violent invisible entity."
+	scan_desc = "paranormal activity"
+	gain_text = "<span class='warning'>You feel a hateful presence close to you.</span>"
+	lose_text = "<span class='notice'>You feel the hateful presence fade away.</span>"
+
+/datum/brain_trauma/magic/poltergeist/on_life()
+	..()
+	if(prob(4))
+		var/most_violent = -1 //So it can pick up items with 0 throwforce if there's nothing else
+		var/obj/item/throwing
+		for(var/obj/item/I in view(5, get_turf(owner)))
+			if(I.anchored)
+				continue
+			if(I.throwforce > most_violent)
+				most_violent = I.throwforce
+				throwing = I
+		if(throwing)
+			throwing.throw_at(owner, 8, 2)
+
+/datum/brain_trauma/magic/antimagic
+	name = "Athaumasia"
+	desc = "Patient is completely inert to magical forces."
+	scan_desc = "thaumic blank"
+	gain_text = "<span class='notice'>You realize that magic cannot be real.</span>"
+	lose_text = "<span class='notice'>You realize that magic might be real.</span>"
+
+/datum/brain_trauma/magic/antimagic/on_gain()
+	ADD_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
+	..()
+
+/datum/brain_trauma/magic/antimagic/on_lose()
+	REMOVE_TRAIT(owner, TRAIT_ANTIMAGIC, TRAUMA_TRAIT)
+	..()
+
 /datum/brain_trauma/magic/stalker
 	name = "Stalking Phantom"
 	desc = "Patient is stalked by a phantom only they can see."

code/datums/brain_damage/severe.dm

@@ -119,8 +119,9 @@
 
 /datum/brain_trauma/severe/paralysis/spinesnapped
 	random_gain = FALSE
+	clonable = FALSE
 	paralysis_type = "legs"
-	resilience = TRAUMA_RESILIENCE_LOBOTOMY
+	resilience = TRAUMA_RESILIENCE_LOBOTOMY // It shouldn't fix severed spinal cords really, but there is no specific surgery for that yet.
 
 /datum/brain_trauma/severe/narcolepsy
 	name = "Narcolepsy"

code/datums/components/crafting/glassware/lens_crafting.dm

@@ -92,7 +92,7 @@
 			qdel(src)
 
 /obj/item/glasswork/glasses
-	name = "Hand Made Glasses"
-	desc = "Hande made glasses that have not been polished at all making them useless. Selling them could still be worth a bit of credits."
+	name = "Handmade Glasses"
+	desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
 	icon = 'icons/obj/glass_ware.dmi'
 	icon_state = "frames_2"

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -92,7 +92,7 @@
 	time = 150
 	subcategory = CAT_MISCELLANEOUS
 	category = CAT_MISC
-	always_availible = FALSE	// Disabled til learned
+	always_availible = FALSE	// Disabled until learned
 
 
 /datum/crafting_recipe/bloodsucker/candelabrum

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

code/datums/mutations/actions.dm

@@ -42,6 +42,7 @@
 	school = "evocation"
 	charge_max = 600
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	range = 20
 	base_icon_state = "fireball"
 	action_icon_state = "fireball0"
@@ -122,6 +123,7 @@
 	desc = "A rare genome that attracts odd forces not usually observed. May sometimes pull you in randomly."
 	school = "evocation"
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	charge_max = 600
 	invocation = "DOOOOOOOOOOOOOOOOOOOOM!!!"
 	invocation_type = "shout"
@@ -155,6 +157,7 @@
 	dropmessage = "You let the electricity from your hand dissipate."
 	hand_path = /obj/item/melee/touch_attack/shock
 	charge_max = 400
+	antimagic_allowed = TRUE
 	clothes_req = NONE
 	action_icon_state = "zap"
 
@@ -212,6 +215,7 @@
 	desc = "Get a scent off of the item you're currently holding to track it. With an empty hand, you'll track the scent you've remembered."
 	charge_max = 100
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	range = -1
 	include_user = TRUE
 	action_icon_state = "nose"
@@ -290,6 +294,7 @@
 	name = "Drop a limb"
 	desc = "Concentrate to make a random limb pop right off your body."
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	charge_max = 100
 	action_icon_state = "autotomy"
 
@@ -327,6 +332,7 @@
 	name = "Lay Web"
 	desc = "Drops a web. Only you will be able to traverse your web easily, making it pretty good for keeping you safe."
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	charge_max = 4 SECONDS //the same time to lay a web
 	action_icon = 'icons/mob/actions/actions_genetic.dmi'
 	action_icon_state = "lay_web"
@@ -368,6 +374,7 @@
 	name = "Launch spike"
 	desc = "Shoot your tongue out in the direction you're facing, embedding it and dealing damage until they remove it."
 	clothes_req = NONE
+	antimagic_allowed = TRUE
 	charge_max = 100
 	action_icon = 'icons/mob/actions/actions_genetic.dmi'
 	action_icon_state = "spike"

code/datums/skills/_check_skills.dm

@@ -11,6 +11,66 @@
 	if(!mind.skill_holder)
 		to_chat(usr, "<span class='warning'>How do you check the skills of [(usr == src)? "yourself when you are" : "something"] without the capability for skills? (PROBABLY A BUG, PRESS F1.)</span>")
 		return
-	var/datum/browser/B = new(usr, "skilldisplay_[REF(src)]", "Skills of [src]")
-	B.set_content(mind.skill_html_readout())
-	B.open()
+
+	mind.skill_holder.ui_interact(src)
+
+/datum/skill_holder/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.always_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "skillpanel", "[owner.name]'s Skills", 620, 580, master_ui, state)
+		ui.set_autoupdate(FALSE) // This UI is only ever opened by one person, and never is updated outside of user input.
+		ui.open()
+	else if(need_static_data_update)
+		update_static_data(user)
+		need_static_data_update = FALSE
+
+/datum/skill_holder/ui_static_data(mob/user)
+	. = list()
+	.["skills"] = list()
+	for(var/path in GLOB.skill_datums)
+		var/datum/skill/S = GLOB.skill_datums[path]
+		var/list/dat = S.get_skill_data(src)
+		if(islist(dat["modifiers"]))
+			dat["modifiers"] = jointext(dat["modifiers"], ", ")
+		dat["percent_base"] = (dat["value_base"] / dat["max_value"])
+		dat["percent_mod"] = (dat["value_mod"] / dat["max_value"])
+		.["skills"] += list(dat)
+
+/datum/skill_holder/ui_data(mob/user)
+	. = list()
+	.["playername"] = owner.name
+	.["see_skill_mods"] = see_skill_mods
+	.["admin"] = check_rights(R_DEBUG)
+
+/datum/skill_holder/ui_act(action, params)
+	. = ..()
+	if(.)
+		return
+	switch(action)
+		if("toggle_mods")
+			see_skill_mods = !see_skill_mods
+			return TRUE
+		if ("adj_exp")
+			if(!check_rights(R_DEBUG))
+				return
+			var/skill = text2path(params["skill"])
+			var/number = input("Please insert the amount of experience/progress you'd like to add/subtract:") as num|null
+			if (number)
+				owner.set_skill_value(skill, owner.get_skill_value(skill, FALSE) + number)
+			return TRUE
+		if ("set_exp")
+			if(!check_rights(R_DEBUG))
+				return
+			var/skill = text2path(params["skill"])
+			var/number = input("Please insert the number you want to set the player's exp/progress to:") as num|null
+			if (!isnull(number))
+				owner.set_skill_value(skill, number)
+			return TRUE
+		if ("set_lvl")
+			if(!check_rights(R_DEBUG))
+				return
+			var/datum/skill/level/S = GLOB.skill_datums[text2path(params["skill"])]
+			var/number = input("Please insert a whole number between 0[S.associative ? " ([S.unskilled_tier])" : ""] and [S.max_levels][S.associative ? " ([S.levels[S.max_levels]])" : ""] corresponding to the level you'd like to set the player to.") as num|null
+			if (number >= 0 && number <= S.max_levels)
+				owner.set_skill_value(S.type, S.get_skill_level_value(number))
+			return TRUE

code/datums/skills/_skill.dm

@@ -8,6 +8,7 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 			continue
 		S = new path
 		.[S.type] = S
+	. = sortTim(., /proc/cmp_skill_categories, TRUE)
 
 /**
   * Skill datums
@@ -34,6 +35,8 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	var/competency_multiplier = 1
 	/// A list of ways this skill can affect or be affected through actions and skill modifiers.
 	var/list/skill_traits = list(SKILL_SANITY, SKILL_INTELLIGENCE)
+	/// Index of this skill in the UI
+	var/ui_category = SKILL_UI_CAT_MISC
 
 /**
   * Ensures what someone's setting as a value for this skill is valid.
@@ -57,10 +60,28 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	return new_value > existing
 
 /**
-  * Standard value "render"
+  * Get a list of data used in the skill panel menu.
   */
-/datum/skill/proc/standard_render_value(value, level)
-	return value
+/datum/skill/proc/get_skill_data(datum/skill_holder/H)
+	var/skill_value = H.owner.get_skill_value(type, FALSE)
+	. = list(
+		"name" = name,
+		"desc" = desc,
+		"path" = type,
+		"value_base" = skill_value,
+		"value_mod" = skill_value,
+		"modifiers" = "None",
+		"max_value" = 1 //To avoid division by zero later on.
+	)
+	var/list/mods = LAZYACCESS(H.skill_value_mods, type)
+	if(mods)
+		var/list/mod_names = list()
+		for(var/k in mods)
+			var/datum/skill_modifier/M = GLOB.skill_modifiers[k]
+			mod_names |= M.name
+			skill_value = M.apply_modifier(skill_value, type, H, MODIFIER_TARGET_VALUE)
+		.["value_mod"] = skill_value
+		.["modifiers"] = mod_names //Will be jointext()'d later.
 
 // 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.
 // Aka: So people don't forget to change checks if they change a skill's progression type.
@@ -71,10 +92,12 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	competency_thresholds = list(THRESHOLD_COMPETENT = FALSE, THRESHOLD_EXPERT = TRUE, THRESHOLD_MASTER = TRUE)
 
 /datum/skill/binary/sanitize_value(new_value)
-	return new_value? TRUE : FALSE
+	return new_value >= 1 ? TRUE : FALSE
 
-/datum/skill/binary/standard_render_value(value, level)
-	return value? "Yes" : "No"
+/datum/skill/binary/get_skill_data(datum/skill_holder/H)
+	. = ..()
+	.["base_readout"] = .["value_base"] ? "Learned: Yes" : "Learned: No"
+	.["mod_readout"] = .["value_mod"] ? "Learned: Yes" : "Learned: No"
 
 /datum/skill/numerical
 	abstract_type = /datum/skill/numerical
@@ -84,14 +107,15 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	var/max_value = 100
 	/// Min value of this skill
 	var/min_value = 0
-	/// Display as a percent in standard_render_value?
-	var/display_as_percent = FALSE
 
 /datum/skill/numerical/sanitize_value(new_value)
 	return clamp(new_value, min_value, max_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/numerical/get_skill_data(datum/skill_holder/H)
+	. = ..()
+	.["base_readout"] = "Skill Progress: \[[.["value_base"]] / [max_value]\]"
+	.["mod_readout"] = "Skill Progress: \[[.["value_mod"]] / [max_value]\]"
+	.["max_value"] = max_value
 
 /datum/skill/enum
 	abstract_type = /datum/skill/enum
@@ -123,13 +147,7 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	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)
+		var/value = round(get_skill_level_value(lvl), 1)
 		if(!associative)
 			levels += value
 			continue
@@ -167,8 +185,13 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	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
+/datum/skill/level/get_skill_data(datum/skill_holder/H)
+	. = ..()
+	var/skill_value_base = .["value_base"]
+	var/skill_value_mod = .["value_mod"]
+	.["level_based"] = TRUE
+
+	var/level = LAZYACCESS(H.skill_levels, type) || 0
 	var/current_lvl_xp_sum = 0
 	if(level)
 		current_lvl_xp_sum = associative ? levels[levels[level]] : levels[level]
@@ -176,8 +199,50 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
 	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
+	.["lvl_base_num"] = .["lvl_mod_num"] = level
+	.["lvl_base"] = .["lvl_mod"] = associative ? (!level ? unskilled_tier : levels[level]) : level
+	.["base_style"] = .["mod_style"] = "font-weight:bold; color:hsl([(level+1)*(350/max_levels+1)], 50%, 50%)"
+	.["xp_next_lvl_base"] = .["xp_next_lvl_mod"] = "\[[skill_value_base - current_lvl_xp_sum]/[next_lvl_xp]\]"
 
-	return "[associative ? current_lvl : "Lvl. [current_lvl]"] ([value - current_lvl_xp_sum]/[next_lvl_xp])[level == max_levels ? " \[MAX!\]" : ""]"
+	.["max_lvl"] = max_levels
+	var/max_value = associative ? levels[levels[max_levels]] : levels[max_levels]
+	.["max_value"] = max_value
+
+	.["base_readout"] = "Overall Skill Progress: \[[skill_value_base]/[max_value]\]"
+	.["mod_readout"] = "Overall Skill Progress: \[[skill_value_mod]/[max_value]\]"
+
+	var/list/mods = LAZYACCESS(H.skill_level_mods, type)
+	if(mods) //I'm not proud of doing the same-ish process twice a row but here we go.
+		var/list/mod_names = .["modifiers"]
+		if(!mod_names)
+			.["modifiers"] = mod_names = list()
+		for(var/k in mods)
+			var/datum/skill_modifier/M = GLOB.skill_modifiers[k]
+			mod_names |= M.name
+			level = M.apply_modifier(level, type, H, MODIFIER_TARGET_LEVEL)
+
+		if(level)
+			current_lvl_xp_sum = associative ? levels[levels[level]] : levels[level]
+		else
+			current_lvl_xp_sum = 0
+		next_index = min(max_levels, level+1)
+		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
+		.["lvl_mod_num"] = level
+		.["lvl_mod"] = associative ? (!level ? unskilled_tier : levels[level]) : level
+		.["mod_style"] = "font-weight:bold; color:hsl([(level+1)*(300/(max_levels+1))], 50%, 50%)"
+		.["xp_next_lvl_mod"] = "\[[skill_value_mod - current_lvl_xp_sum]/[next_lvl_xp]\]"
+
+/**
+  * Gets the base value required to reach a level specified by the 'num' arg.
+  */
+/datum/skill/level/proc/get_skill_level_value(num)
+	switch(level_up_method)
+		if(STANDARD_LEVEL_UP)
+			. = XP_LEVEL(standard_xp_lvl_up, xp_lvl_multiplier, num)
+		if(DWARFY_LEVEL_UP)
+			. = DORF_XP_LEVEL(standard_xp_lvl_up, xp_lvl_multiplier, num)
 
 /datum/skill/level/job
 	abstract_type = /datum/skill/level/job

code/datums/skills/_skill_holder.dm

@@ -20,6 +20,18 @@
 	var/list/original_values
 	var/list/original_affinities
 	var/list/original_levels
+	/// The mind datum this skill is associated with, only used for the check_skills UI
+	var/datum/mind/owner
+	/// For UI updates.
+	var/need_static_data_update = TRUE
+	/// Whether modifiers and final skill values or only base values are displayed.
+	var/see_skill_mods = TRUE
+	/// The current selected skill category.
+	var/selected_category
+
+/datum/skill_holder/New(owner)
+	..()
+	src.owner = owner
 
 /**
   * Grabs the value of a skill.
@@ -79,6 +91,7 @@
 		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)
+	skill_holder.need_static_data_update = TRUE
 	if(!isnull(value))
 		LAZYINITLIST(skill_holder.skills)
 		S.set_skill_value(skill_holder, value, src, silent)
@@ -183,18 +196,3 @@
 		divisor++
 	if(divisor)
 		. = modifier_is_multiplier ? value*(sum/divisor) : value/(sum/divisor)
-
-/**
-  * Generates a HTML readout of our skills.
-  * Port to tgui-next when?
-  */
-/datum/mind/proc/skill_html_readout()
-	var/list/out = list("<center><h1>Skills</h1></center><hr>")
-	out += "<table style=\"width:100%\"><tr><th><b>Skill</b><th><b>Value</b></tr>"
-	for(var/path in GLOB.skill_datums)
-		var/datum/skill/S = GLOB.skill_datums[path]
-		var/skill_value = get_skill_value(path)
-		var/skill_level = get_skill_level(path, round = TRUE)
-		out += "<tr><td><font color='[S.name_color]'>[S.name]</font></td><td>[S.standard_render_value(skill_value, skill_level)]</td></tr>"
-	out += "</table>"
-	return out.Join("")

code/datums/skills/_skill_modifier.dm

@@ -7,6 +7,8 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
   * and cause lots of edge cases. These are fairly simple overall... make a subtype though, don't use this one.
   */
 /datum/skill_modifier
+	/// Name and description of the skill modifier, used in the UI
+	var/name = "???"
 	/// flags for this skill modifier.
 	var/modifier_flags = NONE
 	/// target skills, can be a specific skill typepath or a list of skill traits.
@@ -110,6 +112,7 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
 		if(M.modifier_flags & MODIFIER_SKILL_LEVEL)
 			ADD_MOD_STEP(skill_holder.skill_level_mods, path, skill_holder.original_levels, get_skill_level(path, FALSE))
 	LAZYSET(skill_holder.all_current_skill_modifiers, id, TRUE)
+	skill_holder.need_static_data_update = TRUE
 
 	if(M.modifier_flags & MODIFIER_SKILL_BODYBOUND)
 		M.RegisterSignal(src, COMSIG_MIND_TRANSFER, /datum/skill_modifier.proc/on_mind_transfer)
@@ -141,6 +144,7 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
 		if(M.modifier_flags & MODIFIER_SKILL_LEVEL && skill_holder.skill_level_mods)
 			REMOVE_MOD_STEP(skill_holder.skill_level_mods, path, skill_holder.original_levels)
 	LAZYREMOVE(skill_holder.all_current_skill_modifiers, id)
+	skill_holder.need_static_data_update = TRUE
 
 	if(!mind_transfer && M.modifier_flags & MODIFIER_SKILL_BODYBOUND)
 		M.UnregisterSignal(src, COMSIG_MIND_TRANSFER)
@@ -165,11 +169,7 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
 		var/datum/skill/S = GLOB.skill_datums[skillpath]
 		if(method == MODIFIER_TARGET_VALUE && S.progression_type == SKILL_PROGRESSION_LEVEL)
 			var/datum/skill/level/L = S
-			switch(L.level_up_method)
-				if(STANDARD_LEVEL_UP)
-					mod = XP_LEVEL(L.standard_xp_lvl_up, L.xp_lvl_multiplier, S.competency_thresholds[mod])
-				if(DWARFY_LEVEL_UP)
-					mod = DORF_XP_LEVEL(L.standard_xp_lvl_up, L.xp_lvl_multiplier, S.competency_thresholds[mod])
+			mod = L.get_skill_level_value(L.competency_thresholds[mod])
 		else
 			mod = S.competency_thresholds[mod]
 

code/datums/skills/engineering.dm

@@ -1,5 +1,6 @@
 /datum/skill/level/job/wiring
 	name = "Wiring"
-	desc = "How proficient and knowledged you are at wiring beyond laying cables on the floor."
+	desc = "How proficient and knowledged you are at wiring beyond making post-futuristic wire art."
 	name_color = COLOR_PALE_ORANGE
 	skill_traits = list(SKILL_SANITY, SKILL_INTELLIGENCE, SKILL_USE_TOOL, SKILL_TRAINING_TOOL)
+	ui_category = SKILL_UI_CAT_ENG

code/datums/skills/medical.dm

@@ -1,5 +1,6 @@
 /datum/skill/numerical/surgery
 	name = "Surgery"
-	desc = "How proficient you are at doing surgery."
+	desc = "How proficient you are at performing surgical procedures."
 	name_color = COLOR_PALE_BLUE_GRAY
 	competency_multiplier = 1.5 // 60% surgery speed up at max value of 100, considering the base multiplier.
+	ui_category = SKILL_UI_CAT_MED

code/datums/skills/modifiers/job.dm

@@ -1,6 +1,7 @@
 /// Jobbie skill modifiers.
 
 /datum/skill_modifier/job
+	name = "Job Training"
 	modifier_flags = MODIFIER_SKILL_VALUE|MODIFIER_SKILL_VIRTUE|MODIFIER_SKILL_ORIGIN_DIFF
 	priority = MODIFIER_SKILL_PRIORITY_MAX
 
@@ -23,7 +24,7 @@
 	modifier_flags = MODIFIER_SKILL_VALUE|MODIFIER_SKILL_LEVEL|MODIFIER_SKILL_VIRTUE|MODIFIER_SKILL_ORIGIN_DIFF
 	level_mod = JOB_SKILL_TRAINED
 
-/datum/skill_modifier/job/level/New(id)
+/datum/skill_modifier/job/level/New(id, register = FALSE)
 	if(level_mod)
 		value_mod = GET_STANDARD_LVL(level_mod)
 	..()

code/datums/skills/modifiers/mood.dm

@@ -1,8 +1,10 @@
 /datum/skill_modifier/bad_mood
+	name = "Mood (Dejected)"
 	modifier_flags = MODIFIER_SKILL_VALUE|MODIFIER_SKILL_LEVEL|MODIFIER_SKILL_MULT|MODIFIER_SKILL_BODYBOUND
 	target_skills = list(SKILL_SANITY)
 
 /datum/skill_modifier/great_mood
+	name = "Mood (Elated)"
 	modifier_flags = MODIFIER_SKILL_AFFINITY|MODIFIER_SKILL_MULT|MODIFIER_SKILL_BODYBOUND
 	target_skills = list(SKILL_SANITY)
 	affinity_mod = 1.2

code/datums/skills/modifiers/organs.dm

@@ -1,4 +1,5 @@
 /datum/skill_modifier/brain_damage
+	name = "Brain Damage"
 	target_skills = list(SKILL_INTELLIGENCE)
 	modifier_flags = MODIFIER_SKILL_VALUE|MODIFIER_SKILL_AFFINITY|MODIFIER_SKILL_LEVEL|MODIFIER_SKILL_MULT|MODIFIER_SKILL_BODYBOUND
 	value_mod = 0.85
@@ -6,6 +7,7 @@
 	affinity_mod = 0.85
 
 /datum/skill_modifier/heavy_brain_damage
+	name = "Brain Damage (Severe)"
 	target_skills = list(SKILL_INTELLIGENCE)
 	modifier_flags = MODIFIER_SKILL_VALUE|MODIFIER_SKILL_AFFINITY|MODIFIER_SKILL_LEVEL|MODIFIER_SKILL_BODYBOUND|MODIFIER_SKILL_HANDICAP|MODIFIER_USE_THRESHOLDS
 	priority = MODIFIER_SKILL_PRIORITY_LOW