PsiOmegaDelta 6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm

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

..

admin

Merge pull request #11548 from Baystation12/master

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

alarm

…

assembly

…

awaymissions

…

client

Merge pull request #11376 from NullSnapshot/dev-freeze

2015-12-04 11:28:25 +03:00

clothing

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

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

customitems

…

detectivework

…

economy

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

2015-09-12 12:51:22 +02:00

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

Fixes #10710

2015-09-12 19:34:43 -04:00

liquid

…

maps

…

materials

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02:00

mining

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

2015-09-11 08:38:28 +02:00

mob

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

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

nano

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

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

organs

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

2015-10-11 17:17:41 +02:00

overmap

…

paperwork

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

2015-09-27 13:36:56 +02: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-06 11:34:36 +01:00

random_map

…

reagents

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

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

recycling

…

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 pull request #11340 from Baystation12/master

2015-10-21 10:36:30 +02:00

supermatter

…

surgery

Updates macro/span use.

2015-12-02 09:25:00 +01:00

tables

…

vehicles

…

virus2

…

xgm

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

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