PsiOmegaDelta e1aa05be02 Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates ...

Conflicts:
	code/game/machinery/computer/security.dm

2015-07-28 09:16:34 +02:00

..

admin

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

2015-07-27 10:20:20 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-07-14 08:21:12 +02:00

clothing

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

2015-07-27 10:20:20 +02:00

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

detectivework

…

economy

…

events

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

2015-07-14 08:21:12 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

…

hydroponics

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

2015-07-09 08:45:49 +02:00

icon generation

…

library

…

lighting

make lighting falloff a macro and optimize turfs-in-view

2015-07-22 16:22:28 +01:00

liquid

…

maps

…

materials

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

2015-07-09 08:45:49 +02:00

mining

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

2015-07-14 08:21:12 +02:00

mob

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

nano

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

2015-07-26 10:21:36 +02:00

organs

Compilation fixes.

2015-07-27 10:41:21 +02:00

overmap

…

paperwork

…

power

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

2015-07-20 08:28:32 +02:00

projectiles

Merge with dev.

2015-07-15 16:20:39 +09:30

random_map

…

reagents

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

2015-07-27 10:20:20 +02:00

recycling

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

2015-07-11 09:51:24 +02:00

research

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

spells

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

2015-07-27 10:20:20 +02:00

supermatter

…

surgery

…

tables

Fixes #8161

2015-07-15 16:34:05 +03:00

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates

2015-07-28 09:16:34 +02:00

xgm

…