Merge branch 'develop'

GameData/ConformalDecals/Localization/en-us.cfg

@@ -18,6 +18,14 @@ Localization
     #LOC_ConformalDecals_gui-aspectratio = Aspect Ratio
     #LOC_ConformalDecals_gui-select-flag = Select Flag
     #LOC_ConformalDecals_gui-reset-flag = Reset Flag
+    #LOC_ConformalDecals_gui-set-text = Set Text
+    #LOC_ConformalDecals_gui-group-fill = Fill
+    #LOC_ConformalDecals_gui-group-outline = Outline
+    #LOC_ConformalDecals_gui-fill = Fill
+    #LOC_ConformalDecals_gui-set-fill-color = Set Fill Color
+    #LOC_ConformalDecals_gui-outline = Outline
+    #LOC_ConformalDecals_gui-outline-width = Outline Width
+    #LOC_ConformalDecals_gui-set-outline-color = Set Outline Color
 
     // PARTS
 
@@ -26,6 +34,11 @@ Localization
     #LOC_ConformalDecals_flag-description = A simple switchable flag. Can either use the mission flag or select a specific flag to use.
     #LOC_ConformalDecals_flag-tags = conformal decal sticker flag
 
+    // Text
+    #LOC_ConformalDecals_text-title = CDL-T Text Decal
+    #LOC_ConformalDecals_text-description = A decal that can display custom text in a variety of fonts
+    #LOC_ConformalDecals_text-tags = conformal decal sticker text font
+
     // Generic Decals
     #LOC_ConformalDecals_generic-title = CDL-1 Generic Decal
     #LOC_ConformalDecals_generic-description = A set of generic warning decals and signs to add to your vehicles. 
@@ -64,7 +77,7 @@ Localization
 
     // Semiotic Decals
     #LOC_ConformalDecals_semiotic-title = CDL-2 Semiotic Standard Decal
-    #LOC_ConformalDecals_semiotic-description = After several unfortunate mishaps with confusing signage on spacecraft, The Peel-N-Stik™ Corporation teamed up with Kerland-Mutani to unveil the Semiotic Standard for Kerbal Vessels, a set of standardized icons for use on ships and stations.
+    #LOC_ConformalDecals_semiotic-description = After several unfortunate mishaps with confusing signage on spacecraft, The Peel-N-Stik™ Corporation teamed up with Kerland-Mutani to unveil the Semiotic Standard for Kerbal Vessels, a set of standardized icons for use on ships and stations. (Based on the work of Ron Cobb)
     #LOC_ConformalDecals_semiotic-tags = conformal decal sticker semiotic standard for kerbal vessels Ron Cobb Alien 
     #LOC_ConformalDecals_semiotic-variant-00 = Hazard
     #LOC_ConformalDecals_semiotic-variant-01 = Blank
@@ -98,5 +111,47 @@ Localization
     #LOC_ConformalDecals_semiotic-variant-29 = Radiation Hazard
     #LOC_ConformalDecals_semiotic-variant-30 = Radiation Bunker
     #LOC_ConformalDecals_semiotic-variant-31 = Exhaust
+
+    // Munar Decals
+    #LOC_ConformalDecals_munar-title = CDL-3 Surface Base Decal
+    #LOC_ConformalDecals_munar-description = Munar Industries Ltd. saw the wild success of the CDL-2 decal, and wanted to develop a decal set for their own line of Heluim mining bases. These decals are more explicit than the Semiotic Standard and aimed at the hazards that come with more advanced techonologies. (Based on the work of Gavin Rothery)
+    #LOC_ConformalDecals_munar-tag = conformal decal sticker Moon munar lunar industries Gavin Rothery Sarang
+    #LOC_ConformalDecals_munar-variant-severe-danger = Severe Danger
+    #LOC_ConformalDecals_munar-variant-danger = Danger
+    #LOC_ConformalDecals_munar-variant-hazard = Hazard
+    #LOC_ConformalDecals_munar-variant-warning = Warning
+    #LOC_ConformalDecals_munar-variant-bulkhead = Bulkhead
+    #LOC_ConformalDecals_munar-variant-hatch = Hatch
+    #LOC_ConformalDecals_munar-variant-pressure-hatch = Hatch (Pressurized)
+    #LOC_ConformalDecals_munar-variant-door = Doorway
+    #LOC_ConformalDecals_munar-variant-door-danger = Do Not Obstruct
+    #LOC_ConformalDecals_munar-variant-airlock-interior = Airlock (Interior)
+    #LOC_ConformalDecals_munar-variant-airlock-exterior = Airlock (Exterior)
+    #LOC_ConformalDecals_munar-variant-check-seals = Check All Seals
+    #LOC_ConformalDecals_munar-variant-pressure-seal = Pressure Seal
+    #LOC_ConformalDecals_munar-variant-vacuum = Danger Vacuum
+    #LOC_ConformalDecals_munar-variant-gas-mask = Breathing Apparatus Required
+    #LOC_ConformalDecals_munar-variant-oxygen-rich = Oxygen Rich Environment
+    #LOC_ConformalDecals_munar-variant-robotic-work = Heavy Robotic Work Ahead
+    #LOC_ConformalDecals_munar-variant-explosion = Explosion Hazard
+    #LOC_ConformalDecals_munar-variant-radiation = Radiation Hazard
+    #LOC_ConformalDecals_munar-variant-antimatter = Annihilation Hazard
+    #LOC_ConformalDecals_munar-variant-high-voltage = High Voltage
+    #LOC_ConformalDecals_munar-variant-extreme-voltage = Extreme Voltage
+    #LOC_ConformalDecals_munar-variant-explosive-bolts = Explosive Bolts
+    #LOC_ConformalDecals_munar-variant-autonomous-device = Autonomous Device
+    #LOC_ConformalDecals_munar-variant-gravity-adjust = Gravity Adjust
+    #LOC_ConformalDecals_munar-variant-electromagnetic = Strong EM Field
+    #LOC_ConformalDecals_munar-variant-mind-step = Mind Step
+    #LOC_ConformalDecals_munar-variant-class-1 = Class 1 Hazard: Flammable Liquid
+    #LOC_ConformalDecals_munar-variant-class-2 = Class 2 Hazard: Flammable Solid
+    #LOC_ConformalDecals_munar-variant-class-3 = Class 3 Hazard: Magnetic Field
+    #LOC_ConformalDecals_munar-variant-class-4 = Class 4 Hazard: Electric Field
+    #LOC_ConformalDecals_munar-variant-class-5 = Class 5 Hazard: Pressurized Fuel
+    #LOC_ConformalDecals_munar-variant-class-6 = Class 6 Hazard: Pressurized Coolant
+    #LOC_ConformalDecals_munar-variant-class-7 = Class 7 Hazard: Cryogenic Liquid
+    #LOC_ConformalDecals_munar-variant-class-8 = Class 8 Hazard: Radioactive
+    #LOC_ConformalDecals_munar-variant-class-9 = Class 9 Hazard: Ionized Gas
+    #LOC_ConformalDecals_munar-variant-class-10 = Class 10 Hazard: Antimatter
   }
 }

GameData/ConformalDecals/Parts/Generic/decal-generic.cfg

@@ -65,7 +65,12 @@ PART
     scaleRange = 0.1, 4
     scaleMode = AVERAGE
 
-    shader = ConformalDecals/Paint/Specular
+    shader = ConformalDecals/Decal/Standard
+
+    KEYWORD { 
+      name = DECAL_SDF_ALPHA 
+      value = false
+    }
 
     TEXTURE {
       name = _Decal
@@ -108,7 +113,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 128, 2, 128, 112 
         }
       }
@@ -123,7 +128,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 256, 2, 128, 112 
         }
       }
@@ -138,7 +143,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 384, 2, 128, 112 
         }
       }
@@ -153,7 +158,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 690, 4, 330, 118 
         }
       }
@@ -168,7 +173,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 898, 4, 122, 118
         }
       }
@@ -183,7 +188,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 6, 126, 196, 132
         }
       }
@@ -198,7 +203,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 210, 122, 94, 94 
         }
       }
@@ -213,7 +218,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA {
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 8, 262, 192, 70 
         }
       }
@@ -242,7 +247,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 508, 332, 262, 112 
         }
       }
@@ -257,7 +262,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 202, 218, 164, 114 
         }
       }
@@ -272,7 +277,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 366, 218, 164, 114 
         }
       }
@@ -347,7 +352,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 326, 426, 164, 20 
         }
       }
@@ -363,7 +368,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 776, 388, 48, 48 
         }
       }
@@ -378,7 +383,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 328, 456, 48, 48 
         }
       }
@@ -393,7 +398,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 376, 456, 48, 48 
         }
       }
@@ -408,7 +413,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 424, 456, 48, 48 
         }
       }
@@ -423,7 +428,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 472, 456, 48, 48 
         }
       }
@@ -438,7 +443,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 520, 456, 48, 48 
         }
       }
@@ -453,7 +458,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 568, 456, 48, 48 
         }
       }
@@ -468,7 +473,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA {
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 614, 456, 48, 48 
         }
       }
@@ -483,7 +488,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 662, 456, 48, 48 
         }
       }
@@ -498,7 +503,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA {
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 710, 456, 48, 48 
         }
       }
@@ -513,7 +518,7 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/SpecularSDF
+          KEYWORD { name = DECAL_SDF_ALPHA }
           tile = 758, 456, 48, 48 
         }
       }
@@ -528,7 +533,10 @@ PART
       MODULE {
         IDENTIFIER { name = ModuleConformalDecal }
         DATA { 
-          shader = ConformalDecals/Paint/Diffuse
+          TEXTURE {
+            name = _SpecMap
+            remove = true
+          }
 
           tile = 826, 360, 196, 150 
           opacity = 1

GameData/ConformalDecals/Parts/Munar/decal-munar.cfg

@@ -0,0 +1,537 @@
+PART
+{
+  name = conformaldecals-munar
+  module = Part
+  author = Andrew Cassidy
+  MODEL
+  {
+    model = ConformalDecals/Assets/decal-blank
+    scale = 1.0, 1.0, 1.0
+  }
+  rescaleFactor = 1
+
+  // Attachment
+  attachRules = 1,1,0,0,1
+  node_attach = 0.0, 0.0, 0.05, 0.0, 0.0, -1.0
+
+  // Tech
+  TechRequired = start
+
+  // Info
+  cost = 75
+  category = Structural
+
+  // CDL-3 Surface Base Decal
+  title = #LOC_ConformalDecals_munar-title
+
+  // Peel-N-Stik Adhesive Decals
+  manufacturer = #LOC_ConformalDecals_agent-peel-n-stick_title
+
+  // Munar Industries Ltd. saw the wild success of the CDL-2 decal, and wanted to develop a decal set for their own line of Heluim mining bases. These decals are more explicit than the Semiotic Standard and aimed at the hazards that come with more advanced techonologies. (Based on the work of Gavin Rothery)
+  description = #LOC_ConformalDecals_munar-description
+
+  // conformal decal sticker Moon munar lunar industries Gavin Rothery Sarang 
+  tags = #LOC_ConformalDecals_munar-tags 
+
+  bulkheadProfiles = srf
+
+  // Parameters
+  mass = 0.0005
+  dragModel = NONE
+  angularDrag = 0.0
+  crashTolerance = 10
+  maxTemp = 2000
+  breakingForce = 350
+  breakingTorque = 150
+  physicalSignificance = NONE
+
+  MODULE
+  {
+    name = ModuleConformalDecal
+
+    useBaseNormal = true
+
+    tile = -1, -1, 0, 0
+    tileSize = 96, 96
+    tileIndex = 0
+
+    defaultScale = 0.1
+    defaultDepth = 0.1
+    defaultOpacity = 0.8
+    defaultCutoff = 0
+
+    scaleRange = 0.05, 0.5
+    scaleMode = MINIMUM
+    cutoffAdjustable = false
+
+    shader = ConformalDecals/Decal/Standard
+
+    TEXTURE {
+      name = _Decal
+      textureUrl = ConformalDecals/Parts/Munar/Munar-Atlas
+      isMain = true
+      autoTile = true
+    }
+
+    TEXTURE {
+      name = _SpecMap
+      textureUrl = ConformalDecals/Assets/Decal-Spec
+      autoScale = true
+    }
+  }
+
+  MODULE {
+    name = ModuleB9PartSwitch
+
+    SUBTYPE {
+      name = severe-danger
+      title = #LOC_ConformalDecals_munar-variant-severe-danger
+      primaryColor = #2B250D
+      secondaryColor = #F78000
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 0 }
+      }
+    }
+
+    SUBTYPE {
+      name = danger
+      title = #LOC_ConformalDecals_munar-variant-danger
+      primaryColor = #93927E
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 2 }
+      }
+    }
+
+    SUBTYPE {
+      name = hazard
+      title = #LOC_ConformalDecals_munar-variant-hazard
+      primaryColor = #2B250D
+      secondaryColor = #CC1F01
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 6 }
+      }
+    }
+
+    SUBTYPE {
+      name = warning
+      title = #LOC_ConformalDecals_munar-variant-warning
+      primaryColor = #2B250D
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 5 }
+      }
+    }
+
+    SUBTYPE {
+      name = bulkhead
+      title = #LOC_ConformalDecals_munar-variant-bulkhead
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 7 }
+      }
+    }
+
+    
+    SUBTYPE {
+      name = hatch
+      title = #LOC_ConformalDecals_munar-variant-hatch
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 3 }
+      }
+    }
+
+    SUBTYPE {
+      name = pressure-hatch
+      title = #LOC_ConformalDecals_munar-variant-pressure-hatch
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 4 }
+      }
+    }
+
+    SUBTYPE {
+      name = door
+      title = #LOC_ConformalDecals_munar-variant-door
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 5 }
+      }
+    }
+
+    SUBTYPE {
+      name = door-danger
+      title = #LOC_ConformalDecals_munar-variant-door-danger
+      primaryColor = #2B250D
+      secondaryColor = #CC1F01
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { 
+          tile = 960, 0, 64, 96 
+          scaleMode = HEIGHT
+        }
+      }
+    }
+
+    SUBTYPE {
+      name = airlock-interior
+      title = #LOC_ConformalDecals_munar-variant-airlock-interior
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 866, 96, 142, 96 }
+      }
+    }
+
+    SUBTYPE {
+      name = airlock-exterior
+      title = #LOC_ConformalDecals_munar-variant-airlock-exterior
+      primaryColor = #CC1F01
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 768, 96, 142, 96 }
+      }
+    }
+
+    SUBTYPE {
+      name = check-seals
+      title = #LOC_ConformalDecals_munar-variant-check-seals
+      primaryColor = White
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 8 }
+      }
+    }
+
+    SUBTYPE {
+      name = pressure-seal
+      title = #LOC_ConformalDecals_munar-variant-pressure-seal
+      primaryColor = White
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 9 }
+      }
+    }
+
+    SUBTYPE {
+      name = vacuum
+      title = #LOC_ConformalDecals_munar-variant-vacuum
+      primaryColor = #93927E
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 17 }
+      }
+    }
+
+    SUBTYPE {
+      name = gas-mask
+      title = #LOC_ConformalDecals_munar-variant-gas-mask
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 96, 320, 96, 116 }
+      }
+    }
+
+    SUBTYPE {
+      name = oxygen-rich
+      title = #LOC_ConformalDecals_munar-variant-oxygen-rich
+      primaryColor = #CC1F01
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 288, 416, 96, 96 }
+      }
+    }
+
+    SUBTYPE {
+      name = robotic-work
+      title = #LOC_ConformalDecals_munar-variant-robotic-work
+      primaryColor = #F78000
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 10 }
+      }
+    }
+
+    SUBTYPE {
+      name = explosion
+      title = #LOC_ConformalDecals_munar-variant-explosion
+      primaryColor = #F78000
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 0, 320, 96, 116 }
+      }
+    }
+
+    SUBTYPE {
+      name = radiation
+      title = #LOC_ConformalDecals_munar-variant-radiation
+      primaryColor = #F78000
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 1 }
+      }
+    }
+
+    SUBTYPE {
+      name = antimatter
+      title = #LOC_ConformalDecals_munar-variant-antimatter
+      primaryColor = #F78000
+      secondaryColor = #2B250D
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 11 }
+      }
+    }
+
+    SUBTYPE {
+      name = high-voltage
+      title = #LOC_ConformalDecals_munar-variant-high-voltage
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 13 }
+      }
+    }
+
+    SUBTYPE {
+      name = extreme-voltage
+      title = #LOC_ConformalDecals_munar-variant-extreme-voltage
+      primaryColor = #2B250D
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 14 }
+      }
+    }
+    
+    SUBTYPE {
+      name = explosive-bolts
+      title = #LOC_ConformalDecals_munar-variant-explosive-bolts
+      primaryColor = #93927E
+      secondaryColor = #CC1F01
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 15 }
+      }
+    }
+
+    SUBTYPE {
+      name = autonomous-device
+      title = #LOC_ConformalDecals_munar-variant-autonomous-device
+      primaryColor = #2B250D
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tileIndex = 16 }
+      }
+    }
+
+    SUBTYPE {
+      name = gravity-adjust
+      title = #LOC_ConformalDecals_munar-variant-gravity-adjust
+      primaryColor = White
+      secondaryColor = #CC1F01
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 288, 320, 96, 96 }
+      }
+    }
+
+    SUBTYPE {
+      name = electromagnetic
+      title = #LOC_ConformalDecals_munar-variant-electromagnetic
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { 
+          tile = 967, 195, 50, 90 
+          scaleMode = HEIGHT
+        }
+      }
+    }
+    
+    SUBTYPE {
+      name = mind-step
+      title = #LOC_ConformalDecals_munar-variant-mind-step
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 1, 447, 230, 64 }
+      }
+    }
+    
+    SUBTYPE {
+      name = class-1
+      title = #LOC_ConformalDecals_munar-variant-class-1
+      primaryColor = #CC1F01
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 0, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-2
+      title = #LOC_ConformalDecals_munar-variant-class-2
+      primaryColor = #93927E
+      secondaryColor = #CC1F01
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 96, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-3
+      title = #LOC_ConformalDecals_munar-variant-class-3
+      primaryColor = #93927E
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 192, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-4
+      title = #LOC_ConformalDecals_munar-variant-class-4
+      primaryColor = #93927E
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 288, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-5
+      title = #LOC_ConformalDecals_munar-variant-class-5
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 384, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-6
+      title = #LOC_ConformalDecals_munar-variant-class-6
+      primaryColor = #93927E
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 480, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-7
+      title = #LOC_ConformalDecals_munar-variant-class-7
+      primaryColor = #F78000
+      secondaryColor = #93927E
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 576, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-8
+      title = #LOC_ConformalDecals_munar-variant-class-8
+      primaryColor = #93927E
+      secondaryColor = #F78000
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 672, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-9
+      title = #LOC_ConformalDecals_munar-variant-class-9
+      primaryColor = #93927E
+      secondaryColor = #F78000
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 768, 192, 96, 128 }
+      }
+    }
+
+    SUBTYPE {
+      name = class-10
+      title = #LOC_ConformalDecals_munar-variant-class-10
+      primaryColor = #F78000
+      secondaryColor = White
+
+      MODULE {
+        IDENTIFIER { name = ModuleConformalDecal }
+        DATA { tile = 864, 192, 96, 128 }
+      }
+    }
+  }
+}

GameData/ConformalDecals/Parts/Semiotic/decal-semiotic.cfg

@@ -21,13 +21,13 @@ PART
   cost = 75
   category = Structural
 
-  // CDL-1 Semiotic Standard Decal
+  // CDL-2 Semiotic Standard Decal
   title = #LOC_ConformalDecals_semiotic-title
 
   // Peel-N-Stik Adhesive Decals
   manufacturer = #LOC_ConformalDecals_agent-peel-n-stick_title
 
-  // After several unfortunate mishaps with confusing signage on spacecraft, The Peel-N-Stik™ Corporation teamed up with Kerland-Mutani to unveil the Semiotic Standard for Kerbal Vessels, a set of standardized icons for use on ships and stations.
+  // After several unfortunate mishaps with confusing signage on spacecraft, The Peel-N-Stik™ Corporation teamed up with Kerland-Mutani to unveil the Semiotic Standard for Kerbal Vessels, a set of standardized icons for use on ships and stations. (Based on the work of Ron Cobb)
   description = #LOC_ConformalDecals_semiotic-description
 
   // conformal decal sticker semiotic standard for kerbal vessels Ron Cobb Alien 
@@ -62,7 +62,7 @@ PART
     scaleRange = 0.05, 0.5
     cutoffAdjustable = false
 
-    shader = ConformalDecals/Paint/Specular
+    shader = ConformalDecals/Decal/Standard
 
     TEXTURE {
       name = _Decal

GameData/ConformalDecals/Parts/decal-flag.cfg

@@ -53,5 +53,13 @@ PART
 
     defaultDepth = 0.2
     defaultCutoff = 0
+
+    shader = ConformalDecals/Decal/Standard
+
+    TEXTURE {
+      name = _SpecMap
+      textureUrl = ConformalDecals/Assets/Decal-Spec
+      autoScale = true
+    }
   }
 }

GameData/ConformalDecals/Parts/decal-text.cfg

@@ -0,0 +1,63 @@
+PART
+{
+  name = conformaldecals-text
+  module = Part
+  author = Andrew Cassidy
+  MODEL
+  {
+    model = ConformalDecals/Assets/decal-blank
+    scale = 1.0, 1.0, 1.0
+  }
+  rescaleFactor = 1
+
+  // Attachment
+  attachRules = 1,1,0,0,1
+  node_attach = 0.0, 0.0, 0.1, 0.0, 0.0, -1.0
+
+  // Tech
+  TechRequired = start
+
+  // Info
+  cost = 75
+  category = Structural
+
+  // CDL-T Text Decal
+  title = #LOC_ConformalDecals_text-title
+
+
+  // Peel-N-Stik Adhesive Decals
+  manufacturer = #LOC_ConformalDecals_agent-peel-n-stick_title 
+
+  // A decal that can display custom text in a variety of fonts
+  description = #LOC_ConformalDecals_text-description
+
+
+  // conformal decal sticker text font
+  tags = #LOC_ConformalDecals_text-tags
+
+  bulkheadProfiles = srf
+
+  // Parameters
+  mass = 0.0005
+  dragModel = NONE
+  angularDrag = 0.0
+  crashTolerance = 10
+  maxTemp = 2000
+  breakingForce = 350
+  breakingTorque = 150
+  physicalSignificance = NONE
+
+  MODULE
+  {
+    name = ModuleConformalText
+
+    text = Text
+
+    shader = ConformalDecals/Decal/Text
+    useBaseNormal = true
+    scaleMode = MINIMUM
+
+    defaultDepth = 0.2
+    defaultCutoff = 0.5
+  }
+}

GameData/ConformalDecals/Resources/Categories.cfg

@@ -1,6 +1,7 @@
 // Custom category, requires WildBlueTools to work
 MODCAT
 {
+  name = conformaldecals
   title = #LOC_ConformalDecals_category-decals_title // Decals
 
   folderName = ConformalDecals

GameData/ConformalDecals/Resources/ConformalDecals.cfg

@@ -20,4 +20,41 @@ CONFORMALDECALS {
     shader = KSP/Specular (Transparent)
     shader = Solid Color (Alpha)
   }
+
+  FONT {
+    name = LiberationSans SDF
+    title = Liberation Sans
+  }
+
+  FONT {
+    name = Calibri SDF
+    title = Calibri
+  }
+
+  FONT {
+    name = NotoSans-Regular SDF
+    title = Noto Sans
+  }
+
+  FONT {
+    name = Waukegan LDO Extended SDF
+    title = Waukegan Extended
+  }
+
+  FONT {
+    name = Nasalization SDF
+    title = Nasalization
+  }
+
+  FONT {
+    name = Helvetica SDF
+    title = Helvetica
+  }
+
+  FONT {
+    name = amarurgt SDF
+    title = Amarillo USAF
+    style = 32
+    styleMask = 4
+  }
 }

GameData/ConformalDecals/Resources/conformaldecals.kspfont

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8580f3c17793051fdc08447401fb7920665ad681ff352588508044b662a3240b
+size 364900

GameData/ConformalDecals/Versioning/ConformalDecals.version

@@ -5,8 +5,8 @@
     "VERSION":
     {
         "MAJOR":0,
-        "MINOR":1,
-        "PATCH":4,
+        "MINOR":2,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":