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

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

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

files.dm

Server log files are now sorted when using .getruntimelog or .getserverlog

2014-02-28 22:37:36 -06:00

game.dm

This reverts commit all the say code changes over the last couple of days.

2014-02-22 03:46:10 -06:00

global_lists.dm

Undershirts and rolling down jumpsuits!

2014-04-05 16:18:11 -07:00

icons.dm

Added some sanity to brightness proc

2013-12-26 17:18:17 +04:00

lists.dm

Helper for cycling through list.

2014-02-03 05:02:18 +03:00

logging.dm

*NIX Log files part 2.

2014-03-26 18:51:37 -05:00

maths.dm

…

mobs.dm

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

names.dm

Efficiency: Joblist

2014-03-10 21:57:36 -05:00

sanitize_values.dm

…

text.dm

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00:00

time.dm

Helper update.

2013-06-26 16:11:10 +03:00

type2type.dm

Adds Mentors.

2014-05-04 23:12:06 -05:00

unsorted.dm

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

2014-05-14 22:42:03 +01:00