Erthilo b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm

2013-08-31 17:45:31 +01:00

..

clipboard.dm

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

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

filingcabinet.dm

Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

2012-12-28 01:07:36 +10: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

Beakers and other glass containers now hide their contents, only showing the amount.

2013-07-22 17:38:34 +01:00

paper.dm

Moved tag whitelist check to HELPERS.

2013-02-12 20:43:22 +04: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

Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.

2013-08-28 03:33:04 +01:00

photocopier.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

photography.dm

Bugfix: Fixed issues with custom item camera sprites

2013-05-18 22:00:15 +07:00

stamps.dm

Added IA stamps, IA office has a receiving desk.

2013-08-27 22:10:20 +01:00