Skip to content
Snippets Groups Projects
Commit 123bae51 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'si-more' into 'pregmod-master'

Fix art from slaveInteract

See merge request pregmodfan/fc-pregmod!6205
parents 73c3aae4 efff19e0
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,16 @@ ...@@ -3,6 +3,16 @@
<<run SlaveStatClamp($activeSlave)>> <<run SlaveStatClamp($activeSlave)>>
<<setLocalPronouns $activeSlave>> <<setLocalPronouns $activeSlave>>
<span id="artFrame">
<<if $seeImages == 1 && $eventDescription != 1 && passage() != "Slave Interact">>
<<if $imageChoice == 1>>
<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 3, 0)>></div>
<<else>>
<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 3, 0)>></div>
<</if>>
<</if>>
</span>
<span style="font-weight:bold"><span class="pink"><<= SlaveFullName($activeSlave)>></span></span> <span style="font-weight:bold"><span class="pink"><<= SlaveFullName($activeSlave)>></span></span>
<<if $activeSlave.custom.label>> (<span class="yellow"><span style="font-weight:bold"><<print $activeSlave.custom.label>></span></span>)<</if>> <<if $activeSlave.custom.label>> (<span class="yellow"><span style="font-weight:bold"><<print $activeSlave.custom.label>></span></span>)<</if>>
......
...@@ -106,7 +106,6 @@ ...@@ -106,7 +106,6 @@
<div style="font-style:italic"> <div style="font-style:italic">
<<link "Description Options">> <<link "Description Options">>
<<replace #hideOptionPages>> <<replace #hideOptionPages>>
|
<<link "(hide)">> <<link "(hide)">>
<<replace #hideOptionPages>> <<replace #hideOptionPages>>
<</replace>> <</replace>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment