Aggregate: vendored Defs follow the namespace rename (Class=Institution.*)

Defs/JobDefs/Jobs_Corrections.xml

@@ -5,21 +5,21 @@
        shared one name could not both be reached. -->
   <JobDef>
     <defName>Institution_RehabilitateJob</defName>
-    <driverClass>Contraband.JobDriver_Rehabilitate</driverClass>
+    <driverClass>Institution.JobDriver_Rehabilitate</driverClass>
     <reportString>rehabilitating TargetA.</reportString>
     <casualInterruptible>false</casualInterruptible>
   </JobDef>
 
   <JobDef>
     <defName>Institution_ParoleJob</defName>
-    <driverClass>Contraband.JobDriver_Parole</driverClass>
+    <driverClass>Institution.JobDriver_Parole</driverClass>
     <reportString>paroling TargetA.</reportString>
     <casualInterruptible>false</casualInterruptible>
   </JobDef>
 
   <JobDef>
     <defName>Institution_DisciplineJob</defName>
-    <driverClass>Contraband.JobDriver_Discipline</driverClass>
+    <driverClass>Institution.JobDriver_Discipline</driverClass>
     <reportString>disciplining TargetA.</reportString>
     <casualInterruptible>false</casualInterruptible>
   </JobDef>

Defs/JobDefs/Jobs_Policing.xml

@@ -3,7 +3,7 @@
 
   <JobDef>
     <defName>Institution_Investigate</defName>
-    <driverClass>Contraband.JobDriver_Investigate</driverClass>
+    <driverClass>Institution.JobDriver_Investigate</driverClass>
     <reportString>investigating a crime scene.</reportString>
     <casualInterruptible>true</casualInterruptible>
   </JobDef>

Defs/Misc_Contraband.xml

@@ -3,7 +3,7 @@
 
   <JobDef>
     <defName>Contraband_SearchPawn</defName>
-    <driverClass>Contraband.JobDriver_SearchPawn</driverClass>
+    <driverClass>Institution.JobDriver_SearchPawn</driverClass>
     <reportString>searching TargetA.</reportString>
   </JobDef>
 
@@ -21,7 +21,7 @@
   <WorkGiverDef>
     <defName>Contraband_WardenSearch</defName>
     <label>search prisoners for contraband</label>
-    <giverClass>Contraband.WorkGiver_Warden_Search</giverClass>
+    <giverClass>Institution.WorkGiver_Warden_Search</giverClass>
     <workType>Warden</workType>
     <verb>search</verb>
     <gerund>searching</gerund>

Defs/ThingDefs/Buildings_Justice.xml

@@ -34,7 +34,7 @@
       <Steel>15</Steel>
     </costList>
     <comps>
-      <li Class="Contraband.CompProperties_SecurityGrade" />
+      <li Class="Institution.CompProperties_SecurityGrade" />
     </comps>
     <building>
       <isEdifice>false</isEdifice>

Defs/ThingDefs/Tools_Escape.xml

@@ -29,11 +29,11 @@
     </statBases>
     <stackLimit>1</stackLimit>
     <comps>
-      <li Class="Contraband.CompProperties_Contraband">
+      <li Class="Institution.CompProperties_Contraband">
         <concealability>0.5</concealability>
         <hideIn>InCell</hideIn>
-        <acquireWorker>Contraband.AcquireWorker_Improvise</acquireWorker>
+        <acquireWorker>Institution.AcquireWorker_Improvise</acquireWorker>
-        <escapeWorker>Contraband.EscapeTunnelWorker</escapeWorker>
+        <escapeWorker>Institution.EscapeTunnelWorker</escapeWorker>
       </li>
     </comps>
   </ThingDef>

Defs/ThingDefs/Weapons_Improvised.xml

@@ -34,10 +34,10 @@
       <li>Melee</li>
     </weaponClasses>
     <comps>
-      <li Class="Contraband.CompProperties_Contraband">
+      <li Class="Institution.CompProperties_Contraband">
         <concealability>0.75</concealability>
         <hideIn>OnBody, InCell</hideIn>
-        <acquireWorker>Contraband.AcquireWorker_Improvise</acquireWorker>
+        <acquireWorker>Institution.AcquireWorker_Improvise</acquireWorker>
       </li>
     </comps>
     <tools>

Defs/WorkGiverDefs/WorkGivers_Corrections.xml

@@ -9,7 +9,7 @@
   <WorkGiverDef>
     <defName>Institution_WardenRehabilitate</defName>
     <label>rehabilitate prisoner</label>
-    <giverClass>Contraband.WorkGiver_Warden_Rehabilitate</giverClass>
+    <giverClass>Institution.WorkGiver_Warden_Rehabilitate</giverClass>
     <workType>Warden</workType>
     <verb>rehabilitate</verb>
     <gerund>rehabilitating</gerund>
@@ -23,7 +23,7 @@
   <WorkGiverDef>
     <defName>Institution_WardenParole</defName>
     <label>parole prisoner</label>
-    <giverClass>Contraband.WorkGiver_Warden_Parole</giverClass>
+    <giverClass>Institution.WorkGiver_Warden_Parole</giverClass>
     <workType>Warden</workType>
     <verb>parole</verb>
     <gerund>paroling</gerund>
@@ -36,7 +36,7 @@
   <WorkGiverDef>
     <defName>Institution_WardenDiscipline</defName>
     <label>discipline prisoner</label>
-    <giverClass>Contraband.WorkGiver_Warden_Discipline</giverClass>
+    <giverClass>Institution.WorkGiver_Warden_Discipline</giverClass>
     <workType>Warden</workType>
     <verb>discipline</verb>
     <gerund>disciplining</gerund>

Defs/WorkGiverDefs/WorkGivers_Policing.xml

@@ -4,7 +4,7 @@
   <WorkGiverDef>
     <defName>Institution_Investigate</defName>
     <label>investigate crimes</label>
-    <giverClass>Contraband.WorkGiver_Investigate</giverClass>
+    <giverClass>Institution.WorkGiver_Investigate</giverClass>
     <workType>Institution_Investigating</workType>
     <verb>investigate</verb>
     <gerund>investigating</gerund>

Patches/Ward_DisorderIntegration.xml

@@ -9,7 +9,7 @@
   PTSD, cleanliness-OCD. Deliberately NOT Autism or ADHD — those are neurotypes, and a ward that
   "treats away" who someone is would be a worse mod, not a more featureful one.
 
-  A player or another mod can opt any hediff in the same way: add the Contraband.TreatableConditionExtension extension.
+  A player or another mod can opt any hediff in the same way: add the Institution.TreatableConditionExtension extension.
 -->
 <Patch>
 
@@ -19,7 +19,7 @@
       <xpath>/Defs/HediffDef[defName="MajorDepression"]</xpath>
       <value>
         <modExtensions>
-          <li Class="Contraband.TreatableConditionExtension">
+          <li Class="Institution.TreatableConditionExtension">
             <reductionPerSession>0.10</reductionPerSession>
           </li>
         </modExtensions>
@@ -33,7 +33,7 @@
       <xpath>/Defs/HediffDef[defName="GeneralizedAnxiety"]</xpath>
       <value>
         <modExtensions>
-          <li Class="Contraband.TreatableConditionExtension">
+          <li Class="Institution.TreatableConditionExtension">
             <reductionPerSession>0.12</reductionPerSession>
           </li>
         </modExtensions>
@@ -47,7 +47,7 @@
       <xpath>/Defs/HediffDef[defName="PTSD"]</xpath>
       <value>
         <modExtensions>
-          <li Class="Contraband.TreatableConditionExtension">
+          <li Class="Institution.TreatableConditionExtension">
             <reductionPerSession>0.08</reductionPerSession>
           </li>
         </modExtensions>
@@ -61,7 +61,7 @@
       <xpath>/Defs/HediffDef[defName="COCD"]</xpath>
       <value>
         <modExtensions>
-          <li Class="Contraband.TreatableConditionExtension">
+          <li Class="Institution.TreatableConditionExtension">
             <reductionPerSession>0.10</reductionPerSession>
           </li>
         </modExtensions>