mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

2014-08-22 01:24:34 -04:00

..

admin

Gives filters proper names, updates airlocks to use filters

2014-08-15 20:27:00 -04:00

assembly

…

awaymissions

…

client

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

clothing

Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes

2014-08-22 01:24:34 -04:00

customitems

Master to dev merge.

2014-08-11 17:23:40 +09:30

destilery

…

detectivework

Initial commit of detective console rewrite.

2014-08-19 00:50:14 +04:00

economy

…

events

Removes the loophole ion-law. Adds in some other ion law changes.

2014-08-14 11:20:45 +02:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

hydroponics

Fixed #5912

2014-08-10 16:29:09 -04:00

icon generation

…

library

Made arcane tomes a subtype of books, fixes #5838

2014-08-10 02:23:36 -07:00

liquid

…

maps

…

mining

Moved ambiance sounds out of horrendous ifchain to area definitions.

2014-08-16 04:40:46 +04:00

mob

Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes

2014-08-22 01:24:34 -04:00

nano

…

organs

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

paperwork

Master to dev merge.

2014-08-11 17:23:40 +09:30

power

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

projectiles

Adjusts laser cannon damage

2014-08-16 22:34:23 -04:00

reagents

Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes

2014-08-22 01:24:34 -04:00

recycling

Updates disposal bin pressurization

2014-08-07 19:31:17 -04:00

research

…

scripting

…

security levels

Fixes icons and other things not updating when the master controller updates power status.

2014-08-10 03:45:20 -04:00

shieldgen

Reorganizes shieldgen source code and icon files

2014-08-10 11:58:25 -04:00

shuttles

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

supermatter

Master to dev merge.

2014-08-11 17:23:40 +09:30

surgery

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

vehicles

Fixes runtime in train/explode()

2014-08-10 18:37:39 -04:00

virus2

…