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

..

overmap

Added proc to imitate movement of stars. Changes icon state and throws all unanchored items in space.

2014-07-03 04:47:50 +04:00

RandomZLevels

Removes step_y variable.

2015-01-06 00:46:45 -07:00

exodus-1.dmm

Merge remote-tracking branch 'upstream/master' into dev-freeze

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

exodus-2.dmm

Fixes and adjustments

2015-03-04 11:18:40 -05:00

exodus-3.dmm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

exodus-4.dmm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

exodus-5.dmm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-03-01 21:13:38 +01:00

exodus-6.dmm

Merge remote-tracking branch 'upstream/dev' into 'origin/Beds'.

2014-12-04 14:26:27 +01:00

PowerTesting.dmm

Automatic solar tracking again functional.

2014-11-14 08:12:39 +01:00