xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not ...

Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-09-24 03:14:04 +01:00

..

antimatter

removes a bunch of .0

2015-09-10 20:57:30 +09:00

singularity

Merge pull request #11899 from kingofkosmos/altclickrotatepipe

2015-09-24 01:59:04 +03:00

supermatter

Fixes proc arguments

2015-07-15 23:52:35 +02:00

apc.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

cable.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

cell.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

engine.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

generator.dm

fixes TEG

2015-09-06 13:16:00 -06:00

gravitygenerator.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

lighting.dm

Fixes monkeyize/humanize removing the mob's viruses when they should be kept.

2015-09-13 22:52:38 +02:00

port_gen.dm

Replaced refactored is_hot() to be an atom proc.

2015-09-24 01:12:38 +01:00

power.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

powernet.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

smes.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

solar.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

switch.dm

…

terminal.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

tracker.dm

makes all Destroy()'s return properly

2015-08-31 00:21:01 -06:00

turbine.dm

fix turbine computer

2015-09-05 10:45:57 +03:00