Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

glasses

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

2014-12-16 02:52:08 +03:00

gloves

Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.

2014-12-26 17:04:09 +01:00

head

Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo

2014-12-26 22:31:54 -08:00

masks

reverts some sechailer and other feature things

2014-12-13 00:09:58 -08:00

shoes

coats to lockers, winter boots

2014-12-05 21:14:49 -08:00

spacesuits

Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser

2014-12-26 09:09:24 -08:00

suits

old warden jacket for the lockers

2014-12-17 23:01:10 -08:00

under

Merge branch 'master' into meido

2014-12-25 12:41:29 -03:00

clothing.dm

adds suit sensor menu

2014-12-21 21:04:35 -08:00