PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge ...

Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm

2015-02-03 14:16:14 +01:00

..

files.dm

…

game.dm

Fixes up some helpers.

2015-02-03 03:18:34 -07:00

global_lists.dm

Another pass at WIP folder

2015-02-03 12:14:13 +03:00

icons.dm

Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays.

2014-12-09 17:19:02 -05:00

lists.dm

Camera sorting improvements

2015-01-28 04:33:31 +00:00

logging.dm

…

maths.dm

Fixes up some helpers.

2015-02-03 03:18:34 -07:00

mobs.dm

Fixes and tweaks to the previous.

2014-12-23 22:03:02 +10:30

names.dm

…

sanitize_values.dm

…

text.dm

sanitize_simple correction

2015-02-01 22:21:11 +03:00

time.dm

…

turfs.dm

Stack reorganization, use() now dels after yield

2014-12-25 15:09:09 -05:00

type2type.dm

Merge pull request #7257 from Baystation12/master

2014-12-07 11:28:29 +10:30

unsorted.dm

refactor 'dir = ' into 'set_dir()'

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