diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index 589e418e6f..8bbca6f813 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -136,6 +136,8 @@ input[type=radio].sheet-tab8:checked ~ div.sheet-content8
     opacity:0;
     width:45%;
     margin-left:-4.5%;
+    margin-right:1%;
+    height:2em !important;
 }
 
 
@@ -147,7 +149,7 @@ input[type=radio].sheet-tab8:checked ~ div.sheet-content8
     text-align:center;
     border-radius:5px;
     width:45%;
-    margin-left:-45%;
+    margin-left:-47%;
 }
 
 .sheet-gmrollcheckbox:checked,
@@ -399,6 +401,8 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-vehicleskillscheckbox:checked ~ div.sheet-vehicleskillsticked,
 .sheet-vehiclenotesunticked,
 .sheet-vehiclenotescheckbox:checked ~ div.sheet-vehiclenotesticked,
+.sheet-vehicledmgunticked,
+.sheet-vehicledmgcheckbox:checked ~ div.sheet-vehicledmgticked,
 .sheet-vehicleshowweaponunticked,
 .sheet-vehicleshowweaponcheckbox:checked ~ div.sheet-vehicleshowweaponticked,
 .sheet-vehicleweaponunticked,
@@ -448,6 +452,8 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-mskillhotsimcheckbox:checked ~ div.sheet-mskillhotsimunticked,
 .sheet-programticked,
 .sheet-programcheckbox:checked ~ div.sheet-programunticked,
+.sheet-vehicledmgticked,
+.sheet-vehicledmgcheckbox:checked ~ div.sheet-vehicledmgunticked,
 .sheet-vehiclenotesticked,
 .sheet-vehiclenotescheckbox:checked ~ div.sheet-vehiclenotesunticked,
 .sheet-vehicleskillsticked,
@@ -953,7 +959,7 @@ input[disabled="true"]{
 .sheet-martialrow div:not(.sheet-checkboxticker):not(.sheet-martialnoteswrapper):not(.itemcontrol),
 .sheet-contactsrow div:not(.sheet-checkboxticker):not(.sheet-contactsnoteswrapper):not(.itemcontrol),
 .sheet-programrow div:not(.sheet-checkboxticker):not(.itemcontrol),
-.sheet-vehicle div:not(.sheet-checkboxticker):not(.sheet-vehicleskillmodelabel):not(.sheet-vehicleskillswrapper):not(.sheet-vehiclenoteswrapper):not(.sheet-vehicleweaponnoteswrapper):not(.sheet-vehicleweaponwrapper):not(.itemcontrol),
+.sheet-vehicle div:not(.sheet-checkboxticker):not(.sheet-vehicleskillmodelabel):not(.sheet-vehicleskillswrapper):not(.sheet-vehiclenoteswrapper):not(.sheet-vehicledmgwrapper):not(.sheet-vehicleweaponnoteswrapper):not(.sheet-vehicleweaponwrapper):not(.itemcontrol),
 .sheet-equipmentrow div:not(.sheet-checkboxticker):not(.sheet-equipmentnoteswrapper):not(.itemcontrol),
 .sheet-weaponrow div:not(.sheet-checkboxticker):not(.sheet-weaponnoteswrapper):not(.itemcontrol):not(.sheet-weaponrangerollwrapper):not(.sheet-weaponmeleerollwrapper),
 .sheet-ammorow div:not(.sheet-checkboxticker):not(.itemcontrol):not(.sheet-ammofieldset):not(.sheet-ammolabels),
@@ -987,7 +993,7 @@ input[disabled="true"]{
 }
 
 .sheet-mskillmodlabel{
-    width:30%;
+    width:20%;
 }
 
 
@@ -1006,6 +1012,16 @@ input[disabled="true"]{
 }
 
 
+.sheet-mskillnoisewrapper{
+    width:7%;
+    display:inline-block;
+}
+
+.sheet-vehicleskillnoise,
+.sheet-mskillnoise{
+    width:100%;
+}
+
 .sheet-vehicleskillinputwrapper,
 .sheet-metamagicdescriptionwrapper,
 .sheet-programdescriptionwrapper{
@@ -1441,6 +1457,17 @@ input[disabled="true"]{
     padding-top:0.3em;
 }
 
+.sheet-vehicledmginput{
+    width:40%;
+    margin-right:5%;
+    display:inline-block;
+}
+
+.sheet-vehicledmgphys,
+.sheet-vehicledmgmatrix{
+    width:15%;
+    display:inline-block;
+}
 
 .sheet-warenoteswrapper,
 .sheet-martialnoteswrapper,
@@ -1495,6 +1522,7 @@ input[disabled="true"]{
     min-height:8em;
 }
 
+.sheet-vehicledmgwrapper,
 .sheet-vehiclenoteswrapper,
 .sheet-vehicleskillswrapper,
 .sheet-vehicleweaponwrapper,
@@ -1513,6 +1541,7 @@ input[disabled="true"]{
 
 
 input.sheet-vehicleshowweaponcheckbox:checked ~ div.sheet-vehicleweaponwrapper,
+input.sheet-vehicledmgcheckbox:checked ~ div.sheet-vehicledmgwrapper,
 input.sheet-vehiclenotescheckbox:checked ~ div.sheet-vehiclenoteswrapper,
 input.sheet-vehicleskillscheckbox:checked ~ div.sheet-vehicleskillswrapper,
 input.sheet-vehicleweaponcheckbox:checked ~ div.sheet-vehicleweaponnoteswrapper,
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index ea26de9442..053d526c65 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -99,15 +99,15 @@
                 </div>
                 <div class="rollcol">
                     <div class="statheading"><h4>Roll</h4></div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_bodroll" title="Roll Body" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Body}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{bod_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_agiroll" title="Roll Agility" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Agility}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{agi_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_rearoll" title="Roll Reaction" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Reaction}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{rea_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_strroll" title="Roll Strength" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Strength}}{{val1=Strength}}{{val1_num=[[@{str_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{str_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_charoll" title="Roll Charisma" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Charisma}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{cha_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_introll" title="Roll Intuition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Intuitioin}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{int_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_logroll" title="Roll Logic" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Logic}}{{val1=Logic}}{{val1_num=[[@{log_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{log_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_wilroll" title="Roll Willpower" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Willpower}}{{val1=Willpower}}{{val1_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{wil_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
-                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_magroll" title="Roll Magic/Res" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_bodroll" title="Roll Body" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Body}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{bod_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_agiroll" title="Roll Agility" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Agility}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{agi_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_rearoll" title="Roll Reaction" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Reaction}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{rea_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_strroll" title="Roll Strength" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Strength}}{{val1=Strength}}{{val1_num=[[@{str_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{str_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_charoll" title="Roll Charisma" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Charisma}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{cha_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_introll" title="Roll Intuition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Intuitioin}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{int_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_logroll" title="Roll Logic" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Logic}}{{val1=Logic}}{{val1_num=[[@{log_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{log_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_wilroll" title="Roll Willpower" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Willpower}}{{val1=Willpower}}{{val1_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{wil_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
+                    <div class="statinputwrapper"><button type="roll" class="standardroll" name="roll_magroll" title="Roll Magic/Res" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Magic/Res}}{{val1=Magic/Res}}{{val1_num=[[@{mag_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[?{Apply Wounds|Yes,1|No,0}*(@{wound_total})]]}}{{result=[[(@{mag_total}+?{Situational Modifiers}-?{Apply Wounds}*[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> </div>
                 </div>
                 <div class="edgewrapper">
                     <div class="edgecheckboxwrapper">
@@ -160,6 +160,35 @@
                     </div>
                 </div>
             </div>
+            <div class="specrolls">
+                <h2>Attribute Rolls</h2>
+                <div class="specroll"><label>Surprise (R+I)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_surpriseroll" title="Roll Surprise (Reaction+Intuition)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Surprise}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{rea_total}+@{int_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
+                </div>
+                <div class="specroll"><label>Composure (C+W)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_composureroll" title="Roll Composure (Charisma+Willpower)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Composure}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{val2=Willpower}}{{val2_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{cha_total}+@{wil_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
+                </div>
+                <div class="specroll"><label>Judge Intentions (C+I)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_judgeroll" title="Roll Judge Intetions (Charisma+Intuition)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Judge Intentions}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{cha_total}+@{int_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
+                </div>
+                <div class="specroll"><label>Memory (L+W)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_memoryroll" title="Roll Memory (Logic+Willpower)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Memory}}{{val1=Logic}}{{val1_num=[[@{log_total}]]}}{{val2=Willpower}}{{val2_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{log_total}+@{wil_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
+                </div>
+                <div class="specroll"><label>Poison/Drug (B+W)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_pndroll" title="Roll a Poison/Drug Resistance Test (Body+Willpower)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Poison/Drug Resistance}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Willpower}}{{val2_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{bod_total}+@{wil_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
+                </div>
+                <div class="specroll"><label>Carry/Lift (B+S)</label></div>
+                <div class="specroll">
+                    <button type="roll" class="standardroll" name="roll_carryroll" title="Roll Lift/Carry (Body+Strength)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Carry/Lift}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Strength}}{{val2_num=[[@{str_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{bod_total}+@{str_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}{{description=Can lift (Strength + Nethits) x 15kg
+Can carry (Strength + Nethits) x 10kg
+Can lift overhead (Strength + Nethits) x 5kg}}" /> 
+                </div>
+            </div>
             <div class="movement">
                 <h2>Movement</h2>
                 <div class="movementrow">
@@ -201,32 +230,6 @@
                     </div>
                 </div>
             </div>
-            <div class="specrolls">
-                <h2>Attribute Rolls</h2>
-                <div class="specroll"><label>Surprise</label></div>
-                <div class="specroll">
-                    <button type="roll" class="standardroll" name="roll_surpriseroll" title="Roll Surprise (Reaction+Intuition)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Surprise}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{rea_total}+@{int_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
-                </div>
-                <div class="specroll"><label>Composure</label></div>
-                <div class="specroll">
-                    <button type="roll" class="standardroll" name="roll_composureroll" title="Roll Composure (Charisma+Willpower)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Composure}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{val2=Willpower}}{{val2_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{cha_total}+@{wil_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
-                </div>
-                <div class="specroll"><label>Judge Intentions</label></div>
-                <div class="specroll">
-                    <button type="roll" class="standardroll" name="roll_judgeroll" title="Roll Judge Intetions (Charisma+Intuition)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Judge Intentions}}{{val1=Charisma}}{{val1_num=[[@{cha_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{cha_total}+@{int_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
-                </div>
-                <br>
-                <div class="specroll"><label>Memory</label></div>
-                <div class="specroll">
-                    <button type="roll" class="standardroll" name="roll_memoryroll" title="Roll Memory (Logic+Willpower)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Memory}}{{val1=Logic}}{{val1_num=[[@{log_total}]]}}{{val2=Willpower}}{{val2_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{log_total}+@{wil_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
-                </div>
-                <div class="specroll"><label>Carry/Lift</label></div>
-                <div class="specroll">
-                    <button type="roll" class="standardroll" name="roll_carryroll" title="Roll Lift/Carry (Body+Strength)" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=Carry/Lift}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Strength}}{{val2_num=[[@{str_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{bod_total}+@{str_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}{{description=Can lift (Strength + Nethits) x 15kg
-Can carry (Strength + Nethits) x 10kg
-Can lift overhead (Strength + Nethits) x 5kg}}" /> 
-                </div>
-            </div>
             <div class="notesblock">
                 <h2>Notes</h2>
                 <textarea name="attr_generalnotes"></textarea>
@@ -243,19 +246,19 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 <div class="rollrow">
                     <div class="rolllabel"><label>Without Wounds</label></div>
                     <div class="rolllabel">
-                        <button type="roll" class="standardroll" name="roll_standardroll" title="Roll with a given Dicepool without Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|6}]]}}{{result=[[(?{Dice-Pool}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[?{Limit}]]]]}}{{description=?{Description}}}" /> 
+                        <button type="roll" class="standardroll" name="roll_standardroll" title="Roll with a given Dicepool without Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|6}]]}}{{result=[[(?{Dice-Pool})d6cs>5>5sdkh[[?{Limit}]]]]}}{{description=?{Description}}}" /> 
                     </div>
                     <div class="rolllabel">
-                        <button type="roll" class="standardroll" name="roll_edgeroll" title="Roll with a given Dicepool + Edge and exploding sixes without Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{val2=Edge}}{{val2_num=[[@{edg_total}]]}}{{result=[[(?{Dice-Pool}+@{edg_total})d6!cs>5>5sd@{edgeroll}]]}}{{description=?{Description}}}" /> 
+                        <button type="roll" class="standardroll" name="roll_edgeroll" title="Roll with a given Dicepool + Edge and exploding sixes without Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{val2=Edge}}{{val2_num=[[@{edg_total}]]}}{{result=[[(?{Dice-Pool}+@{edg_total})d6!cs>5>5sd]]}}{{description=?{Description}}}" /> 
                     </div>
                 </div>
                 <div class="rollrow">
                     <div class="rolllabel"><label>With Wounds</label></div>
                     <div class="rolllabel">
-                        <button type="roll" class="standardroll" name="roll_standardroll" title="Roll with a given Dicepool with Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|6}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(?{Dice-Pool}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[?{Limit}]]]]}}{{description=?{Description}}}" /> 
+                        <button type="roll" class="standardroll" name="roll_standardroll" title="Roll with a given Dicepool with Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|6}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(?{Dice-Pool}-[[@{wound_total}]])d6cs>5>5sdkh[[?{Limit}]]]]}}{{description=?{Description}}}" /> 
                     </div>
                     <div class="rolllabel">
-                        <button type="roll" class="standardroll" name="roll_edgeroll" title="Roll with a given Dicepool + Edge and exploding sixes with Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{val2=Edge}}{{val2_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(?{Dice-Pool}+@{edg_total}-[[@{wound_total}]])d6!cs>5>5sd@{edgeroll}]]}}{{description=?{Description}}}" /> 
+                        <button type="roll" class="standardroll" name="roll_edgeroll" title="Roll with a given Dicepool + Edge and exploding sixes with Woundpenalty" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{val1=Dice-Pool}}{{val1_num=[[?{Dice-Pool|6}]]}}{{val2=Edge}}{{val2_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(?{Dice-Pool}+@{edg_total}-[[@{wound_total}]])d6!cs>5>5sd]]}}{{description=?{Description}}}" /> 
                     </div>
                 </div>
             </div>
@@ -325,13 +328,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="number" name="attr_avoid_total" value="@{rea_total}+@{int_total}+@{avoid_bonus}" disabled="true">
                     </div>
                     <div class="defenselabel">                    
-                        <button type="roll" class="defenseroll" name="roll_defenseroll" title="Roll to Dodge an incoming Attack" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Dodge Damage}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{val3=Bonus}}{{val3_num=[[@{avoid_bonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{avoid_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
+                        <button type="roll" class="defenseroll" name="roll_defenseroll" title="Roll to Dodge an incoming Attack" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Dodge Damage}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{val3=Bonus}}{{val3_num=[[@{avoid_bonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{result=[[(@{avoid_total}+?{Situational Modifiers}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
                     </div>
                     <div class="defenselabel">
                         <input type="number" name="attr_soak_total" value="@{armor_total}+@{bod_total}" disabled="true">
                     </div>
                     <div class="defenselabel">
-                        <button type="roll" class="armorroll" name="roll_armorroll" title="Roll to Absorb Damage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Absorb Damage}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Armor}}{{val2_num=[[@{armor_total}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{bod_total}+@{armor_total}+?{Armor Penetration}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
+                        <button type="roll" class="armorroll" name="roll_armorroll" title="Roll to Absorb Damage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Absorb Damage}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Armor}}{{val2_num=[[@{armor_total}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{bod_total}+@{armor_total}+?{Armor Penetration}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
                     </div>
                 </div>
             </div>
@@ -507,10 +510,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice1" value="@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes1" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -585,10 +588,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription1" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -662,10 +665,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice2" value="@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes2" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -740,10 +743,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription2" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -817,10 +820,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice3" value="@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes3" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -895,10 +898,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription3" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -972,10 +975,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice4" value="@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes4" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1050,10 +1053,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription4" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1127,10 +1130,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice5" value="@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes5" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1205,10 +1208,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription5" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1282,10 +1285,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice6" value="@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes6" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1360,10 +1363,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription6" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1437,10 +1440,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice7" value="@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes7" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1515,10 +1518,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription7" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1592,10 +1595,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice8" value="@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes8" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1670,10 +1673,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription8" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1783,8 +1786,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec1" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll1" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname1}}}{{val1=@{skillattr_name1}}}{{val1_num=[[@{skillattr_value1}]]}}{{val2=@{skillname1}}}{{val2_num=[[@{skillrating1}+@{skillbonus1}]]}}{{val3=@{skillspec1}}}{{val3_num=[[2*(?{Specialization @{skillspec1} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name1}}}{{limit_num=[[@{skilllimit_value1}]]}}{{limit_mod=[[@{skilllimitbonus1}]]}}{{result=[[(@{skilldicepool1}+(?{Specialization @{skillspec1} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value1}]]+@{skilllimitbonus1}]]]]}}{{description=@{skillnotes1}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll1" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname1}}}{{val1=@{skillattr_name1}}}{{val1_num=[[@{skillattr_value1}]]}}{{val2=@{skillname1}}}{{val2_num=[[@{skillrating1}+@{skillbonus1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name1}}}{{limit_num=[[@{skilllimit_value1}]]}}{{limit_mod=[[@{skilllimitbonus1}]]}}{{result=[[(@{skilldicepool1}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value1}]]+@{skilllimitbonus1}]]]]}}{{description=@{skillnotes1}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll1" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname1}}}{{val1=@{skillattr_name1}}}{{val1_num=[[@{skillattr_value1}]]}}{{val2=@{skillname1}}}{{val2_num=[[@{skillrating1}+@{skillbonus1}]]}}{{val3=@{skillspec1}}}{{val3_num=[[2*(?{Specialization @{skillspec1} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name1}}}{{limit_num=[[@{skilllimit_value1}]]}}{{limit_mod=[[@{skilllimitbonus1}]]}}{{result=[[(@{skilldicepool1}+(?{Specialization @{skillspec1} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value1}]]+@{skilllimitbonus1}]]]]}}{{description=@{skillnotes1}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll1" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname1}}}{{val1=@{skillattr_name1}}}{{val1_num=[[@{skillattr_value1}]]}}{{val2=@{skillname1}}}{{val2_num=[[@{skillrating1}+@{skillbonus1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name1}}}{{limit_num=[[@{skilllimit_value1}]]}}{{limit_mod=[[@{skilllimitbonus1}]]}}{{result=[[(@{skilldicepool1}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value1}]]+@{skilllimitbonus1}]]]]}}{{description=@{skillnotes1}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox2" title="Check to hide this Skill">
@@ -1841,8 +1844,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec2" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll2" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname2}}}{{val1=@{skillattr_name2}}}{{val1_num=[[@{skillattr_value2}]]}}{{val2=@{skillname2}}}{{val2_num=[[@{skillrating2}+@{skillbonus2}]]}}{{val3=@{skillspec2}}}{{val3_num=[[(?{Specialization @{skillspec2} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name2}}}{{limit_num=[[@{skilllimit_value2}]]}}{{limit_mod=[[@{skilllimitbonus2}]]}}{{result=[[(@{skilldicepool2}+(?{Specialization @{skillspec2} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value2}]]+@{skilllimitbonus2}]]]]}}{{description=@{skillnotes2}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll2" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname2}}}{{val1=@{skillattr_name2}}}{{val1_num=[[@{skillattr_value2}]]}}{{val2=@{skillname2}}}{{val2_num=[[@{skillrating2}+@{skillbonus2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name2}}}{{limit_num=[[@{skilllimit_value2}]]}}{{limit_mod=[[@{skilllimitbonus2}]]}}{{result=[[(@{skilldicepool2}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value2}]]+@{skilllimitbonus2}]]]]}}{{description=@{skillnotes2}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll2" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname2}}}{{val1=@{skillattr_name2}}}{{val1_num=[[@{skillattr_value2}]]}}{{val2=@{skillname2}}}{{val2_num=[[@{skillrating2}+@{skillbonus2}]]}}{{val3=@{skillspec2}}}{{val3_num=[[(?{Specialization @{skillspec2} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name2}}}{{limit_num=[[@{skilllimit_value2}]]}}{{limit_mod=[[@{skilllimitbonus2}]]}}{{result=[[(@{skilldicepool2}+(?{Specialization @{skillspec2} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value2}]]+@{skilllimitbonus2}]]]]}}{{description=@{skillnotes2}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll2" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname2}}}{{val1=@{skillattr_name2}}}{{val1_num=[[@{skillattr_value2}]]}}{{val2=@{skillname2}}}{{val2_num=[[@{skillrating2}+@{skillbonus2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name2}}}{{limit_num=[[@{skilllimit_value2}]]}}{{limit_mod=[[@{skilllimitbonus2}]]}}{{result=[[(@{skilldicepool2}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value2}]]+@{skilllimitbonus2}]]]]}}{{description=@{skillnotes2}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox3" title="Check to hide this Skill">
@@ -1899,8 +1902,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec3" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll3" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname3}}}{{val1=@{skillattr_name3}}}{{val1_num=[[@{skillattr_value3}]]}}{{val2=@{skillname3}}}{{val2_num=[[@{skillrating3}+@{skillbonus3}]]}}{{val3=@{skillspec3}}}{{val3_num=[[(?{Specialization @{skillspec3} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name3}}}{{limit_num=[[@{skilllimit_value3}]]}}{{limit_mod=[[@{skilllimitbonus3}]]}}{{result=[[(@{skilldicepool3}+(?{Specialization @{skillspec3} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value3}]]+@{skilllimitbonus3}]]]]}}{{description=@{skillnotes3}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll3" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname3}}}{{val1=@{skillattr_name3}}}{{val1_num=[[@{skillattr_value3}]]}}{{val2=@{skillname3}}}{{val2_num=[[@{skillrating3}+@{skillbonus3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name3}}}{{limit_num=[[@{skilllimit_value3}]]}}{{limit_mod=[[@{skilllimitbonus3}]]}}{{result=[[(@{skilldicepool3}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value3}]]+@{skilllimitbonus3}]]]]}}{{description=@{skillnotes3}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll3" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname3}}}{{val1=@{skillattr_name3}}}{{val1_num=[[@{skillattr_value3}]]}}{{val2=@{skillname3}}}{{val2_num=[[@{skillrating3}+@{skillbonus3}]]}}{{val3=@{skillspec3}}}{{val3_num=[[(?{Specialization @{skillspec3} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name3}}}{{limit_num=[[@{skilllimit_value3}]]}}{{limit_mod=[[@{skilllimitbonus3}]]}}{{result=[[(@{skilldicepool3}+(?{Specialization @{skillspec3} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value3}]]+@{skilllimitbonus3}]]]]}}{{description=@{skillnotes3}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll3" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname3}}}{{val1=@{skillattr_name3}}}{{val1_num=[[@{skillattr_value3}]]}}{{val2=@{skillname3}}}{{val2_num=[[@{skillrating3}+@{skillbonus3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name3}}}{{limit_num=[[@{skilllimit_value3}]]}}{{limit_mod=[[@{skilllimitbonus3}]]}}{{result=[[(@{skilldicepool3}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value3}]]+@{skilllimitbonus3}]]]]}}{{description=@{skillnotes3}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox4" title="Check to hide this Skill">
@@ -1957,8 +1960,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec4" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll4" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname4}}}{{val1=@{skillattr_name4}}}{{val1_num=[[@{skillattr_value4}]]}}{{val2=@{skillname4}}}{{val2_num=[[@{skillrating4}+@{skillbonus4}]]}}{{val3=@{skillspec4}}}{{val3_num=[[(?{Specialization @{skillspec4} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name4}}}{{limit_num=[[@{skilllimit_value4}]]}}{{limit_mod=[[@{skilllimitbonus4}]]}}{{result=[[(@{skilldicepool4}+(?{Specialization @{skillspec4} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value4}]]+@{skilllimitbonus4}]]]]}}{{description=@{skillnotes4}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll4" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname4}}}{{val1=@{skillattr_name4}}}{{val1_num=[[@{skillattr_value4}]]}}{{val2=@{skillname4}}}{{val2_num=[[@{skillrating4}+@{skillbonus4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name4}}}{{limit_num=[[@{skilllimit_value4}]]}}{{limit_mod=[[@{skilllimitbonus4}]]}}{{result=[[(@{skilldicepool4}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value4}]]+@{skilllimitbonus4}]]]]}}{{description=@{skillnotes4}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll4" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname4}}}{{val1=@{skillattr_name4}}}{{val1_num=[[@{skillattr_value4}]]}}{{val2=@{skillname4}}}{{val2_num=[[@{skillrating4}+@{skillbonus4}]]}}{{val3=@{skillspec4}}}{{val3_num=[[(?{Specialization @{skillspec4} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name4}}}{{limit_num=[[@{skilllimit_value4}]]}}{{limit_mod=[[@{skilllimitbonus4}]]}}{{result=[[(@{skilldicepool4}+(?{Specialization @{skillspec4} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value4}]]+@{skilllimitbonus4}]]]]}}{{description=@{skillnotes4}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll4" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname4}}}{{val1=@{skillattr_name4}}}{{val1_num=[[@{skillattr_value4}]]}}{{val2=@{skillname4}}}{{val2_num=[[@{skillrating4}+@{skillbonus4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name4}}}{{limit_num=[[@{skilllimit_value4}]]}}{{limit_mod=[[@{skilllimitbonus4}]]}}{{result=[[(@{skilldicepool4}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value4}]]+@{skilllimitbonus4}]]]]}}{{description=@{skillnotes4}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox5" title="Check to hide this Skill">
@@ -2015,8 +2018,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec5" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll5" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname5}}}{{val1=@{skillattr_name5}}}{{val1_num=[[@{skillattr_value5}]]}}{{val2=@{skillname5}}}{{val2_num=[[@{skillrating5}+@{skillbonus5}]]}}{{val3=@{skillspec5}}}{{val3_num=[[(?{Specialization @{skillspec5} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name5}}}{{limit_num=[[@{skilllimit_value5}]]}}{{limit_mod=[[@{skilllimitbonus5}]]}}{{result=[[(@{skilldicepool5}+(?{Specialization @{skillspec5} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value5}]]+@{skilllimitbonus5}]]]]}}{{description=@{skillnotes5}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll5" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname5}}}{{val1=@{skillattr_name5}}}{{val1_num=[[@{skillattr_value5}]]}}{{val2=@{skillname5}}}{{val2_num=[[@{skillrating5}+@{skillbonus5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name5}}}{{limit_num=[[@{skilllimit_value5}]]}}{{limit_mod=[[@{skilllimitbonus5}]]}}{{result=[[(@{skilldicepool5}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value5}]]+@{skilllimitbonus5}]]]]}}{{description=@{skillnotes5}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll5" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname5}}}{{val1=@{skillattr_name5}}}{{val1_num=[[@{skillattr_value5}]]}}{{val2=@{skillname5}}}{{val2_num=[[@{skillrating5}+@{skillbonus5}]]}}{{val3=@{skillspec5}}}{{val3_num=[[(?{Specialization @{skillspec5} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name5}}}{{limit_num=[[@{skilllimit_value5}]]}}{{limit_mod=[[@{skilllimitbonus5}]]}}{{result=[[(@{skilldicepool5}+(?{Specialization @{skillspec5} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value5}]]+@{skilllimitbonus5}]]]]}}{{description=@{skillnotes5}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll5" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname5}}}{{val1=@{skillattr_name5}}}{{val1_num=[[@{skillattr_value5}]]}}{{val2=@{skillname5}}}{{val2_num=[[@{skillrating5}+@{skillbonus5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name5}}}{{limit_num=[[@{skilllimit_value5}]]}}{{limit_mod=[[@{skilllimitbonus5}]]}}{{result=[[(@{skilldicepool5}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value5}]]+@{skilllimitbonus5}]]]]}}{{description=@{skillnotes5}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox6" title="Check to hide this Skill">
@@ -2073,8 +2076,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec6" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll6" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname6}}}{{val1=@{skillattr_name6}}}{{val1_num=[[@{skillattr_value6}]]}}{{val2=@{skillname6}}}{{val2_num=[[@{skillrating6}+@{skillbonus6}]]}}{{val3=@{skillspec6}}}{{val3_num=[[(?{Specialization @{skillspec6} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name6}}}{{limit_num=[[@{skilllimit_value6}]]}}{{limit_mod=[[@{skilllimitbonus6}]]}}{{result=[[(@{skilldicepool6}+(?{Specialization @{skillspec6} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value6}]]+@{skilllimitbonus6}]]]]}}{{description=@{skillnotes6}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll6" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname6}}}{{val1=@{skillattr_name6}}}{{val1_num=[[@{skillattr_value6}]]}}{{val2=@{skillname6}}}{{val2_num=[[@{skillrating6}+@{skillbonus6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name6}}}{{limit_num=[[@{skilllimit_value6}]]}}{{limit_mod=[[@{skilllimitbonus6}]]}}{{result=[[(@{skilldicepool6}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value6}]]+@{skilllimitbonus6}]]]]}}{{description=@{skillnotes6}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll6" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname6}}}{{val1=@{skillattr_name6}}}{{val1_num=[[@{skillattr_value6}]]}}{{val2=@{skillname6}}}{{val2_num=[[@{skillrating6}+@{skillbonus6}]]}}{{val3=@{skillspec6}}}{{val3_num=[[(?{Specialization @{skillspec6} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name6}}}{{limit_num=[[@{skilllimit_value6}]]}}{{limit_mod=[[@{skilllimitbonus6}]]}}{{result=[[(@{skilldicepool6}+(?{Specialization @{skillspec6} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value6}]]+@{skilllimitbonus6}]]]]}}{{description=@{skillnotes6}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll6" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname6}}}{{val1=@{skillattr_name6}}}{{val1_num=[[@{skillattr_value6}]]}}{{val2=@{skillname6}}}{{val2_num=[[@{skillrating6}+@{skillbonus6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name6}}}{{limit_num=[[@{skilllimit_value6}]]}}{{limit_mod=[[@{skilllimitbonus6}]]}}{{result=[[(@{skilldicepool6}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value6}]]+@{skilllimitbonus6}]]]]}}{{description=@{skillnotes6}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox7" title="Check to hide this Skill">
@@ -2131,8 +2134,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec7" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll7" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname7}}}{{val1=@{skillattr_name7}}}{{val1_num=[[@{skillattr_value7}]]}}{{val2=@{skillname7}}}{{val2_num=[[@{skillrating7}+@{skillbonus7}]]}}{{val3=@{skillspec7}}}{{val3_num=[[(?{Specialization @{skillspec7} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name7}}}{{limit_num=[[@{skilllimit_value7}]]}}{{limit_mod=[[@{skilllimitbonus7}]]}}{{result=[[(@{skilldicepool7}+(?{Specialization @{skillspec7} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value7}]]+@{skilllimitbonus7}]]]]}}{{description=@{skillnotes7}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll7" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname7}}}{{val1=@{skillattr_name7}}}{{val1_num=[[@{skillattr_value7}]]}}{{val2=@{skillname7}}}{{val2_num=[[@{skillrating7}+@{skillbonus7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name7}}}{{limit_num=[[@{skilllimit_value7}]]}}{{limit_mod=[[@{skilllimitbonus7}]]}}{{result=[[(@{skilldicepool7}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value7}]]+@{skilllimitbonus7}]]]]}}{{description=@{skillnotes7}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll7" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname7}}}{{val1=@{skillattr_name7}}}{{val1_num=[[@{skillattr_value7}]]}}{{val2=@{skillname7}}}{{val2_num=[[@{skillrating7}+@{skillbonus7}]]}}{{val3=@{skillspec7}}}{{val3_num=[[(?{Specialization @{skillspec7} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name7}}}{{limit_num=[[@{skilllimit_value7}]]}}{{limit_mod=[[@{skilllimitbonus7}]]}}{{result=[[(@{skilldicepool7}+(?{Specialization @{skillspec7} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value7}]]+@{skilllimitbonus7}]]]]}}{{description=@{skillnotes7}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll7" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname7}}}{{val1=@{skillattr_name7}}}{{val1_num=[[@{skillattr_value7}]]}}{{val2=@{skillname7}}}{{val2_num=[[@{skillrating7}+@{skillbonus7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name7}}}{{limit_num=[[@{skilllimit_value7}]]}}{{limit_mod=[[@{skilllimitbonus7}]]}}{{result=[[(@{skilldicepool7}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value7}]]+@{skilllimitbonus7}]]]]}}{{description=@{skillnotes7}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox8" title="Check to hide this Skill">
@@ -2189,8 +2192,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec8" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll8" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname8}}}{{val1=@{skillattr_name8}}}{{val1_num=[[@{skillattr_value8}]]}}{{val2=@{skillname8}}}{{val2_num=[[@{skillrating8}+@{skillbonus8}]]}}{{val3=@{skillspec8}}}{{val3_num=[[(?{Specialization @{skillspec8} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name8}}}{{limit_num=[[@{skilllimit_value8}]]}}{{limit_mod=[[@{skilllimitbonus8}]]}}{{result=[[(@{skilldicepool8}+(?{Specialization @{skillspec8} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value8}]]+@{skilllimitbonus8}]]]]}}{{description=@{skillnotes8}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll8" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname8}}}{{val1=@{skillattr_name8}}}{{val1_num=[[@{skillattr_value8}]]}}{{val2=@{skillname8}}}{{val2_num=[[@{skillrating8}+@{skillbonus8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name8}}}{{limit_num=[[@{skilllimit_value8}]]}}{{limit_mod=[[@{skilllimitbonus8}]]}}{{result=[[(@{skilldicepool8}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value8}]]+@{skilllimitbonus8}]]]]}}{{description=@{skillnotes8}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll8" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname8}}}{{val1=@{skillattr_name8}}}{{val1_num=[[@{skillattr_value8}]]}}{{val2=@{skillname8}}}{{val2_num=[[@{skillrating8}+@{skillbonus8}]]}}{{val3=@{skillspec8}}}{{val3_num=[[(?{Specialization @{skillspec8} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name8}}}{{limit_num=[[@{skilllimit_value8}]]}}{{limit_mod=[[@{skilllimitbonus8}]]}}{{result=[[(@{skilldicepool8}+(?{Specialization @{skillspec8} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value8}]]+@{skilllimitbonus8}]]]]}}{{description=@{skillnotes8}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll8" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname8}}}{{val1=@{skillattr_name8}}}{{val1_num=[[@{skillattr_value8}]]}}{{val2=@{skillname8}}}{{val2_num=[[@{skillrating8}+@{skillbonus8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name8}}}{{limit_num=[[@{skilllimit_value8}]]}}{{limit_mod=[[@{skilllimitbonus8}]]}}{{result=[[(@{skilldicepool8}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value8}]]+@{skilllimitbonus8}]]]]}}{{description=@{skillnotes8}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox9" title="Check to hide this Skill">
@@ -2247,8 +2250,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec9" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll9" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname9}}}{{val1=@{skillattr_name9}}}{{val1_num=[[@{skillattr_value9}]]}}{{val2=@{skillname9}}}{{val2_num=[[@{skillrating9}+@{skillbonus9}]]}}{{val3=@{skillspec9}}}{{val3_num=[[(?{Specialization @{skillspec9} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name9}}}{{limit_num=[[@{skilllimit_value9}]]}}{{limit_mod=[[@{skilllimitbonus9}]]}}{{result=[[(@{skilldicepool9}+(?{Specialization @{skillspec9} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value9}]]+@{skilllimitbonus9}]]]]}}{{description=@{skillnotes9}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll9" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname9}}}{{val1=@{skillattr_name9}}}{{val1_num=[[@{skillattr_value9}]]}}{{val2=@{skillname9}}}{{val2_num=[[@{skillrating9}+@{skillbonus9}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name9}}}{{limit_num=[[@{skilllimit_value9}]]}}{{limit_mod=[[@{skilllimitbonus9}]]}}{{result=[[(@{skilldicepool9}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value9}]]+@{skilllimitbonus9}]]]]}}{{description=@{skillnotes9}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll9" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname9}}}{{val1=@{skillattr_name9}}}{{val1_num=[[@{skillattr_value9}]]}}{{val2=@{skillname9}}}{{val2_num=[[@{skillrating9}+@{skillbonus9}]]}}{{val3=@{skillspec9}}}{{val3_num=[[(?{Specialization @{skillspec9} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name9}}}{{limit_num=[[@{skilllimit_value9}]]}}{{limit_mod=[[@{skilllimitbonus9}]]}}{{result=[[(@{skilldicepool9}+(?{Specialization @{skillspec9} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value9}]]+@{skilllimitbonus9}]]]]}}{{description=@{skillnotes9}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll9" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname9}}}{{val1=@{skillattr_name9}}}{{val1_num=[[@{skillattr_value9}]]}}{{val2=@{skillname9}}}{{val2_num=[[@{skillrating9}+@{skillbonus9}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name9}}}{{limit_num=[[@{skilllimit_value9}]]}}{{limit_mod=[[@{skilllimitbonus9}]]}}{{result=[[(@{skilldicepool9}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value9}]]+@{skilllimitbonus9}]]]]}}{{description=@{skillnotes9}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox10" title="Check to hide this Skill">
@@ -2305,8 +2308,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec10" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll10" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname10}}}{{val1=@{skillattr_name10}}}{{val1_num=[[@{skillattr_value10}]]}}{{val2=@{skillname10}}}{{val2_num=[[@{skillrating10}+@{skillbonus10}]]}}{{val3=@{skillspec10}}}{{val3_num=[[(?{Specialization @{skillspec10} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name10}}}{{limit_num=[[@{skilllimit_value10}]]}}{{limit_mod=[[@{skilllimitbonus10}]]}}{{result=[[(@{skilldicepool10}+(?{Specialization @{skillspec10} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value10}]]+@{skilllimitbonus10}]]]]}}{{description=@{skillnotes10}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll10" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname10}}}{{val1=@{skillattr_name10}}}{{val1_num=[[@{skillattr_value10}]]}}{{val2=@{skillname10}}}{{val2_num=[[@{skillrating10}+@{skillbonus10}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name10}}}{{limit_num=[[@{skilllimit_value10}]]}}{{limit_mod=[[@{skilllimitbonus10}]]}}{{result=[[(@{skilldicepool10}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value10}]]+@{skilllimitbonus10}]]]]}}{{description=@{skillnotes10}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll10" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname10}}}{{val1=@{skillattr_name10}}}{{val1_num=[[@{skillattr_value10}]]}}{{val2=@{skillname10}}}{{val2_num=[[@{skillrating10}+@{skillbonus10}]]}}{{val3=@{skillspec10}}}{{val3_num=[[(?{Specialization @{skillspec10} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name10}}}{{limit_num=[[@{skilllimit_value10}]]}}{{limit_mod=[[@{skilllimitbonus10}]]}}{{result=[[(@{skilldicepool10}+(?{Specialization @{skillspec10} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value10}]]+@{skilllimitbonus10}]]]]}}{{description=@{skillnotes10}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll10" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname10}}}{{val1=@{skillattr_name10}}}{{val1_num=[[@{skillattr_value10}]]}}{{val2=@{skillname10}}}{{val2_num=[[@{skillrating10}+@{skillbonus10}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name10}}}{{limit_num=[[@{skilllimit_value10}]]}}{{limit_mod=[[@{skilllimitbonus10}]]}}{{result=[[(@{skilldicepool10}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value10}]]+@{skilllimitbonus10}]]]]}}{{description=@{skillnotes10}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox11" title="Check to hide this Skill">
@@ -2363,8 +2366,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec11" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll11" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname11}}}{{val1=@{skillattr_name11}}}{{val1_num=[[@{skillattr_value11}]]}}{{val2=@{skillname11}}}{{val2_num=[[@{skillrating11}+@{skillbonus11}]]}}{{val3=@{skillspec11}}}{{val3_num=[[(?{Specialization @{skillspec11} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name11}}}{{limit_num=[[@{skilllimit_value11}]]}}{{limit_mod=[[@{skilllimitbonus11}]]}}{{result=[[(@{skilldicepool11}+(?{Specialization @{skillspec11} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value11}]]+@{skilllimitbonus11}]]]]}}{{description=@{skillnotes11}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll11" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname11}}}{{val1=@{skillattr_name11}}}{{val1_num=[[@{skillattr_value11}]]}}{{val2=@{skillname11}}}{{val2_num=[[@{skillrating11}+@{skillbonus11}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name11}}}{{limit_num=[[@{skilllimit_value11}]]}}{{limit_mod=[[@{skilllimitbonus11}]]}}{{result=[[(@{skilldicepool11}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value11}]]+@{skilllimitbonus11}]]]]}}{{description=@{skillnotes11}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll11" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname11}}}{{val1=@{skillattr_name11}}}{{val1_num=[[@{skillattr_value11}]]}}{{val2=@{skillname11}}}{{val2_num=[[@{skillrating11}+@{skillbonus11}]]}}{{val3=@{skillspec11}}}{{val3_num=[[(?{Specialization @{skillspec11} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name11}}}{{limit_num=[[@{skilllimit_value11}]]}}{{limit_mod=[[@{skilllimitbonus11}]]}}{{result=[[(@{skilldicepool11}+(?{Specialization @{skillspec11} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value11}]]+@{skilllimitbonus11}]]]]}}{{description=@{skillnotes11}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll11" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname11}}}{{val1=@{skillattr_name11}}}{{val1_num=[[@{skillattr_value11}]]}}{{val2=@{skillname11}}}{{val2_num=[[@{skillrating11}+@{skillbonus11}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name11}}}{{limit_num=[[@{skilllimit_value11}]]}}{{limit_mod=[[@{skilllimitbonus11}]]}}{{result=[[(@{skilldicepool11}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value11}]]+@{skilllimitbonus11}]]]]}}{{description=@{skillnotes11}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox12" title="Check to hide this Skill">
@@ -2421,8 +2424,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec12" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll12" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname12}}}{{val1=@{skillattr_name12}}}{{val1_num=[[@{skillattr_value12}]]}}{{val2=@{skillname12}}}{{val2_num=[[@{skillrating12}+@{skillbonus12}]]}}{{val3=@{skillspec12}}}{{val3_num=[[(?{Specialization @{skillspec12} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name12}}}{{limit_num=[[@{skilllimit_value12}]]}}{{limit_mod=[[@{skilllimitbonus12}]]}}{{result=[[(@{skilldicepool12}+(?{Specialization @{skillspec12} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value12}]]+@{skilllimitbonus12}]]]]}}{{description=@{skillnotes12}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll12" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname12}}}{{val1=@{skillattr_name12}}}{{val1_num=[[@{skillattr_value12}]]}}{{val2=@{skillname12}}}{{val2_num=[[@{skillrating12}+@{skillbonus12}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name12}}}{{limit_num=[[@{skilllimit_value12}]]}}{{limit_mod=[[@{skilllimitbonus12}]]}}{{result=[[(@{skilldicepool12}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value12}]]+@{skilllimitbonus12}]]]]}}{{description=@{skillnotes12}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll12" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname12}}}{{val1=@{skillattr_name12}}}{{val1_num=[[@{skillattr_value12}]]}}{{val2=@{skillname12}}}{{val2_num=[[@{skillrating12}+@{skillbonus12}]]}}{{val3=@{skillspec12}}}{{val3_num=[[(?{Specialization @{skillspec12} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name12}}}{{limit_num=[[@{skilllimit_value12}]]}}{{limit_mod=[[@{skilllimitbonus12}]]}}{{result=[[(@{skilldicepool12}+(?{Specialization @{skillspec12} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value12}]]+@{skilllimitbonus12}]]]]}}{{description=@{skillnotes12}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll12" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname12}}}{{val1=@{skillattr_name12}}}{{val1_num=[[@{skillattr_value12}]]}}{{val2=@{skillname12}}}{{val2_num=[[@{skillrating12}+@{skillbonus12}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name12}}}{{limit_num=[[@{skilllimit_value12}]]}}{{limit_mod=[[@{skilllimitbonus12}]]}}{{result=[[(@{skilldicepool12}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value12}]]+@{skilllimitbonus12}]]]]}}{{description=@{skillnotes12}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox13" title="Check to hide this Skill">
@@ -2479,8 +2482,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec13" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll13" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname13}}}{{val1=@{skillattr_name13}}}{{val1_num=[[@{skillattr_value13}]]}}{{val2=@{skillname13}}}{{val2_num=[[@{skillrating13}+@{skillbonus13}]]}}{{val3=@{skillspec13}}}{{val3_num=[[(?{Specialization @{skillspec13} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name13}}}{{limit_num=[[@{skilllimit_value13}]]}}{{limit_mod=[[@{skilllimitbonus13}]]}}{{result=[[(@{skilldicepool13}+(?{Specialization @{skillspec13} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value13}]]+@{skilllimitbonus13}]]]]}}{{description=@{skillnotes13}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll13" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname13}}}{{val1=@{skillattr_name13}}}{{val1_num=[[@{skillattr_value13}]]}}{{val2=@{skillname13}}}{{val2_num=[[@{skillrating13}+@{skillbonus13}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name13}}}{{limit_num=[[@{skilllimit_value13}]]}}{{limit_mod=[[@{skilllimitbonus13}]]}}{{result=[[(@{skilldicepool13}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value13}]]+@{skilllimitbonus13}]]]]}}{{description=@{skillnotes13}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll13" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname13}}}{{val1=@{skillattr_name13}}}{{val1_num=[[@{skillattr_value13}]]}}{{val2=@{skillname13}}}{{val2_num=[[@{skillrating13}+@{skillbonus13}]]}}{{val3=@{skillspec13}}}{{val3_num=[[(?{Specialization @{skillspec13} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name13}}}{{limit_num=[[@{skilllimit_value13}]]}}{{limit_mod=[[@{skilllimitbonus13}]]}}{{result=[[(@{skilldicepool13}+(?{Specialization @{skillspec13} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value13}]]+@{skilllimitbonus13}]]]]}}{{description=@{skillnotes13}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll13" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname13}}}{{val1=@{skillattr_name13}}}{{val1_num=[[@{skillattr_value13}]]}}{{val2=@{skillname13}}}{{val2_num=[[@{skillrating13}+@{skillbonus13}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name13}}}{{limit_num=[[@{skilllimit_value13}]]}}{{limit_mod=[[@{skilllimitbonus13}]]}}{{result=[[(@{skilldicepool13}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value13}]]+@{skilllimitbonus13}]]]]}}{{description=@{skillnotes13}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -2583,8 +2586,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec14" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll14" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname14}}}{{val1=@{skillattr_name14}}}{{val1_num=[[@{skillattr_value14}]]}}{{val2=@{skillname14}}}{{val2_num=[[@{skillrating14}+@{skillbonus14}]]}}{{val3=@{skillspec14}}}{{val3_num=[[(?{Specialization @{skillspec14} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name14}}}{{limit_num=[[@{skilllimit_value14}]]}}{{limit_mod=[[@{skilllimitbonus14}]]}}{{result=[[(@{skilldicepool14}+(?{Specialization @{skillspec14} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value14}]]+@{skilllimitbonus14}]]]]}}{{description=@{skillnotes14}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll14" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname14}}}{{val1=@{skillattr_name14}}}{{val1_num=[[@{skillattr_value14}]]}}{{val2=@{skillname14}}}{{val2_num=[[@{skillrating14}+@{skillbonus14}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name14}}}{{limit_num=[[@{skilllimit_value14}]]}}{{limit_mod=[[@{skilllimitbonus14}]]}}{{result=[[(@{skilldicepool14}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value14}]]+@{skilllimitbonus14}]]]]}}{{description=@{skillnotes14}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll14" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname14}}}{{val1=@{skillattr_name14}}}{{val1_num=[[@{skillattr_value14}]]}}{{val2=@{skillname14}}}{{val2_num=[[@{skillrating14}+@{skillbonus14}]]}}{{val3=@{skillspec14}}}{{val3_num=[[(?{Specialization @{skillspec14} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name14}}}{{limit_num=[[@{skilllimit_value14}]]}}{{limit_mod=[[@{skilllimitbonus14}]]}}{{result=[[(@{skilldicepool14}+(?{Specialization @{skillspec14} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value14}]]+@{skilllimitbonus14}]]]]}}{{description=@{skillnotes14}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll14" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname14}}}{{val1=@{skillattr_name14}}}{{val1_num=[[@{skillattr_value14}]]}}{{val2=@{skillname14}}}{{val2_num=[[@{skillrating14}+@{skillbonus14}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name14}}}{{limit_num=[[@{skilllimit_value14}]]}}{{limit_mod=[[@{skilllimitbonus14}]]}}{{result=[[(@{skilldicepool14}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value14}]]+@{skilllimitbonus14}]]]]}}{{description=@{skillnotes14}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox15" title="Check to hide this Skill">
@@ -2641,8 +2644,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec15" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll15" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname15}}}{{val1=@{skillattr_name15}}}{{val1_num=[[@{skillattr_value15}]]}}{{val2=@{skillname15}}}{{val2_num=[[@{skillrating15}+@{skillbonus15}]]}}{{val3=@{skillspec15}}}{{val3_num=[[(?{Specialization @{skillspec15} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name15}}}{{limit_num=[[@{skilllimit_value15}]]}}{{limit_mod=[[@{skilllimitbonus15}]]}}{{result=[[(@{skilldicepool15}+(?{Specialization @{skillspec15} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value15}]]+@{skilllimitbonus15}]]]]}}{{description=@{skillnotes15}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll15" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname15}}}{{val1=@{skillattr_name15}}}{{val1_num=[[@{skillattr_value15}]]}}{{val2=@{skillname15}}}{{val2_num=[[@{skillrating15}+@{skillbonus15}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name15}}}{{limit_num=[[@{skilllimit_value15}]]}}{{limit_mod=[[@{skilllimitbonus15}]]}}{{result=[[(@{skilldicepool15}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value15}]]+@{skilllimitbonus15}]]]]}}{{description=@{skillnotes15}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll15" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname15}}}{{val1=@{skillattr_name15}}}{{val1_num=[[@{skillattr_value15}]]}}{{val2=@{skillname15}}}{{val2_num=[[@{skillrating15}+@{skillbonus15}]]}}{{val3=@{skillspec15}}}{{val3_num=[[(?{Specialization @{skillspec15} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name15}}}{{limit_num=[[@{skilllimit_value15}]]}}{{limit_mod=[[@{skilllimitbonus15}]]}}{{result=[[(@{skilldicepool15}+(?{Specialization @{skillspec15} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value15}]]+@{skilllimitbonus15}]]]]}}{{description=@{skillnotes15}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll15" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname15}}}{{val1=@{skillattr_name15}}}{{val1_num=[[@{skillattr_value15}]]}}{{val2=@{skillname15}}}{{val2_num=[[@{skillrating15}+@{skillbonus15}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name15}}}{{limit_num=[[@{skilllimit_value15}]]}}{{limit_mod=[[@{skilllimitbonus15}]]}}{{result=[[(@{skilldicepool15}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value15}]]+@{skilllimitbonus15}]]]]}}{{description=@{skillnotes15}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox16" title="Check to hide this Skill">
@@ -2699,8 +2702,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec16" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll16" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname16}}}{{val1=@{skillattr_name16}}}{{val1_num=[[@{skillattr_value16}]]}}{{val2=@{skillname16}}}{{val2_num=[[@{skillrating16}+@{skillbonus16}]]}}{{val3=@{skillspec16}}}{{val3_num=[[(?{Specialization @{skillspec16} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name16}}}{{limit_num=[[@{skilllimit_value16}]]}}{{limit_mod=[[@{skilllimitbonus16}]]}}{{result=[[(@{skilldicepool16}+(?{Specialization @{skillspec16} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value16}]]+@{skilllimitbonus16}]]]]}}{{description=@{skillnotes16}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll16" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname16}}}{{val1=@{skillattr_name16}}}{{val1_num=[[@{skillattr_value16}]]}}{{val2=@{skillname16}}}{{val2_num=[[@{skillrating16}+@{skillbonus16}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name16}}}{{limit_num=[[@{skilllimit_value16}]]}}{{limit_mod=[[@{skilllimitbonus16}]]}}{{result=[[(@{skilldicepool16}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value16}]]+@{skilllimitbonus16}]]]]}}{{description=@{skillnotes16}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll16" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname16}}}{{val1=@{skillattr_name16}}}{{val1_num=[[@{skillattr_value16}]]}}{{val2=@{skillname16}}}{{val2_num=[[@{skillrating16}+@{skillbonus16}]]}}{{val3=@{skillspec16}}}{{val3_num=[[(?{Specialization @{skillspec16} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name16}}}{{limit_num=[[@{skilllimit_value16}]]}}{{limit_mod=[[@{skilllimitbonus16}]]}}{{result=[[(@{skilldicepool16}+(?{Specialization @{skillspec16} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value16}]]+@{skilllimitbonus16}]]]]}}{{description=@{skillnotes16}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll16" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname16}}}{{val1=@{skillattr_name16}}}{{val1_num=[[@{skillattr_value16}]]}}{{val2=@{skillname16}}}{{val2_num=[[@{skillrating16}+@{skillbonus16}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name16}}}{{limit_num=[[@{skilllimit_value16}]]}}{{limit_mod=[[@{skilllimitbonus16}]]}}{{result=[[(@{skilldicepool16}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value16}]]+@{skilllimitbonus16}]]]]}}{{description=@{skillnotes16}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox17" title="Check to hide this Skill">
@@ -2757,8 +2760,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec17" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll17" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname17}}}{{val1=@{skillattr_name17}}}{{val1_num=[[@{skillattr_value17}]]}}{{val2=@{skillname17}}}{{val2_num=[[@{skillrating17}+@{skillbonus17}]]}}{{val3=@{skillspec17}}}{{val3_num=[[(?{Specialization @{skillspec17} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name17}}}{{limit_num=[[@{skilllimit_value17}]]}}{{limit_mod=[[@{skilllimitbonus17}]]}}{{result=[[(@{skilldicepool17}+(?{Specialization @{skillspec17} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value17}]]+@{skilllimitbonus17}]]]]}}{{description=@{skillnotes17}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll17" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname17}}}{{val1=@{skillattr_name17}}}{{val1_num=[[@{skillattr_value17}]]}}{{val2=@{skillname17}}}{{val2_num=[[@{skillrating17}+@{skillbonus17}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name17}}}{{limit_num=[[@{skilllimit_value17}]]}}{{limit_mod=[[@{skilllimitbonus17}]]}}{{result=[[(@{skilldicepool17}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value17}]]+@{skilllimitbonus17}]]]]}}{{description=@{skillnotes17}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll17" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname17}}}{{val1=@{skillattr_name17}}}{{val1_num=[[@{skillattr_value17}]]}}{{val2=@{skillname17}}}{{val2_num=[[@{skillrating17}+@{skillbonus17}]]}}{{val3=@{skillspec17}}}{{val3_num=[[(?{Specialization @{skillspec17} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name17}}}{{limit_num=[[@{skilllimit_value17}]]}}{{limit_mod=[[@{skilllimitbonus17}]]}}{{result=[[(@{skilldicepool17}+(?{Specialization @{skillspec17} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value17}]]+@{skilllimitbonus17}]]]]}}{{description=@{skillnotes17}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll17" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname17}}}{{val1=@{skillattr_name17}}}{{val1_num=[[@{skillattr_value17}]]}}{{val2=@{skillname17}}}{{val2_num=[[@{skillrating17}+@{skillbonus17}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name17}}}{{limit_num=[[@{skilllimit_value17}]]}}{{limit_mod=[[@{skilllimitbonus17}]]}}{{result=[[(@{skilldicepool17}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value17}]]+@{skilllimitbonus17}]]]]}}{{description=@{skillnotes17}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox18" title="Check to hide this Skill">
@@ -2815,8 +2818,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec18" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll18" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname18}}}{{val1=@{skillattr_name18}}}{{val1_num=[[@{skillattr_value18}]]}}{{val2=@{skillname18}}}{{val2_num=[[@{skillrating18}+@{skillbonus18}]]}}{{val3=@{skillspec18}}}{{val3_num=[[(?{Specialization @{skillspec18} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name18}}}{{limit_num=[[@{skilllimit_value18}]]}}{{limit_mod=[[@{skilllimitbonus18}]]}}{{result=[[(@{skilldicepool18}+(?{Specialization @{skillspec18} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value18}]]+@{skilllimitbonus18}]]]]}}{{description=@{skillnotes18}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll18" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname18}}}{{val1=@{skillattr_name18}}}{{val1_num=[[@{skillattr_value18}]]}}{{val2=@{skillname18}}}{{val2_num=[[@{skillrating18}+@{skillbonus18}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name18}}}{{limit_num=[[@{skilllimit_value18}]]}}{{limit_mod=[[@{skilllimitbonus18}]]}}{{result=[[(@{skilldicepool18}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value18}]]+@{skilllimitbonus18}]]]]}}{{description=@{skillnotes18}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll18" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname18}}}{{val1=@{skillattr_name18}}}{{val1_num=[[@{skillattr_value18}]]}}{{val2=@{skillname18}}}{{val2_num=[[@{skillrating18}+@{skillbonus18}]]}}{{val3=@{skillspec18}}}{{val3_num=[[(?{Specialization @{skillspec18} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name18}}}{{limit_num=[[@{skilllimit_value18}]]}}{{limit_mod=[[@{skilllimitbonus18}]]}}{{result=[[(@{skilldicepool18}+(?{Specialization @{skillspec18} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value18}]]+@{skilllimitbonus18}]]]]}}{{description=@{skillnotes18}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll18" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname18}}}{{val1=@{skillattr_name18}}}{{val1_num=[[@{skillattr_value18}]]}}{{val2=@{skillname18}}}{{val2_num=[[@{skillrating18}+@{skillbonus18}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name18}}}{{limit_num=[[@{skilllimit_value18}]]}}{{limit_mod=[[@{skilllimitbonus18}]]}}{{result=[[(@{skilldicepool18}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value18}]]+@{skilllimitbonus18}]]]]}}{{description=@{skillnotes18}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox19" title="Check to hide this Skill">
@@ -2873,8 +2876,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec19" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll19" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname19}}}{{val1=@{skillattr_name19}}}{{val1_num=[[@{skillattr_value19}]]}}{{val2=@{skillname19}}}{{val2_num=[[@{skillrating19}+@{skillbonus19}]]}}{{val3=@{skillspec19}}}{{val3_num=[[(?{Specialization @{skillspec19} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name19}}}{{limit_num=[[@{skilllimit_value19}]]}}{{limit_mod=[[@{skilllimitbonus19}]]}}{{result=[[(@{skilldicepool19}+(?{Specialization @{skillspec19} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value19}]]+@{skilllimitbonus19}]]]]}}{{description=@{skillnotes19}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll19" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname19}}}{{val1=@{skillattr_name19}}}{{val1_num=[[@{skillattr_value19}]]}}{{val2=@{skillname19}}}{{val2_num=[[@{skillrating19}+@{skillbonus19}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name19}}}{{limit_num=[[@{skilllimit_value19}]]}}{{limit_mod=[[@{skilllimitbonus19}]]}}{{result=[[(@{skilldicepool19}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value19}]]+@{skilllimitbonus19}]]]]}}{{description=@{skillnotes19}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll19" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname19}}}{{val1=@{skillattr_name19}}}{{val1_num=[[@{skillattr_value19}]]}}{{val2=@{skillname19}}}{{val2_num=[[@{skillrating19}+@{skillbonus19}]]}}{{val3=@{skillspec19}}}{{val3_num=[[(?{Specialization @{skillspec19} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name19}}}{{limit_num=[[@{skilllimit_value19}]]}}{{limit_mod=[[@{skilllimitbonus19}]]}}{{result=[[(@{skilldicepool19}+(?{Specialization @{skillspec19} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value19}]]+@{skilllimitbonus19}]]]]}}{{description=@{skillnotes19}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll19" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname19}}}{{val1=@{skillattr_name19}}}{{val1_num=[[@{skillattr_value19}]]}}{{val2=@{skillname19}}}{{val2_num=[[@{skillrating19}+@{skillbonus19}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name19}}}{{limit_num=[[@{skilllimit_value19}]]}}{{limit_mod=[[@{skilllimitbonus19}]]}}{{result=[[(@{skilldicepool19}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value19}]]+@{skilllimitbonus19}]]]]}}{{description=@{skillnotes19}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox20" title="Check to hide this Skill">
@@ -2931,8 +2934,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec20" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll20" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname20}}}{{val1=@{skillattr_name20}}}{{val1_num=[[@{skillattr_value20}]]}}{{val2=@{skillname20}}}{{val2_num=[[@{skillrating20}+@{skillbonus20}]]}}{{val3=@{skillspec20}}}{{val3_num=[[(?{Specialization @{skillspec20} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name20}}}{{limit_num=[[@{skilllimit_value20}]]}}{{limit_mod=[[@{skilllimitbonus20}]]}}{{result=[[(@{skilldicepool20}+(?{Specialization @{skillspec20} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value20}]]+@{skilllimitbonus20}]]]]}}{{description=@{skillnotes20}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll20" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname20}}}{{val1=@{skillattr_name20}}}{{val1_num=[[@{skillattr_value20}]]}}{{val2=@{skillname20}}}{{val2_num=[[@{skillrating20}+@{skillbonus20}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name20}}}{{limit_num=[[@{skilllimit_value20}]]}}{{limit_mod=[[@{skilllimitbonus20}]]}}{{result=[[(@{skilldicepool20}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value20}]]+@{skilllimitbonus20}]]]]}}{{description=@{skillnotes20}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll20" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname20}}}{{val1=@{skillattr_name20}}}{{val1_num=[[@{skillattr_value20}]]}}{{val2=@{skillname20}}}{{val2_num=[[@{skillrating20}+@{skillbonus20}]]}}{{val3=@{skillspec20}}}{{val3_num=[[(?{Specialization @{skillspec20} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name20}}}{{limit_num=[[@{skilllimit_value20}]]}}{{limit_mod=[[@{skilllimitbonus20}]]}}{{result=[[(@{skilldicepool20}+(?{Specialization @{skillspec20} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value20}]]+@{skilllimitbonus20}]]]]}}{{description=@{skillnotes20}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll20" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname20}}}{{val1=@{skillattr_name20}}}{{val1_num=[[@{skillattr_value20}]]}}{{val2=@{skillname20}}}{{val2_num=[[@{skillrating20}+@{skillbonus20}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name20}}}{{limit_num=[[@{skilllimit_value20}]]}}{{limit_mod=[[@{skilllimitbonus20}]]}}{{result=[[(@{skilldicepool20}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value20}]]+@{skilllimitbonus20}]]]]}}{{description=@{skillnotes20}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox21" title="Check to hide this Skill">
@@ -2989,8 +2992,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec21" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll21" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname21}}}{{val1=@{skillattr_name21}}}{{val1_num=[[@{skillattr_value21}]]}}{{val2=@{skillname21}}}{{val2_num=[[@{skillrating21}+@{skillbonus21}]]}}{{val3=@{skillspec21}}}{{val3_num=[[(?{Specialization @{skillspec21} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name21}}}{{limit_num=[[@{skilllimit_value21}]]}}{{limit_mod=[[@{skilllimitbonus21}]]}}{{result=[[(@{skilldicepool21}+(?{Specialization @{skillspec21} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value21}]]+@{skilllimitbonus21}]]]]}}{{description=@{skillnotes21}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll21" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname21}}}{{val1=@{skillattr_name21}}}{{val1_num=[[@{skillattr_value21}]]}}{{val2=@{skillname21}}}{{val2_num=[[@{skillrating21}+@{skillbonus21}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name21}}}{{limit_num=[[@{skilllimit_value21}]]}}{{limit_mod=[[@{skilllimitbonus21}]]}}{{result=[[(@{skilldicepool21}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value21}]]+@{skilllimitbonus21}]]]]}}{{description=@{skillnotes21}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll21" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname21}}}{{val1=@{skillattr_name21}}}{{val1_num=[[@{skillattr_value21}]]}}{{val2=@{skillname21}}}{{val2_num=[[@{skillrating21}+@{skillbonus21}]]}}{{val3=@{skillspec21}}}{{val3_num=[[(?{Specialization @{skillspec21} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name21}}}{{limit_num=[[@{skilllimit_value21}]]}}{{limit_mod=[[@{skilllimitbonus21}]]}}{{result=[[(@{skilldicepool21}+(?{Specialization @{skillspec21} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value21}]]+@{skilllimitbonus21}]]]]}}{{description=@{skillnotes21}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll21" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname21}}}{{val1=@{skillattr_name21}}}{{val1_num=[[@{skillattr_value21}]]}}{{val2=@{skillname21}}}{{val2_num=[[@{skillrating21}+@{skillbonus21}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name21}}}{{limit_num=[[@{skilllimit_value21}]]}}{{limit_mod=[[@{skilllimitbonus21}]]}}{{result=[[(@{skilldicepool21}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value21}]]+@{skilllimitbonus21}]]]]}}{{description=@{skillnotes21}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -3093,8 +3096,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec22" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll22" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname22}}}{{val1=@{skillattr_name22}}}{{val1_num=[[@{skillattr_value22}]]}}{{val2=@{skillname22}}}{{val2_num=[[@{skillrating22}+@{skillbonus22}]]}}{{val3=@{skillspec22}}}{{val3_num=[[(?{Specialization @{skillspec22} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name22}}}{{limit_num=[[@{skilllimit_value22}]]}}{{limit_mod=[[@{skilllimitbonus22}]]}}{{result=[[(@{skilldicepool22}+(?{Specialization @{skillspec22} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value22}]]+@{skilllimitbonus22}]]]]}}{{description=@{skillnotes22}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll22" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname22}}}{{val1=@{skillattr_name22}}}{{val1_num=[[@{skillattr_value22}]]}}{{val2=@{skillname22}}}{{val2_num=[[@{skillrating22}+@{skillbonus22}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name22}}}{{limit_num=[[@{skilllimit_value22}]]}}{{limit_mod=[[@{skilllimitbonus22}]]}}{{result=[[(@{skilldicepool22}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value22}]]+@{skilllimitbonus22}]]]]}}{{description=@{skillnotes22}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll22" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname22}}}{{val1=@{skillattr_name22}}}{{val1_num=[[@{skillattr_value22}]]}}{{val2=@{skillname22}}}{{val2_num=[[@{skillrating22}+@{skillbonus22}]]}}{{val3=@{skillspec22}}}{{val3_num=[[(?{Specialization @{skillspec22} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name22}}}{{limit_num=[[@{skilllimit_value22}]]}}{{limit_mod=[[@{skilllimitbonus22}]]}}{{result=[[(@{skilldicepool22}+(?{Specialization @{skillspec22} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value22}]]+@{skilllimitbonus22}]]]]}}{{description=@{skillnotes22}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll22" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname22}}}{{val1=@{skillattr_name22}}}{{val1_num=[[@{skillattr_value22}]]}}{{val2=@{skillname22}}}{{val2_num=[[@{skillrating22}+@{skillbonus22}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name22}}}{{limit_num=[[@{skilllimit_value22}]]}}{{limit_mod=[[@{skilllimitbonus22}]]}}{{result=[[(@{skilldicepool22}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value22}]]+@{skilllimitbonus22}]]]]}}{{description=@{skillnotes22}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox23" title="Check to hide this Skill">
@@ -3151,8 +3154,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec23" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll23" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname23}}}{{val1=@{skillattr_name23}}}{{val1_num=[[@{skillattr_value23}]]}}{{val2=@{skillname23}}}{{val2_num=[[@{skillrating23}+@{skillbonus23}]]}}{{val3=@{skillspec23}}}{{val3_num=[[(?{Specialization @{skillspec23} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name23}}}{{limit_num=[[@{skilllimit_value23}]]}}{{limit_mod=[[@{skilllimitbonus23}]]}}{{result=[[(@{skilldicepool23}+(?{Specialization @{skillspec23} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value23}]]+@{skilllimitbonus23}]]]]}}{{description=@{skillnotes23}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll23" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname23}}}{{val1=@{skillattr_name23}}}{{val1_num=[[@{skillattr_value23}]]}}{{val2=@{skillname23}}}{{val2_num=[[@{skillrating23}+@{skillbonus23}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name23}}}{{limit_num=[[@{skilllimit_value23}]]}}{{limit_mod=[[@{skilllimitbonus23}]]}}{{result=[[(@{skilldicepool23}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value23}]]+@{skilllimitbonus23}]]]]}}{{description=@{skillnotes23}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll23" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname23}}}{{val1=@{skillattr_name23}}}{{val1_num=[[@{skillattr_value23}]]}}{{val2=@{skillname23}}}{{val2_num=[[@{skillrating23}+@{skillbonus23}]]}}{{val3=@{skillspec23}}}{{val3_num=[[(?{Specialization @{skillspec23} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name23}}}{{limit_num=[[@{skilllimit_value23}]]}}{{limit_mod=[[@{skilllimitbonus23}]]}}{{result=[[(@{skilldicepool23}+(?{Specialization @{skillspec23} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value23}]]+@{skilllimitbonus23}]]]]}}{{description=@{skillnotes23}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll23" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname23}}}{{val1=@{skillattr_name23}}}{{val1_num=[[@{skillattr_value23}]]}}{{val2=@{skillname23}}}{{val2_num=[[@{skillrating23}+@{skillbonus23}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name23}}}{{limit_num=[[@{skilllimit_value23}]]}}{{limit_mod=[[@{skilllimitbonus23}]]}}{{result=[[(@{skilldicepool23}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value23}]]+@{skilllimitbonus23}]]]]}}{{description=@{skillnotes23}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox24" title="Check to hide this Skill">
@@ -3209,8 +3212,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec24" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll24" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname24}}}{{val1=@{skillattr_name24}}}{{val1_num=[[@{skillattr_value24}]]}}{{val2=@{skillname24}}}{{val2_num=[[@{skillrating24}+@{skillbonus24}]]}}{{val3=@{skillspec24}}}{{val3_num=[[(?{Specialization @{skillspec24} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name24}}}{{limit_num=[[@{skilllimit_value24}]]}}{{limit_mod=[[@{skilllimitbonus24}]]}}{{result=[[(@{skilldicepool24}+(?{Specialization @{skillspec24} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value24}]]+@{skilllimitbonus24}]]]]}}{{description=@{skillnotes24}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll24" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname24}}}{{val1=@{skillattr_name24}}}{{val1_num=[[@{skillattr_value24}]]}}{{val2=@{skillname24}}}{{val2_num=[[@{skillrating24}+@{skillbonus24}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name24}}}{{limit_num=[[@{skilllimit_value24}]]}}{{limit_mod=[[@{skilllimitbonus24}]]}}{{result=[[(@{skilldicepool24}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value24}]]+@{skilllimitbonus24}]]]]}}{{description=@{skillnotes24}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll24" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname24}}}{{val1=@{skillattr_name24}}}{{val1_num=[[@{skillattr_value24}]]}}{{val2=@{skillname24}}}{{val2_num=[[@{skillrating24}+@{skillbonus24}]]}}{{val3=@{skillspec24}}}{{val3_num=[[(?{Specialization @{skillspec24} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name24}}}{{limit_num=[[@{skilllimit_value24}]]}}{{limit_mod=[[@{skilllimitbonus24}]]}}{{result=[[(@{skilldicepool24}+(?{Specialization @{skillspec24} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value24}]]+@{skilllimitbonus24}]]]]}}{{description=@{skillnotes24}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll24" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname24}}}{{val1=@{skillattr_name24}}}{{val1_num=[[@{skillattr_value24}]]}}{{val2=@{skillname24}}}{{val2_num=[[@{skillrating24}+@{skillbonus24}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name24}}}{{limit_num=[[@{skilllimit_value24}]]}}{{limit_mod=[[@{skilllimitbonus24}]]}}{{result=[[(@{skilldicepool24}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value24}]]+@{skilllimitbonus24}]]]]}}{{description=@{skillnotes24}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox25" title="Check to hide this Skill">
@@ -3267,8 +3270,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec25" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll25" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname25}}}{{val1=@{skillattr_name25}}}{{val1_num=[[@{skillattr_value25}]]}}{{val2=@{skillname25}}}{{val2_num=[[@{skillrating25}+@{skillbonus25}]]}}{{val3=@{skillspec25}}}{{val3_num=[[(?{Specialization @{skillspec25} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name25}}}{{limit_num=[[@{skilllimit_value25}]]}}{{limit_mod=[[@{skilllimitbonus25}]]}}{{result=[[(@{skilldicepool25}+(?{Specialization @{skillspec25} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value25}]]+@{skilllimitbonus25}]]]]}}{{description=@{skillnotes25}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll25" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname25}}}{{val1=@{skillattr_name25}}}{{val1_num=[[@{skillattr_value25}]]}}{{val2=@{skillname25}}}{{val2_num=[[@{skillrating25}+@{skillbonus25}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name25}}}{{limit_num=[[@{skilllimit_value25}]]}}{{limit_mod=[[@{skilllimitbonus25}]]}}{{result=[[(@{skilldicepool25}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value25}]]+@{skilllimitbonus25}]]]]}}{{description=@{skillnotes25}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll25" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname25}}}{{val1=@{skillattr_name25}}}{{val1_num=[[@{skillattr_value25}]]}}{{val2=@{skillname25}}}{{val2_num=[[@{skillrating25}+@{skillbonus25}]]}}{{val3=@{skillspec25}}}{{val3_num=[[(?{Specialization @{skillspec25} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name25}}}{{limit_num=[[@{skilllimit_value25}]]}}{{limit_mod=[[@{skilllimitbonus25}]]}}{{result=[[(@{skilldicepool25}+(?{Specialization @{skillspec25} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value25}]]+@{skilllimitbonus25}]]]]}}{{description=@{skillnotes25}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll25" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname25}}}{{val1=@{skillattr_name25}}}{{val1_num=[[@{skillattr_value25}]]}}{{val2=@{skillname25}}}{{val2_num=[[@{skillrating25}+@{skillbonus25}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name25}}}{{limit_num=[[@{skilllimit_value25}]]}}{{limit_mod=[[@{skilllimitbonus25}]]}}{{result=[[(@{skilldicepool25}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value25}]]+@{skilllimitbonus25}]]]]}}{{description=@{skillnotes25}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox26" title="Check to hide this Skill">
@@ -3325,8 +3328,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec26" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll26" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname26}}}{{val1=@{skillattr_name26}}}{{val1_num=[[@{skillattr_value26}]]}}{{val2=@{skillname26}}}{{val2_num=[[@{skillrating26}+@{skillbonus26}]]}}{{val3=@{skillspec26}}}{{val3_num=[[(?{Specialization @{skillspec26} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name26}}}{{limit_num=[[@{skilllimit_value26}]]}}{{limit_mod=[[@{skilllimitbonus26}]]}}{{result=[[(@{skilldicepool26}+(?{Specialization @{skillspec26} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value26}]]+@{skilllimitbonus26}]]]]}}{{description=@{skillnotes26}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll26" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname26}}}{{val1=@{skillattr_name26}}}{{val1_num=[[@{skillattr_value26}]]}}{{val2=@{skillname26}}}{{val2_num=[[@{skillrating26}+@{skillbonus26}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name26}}}{{limit_num=[[@{skilllimit_value26}]]}}{{limit_mod=[[@{skilllimitbonus26}]]}}{{result=[[(@{skilldicepool26}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value26}]]+@{skilllimitbonus26}]]]]}}{{description=@{skillnotes26}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll26" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname26}}}{{val1=@{skillattr_name26}}}{{val1_num=[[@{skillattr_value26}]]}}{{val2=@{skillname26}}}{{val2_num=[[@{skillrating26}+@{skillbonus26}]]}}{{val3=@{skillspec26}}}{{val3_num=[[(?{Specialization @{skillspec26} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name26}}}{{limit_num=[[@{skilllimit_value26}]]}}{{limit_mod=[[@{skilllimitbonus26}]]}}{{result=[[(@{skilldicepool26}+(?{Specialization @{skillspec26} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value26}]]+@{skilllimitbonus26}]]]]}}{{description=@{skillnotes26}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll26" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname26}}}{{val1=@{skillattr_name26}}}{{val1_num=[[@{skillattr_value26}]]}}{{val2=@{skillname26}}}{{val2_num=[[@{skillrating26}+@{skillbonus26}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name26}}}{{limit_num=[[@{skilllimit_value26}]]}}{{limit_mod=[[@{skilllimitbonus26}]]}}{{result=[[(@{skilldicepool26}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value26}]]+@{skilllimitbonus26}]]]]}}{{description=@{skillnotes26}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox27" title="Check to hide this Skill">
@@ -3383,8 +3386,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec27" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll27" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname27}}}{{val1=@{skillattr_name27}}}{{val1_num=[[@{skillattr_value27}]]}}{{val2=@{skillname27}}}{{val2_num=[[@{skillrating27}+@{skillbonus27}]]}}{{val3=@{skillspec27}}}{{val3_num=[[(?{Specialization @{skillspec27} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name27}}}{{limit_num=[[@{skilllimit_value27}]]}}{{limit_mod=[[@{skilllimitbonus27}]]}}{{result=[[(@{skilldicepool27}+(?{Specialization @{skillspec27} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value27}]]+@{skilllimitbonus27}]]]]}}{{description=@{skillnotes27}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll27" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname27}}}{{val1=@{skillattr_name27}}}{{val1_num=[[@{skillattr_value27}]]}}{{val2=@{skillname27}}}{{val2_num=[[@{skillrating27}+@{skillbonus27}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name27}}}{{limit_num=[[@{skilllimit_value27}]]}}{{limit_mod=[[@{skilllimitbonus27}]]}}{{result=[[(@{skilldicepool27}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value27}]]+@{skilllimitbonus27}]]]]}}{{description=@{skillnotes27}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll27" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname27}}}{{val1=@{skillattr_name27}}}{{val1_num=[[@{skillattr_value27}]]}}{{val2=@{skillname27}}}{{val2_num=[[@{skillrating27}+@{skillbonus27}]]}}{{val3=@{skillspec27}}}{{val3_num=[[(?{Specialization @{skillspec27} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name27}}}{{limit_num=[[@{skilllimit_value27}]]}}{{limit_mod=[[@{skilllimitbonus27}]]}}{{result=[[(@{skilldicepool27}+(?{Specialization @{skillspec27} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value27}]]+@{skilllimitbonus27}]]]]}}{{description=@{skillnotes27}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll27" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname27}}}{{val1=@{skillattr_name27}}}{{val1_num=[[@{skillattr_value27}]]}}{{val2=@{skillname27}}}{{val2_num=[[@{skillrating27}+@{skillbonus27}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name27}}}{{limit_num=[[@{skilllimit_value27}]]}}{{limit_mod=[[@{skilllimitbonus27}]]}}{{result=[[(@{skilldicepool27}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value27}]]+@{skilllimitbonus27}]]]]}}{{description=@{skillnotes27}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox28" title="Check to hide this Skill">
@@ -3441,8 +3444,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec28" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll28" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname28}}}{{val1=@{skillattr_name28}}}{{val1_num=[[@{skillattr_value28}]]}}{{val2=@{skillname28}}}{{val2_num=[[@{skillrating28}+@{skillbonus28}]]}}{{val3=@{skillspec28}}}{{val3_num=[[(?{Specialization @{skillspec28} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name28}}}{{limit_num=[[@{skilllimit_value28}]]}}{{limit_mod=[[@{skilllimitbonus28}]]}}{{result=[[(@{skilldicepool28}+(?{Specialization @{skillspec28} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value28}]]+@{skilllimitbonus28}]]]]}}{{description=@{skillnotes28}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll28" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname28}}}{{val1=@{skillattr_name28}}}{{val1_num=[[@{skillattr_value28}]]}}{{val2=@{skillname28}}}{{val2_num=[[@{skillrating28}+@{skillbonus28}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name28}}}{{limit_num=[[@{skilllimit_value28}]]}}{{limit_mod=[[@{skilllimitbonus28}]]}}{{result=[[(@{skilldicepool28}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value28}]]+@{skilllimitbonus28}]]]]}}{{description=@{skillnotes28}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll28" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname28}}}{{val1=@{skillattr_name28}}}{{val1_num=[[@{skillattr_value28}]]}}{{val2=@{skillname28}}}{{val2_num=[[@{skillrating28}+@{skillbonus28}]]}}{{val3=@{skillspec28}}}{{val3_num=[[(?{Specialization @{skillspec28} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name28}}}{{limit_num=[[@{skilllimit_value28}]]}}{{limit_mod=[[@{skilllimitbonus28}]]}}{{result=[[(@{skilldicepool28}+(?{Specialization @{skillspec28} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value28}]]+@{skilllimitbonus28}]]]]}}{{description=@{skillnotes28}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll28" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname28}}}{{val1=@{skillattr_name28}}}{{val1_num=[[@{skillattr_value28}]]}}{{val2=@{skillname28}}}{{val2_num=[[@{skillrating28}+@{skillbonus28}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name28}}}{{limit_num=[[@{skilllimit_value28}]]}}{{limit_mod=[[@{skilllimitbonus28}]]}}{{result=[[(@{skilldicepool28}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value28}]]+@{skilllimitbonus28}]]]]}}{{description=@{skillnotes28}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox29" title="Check to hide this Skill">
@@ -3499,8 +3502,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec29" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll29" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname29}}}{{val1=@{skillattr_name29}}}{{val1_num=[[@{skillattr_value29}]]}}{{val2=@{skillname29}}}{{val2_num=[[@{skillrating29}+@{skillbonus29}]]}}{{val3=@{skillspec29}}}{{val3_num=[[(?{Specialization @{skillspec29} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name29}}}{{limit_num=[[@{skilllimit_value29}]]}}{{limit_mod=[[@{skilllimitbonus29}]]}}{{result=[[(@{skilldicepool29}+(?{Specialization @{skillspec29} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value29}]]+@{skilllimitbonus29}]]]]}}{{description=@{skillnotes29}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll29" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname29}}}{{val1=@{skillattr_name29}}}{{val1_num=[[@{skillattr_value29}]]}}{{val2=@{skillname29}}}{{val2_num=[[@{skillrating29}+@{skillbonus29}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name29}}}{{limit_num=[[@{skilllimit_value29}]]}}{{limit_mod=[[@{skilllimitbonus29}]]}}{{result=[[(@{skilldicepool29}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value29}]]+@{skilllimitbonus29}]]]]}}{{description=@{skillnotes29}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll29" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname29}}}{{val1=@{skillattr_name29}}}{{val1_num=[[@{skillattr_value29}]]}}{{val2=@{skillname29}}}{{val2_num=[[@{skillrating29}+@{skillbonus29}]]}}{{val3=@{skillspec29}}}{{val3_num=[[(?{Specialization @{skillspec29} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name29}}}{{limit_num=[[@{skilllimit_value29}]]}}{{limit_mod=[[@{skilllimitbonus29}]]}}{{result=[[(@{skilldicepool29}+(?{Specialization @{skillspec29} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value29}]]+@{skilllimitbonus29}]]]]}}{{description=@{skillnotes29}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll29" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname29}}}{{val1=@{skillattr_name29}}}{{val1_num=[[@{skillattr_value29}]]}}{{val2=@{skillname29}}}{{val2_num=[[@{skillrating29}+@{skillbonus29}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name29}}}{{limit_num=[[@{skilllimit_value29}]]}}{{limit_mod=[[@{skilllimitbonus29}]]}}{{result=[[(@{skilldicepool29}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value29}]]+@{skilllimitbonus29}]]]]}}{{description=@{skillnotes29}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox30" title="Check to hide this Skill">
@@ -3557,8 +3560,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec30" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll30" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname30}}}{{val1=@{skillattr_name30}}}{{val1_num=[[@{skillattr_value30}]]}}{{val2=@{skillname30}}}{{val2_num=[[@{skillrating30}+@{skillbonus30}]]}}{{val3=@{skillspec30}}}{{val3_num=[[(?{Specialization @{skillspec30} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name30}}}{{limit_num=[[@{skilllimit_value30}]]}}{{limit_mod=[[@{skilllimitbonus30}]]}}{{result=[[(@{skilldicepool30}+(?{Specialization @{skillspec30} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value30}]]+@{skilllimitbonus30}]]]]}}{{description=@{skillnotes30}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll30" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname30}}}{{val1=@{skillattr_name30}}}{{val1_num=[[@{skillattr_value30}]]}}{{val2=@{skillname30}}}{{val2_num=[[@{skillrating30}+@{skillbonus30}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name30}}}{{limit_num=[[@{skilllimit_value30}]]}}{{limit_mod=[[@{skilllimitbonus30}]]}}{{result=[[(@{skilldicepool30}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value30}]]+@{skilllimitbonus30}]]]]}}{{description=@{skillnotes30}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll30" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname30}}}{{val1=@{skillattr_name30}}}{{val1_num=[[@{skillattr_value30}]]}}{{val2=@{skillname30}}}{{val2_num=[[@{skillrating30}+@{skillbonus30}]]}}{{val3=@{skillspec30}}}{{val3_num=[[(?{Specialization @{skillspec30} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name30}}}{{limit_num=[[@{skilllimit_value30}]]}}{{limit_mod=[[@{skilllimitbonus30}]]}}{{result=[[(@{skilldicepool30}+(?{Specialization @{skillspec30} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value30}]]+@{skilllimitbonus30}]]]]}}{{description=@{skillnotes30}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll30" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname30}}}{{val1=@{skillattr_name30}}}{{val1_num=[[@{skillattr_value30}]]}}{{val2=@{skillname30}}}{{val2_num=[[@{skillrating30}+@{skillbonus30}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name30}}}{{limit_num=[[@{skilllimit_value30}]]}}{{limit_mod=[[@{skilllimitbonus30}]]}}{{result=[[(@{skilldicepool30}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value30}]]+@{skilllimitbonus30}]]]]}}{{description=@{skillnotes30}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox31" title="Check to hide this Skill">
@@ -3615,8 +3618,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec31" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll31" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname31}}}{{val1=@{skillattr_name31}}}{{val1_num=[[@{skillattr_value31}]]}}{{val2=@{skillname31}}}{{val2_num=[[@{skillrating31}+@{skillbonus31}]]}}{{val3=@{skillspec31}}}{{val3_num=[[(?{Specialization @{skillspec31} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name31}}}{{limit_num=[[@{skilllimit_value31}]]}}{{limit_mod=[[@{skilllimitbonus31}]]}}{{result=[[(@{skilldicepool31}+(?{Specialization @{skillspec31} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value31}]]+@{skilllimitbonus31}]]]]}}{{description=@{skillnotes31}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll31" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname31}}}{{val1=@{skillattr_name31}}}{{val1_num=[[@{skillattr_value31}]]}}{{val2=@{skillname31}}}{{val2_num=[[@{skillrating31}+@{skillbonus31}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name31}}}{{limit_num=[[@{skilllimit_value31}]]}}{{limit_mod=[[@{skilllimitbonus31}]]}}{{result=[[(@{skilldicepool31}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value31}]]+@{skilllimitbonus31}]]]]}}{{description=@{skillnotes31}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll31" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname31}}}{{val1=@{skillattr_name31}}}{{val1_num=[[@{skillattr_value31}]]}}{{val2=@{skillname31}}}{{val2_num=[[@{skillrating31}+@{skillbonus31}]]}}{{val3=@{skillspec31}}}{{val3_num=[[(?{Specialization @{skillspec31} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name31}}}{{limit_num=[[@{skilllimit_value31}]]}}{{limit_mod=[[@{skilllimitbonus31}]]}}{{result=[[(@{skilldicepool31}+(?{Specialization @{skillspec31} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value31}]]+@{skilllimitbonus31}]]]]}}{{description=@{skillnotes31}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll31" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname31}}}{{val1=@{skillattr_name31}}}{{val1_num=[[@{skillattr_value31}]]}}{{val2=@{skillname31}}}{{val2_num=[[@{skillrating31}+@{skillbonus31}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name31}}}{{limit_num=[[@{skilllimit_value31}]]}}{{limit_mod=[[@{skilllimitbonus31}]]}}{{result=[[(@{skilldicepool31}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value31}]]+@{skilllimitbonus31}]]]]}}{{description=@{skillnotes31}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -3719,8 +3722,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec32" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll32" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname32}}}{{val1=@{skillattr_name32}}}{{val1_num=[[@{skillattr_value32}]]}}{{val2=@{skillname32}}}{{val2_num=[[@{skillrating32}+@{skillbonus32}]]}}{{val3=@{skillspec32}}}{{val3_num=[[(?{Specialization @{skillspec32} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name32}}}{{limit_num=[[@{skilllimit_value32}]]}}{{limit_mod=[[@{skilllimitbonus32}]]}}{{result=[[(@{skilldicepool32}+(?{Specialization @{skillspec32} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value32}]]+@{skilllimitbonus32}]]]]}}{{description=@{skillnotes32}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll32" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname32}}}{{val1=@{skillattr_name32}}}{{val1_num=[[@{skillattr_value32}]]}}{{val2=@{skillname32}}}{{val2_num=[[@{skillrating32}+@{skillbonus32}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name32}}}{{limit_num=[[@{skilllimit_value32}]]}}{{limit_mod=[[@{skilllimitbonus32}]]}}{{result=[[(@{skilldicepool32}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value32}]]+@{skilllimitbonus32}]]]]}}{{description=@{skillnotes32}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll32" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname32}}}{{val1=@{skillattr_name32}}}{{val1_num=[[@{skillattr_value32}]]}}{{val2=@{skillname32}}}{{val2_num=[[@{skillrating32}+@{skillbonus32}]]}}{{val3=@{skillspec32}}}{{val3_num=[[(?{Specialization @{skillspec32} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name32}}}{{limit_num=[[@{skilllimit_value32}]]}}{{limit_mod=[[@{skilllimitbonus32}]]}}{{result=[[(@{skilldicepool32}+(?{Specialization @{skillspec32} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value32}]]+@{skilllimitbonus32}]]]]}}{{description=@{skillnotes32}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll32" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname32}}}{{val1=@{skillattr_name32}}}{{val1_num=[[@{skillattr_value32}]]}}{{val2=@{skillname32}}}{{val2_num=[[@{skillrating32}+@{skillbonus32}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name32}}}{{limit_num=[[@{skilllimit_value32}]]}}{{limit_mod=[[@{skilllimitbonus32}]]}}{{result=[[(@{skilldicepool32}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value32}]]+@{skilllimitbonus32}]]]]}}{{description=@{skillnotes32}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox33" title="Check to hide this Skill">
@@ -3777,8 +3780,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec33" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll33" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname33}}}{{val1=@{skillattr_name33}}}{{val1_num=[[@{skillattr_value33}]]}}{{val2=@{skillname33}}}{{val2_num=[[@{skillrating33}+@{skillbonus33}]]}}{{val3=@{skillspec33}}}{{val3_num=[[(?{Specialization @{skillspec33} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name33}}}{{limit_num=[[@{skilllimit_value33}]]}}{{limit_mod=[[@{skilllimitbonus33}]]}}{{result=[[(@{skilldicepool33}+(?{Specialization @{skillspec33} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value33}]]+@{skilllimitbonus33}]]]]}}{{description=@{skillnotes33}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll33" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname33}}}{{val1=@{skillattr_name33}}}{{val1_num=[[@{skillattr_value33}]]}}{{val2=@{skillname33}}}{{val2_num=[[@{skillrating33}+@{skillbonus33}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name33}}}{{limit_num=[[@{skilllimit_value33}]]}}{{limit_mod=[[@{skilllimitbonus33}]]}}{{result=[[(@{skilldicepool33}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value33}]]+@{skilllimitbonus33}]]]]}}{{description=@{skillnotes33}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll33" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname33}}}{{val1=@{skillattr_name33}}}{{val1_num=[[@{skillattr_value33}]]}}{{val2=@{skillname33}}}{{val2_num=[[@{skillrating33}+@{skillbonus33}]]}}{{val3=@{skillspec33}}}{{val3_num=[[(?{Specialization @{skillspec33} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name33}}}{{limit_num=[[@{skilllimit_value33}]]}}{{limit_mod=[[@{skilllimitbonus33}]]}}{{result=[[(@{skilldicepool33}+(?{Specialization @{skillspec33} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value33}]]+@{skilllimitbonus33}]]]]}}{{description=@{skillnotes33}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll33" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname33}}}{{val1=@{skillattr_name33}}}{{val1_num=[[@{skillattr_value33}]]}}{{val2=@{skillname33}}}{{val2_num=[[@{skillrating33}+@{skillbonus33}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name33}}}{{limit_num=[[@{skilllimit_value33}]]}}{{limit_mod=[[@{skilllimitbonus33}]]}}{{result=[[(@{skilldicepool33}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value33}]]+@{skilllimitbonus33}]]]]}}{{description=@{skillnotes33}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox34" title="Check to hide this Skill">
@@ -3835,8 +3838,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec34" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll34" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname34}}}{{val1=@{skillattr_name34}}}{{val1_num=[[@{skillattr_value34}]]}}{{val2=@{skillname34}}}{{val2_num=[[@{skillrating34}+@{skillbonus34}]]}}{{val3=@{skillspec34}}}{{val3_num=[[(?{Specialization @{skillspec34} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name34}}}{{limit_num=[[@{skilllimit_value34}]]}}{{limit_mod=[[@{skilllimitbonus34}]]}}{{result=[[(@{skilldicepool34}+(?{Specialization @{skillspec34} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value34}]]+@{skilllimitbonus34}]]]]}}{{description=@{skillnotes34}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll34" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname34}}}{{val1=@{skillattr_name34}}}{{val1_num=[[@{skillattr_value34}]]}}{{val2=@{skillname34}}}{{val2_num=[[@{skillrating34}+@{skillbonus34}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name34}}}{{limit_num=[[@{skilllimit_value34}]]}}{{limit_mod=[[@{skilllimitbonus34}]]}}{{result=[[(@{skilldicepool34}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value34}]]+@{skilllimitbonus34}]]]]}}{{description=@{skillnotes34}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll34" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname34}}}{{val1=@{skillattr_name34}}}{{val1_num=[[@{skillattr_value34}]]}}{{val2=@{skillname34}}}{{val2_num=[[@{skillrating34}+@{skillbonus34}]]}}{{val3=@{skillspec34}}}{{val3_num=[[(?{Specialization @{skillspec34} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name34}}}{{limit_num=[[@{skilllimit_value34}]]}}{{limit_mod=[[@{skilllimitbonus34}]]}}{{result=[[(@{skilldicepool34}+(?{Specialization @{skillspec34} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value34}]]+@{skilllimitbonus34}]]]]}}{{description=@{skillnotes34}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll34" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname34}}}{{val1=@{skillattr_name34}}}{{val1_num=[[@{skillattr_value34}]]}}{{val2=@{skillname34}}}{{val2_num=[[@{skillrating34}+@{skillbonus34}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name34}}}{{limit_num=[[@{skilllimit_value34}]]}}{{limit_mod=[[@{skilllimitbonus34}]]}}{{result=[[(@{skilldicepool34}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value34}]]+@{skilllimitbonus34}]]]]}}{{description=@{skillnotes34}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox35" title="Check to hide this Skill">
@@ -3893,8 +3896,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec35" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll35" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname35}}}{{val1=@{skillattr_name35}}}{{val1_num=[[@{skillattr_value35}]]}}{{val2=@{skillname35}}}{{val2_num=[[@{skillrating35}+@{skillbonus35}]]}}{{val3=@{skillspec35}}}{{val3_num=[[(?{Specialization @{skillspec35} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name35}}}{{limit_num=[[@{skilllimit_value35}]]}}{{limit_mod=[[@{skilllimitbonus35}]]}}{{result=[[(@{skilldicepool35}+(?{Specialization @{skillspec35} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value35}]]+@{skilllimitbonus35}]]]]}}{{description=@{skillnotes35}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll35" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname35}}}{{val1=@{skillattr_name35}}}{{val1_num=[[@{skillattr_value35}]]}}{{val2=@{skillname35}}}{{val2_num=[[@{skillrating35}+@{skillbonus35}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name35}}}{{limit_num=[[@{skilllimit_value35}]]}}{{limit_mod=[[@{skilllimitbonus35}]]}}{{result=[[(@{skilldicepool35}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value35}]]+@{skilllimitbonus35}]]]]}}{{description=@{skillnotes35}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll35" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname35}}}{{val1=@{skillattr_name35}}}{{val1_num=[[@{skillattr_value35}]]}}{{val2=@{skillname35}}}{{val2_num=[[@{skillrating35}+@{skillbonus35}]]}}{{val3=@{skillspec35}}}{{val3_num=[[(?{Specialization @{skillspec35} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name35}}}{{limit_num=[[@{skilllimit_value35}]]}}{{limit_mod=[[@{skilllimitbonus35}]]}}{{result=[[(@{skilldicepool35}+(?{Specialization @{skillspec35} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value35}]]+@{skilllimitbonus35}]]]]}}{{description=@{skillnotes35}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll35" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname35}}}{{val1=@{skillattr_name35}}}{{val1_num=[[@{skillattr_value35}]]}}{{val2=@{skillname35}}}{{val2_num=[[@{skillrating35}+@{skillbonus35}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name35}}}{{limit_num=[[@{skilllimit_value35}]]}}{{limit_mod=[[@{skilllimitbonus35}]]}}{{result=[[(@{skilldicepool35}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value35}]]+@{skilllimitbonus35}]]]]}}{{description=@{skillnotes35}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox36" title="Check to hide this Skill">
@@ -3951,8 +3954,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec36" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll36" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname36}}}{{val1=@{skillattr_name36}}}{{val1_num=[[@{skillattr_value36}]]}}{{val2=@{skillname36}}}{{val2_num=[[@{skillrating36}+@{skillbonus36}]]}}{{val3=@{skillspec36}}}{{val3_num=[[(?{Specialization @{skillspec36} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name36}}}{{limit_num=[[@{skilllimit_value36}]]}}{{limit_mod=[[@{skilllimitbonus36}]]}}{{result=[[(@{skilldicepool36}+(?{Specialization @{skillspec36} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value36}]]+@{skilllimitbonus36}]]]]}}{{description=@{skillnotes36}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll36" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname36}}}{{val1=@{skillattr_name36}}}{{val1_num=[[@{skillattr_value36}]]}}{{val2=@{skillname36}}}{{val2_num=[[@{skillrating36}+@{skillbonus36}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name36}}}{{limit_num=[[@{skilllimit_value36}]]}}{{limit_mod=[[@{skilllimitbonus36}]]}}{{result=[[(@{skilldicepool36}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value36}]]+@{skilllimitbonus36}]]]]}}{{description=@{skillnotes36}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll36" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname36}}}{{val1=@{skillattr_name36}}}{{val1_num=[[@{skillattr_value36}]]}}{{val2=@{skillname36}}}{{val2_num=[[@{skillrating36}+@{skillbonus36}]]}}{{val3=@{skillspec36}}}{{val3_num=[[(?{Specialization @{skillspec36} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name36}}}{{limit_num=[[@{skilllimit_value36}]]}}{{limit_mod=[[@{skilllimitbonus36}]]}}{{result=[[(@{skilldicepool36}+(?{Specialization @{skillspec36} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value36}]]+@{skilllimitbonus36}]]]]}}{{description=@{skillnotes36}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll36" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname36}}}{{val1=@{skillattr_name36}}}{{val1_num=[[@{skillattr_value36}]]}}{{val2=@{skillname36}}}{{val2_num=[[@{skillrating36}+@{skillbonus36}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name36}}}{{limit_num=[[@{skilllimit_value36}]]}}{{limit_mod=[[@{skilllimitbonus36}]]}}{{result=[[(@{skilldicepool36}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value36}]]+@{skilllimitbonus36}]]]]}}{{description=@{skillnotes36}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox37" title="Check to hide this Skill">
@@ -4009,8 +4012,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec37" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll37" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname37}}}{{val1=@{skillattr_name37}}}{{val1_num=[[@{skillattr_value37}]]}}{{val2=@{skillname37}}}{{val2_num=[[@{skillrating37}+@{skillbonus37}]]}}{{val3=@{skillspec37}}}{{val3_num=[[(?{Specialization @{skillspec37} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name37}}}{{limit_num=[[@{skilllimit_value37}]]}}{{limit_mod=[[@{skilllimitbonus37}]]}}{{result=[[(@{skilldicepool37}+(?{Specialization @{skillspec37} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value37}]]+@{skilllimitbonus37}]]]]}}{{description=@{skillnotes37}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll37" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname37}}}{{val1=@{skillattr_name37}}}{{val1_num=[[@{skillattr_value37}]]}}{{val2=@{skillname37}}}{{val2_num=[[@{skillrating37}+@{skillbonus37}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name37}}}{{limit_num=[[@{skilllimit_value37}]]}}{{limit_mod=[[@{skilllimitbonus37}]]}}{{result=[[(@{skilldicepool37}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value37}]]+@{skilllimitbonus37}]]]]}}{{description=@{skillnotes37}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll37" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname37}}}{{val1=@{skillattr_name37}}}{{val1_num=[[@{skillattr_value37}]]}}{{val2=@{skillname37}}}{{val2_num=[[@{skillrating37}+@{skillbonus37}]]}}{{val3=@{skillspec37}}}{{val3_num=[[(?{Specialization @{skillspec37} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name37}}}{{limit_num=[[@{skilllimit_value37}]]}}{{limit_mod=[[@{skilllimitbonus37}]]}}{{result=[[(@{skilldicepool37}+(?{Specialization @{skillspec37} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value37}]]+@{skilllimitbonus37}]]]]}}{{description=@{skillnotes37}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll37" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname37}}}{{val1=@{skillattr_name37}}}{{val1_num=[[@{skillattr_value37}]]}}{{val2=@{skillname37}}}{{val2_num=[[@{skillrating37}+@{skillbonus37}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name37}}}{{limit_num=[[@{skilllimit_value37}]]}}{{limit_mod=[[@{skilllimitbonus37}]]}}{{result=[[(@{skilldicepool37}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value37}]]+@{skilllimitbonus37}]]]]}}{{description=@{skillnotes37}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox38" title="Check to hide this Skill">
@@ -4067,8 +4070,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec38" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll38" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname38}}}{{val1=@{skillattr_name38}}}{{val1_num=[[@{skillattr_value38}]]}}{{val2=@{skillname38}}}{{val2_num=[[@{skillrating38}+@{skillbonus38}]]}}{{val3=@{skillspec38}}}{{val3_num=[[(?{Specialization @{skillspec38} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name38}}}{{limit_num=[[@{skilllimit_value38}]]}}{{limit_mod=[[@{skilllimitbonus38}]]}}{{result=[[(@{skilldicepool38}+(?{Specialization @{skillspec38} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value38}]]+@{skilllimitbonus38}]]]]}}{{description=@{skillnotes38}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll38" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname38}}}{{val1=@{skillattr_name38}}}{{val1_num=[[@{skillattr_value38}]]}}{{val2=@{skillname38}}}{{val2_num=[[@{skillrating38}+@{skillbonus38}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name38}}}{{limit_num=[[@{skilllimit_value38}]]}}{{limit_mod=[[@{skilllimitbonus38}]]}}{{result=[[(@{skilldicepool38}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value38}]]+@{skilllimitbonus38}]]]]}}{{description=@{skillnotes38}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll38" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname38}}}{{val1=@{skillattr_name38}}}{{val1_num=[[@{skillattr_value38}]]}}{{val2=@{skillname38}}}{{val2_num=[[@{skillrating38}+@{skillbonus38}]]}}{{val3=@{skillspec38}}}{{val3_num=[[(?{Specialization @{skillspec38} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name38}}}{{limit_num=[[@{skilllimit_value38}]]}}{{limit_mod=[[@{skilllimitbonus38}]]}}{{result=[[(@{skilldicepool38}+(?{Specialization @{skillspec38} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value38}]]+@{skilllimitbonus38}]]]]}}{{description=@{skillnotes38}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll38" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname38}}}{{val1=@{skillattr_name38}}}{{val1_num=[[@{skillattr_value38}]]}}{{val2=@{skillname38}}}{{val2_num=[[@{skillrating38}+@{skillbonus38}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name38}}}{{limit_num=[[@{skilllimit_value38}]]}}{{limit_mod=[[@{skilllimitbonus38}]]}}{{result=[[(@{skilldicepool38}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value38}]]+@{skilllimitbonus38}]]]]}}{{description=@{skillnotes38}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox39" title="Check to hide this Skill">
@@ -4125,8 +4128,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec39" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll39" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname39}}}{{val1=@{skillattr_name39}}}{{val1_num=[[@{skillattr_value39}]]}}{{val2=@{skillname39}}}{{val2_num=[[@{skillrating39}+@{skillbonus39}]]}}{{val3=@{skillspec39}}}{{val3_num=[[(?{Specialization @{skillspec39} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name39}}}{{limit_num=[[@{skilllimit_value39}]]}}{{limit_mod=[[@{skilllimitbonus39}]]}}{{result=[[(@{skilldicepool39}+(?{Specialization @{skillspec39} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value39}]]+@{skilllimitbonus39}]]]]}}{{description=@{skillnotes39}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll39" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname39}}}{{val1=@{skillattr_name39}}}{{val1_num=[[@{skillattr_value39}]]}}{{val2=@{skillname39}}}{{val2_num=[[@{skillrating39}+@{skillbonus39}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name39}}}{{limit_num=[[@{skilllimit_value39}]]}}{{limit_mod=[[@{skilllimitbonus39}]]}}{{result=[[(@{skilldicepool39}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value39}]]+@{skilllimitbonus39}]]]]}}{{description=@{skillnotes39}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll39" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname39}}}{{val1=@{skillattr_name39}}}{{val1_num=[[@{skillattr_value39}]]}}{{val2=@{skillname39}}}{{val2_num=[[@{skillrating39}+@{skillbonus39}]]}}{{val3=@{skillspec39}}}{{val3_num=[[(?{Specialization @{skillspec39} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name39}}}{{limit_num=[[@{skilllimit_value39}]]}}{{limit_mod=[[@{skilllimitbonus39}]]}}{{result=[[(@{skilldicepool39}+(?{Specialization @{skillspec39} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value39}]]+@{skilllimitbonus39}]]]]}}{{description=@{skillnotes39}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll39" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname39}}}{{val1=@{skillattr_name39}}}{{val1_num=[[@{skillattr_value39}]]}}{{val2=@{skillname39}}}{{val2_num=[[@{skillrating39}+@{skillbonus39}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name39}}}{{limit_num=[[@{skilllimit_value39}]]}}{{limit_mod=[[@{skilllimitbonus39}]]}}{{result=[[(@{skilldicepool39}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value39}]]+@{skilllimitbonus39}]]]]}}{{description=@{skillnotes39}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox40" title="Check to hide this Skill">
@@ -4183,8 +4186,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec40" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll40" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname40}}}{{val1=@{skillattr_name40}}}{{val1_num=[[@{skillattr_value40}]]}}{{val2=@{skillname40}}}{{val2_num=[[@{skillrating40}+@{skillbonus40}]]}}{{val3=@{skillspec40}}}{{val3_num=[[(?{Specialization @{skillspec40} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name40}}}{{limit_num=[[@{skilllimit_value40}]]}}{{limit_mod=[[@{skilllimitbonus40}]]}}{{result=[[(@{skilldicepool40}+(?{Specialization @{skillspec40} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value40}]]+@{skilllimitbonus40}]]]]}}{{description=@{skillnotes40}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll40" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname40}}}{{val1=@{skillattr_name40}}}{{val1_num=[[@{skillattr_value40}]]}}{{val2=@{skillname40}}}{{val2_num=[[@{skillrating40}+@{skillbonus40}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name40}}}{{limit_num=[[@{skilllimit_value40}]]}}{{limit_mod=[[@{skilllimitbonus40}]]}}{{result=[[(@{skilldicepool40}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value40}]]+@{skilllimitbonus40}]]]]}}{{description=@{skillnotes40}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll40" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname40}}}{{val1=@{skillattr_name40}}}{{val1_num=[[@{skillattr_value40}]]}}{{val2=@{skillname40}}}{{val2_num=[[@{skillrating40}+@{skillbonus40}]]}}{{val3=@{skillspec40}}}{{val3_num=[[(?{Specialization @{skillspec40} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name40}}}{{limit_num=[[@{skilllimit_value40}]]}}{{limit_mod=[[@{skilllimitbonus40}]]}}{{result=[[(@{skilldicepool40}+(?{Specialization @{skillspec40} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value40}]]+@{skilllimitbonus40}]]]]}}{{description=@{skillnotes40}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll40" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname40}}}{{val1=@{skillattr_name40}}}{{val1_num=[[@{skillattr_value40}]]}}{{val2=@{skillname40}}}{{val2_num=[[@{skillrating40}+@{skillbonus40}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name40}}}{{limit_num=[[@{skilllimit_value40}]]}}{{limit_mod=[[@{skilllimitbonus40}]]}}{{result=[[(@{skilldicepool40}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value40}]]+@{skilllimitbonus40}]]]]}}{{description=@{skillnotes40}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox41" title="Check to hide this Skill">
@@ -4241,8 +4244,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec41" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll41" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname41}}}{{val1=@{skillattr_name41}}}{{val1_num=[[@{skillattr_value41}]]}}{{val2=@{skillname41}}}{{val2_num=[[@{skillrating41}+@{skillbonus41}]]}}{{val3=@{skillspec41}}}{{val3_num=[[(?{Specialization @{skillspec41} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name41}}}{{limit_num=[[@{skilllimit_value41}]]}}{{limit_mod=[[@{skilllimitbonus41}]]}}{{result=[[(@{skilldicepool41}+(?{Specialization @{skillspec41} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value41}]]+@{skilllimitbonus41}]]]]}}{{description=@{skillnotes41}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll41" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname41}}}{{val1=@{skillattr_name41}}}{{val1_num=[[@{skillattr_value41}]]}}{{val2=@{skillname41}}}{{val2_num=[[@{skillrating41}+@{skillbonus41}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name41}}}{{limit_num=[[@{skilllimit_value41}]]}}{{limit_mod=[[@{skilllimitbonus41}]]}}{{result=[[(@{skilldicepool41}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value41}]]+@{skilllimitbonus41}]]]]}}{{description=@{skillnotes41}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll41" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname41}}}{{val1=@{skillattr_name41}}}{{val1_num=[[@{skillattr_value41}]]}}{{val2=@{skillname41}}}{{val2_num=[[@{skillrating41}+@{skillbonus41}]]}}{{val3=@{skillspec41}}}{{val3_num=[[(?{Specialization @{skillspec41} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name41}}}{{limit_num=[[@{skilllimit_value41}]]}}{{limit_mod=[[@{skilllimitbonus41}]]}}{{result=[[(@{skilldicepool41}+(?{Specialization @{skillspec41} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value41}]]+@{skilllimitbonus41}]]]]}}{{description=@{skillnotes41}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll41" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname41}}}{{val1=@{skillattr_name41}}}{{val1_num=[[@{skillattr_value41}]]}}{{val2=@{skillname41}}}{{val2_num=[[@{skillrating41}+@{skillbonus41}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name41}}}{{limit_num=[[@{skilllimit_value41}]]}}{{limit_mod=[[@{skilllimitbonus41}]]}}{{result=[[(@{skilldicepool41}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value41}]]+@{skilllimitbonus41}]]]]}}{{description=@{skillnotes41}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox42" title="Check to hide this Skill">
@@ -4299,8 +4302,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec42" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll42" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname42}}}{{val1=@{skillattr_name42}}}{{val1_num=[[@{skillattr_value42}]]}}{{val2=@{skillname42}}}{{val2_num=[[@{skillrating42}+@{skillbonus42}]]}}{{val3=@{skillspec42}}}{{val3_num=[[(?{Specialization @{skillspec42} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name42}}}{{limit_num=[[@{skilllimit_value42}]]}}{{limit_mod=[[@{skilllimitbonus42}]]}}{{result=[[(@{skilldicepool42}+(?{Specialization @{skillspec42} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value42}]]+@{skilllimitbonus42}]]]]}}{{description=@{skillnotes42}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll42" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname42}}}{{val1=@{skillattr_name42}}}{{val1_num=[[@{skillattr_value42}]]}}{{val2=@{skillname42}}}{{val2_num=[[@{skillrating42}+@{skillbonus42}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name42}}}{{limit_num=[[@{skilllimit_value42}]]}}{{limit_mod=[[@{skilllimitbonus42}]]}}{{result=[[(@{skilldicepool42}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value42}]]+@{skilllimitbonus42}]]]]}}{{description=@{skillnotes42}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll42" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname42}}}{{val1=@{skillattr_name42}}}{{val1_num=[[@{skillattr_value42}]]}}{{val2=@{skillname42}}}{{val2_num=[[@{skillrating42}+@{skillbonus42}]]}}{{val3=@{skillspec42}}}{{val3_num=[[(?{Specialization @{skillspec42} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name42}}}{{limit_num=[[@{skilllimit_value42}]]}}{{limit_mod=[[@{skilllimitbonus42}]]}}{{result=[[(@{skilldicepool42}+(?{Specialization @{skillspec42} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value42}]]+@{skilllimitbonus42}]]]]}}{{description=@{skillnotes42}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll42" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname42}}}{{val1=@{skillattr_name42}}}{{val1_num=[[@{skillattr_value42}]]}}{{val2=@{skillname42}}}{{val2_num=[[@{skillrating42}+@{skillbonus42}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name42}}}{{limit_num=[[@{skilllimit_value42}]]}}{{limit_mod=[[@{skilllimitbonus42}]]}}{{result=[[(@{skilldicepool42}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value42}]]+@{skilllimitbonus42}]]]]}}{{description=@{skillnotes42}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -4403,8 +4406,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec43" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll43" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname43}}}{{val1=@{skillattr_name43}}}{{val1_num=[[@{skillattr_value43}]]}}{{val2=@{skillname43}}}{{val2_num=[[@{skillrating43}+@{skillbonus43}]]}}{{val3=@{skillspec43}}}{{val3_num=[[(?{Specialization @{skillspec43} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name43}}}{{limit_num=[[@{skilllimit_value43}]]}}{{limit_mod=[[@{skilllimitbonus43}]]}}{{result=[[(@{skilldicepool43}+(?{Specialization @{skillspec43} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value43}]]+@{skilllimitbonus43}]]]]}}{{description=@{skillnotes43}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll43" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname43}}}{{val1=@{skillattr_name43}}}{{val1_num=[[@{skillattr_value43}]]}}{{val2=@{skillname43}}}{{val2_num=[[@{skillrating43}+@{skillbonus43}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name43}}}{{limit_num=[[@{skilllimit_value43}]]}}{{limit_mod=[[@{skilllimitbonus43}]]}}{{result=[[(@{skilldicepool43}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value43}]]+@{skilllimitbonus43}]]]]}}{{description=@{skillnotes43}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll43" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname43}}}{{val1=@{skillattr_name43}}}{{val1_num=[[@{skillattr_value43}]]}}{{val2=@{skillname43}}}{{val2_num=[[@{skillrating43}+@{skillbonus43}]]}}{{val3=@{skillspec43}}}{{val3_num=[[(?{Specialization @{skillspec43} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name43}}}{{limit_num=[[@{skilllimit_value43}]]}}{{limit_mod=[[@{skilllimitbonus43}]]}}{{result=[[(@{skilldicepool43}+(?{Specialization @{skillspec43} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value43}]]+@{skilllimitbonus43}]]]]}}{{description=@{skillnotes43}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll43" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname43}}}{{val1=@{skillattr_name43}}}{{val1_num=[[@{skillattr_value43}]]}}{{val2=@{skillname43}}}{{val2_num=[[@{skillrating43}+@{skillbonus43}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name43}}}{{limit_num=[[@{skilllimit_value43}]]}}{{limit_mod=[[@{skilllimitbonus43}]]}}{{result=[[(@{skilldicepool43}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value43}]]+@{skilllimitbonus43}]]]]}}{{description=@{skillnotes43}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox44" title="Check to hide this Skill">
@@ -4461,8 +4464,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec44" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll44" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname44}}}{{val1=@{skillattr_name44}}}{{val1_num=[[@{skillattr_value44}]]}}{{val2=@{skillname44}}}{{val2_num=[[@{skillrating44}+@{skillbonus44}]]}}{{val3=@{skillspec44}}}{{val3_num=[[(?{Specialization @{skillspec44} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name44}}}{{limit_num=[[@{skilllimit_value44}]]}}{{limit_mod=[[@{skilllimitbonus44}]]}}{{result=[[(@{skilldicepool44}+(?{Specialization @{skillspec44} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value44}]]+@{skilllimitbonus44}]]]]}}{{description=@{skillnotes44}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll44" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname44}}}{{val1=@{skillattr_name44}}}{{val1_num=[[@{skillattr_value44}]]}}{{val2=@{skillname44}}}{{val2_num=[[@{skillrating44}+@{skillbonus44}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name44}}}{{limit_num=[[@{skilllimit_value44}]]}}{{limit_mod=[[@{skilllimitbonus44}]]}}{{result=[[(@{skilldicepool44}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value44}]]+@{skilllimitbonus44}]]]]}}{{description=@{skillnotes44}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll44" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname44}}}{{val1=@{skillattr_name44}}}{{val1_num=[[@{skillattr_value44}]]}}{{val2=@{skillname44}}}{{val2_num=[[@{skillrating44}+@{skillbonus44}]]}}{{val3=@{skillspec44}}}{{val3_num=[[(?{Specialization @{skillspec44} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name44}}}{{limit_num=[[@{skilllimit_value44}]]}}{{limit_mod=[[@{skilllimitbonus44}]]}}{{result=[[(@{skilldicepool44}+(?{Specialization @{skillspec44} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value44}]]+@{skilllimitbonus44}]]]]}}{{description=@{skillnotes44}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll44" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname44}}}{{val1=@{skillattr_name44}}}{{val1_num=[[@{skillattr_value44}]]}}{{val2=@{skillname44}}}{{val2_num=[[@{skillrating44}+@{skillbonus44}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name44}}}{{limit_num=[[@{skilllimit_value44}]]}}{{limit_mod=[[@{skilllimitbonus44}]]}}{{result=[[(@{skilldicepool44}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value44}]]+@{skilllimitbonus44}]]]]}}{{description=@{skillnotes44}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox45" title="Check to hide this Skill">
@@ -4519,8 +4522,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec45" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll45" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname45}}}{{val1=@{skillattr_name45}}}{{val1_num=[[@{skillattr_value45}]]}}{{val2=@{skillname45}}}{{val2_num=[[@{skillrating45}+@{skillbonus45}]]}}{{val3=@{skillspec45}}}{{val3_num=[[(?{Specialization @{skillspec45} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name45}}}{{limit_num=[[@{skilllimit_value45}]]}}{{limit_mod=[[@{skilllimitbonus45}]]}}{{result=[[(@{skilldicepool45}+(?{Specialization @{skillspec45} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value45}]]+@{skilllimitbonus45}]]]]}}{{description=@{skillnotes45}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll45" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname45}}}{{val1=@{skillattr_name45}}}{{val1_num=[[@{skillattr_value45}]]}}{{val2=@{skillname45}}}{{val2_num=[[@{skillrating45}+@{skillbonus45}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name45}}}{{limit_num=[[@{skilllimit_value45}]]}}{{limit_mod=[[@{skilllimitbonus45}]]}}{{result=[[(@{skilldicepool45}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value45}]]+@{skilllimitbonus45}]]]]}}{{description=@{skillnotes45}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll45" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname45}}}{{val1=@{skillattr_name45}}}{{val1_num=[[@{skillattr_value45}]]}}{{val2=@{skillname45}}}{{val2_num=[[@{skillrating45}+@{skillbonus45}]]}}{{val3=@{skillspec45}}}{{val3_num=[[(?{Specialization @{skillspec45} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name45}}}{{limit_num=[[@{skilllimit_value45}]]}}{{limit_mod=[[@{skilllimitbonus45}]]}}{{result=[[(@{skilldicepool45}+(?{Specialization @{skillspec45} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value45}]]+@{skilllimitbonus45}]]]]}}{{description=@{skillnotes45}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll45" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname45}}}{{val1=@{skillattr_name45}}}{{val1_num=[[@{skillattr_value45}]]}}{{val2=@{skillname45}}}{{val2_num=[[@{skillrating45}+@{skillbonus45}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name45}}}{{limit_num=[[@{skilllimit_value45}]]}}{{limit_mod=[[@{skilllimitbonus45}]]}}{{result=[[(@{skilldicepool45}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value45}]]+@{skilllimitbonus45}]]]]}}{{description=@{skillnotes45}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox46" title="Check to hide this Skill">
@@ -4577,8 +4580,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec46" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll46" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname46}}}{{val1=@{skillattr_name46}}}{{val1_num=[[@{skillattr_value46}]]}}{{val2=@{skillname46}}}{{val2_num=[[@{skillrating46}+@{skillbonus46}]]}}{{val3=@{skillspec46}}}{{val3_num=[[(?{Specialization @{skillspec46} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name46}}}{{limit_num=[[@{skilllimit_value46}]]}}{{limit_mod=[[@{skilllimitbonus46}]]}}{{result=[[(@{skilldicepool46}+(?{Specialization @{skillspec46} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value46}]]+@{skilllimitbonus46}]]]]}}{{description=@{skillnotes46}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll46" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname46}}}{{val1=@{skillattr_name46}}}{{val1_num=[[@{skillattr_value46}]]}}{{val2=@{skillname46}}}{{val2_num=[[@{skillrating46}+@{skillbonus46}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name46}}}{{limit_num=[[@{skilllimit_value46}]]}}{{limit_mod=[[@{skilllimitbonus46}]]}}{{result=[[(@{skilldicepool46}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value46}]]+@{skilllimitbonus46}]]]]}}{{description=@{skillnotes46}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll46" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname46}}}{{val1=@{skillattr_name46}}}{{val1_num=[[@{skillattr_value46}]]}}{{val2=@{skillname46}}}{{val2_num=[[@{skillrating46}+@{skillbonus46}]]}}{{val3=@{skillspec46}}}{{val3_num=[[(?{Specialization @{skillspec46} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name46}}}{{limit_num=[[@{skilllimit_value46}]]}}{{limit_mod=[[@{skilllimitbonus46}]]}}{{result=[[(@{skilldicepool46}+(?{Specialization @{skillspec46} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value46}]]+@{skilllimitbonus46}]]]]}}{{description=@{skillnotes46}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll46" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname46}}}{{val1=@{skillattr_name46}}}{{val1_num=[[@{skillattr_value46}]]}}{{val2=@{skillname46}}}{{val2_num=[[@{skillrating46}+@{skillbonus46}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name46}}}{{limit_num=[[@{skilllimit_value46}]]}}{{limit_mod=[[@{skilllimitbonus46}]]}}{{result=[[(@{skilldicepool46}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value46}]]+@{skilllimitbonus46}]]]]}}{{description=@{skillnotes46}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox47" title="Check to hide this Skill">
@@ -4635,8 +4638,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec47" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll47" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname47}}}{{val1=@{skillattr_name47}}}{{val1_num=[[@{skillattr_value47}]]}}{{val2=@{skillname47}}}{{val2_num=[[@{skillrating47}+@{skillbonus47}]]}}{{val3=@{skillspec47}}}{{val3_num=[[(?{Specialization @{skillspec47} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name47}}}{{limit_num=[[@{skilllimit_value47}]]}}{{limit_mod=[[@{skilllimitbonus47}]]}}{{result=[[(@{skilldicepool47}+(?{Specialization @{skillspec47} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value47}]]+@{skilllimitbonus47}]]]]}}{{description=@{skillnotes47}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll47" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname47}}}{{val1=@{skillattr_name47}}}{{val1_num=[[@{skillattr_value47}]]}}{{val2=@{skillname47}}}{{val2_num=[[@{skillrating47}+@{skillbonus47}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name47}}}{{limit_num=[[@{skilllimit_value47}]]}}{{limit_mod=[[@{skilllimitbonus47}]]}}{{result=[[(@{skilldicepool47}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value47}]]+@{skilllimitbonus47}]]]]}}{{description=@{skillnotes47}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll47" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname47}}}{{val1=@{skillattr_name47}}}{{val1_num=[[@{skillattr_value47}]]}}{{val2=@{skillname47}}}{{val2_num=[[@{skillrating47}+@{skillbonus47}]]}}{{val3=@{skillspec47}}}{{val3_num=[[(?{Specialization @{skillspec47} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name47}}}{{limit_num=[[@{skilllimit_value47}]]}}{{limit_mod=[[@{skilllimitbonus47}]]}}{{result=[[(@{skilldicepool47}+(?{Specialization @{skillspec47} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value47}]]+@{skilllimitbonus47}]]]]}}{{description=@{skillnotes47}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll47" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname47}}}{{val1=@{skillattr_name47}}}{{val1_num=[[@{skillattr_value47}]]}}{{val2=@{skillname47}}}{{val2_num=[[@{skillrating47}+@{skillbonus47}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name47}}}{{limit_num=[[@{skilllimit_value47}]]}}{{limit_mod=[[@{skilllimitbonus47}]]}}{{result=[[(@{skilldicepool47}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value47}]]+@{skilllimitbonus47}]]]]}}{{description=@{skillnotes47}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox48" title="Check to hide this Skill">
@@ -4693,8 +4696,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec48" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll48" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname48}}}{{val1=@{skillattr_name48}}}{{val1_num=[[@{skillattr_value48}]]}}{{val2=@{skillname48}}}{{val2_num=[[@{skillrating48}+@{skillbonus48}]]}}{{val3=@{skillspec48}}}{{val3_num=[[(?{Specialization @{skillspec48} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name48}}}{{limit_num=[[@{skilllimit_value48}]]}}{{limit_mod=[[@{skilllimitbonus48}]]}}{{result=[[(@{skilldicepool48}+(?{Specialization @{skillspec48} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value48}]]+@{skilllimitbonus48}]]]]}}{{description=@{skillnotes48}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll48" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname48}}}{{val1=@{skillattr_name48}}}{{val1_num=[[@{skillattr_value48}]]}}{{val2=@{skillname48}}}{{val2_num=[[@{skillrating48}+@{skillbonus48}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name48}}}{{limit_num=[[@{skilllimit_value48}]]}}{{limit_mod=[[@{skilllimitbonus48}]]}}{{result=[[(@{skilldicepool48}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value48}]]+@{skilllimitbonus48}]]]]}}{{description=@{skillnotes48}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll48" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname48}}}{{val1=@{skillattr_name48}}}{{val1_num=[[@{skillattr_value48}]]}}{{val2=@{skillname48}}}{{val2_num=[[@{skillrating48}+@{skillbonus48}]]}}{{val3=@{skillspec48}}}{{val3_num=[[(?{Specialization @{skillspec48} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name48}}}{{limit_num=[[@{skilllimit_value48}]]}}{{limit_mod=[[@{skilllimitbonus48}]]}}{{result=[[(@{skilldicepool48}+(?{Specialization @{skillspec48} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value48}]]+@{skilllimitbonus48}]]]]}}{{description=@{skillnotes48}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll48" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname48}}}{{val1=@{skillattr_name48}}}{{val1_num=[[@{skillattr_value48}]]}}{{val2=@{skillname48}}}{{val2_num=[[@{skillrating48}+@{skillbonus48}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name48}}}{{limit_num=[[@{skilllimit_value48}]]}}{{limit_mod=[[@{skilllimitbonus48}]]}}{{result=[[(@{skilldicepool48}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value48}]]+@{skilllimitbonus48}]]]]}}{{description=@{skillnotes48}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox49" title="Check to hide this Skill">
@@ -4751,8 +4754,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec49" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll49" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname49}}}{{val1=@{skillattr_name49}}}{{val1_num=[[@{skillattr_value49}]]}}{{val2=@{skillname49}}}{{val2_num=[[@{skillrating49}+@{skillbonus49}]]}}{{val3=@{skillspec49}}}{{val3_num=[[(?{Specialization @{skillspec49} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name49}}}{{limit_num=[[@{skilllimit_value49}]]}}{{limit_mod=[[@{skilllimitbonus49}]]}}{{result=[[(@{skilldicepool49}+(?{Specialization @{skillspec49} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value49}]]+@{skilllimitbonus49}]]]]}}{{description=@{skillnotes49}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll49" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname49}}}{{val1=@{skillattr_name49}}}{{val1_num=[[@{skillattr_value49}]]}}{{val2=@{skillname49}}}{{val2_num=[[@{skillrating49}+@{skillbonus49}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name49}}}{{limit_num=[[@{skilllimit_value49}]]}}{{limit_mod=[[@{skilllimitbonus49}]]}}{{result=[[(@{skilldicepool49}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value49}]]+@{skilllimitbonus49}]]]]}}{{description=@{skillnotes49}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll49" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname49}}}{{val1=@{skillattr_name49}}}{{val1_num=[[@{skillattr_value49}]]}}{{val2=@{skillname49}}}{{val2_num=[[@{skillrating49}+@{skillbonus49}]]}}{{val3=@{skillspec49}}}{{val3_num=[[(?{Specialization @{skillspec49} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name49}}}{{limit_num=[[@{skilllimit_value49}]]}}{{limit_mod=[[@{skilllimitbonus49}]]}}{{result=[[(@{skilldicepool49}+(?{Specialization @{skillspec49} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value49}]]+@{skilllimitbonus49}]]]]}}{{description=@{skillnotes49}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll49" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname49}}}{{val1=@{skillattr_name49}}}{{val1_num=[[@{skillattr_value49}]]}}{{val2=@{skillname49}}}{{val2_num=[[@{skillrating49}+@{skillbonus49}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name49}}}{{limit_num=[[@{skilllimit_value49}]]}}{{limit_mod=[[@{skilllimitbonus49}]]}}{{result=[[(@{skilldicepool49}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value49}]]+@{skilllimitbonus49}]]]]}}{{description=@{skillnotes49}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox50" title="Check to hide this Skill">
@@ -4809,8 +4812,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec50" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll50" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname50}}}{{val1=@{skillattr_name50}}}{{val1_num=[[@{skillattr_value50}]]}}{{val2=@{skillname50}}}{{val2_num=[[@{skillrating50}+@{skillbonus50}]]}}{{val3=@{skillspec50}}}{{val3_num=[[(?{Specialization @{skillspec50} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name50}}}{{limit_num=[[@{skilllimit_value50}]]}}{{limit_mod=[[@{skilllimitbonus50}]]}}{{result=[[(@{skilldicepool50}+(?{Specialization @{skillspec50} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value50}]]+@{skilllimitbonus50}]]]]}}{{description=@{skillnotes50}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll50" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname50}}}{{val1=@{skillattr_name50}}}{{val1_num=[[@{skillattr_value50}]]}}{{val2=@{skillname50}}}{{val2_num=[[@{skillrating50}+@{skillbonus50}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name50}}}{{limit_num=[[@{skilllimit_value50}]]}}{{limit_mod=[[@{skilllimitbonus50}]]}}{{result=[[(@{skilldicepool50}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value50}]]+@{skilllimitbonus50}]]]]}}{{description=@{skillnotes50}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll50" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname50}}}{{val1=@{skillattr_name50}}}{{val1_num=[[@{skillattr_value50}]]}}{{val2=@{skillname50}}}{{val2_num=[[@{skillrating50}+@{skillbonus50}]]}}{{val3=@{skillspec50}}}{{val3_num=[[(?{Specialization @{skillspec50} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name50}}}{{limit_num=[[@{skilllimit_value50}]]}}{{limit_mod=[[@{skilllimitbonus50}]]}}{{result=[[(@{skilldicepool50}+(?{Specialization @{skillspec50} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value50}]]+@{skilllimitbonus50}]]]]}}{{description=@{skillnotes50}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll50" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname50}}}{{val1=@{skillattr_name50}}}{{val1_num=[[@{skillattr_value50}]]}}{{val2=@{skillname50}}}{{val2_num=[[@{skillrating50}+@{skillbonus50}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name50}}}{{limit_num=[[@{skilllimit_value50}]]}}{{limit_mod=[[@{skilllimitbonus50}]]}}{{result=[[(@{skilldicepool50}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value50}]]+@{skilllimitbonus50}]]]]}}{{description=@{skillnotes50}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox51" title="Check to hide this Skill">
@@ -4867,8 +4870,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec51" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll51" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname51}}}{{val1=@{skillattr_name51}}}{{val1_num=[[@{skillattr_value51}]]}}{{val2=@{skillname51}}}{{val2_num=[[@{skillrating51}+@{skillbonus51}]]}}{{val3=@{skillspec51}}}{{val3_num=[[(?{Specialization @{skillspec51} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name51}}}{{limit_num=[[@{skilllimit_value51}]]}}{{limit_mod=[[@{skilllimitbonus51}]]}}{{result=[[(@{skilldicepool51}+(?{Specialization @{skillspec51} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value51}]]+@{skilllimitbonus51}]]]]}}{{description=@{skillnotes51}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll51" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname51}}}{{val1=@{skillattr_name51}}}{{val1_num=[[@{skillattr_value51}]]}}{{val2=@{skillname51}}}{{val2_num=[[@{skillrating51}+@{skillbonus51}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name51}}}{{limit_num=[[@{skilllimit_value51}]]}}{{limit_mod=[[@{skilllimitbonus51}]]}}{{result=[[(@{skilldicepool51}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value51}]]+@{skilllimitbonus51}]]]]}}{{description=@{skillnotes51}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll51" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname51}}}{{val1=@{skillattr_name51}}}{{val1_num=[[@{skillattr_value51}]]}}{{val2=@{skillname51}}}{{val2_num=[[@{skillrating51}+@{skillbonus51}]]}}{{val3=@{skillspec51}}}{{val3_num=[[(?{Specialization @{skillspec51} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name51}}}{{limit_num=[[@{skilllimit_value51}]]}}{{limit_mod=[[@{skilllimitbonus51}]]}}{{result=[[(@{skilldicepool51}+(?{Specialization @{skillspec51} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value51}]]+@{skilllimitbonus51}]]]]}}{{description=@{skillnotes51}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll51" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname51}}}{{val1=@{skillattr_name51}}}{{val1_num=[[@{skillattr_value51}]]}}{{val2=@{skillname51}}}{{val2_num=[[@{skillrating51}+@{skillbonus51}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name51}}}{{limit_num=[[@{skilllimit_value51}]]}}{{limit_mod=[[@{skilllimitbonus51}]]}}{{result=[[(@{skilldicepool51}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value51}]]+@{skilllimitbonus51}]]]]}}{{description=@{skillnotes51}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -4971,8 +4974,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec52" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll52" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname52}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=@{skillname52}}}{{val2_num=[[@{skillrating52}+@{skillbonus52}]]}}{{val3=@{skillspec52}}}{{val3_num=[[(?{Specialization @{skillspec52} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name52}}}{{limit_num=[[@{skilllimit_value52}]]}}{{limit_mod=[[@{skilllimitbonus52}]]}}{{result=[[(@{skilldicepool52}+(?{Specialization @{skillspec52} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value52}]]+@{skilllimitbonus52}]]]]}}{{description=@{skillnotes52}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll52" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname52}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=@{skillname52}}}{{val2_num=[[@{skillrating52}+@{skillbonus52}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name52}}}{{limit_num=[[@{skilllimit_value52}]]}}{{limit_mod=[[@{skilllimitbonus52}]]}}{{result=[[(@{skilldicepool52}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value52}]]+@{skilllimitbonus52}]]]]}}{{description=@{skillnotes52}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll52" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname52}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=@{skillname52}}}{{val2_num=[[@{skillrating52}+@{skillbonus52}]]}}{{val3=@{skillspec52}}}{{val3_num=[[(?{Specialization @{skillspec52} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name52}}}{{limit_num=[[@{skilllimit_value52}]]}}{{limit_mod=[[@{skilllimitbonus52}]]}}{{result=[[(@{skilldicepool52}+(?{Specialization @{skillspec52} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value52}]]+@{skilllimitbonus52}]]]]}}{{description=@{skillnotes52}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll52" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname52}}}{{val1=@{skillattr_name52}}}{{val1_num=[[@{skillattr_value52}]]}}{{val2=@{skillname52}}}{{val2_num=[[@{skillrating52}+@{skillbonus52}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name52}}}{{limit_num=[[@{skilllimit_value52}]]}}{{limit_mod=[[@{skilllimitbonus52}]]}}{{result=[[(@{skilldicepool52}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value52}]]+@{skilllimitbonus52}]]]]}}{{description=@{skillnotes52}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox53" title="Check to hide this Skill">
@@ -5029,8 +5032,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec53" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll53" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname53}}}{{val1=@{skillattr_name53}}}{{val1_num=[[@{skillattr_value53}]]}}{{val2=@{skillname53}}}{{val2_num=[[@{skillrating53}+@{skillbonus53}]]}}{{val3=@{skillspec53}}}{{val3_num=[[(?{Specialization @{skillspec53} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name53}}}{{limit_num=[[@{skilllimit_value53}]]}}{{limit_mod=[[@{skilllimitbonus53}]]}}{{result=[[(@{skilldicepool53}+(?{Specialization @{skillspec53} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value53}]]+@{skilllimitbonus53}]]]]}}{{description=@{skillnotes53}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll53" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname53}}}{{val1=@{skillattr_name53}}}{{val1_num=[[@{skillattr_value53}]]}}{{val2=@{skillname53}}}{{val2_num=[[@{skillrating53}+@{skillbonus53}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name53}}}{{limit_num=[[@{skilllimit_value53}]]}}{{limit_mod=[[@{skilllimitbonus53}]]}}{{result=[[(@{skilldicepool53}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value53}]]+@{skilllimitbonus53}]]]]}}{{description=@{skillnotes53}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll53" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname53}}}{{val1=@{skillattr_name53}}}{{val1_num=[[@{skillattr_value53}]]}}{{val2=@{skillname53}}}{{val2_num=[[@{skillrating53}+@{skillbonus53}]]}}{{val3=@{skillspec53}}}{{val3_num=[[(?{Specialization @{skillspec53} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name53}}}{{limit_num=[[@{skilllimit_value53}]]}}{{limit_mod=[[@{skilllimitbonus53}]]}}{{result=[[(@{skilldicepool53}+(?{Specialization @{skillspec53} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value53}]]+@{skilllimitbonus53}]]]]}}{{description=@{skillnotes53}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll53" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname53}}}{{val1=@{skillattr_name53}}}{{val1_num=[[@{skillattr_value53}]]}}{{val2=@{skillname53}}}{{val2_num=[[@{skillrating53}+@{skillbonus53}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name53}}}{{limit_num=[[@{skilllimit_value53}]]}}{{limit_mod=[[@{skilllimitbonus53}]]}}{{result=[[(@{skilldicepool53}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value53}]]+@{skilllimitbonus53}]]]]}}{{description=@{skillnotes53}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox54" title="Check to hide this Skill">
@@ -5087,8 +5090,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec54" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll54" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname54}}}{{val1=@{skillattr_name54}}}{{val1_num=[[@{skillattr_value54}]]}}{{val2=@{skillname54}}}{{val2_num=[[@{skillrating54}+@{skillbonus54}]]}}{{val3=@{skillspec54}}}{{val3_num=[[(?{Specialization @{skillspec54} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name54}}}{{limit_num=[[@{skilllimit_value54}]]}}{{limit_mod=[[@{skilllimitbonus54}]]}}{{result=[[(@{skilldicepool54}+(?{Specialization @{skillspec54} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value54}]]+@{skilllimitbonus54}]]]]}}{{description=@{skillnotes54}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll54" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname54}}}{{val1=@{skillattr_name54}}}{{val1_num=[[@{skillattr_value54}]]}}{{val2=@{skillname54}}}{{val2_num=[[@{skillrating54}+@{skillbonus54}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name54}}}{{limit_num=[[@{skilllimit_value54}]]}}{{limit_mod=[[@{skilllimitbonus54}]]}}{{result=[[(@{skilldicepool54}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value54}]]+@{skilllimitbonus54}]]]]}}{{description=@{skillnotes54}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll54" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname54}}}{{val1=@{skillattr_name54}}}{{val1_num=[[@{skillattr_value54}]]}}{{val2=@{skillname54}}}{{val2_num=[[@{skillrating54}+@{skillbonus54}]]}}{{val3=@{skillspec54}}}{{val3_num=[[(?{Specialization @{skillspec54} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name54}}}{{limit_num=[[@{skilllimit_value54}]]}}{{limit_mod=[[@{skilllimitbonus54}]]}}{{result=[[(@{skilldicepool54}+(?{Specialization @{skillspec54} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value54}]]+@{skilllimitbonus54}]]]]}}{{description=@{skillnotes54}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll54" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname54}}}{{val1=@{skillattr_name54}}}{{val1_num=[[@{skillattr_value54}]]}}{{val2=@{skillname54}}}{{val2_num=[[@{skillrating54}+@{skillbonus54}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name54}}}{{limit_num=[[@{skilllimit_value54}]]}}{{limit_mod=[[@{skilllimitbonus54}]]}}{{result=[[(@{skilldicepool54}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value54}]]+@{skilllimitbonus54}]]]]}}{{description=@{skillnotes54}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox55" title="Check to hide this Skill">
@@ -5146,8 +5149,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec55" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll55" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname55}}}{{val1=@{skillattr_name55}}}{{val1_num=[[@{skillattr_value55}]]}}{{val2=@{skillname55}}}{{val2_num=[[@{skillrating55}+@{skillbonus55}]]}}{{val3=@{skillspec55}}}{{val3_num=[[(?{Specialization @{skillspec55} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name55}}}{{limit_num=[[@{skilllimit_value55}]]}}{{limit_mod=[[@{skilllimitbonus55}]]}}{{result=[[(@{skilldicepool55}+(?{Specialization @{skillspec55} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value55}]]+@{skilllimitbonus55}]]]]}}{{description=@{skillnotes55}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll55" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname55}}}{{val1=@{skillattr_name55}}}{{val1_num=[[@{skillattr_value55}]]}}{{val2=@{skillname55}}}{{val2_num=[[@{skillrating55}+@{skillbonus55}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name55}}}{{limit_num=[[@{skilllimit_value55}]]}}{{limit_mod=[[@{skilllimitbonus55}]]}}{{result=[[(@{skilldicepool55}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value55}]]+@{skilllimitbonus55}]]]]}}{{description=@{skillnotes55}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll55" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname55}}}{{val1=@{skillattr_name55}}}{{val1_num=[[@{skillattr_value55}]]}}{{val2=@{skillname55}}}{{val2_num=[[@{skillrating55}+@{skillbonus55}]]}}{{val3=@{skillspec55}}}{{val3_num=[[(?{Specialization @{skillspec55} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name55}}}{{limit_num=[[@{skilllimit_value55}]]}}{{limit_mod=[[@{skilllimitbonus55}]]}}{{result=[[(@{skilldicepool55}+(?{Specialization @{skillspec55} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value55}]]+@{skilllimitbonus55}]]]]}}{{description=@{skillnotes55}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll55" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname55}}}{{val1=@{skillattr_name55}}}{{val1_num=[[@{skillattr_value55}]]}}{{val2=@{skillname55}}}{{val2_num=[[@{skillrating55}+@{skillbonus55}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name55}}}{{limit_num=[[@{skilllimit_value55}]]}}{{limit_mod=[[@{skilllimitbonus55}]]}}{{result=[[(@{skilldicepool55}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value55}]]+@{skilllimitbonus55}]]]]}}{{description=@{skillnotes55}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox56" title="Check to hide this Skill">
@@ -5204,8 +5207,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec56" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll56" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname56}}}{{val1=@{skillattr_name56}}}{{val1_num=[[@{skillattr_value56}]]}}{{val2=@{skillname56}}}{{val2_num=[[@{skillrating56}+@{skillbonus56}]]}}{{val3=@{skillspec56}}}{{val3_num=[[(?{Specialization @{skillspec56} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name56}}}{{limit_num=[[@{skilllimit_value56}]]}}{{limit_mod=[[@{skilllimitbonus56}]]}}{{result=[[(@{skilldicepool56}+(?{Specialization @{skillspec56} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value56}]]+@{skilllimitbonus56}]]]]}}{{description=@{skillnotes56}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll56" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname56}}}{{val1=@{skillattr_name56}}}{{val1_num=[[@{skillattr_value56}]]}}{{val2=@{skillname56}}}{{val2_num=[[@{skillrating56}+@{skillbonus56}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name56}}}{{limit_num=[[@{skilllimit_value56}]]}}{{limit_mod=[[@{skilllimitbonus56}]]}}{{result=[[(@{skilldicepool56}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value56}]]+@{skilllimitbonus56}]]]]}}{{description=@{skillnotes56}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll56" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname56}}}{{val1=@{skillattr_name56}}}{{val1_num=[[@{skillattr_value56}]]}}{{val2=@{skillname56}}}{{val2_num=[[@{skillrating56}+@{skillbonus56}]]}}{{val3=@{skillspec56}}}{{val3_num=[[(?{Specialization @{skillspec56} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name56}}}{{limit_num=[[@{skilllimit_value56}]]}}{{limit_mod=[[@{skilllimitbonus56}]]}}{{result=[[(@{skilldicepool56}+(?{Specialization @{skillspec56} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value56}]]+@{skilllimitbonus56}]]]]}}{{description=@{skillnotes56}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll56" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname56}}}{{val1=@{skillattr_name56}}}{{val1_num=[[@{skillattr_value56}]]}}{{val2=@{skillname56}}}{{val2_num=[[@{skillrating56}+@{skillbonus56}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name56}}}{{limit_num=[[@{skilllimit_value56}]]}}{{limit_mod=[[@{skilllimitbonus56}]]}}{{result=[[(@{skilldicepool56}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value56}]]+@{skilllimitbonus56}]]]]}}{{description=@{skillnotes56}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox57" title="Check to hide this Skill">
@@ -5262,8 +5265,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec57" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll57" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname57}}}{{val1=@{skillattr_name57}}}{{val1_num=[[@{skillattr_value57}]]}}{{val2=@{skillname57}}}{{val2_num=[[@{skillrating57}+@{skillbonus57}]]}}{{val3=@{skillspec57}}}{{val3_num=[[(?{Specialization @{skillspec57} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name57}}}{{limit_num=[[@{skilllimit_value57}]]}}{{limit_mod=[[@{skilllimitbonus57}]]}}{{result=[[(@{skilldicepool57}+(?{Specialization @{skillspec57} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value57}]]+@{skilllimitbonus57}]]]]}}{{description=@{skillnotes57}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll57" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname57}}}{{val1=@{skillattr_name57}}}{{val1_num=[[@{skillattr_value57}]]}}{{val2=@{skillname57}}}{{val2_num=[[@{skillrating57}+@{skillbonus57}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name57}}}{{limit_num=[[@{skilllimit_value57}]]}}{{limit_mod=[[@{skilllimitbonus57}]]}}{{result=[[(@{skilldicepool57}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value57}]]+@{skilllimitbonus57}]]]]}}{{description=@{skillnotes57}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll57" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname57}}}{{val1=@{skillattr_name57}}}{{val1_num=[[@{skillattr_value57}]]}}{{val2=@{skillname57}}}{{val2_num=[[@{skillrating57}+@{skillbonus57}]]}}{{val3=@{skillspec57}}}{{val3_num=[[(?{Specialization @{skillspec57} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name57}}}{{limit_num=[[@{skilllimit_value57}]]}}{{limit_mod=[[@{skilllimitbonus57}]]}}{{result=[[(@{skilldicepool57}+(?{Specialization @{skillspec57} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value57}]]+@{skilllimitbonus57}]]]]}}{{description=@{skillnotes57}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll57" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname57}}}{{val1=@{skillattr_name57}}}{{val1_num=[[@{skillattr_value57}]]}}{{val2=@{skillname57}}}{{val2_num=[[@{skillrating57}+@{skillbonus57}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name57}}}{{limit_num=[[@{skilllimit_value57}]]}}{{limit_mod=[[@{skilllimitbonus57}]]}}{{result=[[(@{skilldicepool57}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value57}]]+@{skilllimitbonus57}]]]]}}{{description=@{skillnotes57}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -5366,8 +5369,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec58" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll58" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname58}}}{{val1=@{skillattr_name58}}}{{val1_num=[[@{skillattr_value58}]]}}{{val2=@{skillname58}}}{{val2_num=[[@{skillrating58}+@{skillbonus58}]]}}{{val3=@{skillspec58}}}{{val3_num=[[(?{Specialization @{skillspec58} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name58}}}{{limit_num=[[@{skilllimit_value58}]]}}{{limit_mod=[[@{skilllimitbonus58}]]}}{{result=[[(@{skilldicepool58}+(?{Specialization @{skillspec58} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value58}]]+@{skilllimitbonus58}]]]]}}{{description=@{skillnotes58}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll58" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname58}}}{{val1=@{skillattr_name58}}}{{val1_num=[[@{skillattr_value58}]]}}{{val2=@{skillname58}}}{{val2_num=[[@{skillrating58}+@{skillbonus58}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name58}}}{{limit_num=[[@{skilllimit_value58}]]}}{{limit_mod=[[@{skilllimitbonus58}]]}}{{result=[[(@{skilldicepool58}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value58}]]+@{skilllimitbonus58}]]]]}}{{description=@{skillnotes58}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll58" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname58}}}{{val1=@{skillattr_name58}}}{{val1_num=[[@{skillattr_value58}]]}}{{val2=@{skillname58}}}{{val2_num=[[@{skillrating58}+@{skillbonus58}]]}}{{val3=@{skillspec58}}}{{val3_num=[[(?{Specialization @{skillspec58} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name58}}}{{limit_num=[[@{skilllimit_value58}]]}}{{limit_mod=[[@{skilllimitbonus58}]]}}{{result=[[(@{skilldicepool58}+(?{Specialization @{skillspec58} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value58}]]+@{skilllimitbonus58}]]]]}}{{description=@{skillnotes58}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll58" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname58}}}{{val1=@{skillattr_name58}}}{{val1_num=[[@{skillattr_value58}]]}}{{val2=@{skillname58}}}{{val2_num=[[@{skillrating58}+@{skillbonus58}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name58}}}{{limit_num=[[@{skilllimit_value58}]]}}{{limit_mod=[[@{skilllimitbonus58}]]}}{{result=[[(@{skilldicepool58}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value58}]]+@{skilllimitbonus58}]]]]}}{{description=@{skillnotes58}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox59" title="Check to hide this Skill">
@@ -5424,8 +5427,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec59" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll59" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname59}}}{{val1=@{skillattr_name59}}}{{val1_num=[[@{skillattr_value59}]]}}{{val2=@{skillname59}}}{{val2_num=[[@{skillrating59}+@{skillbonus59}]]}}{{val3=@{skillspec59}}}{{val3_num=[[(?{Specialization @{skillspec59} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name59}}}{{limit_num=[[@{skilllimit_value59}]]}}{{limit_mod=[[@{skilllimitbonus59}]]}}{{result=[[(@{skilldicepool59}+(?{Specialization @{skillspec59} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value59}]]+@{skilllimitbonus59}]]]]}}{{description=@{skillnotes59}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll59" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname59}}}{{val1=@{skillattr_name59}}}{{val1_num=[[@{skillattr_value59}]]}}{{val2=@{skillname59}}}{{val2_num=[[@{skillrating59}+@{skillbonus59}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name59}}}{{limit_num=[[@{skilllimit_value59}]]}}{{limit_mod=[[@{skilllimitbonus59}]]}}{{result=[[(@{skilldicepool59}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value59}]]+@{skilllimitbonus59}]]]]}}{{description=@{skillnotes59}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll59" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname59}}}{{val1=@{skillattr_name59}}}{{val1_num=[[@{skillattr_value59}]]}}{{val2=@{skillname59}}}{{val2_num=[[@{skillrating59}+@{skillbonus59}]]}}{{val3=@{skillspec59}}}{{val3_num=[[(?{Specialization @{skillspec59} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name59}}}{{limit_num=[[@{skilllimit_value59}]]}}{{limit_mod=[[@{skilllimitbonus59}]]}}{{result=[[(@{skilldicepool59}+(?{Specialization @{skillspec59} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value59}]]+@{skilllimitbonus59}]]]]}}{{description=@{skillnotes59}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll59" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname59}}}{{val1=@{skillattr_name59}}}{{val1_num=[[@{skillattr_value59}]]}}{{val2=@{skillname59}}}{{val2_num=[[@{skillrating59}+@{skillbonus59}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name59}}}{{limit_num=[[@{skilllimit_value59}]]}}{{limit_mod=[[@{skilllimitbonus59}]]}}{{result=[[(@{skilldicepool59}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value59}]]+@{skilllimitbonus59}]]]]}}{{description=@{skillnotes59}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox60" title="Check to hide this Skill">
@@ -5482,8 +5485,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec60" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll60" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname60}}}{{val1=@{skillattr_name60}}}{{val1_num=[[@{skillattr_value60}]]}}{{val2=@{skillname60}}}{{val2_num=[[@{skillrating60}+@{skillbonus60}]]}}{{val3=@{skillspec60}}}{{val3_num=[[(?{Specialization @{skillspec60} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name60}}}{{limit_num=[[@{skilllimit_value60}]]}}{{limit_mod=[[@{skilllimitbonus60}]]}}{{result=[[(@{skilldicepool60}+(?{Specialization @{skillspec60} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value60}]]+@{skilllimitbonus60}]]]]}}{{description=@{skillnotes60}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll60" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname60}}}{{val1=@{skillattr_name60}}}{{val1_num=[[@{skillattr_value60}]]}}{{val2=@{skillname60}}}{{val2_num=[[@{skillrating60}+@{skillbonus60}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name60}}}{{limit_num=[[@{skilllimit_value60}]]}}{{limit_mod=[[@{skilllimitbonus60}]]}}{{result=[[(@{skilldicepool60}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value60}]]+@{skilllimitbonus60}]]]]}}{{description=@{skillnotes60}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll60" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname60}}}{{val1=@{skillattr_name60}}}{{val1_num=[[@{skillattr_value60}]]}}{{val2=@{skillname60}}}{{val2_num=[[@{skillrating60}+@{skillbonus60}]]}}{{val3=@{skillspec60}}}{{val3_num=[[(?{Specialization @{skillspec60} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name60}}}{{limit_num=[[@{skilllimit_value60}]]}}{{limit_mod=[[@{skilllimitbonus60}]]}}{{result=[[(@{skilldicepool60}+(?{Specialization @{skillspec60} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value60}]]+@{skilllimitbonus60}]]]]}}{{description=@{skillnotes60}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll60" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname60}}}{{val1=@{skillattr_name60}}}{{val1_num=[[@{skillattr_value60}]]}}{{val2=@{skillname60}}}{{val2_num=[[@{skillrating60}+@{skillbonus60}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name60}}}{{limit_num=[[@{skilllimit_value60}]]}}{{limit_mod=[[@{skilllimitbonus60}]]}}{{result=[[(@{skilldicepool60}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value60}]]+@{skilllimitbonus60}]]]]}}{{description=@{skillnotes60}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox61" title="Check to hide this Skill">
@@ -5540,8 +5543,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec61" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll61" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname61}}}{{val1=@{skillattr_name61}}}{{val1_num=[[@{skillattr_value61}]]}}{{val2=@{skillname61}}}{{val2_num=[[@{skillrating61}+@{skillbonus61}]]}}{{val3=@{skillspec61}}}{{val3_num=[[(?{Specialization @{skillspec61} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name61}}}{{limit_num=[[@{skilllimit_value61}]]}}{{limit_mod=[[@{skilllimitbonus61}]]}}{{result=[[(@{skilldicepool61}+(?{Specialization @{skillspec61} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value61}]]+@{skilllimitbonus61}]]]]}}{{description=@{skillnotes61}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll61" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname61}}}{{val1=@{skillattr_name61}}}{{val1_num=[[@{skillattr_value61}]]}}{{val2=@{skillname61}}}{{val2_num=[[@{skillrating61}+@{skillbonus61}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name61}}}{{limit_num=[[@{skilllimit_value61}]]}}{{limit_mod=[[@{skilllimitbonus61}]]}}{{result=[[(@{skilldicepool61}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value61}]]+@{skilllimitbonus61}]]]]}}{{description=@{skillnotes61}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll61" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname61}}}{{val1=@{skillattr_name61}}}{{val1_num=[[@{skillattr_value61}]]}}{{val2=@{skillname61}}}{{val2_num=[[@{skillrating61}+@{skillbonus61}]]}}{{val3=@{skillspec61}}}{{val3_num=[[(?{Specialization @{skillspec61} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name61}}}{{limit_num=[[@{skilllimit_value61}]]}}{{limit_mod=[[@{skilllimitbonus61}]]}}{{result=[[(@{skilldicepool61}+(?{Specialization @{skillspec61} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value61}]]+@{skilllimitbonus61}]]]]}}{{description=@{skillnotes61}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll61" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname61}}}{{val1=@{skillattr_name61}}}{{val1_num=[[@{skillattr_value61}]]}}{{val2=@{skillname61}}}{{val2_num=[[@{skillrating61}+@{skillbonus61}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name61}}}{{limit_num=[[@{skilllimit_value61}]]}}{{limit_mod=[[@{skilllimitbonus61}]]}}{{result=[[(@{skilldicepool61}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value61}]]+@{skilllimitbonus61}]]]]}}{{description=@{skillnotes61}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox62" title="Check to hide this Skill">
@@ -5598,8 +5601,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec62" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll62" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname62}}}{{val1=@{skillattr_name62}}}{{val1_num=[[@{skillattr_value62}]]}}{{val2=@{skillname62}}}{{val2_num=[[@{skillrating62}+@{skillbonus62}]]}}{{val3=@{skillspec62}}}{{val3_num=[[(?{Specialization @{skillspec62} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name62}}}{{limit_num=[[@{skilllimit_value62}]]}}{{limit_mod=[[@{skilllimitbonus62}]]}}{{result=[[(@{skilldicepool62}+(?{Specialization @{skillspec62} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value62}]]+@{skilllimitbonus62}]]]]}}{{description=@{skillnotes62}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll62" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname62}}}{{val1=@{skillattr_name62}}}{{val1_num=[[@{skillattr_value62}]]}}{{val2=@{skillname62}}}{{val2_num=[[@{skillrating62}+@{skillbonus62}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name62}}}{{limit_num=[[@{skilllimit_value62}]]}}{{limit_mod=[[@{skilllimitbonus62}]]}}{{result=[[(@{skilldicepool62}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value62}]]+@{skilllimitbonus62}]]]]}}{{description=@{skillnotes62}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll62" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname62}}}{{val1=@{skillattr_name62}}}{{val1_num=[[@{skillattr_value62}]]}}{{val2=@{skillname62}}}{{val2_num=[[@{skillrating62}+@{skillbonus62}]]}}{{val3=@{skillspec62}}}{{val3_num=[[(?{Specialization @{skillspec62} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name62}}}{{limit_num=[[@{skilllimit_value62}]]}}{{limit_mod=[[@{skilllimitbonus62}]]}}{{result=[[(@{skilldicepool62}+(?{Specialization @{skillspec62} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value62}]]+@{skilllimitbonus62}]]]]}}{{description=@{skillnotes62}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll62" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname62}}}{{val1=@{skillattr_name62}}}{{val1_num=[[@{skillattr_value62}]]}}{{val2=@{skillname62}}}{{val2_num=[[@{skillrating62}+@{skillbonus62}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name62}}}{{limit_num=[[@{skilllimit_value62}]]}}{{limit_mod=[[@{skilllimitbonus62}]]}}{{result=[[(@{skilldicepool62}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value62}]]+@{skilllimitbonus62}]]]]}}{{description=@{skillnotes62}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox63" title="Check to hide this Skill">
@@ -5656,8 +5659,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec63" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll63" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname63}}}{{val1=@{skillattr_name63}}}{{val1_num=[[@{skillattr_value63}]]}}{{val2=@{skillname63}}}{{val2_num=[[@{skillrating63}+@{skillbonus63}]]}}{{val3=@{skillspec63}}}{{val3_num=[[(?{Specialization @{skillspec63} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name63}}}{{limit_num=[[@{skilllimit_value63}]]}}{{limit_mod=[[@{skilllimitbonus63}]]}}{{result=[[(@{skilldicepool63}+(?{Specialization @{skillspec63} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value63}]]+@{skilllimitbonus63}]]]]}}{{description=@{skillnotes63}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll63" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname63}}}{{val1=@{skillattr_name63}}}{{val1_num=[[@{skillattr_value63}]]}}{{val2=@{skillname63}}}{{val2_num=[[@{skillrating63}+@{skillbonus63}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name63}}}{{limit_num=[[@{skilllimit_value63}]]}}{{limit_mod=[[@{skilllimitbonus63}]]}}{{result=[[(@{skilldicepool63}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value63}]]+@{skilllimitbonus63}]]]]}}{{description=@{skillnotes63}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll63" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname63}}}{{val1=@{skillattr_name63}}}{{val1_num=[[@{skillattr_value63}]]}}{{val2=@{skillname63}}}{{val2_num=[[@{skillrating63}+@{skillbonus63}]]}}{{val3=@{skillspec63}}}{{val3_num=[[(?{Specialization @{skillspec63} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name63}}}{{limit_num=[[@{skilllimit_value63}]]}}{{limit_mod=[[@{skilllimitbonus63}]]}}{{result=[[(@{skilldicepool63}+(?{Specialization @{skillspec63} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value63}]]+@{skilllimitbonus63}]]]]}}{{description=@{skillnotes63}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll63" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname63}}}{{val1=@{skillattr_name63}}}{{val1_num=[[@{skillattr_value63}]]}}{{val2=@{skillname63}}}{{val2_num=[[@{skillrating63}+@{skillbonus63}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name63}}}{{limit_num=[[@{skilllimit_value63}]]}}{{limit_mod=[[@{skilllimitbonus63}]]}}{{result=[[(@{skilldicepool63}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value63}]]+@{skilllimitbonus63}]]]]}}{{description=@{skillnotes63}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox64" title="Check to hide this Skill">
@@ -5714,8 +5717,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec64" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll64" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname64}}}{{val1=@{skillattr_name64}}}{{val1_num=[[@{skillattr_value64}]]}}{{val2=@{skillname64}}}{{val2_num=[[@{skillrating64}+@{skillbonus64}]]}}{{val3=@{skillspec64}}}{{val3_num=[[(?{Specialization @{skillspec64} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name64}}}{{limit_num=[[@{skilllimit_value64}]]}}{{limit_mod=[[@{skilllimitbonus64}]]}}{{result=[[(@{skilldicepool64}+(?{Specialization @{skillspec64} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value64}]]+@{skilllimitbonus64}]]]]}}{{description=@{skillnotes64}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll64" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname64}}}{{val1=@{skillattr_name64}}}{{val1_num=[[@{skillattr_value64}]]}}{{val2=@{skillname64}}}{{val2_num=[[@{skillrating64}+@{skillbonus64}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name64}}}{{limit_num=[[@{skilllimit_value64}]]}}{{limit_mod=[[@{skilllimitbonus64}]]}}{{result=[[(@{skilldicepool64}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value64}]]+@{skilllimitbonus64}]]]]}}{{description=@{skillnotes64}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll64" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname64}}}{{val1=@{skillattr_name64}}}{{val1_num=[[@{skillattr_value64}]]}}{{val2=@{skillname64}}}{{val2_num=[[@{skillrating64}+@{skillbonus64}]]}}{{val3=@{skillspec64}}}{{val3_num=[[(?{Specialization @{skillspec64} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name64}}}{{limit_num=[[@{skilllimit_value64}]]}}{{limit_mod=[[@{skilllimitbonus64}]]}}{{result=[[(@{skilldicepool64}+(?{Specialization @{skillspec64} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value64}]]+@{skilllimitbonus64}]]]]}}{{description=@{skillnotes64}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll64" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname64}}}{{val1=@{skillattr_name64}}}{{val1_num=[[@{skillattr_value64}]]}}{{val2=@{skillname64}}}{{val2_num=[[@{skillrating64}+@{skillbonus64}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name64}}}{{limit_num=[[@{skilllimit_value64}]]}}{{limit_mod=[[@{skilllimitbonus64}]]}}{{result=[[(@{skilldicepool64}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value64}]]+@{skilllimitbonus64}]]]]}}{{description=@{skillnotes64}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox65" title="Check to hide this Skill">
@@ -5772,8 +5775,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec65" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll65" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname65}}}{{val1=@{skillattr_name65}}}{{val1_num=[[@{skillattr_value65}]]}}{{val2=@{skillname65}}}{{val2_num=[[@{skillrating65}+@{skillbonus65}]]}}{{val3=@{skillspec65}}}{{val3_num=[[(?{Specialization @{skillspec65} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name65}}}{{limit_num=[[@{skilllimit_value65}]]}}{{limit_mod=[[@{skilllimitbonus65}]]}}{{result=[[(@{skilldicepool65}+(?{Specialization @{skillspec65} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value65}]]+@{skilllimitbonus65}]]]]}}{{description=@{skillnotes65}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll65" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname65}}}{{val1=@{skillattr_name65}}}{{val1_num=[[@{skillattr_value65}]]}}{{val2=@{skillname65}}}{{val2_num=[[@{skillrating65}+@{skillbonus65}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name65}}}{{limit_num=[[@{skilllimit_value65}]]}}{{limit_mod=[[@{skilllimitbonus65}]]}}{{result=[[(@{skilldicepool65}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value65}]]+@{skilllimitbonus65}]]]]}}{{description=@{skillnotes65}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll65" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname65}}}{{val1=@{skillattr_name65}}}{{val1_num=[[@{skillattr_value65}]]}}{{val2=@{skillname65}}}{{val2_num=[[@{skillrating65}+@{skillbonus65}]]}}{{val3=@{skillspec65}}}{{val3_num=[[(?{Specialization @{skillspec65} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name65}}}{{limit_num=[[@{skilllimit_value65}]]}}{{limit_mod=[[@{skilllimitbonus65}]]}}{{result=[[(@{skilldicepool65}+(?{Specialization @{skillspec65} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value65}]]+@{skilllimitbonus65}]]]]}}{{description=@{skillnotes65}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll65" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname65}}}{{val1=@{skillattr_name65}}}{{val1_num=[[@{skillattr_value65}]]}}{{val2=@{skillname65}}}{{val2_num=[[@{skillrating65}+@{skillbonus65}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name65}}}{{limit_num=[[@{skilllimit_value65}]]}}{{limit_mod=[[@{skilllimitbonus65}]]}}{{result=[[(@{skilldicepool65}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value65}]]+@{skilllimitbonus65}]]]]}}{{description=@{skillnotes65}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox66" title="Check to hide this Skill">
@@ -5830,8 +5833,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec66" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll66" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname66}}}{{val1=@{skillattr_name66}}}{{val1_num=[[@{skillattr_value66}]]}}{{val2=@{skillname66}}}{{val2_num=[[@{skillrating66}+@{skillbonus66}]]}}{{val3=@{skillspec66}}}{{val3_num=[[(?{Specialization @{skillspec66} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name66}}}{{limit_num=[[@{skilllimit_value66}]]}}{{limit_mod=[[@{skilllimitbonus66}]]}}{{result=[[(@{skilldicepool66}+(?{Specialization @{skillspec66} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value66}]]+@{skilllimitbonus66}]]]]}}{{description=@{skillnotes66}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll66" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname66}}}{{val1=@{skillattr_name66}}}{{val1_num=[[@{skillattr_value66}]]}}{{val2=@{skillname66}}}{{val2_num=[[@{skillrating66}+@{skillbonus66}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name66}}}{{limit_num=[[@{skilllimit_value66}]]}}{{limit_mod=[[@{skilllimitbonus66}]]}}{{result=[[(@{skilldicepool66}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value66}]]+@{skilllimitbonus66}]]]]}}{{description=@{skillnotes66}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll66" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname66}}}{{val1=@{skillattr_name66}}}{{val1_num=[[@{skillattr_value66}]]}}{{val2=@{skillname66}}}{{val2_num=[[@{skillrating66}+@{skillbonus66}]]}}{{val3=@{skillspec66}}}{{val3_num=[[(?{Specialization @{skillspec66} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name66}}}{{limit_num=[[@{skilllimit_value66}]]}}{{limit_mod=[[@{skilllimitbonus66}]]}}{{result=[[(@{skilldicepool66}+(?{Specialization @{skillspec66} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value66}]]+@{skilllimitbonus66}]]]]}}{{description=@{skillnotes66}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll66" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname66}}}{{val1=@{skillattr_name66}}}{{val1_num=[[@{skillattr_value66}]]}}{{val2=@{skillname66}}}{{val2_num=[[@{skillrating66}+@{skillbonus66}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name66}}}{{limit_num=[[@{skilllimit_value66}]]}}{{limit_mod=[[@{skilllimitbonus66}]]}}{{result=[[(@{skilldicepool66}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value66}]]+@{skilllimitbonus66}]]]]}}{{description=@{skillnotes66}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox67" title="Check to hide this Skill">
@@ -5888,8 +5891,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec67" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll67" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname67}}}{{val1=@{skillattr_name67}}}{{val1_num=[[@{skillattr_value67}]]}}{{val2=@{skillname67}}}{{val2_num=[[@{skillrating67}+@{skillbonus67}]]}}{{val3=@{skillspec67}}}{{val3_num=[[(?{Specialization @{skillspec67} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name67}}}{{limit_num=[[@{skilllimit_value67}]]}}{{limit_mod=[[@{skilllimitbonus67}]]}}{{result=[[(@{skilldicepool67}+(?{Specialization @{skillspec67} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value67}]]+@{skilllimitbonus67}]]]]}}{{description=@{skillnotes67}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll67" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname67}}}{{val1=@{skillattr_name67}}}{{val1_num=[[@{skillattr_value67}]]}}{{val2=@{skillname67}}}{{val2_num=[[@{skillrating67}+@{skillbonus67}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name67}}}{{limit_num=[[@{skilllimit_value67}]]}}{{limit_mod=[[@{skilllimitbonus67}]]}}{{result=[[(@{skilldicepool67}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value67}]]+@{skilllimitbonus67}]]]]}}{{description=@{skillnotes67}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll67" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname67}}}{{val1=@{skillattr_name67}}}{{val1_num=[[@{skillattr_value67}]]}}{{val2=@{skillname67}}}{{val2_num=[[@{skillrating67}+@{skillbonus67}]]}}{{val3=@{skillspec67}}}{{val3_num=[[(?{Specialization @{skillspec67} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name67}}}{{limit_num=[[@{skilllimit_value67}]]}}{{limit_mod=[[@{skilllimitbonus67}]]}}{{result=[[(@{skilldicepool67}+(?{Specialization @{skillspec67} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value67}]]+@{skilllimitbonus67}]]]]}}{{description=@{skillnotes67}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll67" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname67}}}{{val1=@{skillattr_name67}}}{{val1_num=[[@{skillattr_value67}]]}}{{val2=@{skillname67}}}{{val2_num=[[@{skillrating67}+@{skillbonus67}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name67}}}{{limit_num=[[@{skilllimit_value67}]]}}{{limit_mod=[[@{skilllimitbonus67}]]}}{{result=[[(@{skilldicepool67}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value67}]]+@{skilllimitbonus67}]]]]}}{{description=@{skillnotes67}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox68" title="Check to hide this Skill">
@@ -5946,8 +5949,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec68" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll68" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname68}}}{{val1=@{skillattr_name68}}}{{val1_num=[[@{skillattr_value68}]]}}{{val2=@{skillname68}}}{{val2_num=[[@{skillrating68}+@{skillbonus68}]]}}{{val3=@{skillspec68}}}{{val3_num=[[(?{Specialization @{skillspec68} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name68}}}{{limit_num=[[@{skilllimit_value68}]]}}{{limit_mod=[[@{skilllimitbonus68}]]}}{{result=[[(@{skilldicepool68}+(?{Specialization @{skillspec68} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value68}]]+@{skilllimitbonus68}]]]]}}{{description=@{skillnotes68}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll68" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname68}}}{{val1=@{skillattr_name68}}}{{val1_num=[[@{skillattr_value68}]]}}{{val2=@{skillname68}}}{{val2_num=[[@{skillrating68}+@{skillbonus68}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name68}}}{{limit_num=[[@{skilllimit_value68}]]}}{{limit_mod=[[@{skilllimitbonus68}]]}}{{result=[[(@{skilldicepool68}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value68}]]+@{skilllimitbonus68}]]]]}}{{description=@{skillnotes68}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll68" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname68}}}{{val1=@{skillattr_name68}}}{{val1_num=[[@{skillattr_value68}]]}}{{val2=@{skillname68}}}{{val2_num=[[@{skillrating68}+@{skillbonus68}]]}}{{val3=@{skillspec68}}}{{val3_num=[[(?{Specialization @{skillspec68} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name68}}}{{limit_num=[[@{skilllimit_value68}]]}}{{limit_mod=[[@{skilllimitbonus68}]]}}{{result=[[(@{skilldicepool68}+(?{Specialization @{skillspec68} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value68}]]+@{skilllimitbonus68}]]]]}}{{description=@{skillnotes68}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll68" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname68}}}{{val1=@{skillattr_name68}}}{{val1_num=[[@{skillattr_value68}]]}}{{val2=@{skillname68}}}{{val2_num=[[@{skillrating68}+@{skillbonus68}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name68}}}{{limit_num=[[@{skilllimit_value68}]]}}{{limit_mod=[[@{skilllimitbonus68}]]}}{{result=[[(@{skilldicepool68}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value68}]]+@{skilllimitbonus68}]]]]}}{{description=@{skillnotes68}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox69" title="Check to hide this Skill">
@@ -6004,8 +6007,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec69" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll69" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname69}}}{{val1=@{skillattr_name69}}}{{val1_num=[[@{skillattr_value69}]]}}{{val2=@{skillname69}}}{{val2_num=[[@{skillrating69}+@{skillbonus69}]]}}{{val3=@{skillspec69}}}{{val3_num=[[(?{Specialization @{skillspec69} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name69}}}{{limit_num=[[@{skilllimit_value69}]]}}{{limit_mod=[[@{skilllimitbonus69}]]}}{{result=[[(@{skilldicepool69}+(?{Specialization @{skillspec69} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value69}]]+@{skilllimitbonus69}]]]]}}{{description=@{skillnotes69}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll69" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname69}}}{{val1=@{skillattr_name69}}}{{val1_num=[[@{skillattr_value69}]]}}{{val2=@{skillname69}}}{{val2_num=[[@{skillrating69}+@{skillbonus69}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name69}}}{{limit_num=[[@{skilllimit_value69}]]}}{{limit_mod=[[@{skilllimitbonus69}]]}}{{result=[[(@{skilldicepool69}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value69}]]+@{skilllimitbonus69}]]]]}}{{description=@{skillnotes69}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll69" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname69}}}{{val1=@{skillattr_name69}}}{{val1_num=[[@{skillattr_value69}]]}}{{val2=@{skillname69}}}{{val2_num=[[@{skillrating69}+@{skillbonus69}]]}}{{val3=@{skillspec69}}}{{val3_num=[[(?{Specialization @{skillspec69} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name69}}}{{limit_num=[[@{skilllimit_value69}]]}}{{limit_mod=[[@{skilllimitbonus69}]]}}{{result=[[(@{skilldicepool69}+(?{Specialization @{skillspec69} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value69}]]+@{skilllimitbonus69}]]]]}}{{description=@{skillnotes69}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll69" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname69}}}{{val1=@{skillattr_name69}}}{{val1_num=[[@{skillattr_value69}]]}}{{val2=@{skillname69}}}{{val2_num=[[@{skillrating69}+@{skillbonus69}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name69}}}{{limit_num=[[@{skilllimit_value69}]]}}{{limit_mod=[[@{skilllimitbonus69}]]}}{{result=[[(@{skilldicepool69}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value69}]]+@{skilllimitbonus69}]]]]}}{{description=@{skillnotes69}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -6108,8 +6111,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec70" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll70" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname70}}}{{val1=@{skillattr_name70}}}{{val1_num=[[@{skillattr_value70}]]}}{{val2=@{skillname70}}}{{val2_num=[[@{skillrating70}+@{skillbonus70}]]}}{{val3=@{skillspec70}}}{{val3_num=[[(?{Specialization @{skillspec70} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name70}}}{{limit_num=[[@{skilllimit_value70}]]}}{{limit_mod=[[@{skilllimitbonus70}]]}}{{result=[[(@{skilldicepool70}+(?{Specialization @{skillspec70} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value70}]]+@{skilllimitbonus70}]]]]}}{{description=@{skillnotes70}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll70" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname70}}}{{val1=@{skillattr_name70}}}{{val1_num=[[@{skillattr_value70}]]}}{{val2=@{skillname70}}}{{val2_num=[[@{skillrating70}+@{skillbonus70}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name70}}}{{limit_num=[[@{skilllimit_value70}]]}}{{limit_mod=[[@{skilllimitbonus70}]]}}{{result=[[(@{skilldicepool70}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value70}]]+@{skilllimitbonus70}]]]]}}{{description=@{skillnotes70}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll70" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname70}}}{{val1=@{skillattr_name70}}}{{val1_num=[[@{skillattr_value70}]]}}{{val2=@{skillname70}}}{{val2_num=[[@{skillrating70}+@{skillbonus70}]]}}{{val3=@{skillspec70}}}{{val3_num=[[(?{Specialization @{skillspec70} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name70}}}{{limit_num=[[@{skilllimit_value70}]]}}{{limit_mod=[[@{skilllimitbonus70}]]}}{{result=[[(@{skilldicepool70}+(?{Specialization @{skillspec70} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value70}]]+@{skilllimitbonus70}]]]]}}{{description=@{skillnotes70}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll70" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname70}}}{{val1=@{skillattr_name70}}}{{val1_num=[[@{skillattr_value70}]]}}{{val2=@{skillname70}}}{{val2_num=[[@{skillrating70}+@{skillbonus70}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name70}}}{{limit_num=[[@{skilllimit_value70}]]}}{{limit_mod=[[@{skilllimitbonus70}]]}}{{result=[[(@{skilldicepool70}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value70}]]+@{skilllimitbonus70}]]]]}}{{description=@{skillnotes70}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox71" title="Check to hide this Skill">
@@ -6166,8 +6169,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec71" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll71" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname71}}}{{val1=@{skillattr_name71}}}{{val1_num=[[@{skillattr_value71}]]}}{{val2=@{skillname71}}}{{val2_num=[[@{skillrating71}+@{skillbonus71}]]}}{{val3=@{skillspec71}}}{{val3_num=[[(?{Specialization @{skillspec71} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name71}}}{{limit_num=[[@{skilllimit_value71}]]}}{{limit_mod=[[@{skilllimitbonus71}]]}}{{result=[[(@{skilldicepool71}+(?{Specialization @{skillspec71} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value71}]]+@{skilllimitbonus71}]]]]}}{{description=@{skillnotes71}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll71" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname71}}}{{val1=@{skillattr_name71}}}{{val1_num=[[@{skillattr_value71}]]}}{{val2=@{skillname71}}}{{val2_num=[[@{skillrating71}+@{skillbonus71}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name71}}}{{limit_num=[[@{skilllimit_value71}]]}}{{limit_mod=[[@{skilllimitbonus71}]]}}{{result=[[(@{skilldicepool71}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value71}]]+@{skilllimitbonus71}]]]]}}{{description=@{skillnotes71}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll71" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname71}}}{{val1=@{skillattr_name71}}}{{val1_num=[[@{skillattr_value71}]]}}{{val2=@{skillname71}}}{{val2_num=[[@{skillrating71}+@{skillbonus71}]]}}{{val3=@{skillspec71}}}{{val3_num=[[(?{Specialization @{skillspec71} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name71}}}{{limit_num=[[@{skilllimit_value71}]]}}{{limit_mod=[[@{skilllimitbonus71}]]}}{{result=[[(@{skilldicepool71}+(?{Specialization @{skillspec71} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value71}]]+@{skilllimitbonus71}]]]]}}{{description=@{skillnotes71}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll71" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname71}}}{{val1=@{skillattr_name71}}}{{val1_num=[[@{skillattr_value71}]]}}{{val2=@{skillname71}}}{{val2_num=[[@{skillrating71}+@{skillbonus71}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name71}}}{{limit_num=[[@{skilllimit_value71}]]}}{{limit_mod=[[@{skilllimitbonus71}]]}}{{result=[[(@{skilldicepool71}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value71}]]+@{skilllimitbonus71}]]]]}}{{description=@{skillnotes71}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox72" title="Check to hide this Skill">
@@ -6224,8 +6227,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec72" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll72" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname72}}}{{val1=@{skillattr_name72}}}{{val1_num=[[@{skillattr_value72}]]}}{{val2=@{skillname72}}}{{val2_num=[[@{skillrating72}+@{skillbonus72}]]}}{{val3=@{skillspec72}}}{{val3_num=[[(?{Specialization @{skillspec72} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name72}}}{{limit_num=[[@{skilllimit_value72}]]}}{{limit_mod=[[@{skilllimitbonus72}]]}}{{result=[[(@{skilldicepool72}+(?{Specialization @{skillspec72} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value72}]]+@{skilllimitbonus72}]]]]}}{{description=@{skillnotes72}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll72" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname72}}}{{val1=@{skillattr_name72}}}{{val1_num=[[@{skillattr_value72}]]}}{{val2=@{skillname72}}}{{val2_num=[[@{skillrating72}+@{skillbonus72}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name72}}}{{limit_num=[[@{skilllimit_value72}]]}}{{limit_mod=[[@{skilllimitbonus72}]]}}{{result=[[(@{skilldicepool72}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value72}]]+@{skilllimitbonus72}]]]]}}{{description=@{skillnotes72}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll72" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname72}}}{{val1=@{skillattr_name72}}}{{val1_num=[[@{skillattr_value72}]]}}{{val2=@{skillname72}}}{{val2_num=[[@{skillrating72}+@{skillbonus72}]]}}{{val3=@{skillspec72}}}{{val3_num=[[(?{Specialization @{skillspec72} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name72}}}{{limit_num=[[@{skilllimit_value72}]]}}{{limit_mod=[[@{skilllimitbonus72}]]}}{{result=[[(@{skilldicepool72}+(?{Specialization @{skillspec72} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value72}]]+@{skilllimitbonus72}]]]]}}{{description=@{skillnotes72}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll72" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname72}}}{{val1=@{skillattr_name72}}}{{val1_num=[[@{skillattr_value72}]]}}{{val2=@{skillname72}}}{{val2_num=[[@{skillrating72}+@{skillbonus72}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name72}}}{{limit_num=[[@{skilllimit_value72}]]}}{{limit_mod=[[@{skilllimitbonus72}]]}}{{result=[[(@{skilldicepool72}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value72}]]+@{skilllimitbonus72}]]]]}}{{description=@{skillnotes72}}" />
                 </div>
             </div>
             <div class="skillspacer"> </div>
@@ -6328,8 +6331,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec73" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll73" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname73}}}{{val1=@{skillattr_name73}}}{{val1_num=[[@{skillattr_value73}]]}}{{val2=@{skillname73}}}{{val2_num=[[@{skillrating73}+@{skillbonus73}]]}}{{val3=@{skillspec73}}}{{val3_num=[[(?{Specialization @{skillspec73} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name73}}}{{limit_num=[[@{skilllimit_value73}]]}}{{limit_mod=[[@{skilllimitbonus73}]]}}{{result=[[(@{skilldicepool73}+(?{Specialization @{skillspec73} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value73}]]+@{skilllimitbonus73}]]]]}}{{description=@{skillnotes73}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll73" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname73}}}{{val1=@{skillattr_name73}}}{{val1_num=[[@{skillattr_value73}]]}}{{val2=@{skillname73}}}{{val2_num=[[@{skillrating73}+@{skillbonus73}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name73}}}{{limit_num=[[@{skilllimit_value73}]]}}{{limit_mod=[[@{skilllimitbonus73}]]}}{{result=[[(@{skilldicepool73}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value73}]]+@{skilllimitbonus73}]]]]}}{{description=@{skillnotes73}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll73" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname73}}}{{val1=@{skillattr_name73}}}{{val1_num=[[@{skillattr_value73}]]}}{{val2=@{skillname73}}}{{val2_num=[[@{skillrating73}+@{skillbonus73}]]}}{{val3=@{skillspec73}}}{{val3_num=[[(?{Specialization @{skillspec73} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name73}}}{{limit_num=[[@{skilllimit_value73}]]}}{{limit_mod=[[@{skilllimitbonus73}]]}}{{result=[[(@{skilldicepool73}+(?{Specialization @{skillspec73} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value73}]]+@{skilllimitbonus73}]]]]}}{{description=@{skillnotes73}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll73" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname73}}}{{val1=@{skillattr_name73}}}{{val1_num=[[@{skillattr_value73}]]}}{{val2=@{skillname73}}}{{val2_num=[[@{skillrating73}+@{skillbonus73}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name73}}}{{limit_num=[[@{skilllimit_value73}]]}}{{limit_mod=[[@{skilllimitbonus73}]]}}{{result=[[(@{skilldicepool73}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value73}]]+@{skilllimitbonus73}]]]]}}{{description=@{skillnotes73}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox74" title="Check to hide this Skill">
@@ -6386,8 +6389,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec74" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll74" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname74}}}{{val1=@{skillattr_name74}}}{{val1_num=[[@{skillattr_value74}]]}}{{val2=@{skillname74}}}{{val2_num=[[@{skillrating74}+@{skillbonus74}]]}}{{val3=@{skillspec74}}}{{val3_num=[[(?{Specialization @{skillspec74} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name74}}}{{limit_num=[[@{skilllimit_value74}]]}}{{limit_mod=[[@{skilllimitbonus74}]]}}{{result=[[(@{skilldicepool74}+(?{Specialization @{skillspec74} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value74}]]+@{skilllimitbonus74}]]]]}}{{description=@{skillnotes74}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll74" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname74}}}{{val1=@{skillattr_name74}}}{{val1_num=[[@{skillattr_value74}]]}}{{val2=@{skillname74}}}{{val2_num=[[@{skillrating74}+@{skillbonus74}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name74}}}{{limit_num=[[@{skilllimit_value74}]]}}{{limit_mod=[[@{skilllimitbonus74}]]}}{{result=[[(@{skilldicepool74}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value74}]]+@{skilllimitbonus74}]]]]}}{{description=@{skillnotes74}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll74" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname74}}}{{val1=@{skillattr_name74}}}{{val1_num=[[@{skillattr_value74}]]}}{{val2=@{skillname74}}}{{val2_num=[[@{skillrating74}+@{skillbonus74}]]}}{{val3=@{skillspec74}}}{{val3_num=[[(?{Specialization @{skillspec74} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name74}}}{{limit_num=[[@{skilllimit_value74}]]}}{{limit_mod=[[@{skilllimitbonus74}]]}}{{result=[[(@{skilldicepool74}+(?{Specialization @{skillspec74} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value74}]]+@{skilllimitbonus74}]]]]}}{{description=@{skillnotes74}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll74" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname74}}}{{val1=@{skillattr_name74}}}{{val1_num=[[@{skillattr_value74}]]}}{{val2=@{skillname74}}}{{val2_num=[[@{skillrating74}+@{skillbonus74}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name74}}}{{limit_num=[[@{skilllimit_value74}]]}}{{limit_mod=[[@{skilllimitbonus74}]]}}{{result=[[(@{skilldicepool74}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value74}]]+@{skilllimitbonus74}]]]]}}{{description=@{skillnotes74}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox75" title="Check to hide this Skill">
@@ -6444,8 +6447,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec75" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll75" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname75}}}{{val1=@{skillattr_name75}}}{{val1_num=[[@{skillattr_value75}]]}}{{val2=@{skillname75}}}{{val2_num=[[@{skillrating75}+@{skillbonus75}]]}}{{val3=@{skillspec75}}}{{val3_num=[[(?{Specialization @{skillspec75} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name75}}}{{limit_num=[[@{skilllimit_value75}]]}}{{limit_mod=[[@{skilllimitbonus75}]]}}{{result=[[(@{skilldicepool75}+(?{Specialization @{skillspec75} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value75}]]+@{skilllimitbonus75}]]]]}}{{description=@{skillnotes75}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll75" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname75}}}{{val1=@{skillattr_name75}}}{{val1_num=[[@{skillattr_value75}]]}}{{val2=@{skillname75}}}{{val2_num=[[@{skillrating75}+@{skillbonus75}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name75}}}{{limit_num=[[@{skilllimit_value75}]]}}{{limit_mod=[[@{skilllimitbonus75}]]}}{{result=[[(@{skilldicepool75}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value75}]]+@{skilllimitbonus75}]]]]}}{{description=@{skillnotes75}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll75" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname75}}}{{val1=@{skillattr_name75}}}{{val1_num=[[@{skillattr_value75}]]}}{{val2=@{skillname75}}}{{val2_num=[[@{skillrating75}+@{skillbonus75}]]}}{{val3=@{skillspec75}}}{{val3_num=[[(?{Specialization @{skillspec75} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name75}}}{{limit_num=[[@{skilllimit_value75}]]}}{{limit_mod=[[@{skilllimitbonus75}]]}}{{result=[[(@{skilldicepool75}+(?{Specialization @{skillspec75} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value75}]]+@{skilllimitbonus75}]]]]}}{{description=@{skillnotes75}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll75" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname75}}}{{val1=@{skillattr_name75}}}{{val1_num=[[@{skillattr_value75}]]}}{{val2=@{skillname75}}}{{val2_num=[[@{skillrating75}+@{skillbonus75}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name75}}}{{limit_num=[[@{skilllimit_value75}]]}}{{limit_mod=[[@{skilllimitbonus75}]]}}{{result=[[(@{skilldicepool75}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value75}]]+@{skilllimitbonus75}]]]]}}{{description=@{skillnotes75}}" />
                 </div>
             </div>
             <input type="checkbox" class="skillshowcheckbox hiddencheckbox" name="attr_skillshowcheckbox76" title="Check to hide this Skill">
@@ -6502,8 +6505,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 </div>
                 <div class="skillbuttonwrapper">
                     <input type="checkbox" class="skillshowspec" name="attr_skillspec76" value="none">
-                    <button type="roll" class="rollbuttonspec" name="roll_skillroll76" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname76}}}{{val1=@{skillattr_name76}}}{{val1_num=[[@{skillattr_value76}]]}}{{val2=@{skillname76}}}{{val2_num=[[@{skillrating76}+@{skillbonus76}]]}}{{val3=@{skillspec76}}}{{val3_num=[[(?{Specialization @{skillspec76} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name76}}}{{limit_num=[[@{skilllimit_value76}]]}}{{limit_mod=[[@{skilllimitbonus76}]]}}{{result=[[(@{skilldicepool76}+(?{Specialization @{skillspec76} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value76}]]+@{skilllimitbonus76}]]]]}}{{description=@{skillnotes76}}" />
-                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll76" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname76}}}{{val1=@{skillattr_name76}}}{{val1_num=[[@{skillattr_value76}]]}}{{val2=@{skillname76}}}{{val2_num=[[@{skillrating76}+@{skillbonus76}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name76}}}{{limit_num=[[@{skilllimit_value76}]]}}{{limit_mod=[[@{skilllimitbonus76}]]}}{{result=[[(@{skilldicepool76}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{skilllimit_value76}]]+@{skilllimitbonus76}]]]]}}{{description=@{skillnotes76}}" />
+                    <button type="roll" class="rollbuttonspec" name="roll_skillroll76" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname76}}}{{val1=@{skillattr_name76}}}{{val1_num=[[@{skillattr_value76}]]}}{{val2=@{skillname76}}}{{val2_num=[[@{skillrating76}+@{skillbonus76}]]}}{{val3=@{skillspec76}}}{{val3_num=[[(?{Specialization @{skillspec76} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name76}}}{{limit_num=[[@{skilllimit_value76}]]}}{{limit_mod=[[@{skilllimitbonus76}]]}}{{result=[[(@{skilldicepool76}+(?{Specialization @{skillspec76} applies})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value76}]]+@{skilllimitbonus76}]]]]}}{{description=@{skillnotes76}}" />
+                    <button type="roll" class="rollbuttonnospec" name="roll_skillroll76" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname76}}}{{val1=@{skillattr_name76}}}{{val1_num=[[@{skillattr_value76}]]}}{{val2=@{skillname76}}}{{val2_num=[[@{skillrating76}+@{skillbonus76}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit_name76}}}{{limit_num=[[@{skilllimit_value76}]]}}{{limit_mod=[[@{skilllimitbonus76}]]}}{{result=[[(@{skilldicepool76}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{skilllimit_value76}]]+@{skilllimitbonus76}]]]]}}{{description=@{skillnotes76}}" />
                 </div>
             </div>
         </div>
@@ -6574,8 +6577,8 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                     </div>
                     <div class="skillbuttonwrapper">
                         <input type="checkbox" class="knowledgeshowspec" name="attr_knowledgespec" value="none">
-                        <button type="roll" class="rollbuttonspec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{val3=@{knowledgespec}}}{{val3_num=[[(?{Specialization @{knowledgespec} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}+(?{Specialization @{knowledgespec} applies|yes,1|no,0})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
-                        <button type="roll" class="rollbuttonnospec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
+                        <button type="roll" class="rollbuttonspec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{val3=@{knowledgespec}}}{{val3_num=[[(?{Specialization @{knowledgespec} applies|Yes,2|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}+(?{Specialization @{knowledgespec} applies|yes,1|no,0})-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
+                        <button type="roll" class="rollbuttonnospec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
                     </div>
                 </div>
             </fieldset>
@@ -6678,8 +6681,8 @@ make sure to enter what the spell is resisted with">
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spellrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}}+@{spellspecialized}+@{spellbonus}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}{{description=@{spelldescription}}}" />
-                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}}+@{spellspecialized}+@{spellbonus}]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{mag_total}+@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})d6cs>5>5sd]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spellrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}}+@{spellspecialized}+@{spellbonus}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}}+@{spellspecialized}+@{spellbonus}]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{mag_total}+@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
                     </div>
                 </div>
             </fieldset>
@@ -6694,10 +6697,10 @@ make sure to enter what the spell is resisted with">
                 </div>
                 <div class="spiriterow">
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_summonrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{skilldicepool69}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{skilldicepool69}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}d6cs>5>5sd@{edgeroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_summonrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{skilldicepool69}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{skilldicepool69}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}@{standardroll}@{edgeroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_bindrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{skilldicepool64}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{skilldicepool64}}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_bindrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{skilldicepool64}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{skilldicepool64}}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                 </div>
             </div>
@@ -6709,10 +6712,10 @@ make sure to enter what the spell is resisted with">
                 </div>
                 <div class="spiriterow">
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_summonrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to compile}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Compiling}}{{val2_num=[[@{skilldicepool70}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{res_total}+@{skilldicepool70}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[?{Level|6}d6cs>5>5sd@{edgeroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_summonrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to compile}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Compiling}}{{val2_num=[[@{skilldicepool70}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{res_total}+@{skilldicepool70}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[?{Level|6}@{standardroll}@{edgeroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_bindrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to register}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Registering}}{{val2_num=[[@{skilldicepool72}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{res_total}+@{skilldicepool72}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[(?{Level|6}*2+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_bindrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to register}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Registering}}{{val2_num=[[@{skilldicepool72}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{res_total}+@{skilldicepool72}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[(?{Level|6}*2+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                 </div>
             </div>
@@ -6838,16 +6841,16 @@ make sure to enter what the spell is resisted with">
                         <button type="roll" class="spellrollmage" name="roll_spriteinitiativeroll" title="Roll for Initiative with this Sprite" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{roll_name=for Matrix Initiative}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Data Processing}}{{val2_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val3=Dice}}{{val3_num=[[4]]}}{{initiative=[[@{spiriteforce}+[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]+4d6 &{tracker}]]}}"></button>
                     </div>
                     <div class="spiriterollwrapper magebound">
-                        <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force x2,*2},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_rea}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)|Armor,(@{spiriteforce}*3+@{spirittype}_bod}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[?{Limit}]]]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force x2,*2},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_rea}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)|Armor,(@{spiriteforce}*3+@{spirittype}_bod}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Limit}]]]]}}" />
                     </div>
                     <div class="spiriterollwrapper technobound">
-                        <button type="roll" class="spellrollmage" name="roll_spritetest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{limit=Limit}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit_num=[[@{spiriteforce}?{Limit|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall},1}kh1]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+@{spiriteforce}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[{@{spiriteforce}?{Limit},1}kh1]]]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spritetest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{limit=Limit}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit_num=[[@{spiriteforce}?{Limit|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall},1}kh1]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+@{spiriteforce}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[{@{spiriteforce}?{Limit},1}kh1]]]]}}" />
                     </div>
                     <div class="spiriterollwrapper magebound">
-                        <button type="roll" class="spellrollmage" name="roll_spiritattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spiritattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
                     </div>
                     <div class="spiriterollwrapper technobound">
-                        <button type="roll" class="spellrollmage" name="roll_spriteattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spriteattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack (Charisma),@{spritetype}_attack}|Sleaze (Intuition),@{spritetype}_sleaze}|Data Proc. (Logic),@{spritetype}_datap}|Firewall (Willpower),@{spritetype}_firewall}},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
                     </div>
                     <div class="spiriterollwrapper magebound">
                         <button type="roll" class="spellrollmage" name="roll_spiritattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{roll_name=his stats}}{{val1=Body}}{{val1_num=[[{@{spiriteforce}@{spirittype}_bod},1}kh1]]}}{{val2=Agility}}{{val2_num=[[{@{spiriteforce}@{spirittype}_agi},1}kh1]]}}{{val3=Reaction}}{{val3_num=[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]}}{{val4=Strength}}{{val4_num=[[{@{spiriteforce}@{spirittype}_str},1}kh1]]}}{{val5=Willpower}}{{val5_num=[[{@{spiriteforce}@{spirittype}_wil},1}kh1]]}}{{val6=Logic}}{{val6_num=[[{@{spiriteforce}@{spirittype}_log},1}kh1]]}}{{val7=Intuition}}{{val7_num=[[{@{spiriteforce}@{spirittype}_int},1}kh1]]}}{{val8=Charisma}}{{val8_num=[[{@{spiriteforce}@{spirittype}_cha},1}kh1]]}}{{description=@{spiritenotes}}}" />
@@ -7151,11 +7154,9 @@ make sure to enter what the spell is resisted with">
             </div>
             <div class="deckrow">
                 <div class="deckrowlabel"></div>
-                <div class="decklabelwrapper"><label>Damaged</label></div>
+                <div class="decklabelwrapper"><label>Damage</label></div>
                 <div class="decklabelwrapper"><label>Condition</label></div>
                 <div class="decklabelwrapper"><label>Noise Red</label></div>
-                <div class="decklabelwrapper"><label>Defenseroll</label></div>
-                <div class="decklabelwrapper"><label>Stay Silent</label></div>
             </div>
             <div class="deckrow">
                 <div class="deckrowlabel">
@@ -7170,11 +7171,25 @@ make sure to enter what the spell is resisted with">
                 <div class="deckinputwrapper">
                     <input type="text" name="attr_noisereduction" title="Total Noise Reduction of the Device" title="(optional) How much Noisereduction total" value="0">
                 </div>
-                <div class="deckinputwrapper">
-                    <button type="roll" class="deckroll" name="roll_deckdefense" title="Click to Roll Matrix Defense" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Defend}}{{val1=Firewall}}}{{val1_num=[[@{firewall_total}]]}}{{val2=Attribute}}{{val2_num=[[?{Attribute|Willpower,@{wil_total}|Logic,@{log_total}|Intuition,@{int_total}}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{firewall_total}+?{Attribute}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+            </div>
+            <div class="deckrow">
+                <div class="deckrowlabel"></div>
+                <div class="decklabelwrapper"><label>Resistance</label></div>
+                <div class="decklabelwrapper"><label>Defenseroll</label></div>
+                <div class="decklabelwrapper"><label>Stay Silent</label></div>
+            </div>
+            <div class="deckrow">
+                <div class="deckrowlabel">
+                    <label>Rolls</label>
                 </div>
                 <div class="deckinputwrapper">
-                    <button type="roll" class="deckroll" name="roll_deckantispott" title="Click to Roll against Matrix Perception" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to stay hidden}}{{val1=Sleaze}}{{val1_num=[[@{sleaze_total}]]}}{{val2=Logic}}{{val2_num=[[@{log_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{sleaze_total}+@{log_total}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+                    <button type="roll" class="deckroll" name="roll_deckresistance" title="Click to resist Matrix Damage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to resist damage}}{{val1=Firewall}}{{val1_num=[[@{firewall_total}]]}}{{val2=Device Rtg}}{{val2_num=[[@{devicertg_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{firewall_total}+@{devicertg_total}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
+                </div>
+                <div class="deckinputwrapper">
+                    <button type="roll" class="deckroll" name="roll_deckdefense" title="Click to Roll Matrix Defense" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Defend}}{{val1=Firewall}}{{val1_num=[[@{firewall_total}]]}}{{val2=Attribute}}{{val2_num=[[?{Attribute|Willpower,@{wil_total}|Logic,@{log_total}|Intuition,@{int_total}}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{firewall_total}+?{Attribute}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
+                </div>
+                <div class="deckinputwrapper">
+                    <button type="roll" class="deckroll" name="roll_deckantispott" title="Click to Roll against Matrix Perception" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to stay hidden}}{{val1=Sleaze}}{{val1_num=[[@{sleaze_total}]]}}{{val2=Logic}}{{val2_num=[[@{log_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{sleaze_total}+@{log_total}+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
                 </div>
             </div>
         </div>
@@ -7218,6 +7233,10 @@ make sure to enter what the spell is resisted with">
                 <input class="mskillhotsimcheckbox hiddencheckbox" type="checkbox" value="2" name="attr_hotsim" title="+2 for Hot Sim">
                 <div class="checkboxticker mskillhotsimunticked"></div>
                 <div class="checkboxticker mskillhotsimticked">X</div>
+                <div class="mskillmodlabel"><label>Noise</label></div>
+                <div class="mskillnoisewrapper">
+                    <input class="mskillnoise" type="number" value="0" name="attr_noise" title="Total noise penalty before noise reduction">
+                </div>
             </div>
             <div class="mskillrow">
                 <div class="mskillnamewrapper">
@@ -7260,12 +7279,12 @@ make sure to enter what the spell is resisted with">
                     </div>
                     <div class="mskillratingwrapper">
                         <select name="attr_mskillrating" title="Select the Skill this Action is based on">
-                            <option value="@{skilldicepool34}">Computer</option>
-                            <option value="@{skilldicepool35}">Cybercombat</option>
-                            <option value="@{skilldicepool37}">Electronic Warfare</option>
-                            <option value="@{skilldicepool40}">Hacking</option>
-                            <option value="@{skilldicepool27}">Hardware</option>
-                            <option value="@{skilldicepool42}">Software</option>
+                            <option value="@{skillrating34}+@{skillbonus34}">Computer</option>
+                            <option value="@{skillrating35}+@{skillbonus35}">Cybercombat</option>
+                            <option value="@{skillrating37}+@{skillbonus37}">Electronic Warfare</option>
+                            <option value="@{skillrating40}+@{skillbonus40}">Hacking</option>
+                            <option value="@{skillrating27}+@{skillbonus27}">Hardware</option>
+                            <option value="@{skillrating42}+@{skillbonus42}">Software</option>
                         </select>
                     </div>
                     <div class="mskillbonuswrapper">
@@ -7284,13 +7303,13 @@ make sure to enter what the spell is resisted with">
                         <input type="text" name="attr_mskillnotes" title="Description...">
                     </div>
                     <div class="mskilldicepoolwrapper">
-                        <input type="number" name="attr_mskilldicepool" value="@{mskillattr}_total}+@{mskillrating}+@{mskillbonus}+@{runningsilent}+@{hotsim}" title="Base Dicepool" disabled="true">
+                        <input type="number" name="attr_mskilldicepool" value="@{mskillattr}_total}+@{mskillrating}+@{mskillbonus}+@{runningsilent}+@{hotsim}" title="Base Dicepool before noise and wounds" disabled="true">
                     </div>
                     <div class="mskillbuttonwrapper">
                         <input type="checkbox" class="mskillshowspec" name="attr_mskillspec" value="none">
                         <input type="text" class="mskillshowspec" name="attr_mskillspec" value="none">
-                        <button type="roll" class="rollbuttonspec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}+@{mskillbonus}]]}}{{val3=@{mskillspec}}}{{val3_num=[[?{Specialization @{mskillspec} applies|Yes,2|No,0}]]}}{{val4=HotSim/Silent}}{{val4_num=[[@{runningsilent}+@{hotsim}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}+?{Specialization @{mskillspec} applies|yes,2|no,0}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}" />
-                        <button type="roll" class="rollbuttonnospec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}+@{mskillbonus}]]}}{{val3=HotSim/Silent}}{{val3_num=[[@{runningsilent}+@{hotsim}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}" />
+                        <button type="roll" class="rollbuttonspec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}+@{mskillbonus}]]}}{{val3=@{mskillspec}}}{{val3_num=[[?{Specialization @{mskillspec} applies|Yes,2|No,0}]]}}{{val4=HotSim/Silent}}{{val4_num=[[@{runningsilent}+@{hotsim}]]}}{{val5=Noise}}{{val5_num=[[{0,@{noise}-@{noisereduction}}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}+?{Specialization @{mskillspec} applies|yes,2|no,0}-[[@{wound_total}]]+?{Situational Modifiers|0}-[[{0,@{noise}-@{noisereduction}}kh1]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}}" />
+                        <button type="roll" class="rollbuttonnospec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}+@{mskillbonus}]]}}{{val3=HotSim/Silent}}{{val3_num=[[@{runningsilent}+@{hotsim}]]}}{{val4=Noise}}{{val4_num=[[{0,@{noise}-@{noisereduction}}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}-[[@{wound_total}]]+?{Situational Modifiers|0}-[[{0,@{noise}-@{noisereduction}}kh1]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}}" />
                    </div>
                 </div>
             </fieldset>
@@ -7313,6 +7332,10 @@ make sure to enter what the spell is resisted with">
                 <div class="checkboxticker mskillhotsimunticked"></div>
                 <div class="checkboxticker mskillhotsimticked">X</div>
                 <input type="checkbox" class="technomancycheckbox vehiclemode3" name="attr_vehiclemode" value="3"> 
+                <div class="vehicleskillmodlabel"><label>Noise</label></div>
+                <div class="vehicleskillmodinput">
+                    <input class="vehicleskillnoise" type="number" value="0" name="attr_noise" title="Total noise penalty before noise reduction">
+                </div>
                 <div class="vehicleskillmodlabel"><label>Control</label></div>
                 <input type="radio" class="vehiclemode vehiclemode0" name="attr_vehiclemode" value="0" title="Click to switch to Manual
 Click again to switch to Remote and Jumped-in" checked> 
@@ -7359,13 +7382,13 @@ Click again to switch to Manual and Remote">
                     <label class="vehiclelabel">Armor</label>
                 </div>
                 <div class="vehicledamagewrapper">
-                    <label class="vehiclelabel">Damage</label>
+                    <label class="vehiclelabel">Dmg</label>
                 </div>
                 <div class="vehicleboxwrapper">
                     <label class="vehiclelabel">Notes</label>
                 </div>
                 <div class="vehicleboxwrapper">
-                    <label class="vehiclelabel">Skills</label>
+                    <label class="vehiclelabel">Tests</label>
                 </div>
                 <div class="vehicleboxwrapper">
                     <label class="vehiclelabel">Weapon</label>
@@ -7404,9 +7427,10 @@ Click again to switch to Manual and Remote">
                     <div class="vehiclearmorwrapper">
                         <input type="text" name="attr_vehiclearmor" value="0" title="Armor Rating of the Vehicle">
                     </div>
-                    <div class="vehicledamagewrapper">
-                        <input type="text" name="attr_vehicledamage" value="0" title="Total Damage this Vehicle has taken">
-                    </div>
+                    <input class="vehicledmgcheckbox hiddencheckbox" type="checkbox" name="attr_showvehicledmg" title="Took some Damage?">
+                    <div class="checkboxticker vehicledmgunticked"></div>
+                    <div class="checkboxticker vehicledmgticked">X</div>
+                    <div class="vehiclespacer"></div>
                     <input class="vehiclenotescheckbox hiddencheckbox" type="checkbox" name="attr_showvehiclenotes" title="Need more Space?">
                     <div class="checkboxticker vehiclenotesunticked"></div>
                     <div class="checkboxticker vehiclenotesticked">X</div>
@@ -7421,6 +7445,34 @@ Click again to switch to Manual and Remote">
                     <div class="vehiclenoteswrapper">
                         <textarea name="attr_vehiclenotes" title="Have more Space!"></textarea>
                     </div>
+                    <div class="vehicledmgwrapper">
+                        <div class="vehicleskillrow">
+                            <div class="vehicledmgphys">
+                                <label class="vehiclelabel">Physical Condition</label>
+                            </div>
+                            <div class="vehicledmgmatrix">
+                                <label class="vehiclelabel">Matrix Condition</label>
+                            </div>
+                        </div>
+                        <div class="vehicleskillrow">
+                            <div class="vehicledmgphys">
+                                <div class="vehicledmginput">
+                                    <input type="number" name="attr_vehicledamagep" value="0" title="How much pyhsical Damage the Vehicle took">
+                                </div>
+                                <div class="vehicledmginput">
+                                    <input type="number" name="attr_vehicledamageprem" value="12+ceil(@{vehiclebody}/2)-@{vehicledamagep}" title="How much physical Damage remaining" disabled="true">
+                                </div>
+                            </div>
+                            <div class="vehicledmgmatrix">
+                                <div class="vehicledmginput">
+                                    <input type="number" name="attr_vehicledamagem" value="0" title="How much Matrix Damage the Vehicle took">
+                                </div>
+                                <div class="vehicledmginput">
+                                    <input type="number" name="attr_vehicledamagemrem" value="8+ceil(@{vehiclepilot}/2)-@{vehicledamagem}" title="How much Matrix Damage remaining" disabled="true">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <div class="vehicleskillswrapper">
                         <div class="vehicleskillrow">
                             <div class="vehicleskillinitiative">
@@ -7454,39 +7506,39 @@ Click again to switch to Manual and Remote">
                                 <button type="roll" class="vehicleroll pilotroll" name="roll_matrixinitiativeroll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for Matrix Initiative}}{{val1=Data Processing}}{{val1_num=[[@{datap_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{val3=Bonus}}{{val3_num=[[@{matrixinitiativebonus}]]}}{{wounds_num=[[@{wound_total}]]}}{{initiative=[[@{matrixinitiativeattribute}+@{matrixinitiativebonus}-[[@{wound_total}]]+[[{@{matrixinitiativedice},(@{edgn}*5)}kh1]]d6 &{tracker}]]}}"></button>
                             </div>
                             <div class="vehicleskillsoak">
-                                <button type="roll" class="vehicleroll" name="roll_vehiclesoakroll" title="Damage Resistance Roll" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=to resist Damage}}{{val1=Body}}{{val1_num=[[@{vehiclebody}]]}}{{val2=Armor}}{{val2_num=[[@{vehiclearmor}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{vehiclebody}+@{vehiclearmor}+?{Armor Penetration|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+                                <button type="roll" class="vehicleroll" name="roll_vehiclesoakroll" title="Damage Resistance Roll" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=to resist Damage}}{{val1=Body}}{{val1_num=[[@{vehiclebody}]]}}{{val2=Armor}}{{val2_num=[[@{vehiclearmor}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{vehiclebody}+@{vehiclearmor}+?{Armor Penetration|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
                             </div>
                             <div class="vehicleskilldodge">
                                 <div class="vehicleskillinputwrapper">
                                     <input type="text" value="0" name="attr_vehicledodgesoft" title="Evasion Autosoft Rating for this Drone/Vehicle">
                                 </div>
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicledodgerollautopilot" title="Roll a Dodge Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Avoidance Test}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Evasion-Soft}}{{val2_num=[[@{vehicledodgesoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}}]]}}{{result=[[(@{vehiclepilot}+@{vehicledodgesoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehiclehand})]]]]}}" />
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicledodgerollpilot" title="Roll a Dodge Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Avoidance Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[(@{rea_total}+@{int_total}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim})+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" />
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicledodgerollautopilot" title="Roll a Dodge Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Avoidance Test}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Evasion-Soft}}{{val2_num=[[@{vehicledodgesoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}}]]}}{{result=[[(@{vehiclepilot}+@{vehicledodgesoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehiclehand})]]]]}}" />
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicledodgerollpilot" title="Roll a Dodge Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Avoidance Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=Intuition}}{{val2_num=[[@{int_total}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[(@{rea_total}+@{int_total}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" />
                             </div>
                             <div class="vehicleskillmaneuver">
                                 <div class="vehicleskillinputwrapper">
                                     <input type="text" value="0" name="attr_vehiclemaneuversoft" title="Maneuver Autosoft Rating for this Drone/Vehicle">
                                 </div>
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehiclemaneuverrollautopilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Maneuver-Soft}}{{val2_num=[[@{vehiclemaneuversoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{result=[[(@{vehiclepilot}+@{vehiclemaneuversoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Limit})]]]]}}" />
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{vehicleskillname}}}{{val2_num=[[@{vehicleskilltype}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(@{rea_total}+@{vehicleskilltype}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim})+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehiclemaneuverrollautopilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Maneuver-Soft}}{{val2_num=[[@{vehiclemaneuversoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{result=[[(@{vehiclepilot}+@{vehiclemaneuversoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit})]]]]}}" />
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{vehicleskillname}}}{{val2_num=[[@{vehicleskilltype}-@{rea_total}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(@{vehicleskilltype}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
                             </div>
                             <div class="vehicleskillperception">
                                 <div class="vehicleskillinputwrapper">
                                     <input type="text" value="0" name="attr_vehicleperceptionsoft" title="Cleasight Autosoft Rating for this Drone/Vehicle">
                                 </div>
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleperceptionrollautopilot" title="Roll a Perception Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Perception Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Clearsight-Soft}}{{val2_num=[[@{vehicleperceptionsoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Sensor}}{{limit_num=[[@{vehiclesens}]]}}{{limit_mod=?{Limit Modifier?|0}}}{{result=[[(@{vehiclepilot}+@{vehicleperceptionsoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehiclesens}+(?{Limit Modifier?}))]]]]}}" />
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleperceptionrollpilot" title="Roll a Perception Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Perception Test with @{vehiclename}}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{val2=Perception/EW}}{{val2_num=[[{@{skilldicepool8},@{skilldicepool37}}kh1]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Sensor}}{{limit_num=[[@{vehiclesens}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}+?{Limit Modifier?|0}]]}}{{result=[[(@{int_total}+[[{@{skilldicepool8},@{skilldicepool37}}kh1]]+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim})+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehiclesens}+floor(@{vehiclemode}/2)*@{controlrig}+?{Limit Modifier?})]]]]}}" />
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleperceptionrollautopilot" title="Roll a Perception Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Perception Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Clearsight-Soft}}{{val2_num=[[@{vehicleperceptionsoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Sensor}}{{limit_num=[[@{vehiclesens}]]}}{{limit_mod=?{Limit Modifier?|0}}}{{result=[[(@{vehiclepilot}+@{vehicleperceptionsoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehiclesens}+(?{Limit Modifier?}))]]]]}}" />
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleperceptionrollpilot" title="Roll a Perception Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Perception Test with @{vehiclename}}}{{val1=Intuition}}{{val1_num=[[@{int_total}]]}}{{val2=Perception/EW}}{{val2_num=[[{@{skillrating8}+@{skillbonus8},@{skillrating37+@{skillbonus37}}}kh1]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Sensor}}{{limit_num=[[@{vehiclesens}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}+?{Limit Modifier?|0}]]}}{{result=[[(@{int_total}+[[{@{skillrating8}+@{skillbonus8},@{skillrating37}+@{skillbonus37}}kh1]]+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehiclesens}+floor(@{vehiclemode}/2)*@{controlrig}+?{Limit Modifier?})]]]]}}" />
                             </div>
                             <div class="vehicleskillsneak">
                                 <div class="vehicleskillinputwrapper">
                                     <input type="text" value="0" name="attr_vehiclesneaksoft" title="Stealth Autosoft Rating for this Drone/Vehicle">
                                 </div>
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehiclesneakrollautopilot" title="Roll a Sneaking Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Sneaking Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Stealth-Soft}}{{val2_num=[[@{vehiclesneaksoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}]]}}{{result=[[(@{vehiclepilot}+@{vehiclesneaksoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehiclehand})]]]]}}" />
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclesneakrollpilot" title="Roll a Sneaking Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Sneaking Test with @{vehiclename}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Reaction,@{rea_total}|Intuition,@{int_total}}]]}}{{val2=Sneaking}}{{val2_num=[[@{skilldicepool10}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(?{Attribute}+@{skilldicepool10}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim})+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehiclehand}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehiclesneakrollautopilot" title="Roll a Sneaking Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Sneaking Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Stealth-Soft}}{{val2_num=[[@{vehiclesneaksoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}]]}}{{result=[[(@{vehiclepilot}+@{vehiclesneaksoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehiclehand})]]]]}}" />
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclesneakrollpilot" title="Roll a Sneaking Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Sneaking Test with @{vehiclename}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Reaction,@{rea_total}|Intuition,@{int_total}}]]}}{{val2=Sneaking}}{{val2_num=[[@{skillrating10}+@{skillbonus10}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Handling}}{{limit_num=[[@{vehiclehand}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(?{Attribute}+@{skillrating10}+@{skillbonus10}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehiclehand}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
                             </div>
                             <div class="vehicleskillother">
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleotherrollautopilot" title="Any other Vehicle Teste" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[?{Autosoft-Rating|0}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}|Sensor,@{vehiclesens}}]]}}{{result=[[(@{vehiclepilot}+?{Autosoft-Rating|0}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Limit})]]]]}}" />
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleotherrollpilot" title="Any other Vehicle Teste" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Test with @{vehiclename}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Body,@{bod_total}|Agility,@{agi_total}|Reaction,@{rea_total}|Strength,@{str_total}|Charisma,@{cha_total}|Intuition,@{int_total}|Logic,@{log_total}|Willpower,@{wil_total}}]]}}{{val2=Skill}}{{val2_num=[[?{Skill-Rating|0}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}|Sensor,@{vehiclesens}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(?{Attribute}+?{Skill-Rating}+@{runningsilent}+@{hotsim}+@{vehiclemode}*@{controlrig}-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(?{Limit}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleotherrollautopilot" title="Any other Vehicle Teste" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=a Test}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[?{Autosoft-Rating|0}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}|Sensor,@{vehiclesens}}]]}}{{result=[[(@{vehiclepilot}+?{Autosoft-Rating|0}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit})]]]]}}" />
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleotherrollpilot" title="Any other Vehicle Teste" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Test with @{vehiclename}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Body,@{bod_total}|Agility,@{agi_total}|Reaction,@{rea_total}|Strength,@{str_total}|Charisma,@{cha_total}|Intuition,@{int_total}|Logic,@{log_total}|Willpower,@{wil_total}}]]}}{{val2=Skill}}{{val2_num=[[?{Skill-Rating|0}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}|Sensor,@{vehiclesens}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(?{Attribute}+?{Skill-Rating}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}" />
                             </div>
                             <div class="vehicleskilltype">
                                 <select name="attr_vehicleskilltype">
@@ -7564,8 +7616,8 @@ Click again to switch to Manual and Remote">
                                 <input type="text" name="attr_vehicleweaponbonus" title="Any Bonuses to Weapon Skill"> 
                             </div>
                             <div class="weaponrollwrapper">
-                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
-                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
                             </div>
                             <input class="vehicleweaponcheckbox hiddencheckbox" type="checkbox" name="attr_vehicleshowweaponnotes" title="Need more Space?">
                             <div class="checkboxticker vehicleweaponunticked"></div>
@@ -7619,12 +7671,12 @@ Click again to switch to Manual and Remote">
                                     <input type="text" name="attr_vehicleammodescription1" title="Additional Description"> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleammodv1}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv1}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1})]]]]}}{{after1=DV([[@{vehicleammodv1}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv1}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
                                 </div>
                             </div>
                             <div class="vehicleammorow">
@@ -7647,12 +7699,12 @@ Click again to switch to Manual and Remote">
                                     <input type="text" name="attr_vehicleammodescription2" title="Additional Description"> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleammodv2}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv2}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2})]]]]}}{{after1=DV([[@{vehicleammodv2}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{skilldicepool52}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{skilldicepool52}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig})]]]]}}{{after1=DV([[@{vehicleammodv2}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
                                 </div>
                             </div>
                         </div>
@@ -7722,7 +7774,7 @@ Click again to switch to Manual and Remote">
                 <div class="armortotal">
                     <input type="number" name="attr_armor_total" value="@{armorworn1}+@{armorworn2}+@{armorworn3}+@{armorworn4}+@{armorworn5}+@{armorworn6}+@{armorworn7}+@{armorworn8}" title="Sum of all worn Armor" disabled="true">
                 </div>
-                <button type="roll" class="armorroll" name="roll_armorroll" title="Roll to Absorb Damage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Absorb Damage}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Armor}}{{val2_num=[[@{armor_total}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{bod_total}+@{armor_total}+?{Armor Penetration}+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}]]}}" /> 
+                <button type="roll" class="armorroll" name="roll_armorroll" title="Roll to Absorb Damage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to Absorb Damage}}{{val1=Body}}{{val1_num=[[@{bod_total}]]}}{{val2=Armor}}{{val2_num=[[@{armor_total}]]}}{{val3=Armor Penetration}}{{val3_num=[[?{Armor Penetration|-0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{result=[[(@{bod_total}+@{armor_total}+?{Armor Penetration}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}]]}}" /> 
             </div>
             <div class="armorlabels">
                 <div class="armorwornwrapper">
@@ -8017,10 +8069,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice1" value="@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes1" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8095,10 +8147,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription1" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8172,10 +8224,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice2" value="@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes2" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8250,10 +8302,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription2" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8327,10 +8379,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice3" value="@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes3" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8405,10 +8457,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription3" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8482,10 +8534,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice4" value="@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes4" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8560,10 +8612,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription4" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8637,10 +8689,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice5" value="@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes5" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8715,10 +8767,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription5" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8792,10 +8844,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice6" value="@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes6" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8870,10 +8922,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription6" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8947,10 +8999,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice7" value="@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes7" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -9025,10 +9077,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription7" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -9102,10 +9154,10 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_weapondice8" value="@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes8" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -9180,10 +9232,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription8" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])d6cs>5>5sd@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -9596,6 +9648,7 @@ Click again to switch to Manual and Remote">
         <div class="hiddentextfield"><input type="text" name="attr_machine_firewall" value="+2"></div>
         <div class="hiddentextfield"><input type="text" name="attr_initialisation" value="0"></div>
         <div class="hiddentextfield"><input type="text" name="attr_edgn" value="0"></div>
+        <div class="hiddentextfield"><input type="text" name="attr_standardroll" value="d6cs>5>5sd"></div>
 
     </div>