diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 2c080492..9dfd9000 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -199,7 +199,10 @@ var/global/normal_ooc_colour = "#002eb8"
for(var/client/C in admins)
if(C.holder.rights & (R_ADMIN|R_MOD|R_DEV))
if(C.prefs.toggles & CHAT_LOOC)
+ var/stealth = ""
+ if(C.holder && C.holder.rights & (R_ADMIN|R_MOD))
+ stealth = "(stealth)"
var/prefix = "(R)LOOC"
if (C.mob in heard)
prefix = "LOOC"
- C << "[prefix]: [src.key]: [msg]"
\ No newline at end of file
+ C << "[stealth][prefix]: [src.key]: [msg]"
\ No newline at end of file
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 8850445f..54d85909 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -7,7 +7,7 @@
var/list/Lines = list()
- if(holder && (R_ADMIN & holder.rights || R_MOD & holder.rights))
+ if(holder && (holder.rights & (R_ADMIN|R_MOD)))
for(var/client/C in clients)
var/entry = "\t[C.key]"
if(C.holder && C.holder.fakekey)
@@ -58,11 +58,9 @@
var/num_admins_online = 0
if(holder)
for(var/client/C in admins)
- if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights)) //Used to determine who shows up in admin rows
-
- if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights)) //Mentors can't see stealthmins
- continue
-
+ if(C.holder.fakekey && !(holder.rights & (R_ADMIN|R_MOD)))
+ continue
+ if(C.holder.rights & R_ADMIN)
msg += "\t[C] is a [C.holder.rank]"
if(C.holder.fakekey)
@@ -80,9 +78,10 @@
msg += "\n"
num_admins_online++
- else if((R_MOD & C.holder.rights) && !(R_FUN & C.holder.rights))
- modmsg += "\t[C] is a [C.holder.rank]"
+ continue
+ else if((C.holder.rights & R_MOD) && !(C.holder.rights & R_FUN))
+ modmsg += "\t[C] is a [C.holder.rank]"
if(isobserver(C.mob))
modmsg += " - Observing"
else if(istype(C.mob,/mob/new_player))
@@ -94,9 +93,10 @@
modmsg += " (AFK)"
modmsg += "\n"
num_mods_online++
- else if ((R_FUN & C.holder.rights) && !(R_ADMIN & C.holder.rights))
- eventmsg += "\t[C] is a [C.holder.rank]"
+ continue
+ else if (C.holder.rights & R_FUN)
+ eventmsg += "\t[C] is a [C.holder.rank]"
if(isobserver(C.mob))
eventmsg += " - Observing"
else if(istype(C.mob,/mob/new_player))
@@ -108,9 +108,10 @@
eventmsg += " (AFK)"
eventmsg += "\n"
num_event_online++
- else if(R_DEV & C.holder.rights)
- devmsg += "\t[C] is a [C.holder.rank]"
+ continue
+ else if(C.holder.rights & R_DEV)
+ devmsg += "\t[C] is a [C.holder.rank]"
if(isobserver(C.mob))
devmsg += " - Observing"
else if(istype(C.mob,/mob/new_player))
@@ -122,9 +123,10 @@
devmsg += " (AFK)"
devmsg += "\n"
num_devs_online++
- else if(R_DUTYOFF & C.holder.rights && !(C.holder.rights & (R_ADMIN|R_MOD)))
- dutymsg += "\t[C]"
+ continue
+ else if(C.holder.rights & R_DUTYOFF)
+ dutymsg += "\t[C]"
if(isobserver(C.mob))
dutymsg += " - Observing"
else if(istype(C.mob,/mob/new_player))
@@ -136,22 +138,27 @@
dutymsg += " (AFK)"
dutymsg += "\n"
num_duty_online++
+ continue
else
for(var/client/C in admins)
- if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights))
- if(!C.holder.fakekey)
- msg += "\t[C] is a [C.holder.rank]\n"
- num_admins_online++
- else if (R_MOD & C.holder.rights)
+ if(C.holder.fakekey) //If anyone is given stealth you want to hide them. There is no point in +STEALTH otherwise, just add it to +ADMIN
+ continue
+ if(C.holder.rights & R_ADMIN)
+ msg += "\t[C] is a [C.holder.rank]\n"
+ num_admins_online++
+ else if (C.holder.rights & R_MOD && !(C.holder.rights & R_FUN))
modmsg += "\t[C] is a [C.holder.rank]\n"
num_mods_online++
- else if ((R_FUN & C.holder.rights) && !(R_MOD & C.holder.rights))
+ continue
+ else if (C.holder.rights & R_FUN)
eventmsg += "\t[C] is a [C.holder.rank]\n"
num_event_online++
- else if(R_DEV & C.holder.rights)
+ continue
+ else if(C.holder.rights & R_DEV)
devmsg += "\t[C] is a [C.holder.rank]\n"
num_devs_online++
+ continue
var/eventwho = ""
if(num_event_online)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 6f13fb68..21a6bd42 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -1,398 +1,3 @@
-/*
-//admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
-var/list/admin_verbs_default = list(
- /client/proc/player_panel,
- /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/
- /client/proc/deadmin_self, /*destroys our own admin datum so we can play as a regular player*/
- /client/proc/hide_verbs, /*hides all our adminverbs*/
- /client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/
- /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
-// /client/proc/deadchat /*toggles deadchat on/off*/
- )
-var/list/admin_verbs_admin = list(
- /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/
- /client/proc/check_antagonists, /*shows all antags*/
- /client/proc/alertlevels,
- /client/proc/cmd_admin_wind,
- /client/proc/cmd_admin_unwind,
- /client/proc/player_panel, /*shows an interface for all players, with links to various panels (old style)*/
- /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/
- /client/proc/invisimin, /*allows our mob to go invisible/visible*/
-// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
- /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/
- /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/
- /datum/admins/proc/announce, /*priority announce something to all clients.*/
- /client/proc/colorooc, /*allows us to set a custom colour for everythign we say in ooc*/
- /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/
- /client/proc/toggle_view_range, /*changes how far we can see*/
- /datum/admins/proc/view_txt_log, /*shows the server log (diary) for today*/
- /datum/admins/proc/view_atk_log, /*shows the server combat-log, doesn't do anything presently*/
- /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
- /client/proc/cmd_admin_pm_panel, /*admin-pm list*/
- /client/proc/cmd_admin_subtle_message, /*send an message to somebody as a 'voice in their head'*/
- /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/
- /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/
- /datum/admins/proc/access_news_network, /*allows access of newscasters*/
- /client/proc/giveruntimelog, /*allows us to give access to runtime logs to somebody*/
- /client/proc/getserverlog, /*allows us to fetch server logs (diary) for other days*/
- /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/
- /client/proc/Getmob, /*teleports a mob to our location*/
- /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/
-// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage
- /client/proc/Jump,
- /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/
- /client/proc/jumptomob, /*allows us to jump to a specific mob*/
- /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/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/
- /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/
- /client/proc/cmd_admin_create_centcom_report,
- /client/proc/cmd_mentor_check_new_players,
- /client/proc/check_words, /*displays cult-words*/
- /client/proc/check_ai_laws, /*shows AI and borg laws*/
- /client/proc/check_antagonists,
- /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
- /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/
-// /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/
- /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/
- /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/
- /client/proc/secrets,
- /client/proc/toggleprayers,
- /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/
- /datum/admins/proc/toggledevooc,
- /datum/admins/proc/togglemodooc,
- /datum/admins/proc/togglelooc,
- /datum/admins/proc/togglemodlooc,
- /datum/admins/proc/toggledevlooc,
- /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/
- /datum/admins/proc/toggledsay, /*toggles dsay on/off for everyone*/
- /client/proc/game_panel, /*game panel, allows to change game-mode etc*/
- /client/proc/cmd_admin_say, /*admin-only ooc chat*/
- /datum/admins/proc/PlayerNotes,
- /client/proc/cmd_mod_say,
- /datum/admins/proc/show_player_info,
- /client/proc/free_slot, /*frees slot for chosen job*/
- /client/proc/cmd_admin_change_custom_event,
- /client/proc/cmd_admin_rejuvenate,
- /client/proc/toggleattacklogs,
- /client/proc/toggledebuglogs,
- /client/proc/toggleghostwriters,
- /client/proc/toggledrones,
- /datum/admins/proc/show_skills,
- /client/proc/check_customitem_activity,
- /client/proc/man_up,
- /client/proc/global_man_up,
- /client/proc/response_team, // Response Teams admin verb
- /client/proc/toggle_antagHUD_use,
- /client/proc/toggle_antagHUD_restrictions,
- /client/proc/allow_character_respawn, /* Allows a ghost to respawn */
- /client/proc/set_ooc,
- /client/proc/cleartox
-)
-var/list/admin_verbs_ban = list(
- /client/proc/unban_panel,
- /client/proc/jobbans,
- /client/proc/warning_panel
- )
-var/list/admin_verbs_sounds = list(
- /client/proc/play_local_sound,
- /client/proc/play_sound
- )
-var/list/admin_verbs_fun = list(
-//Hey look it's in order of letters ^_^
- /datum/admins/proc/access_news_network,
- /datum/admins/proc/Game,
- /datum/admins/proc/toggle_aliens,
- /datum/admins/proc/toggle_space_ninja,
- /client/proc/admin_ghost,
- /client/proc/alertlevels,
- /client/proc/check_ai_laws,
- /client/proc/cinematic,
- /client/proc/cmd_admin_add_freeform_ai_law,
- /client/proc/cmd_admin_add_random_ai_law,
- /client/proc/cmd_admin_change_custom_event,
- /client/proc/cmd_admin_create_centcom_report,
- /client/proc/cmd_admin_delete,
- /client/proc/cmd_admin_direct_narrate,
- /client/proc/cmd_admin_dress,
- /client/proc/cmd_admin_gib_self,
- /client/proc/cmd_admin_pm_context,
- /client/proc/cmd_admin_pm_panel,
- /client/proc/cmd_admin_subtle_message,
- /client/proc/cmd_admin_world_narrate,
- /client/proc/cmd_debug_tog_aliens,
- /client/proc/cmd_mod_say,
- /client/proc/drop_bomb,
- /client/proc/dsay,
- /client/proc/editappear,
- /client/proc/everyone_random,
- /client/proc/Getmob,
- /client/proc/Getkey,
- /client/proc/Jump,
- /client/proc/jumptokey,
- /client/proc/jumptomob,
- /client/proc/make_area_sound,
- /client/proc/make_sound,
- /client/proc/object_talk,
- /client/proc/one_click_antag,
- /client/proc/secrets,
- /client/proc/send_space_ninja,
- /client/proc/toggle_view_range
- )
-
-var/list/admin_verbs_dev = list(
- /client/proc/dsay,
- /client/proc/togglebuildmodeself,
- /client/proc/giveruntimelog,
- /client/proc/getruntimelog,
- /client/proc/cmd_admin_list_open_jobs,
- /client/proc/Debug2,
- /client/proc/admin_ghost,
- /client/proc/kill_air,
- /client/proc/ZASSettings,
- /client/proc/cmd_debug_make_powernets,
- /client/proc/kill_airgroup,
- /client/proc/debug_controller,
- /client/proc/cmd_debug_mob_lists,
- /client/proc/cmd_admin_delete,
- /client/proc/cmd_debug_del_all,
- /datum/admins/proc/restart,
- /client/proc/air_report,
- /client/proc/reload_admins,
- /client/proc/restart_controller,
- /client/proc/enable_debug_verbs,
- /client/proc/toggledebuglogs,
- /client/proc/cmd_dev_say,
- /client/proc/cmd_dev_bst,
- /client/proc/cmd_dev_reset_gravity,
- /client/proc/cmd_dev_reset_floating,
- /client/proc/togglescopeslogs
-)
-var/list/admin_verbs_spawn = list(
- /datum/admins/proc/spawn_atom, /*allows us to spawn instances*/
- /client/proc/respawn_character
- )
-var/list/admin_verbs_server = list(
- /client/proc/Set_Holiday,
- /client/proc/ToRban,
- /datum/admins/proc/startnow,
- /datum/admins/proc/restart,
- /datum/admins/proc/delay,
- /datum/admins/proc/toggleaban,
- /client/proc/toggle_log_hrefs,
- /datum/admins/proc/immreboot,
- /client/proc/everyone_random,
- /datum/admins/proc/toggleAI,
- /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/
- /client/proc/cmd_debug_del_all,
- /client/proc/SDQL_query,
- /client/proc/SDQL2_query,
- /datum/admins/proc/adrev,
- /datum/admins/proc/adspawn,
- /datum/admins/proc/adjump,
- /datum/admins/proc/toggle_aliens,
- /datum/admins/proc/toggle_space_ninja,
- /client/proc/toggle_random_events,
- /client/proc/check_customitem_activity,
- /client/proc/nanomapgen_DumpImage
- )
-var/list/admin_verbs_debug = list(
- /client/proc/getruntimelog, /*allows us to access runtime logs to somebody*/
- /client/proc/cmd_admin_list_open_jobs,
- /datum/admins/proc/restart,
- /datum/admins/proc/delay,
- /client/proc/Debug2,
- /client/proc/kill_air,
- /client/proc/ZASSettings,
- /client/proc/cmd_debug_make_powernets,
- /client/proc/kill_airgroup,
- /client/proc/debug_controller,
- /client/proc/cmd_debug_mob_lists,
- /client/proc/cmd_admin_delete,
- /client/proc/cmd_debug_del_all,
- /client/proc/cmd_debug_tog_aliens,
- /client/proc/air_report,
- /client/proc/reload_admins,
- /client/proc/restart_controller,
- /client/proc/remake_distribution_map,
- /client/proc/show_distribution_map,
- /client/proc/enable_debug_verbs,
- /client/proc/callproc,
- /client/proc/toggledebuglogs,
- /client/proc/cmd_dev_reset_gravity,
- /client/proc/cmd_dev_reset_floating,
- /client/proc/fillspace,
- /client/proc/hide_activity
- )
-var/list/admin_verbs_possess = list(
- /proc/possess,
- /proc/release
- )
-var/list/admin_verbs_permissions = list(
- /client/proc/edit_admin_permissions
- )
-var/list/admin_verbs_rejuv = list(
- /client/proc/respawn_character
- )
-
-//verbs which can be hidden - needs work
-var/list/admin_verbs_hideable = list(
- /client/proc/set_ooc,
- /client/proc/deadmin_self,
-// /client/proc/deadchat,
- /client/proc/toggleprayers,
- /client/proc/toggle_hear_radio,
- /datum/admins/proc/show_traitor_panel,
- /datum/admins/proc/toggleenter,
- /datum/admins/proc/toggleguests,
- /datum/admins/proc/announce,
- /client/proc/colorooc,
- /client/proc/admin_ghost,
- /client/proc/toggle_view_range,
- /datum/admins/proc/view_txt_log,
- /datum/admins/proc/view_atk_log,
- /client/proc/cmd_admin_subtle_message,
- /client/proc/cmd_admin_check_contents,
- /datum/admins/proc/access_news_network,
- /client/proc/admin_call_shuttle,
- /client/proc/admin_cancel_shuttle,
- /client/proc/cmd_admin_direct_narrate,
- /client/proc/cmd_admin_world_narrate,
- /client/proc/check_words,
- /client/proc/play_local_sound,
- /client/proc/play_sound,
- /client/proc/object_talk,
- /client/proc/cmd_admin_dress,
- /client/proc/cmd_admin_gib_self,
- /client/proc/drop_bomb,
- /client/proc/cinematic,
- /datum/admins/proc/toggle_aliens,
- /datum/admins/proc/toggle_space_ninja,
- /client/proc/send_space_ninja,
- /client/proc/cmd_admin_add_freeform_ai_law,
- /client/proc/cmd_admin_add_random_ai_law,
- /client/proc/cmd_admin_create_centcom_report,
- /client/proc/make_sound,
- /client/proc/make_area_sound,
- /client/proc/toggle_random_events,
- /client/proc/cmd_admin_add_random_ai_law,
- /client/proc/Set_Holiday,
- /client/proc/ToRban,
- /datum/admins/proc/startnow,
- /datum/admins/proc/restart,
- /datum/admins/proc/delay,
- /datum/admins/proc/toggleaban,
- /client/proc/toggle_log_hrefs,
- /datum/admins/proc/immreboot,
- /client/proc/everyone_random,
- /datum/admins/proc/toggleAI,
- /datum/admins/proc/adrev,
- /datum/admins/proc/adspawn,
- /datum/admins/proc/adjump,
- /client/proc/restart_controller,
- /client/proc/cmd_admin_list_open_jobs,
- /client/proc/callproc,
- /client/proc/Debug2,
- /client/proc/reload_admins,
- /client/proc/kill_air,
- /client/proc/cmd_debug_make_powernets,
- /client/proc/kill_airgroup,
- /client/proc/debug_controller,
- /client/proc/startSinglo,
- /client/proc/cmd_debug_mob_lists,
- /client/proc/cmd_debug_del_all,
- /client/proc/cmd_debug_tog_aliens,
- /client/proc/air_report,
- /client/proc/enable_debug_verbs,
- /proc/possess,
- /proc/release
- )
-var/list/admin_verbs_mod = list(
- /client/proc/check_antagonists, /*shows all antags*/
- /client/proc/cmd_admin_check_contents,
- /client/proc/cmd_admin_wind,
- /client/proc/cmd_admin_unwind,
- /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/
- /client/proc/cmd_admin_pm_panel, /*admin-pm list*/
- /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/
- /client/proc/toggleattacklogs,
- /client/proc/toggledebuglogs,
- /client/proc/toggleprayers,
- /datum/admins/proc/PlayerNotes,
- /client/proc/cmd_mentor_check_new_players,
- /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/
- /client/proc/cmd_mod_say,
- /client/proc/check_ai_laws,
- /datum/admins/proc/show_player_info,
- /client/proc/player_panel_new,
- /client/proc/dsay,
- /datum/admins/proc/show_skills,
- /datum/admins/proc/show_player_panel,
- /client/proc/check_antagonists,
- /client/proc/jobbans,
- /client/proc/cmd_admin_subtle_message /*send an message to somebody as a 'voice in their head'*/
-)
-/client/proc/add_admin_verbs()
- if(holder)
- verbs += admin_verbs_default
- if(holder.rights & R_BUILDMODE) verbs += /client/proc/togglebuildmodeself
- if(holder.rights & R_ADMIN) verbs += admin_verbs_admin
- if(holder.rights & R_BAN) verbs += admin_verbs_ban
- if(holder.rights & R_FUN) verbs += admin_verbs_fun
- if(holder.rights & R_SERVER) verbs += admin_verbs_server
- if(holder.rights & R_DEBUG) verbs += admin_verbs_debug
- if(holder.rights & R_POSSESS) verbs += admin_verbs_possess
- if(holder.rights & R_PERMISSIONS) verbs += admin_verbs_permissions
- if(holder.rights & R_STEALTH) verbs += /client/proc/stealth
- if(holder.rights & R_REJUVINATE) verbs += admin_verbs_rejuv
- if(holder.rights & R_SOUNDS) verbs += admin_verbs_sounds
- if(holder.rights & R_SPAWN) verbs += admin_verbs_spawn
- if(holder.rights & R_MOD) verbs += admin_verbs_mod
- if(holder.rights & R_DEV) verbs += admin_verbs_dev
-
-/client/proc/remove_admin_verbs()
- verbs.Remove(
- admin_verbs_default,
- /client/proc/togglebuildmodeself,
- admin_verbs_admin,
- admin_verbs_ban,
- admin_verbs_fun,
- admin_verbs_server,
- admin_verbs_debug,
- admin_verbs_possess,
- admin_verbs_permissions,
- /client/proc/stealth,
- admin_verbs_rejuv,
- admin_verbs_sounds,
- admin_verbs_spawn,
- admin_verbs_dev,
- /*Debug verbs added by "show debug verbs"*/
- /client/proc/Cell,
- /client/proc/do_not_use_these,
- /client/proc/camera_view,
- /client/proc/sec_camera_report,
- /client/proc/intercom_view,
- /client/proc/air_status,
- /client/proc/atmosscan,
- /client/proc/powerdebug,
- /client/proc/count_objects_on_z_level,
- /client/proc/count_objects_all,
- /client/proc/cmd_assume_direct_control,
- /client/proc/jump_to_dead_group,
- /client/proc/startSinglo,
- /client/proc/ticklag,
- /client/proc/cmd_admin_grantfullaccess,
- /client/proc/kaboom,
- /client/proc/splash,
- /client/proc/cmd_admin_areatest,
- /client/proc/view_power_update_stats_area,
- /client/proc/view_power_update_stats_machines,
- /client/proc/toggle_power_update_profiling,
- /client/proc/atmos_toggle_debug
- )
-*/
-
/client/proc/hide_most_verbs()//Allows you to keep some functionality while hiding some verbs
set name = "Adminverbs - Hide Most"
set category = "Admin"
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index e16e809a..44f0b861 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -78,7 +78,7 @@
else
recieve_color = "maroon"
send_pm_type = holder.rank + " "
- if(!C.holder && holder && holder.fakekey)
+ if(!C.holder && holder && holder.fakekey)
recieve_pm_type = "Admin"
else
recieve_pm_type = holder.rank
@@ -108,9 +108,16 @@
adminhelp(reply) //sender has left, adminhelp instead
return
- recieve_message = "[recieve_pm_type] PM from-[get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]: [msg]"
+ var/options = ""
+
+ if(C.holder && C.holder.rights & (R_ADMIN|R_MOD|R_FUN|R_DEV))
+ options = "[get_options_bar(src, 1, 1, 1)]"
+ else
+ options = "[get_options_bar(src, 0, 0, 1)]"
+
+ recieve_message = "[recieve_pm_type] PM from-[options]: [msg]"
C << recieve_message
- src << "[send_pm_type]PM to-[get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]: [msg]"
+ src << "[send_pm_type]PM to-[options]: [msg]"
//play the recieving admin the adminhelp sound (if they have them enabled)
//non-admins shouldn't be able to disable this
@@ -124,7 +131,7 @@
//check client/X is an admin and isn't the sender or recipient
if(X == C || X == src)
continue
- if(X.key!=key && X.key!=C.key && (X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD) )
+ if(X.key != key && X.key != C.key && (X.holder.rights & (R_ADMIN|R_MOD)))
X << "PM: [key_name(src, X, 0)]->[key_name(C, X, 0)]: \blue [msg]" //inform X
/client/proc/cmd_admin_irc_pm()
@@ -152,6 +159,6 @@
for(var/client/X in admins)
if(X == src)
continue
- if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD))
+ if(X.holder.rights & (R_ADMIN|R_MOD))
X << "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 4cd2ba75..fc72e39f 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -121,7 +121,8 @@
del(G)
usr.attack_log += text("\[[time_stamp()]\] Has placed [GM.name] ([GM.ckey]) in disposals.")
GM.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [usr.name] ([usr.ckey])")
- msg_admin_attack("[key_name_admin(usr)] placed [key_name_admin(GM)] in a disposals unit. (JMP)")
+ if(GM.ckey || istype(GM, /mob/living/carbon/human))
+ msg_admin_attack("[key_name_admin(usr)] placed [key_name_admin(GM)] in a disposals unit. (JMP)")
return
if(!I) return