Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk ...

Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi

2015-11-07 15:56:39 -03:00

..

designs

Gold requirement

2015-10-29 08:20:32 -05:00

xenobiology

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

2015-11-07 15:56:39 -03:00

circuitprinter.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

designs.dm

Missing Diagnostic HUDs commit

2015-10-30 00:45:31 -05:00

destructive_analyzer.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

experimentor.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

message_server.dm

Tweaks

2015-10-11 08:56:13 -05:00

protolathe.dm

Fixed protolathe not printing things that required reagents.

2015-09-17 14:09:03 +01:00

rd-readme.dm

…

rdconsole.dm

Merge pull request #12283 from KorPhaeron/inworld

2015-10-12 12:12:35 +03:00

rdmachines.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

research.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

server.dm

Removes in world

2015-10-09 22:37:53 -05:00

stock_parts.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00