Cael_Aislinn 66b8f4719d Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport ...

Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/machinery/teleporter.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-08-22 04:21:53 +10:00

..

area

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

mob

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

obj

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

procs

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-08-22 04:21:53 +10:00

sd_procs

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

tanning

- Added Cheri's lizard and monkey pelt sprites for tanning

2012-06-12 23:13:37 +00:00

atom.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

global.dm

- Moved global.dm, which contains globel defines to a more dominant position, next to setup.dm. Changed some global constants to defines.

2012-06-27 05:35:48 +00:00

hub.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

obj.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

turf.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

world.dm

TG: Some fixes for topic calls and inputs.

2012-05-10 03:02:56 +01:00