Tigercat2000 296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam ...

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

2016-03-14 14:45:21 -07:00

..

__DEFINES

Refactors vampire abiliies to be spells

2016-03-10 07:01:31 -05:00

__HELPERS

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

2016-03-14 14:45:21 -07:00

_DATASTRUCTURES

…

_globalvars

meanwhile as i driver tiger INSANE

2016-02-25 16:17:39 -05:00

_hooks

…

_onclick

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

2016-03-14 14:45:21 -07:00

ATMOSPHERICS

Removes ability to hide papers.

2016-02-16 21:54:07 +01:00

controllers

Merge pull request #3818 from Crazylemon64/better_sci_objectives

2016-03-11 00:21:17 -05:00

datums

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

2016-03-14 14:45:21 -07:00

defines

Allows admin announcements to have newlines

2016-02-29 21:26:15 -05:00

game

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

2016-03-14 14:45:21 -07:00

js

…

LINDA

tweak

2016-02-22 22:20:27 -05:00

modules

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

2016-03-14 14:45:21 -07:00

_compile_options.dm

…

hub.dm

…

world.dm

…