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

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2016-05-15 17:19:14 -04:00

..

devices

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

2016-05-15 17:19:14 -04:00

robot

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

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

stacks

2 small changes (#17543)

2016-05-12 21:53:59 -05:00

weapons

Adds Bone Weaponry (#17672)

2016-05-14 18:31:36 -05:00

apc_frame.dm

…

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

…

candle.dm

Fixes spawning lit candles printing messages

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

control_wand.dm

…

crayons.dm

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

2016-05-10 22:53:47 +02: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

…

nuke_tools.dm

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

2016-04-24 21:22:37 +02: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

…