PsiOmegaDelta 033708b8e6 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-11-19 09:06:32 +01:00

..

admin

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

2015-10-16 13:02:59 +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

blob

Fixes a minor blob issue, adds mecha attack message

2015-10-07 10:49:24 +03:00

client

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

2015-11-19 09:06:32 +01:00

clothing

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

2015-11-16 18:20:20 +01:00

customitems

…

detectivework

…

economy

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

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

events

Minor update

2015-11-07 18:05:47 +01: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

Additional respawn refactoring.

2015-11-08 20:05:37 +01:00

holodeck

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

2015-10-15 07:08:16 -04:00

hydroponics

Merge pull request #11420 from Datraen/PlantTweaks

2015-11-10 08:42:03 +01:00

icon generation

…

library

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

lighting

Scheduler now uses btime.

2015-10-24 12:53:04 +02:00

liquid

…

maps

…

materials

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

2015-10-14 08:41:38 +02:00

mining

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

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

mob

Merge pull request #11364 from PsiOmegaDelta/151024-Btime

2015-11-19 10:14:03 +03:00

multiz

Turf initialization tweaking.

2015-09-27 13:18:18 +02:00

nano

Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup

2015-10-26 05:44:13 +03:00

organs

Merge pull request #11204 from Hubblenaut/medical

2015-10-19 16:17:16 +02:00

overmap

…

paperwork

Updates blob

2015-10-05 18:10:16 +03:00

power

Updates gridcheck behavior

2015-11-07 17:11:25 +01:00

projectiles

Merge pull request #10287 from mwerezak/attack-cleanup2

2015-10-25 08:43:47 +01:00

random_map

Amending some loc setting lines.

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

reagents

Compilation fixes.

2015-10-27 13:43:30 +01:00

recycling

fix #10882

2015-09-16 14:34:20 +03:00

research

Merge pull request #11444 from Baystation12/dev-freeze

2015-11-12 17:48:12 +01:00

scripting

…

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

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

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

spells

Reduces wizard subjugate duration

2015-10-27 15:14:40 -05:00

supermatter

…

surgery

Merge pull request #11230 from PsiOmegaDelta/xenomorphs

2015-10-13 08:31:27 +10:30

tables

improve defines in table code

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

vehicles

Updates blob

2015-10-05 18:10:16 +03:00

virus2

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

xgm

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

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