SouDescolado 3b257854f0 Merge pull request #1 from tgstation/master ...

Merge shit

2016-01-05 14:44:37 -02:00

..

devices

Merge pull request #14306 from MrStonedOne/patch-114

2016-01-05 05:21:51 -03:00

robot

Replaces malf with traitor AI

2015-12-18 00:05:30 -06:00

stacks

Fixes cable_coil children not merging each other

2016-01-01 12:44:04 -03:00

weapons

Merge pull request #1 from tgstation/master

2016-01-05 14:44:37 -02:00

apc_frame.dm

…

blueprints.dm

…

body_egg.dm

…

bodybag.dm

…

candle.dm

…

crayons.dm

…

dehy_carp.dm

…

documents.dm

…

holotape.dm

…

latexballoon.dm

…

nuke_tools.dm

…

shooting_range.dm

…

toys.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

trash.dm

…