ikarrus d3ec4dbf72 Resolving Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm

2014-06-27 09:30:43 -06: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

Merge pull request #3805 from Menshin/hud_and_pulling

2014-06-13 17:58:49 -05: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

Added some of Cheridan's suggestions

2014-06-20 21:35:48 -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

Resolving Conflicts:

2014-06-27 09:30:43 -06: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

Resolving Conflicts:

2014-06-27 09:30:43 -06: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