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

Conflicts:
	code/__DEFINES/genetics.dm
	code/modules/mob/living/carbon/human/species_types.dm

2016-06-04 17:41:43 +02:00

..

clipboard.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

contract.dm

- I made human/handle_blood() less shitty.

2016-06-04 17:33:16 +02:00

filingcabinet.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

folders.dm

Adds a new derelict to space ruins

2016-04-18 10:05:43 +03:00

handlabeler.dm

Renames ID cards in PDAs as well

2016-05-04 20:14:23 +01:00

paper_cutter.dm

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00

paper.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

paperbin.dm

Second commits.

2016-04-24 20:37:00 +02:00

paperplane.dm

Paperplane balance fix (#17278)

2016-05-01 12:22:11 +02:00

pen.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

photocopier.dm

Employment contracts can once again be copied. (#17510)

2016-05-11 22:17:02 -05:00

photography.dm

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

stamps.dm

[s] Removes another world << from stamps (#17655)

2016-05-14 06:41:13 -05:00