paprka dc01a092af Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi

2014-12-10 23:55:51 -08:00

..

designs

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

2014-12-10 23:55:51 -08:00

circuitprinter.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

designs.dm

Generic names and buffs

2014-12-08 16:49:48 -08:00

destructive_analyzer.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

message_server.dm

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

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

protolathe.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05: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 #5786 from Miauw62/runtime1

2014-11-10 08:43:10 -08:00

rdmachines.dm

Adds deconstruction for DNA scanner and cloning pod.

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

research.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

server.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00