cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading

Browse Source
This commit is contained in:
AffectedArc07
2021-09-02 14:01:27 +01:00
parent 4062bc6b1a 1a935f5b1a
commit 70fd70f2eb
174 changed files with 1068 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+2 -2
View File
@@ -72,7 +72,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
/datum/admins/proc/show_player_panel(mob/M in GLOB.mob_list)
set category = null
set name = "Show Player Panel"
set name = "\[Admin\] Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)"
if(!M)
@@ -766,7 +766,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
message_admins("[key_name_admin(usr)] checked the AI laws")
/client/proc/update_mob_sprite(mob/living/carbon/human/H as mob)
set name = "Update Mob Sprite"
set name = "\[Admin\] Update Mob Sprite"
set desc = "Should fix any mob sprite update errors."
set category = null
code/modules/admin/admin_verbs.dm
+4 -4
View File
@@ -613,7 +613,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
/client/proc/make_sound(obj/O in view()) // -- TLE
set category = "Event"
set name = "Make Sound"
set name = "\[Admin\] Make Sound"
set desc = "Display a message to everyone who can hear the target"
if(!check_rights(R_EVENT))
@@ -799,7 +799,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
SSblackbox.record_feedback("tally", "admin_verb", 1, "Manage Silicon Laws") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/change_human_appearance_admin(mob/living/carbon/human/H in GLOB.mob_list)
set name = "C.M.A. - Admin"
set name = "\[Admin\] C.M.A. - Admin"
set desc = "Allows you to change the mob appearance"
set category = null
@@ -825,7 +825,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
SSblackbox.record_feedback("tally", "admin_verb", 1, "CMA - Admin") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/change_human_appearance_self(mob/living/carbon/human/H in GLOB.mob_list)
set name = "C.M.A. - Self"
set name = "\[Admin\] C.M.A. - Self"
set desc = "Allows the mob to change its appearance"
set category = null
@@ -965,7 +965,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
/client/proc/man_up(mob/T as mob in GLOB.player_list)
set category = null
set name = "Man Up"
set name = "\[Admin\] Man Up"
set desc = "Tells mob to man up and deal with it."
if(!check_rights(R_ADMIN))
code/modules/admin/machine_upgrade.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/proc/machine_upgrade(obj/machinery/M in world)
set name = "Tweak Component Ratings"
set name = "\[Admin\] Tweak Component Ratings"
set category = null
if(!check_rights(R_DEBUG))
code/modules/admin/verbs/adminjump.dm
+3 -3
View File
@@ -66,7 +66,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Jump To Area") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(turf/T in world)
set name = "Jump to Turf"
set name = "\[Admin\] Jump to Turf"
set category = null
if(!check_rights(R_ADMIN))
@@ -135,7 +135,7 @@
/client/proc/Getmob(mob/M in GLOB.mob_list)
set category = null
set name = "Get Mob"
set name = "\[Admin\] Get Mob"
set desc = "Mob to teleport"
if(!check_rights(R_ADMIN))
@@ -152,7 +152,7 @@
/client/proc/Getkey()
set category = null
set name = "Get Key"
set name = "\[Admin\] Get Key"
set desc = "Key to teleport"
if(!check_rights(R_ADMIN))
code/modules/admin/verbs/adminpm.dm
+1 -1
View File
@@ -1,7 +1,7 @@
//allows right clicking mobs to send an admin PM to their client, forwards the selected mob's client to cmd_admin_pm
/client/proc/cmd_admin_pm_context(mob/M as mob in GLOB.mob_list)
set category = null
set name = "Admin PM Mob"
set name = "\[Admin\] Admin PM Mob"
if(!check_rights(R_ADMIN|R_MENTOR))
return
if(!ismob(M) || !M.client)
code/modules/admin/verbs/debug.dm
+2 -2
View File
@@ -173,7 +173,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
/client/proc/callproc_datum(A as null|area|mob|obj|turf)
set category = null
set name = "Atom ProcCall"
set name = "\[Admin\] Atom ProcCall"
if(!check_rights(R_PROCCALL))
return
@@ -630,7 +630,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
/client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.human_list)
set category = "Event"
set name = "Select equipment"
set name = "\[Admin\] Select equipment"
if(!check_rights(R_EVENT))
return
code/modules/admin/verbs/freeze.dm
+1 -1
View File
@@ -9,7 +9,7 @@
GLOBAL_LIST_EMPTY(frozen_atom_list) // A list of admin-frozen atoms.
/client/proc/freeze(atom/movable/M)
set name = "Freeze"
set name = "\[Admin\] Freeze"
set category = null
if(!check_rights(R_ADMIN))
code/modules/admin/verbs/possess.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/proc/possess(obj/O as obj in world)
set name = "Possess Obj"
set name = "\[Admin\] Possess Obj"
set category = null
if(!check_rights(R_POSSESS))
@@ -34,7 +34,7 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Possess Object") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/proc/release(obj/O as obj in world)
set name = "Release Obj"
set name = "\[Admin\] Release Obj"
set category = null
//usr.loc = get_turf(usr)
code/modules/admin/verbs/randomverbs.dm
+7 -7
View File
@@ -1,6 +1,6 @@
/client/proc/cmd_admin_drop_everything(mob/M as mob in GLOB.mob_list)
set category = null
set name = "Drop Everything"
set name = "\[Admin\] Drop Everything"
if(!check_rights(R_DEBUG|R_ADMIN))
return
@@ -46,7 +46,7 @@
/client/proc/cmd_admin_subtle_message(mob/M as mob in GLOB.mob_list)
set category = "Event"
set name = "Subtle Message"
set name = "\[Admin\] Subtle Message"
if(!ismob(M))
return
@@ -124,7 +124,7 @@
/client/proc/cmd_admin_direct_narrate(mob/M) // Targetted narrate -- TLE
set category = null
set name = "Direct Narrate"
set name = "\[Admin\] Direct Narrate"
if(!check_rights(R_SERVER|R_EVENT))
return
@@ -151,7 +151,7 @@
/client/proc/cmd_admin_headset_message(mob/M in GLOB.mob_list)
set category = "Event"
set name = "Headset Message"
set name = "\[Admin\] Headset Message"
admin_headset_message(M)
@@ -577,7 +577,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_rejuvenate(mob/living/M as mob in GLOB.mob_list)
set category = null
set name = "Rejuvenate"
set name = "\[Admin\] Rejuvenate"
if(!check_rights(R_REJUVINATE))
return
@@ -643,7 +643,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in view())
set category = null
set name = "Delete"
set name = "\[Admin\] Delete"
if(!check_rights(R_ADMIN))
return
@@ -782,7 +782,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
SSblackbox.record_feedback("tally", "admin_verb", 1, "Gibself") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_check_contents(mob/living/M as mob in GLOB.mob_list)
set name = "Check Contents"
set name = "\[Admin\] Check Contents"
set category = null
if(!check_rights(R_ADMIN))