phil235 194398cbbd Merge branch 'master' of https://github.com/tgstation/-tg-station into PreliminaryDamageRefactor ...

# Conflicts:
#	code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
#	code/game/objects/effects/portals.dm

2016-09-29 01:44:27 +02:00

..

suit

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

2016-09-29 01:44:27 +02:00

__ninjaDefines.dm

…

admin_ninja_verbs.dm

Fixes #15973

2016-05-18 10:59:53 -04:00

energy_katana.dm

Some preliminary changes before the damage refactor PR. The changes here do absolutely nothing gamewise.

2016-09-27 22:33:08 +02:00

ninja_event.dm

Revenants now spawn

2016-08-14 13:56:30 -04:00

Ninja_Readme.dm

…