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

..

closets

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

2014-04-16 21:44:26 -07:00

effects

Stops buckled mobs from slipping (for now)

2014-07-02 22:36:49 +02:00

items

Merge branch 'dev' into power-net

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

random

Fixes #4721

2014-04-12 13:06:10 +03:00

structures

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

2014-07-16 19:30:41 +09:30

empulse.dm

…

explosion_recursive.dm

Explosion Optimizations

2014-01-08 19:21:47 +00:00

explosion.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

items.dm

Fixes human internal organs list

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

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Fucking Hell I'm an idiot.

2014-07-03 05:10:31 +09:30

weapons.dm

…