Rob Nelson d49e6d3bf4 Standardize CLUMSY ...

Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm

2014-01-21 22:49:22 -05:00

..

belt.dm

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

cargoprofile.dm

Switching cable coils to stacks

2014-01-21 21:23:26 -05:00

grenades.dm

Sayu grenade and assembly update

2013-11-04 14:31:58 -05:00

programmable.dm

Standardize CLUMSY

2014-01-21 22:49:22 -05:00

random_items.dm

Sayu grenade and assembly update

2013-11-04 14:31:58 -05:00