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

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm

2015-08-11 08:21:06 +02:00

..

admin

Fixes #10217.

2015-08-09 10:52:24 +02:00

alarm

…

assembly

…

awaymissions

…

client

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

clothing

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

…

economy

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

2015-08-11 08:21:06 +02:00

events

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

2015-08-11 08:21:06 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Fixes holodeck runtime.

2015-08-05 09:33:34 +02:00

hydroponics

…

icon generation

…

library

…

lighting

Fixes #10409.

2015-08-03 10:15:24 +02:00

liquid

…

maps

…

materials

More material renames

2015-08-07 17:10:35 -04:00

mining

Fixes #10314

2015-08-02 00:01:10 -04:00

mob

Merge pull request #10457 from Zuhayr/dev-freeze

2015-08-09 10:33:54 -04:00

nano

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

2015-08-05 09:16:50 +02:00

organs

Initial fixes

2015-08-08 11:10:28 -04:00

overmap

…

paperwork

…

power

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

projectiles

Fixes #10314

2015-08-02 00:01:10 -04:00

random_map

…

reagents

Fixes #10021

2015-08-08 11:38:27 -04:00

recycling

Crematorium Destroy()

2015-08-06 08:39:24 +02:00

research

Fixes not being able to insert a complete stack into the protolathe

2015-08-02 00:26:30 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

…

tables

More material renames

2015-08-07 17:10:35 -04:00

vehicles

…

virus2

…