Merge commit 'abac7ee18875a3cc8340f98a6fa78f599e9e1d64' into Edited-TW

sugarcube/src/activities/abduction.tw

@@ -70,7 +70,7 @@
 	<<set $rapeCount = 0>>
 	<<set $tortureCount = 0>>
 	<<set $finances.cash = 0>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<actCLA 'Continue'>>
 		<<gt 'abduction' 'abdRoom'>>
 	<</actCLA>>

sugarcube/src/activities/actress/audition_sex1.tw

@@ -145,7 +145,7 @@
 								<p>"Cute pussy," $boydesc says. "I see you keep it clean down there."</p>
 							<</if>>
 							<<actCLA 'Huh?'>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<gs 'underwear' 'remove'>>
 								<<image "locations/city/citycenter/aurora/auditions/room.jpg">>
 								<p>"Huh?"</p>
@@ -194,7 +194,7 @@
 	<<video "shared/actress/sex/reluctant/bj2.mp4">>
 	<<if getvar("$audition['undress']") == 1>>
 		<<setinit $audition['bonus'] += 15>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 		<p>You strip out of your clothing, baring everything before him before getting back down on your knees to suck on his cock. Fearing the consequences if you don't, you to put in a real effort this time, sucking hard on $boydesc's cock and work as much of his shaft as you can, not just the tip.</p>
 	<<else>>
@@ -969,7 +969,7 @@
 	<</actCLA>>
 <</if>>
 <<if $location_var[$here][0] == 'reluctant_virgin'>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<gs 'underwear' 'remove'>>
 	<<setinit $actress['cast_couch_virginity'] = 1>>
 	<<setinit $audition['cast_couch_virgin'] = 1>>

sugarcube/src/activities/actress/audition_sex2.tw

@@ -392,7 +392,7 @@
 								"... I guess I was just using a figure of speech..." you mumble weakly.
 								<p>"Ooooh, a figure of speech huh? WELL I DON'T HAVE ANY USE FOR THAT!" $boydesc yells at you. You cringe backwards from his tirade.</p>
 								<<if $wardrobe.clothingworntype != 'nude'>>
-									<<gs 'clothing' 'strip'>>
+									<<strip 'clothes'>>
 									<<gs 'underwear' 'remove'>>
 									<p>"For fuck's sake! Well whether you want to or not, you're getting out of those clothes," he says, yanking them off you at this point. "And this better be the best blowjob of your fucking life or you won't even have a chance."</p>
 								<<else>>
@@ -404,7 +404,7 @@
 							<</actCLA>>
 						<</actCLA>>
 						<<actCLA 'Get assfucked'>>
-							<<gs 'clothing' 'strip'>>
+							<<strip 'clothes'>>
 							<<gs 'underwear' 'remove'>>
 							<<gt 'audition_sex2' 'neutral_anal2'>>
 						<</actCLA>>
@@ -416,7 +416,7 @@
 							"No," you shake your head reluctantly. "Anything but that. I just... can't."
 							<p>"Fine," he growls. "But now you're getting assfucked instead!"</p>
 							<<if $wardrobe.clothingworntype != 'nude'>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<gs 'underwear' 'remove'>>
 								He yanks your clothes off and roughly shoves you down onto the desk. Immediately, you can feel him pressing into your asshole.
 							<<else>>
@@ -431,7 +431,7 @@
 							"Well let''s see that ass first and then we'll decide if you get the role."
 							<<if $wardrobe.clothingworntype != 'nude'>>
 								<<actCLA 'Take off your clothes'>>
-									<<gs 'clothing' 'strip'>>
+									<<strip 'clothes'>>
 									<<gs 'underwear' 'remove'>>
 									<<gt 'auditions' 'neutral_anal2'>>
 								<</actCLA>>
@@ -1068,7 +1068,7 @@
 	<<setinit $audition['cast_couch_virgin'] = 1>>
 	<<setinit $actress['cast_couch_virginity'] = 1>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 	<</if>>
 	<<video "locations/pavlovsk/cafe/table.mp4">>
@@ -1097,7 +1097,7 @@
 	<<setinit $audition['cast_couch_virgin'] = 1>>
 	<<setinit $actress['cast_couch_virginity'] = 1>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 	<</if>>
 	<<video "shared/actress/sex/table_doggy/fuck2.mp4">>

sugarcube/src/activities/actress/audition_sex3.tw

@@ -389,7 +389,7 @@
 								"... I guess I was just using a figure of speech..." you mumble weakly.
 								<p>"Ooooh, a figure of speech huh? WELL I DON'T HAVE ANY USE FOR THAT!" $boydesc yells at you. You cringe backwards from his tirade.</p>
 								<<if $wardrobe.clothingworntype != 'nude'>>
-									<<gs 'clothing' 'strip'>>
+									<<strip 'clothes'>>
 									<<gs 'underwear' 'remove'>>
 									<p>"For fuck's sake! Well whether you want to or not, you're getting out of those clothes," he says, yanking them off you at this point. "And this better be the best blowjob of your fucking life or you won't even have a chance."</p>
 								<<else>>
@@ -401,7 +401,7 @@
 							<</actCLA>>
 						<</actCLA>>
 						<<actCLA 'Get assfucked'>>
-							<<gs 'clothing' 'strip'>>
+							<<strip 'clothes'>>
 							<<gs 'underwear' 'remove'>>
 							<<gt 'audition_sex1' 'slutty_anal2'>>
 						<</actCLA>>
@@ -413,7 +413,7 @@
 							"No," you shake your head reluctantly. "Anything but that. I just... can't."
 							<p>"Fine," he growls. "But now you're getting assfucked instead!"</p>
 							<<if $wardrobe.clothingworntype != 'nude'>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<gs 'underwear' 'remove'>>
 								He yanks your clothes off and roughly shoves you down onto the desk. Immediately, you can feel him pressing into your asshole.
 							<<else>>
@@ -428,7 +428,7 @@
 							"Well let''s see that ass first and then we'll decide if you get the role."
 							<<if $wardrobe.clothingworntype != 'nude'>>
 								<<actCLA 'Take off your clothes'>>
-									<<gs 'clothing' 'strip'>>
+									<<strip 'clothes'>>
 									<<gs 'underwear' 'remove'>>
 									<<gt 'audition_sex3' 'slutty_anal2'>>
 								<</actCLA>>
@@ -565,7 +565,7 @@
 		<p>You give $boydesc a sultry smile as you pull your clothes off, making a big show when you reveal your lack of underwear underneath them.</p>
 		<p>"No panties. You little <i>whore</i>. I bet you came here hoping this would happen didn't you?" he grins.</p>
 	<</if>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<gs 'underwear' 'remove'>>
 	<<if rand(0,1) == 1>>
 		<<if $pc.thinksIsVirgin>>
@@ -1096,7 +1096,7 @@
 	<<setinit $audition['cast_couch_virgin'] = 1>>
 	<<setinit $actress['cast_couch_virginity'] = 1>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 	<</if>>
 	<<video "locations/pavlovsk/cafe/table.mp4">>
@@ -1126,7 +1126,7 @@
 	<<setinit $actress['cast_couch_virginity'] = 1>>
 	<<setinit $audition['position'] = 2>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 	<</if>>
 	<<video "shared/actress/sex/table_doggy/fuck2.mp4">>

sugarcube/src/activities/actress/auditions_minor1.tw

@@ -156,7 +156,7 @@
 							<<gt 'audition_sex2' 'neutral_bj1'>>
 						<</actCLA>>
 						<<actCLA 'Undress first'>>
-							<<gs 'clothing' 'strip'>>
+							<<strip 'clothes'>>
 							<<gs 'underwear' 'remove'>>
 							<<gt 'audition_sex2' 'neutral_bj1'>>
 						<</actCLA>>
@@ -329,7 +329,7 @@
 							<<gt 'audition_sex3' 'slutty_bj1'>>
 						<</actCLA>>
 						<<actCLA 'Undress first'>>
-							<<gs 'clothing' 'strip'>>
+							<<strip 'clothes'>>
 							<<gs 'underwear' 'remove'>>
 							<<gt 'audition_sex3' 'slutty_bj1'>>
 						<</actCLA>>
@@ -344,7 +344,7 @@
 									<p>You give $boydesc[0] a sultry smile as you pull your clothes off, making a big show when you reveal your lack of underwear underneath them.</p>
 									<p>"No panties. You little <i>whore</i>. I bet you came here hoping this would happen didn't you?" he grins.</p>
 								<</if>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<gs 'underwear' 'remove'>>
 								"By the way, I'm a virgin," you say hoping to entice him for a more favorable audition, bending over and spreading your pussy lips to show him the proof.
 								<<if rand(1,2) == 1>>
@@ -387,7 +387,7 @@
 									<p>You give $boydesc[0] a sultry smile as you pull your clothes off, making a big show when you reveal your lack of underwear underneath them.</p>
 									<p>"No panties. You little <i>whore</i>. I bet you came here hoping this would happen didn't you?" he grins.</p>
 								<</if>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<gs 'underwear' 'remove'>>
 								"By the way, I'm a virgin," you say hoping to entice him for a more favorable audition, laying back on the desk and spreading your pussy to show him the proof.
 								<p>"A virgin huh?" He gives you a hungry look. "Well, don't mind if I do then..." he continues, lining his cock up with your pussy.</p>

sugarcube/src/activities/bootycall/booty_call_start.tw

@@ -352,7 +352,7 @@
 
 	<</if>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 
 	<</if>>
 	<<if $wardrobe.braworntype != 'none'>>

sugarcube/src/activities/school/deprecated/gschool_lessons1.tw

@@ -278,7 +278,7 @@
 		<</actCLA>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-				<<gs 'panties' 'remove'>>
+				<<strip 'panties'>>
 				<<run $pc.fameInc('pav','sex',5)>>
 				<<image "locations/pavlovsk/school/classroom/removepanties.jpg">>
 				While sitting at your desk feeling bored, you notice no one is looking at you and so decide to take your panties off, just for something to do. You reach under your skirt and pull them down slowly.

sugarcube/src/activities/school/deprecated/gschool_lessons2.tw

@@ -300,7 +300,7 @@
 		<</actCLA>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 
 
 					<<run $pc.fameInc('pav','sex',5)>>
@@ -705,7 +705,7 @@
 		<</actCLA>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 					<<gs 'willpower' 'exhib' 'self' 'medium'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<run $pc.fameInc('pav','sex',5)>>
@@ -1175,7 +1175,7 @@
 			<<gs 'willpower' 'exhib' 'self' 'medium'>>
 			<<if $will_cost <= $pc.pcs_willpwr and $wardrobe.pantyworntype != 'none'>>
 				<<actCLA 'Remove panties (will_cost Willpower)'>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 					<<gs 'willpower' 'exhib' 'self' 'medium'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<run $pc.fameInc('pav','sex',5)>>
@@ -1526,7 +1526,7 @@
 		<</actCLA>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 					<<gs 'willpower' 'exhib' 'self' 'medium'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<run $pc.fameInc('pav','sex',5)>>

sugarcube/src/activities/school/schoolday/lessons/history.tw

@@ -303,7 +303,7 @@
 		<</actCLA>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 					<<gs 'willpower' 'exhib' 'self' 'medium'>>
 					<<gs 'willpower' 'pay' 'self'>>
 					<<run $pc.fameInc('pav','sex',5)>>

sugarcube/src/activities/school/schoolday/lessons/school_class_action_macros.tw

@@ -618,7 +618,7 @@
 		<</if>>
 		<<if $wardrobe.pantyworntype != 'none'>>
 			<<actCLA 'Remove panties' undefined `{willpower:['exhib','self','medium']}`>>
-				<<gs 'panties' 'remove'>>
+				<<strip 'panties'>>
 
 
 				<<run $pc.fameInc('pav','sex',5)>>

sugarcube/src/activities/sex/Sex.js

@@ -0,0 +1,64 @@
+class Sex{
+
+	npcId = '';
+	history = [];
+	scenarioId = '';
+
+	arousals = {};
+
+	reaction(reactionId){
+		return Object.assign({id:reactionId},setup.sexReactions[reactionId]);
+	}
+
+	reactions(scenarioId=undefined){
+		scenarioId ??= this.scenarioId;
+		return this.scenario(scenarioId).reactions.map(reactionId=>this.reaction(reactionId));
+	}
+
+	scenario(scenarioId=undefined){
+		scenarioId ??= this.scenarioId;
+		return setup.sexScenarios[scenarioId];
+	}
+
+	situationNext(scenarioId){
+		scenarioId ??= this.scenarioId;
+		return this.situations(scenarioId).getRandomWeighted();
+	}
+
+	situation(situationId){
+		return Object.assign({id:situationId},setup.sexSituations[situationId]);
+	}
+
+	situations(scenarioId=undefined){
+		scenarioId ??= this.scenarioId;
+		return this.scenario(scenarioId).situations.map(situationId=>this.situation(situationId));
+	}
+
+	constructor(data=undefined){
+		if(data)
+			this._init(data);
+	}
+
+	_init(sex){
+		Object.keys(sex).forEach(function (pn) {
+			this[pn] = clone(sex[pn]);
+		}, this);
+
+		return this;
+	}
+
+	clone = function () {
+		return (new setup.Sex())._init(this);
+	};
+
+	toJSON = function () {
+		var ownData = {};
+		Object.keys(this).forEach(function (pn) {
+			if(typeof this[pn] !== "function")
+				ownData[pn] = clone(this[pn]);
+		}, this);
+		return JSON.reviveWrapper('(new setup.Sex())._init($ReviveData$)', ownData);
+	};
+}
+
+setup.Sex = Sex;

sugarcube/src/activities/sex/sex.tw

@@ -0,0 +1,131 @@
+:: sex_test[event]
+	<<act 'Test'>><<gt 'sex' 'A41'>><</act>>
+
+	<<act 'Test2'>><<gt 'sex_ev_foreplay' 'undress'>><</act>>
+
+:: sex[event]
+	<<set $settings.sex ??= {
+		condoms: {
+			preferOwn: true,
+			sabotage: false,
+			anal:{
+				required: true
+			},
+			vaginal:{
+				required: true
+			}
+		}
+	}>>
+
+	<<set $sex = new setup.Sex({
+		npcId: $location_var[$here][0]
+	})>>
+	
+
+	<h2>Sexual interaction</h2>
+	<<image $npcs.get($sex.npcId,'image')>>
+
+	<p>
+		You are about to start a sexual interaction with <<npc $sex.npcId>><</npc>>.
+	</p>
+	
+	<hr/>
+	<h2>Sex Options</h2>
+	<div class="table" style="--columns-count:2">
+		<h3>Condoms</h3>
+		<p class="explanation">
+			Condoms are only used for sex with characters who have a penis.
+		</p>
+		<p>General</p>
+		<ul>
+			<li><<checkbox "$settings.sex.condoms.preferOwn" false true autocheck>> Use your own condoms if you have some with you.</li>
+			<li><<checkbox "$settings.sex.condoms.sabotage" false true autocheck>> Sabotage your condoms. They still protect against STDs but not against pregnancies. Only applies if your own condom is used. Your partner might find this out before the act.</li>
+		</ul>
+		<p>Anal Sex</p>
+		<ul>
+			<li><<checkbox "$settings.sex.condoms.vaginal.required" false true autocheck>> Require the use of condoms for anal sex.</li>
+		</ul>
+		<p>Vaginal Sex</p>
+		<ul>
+			<li><<checkbox "$settings.sex.condoms.vaginal.required" false true autocheck>> Require the use of condoms for vaginal sex.</li>
+		</ul>
+	</div>
+	
+	
+	/*<<act 'Blowjob'>>
+		<<set $sex.scenarioId = 'bj'>>
+		<<gt 'sex_exec'>>
+	<</act>>*/
+	<<act 'Vaginal Sex'>>
+		<<set $sex.scenarioId = 'vaginal'>>
+		<<gt 'sex_exec'>>
+	<</act>>
+	<<ret 'Change your mind'>>
+
+:: sex_exec[event]
+	<<gs `'sex_'+$sex.scenarioId` $location_var[$here][0]>>
+
+:: sex_bj_scripts[script]
+	setup.sexScenarios = {
+		bj:{
+			mode: 'game',
+			reactions: ['test1','test2'],
+			situations: ['test1','test2']
+		},
+		vaginal:{
+
+		}
+	}
+	
+	setup.sexSituations = {
+		test1:{
+			weight: 100,
+			desc: 'Test1',
+			correct: 'test1'
+		},
+		test2:{
+			weight: 100,
+			desc: 'Test2',
+			correct: 'test2'
+		}
+	}
+
+	setup.sexReactions = {
+		test1:{
+			label: 'Test1',
+			desc: 'test1',
+			image:''
+		},
+		test2:{
+			label: 'Test2',
+			desc: 'test2',
+			image:''
+		}
+	}
+
+:: sex_bj[include]
+	<<if $sex.history.length > 0>>
+		<<set _lastSituationId	= $sex.history.last()>>
+		<<set _lastSituation	= $sex.situation(_lastSituationId)>>
+		<<set _correctReaction = _lastSituation.correct>>
+
+		<<set _currentReactionKey = $location_var[$here][0]>>
+		<<set _reaction = $sex.reaction(_reactionKey)>>
+
+		<<if _correctReaction == _currentReactionKey>>
+			good
+		<<else>>
+			bad
+		<</if>>
+	<</if>>
+
+	<<set _situation = $sex.situationNext()>>
+	<<=_situation.desc>>
+	<<run $sex.history.push(_situation.id)>>
+
+
+	<<for _reaction range $sex.reactions()>>
+		<<act _reaction.label undefined `{capture:['_reaction']}`>>
+			<<gt 'sex_exec' _reaction.id>>
+		<</act>>
+	<</for>>

sugarcube/src/autogenerated/unsorted/FedorMisc.tw

@@ -870,7 +870,7 @@
 				<<image "characters/shared/headshots_main/big1.jpg">>
 				<p>When you reach a secluded area behind the school Dimka barks "<b>TAKE OFF YOUR CLOTHES WHORE!</b>" as he pulls out his phone and begins recording. You look around to find Fedor but he isn't in sight. Dimka grabs you by your hair as he shouts. "I said take off your clothes and stop fucking around whore!" you feel your heart pounding and decide to do as he says. You completely strip down in front of Dimka as he touches your body and shoves his fingers roughly inside your holes. You begin to feel tears forming in your eyes as you wonder why Fedor is not here. Dimka shoves you against the wall then begins roughly smacking you between your legs then grabs onto your clitoris and pulls on it, causing you to shriek in pain.</p>
 				<<image "characters/pavlovsk/school/boy/fedor/school/Events/Dimka/nude.jpg">>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<arouse 'vaginal_finger' 5 `['sub','rough']`>>
 				<<arouse 'anal_finger' 5 `['sub','rough']`>>
 				<<actCLA 'Continue'>>

sugarcube/src/autogenerated/unsorted/MRear.tw

@@ -63,7 +63,7 @@
 		Another submissive women approaches you and says, "If you are looking to earn a nice bonus, there are a group of older men at the outside dining table. If you strip off, go over to them and have sex with them, they will give you a load of cash."
 		This isn''t exactly the BDSM you come here for, but it is not breaking any rules and you have the choice.
 		<<actCLA 'Strip and go meet the older men'>>
-			<<gs 'clothing' 'strip'>> <<gt 'MRear' 'gEV2'>>
+			<<strip 'clothes'>> <<gt 'MRear' 'gEV2'>>
 		<</actCLA>>
 	<<else>>
 		Another submissive women approaches you and says, "If you are looking to earn a nice bonus, there are a group of older men at the outside dining table. If you go over and have sex with them, they will give you a load of cash."

sugarcube/src/autogenerated/unsorted/MeynoldHome.tw

@@ -322,7 +322,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'Bathroom Hornet'>>
 	<<set $VKHornet = 1>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/Wasp.jpg">>
 	<p>As soon as you open the door, a huge wasp darts past you, flying into the kitchen. A few seconds later you hear $VK_VikName scream, "Ahh a hornet. DIE HORNET!!!" She then comes sprinting out of the kitchen with a rolling pin and begins swatting at the fleeing hornet. You can't help but giggle to yourself as you watch the whole ordeal. You then shake your head before walking into the bathroom.</p>
 	<<actCLA 'Continue'>>
@@ -831,7 +831,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'Bath'>>
 	<<set $time.minutes += 20>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/bath.jpg">>
 	You turn the water on and watch as the bathtub slowly fills. You look around the room feeling rather lonely but nevertheless you wait for the tub to fill before carefully climbing inside and relaxing as the warm water sooths you sore body. After a few minutes, you begin slowly scrubbing yourself until you finally feel clean. You then rest for a few more seconds before you get up, dry yourself off then get dressed.
 	<<actCLA 'Continue'>>
@@ -844,7 +844,7 @@
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/Katja2.jpg">>
 	<p>You turn around and see Katja staring at you. You freeze in place as she walks up to you then looks into your eyes as she says, "Let's get you cleaned up $pc.name_nick."</p>
 	<<actCLA 'Meekly nod'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<center><b><h4><font color=#ff0090><<"Katja [$Kat] Meynold">></font></h4></b></center>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/katja.jpg">>
 		Katja begins unbuttoning your shirt then drops it to the ground she then feels up your waist until she gets to your shirt. She then pulls it up over your head exposing your breasts. Katja slowly runs her fingers over your nipples then lightly grips them before pulling them gently up and letting them go, causing your breasts to bounce.
@@ -894,7 +894,7 @@
 	<<image "characters/pavlovsk/school/girl/natalia/love/bedroom/hold.jpg">>
 	<p></p>
 	<<actCLA ''>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<set $time.minutes += 5>>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/bath.jpg">>
 		<p></p>
@@ -924,7 +924,7 @@
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/katja.jpg">>
 	You turn around and see Katja staring at you. She reaches out for you but hesitates as you turn to her. You then look into your eyes and say, "The water is ready Jump in." You then motion her to come closer
 	<<actCLA 'See what she does'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<center><b><h4><font color=#ff0090><<"Katja [$Kat] Meynold">></font></h4></b></center>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/Katja2.jpg">>
 		Katja begins unbuttoning your shirt then drops it to the ground she then feels up your waist until she gets to your shirt. She then pulls it up over your head exposing your breasts. Katja slowly runs her fingers over your nipples then lightly grips them before pulling them gently up and letting them go, causing your breasts to bounce.
@@ -970,7 +970,7 @@
 	<</actCLA>>
 	<<if getvar("$VKWip") == 100>>
 		<<actCLA 'See what she does'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/bath.jpg">>
 			Katja nods then slowly approaches you walks up to you then begins kissing you gently 
 			<<actCLA ''>>

sugarcube/src/autogenerated/unsorted/NikoDates.tw

@@ -126,7 +126,7 @@
 				You slowly pull down your top, revealing your breasts as you stare Niko in his eyes, noticing his lustful gaze as you continue removing your clothes. You can feel your body tremble a little as Niko watches you with a bulge in his pants that continues to grow larger. You slowly start removing your pants, feeling your cheeks grow flushed.
 				<p>"You're doing really good, $pc.name_first. Please keep going," he says, which gives you the confidence to continue stripping.</p>
 				<<actCLA 'Finish undressing'>>
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 					<<run $pc.skillExperienceGain('inhibition',1)>>
 					<<arouse 'flash' 5 `['sub','exhibitionism']`>>
 					<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/1/nude/nude.jpg">>
@@ -413,7 +413,7 @@
 	<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/2/d4.jpg">>
 	You open your eyes to see Niko carrying you to his house, you are feeling very lightheaded as you almost fall to the ground. Niko catches you then begins carrying you up the stairs to his place before opening the door, carrying you inside.
 	<<actCLA 'Enter'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/2/Home/1.jpg">>
 		You can feel the room spinning as Niko carries you into his bedroom and drops you on the bed. You look around the room as you lose feeling in your legs. You can faintly feel your clothes being removed before you slowly look down to see Niko spreading your vaginal lips as he looks inside your pussy.
 		<<if $pc.pcs_vag == 0>>
@@ -658,7 +658,7 @@
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/3/home/home1.jpg">>
 		As soon as you enter the living room, Niko starts kissing your neck and pawing at your breasts before pushing you onto the couch as he removes your clothes. You lay back on the sofa, enjoying Niko caressing your body and passionately kissing you as he continues removing your clothes.
 		<<actCLA 'Return the kiss'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<arouse 'kiss' 5 >>
 			<<set $time.minutes -= 10>>
 			<<image "characters/pavlovsk/school/boy/niko/nikoev/dates/3/home/home2.jpg">>
@@ -859,7 +859,7 @@
 			"Don't get cold feet now. Take it all off," he whispers in your ear.
 			<<actCLA 'Continue stripping'>>
 				<<run $pc.skillExperienceGain('inhibition',2)>>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<arouse 'flash' 2 `['exhibitionism']`>>
 				<<image "characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg">>
 				You can feel your heart racing as you meekly nod and start fully undressing, not even checking if anyone is watching anymore as your hands tremble.
@@ -923,7 +923,7 @@
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/jewelry/collar.jpg">>
 		He pulls out a purple and black collar and dangles it in front of you. "You'll be wearing this today as we go for a stroll." You look at the collar while nervously biting your lip. Niko wraps his arm around your neck and takes you behind the school.
 		<<actCLA 'Continue'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<arouse 'flash' 5 `['exhibitionism']`>>
 			<<image "characters/pavlovsk/school/boy/niko/nikoev/school/exhibition/strip1.jpg">>
 			<p>When you reach the back of the school, Niko orders you to undress. You meekly nod your head and start removing your clothes until you're completely naked. "Why don't you crawl like a good pet while I put this collar on you?" You drop to your knees and start crawling.</p>
@@ -1114,7 +1114,7 @@
 		<p>You nervously bit your lip. "I guess we could try that. You'll cover me up if we get caught, right?"</p>
 		"Of course I will. I'll always keep you safe. You can trust me." He then leads you behind the school.
 		<<actCLA 'Continue'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<run $pc.skillExperienceGain('inhibition',1)>>
 			<<arouse 'flash' 5 `['exhibitionism']`>>
 			<<image "characters/pavlovsk/school/boy/niko/nikoev/school/exhibition/strip2.jpg">>

sugarcube/src/autogenerated/unsorted/NikoEv2.tw

@@ -103,7 +103,7 @@
 		Once you're fully undressed, Niko lifts you up and drops you onto the bed before he immediately pounces on top of you and starts passionately kissing you as he rubs his penis against your vagina.
 		<<arouse 'kiss' 5 >>
 		<<actCLA 'Spread your legs'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<set $time.minutes += 10>>
 			<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/vag.mp4">>
 			<p>You spread your legs and Niko immediately rams his penis inside you, causing a jolt of pleasure. You scream out as he starts pumping you firmly for a few seconds before wrapping his hand around your neck. "Who's your man?"</p>
@@ -384,7 +384,7 @@
 			<<actCLA 'Enter locker room'>>
 				<!-- Boy A159 -->
 				<<set $time.minutes += 5>>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<image "characters/shared/headshots_main/big159.jpg">>
 				<p>When you enter the locker room, you see Petia waiting for you. You immediately know what he wants and turn to Niko. "Do you want me to suck his dick again?"</p>
 				Niko looks at you with a surprised, but pleased look on his face. "You really seem to be getting into this, good, but no, he wants to fuck you this time. Don't worry, he'll pay a lot more this time. So take off your clothes." You obediently remove your clothes as Petia watches you undress while removing his pants and stroking his penis.
@@ -573,7 +573,7 @@
 									<p>Niko chuckles. "She's my girl and it will be 2000 <b>₽</b>, per customer."</p>
 									All of the truckers and bikers start lining up in front of Niko and giving him money before approaching you. They start undressing you as they roughly finger your holes. You close your eyes as one of the men pushes you down on your knees and another shoves his dick into your mouth.
 									<<actCLA 'Suck their dicks'>>
-										<<gs 'clothing' 'strip'>>
+										<<strip 'clothes'>>
 										<<run $pc.skillExperienceGain('inhibition',1)>>
 										<<image "characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/1.jpg">>
 										You start obediently sucking the man''s dick. You close your eyes and try to focus when the man suddenly groans and pulls out of your mouth before coversing your face in his cum. Another man quickly takes his place as the man behind you grabs your head and pulls it toward his dick which you immediately wrap your lips around, sucking eagerly as the men talk to each other.
@@ -739,7 +739,7 @@
 		<<video "characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4">>
 		As soon as you enter Niko''s house, he pulls you toward him and gives you another passionate kiss as he starts undressing you. When he finishes, he starts removing his clothes before pulling you to the bedroom and pushing you onto the bed.
 		<<actCLA 'Lay back'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<arouse 'cuni' 5 >>
 			<<video "characters/pavlovsk/school/boy/fedor/fedorev/home/cuni.mp4">>
 			Niko spreads your legs and starts firmly but gently licking your pussy. You lay back, enjoying Niko''s soft tongue on your clitoris before looking down at him. "Your tongue is so soft... Please keep doing that."

sugarcube/src/autogenerated/unsorted/NikoMeyHome.tw

@@ -330,7 +330,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bathroom_hornet'>>
 	<<set $VKHornet = 1>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/Wasp.jpg">>
 	<p>As soon as you open the door, a huge wasp darts past you and flies into the kitchen. A few seconds later, you hear $VK_VikName screaming. "Ahh a hornet. DIE HORNET!!!" She then comes sprinting out of the kitchen with a rolling pin and starts swatting at the fleeing hornet. You can't help but giggle as you watch the whole ordeal. You shake your head before walking into the bathroom.</p>
 	<<actCLA 'Continue'>>
@@ -902,7 +902,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'bath'>>
 	<<set $time.minutes += 20>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<image "shared/home/bathroom/wash4.jpg">>
 	You turn the water on and watch as the bathtub slowly fills. You look around the room, feeling rather lonely but nevertheless you wait for the tub to fill before carefully climbing into it and relaxing as the warm water soothes you aching body. After a few minutes, you begin slowly scrubbing yourself until you finally feel clean. You then rest for a few more seconds before you get up, dry yourself off and get dressed.
 	<<actCLA 'Continue'>>
@@ -914,7 +914,7 @@
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/Katja2.jpg">>
 	<p>You turn around and see Katja staring at you. You freeze in place as she walks up to you and looks into your eyes. "Let's get you cleaned up, $pc.name_nick."</p>
 	<<actCLA 'Meekly nod'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/katja.jpg">>
 		Katja unbuttons your shirt and pulls it up over your head, exposing your breasts. She then slowly runs her fingers over your nipples and lightly squeezes them before pulling them gently up and letting them go, causing your breasts to bounce.
 		Her hands then reach downward as she slowly slides her thumbs down the waistband of your panties and pulls them all the way down before she kneels down to remove your socks. Once you're fully naked, Katja looks you over and slowly runs her finger over your pussy. She slides her finger in until she sees you flinch from the soreness you feel.
@@ -956,7 +956,7 @@
 	<<image "characters/pavlovsk/school/girl/natalia/love/bedroom/hold.jpg">>
 	<p></p>
 	<<actCLA ''>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<set $time.minutes += 5>>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/bath.jpg">>
 		<p></p>
@@ -985,7 +985,7 @@
 	<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/katja.jpg">>
 	You turn around and see Katja staring at you. She reaches out for you, but hesitates as you turn to her. You look into your eyes. "The water is ready. Jump in." You motion her to come closer.
 	<<actCLA 'See what she does'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/Katja2.jpg">>
 		Katja starts unbuttoning your shirt and pulls it up over your head, exposing your breasts. She then slowly runs her fingers over your nipples and lightly squeezes them before pulling them gently up and letting them go, causing your breasts to bounce.
 		Her hands then reach downward as she slowly slides her thumbs down the waist of your panties and pulls them all the way down before she kneels down to remove your socks. Once you're fully naked, Katja looks you over and slowly runs her finger over your pussy. She slides her finger in until she sees you flinch from the soreness you feel.
@@ -1026,7 +1026,7 @@
 	<</actCLA>>
 	<<if getvar("$VKWip") == 100>>
 		<<actCLA 'See what she does'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<image "characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/bath.jpg">>
 			Katja nods, slowly approaches you and begins kissing you gently.
 			<<actCLA ''>>

sugarcube/src/autogenerated/unsorted/NikoPayback.tw

@@ -258,7 +258,7 @@
 	<<set $NikoPayback_Sex = $time.daystart>>
 	<<set $VK = rand(1,6)>>
 	<!-- Boy A189 -->
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<set $time.minutes += 5>>
 	<<image `'characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg'`>>
 	<p>Niko roughly pushes you into the restroom. "Where were you heading off to in such a hurry?" You take a second to think of an excuse when he quickly storms up to you. "You were trying to fucking avoid me, you stupid bitch!" he snarls before slapping you. He then starts ripping your clothes off.</p>

sugarcube/src/autogenerated/unsorted/NikoSlut.tw

@@ -295,7 +295,7 @@
 	Niko nods. "Sure thing, let''s have the money first."
 	The trucker gives Niko the money before leading you to the restroom.
 	<<actCLA 'Enter restroom'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<set $time.minutes += 5>>
 		<<image "characters/pavlovsk/school/boy/niko/nikoev2/diner/3/Undress#.jpg" 1 2>>
 		As soon as you enter the restroom, the man starts kissing your chest as he undresses you. You let him undress you as he runs his hands over your body, gently rubbing and squeezing your breasts and buttocks. After a few seconds, you're completely naked as the man takes off his pants while staring at your nude body before he approaches you and starts rubbing your pussy.
@@ -397,7 +397,7 @@
 	"Sure thing," Niko responds. "But I'll be keeping an eye on things."
 	"Well you better not be keeping an eye on my dick, or we're gonna have a problem," the biker responds and they both laugh as the man pays Niko before taking you to the back of the diner while Niko follows.
 	<<actCLA 'Follow the man'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<image "characters/pavlovsk/school/boy/niko/nikoev2/diner/4/Undress#.jpg" 1 2>>
 		As soon as you get outside the diner, the man takes a deep breath. "Nothing like getting some fresh air while fucking a cute little thing like yourself. Now take off your clothes."
 		You obediently nod and remove your clothes as the man pulls down his pants and starts stroking his cock as he watches you undress.

sugarcube/src/autogenerated/unsorted/NikoWhore.tw

@@ -11,7 +11,7 @@
 		<<image "characters/pavlovsk/school/boy/niko/nikoev/jewelry/cuffs.jpg">>
 		You reassure yourself as you see Niko take out the collar you wore the other day and place it around your neck, followed by a pair of matching leather cuffs which he places around your wrists. You can feel your heart racing even faster.
 		<<actCLA 'Continue'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<set $time.minutes -= 3>>
 			<<set $NikoDate_Day = $time.daystart>>
 			<<video "characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker1.mp4">>
@@ -759,7 +759,7 @@
 				<p>You arrive at the restroom and Roman pulls you up to a mirror and stands behind you. "You were amazing yesterday and I can't stop thinking about your hot body and cute face. I want another round! Don't worry, I'll be gentle."</p>
 				<<actCLA 'Continue'>>
 					<!-- Boy A154 -->
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 					<<arouse 'foreplay' 5 `['sub']`>>
 					<<arousalEnd>>
 					<<image "characters/pavlovsk/school/boy/niko/nikoev/school/restroom/1.jpg">>

sugarcube/src/autogenerated/unsorted/costuming.tw

@@ -69,7 +69,7 @@
 			<<set $pc.pcs_makeup = $acting['scene_makeup']>>
 			<<set $pc.pcs_lipbalm += 8>>
 			<<gs 'costuming' 'backup_clothes'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<gs 'underwear' 'remove'>>
 			<<setinit $acting['came_from_makeup'] = 1>>
 			<<image "locations/city/industrial/studio/costuming/back_tattoo.jpg">>
@@ -150,7 +150,7 @@
 	<</if>>
 	<<image "locations/city/industrial/studio/costuming/costuming.jpg">>
 	<<if $costuming['outfit'] == 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 		<<set $time.minutes += 2>>
 		<<set $robe = 1>>

sugarcube/src/autogenerated/unsorted/dimaHome.tw

@@ -1187,7 +1187,7 @@
 <</if>>
 <<if $location_var[$here][0] == 'dimka_knees'>>
 	<<set $menu_off = 1>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<h2>Dimka''s Room</h2>
 	<<image "characters/pavlovsk/school/boy/dimka/sex/home/kiss2.jpg">>
 	<<if $wardrobe.pantyworntype != 'none'>>

sugarcube/src/autogenerated/unsorted/events.tw

@@ -63,7 +63,7 @@
 		<<gt 'pav_train_hall' 'female'>>
 	<</if>>
 	<<if getvar("$snkz") == 6>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<set $time.minutes += 120>>
 		<<gt 'pav_lake'>>
 	<</if>>

sugarcube/src/autogenerated/unsorted/foto.tw

@@ -88,7 +88,7 @@
 		<<if getvar("$studio_strip_talk") < 3>>
 			<<actCLA 'Just strip to your panties'>>
 				<<if $wardrobe.clothingworntype != 'nude'>>
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 
 				<</if>>
 				<<setinit $lastwornpantytype['foto'] = $wardrobe.pantyworntype>>
@@ -121,7 +121,7 @@
 		<<if getvar("$studio_strip_talk") < 2 and ($wardrobe.braworntype != 'none' or getvar("$underwear['type']") == 2)>>
 			<<actCLA 'Just strip to your underwear'>>
 				<<if $wardrobe.clothingworntype != 'nude'>>
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 
 				<</if>>
 				<<if getvar("$underwear['type']") == 2>>

sugarcube/src/autogenerated/unsorted/foto_events.tw

@@ -1910,7 +1910,7 @@
 					You do the works at your makeup station throw your clothes on and jump in the car which immediately speeds off to the lake.
 					<<actCLA 'Continue'>>
 						<<set $time.minutes += 30>>
-						<<gs 'clothing' 'strip'>>
+						<<strip 'clothes'>>
 						While the crew sets up, you strip back down and trade your panties out for a bikini bottom before waiting on the crew to start.
 						<<actCLA 'Start the shoot'>>
 							<<set $time.minutes += 180>>

sugarcube/src/autogenerated/unsorted/hookup.tw

@@ -23,7 +23,7 @@
 	<<setinit $lastwornbranumber['hookup'] = $wardrobe.brawornnumber>>
 	<<setinit $lastwornclothingtype['hookup'] = $wardrobe.clothingworntype>>
 	<<setinit $lastwornclothingnumber['hookup'] = $wardrobe.clothingwornnumber>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<gs 'underwear' 'remove'>>
 	<<set $time.minutes += 5>>
 	<<arouse 'foreplay' 2 >>

sugarcube/src/autogenerated/unsorted/hookup_female.tw

@@ -20,7 +20,7 @@
 			<<set $orgasm_or = 'no'>>
 			<<arouse 'clit_finger' 5 >>
 			<<actCLA 'Your legs are getting weak'>>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<gs 'underwear' 'remove'>>
 				<<image "shared/romance/lovers/hookups/gf/gf4.jpg">>
 				Growing a bit tired, she starts to pull you by the hand through the living room towards her bedroom.

sugarcube/src/autogenerated/unsorted/hotel_anna_gear.tw

@@ -29,7 +29,7 @@
 <<if $location_var[$here][0] == 'toys_paddle_options'>>
 	<<if $pc.pcs_inhib >= 30>>
 		<<actCLA 'Disrobe and try the paddle'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<gs 'underwear' 'remove'>>
 			<<setinit $AnnaQW['sub'] += 2>>
 			<<setinit $AnnaQW['trust'] += 1>>

sugarcube/src/autogenerated/unsorted/marisha_ev.tw

@@ -117,7 +117,7 @@
 			<<image `'characters/pavlovsk/resident/marisha/marisha.jpg'`>>
 			<p>You quickly gesture him to leave which he quickly does before you head back to your room and patiently wait for Marisha to finish showering. After a few minutes, Marisha comes back and sits on the bed next to you before saying, "Thank you for helping me out $pc.name_first. I really appreciate it." You place your hand on her shoulder then say, "No need to thank me. You can stay the night if you want." She nods and says, "That sounds great." You both then spend the night chatting about various topics.</p>
 			<<actCLA 'Go to sleep'>>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<set $loc = 'bedrPar'>>
 				<<set $loc_arg = 'start'>>
 				<<setinit $MarishaQW["marisha_sleepover"] = 1>>
@@ -129,7 +129,7 @@
 			<<image `'characters/pavlovsk/resident/marisha/marisha.jpg'`>>
 			<p>You ignore him and he continues to spy on her as you wait patiently in your room. After a few minutes, Marisha comes back and sits on the bed next to you before saying, "Thank you for helping me out $pc.name_first. I really appreciate it." You place your hand on her shoulder then say, "No need to thank me. You can stay the night if you want." She nods and says, "That sounds great." You both then spend the night chatting about various topics.</p>
 			<<actCLA 'Go to sleep'>>
-				<<gs 'clothing' 'strip'>>
+				<<strip 'clothes'>>
 				<<set $loc = 'bedrPar'>>
 				<<set $loc_arg = 'start'>>
 				<<setinit $MarishaQW["marisha_sleepover"] = 1>>

sugarcube/src/autogenerated/unsorted/placer_sex.tw

@@ -1778,7 +1778,7 @@
 						<<set $cumprecheck = 1>> <<gs 'cum_manage'>>
 						<<set $rape += 1>>
 						<<set $guy += 1>>
-						<<gs 'clothing' 'strip'>>
+						<<strip 'clothes'>>
 						<<gs 'underwear' 'remove'>>
 						<<image "locations/shared/park/sex/bench/sleeping_parc_alco1_6.jpg">>
 						<<if $pc.thinksIsVirgin>>

sugarcube/src/autogenerated/unsorted/sex.tw

@@ -1,4 +1,4 @@
-:: sex
+:: sex_old[deprecated]
 <<set $here = 'sex'>>
 <<set $ARGS = $location_var[$here]>>
 <<if $location_var[$here][0] == 'start'>>

sugarcube/src/autogenerated/unsorted/sex_ev_foreplay.tw

@@ -3,29 +3,21 @@
 <<set $ARGS = $location_var[$here]>>
 <!-- !! ------------------------- Generic Sex Event Foreplay ------------------------->
 <<if $location_var[$here][0] == 'undress'>>
-	<<if getvar("$CloDress") == 1>>
+	/*<<if getvar("$CloDress") == 1>>
 		<<setinit $sex_ev['CloDress'] = 1>>
 
-	<</if>>
-	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
-
-	<</if>>
-	<<if $wardrobe.braworntype != 'none'>>
-		<<gs 'bras' 'remove'>>
-
-	<</if>>
-	<<if $wardrobe.pantyworntype != 'none'>>
-		<<gs 'panties' 'remove'>>
-
-	<</if>>
-	<<arouse 'foreplay' 2 >>
+	<</if>>*/
+	<<strip 'clothes'>>
+	<<strip 'bra'>>
+	<<strip 'panties'>>
+	/*<<arouse 'foreplay' 2 >>
 	<<arouse 'foreplay_give' -2 >>
 	<<video "shared/sex/misc/undress1.mp4">>
 	<!-- !! initiative call-->
 	You tear each other''s clothes off, leaving a trail of discarded fabrics leading to the bed.
-	<<gs 'sex_ev_foreplay' 'bed_start'>>
+	<<gs 'sex_ev_foreplay' 'bed_start'>>*/
 <</if>>
+:: asdasdasd
 <<if $location_var[$here][0] == 'bed_start'>>
 	<<setinit $sex_ev['start_time'] = $totminut>>
 	<!-- !! $sex_ev['bed_room']-->

sugarcube/src/autogenerated/unsorted/sex_ev_hookup_leave.tw

@@ -100,15 +100,15 @@
 			"... I guess I could..." you relent, dropping the clothes you were holding.
 			<<actCLA 'Undress and get into bed with him'>>
 				<<if $wardrobe.clothingworntype != 'nude'>>
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 
 				<</if>>
 				<<if $wardrobe.braworntype != 'none'>>
-					<<gs 'bras' 'remove'>>
+					<<strip 'bra'>>
 
 				<</if>>
 				<<if $wardrobe.pantyworntype != 'none'>>
-					<<gs 'panties' 'remove'>>
+					<<strip 'panties'>>
 
 				<</if>>
 				<<image "shared/sex/after/cuddle1.jpg">>

sugarcube/src/autogenerated/unsorted/sex_ev_start.tw

@@ -538,15 +538,15 @@
 
 	<</if>>
 	<<if $wardrobe.clothingworntype != 'nude'>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 
 	<</if>>
 	<<if $wardrobe.braworntype != 'none'>>
-		<<gs 'bras' 'remove'>>
+		<<strip 'bra'>>
 
 	<</if>>
 	<<if $wardrobe.pantyworntype != 'none'>>
-		<<gs 'panties' 'remove'>>
+		<<strip 'panties'>>
 
 	<</if>>
 <</if>>

sugarcube/src/autogenerated/unsorted/shortgs.tw

@@ -103,7 +103,7 @@
 <!-- !! use gs 'shortgs','undress'-->
 <<if $location_var[$here][0] == 'undress'>>
 	<<gs 'underwear' 'remove'>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 <</if>>
 <!-- !! reverse procedure, it can be modified for lose or stolen panties later.-->
 <!-- !! use gs 'shortgs','dress'-->

sugarcube/src/autogenerated/unsorted/stwork2.tw

@@ -179,7 +179,7 @@
 			<<set $i[1] = 'them'>>
 		<</if>>
 		<<actCLA 'Take off your $i'>>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<image "locations/city/redlight/stripclub/stripclo#.jpg" 6 7>>
 			<<if getvar("$custboo") == 0>>
 				<<set $pc.mood += 5>>

sugarcube/src/locations/city/city_sauna.tw

@@ -203,7 +203,7 @@
 				<<setinit $lastwornbratype['bed'] = $wardrobe.braworntype>>
 				<<setinit $lastwornbranumber['bed'] = $wardrobe.brawornnumber>>
 				<<if $wardrobe.clothingworntype != 'nude'>>
-					<<gs 'clothing' 'strip'>>
+					<<strip 'clothes'>>
 
 				<</if>>
 				<<gt 'sleep' 'succhoice'>>
@@ -232,7 +232,7 @@
 						<</if>>
 					<</if>>
 					<<if $wardrobe.clothingworntype != 'nude'>>
-						<<gs 'clothing' 'strip'>>
+						<<strip 'clothes'>>
 
 					<</if>>
 					<<if getvar("$magf2bdo") == 2>>

sugarcube/src/locations/gadukino/gadbana.tw

@@ -88,7 +88,7 @@ Grandma''s enema bulb is hidden behind some stuff on the shelf.
 					<<set $pc.pcs_hairbsh = 0>>
 					<<set $pc.pcs_makeup = 1>>
 					<<if $wardrobe.clothingworntype != 'nude'>>
-						<<gs 'clothing' 'strip'>>
+						<<strip 'clothes'>>
 
 					<</if>>
 					<<if $wardrobe.pantyworntype != 'none' and $wardrobe.braworntype != 'none'>>
@@ -157,7 +157,7 @@ Grandma''s enema bulb is hidden behind some stuff on the shelf.
 		<<actCLA 'Remove clothes'>>
 			<<set $time.minutes += 1>>
 			<!-- !!gs 'clothing', 'strip', 'gadbana'-->
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<gt 'gadbana'>>
 		<</actCLA>>
 	<</if>>

sugarcube/src/locations/generic/bathroom/bathroom.tw

@@ -1475,7 +1475,7 @@ You wash off your makeup.
 			<<set $time.minutes += 5>>
 			<<video "pc/items/accessories/computer/webcam/undress1.mp4">>
 			You remove your clothing.
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 
 			<<actCLA 'Return'>>
 				<<set $menu_off = 0>> <<gt $location>>

sugarcube/src/locations/pavlov/lake/pav_lake_nude_events.tw

@@ -11,7 +11,7 @@
 		The girl wraps her hand around the shaft of his engorged cock and slowly begins stroking it as she sucks and licks the head, never breaking eye contact. The man''s abs visibly tighten as he moans in pleasure. You find yourself enthralled and unable to look away as a heat begins to build between your legs.
 		<<arouse 'voyeur_sex' 2 >>
 		<<actCLA 'Further'>>
-			 			<<gs 'clothing' 'strip'>>
+			 			<<strip 'clothes'>>
 			<<image "locations/pavlovsk/lake/secluded_beach/voyeurism/voyeurism_start_event_2.jpg">>
 			Leaving your clothes lying in the sand, you move a little closer to the couple, pretending that you're just walking on the beach. You watch the girl push the man''s legs further apart, allowing her to dip her head down and take one ball into her mouth, then the other. Once she returns to his throbbing cock, she opens her mouth and takes it in further than before, swallowing almost all of the impressivly sized cock.
 			<<arouse 'voyeur_sex' 2 >>

sugarcube/src/locations/pavlov/residential/pav_complex.tw

@@ -298,7 +298,7 @@
 							<<actCLA 'Strip down to your panties'>>
 								<<set $time.minutes += 3>>
 								<<run $npcs.inc('A158','rel',1)>>
-								<<gs 'clothing' 'strip'>>
+								<<strip 'clothes'>>
 								<<run $wardrobe.strip('bra')>>
 								<<arouse 'foreplay' 5 `['exhibitionism']`>>
 								<<image "locations/pavlovsk/resident/apartment/garage/val/val1.jpg">>

sugarcube/src/locations/stores/shop_fashionista.tw

@@ -26,7 +26,7 @@
 	/*<<if $wardrobe.pantyworntype != 'none'>>
 		<<actCLA 'Enter changing room (strip to underwear)'>>
 			<<image "locations/city/citycenter/mall/fashionista/underwear.jpg">>
-			<<gs 'clothing' 'strip'>>
+			<<strip 'clothes'>>
 			<<set $changingroom_underwear = 1>>
 			<<gs 'shop_fashionista' 'changingroom' 1>>
 		<</actCLA>>

sugarcube/src/macros/0macros.twee-config.json

@@ -344,6 +344,12 @@
 				]
 			},
 			"wardrobeFiltersReset":{},
+			"strip":{
+				"description":"Removes one layer of clothing from the PC: 'bra','clothes','coat','panties' or 'shoes'",
+				"parameters":[
+					"text"
+				]
+			},
 			"arouse":{
 				"description":"Increases the arouseal of the PC\n\nP1: Act (string, as defined in ```setup.arousal```)\n\nP2: Duration (int, minutes the arousal lasts, negative numbers don't add this time to ```$time```)\n\nP3: Fetishes (array of string)\n\nP4: NPCID (optional string)\n\nP5: Flags",
 				"parameters":[

sugarcube/src/npcs/katja/katja_sex.tw

@@ -555,7 +555,7 @@
 	<p>"So girls, how do we begin?"</p>
 	The girls strip slower than you, and you can see Katja ogling a blushing (but not embarrassed) Natasha. They then jumps on the bed and looks at you expectantly.
 	<<gs 'underwear' 'backup'>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<actCLA 'Katja'>>
 		<<set $menu_off = 1>>
 		<<arouse 'cuni_give' 10 >>

sugarcube/src/npcs/martin/MartinSex.tw

@@ -383,7 +383,7 @@
 	<p>Martin is utterly perplexed by that. "$pc.name_first, what are you-"</p>
 	"Oops, I seem to have accidentally pulled my panties down," you say innocently, giving him a broad smile.
 	<p>Most of your crotch is revealed to him, but your ' + iif(tatvag>0,'tattooed ',') + 'pussy is only vaguely perceptible. Still, you can already tell that the situation is entirely different from how it was a minute ago - the suave barkeeper is on the defensive. And you are just getting started...</p>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<arouse 'foreplay' 1 `['exhibitionism']`>>
 	<<actCLA 'Turn around'>>
 		<<image "locations/city/industrial/bar/sex/bar/martin/tease/tease2.jpg">>
@@ -447,7 +447,7 @@
 		<p>Feeling ready to burn whatever bridge there's left behind you, you face Martin, revealing your $pc_desc['pubes'] $pcdesc_genitals to him. He seems shocked by your boldness; not just by you stripping for him, right here in the empty bar - although that must be a big part of it - but also by the fact that you had been walking around commando like there was nothing to it.</p>
 		<p>"Like what you see?"</p>
 		<p>You don't know if he was even physically capable of saying no, given that he just barely managed to croak a "yes" - still, it was nice that he was being honest with you and himself.</p>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<arouse 'foreplay' 1 `['exhibitionism']`>>
 		<<actCLA 'Then he's gonna like what's next'>>
 			<<image "locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg">>
@@ -515,7 +515,7 @@
 	<p>You then take a few steps back and slowly bend forward, giving him a generous look at your $pc_desc['breast'] cleavage and $pc_desc['legs'] legs as you take off your lower garment.</p>
 	Martin certainly looks like he likes where this is going, and you have no intention of changing course.
 	Without much ado, you smile and pull down your panties as well. Most of your crotch is revealed to him, but your sex is only vaguely perceptible. But taking the initiative like this is fun, and it adds to the thrill to know that you're standing in the middle of a bar, even if nobody''s gonna enter.
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<arouse 'foreplay' 1 `['exhibitionism']`>>
 	<<actCLA 'Turn around'>>
 		<<image "locations/city/industrial/bar/sex/bar/martin/tease/tease2.jpg">>
@@ -630,7 +630,7 @@
 		<p>You slowly turn to face Martin, revealing your $pc_desc['pubes'] $pcdesc_genitals to him. Your boldness to strip for him, right here in the empty bar, and to walk around without underwear seem to turn him on immensely, if the bulge in his pants is any indication.</p>
 		<p>"Like what you see?" You ask, taking another small sip of wine.</p>
 		<p>"You little minx", is all he says, sounding as incredulous as he does admiring - not to mention horny.</p>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<arouse 'foreplay' 1 `['exhibitionism']`>>
 		<<actCLA 'He's gonna like what's next'>>
 			<<image "locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg">>

sugarcube/src/npcs/school/Zvereva/Zvereva_Sly_events.tw

@@ -144,7 +144,7 @@
 	<<set $pursepantynumber = $wardrobe.pantywornnumber>>
 	<<set $pursebratype = $wardrobe.braworntype>>
 	<<set $pursebranumber = $wardrobe.brawornnumber>>
-	<<gs 'clothing' 'strip'>>
+	<<strip 'clothes'>>
 	<<gs 'underwear' 'remove'>>
 	<<if $q.christina?.get('fight') == -1>>
 		<<actCLA 'Angrily start stroking it'>>

sugarcube/src/npcs/school/Zvereva/Zvereva_Sly_sex.tw

@@ -26,7 +26,7 @@
 		<<set $pursepantynumber = $wardrobe.pantywornnumber>>
 		<<set $pursebratype = $wardrobe.braworntype>>
 		<<set $pursebranumber = $wardrobe.brawornnumber>>
-		<<gs 'clothing' 'strip'>>
+		<<strip 'clothes'>>
 		<<gs 'underwear' 'remove'>>
 		<<if $slyQW['Chris_peek_daystart'] != $time.daystart>>
 			<<setinit $slyQW['Chris_peek_daystart'] = $time.daystart>>

sugarcube/src/style/table.css

@@ -5,6 +5,22 @@
     grid-gap: 0.5em;
 }
 
+.table > .explanation{
+	grid-column: 1/-1;
+	font-style: italic;
+}
+
+.table > p{
+	margin: 0;
+}
+
+.table>ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	margin: 0;
+}
+
 .table > h3{
     grid-column: 1/-1;
     text-align: center;

sugarcube/src/wardrobe/wardrobeWidgets.tw

@@ -0,0 +1,8 @@
+:: wardrobeWidgets[widget]
+<<widget 'strip'>>
+    <<set _supportedArguments = ['bra','clothes','coat','panties','shoes']>>
+    <<if !_supportedArguments.includes(_args[0])>>
+        <p class="error">Unsupported argument in widget strip. Supported arguments: <<=_supportedArguments.join(',')>></p>
+    <</if>>
+    <<run $wardrobe.strip('clothes')>>
+<</widget>>