Chinsky ae75e3555e Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience ...

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm

2015-04-05 05:23:14 +03:00

..

ears

Response to #7686

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

glasses

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

2014-10-20 04:52:45 +04:00

gloves

Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.

2015-01-30 18:22:58 -05:00

head

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

masks

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

shoes

Minor Entered() refactoring.

2015-02-04 10:49:53 +10:30

spacesuits

Merge remote-tracking branch 'remotes/upstream/dev-freeze' into conscience

2015-04-05 05:23:14 +03:00

suits

Adds four mercenary vests to the merc base, tweaks

2015-03-09 03:15:45 -04:00

under

Fixes webbings utilising bluespace storage for infinite storage (again)

2015-03-27 03:06:29 +00:00

clothing.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro

2015-02-11 14:35:58 +10:30