Jovaniph c428edf39e Merge Conflict thingy

2017-09-29 19:09:01 -04:00

..

secure

Merge Conflict thingy

2017-09-29 19:09:01 -04:00

cardboardbox.dm

This commit updates the name of the new "cardboard_boxes.dmi" file (from boxes.dmi) to prevent future confusion with regular boxes.

2017-02-09 02:08:41 -04:00

coffin.dm

…

crittercrate.dm

…

fireaxe.dm

add changeling biodegrade power, move closet/crate/locker broken and locked vars up, re-add hivemind link to the dme

2017-09-23 19:04:22 +04:00

fitness.dm

…

gimmick.dm

…

job_closets.dm

…

l3closet.dm

…

malfunction.dm

…

statue.dm

Merge branch 'master' into findnreplace

2017-03-05 12:09:52 +00:00

syndicate.dm

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

utility_closets.dm

Fixes welded fireclosets not showing up properly

2016-08-13 13:14:30 -04:00

wardrobe.dm

Merge Conflict thingy

2017-09-29 19:09:01 -04:00