mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-04-26 14:53:01 -04:00

..

carbonpaper.dm

…

clipboard.dm

Removes FPRINT and TABLEPASS flags

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

faxmachine.dm

…

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

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

paper_bundle.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

paper.dm

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

2015-04-24 17:13:37 +02:00

paperbin.dm

Replaced display_name with name, worked on severing limbs and damage propagation.

2015-03-25 19:07:22 +10:30

pen.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

photocopier.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

photography.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

silicon_photography.dm

…

stamps.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00