Merge part 2

Yeah this should fix everything with the update
This commit is contained in:
BongaTheProto
2022-02-27 14:39:07 -05:00
parent 54aec9bd98
commit ddd36b40cf
17 changed files with 49 additions and 46 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
/client/proc/cmd_admin_man_up_global, //CIT CHANGE - ditto
/client/proc/cmd_admin_create_centcom_report,
/client/proc/cmd_change_command_name,
/client/proc/cmd_player_playtimes, /* shows players by playtime */
/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
/client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud
/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
/datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */
+1
View File
@@ -20,6 +20,7 @@
client["ckey"] = C.ckey
client["playtime"] = C.get_exp_living(TRUE)
client["playtime_hours"] = C.get_exp_living()
client["flags"] = check_flags(C)
var/mob/M = C.mob
client["observer"] = isobserver(M)