Contraband semirebalance

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -95,50 +95,6 @@
     sprite: Clothing/Belt/belt_overlay.rsi
   - type: Appearance
 
-# HL start
-- type: entity
-  parent: [NFClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseC3SyndicateContraband]
-  id: ClothingBeltUtilitySyndicate
-  name: blood-red utility belt
-  description: It can hold various tools while looking fresh as fuck.
-  components:
-  - type: Sprite
-    sprite: _HL/Clothing/Belt/utility.rsi
-  - type: Clothing
-    sprite: _HL/Clothing/Belt/utility.rsi
-  - type: Storage
-  - type: ItemMapper
-    mapLayers:
-      drill:
-        whitelist:
-          tags:
-          - Syndie_Powerdrill
-      jaws:
-        whitelist:
-          tags:
-          - Syndie_JawsOfLife
-      multitool:
-        whitelist:
-          tags:
-          - Syndie_Multitool
-    sprite: _HL/Clothing/Belt/belt_overlay.rsi
-  - type: Appearance
-
-- type: entity
-  parent: ClothingBeltUtilitySyndicate
-  id: ClothingBeltUtilitySyndicateFilled
-  suffix: filled
-  components:
-  - type: StorageFill
-    contents:
-    - id: SyndicateJawsOfLife
-    - id: SyndicateWelderExperimental
-    - id: SyndicatePowerDrill
-    - id: SyndicateMultitool
-    - id: ClothingHandsGlovesCombat
-    - id: ClothingMaskGasSyndicate
-# HL end
-
 - type: entity
   parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltChiefEngineer

Resources/Prototypes/Entities/Clothing/Masks/masks.yml

@@ -42,7 +42,7 @@
   - type: IngestionBlocker # Goobstation
 
 - type: entity
-  parent: [ClothingMaskGas, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [ClothingMaskGas, BaseC1Contraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent ## HL: C3 > C1
   id: ClothingMaskGasSyndicate
   name: syndicate gas mask
   description: A close-fitting tactical mask that can be connected to an air supply.

Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml

@@ -388,7 +388,7 @@
     sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi
 
 - type: entity
-  parent: [BaseC3SyndicateContraband, ClothingOuterCoatHoSTrench, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, add ContrabandClothing as parent
+  parent: [BaseC2Contraband, ClothingOuterCoatHoSTrench, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, add ContrabandClothing as parent ## Hardlight: C3 -> C2
   id: ClothingOuterCoatSyndieCapArmored
   name: syndicate's armored coat
   description: The syndicate's armored coat is made of durable fabric, with gilded patterns.

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -511,7 +511,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformSkirtBase, ContrabandClothing ] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, ContrabandClothing
+  parent: [UnsensoredClothingUniformSkirtBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, ContrabandClothing ## HL: Noncontra clothing
   id: ClothingUniformJumpskirtOperative
   name: operative jumpskirt
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.
@@ -625,7 +625,7 @@
       sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi
 
 - type: entity
-  parent: [ClothingUniformSkirtBase, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, ContrabandClothing
+  parent: [ClothingUniformSkirtBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, ContrabandClothing ## HL: Noncontra clothing
   id: ClothingUniformJumpskirtSyndieFormalDress
   name: syndicate formal dress
   description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -738,7 +738,7 @@
       sprite: Clothing/Uniforms/Jumpsuit/lawyergood.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [UnsensoredClothingUniformBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent ## HL: C3 -> C)
   id: ClothingUniformJumpsuitPyjamaSyndicateBlack
   name: black syndicate pyjamas
   description: For those long nights in perma.
@@ -749,7 +749,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [UnsensoredClothingUniformBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent ## HL: C3 -> C)
   id: ClothingUniformJumpsuitPyjamaSyndicatePink
   name: pink syndicate pyjamas
   description: For those long nights in perma.
@@ -760,7 +760,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [UnsensoredClothingUniformBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent ## HL: C3 -> C)
   id: ClothingUniformJumpsuitPyjamaSyndicateRed
   name: red syndicate pyjamas
   description: For those long nights in perma.
@@ -815,7 +815,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
 
 - type: entity
-  parent: [UnsensoredClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [UnsensoredClothingUniformBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent ## HL: C3 -> C0
   id: ClothingUniformJumpsuitOperative
   name: operative jumpsuit
   description: Uniform for elite syndicate operatives performing tactical operations in deep space.
@@ -1119,7 +1119,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi
 
 - type: entity
-  parent: [ClothingUniformBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as a parent
+  parent: [ClothingUniformBase] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as a parent ## HL: C3 -> C0
   id: ClothingUniformJumpsuitSyndieFormal
   name: syndicate formal suit
   description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."

Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml

@@ -307,7 +307,7 @@
 
 - type: entity
   id: BedsheetSyndie
-  parent: [ BedsheetBase, BaseC3SyndicateContrabandNoValue ] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandNoValue
+  parent: [ BedsheetBase ] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandNoValue ## Hardlight: C3 -> C0
   name: syndicate bedsheet
   description: It has a syndicate emblem and it has an aura of evil.
   components:

Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml

@@ -23,7 +23,7 @@
     sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
 
 - type: entity
-  parent: [BaseItem, BaseC3SyndicateContraband, RecyclableItemClothSmall] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband added RecyclableItemClothSmall
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband added RecyclableItemClothSmall ## Hardlight: C3 -> C0
   id: SyndieHandyFlag
   name: syndicate handheld flag
   description: "For truly rebellious patriots. Death to NT!"

Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml

@@ -52,7 +52,7 @@
 
 - type: entity
   name: jaws of death
-  parent: [JawsOfLife, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [JawsOfLife, BaseC2Contraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband ## Hardlight: C3 -> C2
   id: SyndicateJawsOfLife
   description: Useful for entering the station or its departments.
   components:

Resources/Prototypes/Entities/Objects/Tools/tools.yml

@@ -314,113 +314,6 @@
     soundHit:
       path: "/Audio/Items/drill_hit.ogg"
 
-### HL start
-- type: entity
-  name: gorlex maraudrill
-  parent: [PowerDrill, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
-  id: SyndicatePowerDrill
-  description: An advanced powered hand drill.
-  components:
-  - type: Sprite
-    sprite: _HL/Objects/Tools/syndie_drill.rsi
-    state: drill_screw
-  - type: Item
-    sprite: _HL/Objects/Tools/syndie_drill.rsi
-    inhandVisuals:
-      left:
-      - state: inhand-left
-      right:
-      - state: inhand-right
-    size: Small
-  - type: Tool
-    qualities:
-    - Screwing
-    speedModifier: 3.0
-  - type: MultipleTool
-    entries:
-      - behavior: Screwing
-        sprite:
-          sprite: _HL/Objects/Tools/syndie_drill.rsi
-          state: drill_screw
-        useSound: /Audio/Items/drill_use.ogg
-        changeSound: /Audio/Items/change_drill.ogg
-      - behavior: Anchoring
-        sprite:
-          sprite: _HL/Objects/Tools/syndie_drill.rsi
-          state: drill_bolt
-        useSound: /Audio/Items/drill_use.ogg
-        changeSound: /Audio/Items/change_drill.ogg
-  - type: MeleeWeapon
-    damage:
-      types:
-        Piercing: 14
-  - type: Tag
-    tags:
-    - Syndie_Powerdrill
-
-- type: entity
-  name: multitaser
-  parent: [BaseItem, BaseC3SyndicateContraband]
-  id: SyndicateMultitool
-  description: An illegal tool to copy, store, and send electrical pulses and signals through wires, machines, and people.
-  components:
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/multitool_drop.ogg
-  - type: Sprite
-    sprite: _HL/Objects/Tools/multitaser.rsi
-    layers:
-    - state: icon
-    - state: green-unlit
-      shader: unshaded
-  - type: Item
-    size: Small
-  - type: Clothing
-    sprite: _HL/Objects/Tools/multitaser.rsi
-    quickEquip: false
-    slots:
-    - Belt
-  - type: Tool
-    qualities:
-    - Pulsing
-  - type: NetworkConfigurator
-  - type: ActivatableUI
-    key: enum.NetworkConfiguratorUiKey.List
-    inHandsOnly: true
-  - type: UserInterface
-    interfaces:
-      enum.NetworkConfiguratorUiKey.List:
-        type: NetworkConfiguratorBoundUserInterface
-      enum.NetworkConfiguratorUiKey.Configure:
-        type: NetworkConfiguratorBoundUserInterface
-      enum.NetworkConfiguratorUiKey.Link:
-        type: NetworkConfiguratorBoundUserInterface
-  - type: Tag
-    tags:
-    - Syndie_Multitool
-    - DoorElectronicsConfigurator
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-      Plastic: 100
-  - type: StaticPrice
-    price: 28 # Frontier 56<28
-  - type: GuideHelp
-    guides:
-    - Networking
-    - WirePanels
-    - Airlocks
-    - InspectingPower
-  - type: MeleeWeapon
-    wideAnimationRotation: -90
-    attackRate: 2
-    damage:
-      types:
-        Shock: 8
-    soundHit:
-      path: /Audio/Items/Defib/defib_zap.ogg
-### HL end
-
 - type: entity
   id: RCD
   parent: BaseItem # Frontier: remove BaseEngineeringContraband

Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml

@@ -0,0 +1,41 @@
+- type: entity
+  parent: [NFClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseC1Contraband ]
+  id: ClothingBeltUtilitySyndicate
+  name: blood-red utility belt
+  description: It can hold various tools while looking fresh as fuck.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Belt/utility.rsi
+  - type: Clothing
+    sprite: _HL/Clothing/Belt/utility.rsi
+  - type: Storage
+  - type: ItemMapper
+    mapLayers:
+      drill:
+        whitelist:
+          tags:
+          - Syndie_Powerdrill
+      jaws:
+        whitelist:
+          tags:
+          - Syndie_JawsOfLife
+      multitool:
+        whitelist:
+          tags:
+          - Syndie_Multitool
+    sprite: _HL/Clothing/Belt/belt_overlay.rsi
+  - type: Appearance
+
+- type: entity
+  parent: ClothingBeltUtilitySyndicate
+  id: ClothingBeltUtilitySyndicateFilled
+  suffix: filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: SyndicateJawsOfLife
+    - id: SyndicateWelderExperimental
+    - id: SyndicatePowerDrill
+    - id: SyndicateMultitool
+    - id: ClothingHandsGlovesCombat
+    - id: ClothingMaskGasSyndicate