PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

admin.dm

Clean server start.

2015-04-18 15:32:25 +02:00

announce.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

AStar.dm

Fixes the heap fix.

2014-12-09 18:42:54 -07:00

dbcore.dm

- Fixed the revision number not showing properly. Hopefully it's fixed for good this time, as it works off of logic, instead of line numbers.

2012-11-06 17:21:13 +00:00

hud.dm

Synth medical sensors now report dead/alive status.

2015-03-02 13:04:02 +01:00

radio.dm

Radio runtime fix

2015-01-21 20:41:45 +00:00

records.dm

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

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

sd_Alert.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

statistics.dm

Runtime fixes

2015-03-06 18:39:44 +01:00