Merge branch 'Python3' into Chibis

* Fixed an issue with the order of layers caused by the use of sets

game/scripts/characters/hermione/events/items/vibrators.rpy

@@ -1701,7 +1701,7 @@ label hg_vibrators_personal:
             "-Grade her performance-":
                 gen "Oh, wait!" ("base", xpos="far_left", ypos="head")
                 gen "I was going to grade you, wasn't I?" ("base", xpos="far_left", ypos="head")
-                gen "Hmm...{w=0.4} Let's see..." ("base", xpos="far_left", ypos="head")
+                gen "*Hmm*...{w=0.4} Let's see..." ("base", xpos="far_left", ypos="head")
                 her "..." ("soft", "base", "base", "mid", cheeks="blush") #hopeful
 
                 menu:
@@ -1727,7 +1727,7 @@ label hg_vibrators_personal:
                             her "Well, I was thinking, it's not like I can show this grade off to my classmates, or anything..." ("open", "base", "base", "R", cheeks="blush")
                             gen "I mean, you could--..." ("grin", xpos="far_left", ypos="head")
                             gen "--but I get the sentiment..." ("base", xpos="far_left", ypos="head")
-                            gen "Hmm..." ("base", xpos="far_left", ypos="head")
+                            gen "*Hmm*..." ("base", xpos="far_left", ypos="head")
 
                     "-Deny her a passing grade-":
 
@@ -3120,7 +3120,7 @@ label hg_vibrators_public_return:
                 her "The fact that they were there with me the entire time, it made me feel as if we were sharing this feeling."
                 her "Even if in reality, they weren't aware of anything that was going on..."
                 gen "Feeling comfortable around your friends is very important, [hermione_name]."
-                her "Hmm... Yes, although I don't think this is the kind of comfort you're meant to feel around your friends..."
+                her "*Hmm*... Yes, although I don't think this is the kind of comfort you're meant to feel around your friends..."
                 gen "Unless benefits are added to the equation..."
 
                 show her_vibrators_public eyebrows_worried mouth_lip_bite as xray_child
@@ -3337,7 +3337,7 @@ label hg_vibrators_public_return:
                         her "So, the reason why they kept looking over was to make sure I was okay." ("annoyed", "closed", "base", "mid", cheeks="blush")
 
                     her "Of course they wouldn't expect that the reason I wasn't acting myself was because I had strapped vibrators on my body!" ("open", "closed", "base", "mid", cheeks="blush")
-                    gen "Hmm... I'm beginning to understand why women think that men are completely oblivious creatures..." ("base", xpos="far_left", ypos="head")
+                    gen "*Hmm*... I'm beginning to understand why women think that men are completely oblivious creatures..." ("base", xpos="far_left", ypos="head")
                     gen "Very well [hermione_name], that shall very much do for today." ("base", xpos="far_left", ypos="head")
                     her "Oh, okay then..." ("soft", "narrow", "base", "down", cheeks="blush")
 

game/scripts/doll/common.rpy

@@ -75,12 +75,12 @@ init -1 python:
         threadlock = False
         icon_threadlock = False
 
-        layers_extra = {"extra", "outline", "overlay"}
-        layers_special = {"skin", "mask", "wind_mask"}
-        layers_additional = {"back", "front"}
+        layers_extra = ("extra", "outline", "overlay")
+        layers_special = ("skin", "mask", "wind_mask")
+        layers_additional = ("back", "front")
 
         blacklist_toggles = ("hair", "glasses", "pubes", "piercing", "makeup", "tattoo", "earrings")
-        blacklist_unequip = {"hair"}
+        blacklist_unequip = ("hair",)
         multislots = ("makeup", "accessory", "piercing", "tattoo")
 
         sizes = (1010, 1200) # Default sizes used for defining rare cases