shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maybe actually have mentors that aren't broke as shit (#5954)

Browse Source
This commit is contained in:
Poojawa
2018-03-15 20:49:32 -05:00
committed by GitHub
parent 89f37cc8b7
commit 31d988344a
10 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/citadel_defines.dm
+1 -1
View File
@@ -108,7 +108,7 @@
//Brainslugs
#define isborer(A) (istype(A, /mob/living/simple_animal/borer))
#define CITADEL_MENTOR_OOC_COLOUR "#ad396e"
#define CITADEL_MENTOR_OOC_COLOUR "#224724"
//stamina stuff
#define STAMINA_SOFTCRIT 100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
code/modules/admin/admin.dm
+2 -5
View File
@@ -53,11 +53,6 @@
body += "<a href='?_src_=holder;[HrefToken()];modantagrep=set;mob=[REF(M)]'>\[set\]</a> "
body += "<a href='?_src_=holder;[HrefToken()];modantagrep=zero;mob=[REF(M)]'>\[zero\]</a>"
body += "<br><br>"
body += "<A href='?_src_=holder;[HrefToken()];makementor=[M.ckey]'>Make mentor</A> | "
body += "<A href='?_src_=holder;[HrefToken()];removementor=[M.ckey]'>Remove mentor</A>"
body += "<br>"
body += "<br><br>\[ "
body += "<a href='?_src_=vars;[HrefToken()];Vars=[REF(M)]'>VV</a> - "
if(M.mind)
@@ -184,6 +179,8 @@
body += "<A href='?_src_=holder;[HrefToken()];tdomeadmin=[REF(M)]'>Thunderdome Admin</A> | "
body += "<A href='?_src_=holder;[HrefToken()];tdomeobserve=[REF(M)]'>Thunderdome Observer</A> | "
body += usr.client.citaPPoptions(M) // CITADEL
body += "<br>"
body += "</body></html>"
code/modules/admin/secrets.dm
+1
View File
@@ -9,6 +9,7 @@
<BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=list_job_debug'>Show Job Debug</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=admin_log'>Admin Log</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=mentor_log'>Mentor Log</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=show_admins'>Show Admin List</A><BR>
<BR>
"}
code/modules/client/client_procs.dm
+4 -7
View File
@@ -87,14 +87,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
if(href_list["priv_msg"])
cmd_admin_pm(href_list["priv_msg"],null)
return
// Mentor PM
if(href_list["mentor_msg"])
if(CONFIG_GET(flag.mentors_mobname_only))
var/mob/M = locate(href_list["mentor_msg"])
cmd_mentor_pm(M,null)
else
cmd_mentor_pm(href_list["mentor_msg"],null)
// CITADEL Start - Mentor PM
if (citadel_client_procs(href_list))
return
// CITADEL End
switch(href_list["_src_"])
if("holder")
modular_citadel/code/modules/client/client_procs.dm
+21
View File
@@ -1,3 +1,24 @@
/client/New()
. = ..()
mentor_datum_set()
/client/proc/citadel_client_procs(href_list)
if(href_list["mentor_msg"])
if(CONFIG_GET(flag/mentors_mobname_only))
var/mob/M = locate(href_list["mentor_msg"])
cmd_mentor_pm(M,null)
else
cmd_mentor_pm(href_list["mentor_msg"],null)
return TRUE
//Mentor Follow
if(href_list["mentor_follow"])
var/mob/living/M = locate(href_list["mentor_follow"])
if(istype(M))
mentor_follow(M)
return TRUE
/client/proc/mentor_datum_set(admin)
mentor_datum = GLOB.mentor_datums[ckey]
if(!mentor_datum && check_rights_for(src, R_ADMIN,0)) // admin with no mentor datum?let's fix that
modular_citadel/code/modules/mentor/follow.dm
+1 -1
View File
@@ -23,4 +23,4 @@
verbs -= /client/proc/mentor_unfollow
to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(mentor_datum.following)]</span>")
log_mentor("[key_name(usr)] stopped following [key_name(mentor_datum.following)]")
mentor_datum.following = null
mentor_datum.following = null
modular_citadel/code/modules/mentor/mentor.dm
-23
View File
@@ -57,29 +57,6 @@ GLOBAL_PROTECT(mentor_href_token)
/proc/MentorHrefToken(forceGlobal = FALSE)
return "mentor_token=[RawMentorHrefToken(forceGlobal)]"
/datum/mentors/Topic(href, href_list)
..()
if(!usr || !usr.client || usr.client != owner || !usr.client.is_mentor())
return
if(!CheckMentorHREF(href, href_list))
return
if(href_list["mentor_msg"])
if(CONFIG_GET(flag/mentors_mobname_only))
var/mob/M = locate(href_list["mentor_msg"])
usr.client.cmd_mentor_pm(M,null)
else
usr.client.cmd_mentor_pm(href_list["mentor_msg"],null)
return
//Mentor Follow
if(href_list["mentor_follow"])
var/mob/living/M = locate(href_list["mentor_follow"])
if(istype(M))
usr.client.mentor_follow(M)
return
/proc/load_mentors()
GLOB.mentor_datums.Cut()
for(var/client/C in GLOB.mentors)
modular_citadel/code/modules/mentor/mentor_verbs.dm
+1 -1
View File
@@ -9,4 +9,4 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
verbs += GLOB.mentor_verbs
/client/proc/remove_mentor_verbs()
verbs -= GLOB.mentor_verbs
verbs -= GLOB.mentor_verbs
modular_citadel/code/modules/mentor/mentorpm.dm
+11 -3
View File
@@ -35,10 +35,18 @@
if(!msg)
msg = input(src,"Message:", "Private message") as text|null
if(!msg) return
if(!msg)
return
if(!C)
if(is_mentor()) to_chat(src, "<font color='red'>Error: Mentor-PM: Client not found.</font>")
else mentorhelp(msg) //Mentor we are replying to has vanished, Mentorhelp instead (how the fuck does this work?let's hope it works,shrug)
if(is_mentor())
to_chat(src, "<font color='red'>Error: Mentor-PM: Client not found.</font>")
else
mentorhelp(msg) //Mentor we are replying to has vanished, Mentorhelp instead (how the fuck does this work?let's hope it works,shrug)
return
// Neither party is a mentor, they shouldn't be PMing!
if (!C.is_mentor() && !is_mentor())
return
msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
modular_citadel/code/modules/mentor/mentorsay.dm
+1 -1
View File
@@ -15,4 +15,4 @@
msg = "<b><font color ='#8A2BE2'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
else
msg = "<b><font color ='#E236D8'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></font></b>"
to_chat(GLOB.admins | GLOB.mentors, msg)
to_chat(GLOB.admins | GLOB.mentors, msg)