Skip to content

Commit

Permalink
shquasdh
Browse files Browse the repository at this point in the history
  • Loading branch information
CannibalHunter committed Aug 17, 2024
1 parent ce391de commit 96bcbe6
Show file tree
Hide file tree
Showing 27 changed files with 92 additions and 90 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/rogue/devotion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
// Debug verb
/mob/living/carbon/human/proc/devotionchange()
set name = "(DEBUG)Change Devotion"
set category = "Special Verbs"
set category = "Debug"

if(!devotion)
return FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
return SStriumphs.get_triumphs(ckey)

/client/proc/adjusttriumph()
set category = "GameMaster"
set category = "Admin"
set name = "Adjust Triumphs"
var/input = input(src, "how much") as num
if(mob && input)
Expand Down
13 changes: 7 additions & 6 deletions code/modules/admin/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////Panels

/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
set category = "GameMaster"
set category = "Admin"
set name = "Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"

Expand Down Expand Up @@ -195,7 +195,7 @@
/datum/admins/proc/admin_heal(mob/living/M in GLOB.mob_list)
set name = "Heal Mob"
set desc = "Heal a mob to full health"
set category = "GameMaster"
set category = "Admin"

if(!check_rights())
return
Expand All @@ -207,7 +207,7 @@
/datum/admins/proc/admin_revive(mob/living/M in GLOB.mob_list)
set name = "Revive Mob"
set desc = "Resuscitate a mob"
set category = "GameMaster"
set category = "Admin"

if(!check_rights())
return
Expand All @@ -233,7 +233,7 @@
/datum/admins/proc/admin_sleep(mob/living/M in GLOB.mob_list)
set name = "Toggle Sleeping"
set desc = "Toggle a mob's sleeping state"
set category = "GameMaster"
set category = "Admin"

if(!check_rights())
return
Expand Down Expand Up @@ -298,6 +298,7 @@
set category = "Fun"
set name = "Access Newscaster Network"
set desc = ""
set hidden = 1

if (!istype(src, /datum/admins))
src = usr.client.holder
Expand Down Expand Up @@ -599,7 +600,7 @@


/datum/admins/proc/announce()
set category = "Special Verbs"
set category = "Admin"
set name = "Announce"
set desc="Announce your desires to the world"
if(!check_rights(0))
Expand All @@ -614,7 +615,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Announce") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

/datum/admins/proc/set_admin_notice()
set category = "Special Verbs"
set category = "Admin"
set name = "Set Admin Notice"
set desc ="Set an announcement that appears to everyone who joins the server. Only lasts this round"
if(!check_rights(0))
Expand Down
16 changes: 9 additions & 7 deletions code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
to_chat(src, show_popup_menus ? "Right click menus are now enabled" : "Right click menus are now disabled")

/client/proc/admin_ghost()
set category = "GameMaster"
set category = "Admin"
set name = "Aghost"
if(!holder)
return
Expand Down Expand Up @@ -438,7 +438,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)

/client/proc/check_antagonists()
set name = "Check Antagonists"
set category = "GameMaster"
set category = "Admin"
if(holder)
holder.check_antagonists()
log_admin("[key_name(usr)] checked antagonists.") //for tsar~
Expand Down Expand Up @@ -545,7 +545,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Stealth Mode") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

/client/proc/drop_bomb()
set category = "Special Verbs"
set category = "Fun"
set name = "Drop Bomb"
set desc = ""

Expand Down Expand Up @@ -587,7 +587,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Drop Bomb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

/client/proc/drop_dynex_bomb()
set category = "Special Verbs"
set category = "Fun"
set name = "Drop DynEx Bomb"
set desc = ""

Expand Down Expand Up @@ -673,6 +673,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
/client/proc/give_disease(mob/living/T in GLOB.mob_living_list)
set category = "Fun"
set name = "Give Disease"
set hidden = 1
set desc = ""
if(!istype(T))
to_chat(src, span_notice("I can only give a disease to a mob of type /mob/living."))
Expand All @@ -686,7 +687,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins(span_adminnotice("[key_name_admin(usr)] gave [key_name_admin(T)] the disease [D]."))

/client/proc/object_say(obj/O in world)
set category = "Special Verbs"
set category = "Fun"
set name = "OSay"
set desc = ""
var/message = input(usr, "What do you want the message to be?", "Make Sound") as text | null
Expand All @@ -698,7 +699,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Object Say") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/togglebuildmodeself()
set name = "Toggle Build Mode Self"
set category = "Special Verbs"
set category = "Admin"
if (!(holder.rank.rights & R_BUILD))
return
if(src.mob)
Expand Down Expand Up @@ -793,6 +794,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
set name = "Toggle Admin AI Interact"
set category = "Admin"
set desc = ""
set hidden = 1

AI_Interact = !AI_Interact
if(mob && IsAdminGhost(mob))
Expand All @@ -802,7 +804,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
message_admins("[key_name_admin(usr)] has [AI_Interact ? "activated" : "deactivated"] their AI interaction")

/client/proc/end_party()
set category = "GameMaster"
set category = "Admin"
set name = "EndPlaytest"
set hidden = 1
if(!holder)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/adminmenu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/datum/verbs/menu/Admin/verb/playerpanel()
set name = "Player Panel New"
set desc = ""
set category = "GameMaster"
set category = "Admin"
if(usr.client.holder)
usr.client.holder.player_panel_new()
SSblackbox.record_feedback("tally", "admin_verb", 1, "Player Panel New") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/patreon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY(hiderole)
GLOBAL_LIST_EMPTY(anonymize)

/mob/dead/new_player/verb/anonymize()
set category = "Options"
set category = "OOC"
set name = "Anonymize"
if(!client)
return
Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/playerquality.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
log_admin("[admin] adjusted [key]'s PQ by [amt] for reason: [reason]")

/client/proc/check_pq()
set category = "GameMaster"
set name = "CheckPQ"
set category = "Admin"
set name = "PQ-Check"
if(!holder)
return
var/selection = alert(src, "Check VIA...", "Check PQ", "Character List", "Player List", "Player Name")
Expand Down Expand Up @@ -148,8 +148,8 @@
popup.open()

/client/proc/adjust_pq()
set category = "GameMaster"
set name = "AdjustPQ"
set category = "Admin"
set name = "PQ-Adjust"
if(!holder)
return
var/selection = alert(src, "Adjust VIA...", "MODIFY PQ", "Character List", "Player List", "Player Name")
Expand Down
6 changes: 3 additions & 3 deletions code/modules/admin/verbs/adminjump.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/client/proc/jumptoarea(area/A in GLOB.sortedAreas)
set name = "Jump to Area"
set desc = ""
set category = "GameMaster"
set category = "Admin"
if(!src.holder)
// //to_chat(src, "Only administrators may use this command.")
return
Expand Down Expand Up @@ -38,7 +38,7 @@
return

/client/proc/jumptomob(mob/M in GLOB.mob_list)
set category = "GameMaster"
set category = "Admin"
set name = "Jump to Mob"

if(!src.holder)
Expand Down Expand Up @@ -72,7 +72,7 @@
message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]")

/client/proc/jumptokey()
set category = "GameMaster"
set category = "Admin"
set name = "Jump to Key"

if(!src.holder)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/adminsay.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/client/proc/cmd_admin_say(msg as text)
set category = "GameMaster"
set category = "Admin"
set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite
set hidden = 0
if(!check_rights(0))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/deadsay.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/client/proc/dsay(msg as text)
set category = "Special Verbs"
set category = "Admin"
set name = "Dsay"
set hidden = 1
if(!holder)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/admin/verbs/debug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/cmd_admin_robotize(mob/M in GLOB.mob_list)
set category = "Fun"
set name = "Make Robot"
set hidden = 1

if(!SSticker.HasRoundStarted())
alert("Wait until the game starts")
Expand All @@ -55,6 +56,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/cmd_admin_blobize(mob/M in GLOB.mob_list)
set category = "Fun"
set name = "Make Blob"
set hidden = 1

if(!SSticker.HasRoundStarted())
alert("Wait until the game starts")
Expand All @@ -70,6 +72,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/cmd_admin_animalize(mob/M in GLOB.mob_list)
set category = "Fun"
set name = "Make Simple Animal"
set hidden = 1

if(!SSticker.HasRoundStarted())
alert("Wait until the game starts")
Expand All @@ -91,6 +94,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set category = "Fun"
set name = "Make pAI"
set desc = ""
set hidden = 1

var/list/available = list()
for(var/mob/C in GLOB.mob_list)
Expand Down Expand Up @@ -123,6 +127,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/cmd_admin_alienize(mob/M in GLOB.mob_list)
set category = "Fun"
set name = "Make Alien"
set hidden = 1

if(!SSticker.HasRoundStarted())
alert("Wait until the game starts")
Expand All @@ -138,6 +143,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/cmd_admin_slimeize(mob/M in GLOB.mob_list)
set category = "Fun"
set name = "Make slime"
set hidden = 1

if(!SSticker.HasRoundStarted())
alert("Wait until the game starts")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/getlogs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
/client/proc/getserverlogs()
set name = "Get Server Logs"
set desc = ""
set category = "GameMaster"
set category = "Admin"

browseserverlogs()

/client/proc/getcurrentlogs()
set name = "Get Current Logs"
set desc = ""
set category = "GameMaster"
set category = "Admin"

browseserverlogs("[GLOB.log_directory]/")

Expand Down
19 changes: 3 additions & 16 deletions code/modules/admin/verbs/playsound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

/client/verb/change_music_vol()
set category = "Options"
set category = "OOC"
set name = "ChangeMusicPower"

if(prefs)
Expand All @@ -67,7 +67,7 @@


/client/verb/show_rolls()
set category = "Options"
set category = "OOC"
set name = "ShowRolls"

if(prefs)
Expand All @@ -79,7 +79,7 @@
to_chat(src, "ShowRolls Disabled")

/client/verb/change_master_vol()
set category = "Options"
set category = "OOC"
set name = "ChangeVolPower"

if(prefs)
Expand All @@ -92,19 +92,6 @@
prefs.save_preferences()

mob.update_channel_volume(CHANNEL_AMBIENCE, prefs.mastervol)
/*
/client/verb/help_rpguide()
set category = "Options"
set name = "zHelp-RPGuide"
src << link("https://cdn.discordapp.com/attachments/844865105040506891/938971395445112922/rpguide.jpg")
/client/verb/help_uihelp()
set category = "Options"
set name = "zHelp-UIGuide"
src << link("https://cdn.discordapp.com/attachments/844865105040506891/938275090414579762/unknown.png")
*/

/client/proc/play_local_sound(S as sound)
set category = "Fun"
Expand Down
Loading

0 comments on commit 96bcbe6

Please sign in to comment.