Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom ...

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

2015-09-15 04:18:27 +02:00

..

artefact.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

godhand.dm

In hand sprite overhaul

2015-09-13 22:44:18 +02:00

raginmages.dm

Fix incorrect uses of the shuffle proc.

2015-06-01 08:23:31 -07:00

rightandwrong.dm

Guns update

2015-09-14 04:05:20 +02:00

soulstone.dm

Prevent jobbanned people from becoming constructs

2015-08-29 18:56:36 +02:00

spellbook.dm

Fixes mechas not gc'ing properly

2015-08-28 19:43:24 +02:00

wizard.dm

Update wizard.dm

2015-08-15 04:05:51 -04:00