MrSnapwalk 07441e1e61 Attempting to fix conflicts with the following files: ...

icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi

2014-11-19 13:54:28 -06:00

..

glasses

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

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

gloves

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

head

Adds tajaran/unathi tacticool sprite sheets

2014-11-13 01:03:29 -05:00

masks

Merge pull request #7007 from mwerezak/helmet

2014-11-14 11:19:29 +03:00

shoes

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

spacesuits

Adds the new spacesuit sprites. Adds a less IMMULSION-BREAKING description for the syndicate spacesuit/helmet.

2014-11-16 19:05:09 -06:00

suits

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

under

Apparently the blue lawyer jacket didn't actually button up properly. Now it should button up, and uses the same system as everything else.

2014-11-11 12:47:02 -05:00

clothing.dm

Merge pull request #6939 from PsiOmegaDelta/VerbOptimization

2014-11-05 23:23:56 +03:00