PsiOmega 31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires ...

Conflicts:
	code/game/machinery/autolathe.dm

2014-11-25 11:19:39 +01:00

..

files.dm

…

game.dm

Fixes and event end estimations.

2014-11-12 09:39:54 +01:00

global_lists.dm

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

2014-11-25 10:33:47 +01:00

icons.dm

…

lists.dm

Add dd_insertObjectList proc, adjust obj/machinery/New to use this proc

2014-10-30 22:59:10 +00:00

logging.dm

…

maths.dm

Completes the basic random event manager.

2014-11-08 18:22:31 +01:00

mobs.dm

Wiring Upgrade

2014-11-04 14:27:46 +01:00

names.dm

…

sanitize_values.dm

…

text.dm

/tg/ input stripping.

2014-11-21 18:32:51 +01:00

time.dm

…

turfs.dm

Plastique wiring.

2014-11-24 11:21:31 +01:00

type2type.dm

Z-Level Compatibility

2014-10-30 14:29:56 +01:00

unsorted.dm

update IsGuestKey for webclient guests

2014-11-01 21:40:01 +00:00