GinjaNinja32 87f645a267 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2016-01-11 07:51:07 +00:00

..

acting

…

admin

Logging tweaks.

2016-01-08 15:22:43 +01:00

alarm

Modular Computer Multitasking + Fixes

2016-01-08 01:34:30 +01:00

assembly

…

awaymissions

…

blob

…

client

Merge pull request #11933 from comma/mirrormirror

2016-01-08 22:09:22 +00:00

clothing

Meson Scanners now "see in the dark"...again.

2016-01-09 21:59:10 -05:00

customitems

…

detectivework

…

economy

Species economy modifier now defaults to human if missing.

2016-01-04 09:38:31 +01:00

events

Adds the "Shipping Error" random event.

2016-01-10 04:21:29 -05:00

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

Logging tweaks.

2016-01-08 15:22:43 +01:00

icon generation

…

library

Logging tweaks.

2016-01-08 15:22:43 +01:00

lighting

…

liquid

…

maps

…

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

Runtime is now less spooky while dead or otherwise incapacitated.

2016-01-10 12:57:04 +01:00

modular_computers

Merge pull request #11932 from comma/screensaver

2016-01-10 12:26:23 +01:00

multiz

…

nano

Power monitor tweaks

2016-01-09 06:28:32 +01:00

organs

It should now be possible to give species with blood IV, rather than species without blood.

2016-01-03 17:31:49 +01:00

overmap

…

paperwork

…

power

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

2016-01-11 07:51:07 +00:00

projectiles

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

random_map

…

reagents

Merge pull request #11856 from atlantiscze/01-01-2015-GasAxing

2016-01-01 12:18:18 +01:00

recycling

…

research

Fixes #11931 + Design bug

2016-01-08 01:55:56 +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

Fixes #11916

2016-01-07 05:47:51 +03:00

tables

Scheduler, observation, and New() tweaks.

2015-12-27 17:44:53 +01:00

vehicles

…

virus2

…

wireless

…

xgm

…