Rolan7 7decfe8621 Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes ...

Conflicts:
	code/modules/mob/living/carbon/carbon.dm

2014-06-21 09:00:21 -04:00

..

__DEFINES

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

__HELPERS

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

_globalvars

Strip Menu now obscures items based on flags_inv

2014-05-31 13:45:14 -06:00

_onclick

Changelings can use hivechat while muzzled.

2014-06-17 00:13:56 -04:00

ATMOSPHERICS

Fixed spelling in atmospherics.dm

2014-05-24 15:02:50 -04:00

controllers

Merge pull request #3959 from CollenN/mutrace-final

2014-06-20 21:47:54 -05:00

datums

Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes

2014-06-21 09:00:21 -04:00

defines

Removes hacky code in favour of a process() check for the nuke disk's location

2014-05-30 22:01:20 -06:00

game

Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes

2014-06-21 09:00:21 -04:00

js

…

LINDA

Added more stuff to the status panel for admins, air related, these are only temporal (hehehe)

2014-04-17 21:37:06 -03:00

modules

Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes

2014-06-21 09:00:21 -04:00

unused

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

WorkInProgress

Resolved conflicts:

2014-06-13 09:04:30 -06:00

_compile_options.dm

Per Aran's request, re-add dellogging

2014-06-16 11:21:42 -07:00

hub.dm

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

world.dm

Per Aran's request, re-add dellogging

2014-06-16 11:21:42 -07:00