Kelenius dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm

2015-08-24 18:16:36 +03:00

..

admin

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04: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

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

client

Adds variables for CentComm, NanoTrasen and the station name.

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

clothing

Merge pull request #10381 from Zuhayr/hardsuitcontrol

2015-08-24 12:04:31 +02: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

Adds variables for CentComm, NanoTrasen and the station name.

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

events

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

2015-08-22 15:44:02 +01: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

Fix gender issues, some typos from various files

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

ghosttrap

…

holodeck

Adds variables for CentComm, NanoTrasen and the station name.

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

hydroponics

Refactoring hardsuit click checking.

2015-08-23 02:14:55 +09:30

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 branch 'dev' into ofMechfabAndPanic

2015-08-24 18:16:36 +03:00

nano

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

organs

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

2015-08-24 10:31:30 +02:00

overmap

More computer overlay changes.

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

paperwork

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

power

Fixes computers with custom icon states.

2015-08-21 09:50:39 +02:00

projectiles

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04: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-24 10:31:30 +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' into ofMechfabAndPanic

2015-08-24 18:16:36 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

Adds variables for CentComm, NanoTrasen and the station name.

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

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

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

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

vehicles

…

virus2

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

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

xgm

…