Remie Richards da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances ...

Conflicts:
	code/game/atoms.dm

2016-04-06 21:26:46 +01:00

..

__DATASTRUCTURES

…

__DEFINES

World "?status" expansion, Topic() rework

2016-04-06 02:15:25 -06:00

__HELPERS

adds a compile time warning for atmos bugs with 509

2016-04-06 10:44:29 -06:00

__PATH_COMPATIBILITY

…

_globalvars

Adds a framework for alternate appearances (override images), the Cardborg costume now makes you look like a real Standard Cyborg

2016-04-02 20:52:00 +01:00

_onclick

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

2016-04-03 18:22:20 -06:00

controllers

Merge pull request #16660 from MrStonedOne/patch-186

2016-04-06 10:39:04 -06:00

datums

Merge pull request #16637 from LanCartwright/virosymptomwork

2016-04-05 23:50:53 -05:00

game

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

2016-04-06 21:26:46 +01:00

js

…

modules

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

2016-04-06 21:26:46 +01:00

orphaned procs

…

_compile_options.dm

…

hub.dm

…

world.dm

World "?status" expansion, Topic() rework

2016-04-06 02:15:25 -06:00