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

Conflicts:
	.travis.yml

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

..

admin

Replace ';' with '; // do nothing' for clarity

2015-09-10 04:00:37 +01: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

…

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

…

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

…

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

…

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-13 10:52:01 +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

…

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

…

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

…

spells

…

supermatter

…

surgery

…

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

Implement VV header and options for virus2 datums

2015-09-10 03:58:10 +01:00

xgm

…