skull132 205ed7ed42 Merge remote-tracking branch 'origin/just-in-case' ...

# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.

2016-01-28 01:32:20 +02:00

..

equip

Remove Horse Mask Spell

2016-01-13 20:06:37 -05:00

projectile

…

ethereal_jaunt.dm

…

genetic.dm

Magical fixes.

2015-07-21 11:34:25 +02:00

harvest.dm

…

mind_transfer.dm

Vampire Gamemode Developement Test

2016-01-20 22:14:21 -05:00

shift.dm

…

subjugate.dm

…

targeted.dm

Magical fixes.

2015-07-21 11:34:25 +02:00