PsiOmegaDelta 232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm

2015-09-18 08:51:10 +02:00

..

admin

Macro refactoring.

2015-09-16 12:57:14 +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

…

client

Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs

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

clothing

Corrects HTML tag mismatch.

2015-09-15 20:39:33 +02:00

customitems

…

detectivework

…

economy

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

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

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

…

holodeck

…

hydroponics

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

2015-09-18 08:51:10 +02:00

icon generation

…

library

…

lighting

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

2015-09-18 08:51:10 +02: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-18 08:51:10 +02:00

multiz

Fixes multi-z things.

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

nano

Macro refactoring.

2015-09-16 12:57:14 +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

Improves powernet destruction.

2015-09-16 08:00:22 +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/dev-freeze' into dev

2015-09-18 08:51:10 +02:00

recycling

fix #10882

2015-09-16 14:34:20 +03: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

…

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

…