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

..

assembly.dm

Merge remote-tracking branch 'tgstation/master' into point-zero

2015-09-12 21:07:40 +09:00

bomb.dm

removes a bunch of .0

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

doorcontrol.dm

Fixes

2015-08-28 10:44:34 +03:00

flash.dm

increased confusion multiplier, increased confusion sources

2015-09-13 12:39:41 -06:00

health.dm

Assemblies update

2015-09-04 11:22:37 +03:00

helpers.dm

…

holder.dm

removes a bunch of .0

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

igniter.dm

Replaced refactored is_hot() to be an atom proc.

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

infrared.dm

Merge pull request #11899 from kingofkosmos/altclickrotatepipe

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

mousetrap.dm

Assemblies update

2015-09-04 11:22:37 +03:00

proximity.dm

Fixes two runtimes in reagent reaction code (caused by my recent changes)

2015-08-23 17:29:57 +02:00

shock_kit.dm

removes a bunch of .0

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

signaler.dm

makes all Destroy()'s return properly

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

timer.dm

Fixes not being able to use timer while buckled.

2015-08-23 17:38:10 +02:00

voice.dm

Removes tape recorder wires to fix a server-crashing bug.

2015-08-10 14:00:05 +02:00