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

April sync (#360)

Browse Source 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
This commit is contained in:
Poojawa
2017-04-13 23:37:00 -05:00
committed by GitHub
parent cdc32c98fa
commit 7e9b96a00f
1322 changed files with 174827 additions and 23888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mentor/follow.dm
+4 -5
View File
@@ -1,4 +1,3 @@
//var/following = null //Gross, but necessary as we loose all concept of who we're following otherwise
/client/proc/mentor_follow(var/mob/living/M)
if(!check_mentor())
return
@@ -10,7 +9,7 @@
return
if(!holder)
var/datum/mentors/mentor = mentor_datums[usr.client.ckey]
var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey]
mentor.following = M
/* else
holder.following = M*/
@@ -18,7 +17,7 @@
usr.reset_perspective(M)
src.verbs += /client/proc/mentor_unfollow
to_chat(admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is now following <EM>[key_name(M)]</span>")
to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is now following <EM>[key_name(M)]</span>")
to_chat(usr, "<span class='info'>You are now following [M]. Click the \"Stop Following\" button in the Mentor tab to stop.</span>")
log_mentor("[key_name(usr)] began following [key_name(M)]")
@@ -37,13 +36,13 @@
var/following = null
if(!holder)
var/datum/mentors/mentor = mentor_datums[usr.client.ckey]
var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey]
following = mentor.following
/*else
following = holder.following*/
to_chat(admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(following)]</span>")
to_chat(GLOB.admins, "<span class='mentor'><span class='prefix'>MENTOR:</span> <EM>[key_name(usr)]</EM> is no longer following <EM>[key_name(following)]</span>")
to_chat(usr, "<span class='info'>You are no longer following [following].</span>")
log_mentor("[key_name(usr)] stopped following [key_name(following)]")