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

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-08-29 10:06:18 +02:00

..

admin

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

2015-08-29 10:06:18 +02:00

alarm

…

assembly

…

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +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-29 10:06:18 +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-29 10:06:18 +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

Refactoring hardsuit click checking.

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

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

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

2015-08-22 03:57:12 +09:30

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-29 10:06:18 +02:00

nano

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

2015-08-27 09:01:50 +02:00

organs

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

2015-08-27 09:01:50 +02:00

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-29 10:06:18 +02:00

power

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

2015-08-29 10:06:18 +02:00

projectiles

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

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

random_map

Amending some loc setting lines.

2015-08-25 12:40:09 +09:30

reagents

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

2015-08-25 08:20:13 +02:00

recycling

…

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

…

supermatter

…

surgery

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

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

tables

improve defines in table code

2015-08-28 00:12:18 +01:00

vehicles

…

virus2

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

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

xgm

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

2015-08-25 08:12:39 +02:00