mwerezak 5ca36fcadb Merge branch 'dev' into power-net ...

Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl

2014-07-16 16:14:52 -04:00

..

admin

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

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

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

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 branch 'master' of https://github.com/Baystation12/Baystation12 into dev

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

nano

Fixed comments for new JS files in nanoui.dm.

2014-07-14 11:50:25 +01:00

organs

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

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

paperwork

…

power

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

projectiles

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

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

reagents

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

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

recycling

Pipe rendering rewrite

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

research

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04: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

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

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