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

Conflicts:
	code/game/objects/items/weapons/power_cells.dm

2015-05-22 08:26:13 +02:00

..

ears

Response to #7686

2015-01-06 21:48:56 +01:00

glasses

qdel

2015-05-12 13:12:58 +09:30

gloves

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

2015-05-10 10:43:46 +02:00

head

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

masks

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

2015-04-27 08:08:39 +02:00

shoes

Debugging!

2015-05-12 21:30:06 +09:30

spacesuits

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

2015-05-22 08:26:13 +02:00

suits

Merge with dev.

2015-05-20 13:39:31 +09:30

under

Merge with dev.

2015-05-20 13:39:31 +09:30

clothing.dm

Merge pull request #8903 from Mloc/lightwrite

2015-05-11 09:26:04 +09:30