real menu button

Author: SapphicOverload

code/__DEFINES/hud.dm

@@ -106,6 +106,7 @@
 #define ui_borg_radio "EAST-1:28,SOUTH+1:7"
 #define ui_borg_intents "EAST-2:26,SOUTH:5"
 #define ui_language_menu "EAST-4:6,SOUTH:21"
+#define ui_skill_menu "EAST-4:6,SOUTH:5"
 
 //Upper-middle right (alerts)
 #define ui_alert1 "EAST-1:28,CENTER+5:27"

code/_onclick/hud/alert.dm

@@ -327,68 +327,10 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 /atom/movable/screen/alert/skill_up
 	name = "Allocate Skill Points"
 	desc = "You have unspent skill points! Click here to allocate them."
-	var/list/allocated_skills = list(
-		SKILL_PHYSIOLOGY = 0,
-		SKILL_MECHANICAL = 0,
-		SKILL_TECHNICAL = 0,
-		SKILL_SCIENCE = 0,
-		SKILL_FITNESS = 0,
-	)
-	var/allocated_points = 0
 
 /atom/movable/screen/alert/skill_up/Click(location, control, params)
 	. = ..()
-	ui_interact(mob_viewer)
-
-/atom/movable/screen/alert/skill_up/ui_interact(mob/user, datum/tgui/ui)
-	ui = SStgui.try_update_ui(user, src, ui)
-	if (!ui)
-		ui = new(user, src, "SkillMenu", "Allocate Skill Points")
-		ui.open()
-
-/atom/movable/screen/alert/skill_up/ui_data(mob/user)
-	var/list/data = list()
-	var/list/skill_data = list()
-	for(var/skill in user.mind.skills)
-		skill_data.Add(list(list(
-			"base" = user.get_skill(skill),
-			"allocated" = allocated_skills[skill],
-		)))
-	data["skills"] = skill_data
-	data["skill_points"] = user.mind.skill_points
-	data["allocated_points"] = allocated_points
-	data["exceptional_skill"] = HAS_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
-	return data
-
-/atom/movable/screen/alert/skill_up/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
-	. = ..()
-	if(.)
-		return
-	var/mob/user = usr
-	if(!user.mind)
-		CRASH("User ([user]) without a mind attempted to allocate skill points!")
-	switch(action)
-		if("confirm")
-			for(var/skill in user.mind.skills)
-				user.adjust_skill(skill, allocated_skills[skill], max_skill = EXP_GENIUS)
-				allocated_skills[skill] = 0
-			user.mind.skill_points -= allocated_points
-			allocated_points = 0
-			if(!user.mind.skill_points)
-				user.clear_alert("skill points")
-			return TRUE
-		if("allocate")
-			allocated_skills[params["skill"]] += params["amount"]
-			allocated_points += params["amount"]
-			return TRUE
-
-/atom/movable/screen/alert/skill_up/ui_status(mob/user)
-	if(!user.mind)
-		return UI_CLOSE
-	return UI_INTERACTIVE
-
-/atom/movable/screen/alert/skill_up/ui_state(mob/user)
-	return GLOB.always_state
+	mob_viewer.hud_used?.skill_menu?.ui_interact(mob_viewer)
 
 //ALIENS
 

code/_onclick/hud/hud.dm

@@ -40,6 +40,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/rest_icon
 	var/atom/movable/screen/throw_icon
 	var/atom/movable/screen/module_store_icon
+	var/atom/movable/screen/skill_menu
 
 	var/list/static_inventory = list() //the screen objects which are static
 	var/list/toggleable_inventory = list() //the screen objects which can be hidden

code/_onclick/hud/human.dm

@@ -101,6 +101,12 @@
 		using.screen_loc = UI_BOXAREA
 	static_inventory += using
 
+	skill_menu = new /atom/movable/screen/skill_menu(src)
+	skill_menu.icon = ui_style
+	if(!widescreen_layout)
+		skill_menu.screen_loc = UI_BOXAREA
+	static_inventory += skill_menu
+
 	action_intent = new /atom/movable/screen/combattoggle/flashy(src)
 	action_intent.icon = ui_style
 	action_intent.screen_loc = ui_combat_toggle

code/_onclick/hud/screen_objects.dm

@@ -118,6 +118,73 @@
 	var/datum/language_holder/H = M.get_language_holder()
 	H.open_language_menu(usr)
 
+/atom/movable/screen/skill_menu
+	name = "skills menu"
+	icon = 'icons/mob/screen_midnight.dmi'
+	icon_state = "skill_menu"
+	screen_loc = ui_skill_menu
+	var/list/allocated_skills = list(
+		SKILL_PHYSIOLOGY = 0,
+		SKILL_MECHANICAL = 0,
+		SKILL_TECHNICAL = 0,
+		SKILL_SCIENCE = 0,
+		SKILL_FITNESS = 0,
+	)
+	var/allocated_points = 0
+
+/atom/movable/screen/skill_menu/Click()
+	ui_interact(usr)
+
+/atom/movable/screen/skill_menu/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if (!ui)
+		ui = new(user, src, "SkillMenu", "Allocate Skill Points")
+		ui.open()
+
+/atom/movable/screen/skill_menu/ui_data(mob/user)
+	var/list/data = list()
+	var/list/skill_data = list()
+	for(var/skill in user.mind.skills)
+		skill_data.Add(list(list(
+			"base" = user.get_skill(skill),
+			"allocated" = allocated_skills[skill],
+		)))
+	data["skills"] = skill_data
+	data["skill_points"] = user.mind.skill_points
+	data["allocated_points"] = allocated_points
+	data["exceptional_skill"] = HAS_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
+	return data
+
+/atom/movable/screen/skill_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+	. = ..()
+	if(.)
+		return
+	var/mob/user = usr
+	if(!user.mind)
+		CRASH("User ([user]) without a mind attempted to allocate skill points!")
+	switch(action)
+		if("confirm")
+			for(var/skill in user.mind.skills)
+				user.adjust_skill(skill, allocated_skills[skill], max_skill = EXP_GENIUS)
+				allocated_skills[skill] = 0
+			user.mind.skill_points -= allocated_points
+			allocated_points = 0
+			if(!user.mind.skill_points)
+				user.clear_alert("skill points")
+			return TRUE
+		if("allocate")
+			allocated_skills[params["skill"]] += params["amount"]
+			allocated_points += params["amount"]
+			return TRUE
+
+/atom/movable/screen/skill_menu/ui_status(mob/user)
+	if(!user.mind)
+		return UI_CLOSE
+	return UI_INTERACTIVE
+
+/atom/movable/screen/skill_menu/ui_state(mob/user)
+	return GLOB.always_state
+
 /atom/movable/screen/ghost/pai
 	name = "pAI Candidate"
 	icon = 'icons/mob/screen_midnight.dmi'