MrStonedOne 5d86ed49f6 Merge conflic fix

2016-01-03 14:51:14 -08:00

..

devices

Merge conflic fix

2016-01-03 14:51:14 -08: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 conflic fix

2016-01-03 14:51:14 -08: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

Makes burn_state use defines

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