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

Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm

2014-09-10 22:14:37 +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

Shortened helper.

2014-06-18 23:44:11 +04:00

global_lists.dm

Added . and # prefix to language keys checks (like radios)

2014-07-23 21:58:50 -05:00

icons.dm

Tidy up and use more sane defaults.

2014-07-31 22:17:26 -06:00

lists.dm

Atmospherics computer now displays a sorted list of air alarms

2014-08-23 15:23:14 +02:00

logging.dm

Got vgstation13 colored lights rewrite working here.

2014-06-17 22:35:23 +04:00

maths.dm

Got vgstation13 colored lights rewrite working here.

2014-06-17 22:35:23 +04:00

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

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

2014-09-10 22:14:37 +01:00

time.dm

Mutiny Mode

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

type2type.dm

Merged getFlatIcon rendering from tgstation

2014-07-27 17:21:19 -06:00

unsorted.dm

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

2014-09-10 22:14:37 +01:00