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

Conflicts:
	code/game/objects/objs.dm
	code/modules/mob/living/carbon/human/human_defense.dm

2014-11-04 18:24:52 +01:00

..

combat.dm

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

2014-11-04 18:24:52 +01:00

durand.dm

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

gygax.dm

Adding checks for stun, restrained to many object verbs.

2014-11-01 19:18:01 +01:00

honker.dm

better remove that...

2014-11-03 21:47:41 +01:00

marauder.dm

Space movement rewrite to allow everything to drift

2014-10-25 23:19:46 -07:00

phazon.dm

I accidentally the phasing

2014-10-11 22:37:37 +03:00

reticence.dm

mechs are stompy again

2014-05-19 12:09:13 -05:00