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

..

clipboard.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

filingcabinet.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

folders.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

handlabeler.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

paper.dm

Standardize CLUMSY

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

paperbin.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

pen.dm

Adding checks for LAssailant everywhere whee

2013-12-23 04:57:44 -05:00

photocopier.dm

Photocopier exploit fix

2013-12-17 07:25:53 -05:00

photography.dm

Pretty much all new click code

2013-10-12 14:44:36 -04:00

stamps.dm

New Stamp Code + Map updates

2013-10-31 08:35:38 -04:00