mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-04-26 14:53:01 -04:00

..

ears

Response to #7686

2015-01-06 21:48:56 +01:00

glasses

Thermal/NVG changes.

2015-04-05 09:54:55 +02:00

gloves

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

head

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

masks

Updates a few mask body cover flags, allows breath masks to be adjusted in hand

2015-04-24 22:00:51 -04:00

shoes

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

spacesuits

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

suits

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

under

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00

clothing.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00