Mloc-Argent 64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm

2014-07-06 17:50:53 +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

ashtray.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

guestpass.dm

Fixes guest terminals only allowing 29 minute passes.

2014-07-02 06:46:42 +09:30