Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
2017-02-28 09:30:49 -06:00
parent 93782cf716
commit 0bca862419
544 changed files with 309981 additions and 81206 deletions
@@ -12,13 +12,11 @@
 	if(!holder)
 		var/datum/mentors/mentor = mentor_datums[usr.client.ckey]
 		mentor.following = M
-	else
-		holder.following = M
+/*	else
+		holder.following = M*/

-	ManualFollow(M)
-
-//	usr.reset_perspective(M)
-	usr.verbs += /client/proc/mentor_unfollow
+	usr.reset_perspective(M)
+	src.verbs += /client/proc/mentor_unfollow

 	admins << "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is now following <EM>[key_name(M)]</span>"
 	usr << "<span class='info'>You are now following [M]. Click the \"Stop Following\" button in the Mentor tab to stop.</span>"
@@ -35,14 +33,14 @@
 		return

 	usr.reset_perspective(null)
-	usr.verbs -= /client/proc/mentor_unfollow
+	src.verbs -= /client/proc/mentor_unfollow

 	var/following = null
 	if(!holder)
 		var/datum/mentors/mentor = mentor_datums[usr.client.ckey]
 		following = mentor.following
-	else
-		following = holder.following
+	/*else
+		following = holder.following*/


 	admins << "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(following)]</span>"
@@ -21,7 +21,10 @@ var/list/mentor_datums = list()
 		owner = null

 /client/proc/dementor()
+	var/mentor = mentor_datums[ckey]
 	mentor_datums -= ckey
+	qdel(mentor)
+
 	return 1

 /proc/check_mentor()
@@ -4,7 +4,6 @@
 	mentors.Cut()

 	if(!config.mentor_legacy_system)
-		establish_db_connection()
 		if(!dbcon.IsConnected())
 			world.log << "Failed to connect to database in load_mentors()."
 			diary << "Failed to connect to database in load_mentors()."
@@ -1,6 +1,6 @@
 /client/verb/mentorhelp(msg as text)
 	set category = "Mentor"
-	set name = "Mentorhelp"
+	set name = "mentorhelp"

 	//remove out adminhelp verb temporarily to prevent spamming of mentors.
 	src.verbs -= /client/verb/mentorhelp
@@ -28,6 +28,15 @@
 	src << "<span class='mentornotice'><font color='purple'>PM to-<b>Mentors</b>: [msg]</font></span>"
 	return

+/proc/get_mentor_counts()
+	. = list("total" = 0, "afk" = 0, "present" = 0)
+	for(var/client/X in mentors)
+		.["total"]++
+		if(X.is_afk())
+			.["afk"]++
+		else
+			.["present"]++
+
 /proc/key_name_mentor(var/whom, var/include_link = null, var/include_name = 0, var/include_follow = 0, var/char_name_only = 0)
 	var/mob/M
 	var/client/C
@@ -19,7 +19,7 @@
 //Fetching a message if needed. src is the sender and C is the target client
 /client/proc/cmd_mentor_pm(whom, msg)
 	var/client/C
-	if(istype(whom,/mob))
+	if(ismob(whom))
 		var/mob/M = whom
 		C = M.client
 	else if(istext(whom))
@@ -7,8 +7,10 @@
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	if(!msg)	return

+	msg = emoji_parse(msg)
 	log_mentor("MSAY: [key_name(src)] : [msg]")

+
 	if(check_rights(R_ADMIN,0))
 		msg = "<span class='mentoradmin'><span class='prefix'>MENTOR:</span> <EM>[key_name(src, 0, 0)]</EM>: <span class='message'>[msg]</span></span>"
 		mentors << msg