Merge branch 'pregmod-master' into 'pregmod-master'

File relocation and restored .gitignore See merge request pregmodfan/fc-pregmod!1956

Merge branch 'pregmod-master' into 'pregmod-master'
b1dcf91f · Pregmodder · 1f38f8c2 · a0a6a507 · b1dcf91f · b1dcf91f
Commit b1dcf91f authored 6 years ago by Pregmodder
--- a/bin/.gitignore
+++ b/bin/.gitignore
 # Ignore everything in this directory
 *
 # Except the following:
-!.gitignore
-!resources/vector/*
\ No newline at end of file
+!.gitignore
\ No newline at end of file
--- a/bin/resources/vector/amazon.png
+++ b/bin/resources/vector/amazon.png
--- a/bin/resources/vector/angel.png
+++ b/bin/resources/vector/angel.png
--- a/bin/resources/vector/businesswoman.png
+++ b/bin/resources/vector/businesswoman.png
--- a/bin/resources/vector/cherub.png
+++ b/bin/resources/vector/cherub.png
--- a/bin/resources/vector/corrupt.png
+++ b/bin/resources/vector/corrupt.png
--- a/bin/resources/vector/default.png
+++ b/bin/resources/vector/default.png
--- a/bin/resources/vector/fairy.png
+++ b/bin/resources/vector/fairy.png
--- a/bin/resources/vector/goddess.png
+++ b/bin/resources/vector/goddess.png
--- a/bin/resources/vector/incubus.png
+++ b/bin/resources/vector/incubus.png
--- a/bin/resources/vector/monstergirl.png
+++ b/bin/resources/vector/monstergirl.png
--- a/bin/resources/vector/pfairy.png
+++ b/bin/resources/vector/pfairy.png
--- a/bin/resources/vector/schoolgirl.png
+++ b/bin/resources/vector/schoolgirl.png
--- a/bin/resources/vector/shemale.png
+++ b/bin/resources/vector/shemale.png
--- a/bin/resources/vector/succubus.png
+++ b/bin/resources/vector/succubus.png
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1430,7 +1430,7 @@ SLAVE RELATIONSHIPS


 <<case "Emotional Slut">>
-	''Emotionally sluts'' are slaves who have lost track of normal human emotional attachments, seeing sex as the only real closeness. Slaves may become emotional sluts if they become perfectly @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ and @@.mediumaquamarine;[[trusting|Encyclopedia][$encyclopedia = "Trust"]]@@ without being part of a [[romance|Encyclopedia][$encyclopedia = "Romances"]]. They receive powerful mental benefits, though they will be disappointed if they are not on assignments that allow them to be massively promiscuous, and perform better at the [[whoring|Encyclopedia][$encyclopedia = "Whoring"]] and [[public service|Encyclopedia][$encyclopedia = "Public Service"]] assignments. The most reliable way of ensuring a slave's development into an emotional slut is to have her assigned as a public servant (or to the [[club|Encyclopedia][$encyclopedia = "Club"]]) as she becomes perfectly @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ and @@.mediumaquamarine;[[trusting|Encyclopedia][$encyclopedia = "Trust"]]@@.
+	''Emotional sluts'' are slaves who have lost track of normal human emotional attachments, seeing sex as the only real closeness. Slaves may become emotional sluts if they become perfectly @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ and @@.mediumaquamarine;[[trusting|Encyclopedia][$encyclopedia = "Trust"]]@@ without being part of a [[romance|Encyclopedia][$encyclopedia = "Romances"]]. They receive powerful mental benefits, though they will be disappointed if they are not on assignments that allow them to be massively promiscuous, and perform better at the [[whoring|Encyclopedia][$encyclopedia = "Whoring"]] and [[public service|Encyclopedia][$encyclopedia = "Public Service"]] assignments. The most reliable way of ensuring a slave's development into an emotional slut is to have her assigned as a public servant (or to the [[club|Encyclopedia][$encyclopedia = "Club"]]) as she becomes perfectly @@.hotpink;[[devoted|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ and @@.mediumaquamarine;[[trusting|Encyclopedia][$encyclopedia = "Trust"]]@@.


 <<case "Slave Marriages">>