Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff ...

Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm

2015-03-28 19:14:59 +03:00

..

carbonpaper.dm

disregard failure. I made a silly.

2014-04-06 18:29:50 -07:00

clipboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

faxmachine.dm

Merge remote-tracking branch 'upstream/dev' into faxmachine

2014-11-20 14:57:35 -05:00

filingcabinet.dm

Fixes medical record cabinet runtime

2015-03-09 03:18:38 -04:00

folders.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

handlabeler.dm

Added labelling for hydro trays.

2015-02-04 10:54:18 +10:30

paper_bundle.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

paper.dm

merge fix

2015-03-25 01:13:23 +03:00

paperbin.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

pen.dm

Merge branch 'Baystation12/dev' into ofChemistryAndStuff

2015-03-28 19:14:59 +03:00

photocopier.dm

Fixes photocopier runtime

2015-03-09 12:12:31 -04:00

photography.dm

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

silicon_photography.dm

Fixes #7366.

2014-12-10 21:54:57 +01:00

stamps.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00