Incoming 3da00354b4 Merge branch 'master' of https://github.com/tgstation/-tg-station into action_action_action_action_action ...

Conflicts:
	icons/mob/actions.dmi

2015-11-10 17:03:05 -05:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #12911 from Shadowlight213/DbJobunban

2015-11-09 15:47:10 +11:00

__HELPERS

Merge pull request #12919 from MrStonedOne/patch-61

2015-11-09 23:19:16 +03:00

_globalvars

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

_onclick

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

ATMOSPHERICS

Improves speed of redraw_lighting()

2015-11-06 23:36:03 -03:00

controllers

Merge remote-tracking branch 'upstream/master' into fuk

2015-11-07 15:56:39 -03:00

datums

Makes the lich beam dark green, and thus much more spooky.

2015-11-08 20:31:54 -05:00

game

Merge pull request #12873 from KorPhaeron/zipties

2015-11-10 08:03:53 -06:00

js

…

LINDA

…

modules

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

2015-11-10 17:03:05 -05:00

orphaned procs

…

_compile_options.dm

…

hub.dm

…

world.dm

Adds a config option for the round end restart delay.

2015-10-26 05:04:43 -07:00