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

Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml

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

..

admin

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

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

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 #10972 from Zuhayr/resomi

2015-09-06 13:09:34 +03:00

clothing

Merge pull request #10972 from Zuhayr/resomi

2015-09-06 13:09:34 +03:00

customitems

…

detectivework

…

economy

…

events

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

2015-08-28 11:27:20 +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 branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2

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

mob

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

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

multiz

Fixes multi-z things.

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

nano

Observers can now view radio settings, admins can alter them.

2015-09-04 10:07:41 +02:00

organs

removing now unneeded limb define.

2015-09-06 00:42:54 +09:30

overmap

…

paperwork

Adds Supply Fax

2015-08-31 15:32:35 -04:00

power

Merge pull request #10955 from SkyMarshal/multi-z

2015-09-05 11:36:59 +09:30

projectiles

Merge pull request #10340 from comma/russian_roulette

2015-09-03 19:40:01 +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-09-05 09:35:02 +02:00

recycling

Multi-Z.

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

research

Fixes a few issues with the mechfab, fixes #10852

2015-08-25 12:28:20 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

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-freeze' into dev

2015-08-30 10:23:14 +02:00

xgm

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

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