phil235 c1a37bb2e0 Derp, I hate fixing merge conflicts...

2015-06-28 15:27:58 +02:00

..

glasses

Merge pull request #9741 from palpatine213/SecHudEmag

2015-06-04 20:19:39 -05:00

gloves

Squashed Commits

2015-06-27 00:09:16 -06:00

head

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

masks

Derp, I hate fixing merge conflicts...

2015-06-28 15:27:58 +02:00

shoes

Merge pull request #9620 from xxalpha/mineralcontainer

2015-06-28 15:07:17 +03:00

spacesuits

Merge remote-tracking branch 'upstream/master' into chief

2015-06-23 21:50:16 +01:00

suits

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

under

Squashed Commits

2015-06-27 00:09:16 -06:00

cloaks.dm

FEATURES SIX AND SEVEN: Suicide msg's and cloaks

2015-06-10 14:17:38 -04:00

clothing.dm

Burning objects are processed every tick now instead of using a spawn() check

2015-06-27 09:22:14 -06:00