Skip to content
Snippets Groups Projects
Commit bc38af86 authored by Vrelnir's avatar Vrelnir
Browse files

Merge branch 'TFS-master-patch-21212' into 'dev'

Adding "personname"

See merge request !2121
parents e36ff9c4 86a12bf5
No related branches found
No related tags found
No related merge requests found
......@@ -1366,6 +1366,10 @@
<</if>>
<</silently>><<print _text_output>><</widget>>
<<widget "personname">><<silently>>
<<set _text_output to $NPCList[$index].name>>
<</silently>><<print _text_output>><</widget>>
<<widget "person">><<silently>>
<<set _text_output to $description + " ">>
<<if ($NPCList[$index].type and $NPCList[$index].type isnot "human") and _args[0] isnot "normal">>
......
......@@ -369,7 +369,7 @@ The classroom door starts to open, and the <<person>> continues <<his>> task as
"It's okay," <<nnpc_he Robin>> says. <<nnpc_He Robin>> searches <<nnpc_his Robin>> pocket for a tissue. Winter enters, and Robin turns to <<nnpc_him Winter>>.
<br><br>
"<<He>> assaulted my friend," Robin says, pointing at the <<person>>.
"<<personname>> assaulted my friend," Robin says, pointing at the <<person>>.
<br><br>
Winter points at the door, and the <<person>> marches out, giving you a wink before disappearing.
......@@ -385,7 +385,7 @@ The classroom door starts to open, and the <<person>> continues <<his>> task as
<<if $robinhistory is "seat">>
The <<person>> recoils in pain. <<He>> glares at you, and <<he>> and <<his>> friends look like they've a mind to punish you, but footsteps can be heard approaching the class. They think better of it.
<br><br>
They release Robin, and <<nnpc_he Robin>> rushes to your side. "It's okay," <<nnpc_he Robin>> says. Winter returns, and fixes Robin with <<nnpc_his Winter>> gaze. "<<He>> assaulted my friend." Robin points at the <<person>>.
They release Robin, and <<nnpc_he Robin>> rushes to your side. "It's okay," <<nnpc_he Robin>> says. Winter returns, and fixes Robin with <<nnpc_his Winter>> gaze. "<<personname>> assaulted my friend." Robin points at the <<person>>.
<br><br>
Winter points at the door, and the <<person>> marches out, still nursing an injury.
<br><br>
......@@ -405,7 +405,7 @@ The classroom door starts to open, and the <<person>> continues <<his>> task as
<br><br>
Winter enters. <<nnpc_His Winter>> eyes rest on Robin. "I can't leave you alone for five minutes, can I?"
<br><br>
"<<He>> assaulted my friend," Robin says, pointing at the <<person>>.
"<<personname>> assaulted my friend," Robin says, pointing at the <<person>>.
<br><br>
Winter points at the door, and the <<person>> marches out, giving you a wink before disappearing.
<br><br>
......@@ -424,7 +424,7 @@ The classroom door starts to open, and the <<person>> continues <<his>> task as
<br><br>
"Don't waste my time again," Winter says. "Or you'll never see the end of detention." <<nnpc_He Winter>> turns to you, then to Robin.
<br><br>
"<<He>> assaulted my friend," Robin says, pointing at the <<person>>.
"<<personname>> assaulted my friend," Robin says, pointing at the <<person>>.
<br><br>
Winter points at the door, and the <<person>> marches out, giving you a wink before disappearing.
<br><br>
......
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