GinjaNinja32 314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm

2015-06-02 17:33:20 +01:00

..

construction_datum.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

events.dm

- Added Exosuit Jetpack

2012-02-08 18:47:04 +00:00

getrev.dm

Server build date and revision.

2015-05-29 08:26:31 +02:00

global_iterator.dm

code/datums

2015-05-29 20:13:42 +01:00

teleport.dm

Teleport cleanup.

2015-05-05 09:55:19 +02:00

topic_input.dm

…