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

..

material_recipes.dm

makes benches a subtype of tables

2016-06-29 17:52:27 -04:00

material_sheets.dm

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

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

material_synth.dm

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

materials.dm

AI Core Update

2016-07-05 17:33:34 -04:00