PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

2015-03-05 08:05:44 +01:00

..

bluespaceartillery.dm

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

corpse.dm

Conflict fix

2015-02-03 20:57:16 +03:00

exile.dm

Swapped the locations of the Vault and Tech Storage.

2012-12-01 01:03:15 +00:00

gateway.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

loot.dm

Activated magboots will now, definitely, prevent airflow based grieving of your personage. (Included is a possible fix for airflow opening doors by throwing you at them)

2013-04-17 00:45:36 -07:00

pamphlet.dm

Moved para and sleepy pen defines out of weapon.dm.

2012-10-13 14:37:28 +00:00

trigger.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

zlevel.dm

Fixes #8334.

2015-03-02 11:42:40 +01:00