Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/modules/client/preference/preferences.dm

2016-06-19 16:28:57 -07:00

..

area

Fix SST shuttle, make it a real shuttle (#4675)

2016-06-15 04:48:26 -04:00

dna

Noir Doesn't Grey out HUD, Adds Remaining Glasses for Vox, 'Yi' to Vox-pidgin syllables & Framework for Icon-based Skin Tone, Fixes #3138, Greyscales Vox Hair (#4614)

2016-06-19 11:35:36 -04:00

gamemodes

Merge pull request #4349 from VampyrBytes/DatumEmotesMK2

2016-06-19 14:04:00 -04:00

jobs

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

2016-06-13 20:11:29 -07:00

machinery

Merge pull request #4610 from monster860/ui_plane

2016-06-19 13:38:01 -04:00

magic

Replace most (if not all) output << operators with to_chat(user, message)

2016-04-05 08:15:05 -07:00

mecha

Of powergloves and pedantry

2016-06-01 17:09:16 -04:00

objects

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

2016-06-19 16:28:57 -07:00

turfs

Removes dust from vox raider base (#4649)

2016-06-13 23:11:03 -04:00

verbs

Fixes a few runtimes

2016-05-23 19:23:18 -04:00

alternate_appearance.dm

Alternate Appearance system (from tgstation/-tg-station#16586)

2016-04-06 13:58:03 -07:00

asteroid.dm

Ports tg simple_animal bots

2016-03-28 00:22:04 -04:00

atoms_movable.dm

More fixes and sprites

2016-05-31 22:51:14 -04:00

atoms.dm

Alternate Appearance system (from tgstation/-tg-station#16586)

2016-04-06 13:58:03 -07:00

data_huds.dm

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

response_team.dm

Fixes paths, snipers, turrets, mechas, some other things.

2016-05-31 22:50:59 -04:00

shuttle_engines.dm

Fixes shuttle smoothing

2016-04-21 21:35:53 -04:00

skincmd.dm

…

smoothwall.dm

…

sound.dm

Here we go again...

2016-05-31 22:50:53 -04:00