From e3ce286ea42119b40d8d016f2b484dec71985847 Mon Sep 17 00:00:00 2001 From: Kazzc Date: Tue, 14 Jan 2020 14:40:21 -0600 Subject: [PATCH 1/2] Committed out the old "request Spice" from Virgo and made a new command for "request spice" It should send a ding noise, comes with commands that allows an admin to "jump, give cookie, Look at VV, look at Player panel, DM them" --- code/modules/admin/verbs/adminhelp_vr.dm | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index f2df8e4eb2..a6dde89330 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -15,6 +15,8 @@ query_string += "&admin_number_afk=[afkmins.len]" world.Export("[config.chat_webhook_url]?[query_string]") + +/* //CHOMPStation Addition 14/1/20 Ksc - Committing this out to be replaced with a improved request spice. /client/verb/adminspice() set category = "Admin" set name = "Request Spice" @@ -36,3 +38,37 @@ usr.verbs -= /client/verb/adminspice spawn(6000) usr.verbs += /client/verb/adminspice // 10 minute cool-down for spice request +*/ + +/mob/verb/Spice(msg as text) //CHOMPStation Addition 14/1/20 Ksc - The improved request spice command. + set category = "Admin" + set name = "Request Spice" + set desc = "Request for admins to challange your shift" + + if(say_disabled) //This is here to try to identify lag problems + usr << "Speech is currently admin-disabled." + return + + msg = sanitize(msg) + if(!msg) return + + if(usr.client) + if(msg) + client.handle_spam_prevention(MUTE_PRAY) + if(usr.client.prefs.muted & MUTE_PRAY) + usr << " No spice for you (muted)." + return + + var/image/cross = image('icons/obj/food.dmi',"enchiladas") + msg = "\icon[cross] SPICE: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" + + for(var/client/C in admins) + if(R_ADMIN & C.holder.rights) + if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers)) + C << msg + C << 'sound/effects/ding.ogg' + usr << "Be wary of the cookie." + + feedback_add_details("admin_verb","spicech") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + //log_admin("HELP: [key_name(src)]: [msg]") + From ce80cc4c3e1e6caae3c006d9772b63b41bcdde95 Mon Sep 17 00:00:00 2001 From: Kazzc Date: Wed, 15 Jan 2020 03:07:07 -0600 Subject: [PATCH 2/2] Changed "usr" << to "to_chat(usr, )" --- code/modules/admin/verbs/adminhelp_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp_vr.dm b/code/modules/admin/verbs/adminhelp_vr.dm index a6dde89330..40859729be 100644 --- a/code/modules/admin/verbs/adminhelp_vr.dm +++ b/code/modules/admin/verbs/adminhelp_vr.dm @@ -46,7 +46,7 @@ set desc = "Request for admins to challange your shift" if(say_disabled) //This is here to try to identify lag problems - usr << "Speech is currently admin-disabled." + to_chat (usr, "Speech is currently admin-disabled.") return msg = sanitize(msg) @@ -56,7 +56,7 @@ if(msg) client.handle_spam_prevention(MUTE_PRAY) if(usr.client.prefs.muted & MUTE_PRAY) - usr << " No spice for you (muted)." + to_chat (usr, " No spice for you. (muted).") return var/image/cross = image('icons/obj/food.dmi',"enchiladas") @@ -67,7 +67,7 @@ if(C.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers)) C << msg C << 'sound/effects/ding.ogg' - usr << "Be wary of the cookie." + to_chat (usr, "Be wary of the cookie.") feedback_add_details("admin_verb","spicech") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]")