Incoming 071e2aee3c fixes conflicts ...

swaps appretice and wizard icons

2015-01-16 13:45:36 -05:00

..

aid.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

blobies.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

curseditems.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

departmentrevolt.dm

renames chef to cook

2014-12-22 17:02:06 -08:00

fakeexplosion.dm

Renames Fake Explosion to Fake Nuclear Explosion

2014-10-11 03:06:28 +11:00

ghost.dm

…

greentext.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

imposter.dm

Adds an antag hud system for wizards.

2015-01-13 00:14:05 -05:00

invincible.dm

…

lava.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

magicarp.dm

…

petsplosion.dm

…

race.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

shuffle.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

summons.dm

Magic Mania 1.8: Summon Spells Rework and The Challenge System

2014-12-14 22:07:00 -05:00