Files
Paradise/code/modules/mob
mwerezak f43a3ead70 Merges taser and stun baton effects
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm

Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living.dm
2014-08-03 15:59:21 -04:00
..
2014-07-31 19:42:07 -04:00
2014-05-22 14:21:29 -04:00
2014-06-20 04:15:15 +09:30
2014-06-29 16:44:42 -04:00
2014-07-30 05:46:47 +01:00
2014-08-03 15:13:52 -04:00