phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm

2015-03-26 02:31:06 +01:00

..

designs

Merge pull request #8451 from Fayrik/FoamForceFuckYeah

2015-03-25 16:30:42 +11:00

xenobiology

Adding a changelog.

2015-03-26 02:23:39 +01:00

circuitprinter.dm

Merge pull request #7988 from Menshin/protalathe_matcheck_fix

2015-02-27 11:11:52 +03:00

designs.dm

Code tweaks. Designs are now in 'Medical'.

2015-03-20 22:57:52 +00:00

destructive_analyzer.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

experimentor.dm

Merge pull request #8349 from MrPerson/qdel_reagents_hopefully

2015-03-23 08:55:11 -05:00

message_server.dm

Merge remote-tracking branch 'upstream/master' into hiasl

2014-11-01 20:04:26 -03:00

protolathe.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

rd-readme.dm

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +00:00

rdconsole.dm

Merge pull request #7988 from Menshin/protalathe_matcheck_fix

2015-02-27 11:11:52 +03:00

rdmachines.dm

Adds deconstruction for DNA scanner and cloning pod.

2013-12-07 08:55:07 +02:00

research.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

server.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00