PsiOmega e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

2015-08-21 20:27:48 +02:00

..

admin

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +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

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

client

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

clothing

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

customitems

…

detectivework

More computer overlay changes.

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

economy

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

events

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

examine

…

ext_scripts

…

flufftext

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

hydroponics

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

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

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00

mob

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

nano

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

organs

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

2015-08-22 03:17:16 +09:30

overmap

More computer overlay changes.

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

paperwork

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

power

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 18:59:19 +02:00

projectiles

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02: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 branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-22 02:30:14 +09:30

recycling

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

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

research

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +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

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

2015-08-22 03:11:53 +09:30

tables

…

vehicles

…

virus2

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

xgm

…