Mloc-Hibernia 281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm

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

..

admin

Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.

2014-07-09 19:12:32 +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

…

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/master' into dev-freeze

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

nano

This change to nanomanager optimizes the sending of nanoui assets to clients.

2014-07-03 22:55:54 +01:00

organs

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

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

paperwork

…

power

Bugfix - cable coil now shows correct transferred amount.

2014-07-16 22:59:14 +02: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

another missing battery check

2014-07-16 15:20:23 +02:00

scripting

…

security levels

…

shuttles

Merge pull request #5507 from mwerezak/supply-shuttle-fix

2014-07-05 23:16:42 +01:00

supermatter

Bandaid fix for #5589

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

surgery

Merge pull request #5613 from comma/master

2014-07-14 15:49:19 +09:30

vehicles

…

virus2

Fixes human internal organs list

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