davipatury 781e66ec52 Fix conflicts.

2017-03-08 12:57:45 -03:00

..

devices

rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands

2017-03-07 20:55:43 +04:00

mountable_frames

…

robot

Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions

2017-02-06 19:55:37 +01:00

stacks

Merge remote-tracking branch 'origin/master' into modular_computers

2017-03-04 15:44:20 -03:00

weapons

Merge pull request #6704 from uraniummeltdown/hardsuit

2017-03-07 23:35:07 -05:00

ashtray.dm

…

blueprints.dm

Merge branch 'master' into lavaland_megafauna

2017-02-02 20:17:31 +01:00

bodybag.dm

…

candle.dm

…

changestone.dm

…

contraband.dm

…

control_wand.dm

…

crayons.dm

Various fixes

2017-02-10 18:55:23 +01:00

dehy_carp.dm

…

documents.dm

…

flag.dm

…

latexballoon.dm

…

misc.dm

…

policetape.dm

…

random_items.dm

…

shooting_range.dm

…

toys.dm

Refactors Reagent Tanks--Adds High Capacity Water Tank

2017-02-05 13:58:24 -05:00

trash.dm

…