mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts: # code/__HELPERS/unsorted.dm # code/_globalvars/lists/objects.dm # code/controllers/verbs.dm # code/game/gamemodes/cult/ritual.dm # code/game/gamemodes/cult/runes.dm # code/game/objects/items/stacks/sheets/sheet_types.dm # code/modules/mob/spirit/mask/mask.dm # code/modules/mob/spirit/viewpoint.dm # icons/effects/96x96.dmi # icons/effects/effects.dmi # icons/mob/actions.dmi # icons/obj/weapons.dmi # icons/obj/wizard.dmi # icons/turf/floors.dmi
This commit is contained in:
@@ -37,7 +37,6 @@ var/list/admin_verbs_admin = list(
|
||||
/client/proc/jumptoturf, /*allows us to jump to a specific turf*/
|
||||
/client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/
|
||||
/client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/
|
||||
/client/proc/check_words, /*displays cult-words*/
|
||||
/client/proc/check_ai_laws, /*shows AI and borg laws*/
|
||||
/client/proc/manage_silicon_laws, /* Allows viewing and editing silicon laws. */
|
||||
/client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
|
||||
@@ -75,6 +74,7 @@ var/list/admin_verbs_admin = list(
|
||||
/client/proc/debug_variables,
|
||||
/client/proc/show_snpc_verbs,
|
||||
/client/proc/reset_all_tcs, /*resets all telecomms scripts*/
|
||||
/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
|
||||
/client/proc/toggle_mentor_chat
|
||||
)
|
||||
var/list/admin_verbs_ban = list(
|
||||
|
||||
Reference in New Issue
Block a user