From acd544e035ad164f1c0778a2e414a5097aa95845 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Tue, 23 Apr 2019 17:35:53 -0500 Subject: [PATCH] Oopsie --- src/pregmod/pRaped.tw | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw index 9a72ac4f1c3..3cccd40ba96 100644 --- a/src/pregmod/pRaped.tw +++ b/src/pregmod/pRaped.tw @@ -138,10 +138,6 @@ It would be prudent to up security in your arcology. That or take a guard along <<else>> -<<<<<<< HEAD -======= - ->>>>>>> 181465f486f48228842d09a1d4c287b6a5231e8f <br><br> Now the only question is what to do with the would-be rapist. You could toss them out of the arcology, but it might be more fun to turn the tables on them. @@ -159,7 +155,7 @@ Now the only question is what to do with the would-be rapist. You could toss the <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>> <<replace "#result">> You complete the legalities and biometric scanning quickly and without fuss. The idiot will regret crossing you when $he wakes in the penthouse for basic slave induction. - <<include "New Slave Intro">> + <<include "New Slave Intro">> <</replace>> <</link>> <br><<link "Sentence $him to a day in the stocks, then enslave $him">> @@ -178,9 +174,9 @@ Now the only question is what to do with the would-be rapist. You could toss the <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>> <<replace "#result">> You declare $his holes fair game for the entire arcology. $He spends a torturous day in the stocks before being hauled in for enslavement, somewhat @@.red;the worse for wear@@ and @@.red;acting oddly@@ due to $his ordeal, bruises all over $his body, cum leaking from $his @@.lime;loosened@@ anus<<if $activeSlave.vagina > -1>> and @@.lime;fucked-out@@ pussy<</if>>. The public @@.green;enjoys the fun.@@ - <<run repX(500, "event")>> - <<set $arcologies[0].prosperity += 2>> - <<include "New Slave Intro">> + <<run repX(500, "event")>> + <<set $arcologies[0].prosperity += 2>> + <<include "New Slave Intro">> <</replace>> <</link>> <<if $arcade > 0>> @@ -190,7 +186,7 @@ Now the only question is what to do with the would-be rapist. You could toss the <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>> <<replace "#result">> You complete the legalities and biometric scanning quickly and cautiously. The idiot will be in for a surprise when $he awakes to find $he can't move and a dick is in $his ass. - <<run newSlave($activeSlave)>> /* skip New Slave Intro */ + <<run newSlave($activeSlave)>> /* skip New Slave Intro */ <</replace>> <</link>> <</if>> @@ -201,8 +197,8 @@ Now the only question is what to do with the would-be rapist. You could toss the <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>> <<replace "#result">> You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up <<if $dairyStimulatorsSetting > 1>>in agony as $his anus takes the rectal hydration dildo<<else>>to find $his chest has begun swelling with milk<</if>>. - <<set $activeSlave.boobs += 300>> - <<run newSlave($activeSlave)>> /* skip New Slave Intro */ + <<set $activeSlave.boobs += 300>> + <<run newSlave($activeSlave)>> /* skip New Slave Intro */ <</replace>> <</link>> <</if>> @@ -236,18 +232,18 @@ Now the only question is what to do with the would-be rapist. You could toss the <<run newSlave($activeSlave)>> <<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>> <<replace "#result">> - You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction. - <<include "New Slave Intro">> + You want $him to suffer for what $he tried to pull on you. You make sure $he is fully awake as $he is strapped into the autosurgery, taking the time to roughly fondle $his balls. You take great pleasure in watching $him struggle as $his testicles are removed. Once $he can stand again, it's off to the penthouse for basic slave induction. + <<include "New Slave Intro">> <</replace>> <</link>> <</if>> <<else>> //You lack the necessary funds to enslave $him.// <</if>> -<<link "Publicly flog the criminal">> +<br><<link "Publicly flog the criminal">> <<replace "#result">> - Naturally, the wretch will be thrown out of the arcology: but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@ - <<run repX(500, "event")>> + Naturally, the wretch will be thrown out of the arcology, but an example must first be made. Free people must understand that criminals who commit outrages against them will be severely punished. The protesting malefactor is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@ + <<run repX(500, "event")>> <</replace>> <</link>> </span> -- GitLab