PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01: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 pull request #8328 from PsiOmegaDelta/LessIsMore

2015-03-03 10:21:16 +03:00

suits

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

2015-03-13 09:23:26 +01:00

under

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

2015-03-13 09:23:26 +01:00

clothing.dm

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

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