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

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm

2016-03-30 22:55:00 -06:00

..

beams.dm

Revert "Introduces the new taser. "

2016-03-26 23:01:18 +03:00

bullets.dm

unfucks everything. Well, at least I think so. Oh and the overloaded shot now fires four pellets instead of six. Feels a little limp dicked for the cost and prep but I'm getting paranoid over its power potential. Lets see how people use this before making balance changes.

2016-03-07 04:40:54 -08:00

energy.dm

Revert "Introduces the new taser. "

2016-03-26 23:01:18 +03:00

magic.dm

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

2016-03-30 22:55:00 -06:00

reusable.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

special.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00