Skip to content

Commit

Permalink
obliterates mentorfollow (#2745)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
title

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

this thing does not work and i do not recall a single instance of it
ever working.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed mentorfollow
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
meemofcourse authored Feb 19, 2024
1 parent cdfe954 commit 5cf7c23
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 88 deletions.
7 changes: 0 additions & 7 deletions code/modules/client/client_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
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))
mentor_follow(M)
return

//byond bug ID:2256651
if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")
Expand Down
70 changes: 0 additions & 70 deletions code/modules/mentor/follow.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/modules/mentor/mentor_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
/client/proc/show_mentor_memo,
/client/proc/cmd_mentor_say,
/client/proc/cmd_mentor_dementor,
/client/proc/mentor_unfollow
))
GLOBAL_PROTECT(mentor_verbs)

Expand Down
5 changes: 1 addition & 4 deletions code/modules/mentor/verbs/mentorhelp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
else
.["present"]++

/proc/key_name_mentor(whom, include_link = null, include_name = 0, include_follow = 0, char_name_only = 0)
/proc/key_name_mentor(whom, include_link = null, include_name = 0, char_name_only = 0)
var/mob/M
var/client/C
var/key
Expand Down Expand Up @@ -91,7 +91,4 @@
else
. += "*no key*"

if(include_follow)
. += " (<a href='?mentor_follow=[REF(M)]'>F</a>)"

return .
10 changes: 5 additions & 5 deletions code/modules/mentor/verbs/mentorpm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@
var/show_char = CONFIG_GET(flag/mentors_mobname_only)
if(check_mentor_other(C))
if(check_mentor()) //both are mentors
to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0)]</b>: [msg]</span>")

else //recipient is an mentor but sender is not
to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span>")
to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, show_char)]</b>: [msg]</span>")
to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")

else
if(check_mentor()) //sender is an mentor but recipient is not.
to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span>")
to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, show_char)]</b>: [msg]</span>")

//we don't use message_Mentors here because the sender/receiver might get it too
for(var/client/X in GLOB.mentors)
Expand Down
1 change: 0 additions & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2349,7 +2349,6 @@
#include "code\modules\mapping\space_management\space_level.dm"
#include "code\modules\mapping\space_management\traits.dm"
#include "code\modules\mapping\space_management\zlevel_manager.dm"
#include "code\modules\mentor\follow.dm"
#include "code\modules\mentor\holder2.dm"
#include "code\modules\mentor\mentor_ranks.dm"
#include "code\modules\mentor\mentor_verbs.dm"
Expand Down

0 comments on commit 5cf7c23

Please sign in to comment.