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

Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm

2015-09-15 20:25:13 +02:00

..

ears

…

glasses

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

2015-08-12 21:18:18 +02:00

gloves

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

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

head

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

2015-08-12 21:18:18 +02:00

masks

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

2015-08-11 18:47:05 +01:00

shoes

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

spacesuits

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

2015-09-15 20:25:13 +02:00

suits

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

2015-08-11 18:47:05 +01:00

under

Merge with master.

2015-08-18 11:31:10 -07:00

chameleon.dm

Updates more hats

2015-06-28 01:50:05 -04:00

clothing.dm

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

2015-08-24 10:23:12 +02:00