PsiOmegaDelta 5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm

2015-12-20 11:22:08 +01:00

..

admin

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

2015-12-13 10:15:29 +01:00

alarm

…

assembly

…

awaymissions

…

client

Merge pull request #11649 from Baystation12/master

2015-12-10 08:21:43 +01:00

clothing

Merge pull request #11649 from Baystation12/master

2015-12-10 08:21:43 +01:00

customitems

…

detectivework

…

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Code relocation.

2015-10-11 17:31:21 +02:00

hydroponics

Replaces misc. checks with usr.incapacitated().

2015-11-24 14:05:04 +01:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-12-13 10:15:29 +01:00

mining

…

mob

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

2015-12-20 11:22:08 +01:00

nano

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

2015-12-08 08:09:37 +01:00

organs

fix #11637

2015-12-09 17:04:24 +00:00

overmap

…

paperwork

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

2015-12-08 08:09:37 +01:00

power

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

2015-12-06 11:34:36 +01:00

projectiles

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

2015-12-13 10:15:29 +01:00

random_map

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

2015-12-13 10:15:29 +01:00

reagents

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

2015-12-20 11:22:08 +01:00

recycling

Fixes #11093

2015-12-11 21:32:00 -07:00

research

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

2015-12-06 11:34:36 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

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

2015-11-24 14:02:15 +01:00

spells

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

2015-12-13 10:15:29 +01:00

supermatter

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

2015-12-20 11:22:08 +01:00

surgery

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

2015-12-08 08:09:37 +01:00

tables

…

vehicles

…

virus2

…

xgm

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

2015-12-06 11:34:36 +01:00