Kearel 6ec929c14d should realistically fix merge conflicts ...

I don't know actually if it will.

2016-01-06 15:12:05 -06:00

..

acting

…

admin

fix #11828

2015-12-30 18:46:25 +00:00

alarm

…

assembly

…

awaymissions

…

blob

Prevents blob from growing over asteroid walls

2015-12-18 07:59:49 +01:00

client

Merge pull request #11823 from PsiOmegaDelta/151230-MapTweaks

2015-12-30 18:48:44 +00:00

clothing

Fixed people being unable to dress up.

2015-12-20 21:58:05 +03:00

customitems

…

detectivework

Forensics fixes/tweaks.

2015-12-10 19:34:28 +10:30

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

should realistically fix merge conflicts

2016-01-06 15:12:05 -06:00

genetics

…

ghosttrap

The binary channel will now be listed using the user's primary language key, instead of :

2015-12-28 20:37:05 +01:00

holodeck

…

hydroponics

Fixes #11661

2015-12-29 15:12:07 -06:00

icon generation

…

library

…

lighting

…

liquid

…

maps

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

materials

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

2015-12-29 20:25:34 +01:00

mining

Makes the mining asteroid airless again.

2015-12-30 00:13:12 -05:00

mob

Bags with the auto-pickup ability can no longer grab anchored objects.

2015-12-30 11:28:54 +01:00

modular_computers

Tablets can now be placed into pockets

2015-12-30 14:57:08 +01:00

multiz

…

nano

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

2015-12-29 20:25:34 +01:00

organs

Merge pull request #11762 from Baystation12/dev-freeze

2015-12-27 16:10:04 +01:00

overmap

…

paperwork

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

power

Merge pull request #11756 from Baystation12/master

2015-12-26 11:58:42 +01:00

projectiles

Fixed weapon use by borgs.

2015-12-29 14:02:33 +01:00

random_map

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

2015-12-13 10:47:33 +01:00

reagents

Removes jar slime handling, whatever it was supposed to be. Fixes #11689.

2015-12-23 13:46:31 +01:00

recycling

Merge pull request #11513 from Karolis2011/Constructable_Cargo

2015-12-19 09:18:45 +03:00

research

Fixes recipes for components that use steel

2015-12-30 14:47:13 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Fixes #11681

2015-12-20 20:05:07 +03:00

supermatter

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

2015-12-20 11:55:53 +01:00

surgery

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

2015-12-08 08:23:10 +01:00

tables

…

vehicles

…

virus2

…

wireless

fix issues with indented absolute path definitions

2015-12-09 14:12:54 +00:00

xgm

…