ikarrus 81e9431c64 Resolved Conflicts: ...

_maps/map_files/tgstation.2.1.3.dmm

2014-07-06 10:37:05 -06:00

..

_DynamicAreaLighting_TG.dm

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

2014-03-22 17:42:07 +01:00

configuration.dm

Resolving Conflicts:

2014-07-01 13:31:08 -06:00

failsafe.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

garbage.dm

Add logging to failed GC's that result in a del() call

2014-06-13 11:46:17 -07:00

lighting_controller.dm

Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm

2014-01-10 18:32:28 +00:00

master_controller.dm

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

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

shuttle_controller.dm

Finalizes Mutantrace Datum Update

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

supply_shuttle.dm

-Shuttles inflict heavy brute damage instead of instagibbing

2014-06-06 22:14:55 -06:00

verbs.dm

Initial pass to convert LF to CRLF

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

voting.dm

Removed percentages and added a "Did not vote" count for custom votes. (Non-voters get automatically added to status quo option in non-custom votes)

2013-12-08 11:34:12 -07:00