phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm

2015-03-26 02:31:06 +01:00

..

beams.dm

Merge pull request #6737 from tkdrg/hurr

2015-01-13 02:13:38 -06:00

bullets.dm

* Unified the firing proc for energy and ballistics mech guns

2015-03-17 23:58:03 +01:00

energy.dm

Fixes taser stun duration to be back to normal, also jitter animation now only starts after the mob falls to the ground.

2015-02-25 15:24:06 +01:00

magic.dm

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

2015-03-23 16:51:03 +01:00

reusable.dm

Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)

2015-03-21 16:18:32 +00:00

special.dm

First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.

2015-03-20 23:02:53 +00:00