phil235 129295be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab ...

Conflicts:
	code/__DEFINES/misc.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defines.dm

2016-05-25 23:48:00 +02:00

..

devices

Polymorph bugs, time since death, groundwork laid

2016-05-24 17:28:34 +01:00

robot

Maybe now?

2016-05-24 18:25:20 -04:00

stacks

Runed metal no longer deletes girders when used on them.

2016-05-19 16:46:57 -04:00

weapons

Merge branch 'master' of https://github.com/tgstation/-tg-station into PullvsGrab

2016-05-25 23:48:00 +02:00

apc_frame.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

blueprints.dm

Cyborg Blueprints

2016-04-30 03:47:51 -05:00

body_egg.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

bodybag.dm

Fixes bodybag making the wrong sound when closed

2016-03-19 16:26:33 +01:00

candle.dm

Fixes spawning lit candles printing messages

2016-05-10 19:13:11 +01:00

control_wand.dm

Span Classes

2016-03-01 20:01:12 -06:00

crayons.dm

Fixes some last minute spraycan bugs

2016-05-23 20:26:40 +01:00

dehy_carp.dm

Makes dehydrated carps more fun (#17302)

2016-05-03 19:30:32 -05:00

documents.dm

Moved crayon code out of toys.dm and into crayons.dm

2016-05-10 22:53:47 +02:00

latexballoon.dm

Replaced refactored is_hot() to be an atom proc.

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

nuke_tools.dm

clean

2016-05-21 16:42:37 +01:00

shooting_range.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

toys.dm

Readd pick to generate_messages for skeleton

2016-05-15 20:17:47 +12:00

trash.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00