diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index a6015b2cc1361e0d78812fff919c1da121fec500..00840bf7eb9d6a704e30a259fc9900d3c865e839 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -190,6 +190,8 @@ module.exports = {
rules: {
"object-shorthand": ["error", "always"],
+ "es-x/no-object-hasown": "off",
+
// SugarCube extends native objects and we follow it
"no-extend-native": "off",
diff --git a/game/base-combat/effects.twee b/game/base-combat/effects.twee
index 1e23ab6420315c4c8d2cc060b62db46548d7335e..5ac4c9d964f51a9a344d398df2b20aebc180a6b3 100644
--- a/game/base-combat/effects.twee
+++ b/game/base-combat/effects.twee
@@ -6105,7 +6105,7 @@
You spread your thighs, but just receive a slap. "Settle down, <<bitch>>."
<<violence 2>><<hitstat>><<bruise bottom>>
<<elseif ["penisentrance", "penisimminent"].includes($NPCList[$penistarget].penis)>>
- <<set $penisaction to 0>><<meek 10 $penistarget>><<penileskill>><<set $penisactiondefault to "penispussy">>
+ <<set $penisaction to 0>><<meek 10 $penistarget>><<penileskilluse>><<set $penisactiondefault to "penispussy">>
<<if combatSkillCheck("vaginal", $penistarget)>>
<<personselect $penistarget>>
<<submission 2>><<set $vaginause to "penis">><<set $NPCList[$penistarget].penis to "vaginaentrance">><<set $penisuse to 0>>
diff --git a/game/base-system/widgets.twee b/game/base-system/widgets.twee
index 5a2c0a622eeefed77bc413d1a8305d934d7ad69d..ac189758f1097537dcc39026bd6956ce69d3e906 100644
--- a/game/base-system/widgets.twee
+++ b/game/base-system/widgets.twee
@@ -341,7 +341,7 @@
<<set _possessMod to 1>>
<</if>>
<<set $stress += (_violence * _drunkMod * _stressMod) * (1 - ($masochism / 1200))>>
- <<combattrauma _violence * _traumaMod>>
+ <<combattrauma `_violence * _traumaMod`>>
<<set $pain += (_violence * _painMod * (1 - ($masochism / 1200)) * (1 - ($sciencetrait / 10)) / _possessMod)>>
<<set _arousal to (_violence * (0 + ($masochism / 18)))>>
<<arousal _arousal/_possessMod "maso">>
@@ -385,7 +385,7 @@
<<set _drunkMod to 10>>
<</if>>
<<set $stress += (_violence * _drunkMod * _stressMod) * (1 - ($masochism / 1200))>>
- <<trauma _violence * _traumaMod>>
+ <<trauma `_violence * _traumaMod`>>
<<set $pain += (_violence * _painMod * (1 - ($masochism / 1200)) * (1 - ($sciencetrait / 10)))>>
<<set _arousal to (_violence * _arousalMod * (0 + ($masochism / 18)))>>
<<arousal _arousal "maso">>
diff --git a/game/overworld-forest/loc-asylum/main.twee b/game/overworld-forest/loc-asylum/main.twee
index c55fdf4318e3bca4e0b24f40db7a3487ef7321f0..1b150456b9c23c8d93c33592c2a9e7d494699f9b 100644
--- a/game/overworld-forest/loc-asylum/main.twee
+++ b/game/overworld-forest/loc-asylum/main.twee
@@ -192,11 +192,11 @@
<br>
<<if Time.weekDay is 1 and $daily.massAttended isnot 1>>
<<if $fallenangel gte 2>>
- <<link [[Pray (1:00)|Asylum Pray Fallen Angel]]>><<purity 63>><<pass 60>><<stress 10>><<set $daily.massAttended to 1>><</link>><<gggpurity>><<stress>>
+ <<link [[Pray (1:00)|Asylum Pray Fallen Angel]]>><<purity 63>><<pass 60>><<stress 10>><<set $daily.massAttended to 1>><</link>><<gggpurity>><<gstress>>
<<elseif $angel gte 6>>
<<link [[Pray (1:00)|Asylum Pray Angel]]>><<purity 10>><<pass 60>><<stress -10>><<set $daily.massAttended to 1>><</link>><<gpurity>><<lstress>>
<<elseif $demon gte 6>>
- <<link [[Reflect (1:00)|Asylum Pray Demon]]>><<purity -10>><<pass 60>><<stress 10>><<set $daily.massAttended to 1>><</link>><<lpurity>><<stress>>
+ <<link [[Reflect (1:00)|Asylum Pray Demon]]>><<purity -10>><<pass 60>><<stress 10>><<set $daily.massAttended to 1>><</link>><<lpurity>><<gstress>>
<<else>>
<<link [[Pray (1:00)|Asylum Pray]]>><<purity 10>><<pass 60>><<stress -10>><<set $daily.massAttended to 1>><</link>><<gpurity>><<lstress>>
<</if>>
diff --git a/game/overworld-plains/loc-estate/cards.twee b/game/overworld-plains/loc-estate/cards.twee
index ced00b0e0f28f57b5dcdaff051f508a7486d1c08..8f3c8c024f16f9f82f125831b610296ff68eee97 100644
--- a/game/overworld-plains/loc-estate/cards.twee
+++ b/game/overworld-plains/loc-estate/cards.twee
@@ -2223,7 +2223,7 @@ You drop to your knees, and crawl beneath the table. They're already beginning a
<<rng>>
<<if $rng gte 86 - ($estate.cards.rim || 0) * 10 and $analingusdisablegiving is "f">>
- <<He>> puts a foot up on his chair, <<npcUndressText $NPCList[$estate.cards.oral - 1] "lower" "self">>, and reclines directing you to <<his>> asshole.
+ <<He>> puts a foot up on his chair, <<npcUndressText $NPCList[$estate.cards.oral-1] "lower" "self">>, and reclines directing you to <<his>> asshole.
<br><br>
Wren said you had to use your mouth.
diff --git a/game/overworld-town/loc-brothel/main.twee b/game/overworld-town/loc-brothel/main.twee
index 9b3b4f5bb177c454607d237a5ee092bf01d012c0..e026577bd443ba464d35504669aa073f9dd33724 100644
--- a/game/overworld-town/loc-brothel/main.twee
+++ b/game/overworld-town/loc-brothel/main.twee
@@ -2794,7 +2794,7 @@ The <<person1>><<person>> grabs you by the chin and lifts your head to get a goo
You meet <<his>> gaze head on. Your determination seems to unsettle <<him>>.
<br><br>
- "I had a lot of fun," <<he>> says, avoiding your look. "Thank you."<<llstress>><<stress - 12>>
+ "I had a lot of fun," <<he>> says, avoiding your look. "Thank you."<<llstress>><<stress -12>>
<br><br>
<<He>> turns and leaves the room.
diff --git a/game/overworld-town/loc-flats/events.twee b/game/overworld-town/loc-flats/events.twee
index ca92ded37ede1374699a77117d951b57c2f7097c..3d23277efdaf0e556122ddcdb8851e9679a18a97 100644
--- a/game/overworld-town/loc-flats/events.twee
+++ b/game/overworld-town/loc-flats/events.twee
@@ -147,7 +147,7 @@ You scream for help. The <<person>> shoves you against the wall. "Expecting copp
<<effects>>
<<if $physiqueSuccess>>
- You smack the <<person>>'s face. <span class="green"><<He>> recoils from the blow,</span> trips, and tumbles down the stairs.<<ltrauma>><<trauma>>
+ You smack the <<person>>'s face. <span class="green"><<He>> recoils from the blow,</span> trips, and tumbles down the stairs.<<ltrauma>><<trauma -6>>
<br><br>
<<He>> staggers to <<his>> feet, and limps away.
@@ -167,7 +167,7 @@ You scream for help. The <<person>> shoves you against the wall. "Expecting copp
<<effects>>
<<if $physiqueSuccess>>
- You stomp on the <<person>>'s foot. <span class="green"><<He>> releases you with a cry,</span> trips, and tumbles down the stairs.<<ltrauma>><<trauma>>
+ You stomp on the <<person>>'s foot. <span class="green"><<He>> releases you with a cry,</span> trips, and tumbles down the stairs.<<ltrauma>><<trauma -6>>
<br><br>
<<He>> staggers to <<his>> feet, and limps away.
diff --git a/game/overworld-town/loc-flats/exhibitionism.twee b/game/overworld-town/loc-flats/exhibitionism.twee
index 24a0b0a935b32cc738389d076cbef0fd37d235cc..c7f4d5a714d803de7baa85815d77f74561c3e249 100644
--- a/game/overworld-town/loc-flats/exhibitionism.twee
+++ b/game/overworld-town/loc-flats/exhibitionism.twee
@@ -37,7 +37,7 @@ The <<person3>><<person>> and <<person4>><<person>> arrive, and the four stand g
<<link [[Struggle|Flats Exposed Struggle]]>><</link>><<physiquedifficulty 1 16000>>
<br>
-<<link [[Endure|Flats Exposed Endure]]>><<trauma 6>><<stress>><</link>><<gtrauma>><<gstress>>
+<<link [[Endure|Flats Exposed Endure]]>><<trauma 6>><<stress 6>><</link>><<gtrauma>><<gstress>>
<br>
<<if $submissive gte 1500>>
<<link [[Beg|Flats Exposed Beg]]>><</link>><<submissivetext>>
diff --git a/game/overworld-town/loc-flats/hookah.twee b/game/overworld-town/loc-flats/hookah.twee
index 2cc3d39812d0d0fa3dcdc9be8040ad51dde8de0a..9e12cfdea3f525691c95e04ccd38d328f2afb817 100644
--- a/game/overworld-town/loc-flats/hookah.twee
+++ b/game/overworld-town/loc-flats/hookah.twee
@@ -894,7 +894,7 @@ The tentacles retreat, disappearing into the bathroom, and down the drains.
<<person1>>
<<set $rng to random(1, 5)>>
<<if $rng is 5>>
- The <<person>> fidgets incessantly. You shift the hookah away from <<him>>. You're afraid <<he>>'ll shatter it otherwise.<<gstress>><<stress>>
+ The <<person>> fidgets incessantly. You shift the hookah away from <<him>>. You're afraid <<he>>'ll shatter it otherwise.<<gstress>><<stress 6>>
<br><br>
<<elseif $rng is 4>>
The <<person>> releases an unholy wail. You cover your ears. It doesn't last long, at least.<<gstress>><<stress 6>>
diff --git a/game/overworld-town/loc-home/events.twee b/game/overworld-town/loc-home/events.twee
index 20c2efef12029b7ad85d2f5c955c48cdd4b27636..1fcd1f3cc53ba446fc893cc3199cb81182e86cef 100644
--- a/game/overworld-town/loc-home/events.twee
+++ b/game/overworld-town/loc-home/events.twee
@@ -1133,7 +1133,7 @@ You ask the <<person>> to sit down until you can replace <<his>> bandages. A def
<<switch random(1,3)>>
<<case 1>>
<<set $instrument to "violin">>
- <<He>> plays a well-kept violin with a sturdy bow and a tranquil expression. It comes through in <<his>> music. You briefly forget about Bailey's looming debt threat. Maybe one day you can be free of it too.<<lstress>><<ltrauma>><<stress - 6>><<trauma -5>>
+ <<He>> plays a well-kept violin with a sturdy bow and a tranquil expression. It comes through in <<his>> music. You briefly forget about Bailey's looming debt threat. Maybe one day you can be free of it too.<<lstress>><<ltrauma>><<stress -6>><<trauma -5>>
<<case 2>>
<<set $instrument to "guitar">>
diff --git a/game/overworld-town/loc-pirates/widgets.twee b/game/overworld-town/loc-pirates/widgets.twee
index f6f9fc51ddfd391a9c6da11858905c83f0de1c06..5172e17e1f6783857ed7eca328ae2dc05b1f62a5 100644
--- a/game/overworld-town/loc-pirates/widgets.twee
+++ b/game/overworld-town/loc-pirates/widgets.twee
@@ -14,7 +14,7 @@
<<if $pirate_status is undefined>>
<<set $pirate_status to 0>>
<</if>>
- <<if _args[0] is "scum" and $pirate_rank isnot 0 or _args[0] is "mate" and $pirate_rank isnot 1>>
+ <<if _args[1] is "scum" and $pirate_rank isnot 0 or _args[1] is "mate" and $pirate_rank isnot 1>>
<<else>>
<<set $pirate_status += _args[0]>>
<<set $pirate_status to Math.clamp($pirate_status, 0, 100)>>
@@ -23,175 +23,175 @@
<</widget>>
<<widget "events_pirate_deck">>
-<<cleareventpool>>
-<<addinlineevent "pirate_scum_deck_1" 1>>
- <<generateRole 0 0 "pirate">><<person1>>
- A <<person>> steps into you, reaching with both hands to fondle your <<bottom>> and pushing you against the railing. "Nice arse," <<he>> says. "Let's take a closer look." <<He>> wraps an arm around your waist, and tries to spin you around.<<gtrauma>><<garousal>><<trauma 6>><<arousal 6>>
- <br><br>
-
- <<link [[Endure|Pirate Scum Deck Endure]]>><<sub 1>><</link>>
- <br>
- <<link [[Smack|Pirate Scum Deck Smack]]>><<def 1>><<pain 4>><<pirate_status 1 "scum">><</link>><<gpain>><<grespect "scum">>
- <br>
-<</addinlineevent>>
+ <<cleareventpool>>
+ <<addinlineevent "pirate_scum_deck_1" 1>>
+ <<generateRole 0 0 "pirate">><<person1>>
+ A <<person>> steps into you, reaching with both hands to fondle your <<bottom>> and pushing you against the railing. "Nice arse," <<he>> says. "Let's take a closer look." <<He>> wraps an arm around your waist, and tries to spin you around.<<gtrauma>><<garousal>><<trauma 6>><<arousal 6>>
+ <br><br>
-<<addinlineevent "pirate_scum_deck_2" 1>>
- <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<generateRole 2 0 "pirate">><<person1>>
- A <<person>>, <<person2>><<person>>, and <<person3>><<person>> step around you, blocking your passage.
- <br><br>
- "Just who we were looking for," the <<person1>><<person>> says. "My friend here needs to practise <<his>> rope knotting skills. Very important." The <<person2>><<person>> grins, and brandishes a length of rope. "Why don't you stand there by the mast."
- <br><br>
- <<link [[Do as bid (0:10)|Pirate Scum Deck Rope]]>><<sub 1>><<pass 10>><</link>>
- <br>
- <<link [[Refuse|Pirate Scum Deck Rope Refuse]]>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
- <br>
- <<link [[Offer to show them the ropes instead (0:10)|Pirate Scum Deck Rope Seduce]]>><<def 1>><<pass 10>><</link>>
- <br>
-<</addinlineevent>>
+ <<link [[Endure|Pirate Scum Deck Endure]]>><<sub 1>><</link>>
+ <br>
+ <<link [[Smack|Pirate Scum Deck Smack]]>><<def 1>><<pain 4>><<pirate_status 1 "scum">><</link>><<gpain>><<grespect "scum">>
+ <br>
+ <</addinlineevent>>
-<<addinlineevent "pirate_scum_deck_3" 1>>
- <<generateRole 0 0 "pirate">><<person1>>
- <<if $drunk gte 1>>
- A <<person>> interrupts their swabbing of the deck to sweep their mop at your feet. In your tipsy state, you notice it too late. It trips you at the ankles, and leaves you on your knees.
+ <<addinlineevent "pirate_scum_deck_2" 1>>
+ <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<generateRole 2 0 "pirate">><<person1>>
+ A <<person>>, <<person2>><<person>>, and <<person3>><<person>> step around you, blocking your passage.
<br><br>
-
- The <<person>> doubles down on the humiliation by sitting on your back before you can stand, forcing you down further. <<He>> gives your <<bottom>> a spank, to the amusement of the crew.<<gpain>><<gtrauma>><<gstress>><<pain 4>><<trauma 6>><<stress 6>>
+ "Just who we were looking for," the <<person1>><<person>> says. "My friend here needs to practise <<his>> rope knotting skills. Very important." The <<person2>><<person>> grins, and brandishes a length of rope. "Why don't you stand there by the mast."
<br><br>
-
- <<link [[Endure (0:03)|Pirate Scum Deck Mop Endure]]>><<sub 1>><<pass 3>><</link>><<garousal>>
+ <<link [[Do as bid (0:10)|Pirate Scum Deck Rope]]>><<sub 1>><<pass 10>><</link>>
+ <br>
+ <<link [[Refuse|Pirate Scum Deck Rope Refuse]]>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
<br>
- <<link [[Threaten (0:03)|Pirate Scum Deck Mop Threaten]]>><<def 1>><<pass 3>><<pain 4>><<stress 6>><<pirate_status 1 "scum">><</link>><<gpain>><<gstress>><<grespect "scum">>
+ <<link [[Offer to show them the ropes instead (0:10)|Pirate Scum Deck Rope Seduce]]>><<def 1>><<pass 10>><</link>>
+ <br>
+ <</addinlineevent>>
- <<else>>
- A <<person>> interrupts their swabbing of the deck to sweep their mop at your feet.
- <<if currentSkillValue('danceskill') gte random(1, 800)>>
- A thought strikes as you <span class="green">spring over it.</span>
- <br><br>
- <<link [[Kick the mop|Pirate Scum Deck Mop Kick]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
- <br>
- <<link [[Land with grace|Pirate Scum Deck Mop Land]]>><<stress -6>><</link>><<lstress>>
- <br>
- <<else>>
- <span class="red">It trips you at the ankles,</span> and leaves you on your knees.
+ <<addinlineevent "pirate_scum_deck_3" 1>>
+ <<generateRole 0 0 "pirate">><<person1>>
+ <<if $drunk gte 1>>
+ A <<person>> interrupts their swabbing of the deck to sweep their mop at your feet. In your tipsy state, you notice it too late. It trips you at the ankles, and leaves you on your knees.
<br><br>
The <<person>> doubles down on the humiliation by sitting on your back before you can stand, forcing you down further. <<He>> gives your <<bottom>> a spank, to the amusement of the crew.<<gpain>><<gtrauma>><<gstress>><<pain 4>><<trauma 6>><<stress 6>>
<br><br>
- <<link [[Endure|Pirate Scum Deck Mop Endure]]>><<sub 1>><</link>><<garousal>>
+ <<link [[Endure (0:03)|Pirate Scum Deck Mop Endure]]>><<sub 1>><<pass 3>><</link>><<garousal>>
<br>
- <<link [[Threaten|Pirate Scum Deck Mop Threaten]]>><<def 1>><<pain 4>><<stress 6>><<pirate_status 1 "scum">><</link>><<gpain>><<gstress>><<grespect "scum">>
+ <<link [[Threaten (0:03)|Pirate Scum Deck Mop Threaten]]>><<def 1>><<pass 3>><<pain 4>><<stress 6>><<pirate_status 1 "scum">><</link>><<gpain>><<gstress>><<grespect "scum">>
+
+ <<else>>
+ A <<person>> interrupts their swabbing of the deck to sweep their mop at your feet.
+ <<if currentSkillValue('danceskill') gte random(1, 800)>>
+ A thought strikes as you <span class="green">spring over it.</span>
+ <br><br>
+ <<link [[Kick the mop|Pirate Scum Deck Mop Kick]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
+ <br>
+ <<link [[Land with grace|Pirate Scum Deck Mop Land]]>><<stress -6>><</link>><<lstress>>
+ <br>
+ <<else>>
+ <span class="red">It trips you at the ankles,</span> and leaves you on your knees.
+ <br><br>
+
+ The <<person>> doubles down on the humiliation by sitting on your back before you can stand, forcing you down further. <<He>> gives your <<bottom>> a spank, to the amusement of the crew.<<gpain>><<gtrauma>><<gstress>><<pain 4>><<trauma 6>><<stress 6>>
+ <br><br>
+
+ <<link [[Endure|Pirate Scum Deck Mop Endure]]>><<sub 1>><</link>><<garousal>>
+ <br>
+ <<link [[Threaten|Pirate Scum Deck Mop Threaten]]>><<def 1>><<pain 4>><<stress 6>><<pirate_status 1 "scum">><</link>><<gpain>><<gstress>><<grespect "scum">>
+ <</if>>
<</if>>
- <</if>>
-<</addinlineevent>>
-<<runeventpool>>
+ <</addinlineevent>>
+ <<runeventpool>>
<</widget>>
<<widget "events_pirate_cabin">>
-<<cleareventpool>>
-<<addinlineevent "pirate_scum_cabin_1" 1>>
- <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<generateRole 2 0 "pirate">><<person1>>
- "Hey," a <<person>> calls to you. <<Hes>> sat with a <<person2>><<person>> and <<person3>><<person>>, drinking. "Come over here. Give us a kiss."
- <br><br>
- <<link [[Do as bid|Pirate Scum Cabin Kiss]]>><<sub 1>><</link>><<kissvirginitywarning>>
- <br>
- <<link [[Ignore|Pirate Scum Cabin Ignore]]>><</link>>
- <br>
- <<link [[Insult|Pirate Scum Cabin Insult]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect>>
-<</addinlineevent>>
-
-<<addinlineevent "pirate_scum_cabin_2" 1>>
- <<generateRole 0 0 "pirate">><<person1>>
- A <<person>> pins you to the cabin wall. "My bunk's in there," <<he>> says, gesturing at a gap in a bulkhead. "I'm gonna take you for a tumble, scum."
- <br><br>
-
- <<link [[Shove away|Pirate Scum Cabin Shove]]>><<def 1>><<trauma -6>><<stress 6>><<pirate_status 1 "scum">><</link>><<gstress "scum">><<ltrauma>><<grespect "scum">>
- <br>
- <<link [[Go along with it|Pirate Scum Cabin Go]]>><<sub 1>><<trauma 6>><</link>><<gtrauma>>
- <br>
-<</addinlineevent>>
+ <<cleareventpool>>
+ <<addinlineevent "pirate_scum_cabin_1" 1>>
+ <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<generateRole 2 0 "pirate">><<person1>>
+ "Hey," a <<person>> calls to you. <<Hes>> sat with a <<person2>><<person>> and <<person3>><<person>>, drinking. "Come over here. Give us a kiss."
+ <br><br>
+ <<link [[Do as bid|Pirate Scum Cabin Kiss]]>><<sub 1>><</link>><<kissvirginitywarning>>
+ <br>
+ <<link [[Ignore|Pirate Scum Cabin Ignore]]>><</link>>
+ <br>
+ <<link [[Insult|Pirate Scum Cabin Insult]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect>>
+ <</addinlineevent>>
-<<addinlineevent "pirate_scum_cabin_3" 1>>
- <<generateRole 0 0 "pirate">><<person1>>
- <<if $worn.upper.type.includes("naked") and $worn.under_upper.type.includes("naked")>>
- "Nice <<breasts>>," laughs a <<person>>, pulling a phone from <<his>> pocket. <<covered>> "Give us a better look."<<gstress>><<stress 6>>
+ <<addinlineevent "pirate_scum_cabin_2" 1>>
+ <<generateRole 0 0 "pirate">><<person1>>
+ A <<person>> pins you to the cabin wall. "My bunk's in there," <<he>> says, gesturing at a gap in a bulkhead. "I'm gonna take you for a tumble, scum."
<br><br>
- <<link [[Refuse|Pirate Scum Cabin Breast Refuse]]>><<def 1>><<pirate_status 1 "scum">><<pain 4>><</link>><<gpain>><<grespect "scum">>
+ <<link [[Shove away|Pirate Scum Cabin Shove]]>><<def 1>><<trauma -6>><<stress 6>><<pirate_status 1 "scum">><</link>><<gstress "scum">><<ltrauma>><<grespect "scum">>
<br>
- <<link [[Relent|Pirate Scum Cabin Breast Show]]>><<sub 1>><<pirate_status -1>><<gtrauma>><</link>><<lrespect>><<gtrauma>>
+ <<link [[Go along with it|Pirate Scum Cabin Go]]>><<sub 1>><<trauma 6>><</link>><<gtrauma>>
<br>
- <<else>>
- <<if $player.gender_appearance is "m">>
- "Take your top off," says a <<person>>. "I wanna see your chest."
+ <</addinlineevent>>
+
+ <<addinlineevent "pirate_scum_cabin_3" 1>>
+ <<generateRole 0 0 "pirate">><<person1>>
+ <<if $worn.upper.type.includes("naked") and $worn.under_upper.type.includes("naked")>>
+ "Nice <<breasts>>," laughs a <<person>>, pulling a phone from <<his>> pocket. <<covered>> "Give us a better look."<<gstress>><<stress 6>>
<br><br>
+
+ <<link [[Refuse|Pirate Scum Cabin Breast Refuse]]>><<def 1>><<pirate_status 1 "scum">><<pain 4>><</link>><<gpain>><<grespect "scum">>
+ <br>
+ <<link [[Relent|Pirate Scum Cabin Breast Show]]>><<sub 1>><<pirate_status -1>><<gtrauma>><</link>><<lrespect>><<gtrauma>>
+ <br>
<<else>>
- "Take your top off," says a <<person>>. "I wanna see your breasts."
+ <<if $player.gender_appearance is "m">>
+ "Take your top off," says a <<person>>. "I wanna see your chest."
+ <br><br>
+ <<else>>
+ "Take your top off," says a <<person>>. "I wanna see your breasts."
+ <</if>>
+ <br><br>
+
+ <<link [[Refuse|Pirate Scum Cabin Refuse]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
+ <br>
+ <<set $skulduggerydifficulty to 600>>
+ <<link [[Trick|Pirate Scum Cabin Trick]]>><<def 1>><</link>><<skulduggerydifficulty>>
+ <br>
+ <<link [[Do as bid|Pirate Scum Cabin Bid]]>><<sub 1>><<pirate_status -1>><</link>><<lrespect>>
+ <br>
<</if>>
- <br><br>
-
- <<link [[Refuse|Pirate Scum Cabin Refuse]]>><<def 1>><<pirate_status 1 "scum">><</link>><<grespect "scum">>
- <br>
- <<set $skulduggerydifficulty to 600>>
- <<link [[Trick|Pirate Scum Cabin Trick]]>><<def 1>><</link>><<skulduggerydifficulty>>
- <br>
- <<link [[Do as bid|Pirate Scum Cabin Bid]]>><<sub 1>><<pirate_status -1>><</link>><<lrespect>>
- <br>
- <</if>>
-<</addinlineevent>>
-<<runeventpool>>
+ <</addinlineevent>>
+ <<runeventpool>>
<</widget>>
<<widget "events_pirate_bilge">>
-<<cleareventpool>>
-<<addinlineevent "pirate_scum_bilge_1" 1>>
- <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<person1>>
- A drunk <<person>> lurches from the shadows, almost forcing you over with <<his>> weight. "What a pretty thing," <<he>> says, making a clumsy attempt to grope you.<<gstress>><<stress 6>>
- <br><br>
- A <<person2>><<person>> staggers from behind, equally drunk.
- <br><br>
- <<if $drunk gte 120>>
- In you're inebriated state, you're too clumsy to get away.
+ <<cleareventpool>>
+ <<addinlineevent "pirate_scum_bilge_1" 1>>
+ <<generateRole 0 0 "pirate">><<generateRole 1 0 "pirate">><<person1>>
+ A drunk <<person>> lurches from the shadows, almost forcing you over with <<his>> weight. "What a pretty thing," <<he>> says, making a clumsy attempt to grope you.<<gstress>><<stress 6>>
+ <br><br>
+ A <<person2>><<person>> staggers from behind, equally drunk.
<br><br>
+ <<if $drunk gte 120>>
+ In you're inebriated state, you're too clumsy to get away.
+ <br><br>
- <<link [[Next|Pirate Scum Bilge Pair Rape]]>><<set $molestationstart to 1>><</link>>
+ <<link [[Next|Pirate Scum Bilge Pair Rape]]>><<set $molestationstart to 1>><</link>>
+ <br>
+ <<else>>
+ <<link [[Endure|Pirate Scum Bilge Endure]]>><<sub 1>><<trauma 6>><</link>><<gtrauma>>
+ <br>
+ <<link [[Shove|Pirate Scum Bilge Shove]]>><<def 1>><<pirate_status 1 "scum">><<pain 4>><</link>><<gpain>><<grespect "scum">>
+ <br>
+ <</if>>
+ <</addinlineevent>>
+
+ <<addinlineevent "pirate_scum_bilge_2" 1>>
+ You hear a faint slurping, growing louder. An unnatural silhouette is cast on the wall. You're not sure where the light is coming from. It's suddenly very cold.
+ <br><br>
+
+ <<link [[Run|Pirate Scum Bilge Run]]>><</link>>
<br>
- <<else>>
- <<link [[Endure|Pirate Scum Bilge Endure]]>><<sub 1>><<trauma 6>><</link>><<gtrauma>>
+ <<link [[Hide (0:05)|Pirate Scum Bilge Hide]]>><<pass 5>><</link>>
<br>
- <<link [[Shove|Pirate Scum Bilge Shove]]>><<def 1>><<pirate_status 1 "scum">><<pain 4>><</link>><<gpain>><<grespect "scum">>
+ <<link [[Scream|Pirate Scum Bilge Scream]]>><</link>>
<br>
- <</if>>
-<</addinlineevent>>
-
-<<addinlineevent "pirate_scum_bilge_2" 1>>
- You hear a faint slurping, growing louder. An unnatural silhouette is cast on the wall. You're not sure where the light is coming from. It's suddenly very cold.
- <br><br>
-
- <<link [[Run|Pirate Scum Bilge Run]]>><</link>>
- <br>
- <<link [[Hide (0:05)|Pirate Scum Bilge Hide]]>><<pass 5>><</link>>
- <br>
- <<link [[Scream|Pirate Scum Bilge Scream]]>><</link>>
- <br>
- <<link [[Find the source of the noise|Pirate Scum Bilge Search]]>><</link>><<willpowerdifficulty 1 1000>>
- <br>
-<</addinlineevent>>
+ <<link [[Find the source of the noise|Pirate Scum Bilge Search]]>><</link>><<willpowerdifficulty 1 1000>>
+ <br>
+ <</addinlineevent>>
-<<addinlineevent "pirate_scum_bilge_3" 1>>
- You hear the ship groan around you. It almost sounds alive.<<gstress>><<stress 6>>
- <br><br>
- <<link [[Next|Pirate Bilge]]>><<endevent>><<set $eventskip to 1>><</link>>
- <br>
-<</addinlineevent>>
-<<runeventpool>>
+ <<addinlineevent "pirate_scum_bilge_3" 1>>
+ You hear the ship groan around you. It almost sounds alive.<<gstress>><<stress 6>>
+ <br><br>
+ <<link [[Next|Pirate Bilge]]>><<endevent>><<set $eventskip to 1>><</link>>
+ <br>
+ <</addinlineevent>>
+ <<runeventpool>>
<</widget>>
<<widget "passoutpirates">>
-You've pushed yourself too much. Everything fades to black.
-<br><br>
-<<link [[Next|Pirate Passout]]>><</link>>
-<br>
-<<pass 1 hour>>
-<<trauma 6>><<passout>>
+ You've pushed yourself too much. Everything fades to black.
+ <br><br>
+ <<link [[Next|Pirate Passout]]>><</link>>
+ <br>
+ <<pass 1 hour>>
+ <<trauma 6>><<passout>>
<</widget>>
\ No newline at end of file
diff --git a/game/overworld-town/loc-school/hallways.twee b/game/overworld-town/loc-school/hallways.twee
index 37ebd796f17619a52786e845072d66bdfd73a005..13bdad993968e2d3ffe59c516a2e16b492ab471b 100644
--- a/game/overworld-town/loc-school/hallways.twee
+++ b/game/overworld-town/loc-school/hallways.twee
@@ -2674,7 +2674,7 @@ The group of students fight to pull down your <<if setup.clothes.lower[clothesIn
<</if>>
- <<link [[Run|Hallways Pantsed Run]]>><<trauma 2>><<stress 6>><<set $phase to 3>><</link>><<gstress>><<trauma>>
+ <<link [[Run|Hallways Pantsed Run]]>><<trauma 2>><<stress 6>><<set $phase to 3>><</link>><<gstress>><<gtrauma>>
<<else>>
diff --git a/game/overworld-town/loc-sea/events.twee b/game/overworld-town/loc-sea/events.twee
index 2ad0cec30c656f889d66b4036bac367a826b7538..58b1444c426897ff8eab5dd20b0554ebf7a26d57 100644
--- a/game/overworld-town/loc-sea/events.twee
+++ b/game/overworld-town/loc-sea/events.twee
@@ -1174,7 +1174,7 @@ As <<he>> speaks, the <<person2>><<person>> swims around and behind you. <<Hes>>
<<link [[Next|Sea Pair Rape]]>><<set $molestationstart to 1>><</link>>
<br>
<<else>>
- <<He>> gropes and squeezes them beneath the fabric.<<gtrauma>><<stress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
+ <<He>> gropes and squeezes them beneath the fabric.<<gtrauma>><<gstress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
<br><br>
<<sea_pair_orgasm>>
@@ -1198,7 +1198,7 @@ As <<he>> speaks, the <<person2>><<person>> swims around and behind you. <<Hes>>
<<link [[Next|Sea Pair Rape]]>><<set $molestationstart to 1>><</link>>
<br>
<<else>>
- <<He>> gropes and squeezes it beneath the fabric.<<gtrauma>><<stress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
+ <<He>> gropes and squeezes it beneath the fabric.<<gtrauma>><<gstress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
<br><br>
<<sea_pair_orgasm>>
@@ -1298,7 +1298,7 @@ The pair disappear behind the waves.
<<link [[Next|Sea Pair Rape]]>><<set $molestationstart to 1>><</link>>
<br>
<<else>>
- <<He>> gropes and squeezes them beneath the fabric.<<gtrauma>><<stress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
+ <<He>> gropes and squeezes them beneath the fabric.<<gtrauma>><<gstress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
<br><br>
<<sea_pair_orgasm>>
<</if>>
@@ -1321,7 +1321,7 @@ The pair disappear behind the waves.
<<link [[Next|Sea Pair Rape]]>><<set $molestationstart to 1>><</link>>
<br>
<<else>>
- <<He>> gropes and squeezes it beneath the fabric.<<gtrauma>><<stress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
+ <<He>> gropes and squeezes it beneath the fabric.<<gtrauma>><<gstress>><<garousal>><<trauma 6>><<stress 6>><<arousal 600>>
<br><br>
<<sea_pair_orgasm>>
diff --git a/game/overworld-town/loc-temple/confess.twee b/game/overworld-town/loc-temple/confess.twee
index 36ae4752cf44335099a40cd9809b98dfbe500b40..5f4dfedc0d81ac0f0bf89fc62ee5cdc09d1d95c4 100644
--- a/game/overworld-town/loc-temple/confess.twee
+++ b/game/overworld-town/loc-temple/confess.twee
@@ -2434,7 +2434,7 @@ You grab one of the pieces of paper and a pen from the stack and slip them throu
A pause. "I see. How unusual. I'll trust your word, <<sister>>. Thank you."
<br><br>
- <<He>> writes <<his>> name and leaves the confessional. <<grace 1>><<grace>>
+ <<He>> writes <<his>> name and leaves the confessional. <<grace 1>><<ggrace>>
<<case "corrupt_3" "corrupt_6">>
<<set $daily.contritions++>>
"Is this the path to forgiveness? Thank you, <<sister>>. I'm eager to see these specialists."
diff --git a/game/overworld-town/loc-temple/main.twee b/game/overworld-town/loc-temple/main.twee
index d61bbd27bb3bde93de8bd9e24dd9fe3786847926..56e722b3caf947ba169f5c950f4a514128f72f7b 100644
--- a/game/overworld-town/loc-temple/main.twee
+++ b/game/overworld-town/loc-temple/main.twee
@@ -1006,7 +1006,7 @@ Jordan listens with an unreadable expression as you tell <<him>> of how you retr
You hear a door open, and <<monk>> emerges from a staircase, leading up from some underground area. Jordan whispers something into <<his>> ear, and the <<monk>> leaves with an anxious haste.
<br><br>
<<person1>>
-"Forgive me child," Jordan says once alone again. "Despite the setback, you managed to retrieve the spear, and at great danger to your person. Please, allow me to extend you the temple's gratitude." <<He>> bows, then turns away.<<if $temple_rank isnot undefined and $temple_rank isnot "prospective">><<grace>><<grace 3>><</if>>
+"Forgive me child," Jordan says once alone again. "Despite the setback, you managed to retrieve the spear, and at great danger to your person. Please, allow me to extend you the temple's gratitude." <<He>> bows, then turns away.<<if $temple_rank isnot undefined and $temple_rank isnot "prospective">><<gggrace>><<grace 3>><</if>>
<br><br>
<<link [[Next|Temple]]>><<set $temple_spear_mission to 2>><<temple_spear_mission_end>><<endevent>><</link>>
@@ -1023,7 +1023,7 @@ Jordan listens with an unreadable expression as you tell <<him>> of how you retr
You hear a door open, and <<monk>> emerges from a staircase, leading up from some underground area. Jordan whispers something into <<his>> ear, and the <<monk>> leaves with an anxious haste.
<br><br>
<<person1>>
-"Forgive me child," Jordan says once alone again. "Despite the setback, you managed to retrieve the spear, and at great danger to your person. Please, allow me to extend you the temple's gratitude." <<He>> bows, then turns away.<<if $temple_rank isnot undefined and $temple_rank isnot "prospective">><<grace>><<grace 3>><</if>>
+"Forgive me child," Jordan says once alone again. "Despite the setback, you managed to retrieve the spear, and at great danger to your person. Please, allow me to extend you the temple's gratitude." <<He>> bows, then turns away.<<if $temple_rank isnot undefined and $temple_rank isnot "prospective">><<gggrace>><<grace 3>><</if>>
<br><br>
<<link [[Next|Temple]]>><<set $temple_spear_mission to 2>><<temple_spear_mission_end>><<endevent>><</link>>