PsiOmegaDelta c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess ...

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm

2015-08-20 12:42:51 +02:00

..

admin

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

alarm

…

assembly

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

awaymissions

…

client

Merge pull request #9856 from Hubblenaut/dev

2015-08-19 17:56:37 -04:00

clothing

Merge pull request #9856 from Hubblenaut/dev

2015-08-19 17:56:37 -04:00

customitems

…

detectivework

More computer overlay changes.

2015-08-20 08:38:43 +02:00

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Merge

2015-08-16 17:10:11 -07:00

hydroponics

…

icon generation

…

library

…

lighting

Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

2015-08-18 11:59:50 -07:00

liquid

…

maps

…

materials

Reimplemented floor lights as a machine built at the autolathe.

2015-08-16 19:26:17 -07:00

mining

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

mob

Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess

2015-08-20 12:42:51 +02:00

nano

Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess

2015-08-20 12:42:51 +02:00

organs

…

overmap

More computer overlay changes.

2015-08-20 08:38:43 +02:00

paperwork

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

power

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

projectiles

…

random_map

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

reagents

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

2015-08-18 18:29:01 +02:00

recycling

Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir

2015-08-18 15:48:55 +01:00

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs

2015-08-18 12:06:53 -07:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

supermatter

…

surgery

…

tables

…

vehicles

…

virus2

More computer overlay changes.

2015-08-20 08:38:43 +02:00

xgm

…