Files
Paradise/code/modules
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-18 06:32:15 -04:00
2014-07-25 18:55:08 -04:00
2014-07-26 07:25:47 +01:00
2014-07-18 06:32:15 -04:00
2014-07-27 13:49:50 -04:00
2014-08-03 15:59:21 -04:00
2014-07-21 18:54:19 -04:00
2014-08-02 11:39:01 +01:00
2014-08-03 15:07:07 -04:00
2014-07-28 13:49:18 -04:00
2014-08-03 15:28:57 -04:00
2014-07-16 20:17:50 +01:00
2014-08-03 15:14:38 -04:00
2014-07-25 20:10:10 -04:00