Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

devices

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

robot

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

stacks

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

weapons

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05: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

origin and req lvl changes

2016-05-21 17:17:20 +03: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

Merge pull request #18039 from coiax/alt-click-spraycan

2016-05-31 15:55:22 +12:00

dehy_carp.dm

Makes dehydrated carps more fun (#17302)

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

documents.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

latexballoon.dm

…

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