Desolate f7627d2fcb Resolves conflicts.

2018-10-11 05:36:22 -05:00

..

area_teleport.dm

…

bloodcrawl.dm

…

charge.dm

…

cluwne.dm

…

conjure.dm

…

construct_spells.dm

…

dumbfire.dm

…

emplosion.dm

…

ethereal_jaunt.dm

…

explosion.dm

…

fake_gib.dm

…

genetic.dm

…

horsemask.dm

…

infinite_guns.dm

…

inflict_handler.dm

…

knock.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

lichdom.dm

…

lightning.dm

…

magnet.dm

…

mime.dm

…

mind_transfer.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

projectile.dm

…

rathens.dm

…

rod_form.dm

…

shapeshift.dm

…

summonitem.dm

…

touch_attacks.dm

…

trigger.dm

…

turf_teleport.dm

…

wizard.dm

…