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

Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm

2015-11-22 11:48:00 +01:00

..

admin

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

2015-10-16 13:02:59 +02:00

alarm

…

assembly

…

awaymissions

…

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 branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev

2015-11-22 19:45:55 +10:30

customitems

…

detectivework

Porting forensics from Aurora.

2015-10-24 02:15:06 +10:30

economy

…

events

Minor update

2015-11-07 18:05:47 +01:00

examine

…

ext_scripts

…

flufftext

…

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 remote-tracking branch 'upstream/dev-freeze' into dev

2015-11-22 11:48:00 +01:00

icon generation

…

library

…

lighting

Re-adds missing lighting initializer.

2015-11-21 16:20:04 +01:00

liquid

…

maps

…

materials

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

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

mining

…

mob

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

2015-11-22 11:48:00 +01:00

multiz

Turf initialization tweaking.

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

nano

Engineering alarm monitors now include camera alarms.

2015-11-21 11:52:10 +01:00

organs

Porting forensics from Aurora.

2015-10-24 02:15:06 +10:30

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 branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev

2015-11-22 19:45:55 +10:30

random_map

…

reagents

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

2015-11-22 19:45:55 +10:30

recycling

…

research

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

2015-11-22 11:48:00 +01:00

scripting

…

security levels

…

shieldgen

Updates blob

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

shuttles

…

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

…

vehicles

Updates blob

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

virus2

…

xgm

…