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

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

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

..

admin

Finishing touches

2016-06-08 15:11:24 -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-13 20:11:29 -07:00

clothing

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

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

computer3

…

crafting

Crossbows and piescannons

2016-06-02 22:17:19 -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

…

events

Traders Event (#4016)

2016-06-11 12:47:20 -04:00

examine

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

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

ext_scripts

…

fish

…

flufftext

Sprites & fixes

2016-05-31 22:50:57 -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 pull request #4515 from TheDZD/why-did-i-try-doing-this-again

2016-06-08 22:49:10 -04:00

mob

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

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

nano

Nano animations!

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

ninja

…

paperwork

Makes photocopied butts use OOP

2016-05-20 05:06:39 -04:00

pda

Nano animations!

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

pooling

…

power

Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

2016-06-08 22:49:10 -04:00

procedural_mapping

…

projectiles

Finishing touches

2016-06-08 15:11:24 -04:00

reagents

Merge pull request #4608 from Fox-McCloud/remove-mindslave

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

recycling

…

research

Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

2016-06-08 22:49:10 -04:00

scripting

Merge pull request #4231 from monster860/concurrency

2016-05-13 15:34:15 -04:00

security_levels

…

shuttle

Traders Event (#4016)

2016-06-11 12:47:20 -04:00

space_transition

…

spacepods

Spacepod Fix - Equipment Modules (#4637)

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

store

…

surgery

Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again

2016-06-08 22:49:10 -04:00

telesci

…

tooltip

…

tram

…

vehicle

Fixed ambulance move runtime

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