MergerMerged

Changelog.txt

src/SecExp/securityHQ.tw

src/SecExp/weaponsManufacturing.tw

src/SpecialForce/SpecialForce.js

src/art/vector/VectorArtJS.js

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

src/endWeek/saChoosesOwnClothes.js

src/interaction/main/toychest.js

src/interaction/main/useGuard.js

src/js/DefaultRules.js

src/js/SlaveState.js

src/js/hTagMacroJS.js

src/js/itemAvailability.js

src/js/quickListJS.js

src/js/removeActiveSlave.js

src/js/rulesAssistantOptions.js

src/js/slaveGenerationJS.js

src/js/slaveStatsChecker.js

src/js/slaveSummaryWidgets.js

src/js/storyJS.js