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

Conflicts:
	code/modules/mob/mob.dm

2015-04-03 09:33:05 +02: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

Merge pull request #8380 from volas/sanitize_procs

2015-03-29 00:57:33 +10:30

shoes

Minor Entered() refactoring.

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

spacesuits

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

2015-04-03 09:33:05 +02: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' into NarsiePort

2015-03-30 20:17:05 +02:00

clothing.dm

Updated ismonkey(), refactored kitchen spike, refactored plastic flaps.

2015-03-26 12:45:12 +10:30