Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

glasses

origin and req lvl changes

2016-05-21 17:17:20 +03:00

gloves

Maint table tweaks

2016-05-04 19:05:39 +01:00

head

Merge pull request #17839 from optimumtact/watisgoinon

2016-05-24 17:46:11 +02:00

masks

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

outfits

ert medbeammemes

2016-05-21 13:55:25 -05:00

shoes

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

spacesuits

Removal of station hardsuit jetpack

2016-05-29 11:05:16 +01:00

suits

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

under

Fixes things found in testing

2016-05-26 23:30:42 +03:00

chameleon.dm

Syndicate origin tech changes

2016-05-18 20:12:01 +03:00

clothing.dm

Refactors NOREACT flag; minor cig refactor

2016-05-26 10:12:59 +01:00