diff --git a/toontown/estate/DistributedChair.py b/toontown/estate/DistributedChair.py index b916c0ef..b68847bc 100644 --- a/toontown/estate/DistributedChair.py +++ b/toontown/estate/DistributedChair.py @@ -12,6 +12,7 @@ class DistributedChair(DistributedFurnitureItem): self.dialog = None self.exitButton = None self.avId = ToontownGlobals.CHAIR_NONE + self.accept('exitingStoppedState', self.destroyGui) def loadModel(self): model = DistributedFurnitureItem.loadModel(self) diff --git a/toontown/estate/DistributedRewardCrate.py b/toontown/estate/DistributedRewardCrate.py index 911641a6..cd291bc5 100644 --- a/toontown/estate/DistributedRewardCrate.py +++ b/toontown/estate/DistributedRewardCrate.py @@ -10,6 +10,7 @@ class DistributedRewardCrate(DistributedFurnitureItem): def __init__(self, cr): DistributedFurnitureItem.__init__(self, cr) self.dialog = None + self.accept('exitingStoppedState', self.destroyDialog) def loadModel(self): model = DistributedFurnitureItem.loadModel(self) diff --git a/toontown/estate/DistributedTV.py b/toontown/estate/DistributedTV.py index c7a3bd6e..97d10d71 100644 --- a/toontown/estate/DistributedTV.py +++ b/toontown/estate/DistributedTV.py @@ -13,10 +13,7 @@ class DistributedTV(DistributedFurnitureItem): self.dialog = None self.screen = None self.sound = None - - def announceGenerate(self): self.accept('exitingStoppedState', self.destroyGui) - DistributedFurnitureItem.announceGenerate(self) def loadModel(self, animate=1): model = DistributedFurnitureItem.loadModel(self) diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 4909f033..db4ddcd4 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -5606,7 +5606,6 @@ NPCToonNames = {20000: 'Tutorial Tom', 2009: lHQOfficerF, 2010: lHQOfficerF, 2012: 'Fisherman Freddy', - 2018: 'Duff..err..TIP Man', 2013: 'Clerk Poppy', 2014: 'Clerk Peppy', 2015: 'Clerk Pappy',