Ikarrus 6cc17a6243 Resolved Conflicts: ...

code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm

2015-06-27 00:17:02 -06:00

..

clipboard.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

filingcabinet.dm

…

folders.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

handlabeler.dm

…

paper.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

paperbin.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

pen.dm

Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u.

2015-06-25 00:30:09 +02:00

photocopier.dm

…

photography.dm

Squashed Commits

2015-06-27 00:09:16 -06:00

stamps.dm

…