mwerezak 39789d56b8 Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net ...

Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm

2014-07-15 12:12:08 -04:00

..

admin

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00

assembly

…

awaymissions

…

client

Final touches for loadout system.

2014-07-11 12:16:08 +09:30

clothing

Final touches for loadout system.

2014-07-11 12:16:08 +09:30

customitems

Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly.

2014-07-09 16:58:38 +09:30

destilery

…

detectivework

…

economy

…

events

Fixes #5483

2014-07-04 17:48:12 +09:30

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

Fixed a couple of oversights with cards.

2014-06-29 09:43:34 +09:30

genetics

…

hydroponics

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

icon generation

…

library

…

liquid

…

maps

…

mining

Merging work into dev.

2014-07-10 20:25:07 +09:30

mob

Merge pull request #5565 from Zuhayr/newgear

2014-07-11 14:40:05 -07:00

nano

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

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

organs

Fixes chargers being a magical source of charge

2014-07-12 15:44:21 -04:00

paperwork

Merge pull request #5359 from Baystation12/master

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

power

Fixes chargers being a magical source of charge

2014-07-12 15:44:21 -04:00

projectiles

Fixed some icon issues with vox/adjusted paths, fixed icon issue with armalis cannon.

2014-06-29 10:00:35 +09:30

reagents

Merge resolution.

2014-07-11 12:47:16 +09:30

recycling

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00

research

R&D Server heat production and power usage

2014-07-11 15:14:54 -04:00

scripting

…

security levels

…

shuttles

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

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

supermatter

Cleans up SM temp change using thermal energy

2014-07-11 15:18:16 -04:00

surgery

Allows necrosis to be fixed with peridaxon and surgery

2014-07-06 13:02:58 -04:00

vehicles

Fixes in wheelchair and different handling of movement

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

virus2

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

2014-06-22 21:58:30 +09:30