TZK13 c0bfd10e49 Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

..

effects

Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger

2014-12-26 22:36:55 -03:00

items

Merge pull request #6355 from AnturK/librarian_pda

2014-12-27 01:44:49 -03:00

structures

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

empulse.dm

…

explosion.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

items.dm

Always reset the layer of things removed from storage

2014-12-19 09:42:06 -08:00

objs.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

structures.dm

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

weapons.dm

…