PsiOmega e722da01f6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

2015-09-12 13:10:29 +02:00

..

admin

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

2015-09-08 08:22:37 +02:00

alarm

…

assembly

Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.

2015-09-03 09:38:15 +02:00

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

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

client

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

clothing

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

2015-09-11 08:54:03 +02:00

customitems

…

detectivework

More computer overlay changes.

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

economy

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

2015-09-12 13:10:29 +02:00

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

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

hydroponics

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

2015-09-07 11:31:19 +09:30

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

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

2015-09-01 03:22:08 +02:00

mining

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

2015-09-11 08:54:03 +02:00

mob

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

2015-09-11 08:54:03 +02:00

multiz

Fixes multi-z things.

2015-08-30 18:58:37 -07:00

nano

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

2015-09-08 08:22:37 +02:00

organs

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

2015-09-11 08:54:03 +02:00

overmap

More computer overlay changes.

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

paperwork

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

power

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

2015-09-11 08:54:03 +02:00

projectiles

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

random_map

Amending some loc setting lines.

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

reagents

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

2015-09-12 12:51:22 +02:00

recycling

Multi-Z.

2015-08-30 14:15:20 -07:00

research

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

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

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

virus2

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

2015-09-07 13:57:09 +09:30

xgm

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

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