Merge branch 'master' of https://github.com/goonstation/goonstation

_std/macros/antag_popups.dm

@@ -332,12 +332,6 @@
 		M.Browse(html, "window=antagTips;size=700x450;title=[window_title]")
 
 
-/client/proc/cmd_admin_antag_popups()
-	set name = "View Special Role Popups"
-	SET_ADMIN_CAT(ADMIN_CAT_SERVER)
-	if (src.holder)
-		get_singleton(/datum/antagPopups).showPanel()
-
 /mob
 	///Stores the name of the last antag popup shown to the mob
 

_std/macros/client.dm

@@ -9,3 +9,19 @@
 #define DENY_TEMPMIN if(!src.holder || src.holder.tempmin) {boutput(src, SPAN_ADMIN("Only administrators may use this command.")); return}
 #define MENTOR_ONLY if(!src.mentor) {boutput(src, SPAN_ADMIN("Only mentors may use this command.")); return}
 #define USR_ADMIN_ONLY if(usr?.client && !usr.client.holder) {boutput(usr, SPAN_ADMIN("Only administrators may use this command.")); return}
+
+#ifdef SPACEMAN_DMM //spaceman doesn't like ....... syntax, can't think why
+	#define CURRENT_PROC_PATH null
+#elif defined(OPENDREAM) || DM_VERSION >= 515 //OD has a sane version and byond added it too in 515
+	#define CURRENT_PROC_PATH __PROC__
+#else //aaand then there's 514
+	#define CURRENT_PROC_PATH .......
+#endif
+
+#define SHOW_VERB_DESC do {\
+	var/procpath/this_proc = CURRENT_PROC_PATH;\
+	if(usr.client.check_key(KEY_EXAMINE)) {\
+		boutput(usr, "<span class='helpmsg'>[this_proc.desc || "No verb desc found"]</span>");\
+		return\
+	}\
+} while(FALSE)

_std/vox.dm

@@ -67,6 +67,7 @@ var/global/datum/voxdbg/VoxDebug = new
 	SET_ADMIN_CAT(ADMIN_CAT_DEBUG)
 	set name = "Debug VOX"
 	set desc = "Fuck me."
+	SHOW_VERB_DESC
 
 	VoxDebug.voxtokens = voxtokens
 	VoxDebug.voxsounds_flag_sorted = voxsounds_flag_sorted
@@ -79,10 +80,8 @@ var/global/datum/voxdbg/VoxDebug = new
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Intercom Help"
 	set desc = "WOOP WOOP ASS DAY"
-
-	if(!isadmin(src))
-		boutput(src, "Only administrators may use this command.")
-		return
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	vox_help(usr)
 
@@ -136,9 +135,8 @@ proc/vox_help(var/mob/user)
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Intercom Announcement"
 	set desc = "ABOUT THAT BEER I OWED YA, GORDON"
-	if(!isadmin(src))
-		boutput(src, "Only administrators may use this command.")
-		return
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	vox_reinit_check()
 
@@ -156,11 +154,8 @@ proc/vox_help(var/mob/user)
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Intercom Announcement (Pitch Shifted)"
 	set desc = "ABOUT that BEER I owed YA, NODROG"
-	if(!isadmin(src))
-		boutput(src, "Only administrators may use this command.")
-		return
-
-
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	vox_reinit_check()
 

code/WorkInProgress/WiresStuff.dm

@@ -132,6 +132,7 @@ var/global/deathConfettiActive = 0
 	set name = "Toggle Death Confetti"
 	set desc = "Toggles the fun confetti effect and sound whenever a mob dies"
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	deathConfettiActive = !deathConfettiActive
 
@@ -222,6 +223,7 @@ var/global/deathConfettiActive = 0
 	set desc = "A hard reboot is when the game instance outright ends, and the backend server reinitialises it"
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/hardRebootFileExists = fexists(hardRebootFilePath)
 	var/logMessage = ""

code/WorkInProgress/actuallyKeelinsStuff.dm

@@ -818,7 +818,8 @@ Returns:
 	SET_ADMIN_CAT(ADMIN_CAT_DEBUG)
 	set name = "Test Cinematic camera"
 	set desc="Test Cinematic camera"
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/mob/M = usr
 	var/datum/targetable/cincam/R = new()
 	M.targeting_ability = R
@@ -1637,6 +1638,8 @@ Returns:
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Pixel explosion mode"
 	set desc = "Enter pixel explosion mode."
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	alert("Clicking on things will now explode them into pixels!")
 	pixelmagic(mode == "explode")
 
@@ -1748,7 +1751,8 @@ Returns:
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Turn off pixel explosion mode"
 	set desc = "Turns off pixel explosion mode."
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/mob/M = usr
 	if (istype(M.targeting_ability, /datum/targetable/pixelpicker))
 		var/datum/targetable/pixelpicker/pixel_picker = M.targeting_ability
@@ -2794,6 +2798,7 @@ Returns:
 	set popup_menu = 0
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/mob/M = src.mob
 	if (istype(M))

code/WorkInProgress/blueprints.dm

@@ -399,7 +399,8 @@
 	set name = "Blueprint Create"
 	set desc = "Allows creation of blueprints of any user."
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/picked = browse_abcu_blueprints(usr, "Admin Share Blueprint", "Choose a blueprint to print and share!", TRUE)
 	if (!picked) return
 	var/obj/printed = new /obj/item/abcu_blueprint_reference(usr, picked, usr)
@@ -410,7 +411,8 @@
 	set name = "Blueprint Delete"
 	set desc = "Allows deletion of blueprints of any user."
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/deleted = delete_abcu_blueprint(usr, TRUE)
 	if (!deleted) return
 	logTheThing(LOG_ADMIN, usr, "[usr] deleted blueprint [deleted["file"]], owned by [deleted["ckey"]].")
@@ -419,7 +421,8 @@
 	set name = "Blueprint Dump"
 	set desc = "Dumps readable HTML blueprint, of any user, to your client folder."
 	SET_ADMIN_CAT(ADMIN_CAT_DEBUG)
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/picked = browse_abcu_blueprints(usr, "Admin Dump Blueprint", "Choose a blueprint to export.", TRUE)
 	if (!picked) return
 

code/WorkInProgress/customcritter.dm

@@ -2108,6 +2108,8 @@ var/global/datum/critterCreatorHolder/critter_creator_controller = new()
 	set name = "Critter Creator (WIP)"
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set hidden = 0
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/datum/critterCreator/CR = critter_creator_controller.getCreator(src.mob)
 	if (CR)

code/datums/buildmode.dm

@@ -234,6 +234,8 @@ ABSTRACT_TYPE(/datum/buildmode)
 	set name = "Reset Build Mode"
 	set desc = "If your build mode save got screwed up use this to reset it!"
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if(src.buildmode?.is_active)
 		src.togglebuildmode()
@@ -247,6 +249,8 @@ ABSTRACT_TYPE(/datum/buildmode)
 	set name = "Build Mode"
 	set desc = "Toggle build Mode on/off."
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if(!src.buildmode)
 		src.buildmode = src.player.get_buildmode()

code/datums/controllers/job_controls.dm

@@ -963,6 +963,8 @@ var/datum/job_controller/job_controls
 /client/proc/cmd_job_controls()
 	SET_ADMIN_CAT(ADMIN_CAT_DEBUG)
 	set name = "Job Controls"
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if (job_controls == null) boutput(src, "<h3 class='admin'>UH OH! Shit's broken as fuck!</h3>")
 	else src.debug_variables(job_controls)

code/datums/ircbot.dm

@@ -179,6 +179,7 @@ var/global/datum/ircbot/ircbot = new /datum/ircbot()
 	SET_ADMIN_CAT(ADMIN_CAT_SERVER_TOGGLES)
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	ircbot.toggleDebug(src)
 	return 1

code/datums/tooltip.dm

@@ -454,6 +454,7 @@ var/global/list/atomTooltips = list()
 	SET_ADMIN_CAT(ADMIN_CAT_DEBUG)
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/holderCount = 0
 	var/tooltipCount = 0

code/datums/viewport.dm

@@ -208,6 +208,7 @@
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
 	set name = "Create Viewport"
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/datum/viewport/viewport = src.mob.create_viewport(VIEWPORT_ID_ADMIN, share_planes=TRUE)
 	viewport.handler.listens = TRUE
@@ -217,6 +218,7 @@
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
 	set name = "Create Silent Viewport"
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	src.mob.create_viewport(VIEWPORT_ID_ADMIN_SILENT, share_planes=TRUE)
 
@@ -225,6 +227,7 @@
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
 	set name = "Create Viewport Following"
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/atom/target_atom = pick_ref(src.mob)
 	if(!target_atom || isturf(target_atom))

code/error_handling.dm

@@ -54,6 +54,7 @@ var/global/blame_for_runtimes = FALSE
 	set popup_menu = 0
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if (!cdn)
 		var/list/viewerResources = list(
@@ -71,6 +72,7 @@ var/global/blame_for_runtimes = FALSE
 	set popup_menu = 0
 
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 	if (global.blame_for_runtimes)
 		global.blame_for_runtimes = FALSE
 		boutput(src, SPAN_NOTICE("Aggressive debugging disabled"))

code/mob/living/silicon.dm

@@ -444,6 +444,7 @@ var/global/list/module_editors = list()
 	SET_ADMIN_CAT(ADMIN_CAT_PLAYERS)
 	set popup_menu = 0
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if (!istype(M))
 		boutput(src, SPAN_ALERT("That thing has no module!"))

code/modules/admin/admin.dm

@@ -3860,6 +3860,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_SERVER)
 	set name = "Restart"
 	set desc= "Restarts the world"
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/confirm = alert("Restart the game world?", "Restart", "Yes", "Cancel")
 	if(confirm == "Cancel")
@@ -3884,6 +3886,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_FUN)
 	set name = "Announce"
 	set desc="Announce your desires to the world"
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	var/message = input("Global message to send:", "Admin Announce", null, null)  as message
 	if (message)
 		if(usr.client.holder.rank != "Coder" && usr.client.holder.rank != "Host")
@@ -3896,6 +3900,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_SERVER)
 	set desc="Start the round RIGHT NOW"
 	set name="Start Now"
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	if(!ticker)
 		tgui_alert(usr,"Unable to start the game as it is not set up.")
 		return
@@ -3914,7 +3920,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_SERVER)
 	set desc="Delay the game start"
 	set name="Delay Round Start"
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	if (current_state > GAME_STATE_PREGAME)
 		return tgui_alert(usr,"Too late... The game has already started!")
 	game_start_delayed = !(game_start_delayed)
@@ -3934,7 +3941,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_SERVER)
 	set desc="Delay the server restart"
 	set name="Delay Round End"
-
+	USR_ADMIN_ONLY
+	SHOW_VERB_DESC
 	// If the game end is delayed AT ALL, confirm removing the delay
 	// so that mutiple admins don't end up cancelling their own delays
 	if (game_end_delayed)
@@ -4222,6 +4230,7 @@ var/global/noir = 0
 	set desc = "Select a mob to manage its bioeffects."
 	set popup_menu = 0
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if (isnull(holder.bioeffectmanager))
 		holder.bioeffectmanager = new
@@ -4234,6 +4243,7 @@ var/global/noir = 0
 	set desc = "Select a mob to manage its abilities."
 	set popup_menu = 0
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	if (isnull(holder.abilitymanager))
 		holder.abilitymanager = new
@@ -4246,7 +4256,7 @@ var/global/noir = 0
 	set desc = "Select a mob to manage its traits."
 	set popup_menu = 0
 	ADMIN_ONLY
-
+	SHOW_VERB_DESC
 	var/list/dat = list()
 	dat += {"
 		<html>
@@ -4329,6 +4339,7 @@ var/global/noir = 0
 	set desc = "Select a mob to manage its mind's objectives."
 	set popup_menu = 0
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	var/list/dat = list()
 	dat += {"
@@ -4405,6 +4416,8 @@ var/global/noir = 0
 	SET_ADMIN_CAT(ADMIN_CAT_UNUSED)
 	set desc = "Respawn a mob"
 	set popup_menu = 0
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 	if (!M) return
 
 	if (!forced && tgui_alert(src, "Respawn [M]?", "Confirmation", list("Yes", "No")) != "Yes")
@@ -4433,7 +4446,8 @@ var/global/noir = 0
 	set name = "Respawn Self"
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
 	set desc = "Respawn yourself"
-
+	ADMIN_ONLY
+	SHOW_VERB_DESC
 	logTheThing(LOG_ADMIN, src, "respawned themselves.")
 	logTheThing(LOG_DIARY, src, "respawned themselves.", "admin")
 	message_admins("[key_name(src)] respawned themselves.")

code/modules/admin/admin_holder.dm

@@ -372,6 +372,7 @@
 	SET_ADMIN_CAT(ADMIN_CAT_SELF)
 	set name = "Change Admin Preferences"
 	ADMIN_ONLY
+	SHOW_VERB_DESC
 
 	src.holder.show_pref_window(src.mob)