Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 644f28f

Browse filesBrowse files
GuppyLaxxGuppyLaxx
committed
i hate this so much
1 parent 893e81d commit 644f28f
Copy full SHA for 644f28f

31 files changed

+739-13Lines changed: 739 additions & 13 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/__DEFINES/~yogs_defines/keybindings.dm‎

Copy file name to clipboardExpand all lines: code/__DEFINES/~yogs_defines/keybindings.dm
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ GLOBAL_LIST_INIT(keybinding_validkeys, list(
121121

122122
// Admin
123123
#define ACTION_ASAY "Adminchat"
124+
#define ACTION_MENTORCHAT "Mentorchat"
124125
#define ACTION_AGHOST "Admin Ghost"
125126
#define ACTION_PLAYERPANEL "Player Panel"
126127
#define ACTION_BUILDMODE "Build Mode"
@@ -158,9 +159,9 @@ GLOBAL_LIST_INIT(keybinding_default, list(
158159
ACTION_TARGETRLEG = "Numpad1",
159160
ACTION_TARGETGROIN = "Numpad2",
160161
ACTION_TARGETLLEG = "Numpad3",
161-
162+
162163
ACTION_RESIST = "B",
163-
164+
164165
ACTION_TOGGLETHROW = "R",
165166
ACTION_INTENTHELP = "1",
166167
ACTION_INTENTDISARM = "2",
@@ -169,6 +170,7 @@ GLOBAL_LIST_INIT(keybinding_default, list(
169170

170171

171172
ACTION_ASAY = "F3",
173+
ACTION_MENTORCHAT = "F4",
172174
ACTION_AGHOST = "F5",
173175
ACTION_PLAYERPANEL = "F6",
174176
ACTION_BUILDMODE = "F7",
@@ -185,4 +187,4 @@ GLOBAL_LIST_INIT(keybinding_default, list(
185187
dat += "<b>[name]:</b> <a href='?_src_=prefs;keybinding=[action];dir=[dir];task=input' [button_bound ? "" : "style='color:red'"]>[button_bound ? button : "Unbound"]</a><br>"; \
186188

187189
#define BUTTON_KEY(name, action) \
188-
BUTTON_KEY_MOVEMENT(name, action, 0);
190+
BUTTON_KEY_MOVEMENT(name, action, 0);
Collapse file

‎code/__DEFINES/~yogs_defines/mentor.dm‎

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#define YOGS_MENTOR_OOC_COLOUR "#FF3E96"
Collapse file

‎code/game/world.dm‎

Copy file name to clipboardExpand all lines: code/game/world.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GLOBAL_VAR(restart_counter)
3131
#endif
3232

3333
load_admins()
34-
load_donators() // yogs - Donators
34+
load_yogs_stuff() // yogs - Donators
3535
refresh_admin_files() //yogs - DB support
3636
LoadVerbs(/datum/verbs/menu)
3737
if(CONFIG_GET(flag/usewhitelist))
Collapse file

‎code/modules/admin/admin.dm‎

Copy file name to clipboardExpand all lines: code/modules/admin/admin.dm
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
body += "<A href='?_src_=holder;[HrefToken()];tdomeadmin=[REF(M)]'>Thunderdome Admin</A> | "
204204
body += "<A href='?_src_=holder;[HrefToken()];tdomeobserve=[REF(M)]'>Thunderdome Observer</A> | "
205205

206+
body += usr.client.YogsPPoptions(M) // YOGS - Player panel stuff, big PP
206207
body += "<br>"
207208
body += "</body></html>"
208209

Collapse file

‎code/modules/admin/admin_verbs.dm‎

Copy file name to clipboardExpand all lines: code/modules/admin/admin_verbs.dm
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
126126
/client/proc/forcerandomrotate,
127127
/client/proc/adminchangemap,
128128
/client/proc/panicbunker,
129-
/client/proc/toggle_hub
129+
/client/proc/toggle_hub,
130+
/client/proc/mentor_memo /* YOGS - something stupid about "Mentor memos" */
130131
)
131132
GLOBAL_PROTECT(admin_verbs_debug)
132133
GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
Collapse file

‎code/modules/admin/secrets.dm‎

Copy file name to clipboardExpand all lines: code/modules/admin/secrets.dm
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<B>General Secrets</B><BR>
99
<BR>
1010
<A href='?src=[REF(src)];[HrefToken()];secrets=admin_log'>Admin Log</A><BR>
11+
<A href='?src=[REF(src)];[HrefToken()];secrets=mentor_log'>Mentor Log</A><BR>
1112
<A href='?src=[REF(src)];[HrefToken()];secrets=show_admins'>Show Admin List</A><BR>
1213
<BR>
13-
"}
14+
"} // YOGS - Added mentor logs
1415

1516
if(check_rights(R_ADMIN,0))
1617
dat += {"
@@ -107,6 +108,9 @@
107108
dat += "No-one has done anything this round!"
108109
usr << browse(dat, "window=admin_log")
109110

111+
if("mentor_log") // YOGS - Get in those mentor logs
112+
YogMentorLogs() // YOGS - Same as above
113+
110114
if("show_admins")
111115
var/dat = "<B>Current admins:</B><HR>"
112116
if(GLOB.admin_datums)
Collapse file

‎code/modules/client/client_procs.dm‎

Copy file name to clipboardExpand all lines: code/modules/client/client_procs.dm
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,17 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
9292
if(href_list["priv_msg"])
9393
cmd_admin_pm(href_list["priv_msg"],null)
9494
return
95-
95+
// YOGS START - Mentor PMs
96+
if(yogs_client_procs(href_list))
97+
return
98+
// YOGS END
9699
switch(href_list["_src_"])
97100
if("holder")
98101
hsrc = holder
99102
if("usr")
100103
hsrc = mob
104+
if("mentor") // YOGS - Mentor stuff
105+
hsrc = mentor_datum // YOGS - Mentor stuff
101106
if("prefs")
102107
if (inprefs)
103108
return
Collapse file

‎code/modules/client/verbs/ooc.dm‎

Copy file name to clipboardExpand all lines: code/modules/client/verbs/ooc.dm
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,14 @@
7272
to_chat(C, "<span class='adminobserverooc'><span class='prefix'>OOC:</span> <EM>[keyname][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message linkify'>[msg]</span></span>")
7373
else
7474
to_chat(C, "<font color='[GLOB.normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[holder.fakekey ? holder.fakekey : key]:</EM> <span class='message linkify'>[msg]</span></span></font>")
75+
else if(is_mentor()) // YOGS START - Mentor and Donor colors
76+
to_chat(C, "<font color='[YOGS_MENTOR_OOC_COLOUR]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></span>")
7577
else if(!(key in C.prefs.ignoring))
76-
// yogs start - Donor OOC tag
7778
if(is_donator(src))
7879
to_chat(C, "<font color='[GLOB.normal_ooc_colour]'><span class='ooc'><span class='prefix'>\[Donator\] OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></span></font>")
7980
else
8081
to_chat(C, "<font color='[GLOB.normal_ooc_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[keyname]:</EM> <span class='message linkify'>[msg]</span></span></font>")
81-
// yogs end
82+
// YOGS END
8283

8384
/proc/toggle_ooc(toggle = null)
8485
if(toggle != null) //if we're specifically en/disabling ooc
Collapse file

‎config/mentors.txt‎

Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Like admins.txt, but for mentors and without ranks.
2+
# Just put ckeys in the format of one ckey per line, and all the ckeys listed here will be made mentors.
3+
#GuppyLaxx
Collapse file

‎config/yogs_config.txt‎

Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Comment this out if you want to use the SQL based mentor system, the legacy system uses mentors.txt.
2+
## You need to set up your database to use the SQL based system.
3+
## This flag is automatically enabled if SQL_ENABLED isn't
4+
#MENTOR_LEGACY_SYSTEM
5+
6+
#Mentors only see ckeys by default. Uncomment to have them only see mob name
7+
#MENTORS_MOBNAME_ONLY

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.