paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi

2015-01-15 22:16:11 -08:00

..

artefact.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

raginmages.dm

Ragin' Mages Tweaks: 50 wizards, 100 crewmembers? That's a great idea!

2015-01-09 21:12:35 -08:00

rightandwrong.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess

2015-01-15 22:16:11 -08:00

soulstone.dm

new var and subtype for mundane users

2015-01-14 08:19:07 -08:00

spellbook.dm

Merge pull request #6963 from Boggart/wizrepulse

2015-01-14 14:36:00 -03:00

wizard.dm

Update wizard.dm

2015-01-08 01:24:21 -08:00