Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04: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

Merge resolution with master.

2014-06-02 12:05:12 +09:30

icons.dm

Added some sanity to brightness proc

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

lists.dm

Change crew monitoring computer to use NanoUI

2014-06-02 09:29:34 +01: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

Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel.

2014-06-03 21:26:34 -05:00

sanitize_values.dm

…

text.dm

Optimized and refactored list2text, text2list, and replacetext.

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

time.dm

Mutiny Mode

2014-05-11 15:03:50 -05:00

type2type.dm

Adds Mentors.

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

unsorted.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00