Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #47 from stevetts/master

Browse source 
Merge current master
This commit is contained in:
John Cote 2015-06-24 17:52:53 -04:00
commit ac15b0e4b5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -8,7 +8,7 @@ The source code for Toontown Stride.
### Info ### Info
* It is recommended that you make all of your changes in a fork before committing.
* Do not erase or revert another person's commit without first consulting them. * Do not erase or revert another person's commit without first consulting them.
* Only push to this repository. * Only push to this repository for Toontown Stride source code.
* Never force a git push. * Bigger commits should be done in a seperate branch then merged to master after tested.
* Never force a git push.

2
toontown/makeatoon/MakeAToon.py
View file

@ -66,7 +66,7 @@ class MakeAToon(StateData.StateData):
self.bs = BodyShop.BodyShop('BodyShop-done') self.bs = BodyShop.BodyShop('BodyShop-done')
self.cos = ColorShop.ColorShop('ColorShop-done') self.cos = ColorShop.ColorShop('ColorShop-done')
self.cls = MakeClothesGUI.MakeClothesGUI('ClothesShop-done') self.cls = MakeClothesGUI.MakeClothesGUI('ClothesShop-done')
self.ns = NameShop.NameShop(self, 'NameShop-done', avList, index, True) self.ns = NameShop.NameShop(self, 'NameShop-done', avList, index)
self.shop = GENDERSHOP self.shop = GENDERSHOP
self.shopsVisited = [] self.shopsVisited = []
if self.warp: if self.warp: