Tigercat2000 82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm

2016-06-27 08:20:49 -07:00

..

admin

Allows admins to save their CC characters (#4717)

2016-06-26 13:57:59 -04:00

alarm

…

arcade

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

assembly

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

atmos_automation

…

awaymissions

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

client

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

2016-06-27 08:20:49 -07:00

clothing

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

2016-06-27 08:20:49 -07:00

computer3

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

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

Fixed #4720 (#4737)

2016-06-21 16:56:01 -04:00

economy

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

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

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

ext_scripts

…

fish

…

flufftext

to_chat fixes

2016-06-24 18:36:50 -04:00

food

TAFFY WHY DID YOU LEAVE ME

2016-06-22 10:53:22 +02:00

garbage_collection

…

holiday

…

hydroponics

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

media

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

mining

Merge pull request #4736 from FlattestGuitar/drone

2016-06-22 14:02:33 -04:00

mob

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

2016-06-27 08:20:49 -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

to_chat fixes

2016-06-24 18:36:50 -04:00

pda

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

pooling

…

power

to_chat fixes

2016-06-24 18:36:50 -04:00

procedural_mapping

…

projectiles

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

reagents

to_chat fixes

2016-06-24 18:36:50 -04:00

recycling

…

research

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

scripting

Goonchat (#4744)

2016-06-23 16:56:15 -04:00

security_levels

…

shuttle

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

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

space_transition

…

spacepods

to_chat fixes

2016-06-24 18:36:50 -04:00

store

…

surgery

Organs Start With Species, Fixes Limb Attachment Runtime (#4773)

2016-06-26 18:30:08 -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