Mloc-Hibernia 51d2451c01 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	nano/templates/geoscanner.tmpl

2014-07-18 13:15:30 +00:00

..

admin

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

2014-07-16 19:30:41 +09:30

assembly

…

awaymissions

…

client

Trying to fix the loadout spawn issue, at least this will make it more informative.

2014-07-12 10:35:31 +09:30

clothing

Fixes #5523

2014-07-14 12:23:28 +09:30

customitems

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

2014-07-17 20:57:06 +09:30

destilery

…

detectivework

…

economy

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

events

Fixes human internal organs list

2014-07-12 16:15:37 -04:00

ext_scripts

…

flufftext

…

food

Syntiflesh is defined twice, both as a food/snack and obj/item/weapon. The first one is edible while the second one is not.

2014-07-10 22:20:13 +01:00

games

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

genetics

…

hydroponics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Fixes #5608

2014-07-14 12:02:48 +09:30

mob

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

2014-07-18 13:15:30 +00:00

nano

Layout update for NanoUI.

2014-07-15 01:08:06 +01:00

organs

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

2014-07-18 13:08:12 +00:00

paperwork

Merge pull request #5359 from Baystation12/master

2014-06-25 15:37:04 +04:00

power

Merge pull request #5631 from PsiOmegaDelta/Engine

2014-07-17 15:42:03 +04:00

projectiles

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

2014-07-17 20:57:06 +09:30

reagents

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

2014-07-17 20:57:06 +09:30

recycling

…

research

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

2014-07-18 13:15:30 +00:00

scripting

…

security levels

…

shuttles

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

supermatter

Bandaid fix for #5589

2014-07-14 11:42:39 +09:30

surgery

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

2014-07-16 19:32:00 +09:30

vehicles

Fixes in wheelchair and different handling of movement

2014-07-02 22:42:18 +02:00

virus2

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

2014-07-16 19:30:41 +09:30