From 98ca47bc28c296828e5aff2d0ff6787f6a59a25b Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Wed, 20 May 2020 12:00:08 +0200
Subject: [PATCH] populate quick links menu

---
 src/002-config/mousetrapConfig.js               | 3 ---
 src/gui/quicklinks.js                           | 5 +++++
 src/npc/asDump.tw                               | 2 +-
 src/npc/interaction/FFuckdollAnal.tw            | 2 +-
 src/npc/interaction/FFuckdollImpreg.tw          | 2 +-
 src/npc/interaction/FFuckdollOral.tw            | 2 +-
 src/npc/interaction/FFuckdollVaginal.tw         | 2 +-
 src/npc/interaction/FSuckle.tw                  | 2 +-
 src/npc/interaction/fAbuse.tw                   | 2 +-
 src/npc/interaction/fAnus.tw                    | 2 +-
 src/npc/interaction/fAssistedSex.tw             | 2 +-
 src/npc/interaction/fBeg.tw                     | 2 +-
 src/npc/interaction/fBellyFuck.tw               | 2 +-
 src/npc/interaction/fBoobs.tw                   | 2 +-
 src/npc/interaction/fButt.tw                    | 2 +-
 src/npc/interaction/fCaress.tw                  | 2 +-
 src/npc/interaction/fDance.tw                   | 2 +-
 src/npc/interaction/fDick.tw                    | 2 +-
 src/npc/interaction/fEmbrace.tw                 | 2 +-
 src/npc/interaction/fFeelings.tw                | 2 +-
 src/npc/interaction/fFeet.tw                    | 2 +-
 src/npc/interaction/fKiss.tw                    | 2 +-
 src/npc/interaction/fLickPussy.tw               | 2 +-
 src/npc/interaction/fLips.tw                    | 2 +-
 src/npc/interaction/fMaternitySwing.tw          | 2 +-
 src/npc/interaction/fNippleFuck.tw              | 2 +-
 src/npc/interaction/fPCImpreg.tw                | 2 +-
 src/npc/interaction/fPat.tw                     | 2 +-
 src/npc/interaction/fPoolSex.tw                 | 2 +-
 src/npc/interaction/fRelation.tw                | 2 +-
 src/npc/interaction/fRival.tw                   | 2 +-
 src/npc/interaction/fSlaveFeed.tw               | 2 +-
 src/npc/interaction/fSlaveImpregConsummate.tw   | 2 +-
 src/npc/interaction/fSlaveSelfImpreg.tw         | 2 +-
 src/npc/interaction/fSlaveSlaveVagConsummate.tw | 2 +-
 src/npc/interaction/fVagina.tw                  | 2 +-
 src/npc/interaction/fillUpButt.tw               | 2 +-
 src/npc/interaction/fillUpFace.tw               | 2 +-
 src/npc/interaction/fondleBoobs.tw              | 2 +-
 src/npc/interaction/fondleButt.tw               | 2 +-
 src/npc/interaction/fondleDick.tw               | 2 +-
 src/npc/interaction/fondleVagina.tw             | 2 +-
 src/npc/interaction/forceFeeding.tw             | 2 +-
 src/uncategorized/bodyModification.tw           | 2 +-
 src/uncategorized/changeLanguage.tw             | 2 +-
 src/uncategorized/personalAttentionSelect.tw    | 2 +-
 src/uncategorized/remoteSurgery.tw              | 2 +-
 src/uncategorized/salon.tw                      | 2 +-
 48 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index 55cd6687b01..df31dc5fb39 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -27,6 +27,3 @@ Mousetrap.bind("f", function() {
 Mousetrap.bind("h", function() {
 	$("#manageHG a").trigger("click");
 });
-Mousetrap.bind("a", function() {
-	$("#managePA a").trigger("click");
-});
diff --git a/src/gui/quicklinks.js b/src/gui/quicklinks.js
index 2d8272e2117..46d74e9359a 100644
--- a/src/gui/quicklinks.js
+++ b/src/gui/quicklinks.js
@@ -24,6 +24,7 @@ App.UI.quickMenu = (function() {
 			"Manage Arcology": true,
 			"Manage Personal Affairs": true,
 			"Manage Corporation": true,
+			"Personal assistant options":true,
 			Firebase: true,
 			propagandaHub: true,
 			securityHQ: true,
@@ -65,6 +66,8 @@ App.UI.quickMenu = (function() {
 		},
 		Tools: {
 			"Find Slave": true,
+			"Rules Assistant":true,
+			"Personal Attention Select":true,
 		},
 		Options: {
 			Options: true,
@@ -131,6 +134,7 @@ App.UI.quickMenu = (function() {
 		Nursery: () => App.Entity.facilities.nursery.UIName,
 		Options: "Game Options",
 		"Personal assistant options": "Personal Assistant",
+		"Personal Attention Select":"Personal Attention",
 		Pit: () => App.Entity.facilities.pit.UIName,
 		propagandaHub: "Manage PR",
 		riotControlCenter: "Manage Rebels",
@@ -205,6 +209,7 @@ App.UI.quickMenu = (function() {
 		"Neighbor Interact": "d",
 		Options: "o",
 		"Personal assistant options": "t",
+		"Personal Attention Select":"a",
 		Policies: "y",
 		propagandaHub:"H",
 		"Recruiter Select": "u",
diff --git a/src/npc/asDump.tw b/src/npc/asDump.tw
index 53e23167d22..b4cbe49c29a 100644
--- a/src/npc/asDump.tw
+++ b/src/npc/asDump.tw
@@ -1,4 +1,4 @@
-:: AS Dump
+:: AS Dump [no-history]
 
 <<if (ndef $activeSlave) || ($activeSlave == 0)>>
 
diff --git a/src/npc/interaction/FFuckdollAnal.tw b/src/npc/interaction/FFuckdollAnal.tw
index 1482ff00fc8..1eb3cb0e90e 100644
--- a/src/npc/interaction/FFuckdollAnal.tw
+++ b/src/npc/interaction/FFuckdollAnal.tw
@@ -1,4 +1,4 @@
-:: FFuckdollAnal [nobr]
+:: FFuckdollAnal [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/FFuckdollImpreg.tw b/src/npc/interaction/FFuckdollImpreg.tw
index 698559bab8f..00db19147b0 100644
--- a/src/npc/interaction/FFuckdollImpreg.tw
+++ b/src/npc/interaction/FFuckdollImpreg.tw
@@ -1,4 +1,4 @@
-:: FFuckdollImpreg [nobr]
+:: FFuckdollImpreg [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/FFuckdollOral.tw b/src/npc/interaction/FFuckdollOral.tw
index 9a7dc13fa8f..66cfc24ef2f 100644
--- a/src/npc/interaction/FFuckdollOral.tw
+++ b/src/npc/interaction/FFuckdollOral.tw
@@ -1,4 +1,4 @@
-:: FFuckdollOral [nobr]
+:: FFuckdollOral [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/FFuckdollVaginal.tw b/src/npc/interaction/FFuckdollVaginal.tw
index 268ace4bf22..77f62d82afb 100644
--- a/src/npc/interaction/FFuckdollVaginal.tw
+++ b/src/npc/interaction/FFuckdollVaginal.tw
@@ -1,4 +1,4 @@
-:: FFuckdollVaginal [nobr]
+:: FFuckdollVaginal [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/FSuckle.tw b/src/npc/interaction/FSuckle.tw
index 23c23895362..4a2a5eb7eb1 100644
--- a/src/npc/interaction/FSuckle.tw
+++ b/src/npc/interaction/FSuckle.tw
@@ -1,4 +1,4 @@
-:: FSuckle [nobr]
+:: FSuckle [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<run Enunciate($activeSlave)>>
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index e1111596286..3576b3642a3 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -1,4 +1,4 @@
-:: FAbuse [nobr]
+:: FAbuse [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fAnus.tw b/src/npc/interaction/fAnus.tw
index 73cff54da5e..2218ff43a6e 100644
--- a/src/npc/interaction/fAnus.tw
+++ b/src/npc/interaction/fAnus.tw
@@ -1,4 +1,4 @@
-:: FAnus [nobr]
+:: FAnus [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fAssistedSex.tw b/src/npc/interaction/fAssistedSex.tw
index dc1d9326fc5..e809d033e2b 100644
--- a/src/npc/interaction/fAssistedSex.tw
+++ b/src/npc/interaction/fAssistedSex.tw
@@ -1,4 +1,4 @@
-:: FAssistedSex [nobr]
+:: FAssistedSex [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fBeg.tw b/src/npc/interaction/fBeg.tw
index bb171297eee..a1f94f2c215 100644
--- a/src/npc/interaction/fBeg.tw
+++ b/src/npc/interaction/fBeg.tw
@@ -1,4 +1,4 @@
-:: FBeg [nobr]
+:: FBeg [nobr no-history]
 
 /* things I need: checks for canWalk() to see how easily she can move, blindness checks, replacement for BoobsDesc, maybe devotion catches for certain flaws */
 /* priority! femPC support! */
diff --git a/src/npc/interaction/fBellyFuck.tw b/src/npc/interaction/fBellyFuck.tw
index febe54b84ee..bb2c5857ae1 100644
--- a/src/npc/interaction/fBellyFuck.tw
+++ b/src/npc/interaction/fBellyFuck.tw
@@ -1,4 +1,4 @@
-:: FBellyFuck [nobr]
+:: FBellyFuck [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fBoobs.tw b/src/npc/interaction/fBoobs.tw
index 9216055783c..037516b5a96 100644
--- a/src/npc/interaction/fBoobs.tw
+++ b/src/npc/interaction/fBoobs.tw
@@ -1,4 +1,4 @@
-:: FBoobs [nobr]
+:: FBoobs [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fButt.tw b/src/npc/interaction/fButt.tw
index 2f262587180..99d02192b0a 100644
--- a/src/npc/interaction/fButt.tw
+++ b/src/npc/interaction/fButt.tw
@@ -1,4 +1,4 @@
-:: FButt [nobr]
+:: FButt [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fCaress.tw b/src/npc/interaction/fCaress.tw
index be2830bfe89..4548eacf591 100644
--- a/src/npc/interaction/fCaress.tw
+++ b/src/npc/interaction/fCaress.tw
@@ -1,4 +1,4 @@
-:: FCaress [nobr]
+:: FCaress [nobr no-history]
 
 <<setPlayerPronouns>>
 <<set $AS = $activeSlave.ID>>
diff --git a/src/npc/interaction/fDance.tw b/src/npc/interaction/fDance.tw
index 7a1c6a83e08..7ccc9dbf458 100644
--- a/src/npc/interaction/fDance.tw
+++ b/src/npc/interaction/fDance.tw
@@ -1,4 +1,4 @@
-:: FDance [nobr]
+:: FDance [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fDick.tw b/src/npc/interaction/fDick.tw
index 18af069c278..4463b3e59ad 100644
--- a/src/npc/interaction/fDick.tw
+++ b/src/npc/interaction/fDick.tw
@@ -1,4 +1,4 @@
-:: FDick [nobr]
+:: FDick [nobr no-history]
 /* TODO: .pregMood and more amp variants */
 
 <<set $AS = $activeSlave.ID>>
diff --git a/src/npc/interaction/fEmbrace.tw b/src/npc/interaction/fEmbrace.tw
index ce6dafb6cf6..d91ada3ada5 100644
--- a/src/npc/interaction/fEmbrace.tw
+++ b/src/npc/interaction/fEmbrace.tw
@@ -1,4 +1,4 @@
-:: FEmbrace [nobr]
+:: FEmbrace [nobr no-history]
 
 <<setPlayerPronouns>>
 <<set $AS = $activeSlave.ID>>
diff --git a/src/npc/interaction/fFeelings.tw b/src/npc/interaction/fFeelings.tw
index 02a1f016a4e..e3ee640ff84 100644
--- a/src/npc/interaction/fFeelings.tw
+++ b/src/npc/interaction/fFeelings.tw
@@ -1,4 +1,4 @@
-:: FFeelings [nobr]
+:: FFeelings [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 
diff --git a/src/npc/interaction/fFeet.tw b/src/npc/interaction/fFeet.tw
index bbeca8c26e7..9e4085ccf53 100644
--- a/src/npc/interaction/fFeet.tw
+++ b/src/npc/interaction/fFeet.tw
@@ -1,4 +1,4 @@
-:: FFeet [nobr]
+:: FFeet [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fKiss.tw b/src/npc/interaction/fKiss.tw
index a377816d00d..c708b599c0b 100644
--- a/src/npc/interaction/fKiss.tw
+++ b/src/npc/interaction/fKiss.tw
@@ -1,4 +1,4 @@
-:: FKiss [nobr]
+:: FKiss [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fLickPussy.tw b/src/npc/interaction/fLickPussy.tw
index eee1cdb8150..d060cddc6a5 100644
--- a/src/npc/interaction/fLickPussy.tw
+++ b/src/npc/interaction/fLickPussy.tw
@@ -1,4 +1,4 @@
-:: FLickPussy [nobr]
+:: FLickPussy [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fLips.tw b/src/npc/interaction/fLips.tw
index 0cc558174b3..3ea471f467c 100644
--- a/src/npc/interaction/fLips.tw
+++ b/src/npc/interaction/fLips.tw
@@ -1,4 +1,4 @@
-:: FLips [nobr]
+:: FLips [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fMaternitySwing.tw b/src/npc/interaction/fMaternitySwing.tw
index 2642f35c493..2d3a9eeceab 100644
--- a/src/npc/interaction/fMaternitySwing.tw
+++ b/src/npc/interaction/fMaternitySwing.tw
@@ -1,4 +1,4 @@
-:: FMaternitySwing [nobr]
+:: FMaternitySwing [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fNippleFuck.tw b/src/npc/interaction/fNippleFuck.tw
index 48631df4c30..33b2065de50 100644
--- a/src/npc/interaction/fNippleFuck.tw
+++ b/src/npc/interaction/fNippleFuck.tw
@@ -1,4 +1,4 @@
-:: FNippleFuck [nobr]
+:: FNippleFuck [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<run Enunciate($activeSlave)>>
diff --git a/src/npc/interaction/fPCImpreg.tw b/src/npc/interaction/fPCImpreg.tw
index 72b261d6aaf..73651bcafd5 100644
--- a/src/npc/interaction/fPCImpreg.tw
+++ b/src/npc/interaction/fPCImpreg.tw
@@ -1,4 +1,4 @@
-:: FPCImpreg [nobr]
+:: FPCImpreg [nobr no-history]
 
 /* TODO: add reactions for incest */
 
diff --git a/src/npc/interaction/fPat.tw b/src/npc/interaction/fPat.tw
index a56458e24b4..4de3f628f04 100644
--- a/src/npc/interaction/fPat.tw
+++ b/src/npc/interaction/fPat.tw
@@ -1,4 +1,4 @@
-:: FPat [nobr]
+:: FPat [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<run Enunciate($activeSlave)>>
diff --git a/src/npc/interaction/fPoolSex.tw b/src/npc/interaction/fPoolSex.tw
index 0b737821124..baf3d3a14ea 100644
--- a/src/npc/interaction/fPoolSex.tw
+++ b/src/npc/interaction/fPoolSex.tw
@@ -1,4 +1,4 @@
-:: FPoolSex [nobr]
+:: FPoolSex [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fRelation.tw b/src/npc/interaction/fRelation.tw
index f02f48bae40..d3863431b65 100644
--- a/src/npc/interaction/fRelation.tw
+++ b/src/npc/interaction/fRelation.tw
@@ -1,4 +1,4 @@
-:: FRelation [nobr]
+:: FRelation [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 
diff --git a/src/npc/interaction/fRival.tw b/src/npc/interaction/fRival.tw
index 7221a0b16fa..19ea7feae34 100644
--- a/src/npc/interaction/fRival.tw
+++ b/src/npc/interaction/fRival.tw
@@ -1,4 +1,4 @@
-:: FRival [nobr]
+:: FRival [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<set $partner = $slaveIndices[$activeSlave.rivalryTarget]>>
diff --git a/src/npc/interaction/fSlaveFeed.tw b/src/npc/interaction/fSlaveFeed.tw
index cf62f44f5de..c621bc715e6 100644
--- a/src/npc/interaction/fSlaveFeed.tw
+++ b/src/npc/interaction/fSlaveFeed.tw
@@ -1,4 +1,4 @@
-:: FSlaveFeed [nobr]
+:: FSlaveFeed [nobr no-history]
 
 <<set _pregDiscovery = 0>>
 <<set $AS = $activeSlave.ID>>
diff --git a/src/npc/interaction/fSlaveImpregConsummate.tw b/src/npc/interaction/fSlaveImpregConsummate.tw
index b699a90178a..a0fa8f1bc53 100644
--- a/src/npc/interaction/fSlaveImpregConsummate.tw
+++ b/src/npc/interaction/fSlaveImpregConsummate.tw
@@ -1,4 +1,4 @@
-:: FSlaveImpreg Consummate [nobr]
+:: FSlaveImpreg Consummate [nobr no-history]
 
 The first necessary step is to prepare the donatrix.
 <<set $AS = $activeSlave.ID>>
diff --git a/src/npc/interaction/fSlaveSelfImpreg.tw b/src/npc/interaction/fSlaveSelfImpreg.tw
index 9cb8eb637c0..aa21bdccf15 100644
--- a/src/npc/interaction/fSlaveSelfImpreg.tw
+++ b/src/npc/interaction/fSlaveSelfImpreg.tw
@@ -1,4 +1,4 @@
-:: FSlaveSelfImpreg [nobr]
+:: FSlaveSelfImpreg [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fSlaveSlaveVagConsummate.tw b/src/npc/interaction/fSlaveSlaveVagConsummate.tw
index 5783fe47165..b6d8636bc43 100644
--- a/src/npc/interaction/fSlaveSlaveVagConsummate.tw
+++ b/src/npc/interaction/fSlaveSlaveVagConsummate.tw
@@ -1,4 +1,4 @@
-:: FSlaveSlaveVag Consummate [nobr]
+:: FSlaveSlaveVag Consummate [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fVagina.tw b/src/npc/interaction/fVagina.tw
index 77e5cfcd430..028877f9469 100644
--- a/src/npc/interaction/fVagina.tw
+++ b/src/npc/interaction/fVagina.tw
@@ -1,4 +1,4 @@
-:: FVagina [nobr]
+:: FVagina [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fillUpButt.tw b/src/npc/interaction/fillUpButt.tw
index be0f17d9262..b369ec7e734 100644
--- a/src/npc/interaction/fillUpButt.tw
+++ b/src/npc/interaction/fillUpButt.tw
@@ -1,4 +1,4 @@
-:: FillUpButt [nobr]
+:: FillUpButt [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fillUpFace.tw b/src/npc/interaction/fillUpFace.tw
index 73d86553a58..fa1034e68fd 100644
--- a/src/npc/interaction/fillUpFace.tw
+++ b/src/npc/interaction/fillUpFace.tw
@@ -1,4 +1,4 @@
-:: FillUpFace [nobr]
+:: FillUpFace [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fondleBoobs.tw b/src/npc/interaction/fondleBoobs.tw
index 0d1419563a9..fbc258757e1 100644
--- a/src/npc/interaction/fondleBoobs.tw
+++ b/src/npc/interaction/fondleBoobs.tw
@@ -1,4 +1,4 @@
-:: FondleBoobs [nobr]
+:: FondleBoobs [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fondleButt.tw b/src/npc/interaction/fondleButt.tw
index 6eb7d1f0c80..2da14590e42 100644
--- a/src/npc/interaction/fondleButt.tw
+++ b/src/npc/interaction/fondleButt.tw
@@ -1,4 +1,4 @@
-:: FondleButt [nobr]
+:: FondleButt [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fondleDick.tw b/src/npc/interaction/fondleDick.tw
index a4b10f25e85..be287a36854 100644
--- a/src/npc/interaction/fondleDick.tw
+++ b/src/npc/interaction/fondleDick.tw
@@ -1,4 +1,4 @@
-:: FondleDick [nobr]
+:: FondleDick [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/fondleVagina.tw b/src/npc/interaction/fondleVagina.tw
index 7e31cec7558..e8a4358665c 100644
--- a/src/npc/interaction/fondleVagina.tw
+++ b/src/npc/interaction/fondleVagina.tw
@@ -1,4 +1,4 @@
-:: FondleVagina [nobr]
+:: FondleVagina [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/npc/interaction/forceFeeding.tw b/src/npc/interaction/forceFeeding.tw
index c99bbb40b68..263e4f0d5f5 100644
--- a/src/npc/interaction/forceFeeding.tw
+++ b/src/npc/interaction/forceFeeding.tw
@@ -1,4 +1,4 @@
-:: forceFeeding [nobr]
+:: forceFeeding [nobr no-history]
 
 <<set $AS = $activeSlave.ID>>
 <<setLocalPronouns $activeSlave>>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index ba557c462cc..b09cdf0fc60 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -1,4 +1,4 @@
-:: Body Modification [nobr]
+:: Body Modification [nobr jump-from-safe]
 
 <<set $nextButton = "Confirm changes", $nextLink = "Slave Interact">>
 <<set $AS = $activeSlave.ID>>
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index 6050573779d..95f3c2a4197 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -1,4 +1,4 @@
-:: Change Language [nobr]
+:: Change Language [nobr jump-from-safe]
 
 <<set $nextButton = "Confirm changes">>
 <<if $sideBarOptions.compact > 0>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 05f16894337..74c8f24c04d 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -1,4 +1,4 @@
-:: Personal Attention Select [nobr]
+:: Personal Attention Select [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main">>
 
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 0a1006d5b6f..02f64934413 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -1,4 +1,4 @@
-:: Remote Surgery [nobr]
+:: Remote Surgery [nobr jump-from-safe]
 
 <style>
 .active {
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index f35b17b3be6..057c9ec21c7 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -1,4 +1,4 @@
-:: Salon [nobr]
+:: Salon [nobr jump-from-safe]
 
 <<set $nextButton = "Confirm changes", $nextLink = "Slave Interact", $encyclopedia = "The Auto Salon">>
 <<set $AS = $activeSlave.ID>>
-- 
GitLab