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

Conflicts:
	code/modules/clothing/masks/gasmask.dm

2015-06-28 15:22:21 +02:00

..

designs

Merge pull request #8876 from xxalpha/fixfixfix

2015-06-21 22:12:17 +03:00

xenobiology

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

circuitprinter.dm

Fixes imprinter volume with beakers

2015-05-30 17:23:39 +03:00

designs.dm

Merge pull request #9804 from Firecage/Exwelder

2015-06-07 21:23:45 -05: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 branch 'master' of https://github.com/tgstation/-tg-station into AcidFix

2015-06-24 21:15:09 +02:00

message_server.dm

Merge pull request #9845 from AnturK/buttsender

2015-06-17 20:36:52 +02:00

protolathe.dm

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03: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 #9960 from xxalpha/bass

2015-06-18 15:50:35 +02:00

rdmachines.dm

Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.

2015-04-24 20:50:50 +03:00

research.dm

Changes alot of datum/ to /datum/

2015-05-31 02:40:54 +02:00

server.dm

Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome

2015-06-16 11:30:44 +02:00

stock_parts.dm

Reverts BPRED change.

2015-06-24 19:51:28 +02:00