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

Conflicts:
	code/modules/client/preferences.dm

2014-07-25 17:19:59 -07:00

..

admin

Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.

2014-07-21 19:02:38 +09:30

assembly

…

awaymissions

Updates eng rig path, adds obj sprites

2014-07-19 23:18:32 -04:00

client

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

2014-07-25 17:19:59 -07:00

clothing

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

2014-07-21 16:30:01 +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

Fixes Runtime Error, doesn't query for PIN on lowest account security level

2014-07-21 12:08:50 +02:00

events

Fixes lingering reference to organ_failure

2014-07-18 12:02:39 -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 branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-07-25 17:19:59 -07:00

nano

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

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

organs

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

2014-07-25 17:19:59 -07:00

paperwork

Moves paperbin to OBJ_LAYER - 0.1 to prevent clipping

2014-07-21 12:08:51 +02:00

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-freeze

2014-07-25 17:19:59 -07:00

reagents

Merging.

2014-07-25 22:50:35 +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

Cargo train fixes

2014-07-24 20:14:58 +12:00

virus2

Fixes human internal organs list

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