Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

advanced_who_vr.dm

Adds in an "Advanced who"

2016-05-23 20:51:51 -04:00

ignore.dm

Comments out ignore and unignoring in character setup, properly removes ability to ignore yourself

2016-05-13 01:16:44 +01:00

ooc.dm

Merge pull request #358 from VOREStation/sync

2016-06-14 19:29:43 -04:00

suicide.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

who.dm

Developers now appear in Staffwho

2016-06-27 18:51:40 -05:00