Werner a1a1d6c17e Some more bug fixes (#26) ...

Some more bugfixes.
The Windoor changes from Nanakos pull might conflict.
So merge that first and I´ll resolve as needed.

2016-11-30 18:30:06 +02:00

..

acting

…

admin

Reduce more compiles

2016-11-27 18:34:26 +02:00

alarm

…

antag_contest

Antag Contest Update (#1029)

2016-10-02 23:11:53 +03:00

assembly

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

awaymissions

…

blob

…

cargo

Nanako's compile fixes (#25)

2016-11-30 18:28:58 +02:00

cciaa

…

client

Final merge

2016-11-12 00:10:21 +02:00

clothing

Syndicate borg fix mk II and bees. (#23)

2016-11-27 20:00:35 +02:00

customitems

Fixing missing posters and new additions (#1093)

2016-10-30 20:12:31 +02:00

detectivework

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

economy

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

events

Final merge

2016-11-12 00:10:21 +02:00

examine

…

ext_scripts

…

flufftext

…

food

Fixes #454 and Hivenet (#453)

2016-06-25 00:38:12 +03:00

games

…

genetics

…

ghosttrap

Syndicate borg spawner upgrade (#11)

2016-11-19 18:55:21 +02:00

holodeck

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

http

BOREALIS 2 Implementation (#938)

2016-09-18 23:28:01 +03:00

hydroponics

Syndicate borg fix mk II and bees. (#23)

2016-11-27 20:00:35 +02:00

icon generation

…

intern

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

library

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

lighting

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

liquid

…

maps

…

materials

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

mining

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

mob

Some more bug fixes (#26)

2016-11-30 18:30:06 +02:00

modular_computers

…

multiz

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

nano

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

organs

Fixing compile errors (#8)

2016-11-12 12:47:43 +02:00

overmap

…

paperwork

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

power

Final merge

2016-11-12 00:10:21 +02:00

projectiles

Some more bug fixes (#26)

2016-11-30 18:30:06 +02:00

random_map

Compile errors round 2 by Alberyk (#3)

2016-10-15 21:53:09 +03:00

reagents

Baymerge fixes (#12)

2016-11-19 11:56:49 +02:00

recycling

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

research

More fixes (#21)

2016-11-21 18:11:36 +02:00

scripting

…

security levels

Final merge

2016-11-12 00:10:21 +02:00

shieldgen

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

shuttles

…

spells

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

supermatter

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

surgery

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

tables

Merge branch 'development-2' into development

2016-10-31 00:01:52 +02:00

telesci

Some bug fixes (#5)

2016-10-17 11:09:23 +03:00

vehicles

Clearing compiles (#22)

2016-11-22 22:21:35 +02:00

ventcrawl

Bedshape's fixes, 28SEP (#1021)

2016-09-28 23:05:48 +03:00

virus2

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

web_interface

Welcome Screen (#535)

2016-07-11 16:48:58 +03:00

wireless

…

xgm

…