Markolie e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise ...

Conflicts:
	maps/cyberiad.dmm

2015-03-04 19:34:21 +01:00

..

glasses

ERT equipment rework

2015-03-03 22:51:54 +01:00

gloves

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

head

ERT equipment update

2015-03-04 17:16:19 +01:00

masks

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

shoes

Removes Space Ninjas

2015-03-02 19:05:44 -05:00

spacesuits

Merge pull request #493 from Markolie/master

2015-03-03 21:28:22 -05:00

suits

ERT equipment update

2015-03-04 17:16:19 +01:00

under

ERT equipment update

2015-03-04 17:16:19 +01:00

clothing.dm

Taking off mask disables internals

2015-02-28 19:51:14 +01:00