Merge branch 'space-wizards:master' into master

Resources/Prototypes/Entities/Clothing/Head/hats.yml

@@ -476,17 +476,30 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingHeadBase
+  parent: [ClothingHeadBase, BaseFoldable]
   id: ClothingHeadHatUshanka
   name: ushanka
   description: "Perfect for winter in Siberia, da?"
   components:
-  - type: Sprite
-    sprite: Clothing/Head/Hats/ushanka.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/ushanka.rsi
+  - type: Appearance
   - type: AddAccentClothing
     accent: RussianAccent
+  - type: Foldable
+    canFoldInsideContainer: true
+  - type: FoldableClothing
+    foldedEquippedPrefix: up
+    foldedHeldPrefix: up
+  - type: Sprite
+    sprite: Clothing/Head/Hats/ushanka.rsi
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon-up
+      map: ["foldedLayer"]
+      visible: false
+
 
 - type: entity
   parent: ClothingHeadBase

Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml

@@ -134,3 +134,18 @@
     tags:
       - Trash
       - CrystalRed
+
+- type: entity
+  parent: ShardCrystalBase
+  id: ShardCrystalRandom
+  name: random crystal shard
+  components:
+  - type: RandomSpawner
+    prototypes:
+      - ShardCrystalGreen
+      - ShardCrystalPink
+      - ShardCrystalOrange
+      - ShardCrystalBlue
+      - ShardCrystalCyan
+      - ShardCrystalRed
+    chance: 1

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -11,6 +11,8 @@
     damage:
       types:
         Blunt: 10
+    soundHit:
+      collection: MetalThud
   - type: Spillable
     solution: absorbed
   - type: Wieldable
@@ -49,6 +51,8 @@
       damage:
         types:
           Blunt: 10
+      soundHit:
+         collection: MetalThud
     - type: Spillable
       solution: absorbed
     - type: Wieldable

Resources/Prototypes/Entities/Objects/Weapons/Melee/weapon_toolbox.yml

@@ -17,3 +17,5 @@
     damage:
       types:
         Blunt: 20
+    soundHit:
+      path: "/Audio/Weapons/smash.ogg"

Resources/Prototypes/GameRules/roundstart.yml

@@ -69,7 +69,7 @@
   noSpawn: true
   components:
   - type: GameRule
-    minPlayers: 20
+    minPlayers: 35
   - type: NukeopsRule
     faction: Syndicate
 

Resources/Prototypes/Recipes/Reactions/fun.yml

@@ -171,6 +171,21 @@
   products:
     Laughter: 2
 
+- type: reaction
+  id: CreateCrystals
+  quantized: true
+  minTemp: 374
+  reactants:
+    Sugar:
+      amount: 15
+    Water:
+      amount: 15
+    Ethanol:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: ShardCrystalRandom
+
 - type: reaction
   id: Gunpowder
   impact: Low
@@ -185,4 +200,4 @@
       amount: 2
   effects:
     - !type:CreateEntityReactionEffect
-      entity: MaterialGunpowder
+      entity: MaterialGunpowder