Tigercat2000 46901d74b2 Merge remote-tracking branch 'upstream/master' into IM_GOING_TO_FUCKING_GO_INSANE_GODDAMNIT ...

Conflicts:
	code/game/gamemodes/meteor/meteor.dm

2015-11-16 14:28:27 -08:00

..

__DEFINES

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

2015-11-07 20:54:24 -08:00

__HELPERS

Global DatumRefLists cleanup x1

2015-11-16 14:21:05 -08:00

_DATASTRUCTURES

…

_globalvars

Removes Nations and Unused Game Modes

2015-10-11 19:51:19 -04:00

_hooks

…

_onclick

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

2015-11-07 20:54:24 -08:00

ATMOSPHERICS

Made passive vent equalize pressure

2015-11-15 16:17:53 -05:00

controllers

Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"

2015-11-01 20:34:37 -08:00

datums

MULEbots notify on relevant deliveries

2015-11-14 14:29:24 -08:00

defines

Fixes medhud/sechud/etc shit, ai life refactor

2015-11-13 07:28:45 -08:00

game

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

2015-11-16 14:28:27 -08:00

js

…

LINDA

Merge pull request #2324 from Fox-McCloud/hotspot-fix

2015-10-09 01:06:02 +02:00

modules

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

2015-11-16 14:28:27 -08:00

_compile_options.dm

…

hub.dm

…

stylesheet.dm

…

test.dm

…

world.dm

0 second restart fix

2015-10-04 03:48:34 +02:00