carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems ...

Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm

2015-01-04 01:52:14 +00:00

..

clipboard.dm

Some fixes and minor improvements to examining.

2014-06-13 09:01:52 -07:00

filingcabinet.dm

Secret Document Objectives

2014-05-04 15:00:47 -06:00

folders.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor

2014-06-09 01:50:44 -07:00

handlabeler.dm

…

paper.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems

2015-01-04 01:52:14 +00:00

paperbin.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

pen.dm

Balance changes to the sleepypen.

2014-09-05 18:24:25 +02:00

photocopier.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

photography.dm

Fixes issues with TK teleporting pictures and harvested plants.

2014-11-18 15:49:03 -03:00

stamps.dm

…