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

..

obj

item_state cleanup

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

procs

Ports Mloc's HUD fixes from Bay and further fixes ours because of code differences

2016-07-11 16:35:21 +01:00

gases.dm

Fixes #11071, #10936

2015-12-08 18:15:40 +01:00

obj.dm

item_state cleanup

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