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

..

admin

Merge pull request #4610 from monster860/ui_plane

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

alarm

…

arcade

…

assembly

Experimentor Duplication Limit

2016-06-07 02:25:06 -04:00

atmos_automation

…

awaymissions

Sprites & fixes

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

client

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

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

clothing

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

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

computer3

…

crafting

Adds in Ability to make Latex Gloves Balloons

2016-06-12 03:28:01 -04:00

customitems

Fluff Item Adjustments (#4630)

2016-06-10 00:29:51 -04:00

detective_work

Scanner - Be Dey Incapacitated?

2016-06-08 10:38:17 -04:00

economy

…

error_handler

Adds Error Handling and Realtime Runtime Reviewal (#4679)

2016-06-19 12:53:07 -04:00

events

Rogue Drones Message Now NSV Instead of NMV (#4716)

2016-06-19 13:25:49 -04:00

examine

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

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

ext_scripts

…

fish

…

flufftext

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

food

More Fudge Flavors

2016-05-20 14:58:29 -04:00

garbage_collection

…

holiday

…

hydroponics

Removes Ghost Chilli Juice and Dragon's Breath (#4495)

2016-05-25 17:09:18 -04:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

media

…

mining

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

mob

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

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

nano

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

ninja

…

paperwork

Puts UI on it's own plane

2016-06-06 17:12:28 -04:00

pda

Nano animations!

2016-05-27 14:52:04 -04:00

pooling

…

power

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

procedural_mapping

…

projectiles

Mimic Gun and Gun Fixes (#4699)

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

reagents

Alcohol refactor v12413526345. (#4647)

2016-06-19 11:52:44 -04:00

recycling

…

research

Merge pull request #4624 from monster860/nanoui

2016-06-19 13:37:07 -04:00

scripting

…

security_levels

…

shuttle

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

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

space_transition

…

spacepods

Spacepod Fix - Equipment Modules (#4637)

2016-06-11 12:22:34 -04:00

store

…

surgery

Alcohol refactor v12413526345. (#4647)

2016-06-19 11:52:44 -04:00

telesci

Rermove "100" from the list of power options in telesci (#4671)

2016-06-16 03:47:39 -04:00

tooltip

…

tram

…

vehicle

Fixed ambulance move runtime

2016-05-22 20:45:25 -04:00