DZD 3939abaf5d Fix Conflicts and Sync with Upstream ...

Fixes conflict in icons/obj/gun.dmi by importing sprites added by #172

2015-01-16 17:07:22 -05:00

..

closets

…

effects

Remaining 3 /tg/ away missions

2015-01-11 07:41:12 +01:00

items

Wizard Update Part 1

2015-01-14 21:56:39 -05:00

random

…

storage

…

structures

Fix Conflicts and Sync with Upstream

2015-01-16 17:07:22 -05:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Explosions go to attack logs.

2014-06-21 07:27:31 -04:00

items.dm

Clothing Update

2015-01-01 11:23:48 -05:00

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 08:47:51 -04:00

structures.dm

Merge pull request #508 from Markolie/master

2014-11-22 00:57:02 -05:00

weapons.dm

…