PsiOmegaDelta 120ce3f20c Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums ...

Conflicts:
	code/modules/admin/topic.dm

2015-08-20 14:16:35 +02:00

..

admin

Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

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

Cleans up id card setup. Now with less automagic and more controlled.

2015-08-14 16:08:47 +02:00

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

Small tweaks to get rolldowns to work properly.

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

detectivework

More computer overlay changes.

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

economy

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

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

events

Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery

2015-08-13 08:11:32 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

…

holodeck

Merge

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

hydroponics

Merge branch 'dev' into ofBeesAndHoney

2015-08-13 08:33:46 +03:00

icon generation

…

library

Merge pull request #10279 from Kearel/LibraryModifications

2015-08-13 17:47:16 +03:00

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 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

nano

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

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

organs

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

2015-08-13 09:01:10 +02:00

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

Merge pull request #10200 from mwerezak/gun-desc

2015-08-14 03:55:43 +03:00

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

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

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

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

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

2015-08-13 05:55:05 +01:00

vehicles

…

virus2

More computer overlay changes.

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

xgm

…