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

..

devices

Merge branch 'dev' into power-net

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

robot

Merge branch 'master' into dev

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

stacks

Merge pull request #5554 from Baystation12/master

2014-07-09 23:00:04 -07:00

weapons

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

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

apc_frame.dm

…

blueprints.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

bodybag.dm

Fixes bodybags not being able to be put back...

2014-05-22 16:44:26 -04:00

candle.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

contraband.dm

…

crayons.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

latexballoon.dm

Fixes FEA temperature_expose() being used...

2014-06-22 00:13:22 -04:00

shooting_range.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

toys.dm

Merge pull request #5277 from Jarcolr/dev

2014-06-20 09:02:03 +04:00

trash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00