Clean up, increase build stability (#583)

* Update base.yml

* bandit -> sociopath

* some fixes

* syringe

* vaults

* Update ContentAudioSystem.CP14AmbientLoop.cs

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -7,7 +7,7 @@
     contents:
       - id: CP14KeyRingAlchemist
       - id: HandLabeler #TODO custom cp14 labeler
-      - id: Syringe #TODO custom cp14 syringe
+      - id: CP14Syringe
         amount: 2
       - id: CP14Cauldron
       - id: CP14Pestle
@@ -77,4 +77,30 @@
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved
-      - id: CP14StampCommandant
+      - id: CP14StampCommandant
+
+- type: entity
+  parent: CP14SafeVault
+  id: CP14SafeVaultFilled25
+  suffix: Vault, Filled 25gp
+  components:
+  - type: EntityTableContainerFill
+    containers: 
+      entity_storage: !type:GroupSelector
+        children:
+          - id: CP14JewelryRuby
+            weight: 0.1
+          - !type:GroupSelector
+            children:
+            # or 5gp
+            - id: CP14GoldCoin5
+            # or 50sp
+            - !type:AllSelector
+              children:
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin
+              - id: CP14SilverCoin 
+              - id: CP14SilverCoin
+            rolls: !type:ConstantNumberSelector
+              value: 5

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -180,8 +180,6 @@
   - type: Strippable
   - type: UserInterface
     interfaces:
-      enum.VoiceMaskUIKey.Key:
-        type: VoiceMaskBoundUserInterface
       enum.HumanoidMarkingModifierKey.Key:
         type: HumanoidMarkingModifierBoundUserInterface
       enum.StrippingUiKey.Key:
@@ -224,6 +222,7 @@
   - type: CP14FootprintTrailer
   - type: CP14DemiplaneStabilizer
     requireAlive: true
+  - type: CanEnterCryostorage
 
 
 - type: entity
@@ -256,6 +255,9 @@
     - Pacified
     - StaminaModifier
     - Flashed
+    - RadiationProtection
+    - Drowsiness
+    - Adrenaline
   - type: Blindable
   - type: Bloodstream
     bloodReagent: CP14Blood
@@ -271,6 +273,11 @@
     heatDamage:
       types:
         Heat: 1.5 #per second, scales with temperature & other constants
+  - type: TemperatureSpeed
+    thresholds:
+      293: 0.8
+      280: 0.6
+      260: 0.4
   - type: ThermalRegulator
     metabolismHeat: 800
     radiatedHeat: 100

Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml

@@ -222,4 +222,44 @@
         visible: false
   - type: SolutionContainerVisuals
     maxFillLevels: 2
-    fillBaseName: liq-
+    fillBaseName: liq-
+
+- type: entity
+  id: CP14Syringe
+  parent: BaseItem
+  name: syringe
+  description: Used to draw blood samples from mobs, or to inject them with reagents.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+    layers:
+      - state: syringe1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: base
+        map: ["enum.SolutionContainerLayers.Base"]
+  - type: Icon
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+    state: base
+  - type: Item
+    size: Tiny
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 10
+  - type: Injector
+    injectOnly: false
+    toggleState: Draw
+  - type: ExaminableSolution
+    solution: injector
+  - type: Spillable
+    solution: injector
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 3
+    fillBaseName: syringe
+  - type: Tag
+    tags:
+    - Syringe

Resources/Prototypes/_CP14/Entities/Objects/Tools/bucket.yml

@@ -4,7 +4,6 @@
   name: bucket
   description: It's a boring old bucket.
   categories: [ ForkFiltered ]
-  suffix: CP14
   components: 
   - type: Drink
     solution: bucket

Resources/Prototypes/_CP14/Entities/Objects/Tools/scissors.yml

@@ -5,6 +5,8 @@
   categories: [ ForkFiltered ]
   parent: BaseItem
   components:
+  - type: Item
+    size: Tiny
   - type: Sprite
     sprite: _CP14/Objects/Tools/scissors.rsi
     state: icon

Resources/Prototypes/_CP14/Entities/Structures/Doors/iron_doors.yml

@@ -102,11 +102,11 @@
 
 - type: entity
   parent: CP14IronDoor
-  id: CP14IronDoorBankSafe1
-  suffix: Bank Safe 1
+  id: CP14IronDoorBankSafe
+  suffix: Bank Safe
   components:
   - type: CP14Lock
-    autoGenerateShape: BankSafe1
+    autoGenerateShape: BankSafe
   - type: Lock
     locked: true
 
@@ -117,55 +117,5 @@
   components:
   - type: CP14Lock
     autoGenerateShape: BankCommandantRoom
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe2
-  suffix: Bank Safe 2
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe2
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe3
-  suffix: Bank Safe 3
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe3
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe4
-  suffix: Bank Safe 4
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe4
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe5
-  suffix: Bank Safe 5
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe5
-  - type: Lock
-    locked: true
-
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorBankSafe6
-  suffix: Bank Safe 6
-  components:
-  - type: CP14Lock
-    autoGenerateShape: BankSafe6
   - type: Lock
     locked: true

Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml

@@ -44,6 +44,8 @@
   - type: Appearance
   - type: Transform
     anchored: true
+  - type: Lock
+    locked: false
 
 - type: entity
   name: wooden cabinet

Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml

@@ -57,13 +57,15 @@
   - type: Rotatable
   - type: Transform
     anchored: true
+  - type: Lock
+    locked: false
 
 - type: entity
-  name: wooden closet
   parent:
   - CP14ClosetBase
   - CP14BaseFlammable
   id: CP14WoodenCloset
+  name: wooden closet
   description: It's a regular wooden closet.
   components:
   - type: Sprite
@@ -95,4 +97,60 @@
         spawn:
           CP14WoodenPlanks1:
             min: 2
-            max: 5
+            max: 5
+
+- type: entity
+  name: safe
+  parent:
+  - CP14ClosetBase
+  id: CP14Safe
+  description: A giant iron box for storing your most precious possessions. Extremely heavy and extremely strong.
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Dressers/vault.rsi
+    state: base
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.05,0.45,0.45"
+        density: 2000
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 500
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 350
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+  - type: Lock
+    locked: true
+  - type: CP14Lock
+    autoGenerateShape: BankSafe
+
+- type: entity
+  parent: CP14Safe
+  id: CP14SafeVault
+  name: vault safe
+  components:
+  - type: CP14Lock
+    autoGenerateShape: BankVault

Resources/Prototypes/_CP14/Entities/fire.yml

@@ -3,16 +3,16 @@
   name: fire
   description: it's fire!
   categories: [ ForkFiltered ]
-  suffix: cp14
   placement:
     mode: SnapgridCenter
   components:
   - type: Sprite
-    drawDepth: Mobs
+    drawdepth: Effects
     snapCardinals: true
     sprite: _CP14/Effects/fire.rsi
     layers:
       - state: full
+        shader: unshaded
   - type: FireVisuals
     sprite: _CP14/Effects/fire.rsi
     normalState: full

Resources/Prototypes/_CP14/Entities/keyrings.yml

@@ -79,12 +79,7 @@
     contents:
     - id: CP14KeyBankEntrance
     - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe1
-    - id: CP14KeyBankSafe2
-    - id: CP14KeyBankSafe3
-    - id: CP14KeyBankSafe4
-    - id: CP14KeyBankSafe5
-    - id: CP14KeyBankSafe6
+    - id: CP14KeyBankSafe
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -97,9 +92,4 @@
     - id: CP14KeyBankVault
     - id: CP14KeyBankEntrance
     - id: CP14KeyBankStaff
-    - id: CP14KeyBankSafe1
-    - id: CP14KeyBankSafe2
-    - id: CP14KeyBankSafe3
-    - id: CP14KeyBankSafe4
-    - id: CP14KeyBankSafe5
-    - id: CP14KeyBankSafe6
+    - id: CP14KeyBankSafe

Resources/Prototypes/_CP14/Entities/keys.yml

@@ -169,60 +169,10 @@
 
 - type: entity
   parent: CP14BaseKey
-  id: CP14KeyBankSafe1
-  name: bank safe 1 key
+  id: CP14KeyBankSafe
+  name: bank safe key
   components:
   - type: Sprite
     state: key12
   - type: CP14Key
-    autoGenerateShape: BankSafe1
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe2
-  name: bank safe 2 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe2
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe3
-  name: bank safe 3 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe3
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe4
-  name: bank safe 4 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe4
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe5
-  name: bank safe 5 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe5
-
-- type: entity
-  parent: CP14BaseKey
-  id: CP14KeyBankSafe6
-  name: bank safe 6 key
-  components:
-  - type: Sprite
-    state: key12
-  - type: CP14Key
-    autoGenerateShape: BankSafe6
+    autoGenerateShape: BankSafe

Resources/Prototypes/_CP14/GameRules/roundstart.yml

@@ -23,24 +23,24 @@
       - CP14PersonalCurrencyCollectObjectiveGroup
 
 - type: entity
-  id: CP14BanditsRule
+  id: CP14SociopathsRule
   parent: CP14BaseGameRule
   components:
   - type: GameRule
-    minPlayers: 0 #Increase when bigger online
+    minPlayers: 2 #Increase when bigger online
   - type: AntagSelection
     definitions:
-    - prefRoles: [ CP14Bandit ]
-      startingGear: CP14BanditGear
+    - prefRoles: [ CP14Sociopath ]
+      startingGear: CP14SociopathGear
       max: 8
       playerRatio: 10
-      blacklist:
-        components:
-        - AntagImmune
+      #blacklist:
+      #  components:
+      #  - AntagImmune
       lateJoinAdditional: true
       mindRoles:
-      - CP14MindRoleBandit
+      - CP14MindRoleSociopath
       briefing:
-        text: cp14-roles-antag-bandit-briefing
+        text: cp14-roles-antag-sociopath-briefing
         color: "#cc3010"
-        sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg"
+        sound: "/Audio/_CP14/Ambience/Antag/bandit_start.ogg"

Resources/Prototypes/_CP14/LockCategories/LockCategory.yml

@@ -20,29 +20,8 @@
   id: BankCommandantRoom
   complexity: 7
 
-
 - type: CP14LockCategory
-  id: BankSafe1
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe2
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe3
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe4
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe5
-  complexity: 5
-
-- type: CP14LockCategory
-  id: BankSafe6
+  id: BankSafe
   complexity: 5
 
 # Tavern 

Resources/Prototypes/_CP14/Roles/Antags/Bandit.yml

@@ -1,16 +1,16 @@
 - type: antag
-  id: CP14Bandit
-  name: cp14-roles-antag-bandit-name
+  id: CP14Sociopath
+  name: cp14-roles-antag-sociopath-name
   antagonist: true
   setPreference: true
-  objective: cp14-roles-antag-bandit-objective
+  objective: cp14-roles-antag-sociopath-objective
   requirements:
   - !type:OverallPlaytimeRequirement
     time: 3600 # 1h
   #guides: TODO
 
 - type: startingGear
-  id: CP14BanditGear
+  id: CP14SociopathGear
   storage:
     back:
     - CP14BaseLockpick
@@ -19,14 +19,13 @@
 
 - type: entity
   parent: BaseMindRoleAntag
-  id: CP14MindRoleBandit
+  id: CP14MindRoleSociopath
   categories: [ ForkFiltered ]
-  name: Bandit Role
-#  description: cp14-roles-antag-bandit-objective
+  name: Sociopath Role
   components:
   - type: MindRole
-    antagPrototype: CP14Bandit
+    antagPrototype: CP14Sociopath
     exclusiveAntag: true
-  - type: CP14BanditRole
+  - type: CP14SociopathRole
   - type: RoleBriefing
-    briefing: cp14-roles-antag-bandit-briefing
+    briefing: cp14-roles-antag-sociopath-briefing

Resources/Prototypes/_CP14/game_presets.yml

@@ -17,7 +17,7 @@
   showInVote: true
   cP14Allowed: true
   rules:
-    - CP14BanditsRule
+    - CP14SociopathsRule
     - CP14RoundObjectivesRule
 
 - type: gamePreset
@@ -30,4 +30,4 @@
   cP14Allowed: true
   rules:
     - Sandbox
-    - CP14RoundObjectivesRule
+    - CP14RoundObjectivesRule