SinTwo 976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi

2016-07-13 17:07:52 -04:00

..

xenoarchaeology

item_state cleanup

2016-07-11 22:31:32 -04:00

circuitprinter.dm

Frame Fixes

2016-06-01 14:32:56 -04:00

designs.dm

Fixes a bad material discovered by the new unit test!

2016-06-02 18:37:37 -04:00

destructive_analyzer.dm

Frame Fixes

2016-06-01 14:32:56 -04:00

mechfab_designs.dm

Makes everything produced in Robotics 25% cheaper to produce

2016-06-11 16:28:32 +01:00

message_server.dm

…

prosfab_designs.dm

Adjusts FBP and prosthetic limb producing costs

2016-07-10 04:37:00 +01:00

protolathe.dm

Frame Fixes

2016-06-01 14:32:56 -04:00

rd-readme.dm

…

rdconsole.dm

Resolve problem with robot destructive analyzer

2016-03-31 16:10:07 -04:00

rdmachines.dm

Removes copypaste

2016-01-18 16:04:01 +03:00

research.dm

Scheduler now uses btime, and other improvements

2016-06-01 17:56:07 +01:00

server.dm

Frame Fixes

2016-06-01 14:32:56 -04:00