GinjaNinja32 60a6fe9513 Merge pull request #11799 from Ccomp5950/merge_fix ...

Fix previous merge conflict oopsie.

2015-12-29 04:55:49 +00:00

..

acting

…

admin

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

2015-12-25 03:51:40 +00:00

alarm

…

assembly

…

awaymissions

…

blob

Prevents blob from growing over asteroid walls

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

client

Added checks for character age to numerous jobs.

2015-12-22 13:24:12 +01: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

…

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

…

icon generation

…

library

…

lighting

…

liquid

…

maps

fix issues with indented absolute path definitions

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

materials

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

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

mining

Rotational icons.

2015-12-08 16:13:55 +01:00

mob

Merge pull request #11799 from Ccomp5950/merge_fix

2015-12-29 04:55:49 +00:00

multiz

…

nano

Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower

2015-12-09 21:34:12 +03: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

Fixes some overlay issues with aiming.

2015-12-17 17:39:25 +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

Merge remote-tracking branch 'upstream/dev' into 151210-TapeTape

2015-12-13 11:50:06 +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

Adds missing click cooldowns for aggressive actions

2015-12-06 00:05:06 -05:00

virus2

…

wireless

fix issues with indented absolute path definitions

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

xgm

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

2015-12-06 11:34:36 +01:00