Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

# Conflicts: # Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-08 12:29:20 +03:00
parent 38c3bf2595 489efeb717
commit 97939f6e3e
155 changed files with 17151 additions and 15001 deletions
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -148,6 +148,8 @@
    sprite: Clothing/Head/Misc/cone.rsi
  - type: Clothing
    sprite: Clothing/Head/Misc/cone.rsi
+  - type: Item
+    storedRotation: 0
  - type: PhysicalComposition #you can't just pass up some free plastic!
    materialComposition:
      Plastic: 100
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -96,6 +96,16 @@
  - type: Flammable
    damage:
      types: {}
+  - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad
+    allowed:
+    - SlowedDown
+    - Stutter
+    - Electrocution
+    - ForcedSleep
+    - TemporaryBlindness
+    - Pacified
+    - RadiationProtection
+    - Drowsiness
  - type: Temperature
    heatDamageThreshold: 800
  - type: Metabolizer
--- a/Resources/Prototypes/Entities/Mobs/Player/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -11,16 +11,17 @@
  name: syndicate agent
  suffix: Human, Base
  components:
-    - type: RandomHumanoidAppearance
-      randomizeName: false
-      hair: HairBald
-    - type: Loadout
-      prototypes: [SyndicateOperativeGearExtremelyBasic]
-    - type: RandomMetadata
-      nameSegments: [names_death_commando]
-    - type: NpcFactionMember
-      factions:
-      - Syndicate
+  - type: RandomHumanoidAppearance
+    randomizeName: false
+    hair: HairBald
+  - type: Loadout
+    prototypes: [SyndicateOperativeGearExtremelyBasic]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+  - type: RandomMetadata
+    nameSegments: [names_death_commando]
+  - type: NpcFactionMember
+    factions:
+    - Syndicate

 - type: entity
  parent: MobHumanSyndicateAgentBase
@@ -28,10 +29,10 @@
  name: syndicate agent
  suffix: Human, Traitor
  components:
-    # make the player a traitor once its taken
-    - type: AutoTraitor
-      giveUplink: false
-      giveObjectives: false
+  # make the player a traitor once its taken
+  - type: AutoTraitor
+    giveUplink: false
+    giveObjectives: false

 - type: entity
  parent: MobHumanSyndicateAgent
@@ -40,6 +41,7 @@
  components:
  - type: Loadout
    prototypes: [SyndicateReinforcementMedic]
+    roleLoadout: [ RoleSurvivalSyndicate ]

 - type: entity
  parent: MobHumanSyndicateAgent
@@ -48,6 +50,7 @@
  components:
  - type: Loadout
    prototypes: [SyndicateReinforcementSpy]
+    roleLoadout: [ RoleSurvivalSyndicate ]

 - type: entity
  parent: MobHumanSyndicateAgent
@@ -56,19 +59,20 @@
  components:
  - type: Loadout
    prototypes: [SyndicateReinforcementThief]
+    roleLoadout: [ RoleSurvivalSyndicate ]

 - type: entity
  parent: MobHumanSyndicateAgentBase
  id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
  suffix: Human, NukeOps
  components:
-    - type: NukeOperative
-    - type: RandomMetadata
-      nameSegments:
-      - nukeops-role-operator
-      - SyndicateNamesNormal
-    - type: Loadout
-      prototypes: [SyndicateOperativeGearFullNoUplink]
+  - type: NukeOperative
+  - type: RandomMetadata
+    nameSegments:
+    - nukeops-role-operator
+    - SyndicateNamesNormal
+  - type: Loadout
+    prototypes: [SyndicateOperativeGearFullNoUplink]

 # Nuclear Operative
 - type: entity
@@ -77,8 +81,8 @@
  parent: MobHuman
  id: MobHumanNukeOp
  components:
-    - type: NukeOperative
-    - type: RandomHumanoidAppearance
+  - type: NukeOperative
+  - type: RandomHumanoidAppearance

 - type: entity
  categories: [ HideSpawnMenu ]
@@ -86,15 +90,16 @@
  id: MobHumanLoneNuclearOperative
  name: Lone Operative
  components:
-    - type: RandomHumanoidAppearance
-      randomizeName: false
-    - type: NukeOperative
-    - type: Loadout
-      prototypes: [SyndicateLoneOperativeGearFull]
-    - type: RandomMetadata
-      nameSegments:
-      - SyndicateNamesPrefix
-      - SyndicateNamesNormal
-    - type: NpcFactionMember
-      factions:
-      - Syndicate
+  - type: RandomHumanoidAppearance
+    randomizeName: false
+  - type: NukeOperative
+  - type: Loadout
+    prototypes: [SyndicateLoneOperativeGearFull]
+    roleLoadout: [ RoleSurvivalSyndicate ]
+  - type: RandomMetadata
+    nameSegments:
+    - SyndicateNamesPrefix
+    - SyndicateNamesNormal
+  - type: NpcFactionMember
+    factions:
+    - Syndicate
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -44,6 +44,7 @@
        settings: short
    - type: Loadout
      prototypes: [ DeathSquadGear ]
+      roleLoadout: [ RoleSurvivalEVA ]
    - type: RandomMetadata
      nameSegments:
        - NamesFirstMilitaryLeader
@@ -80,6 +81,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTLeaderGear ]
+      roleLoadout: [ RoleSurvivalExtended ]
    - type: RandomMetadata
      nameSegments:
      - NamesFirstMilitaryLeader
@@ -109,6 +111,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTLeaderGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 - type: entity
  id: RandomHumanoidSpawnerERTLeaderEVALecter
@@ -130,6 +133,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTLeaderGearEVALecter ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## ERT Chaplain

@@ -165,6 +169,7 @@
      - NamesLastMilitary
    - type: Loadout
      prototypes: [ ERTChaplainGear ]
+      roleLoadout: [ RoleSurvivalExtended ]

 - type: entity
  id: RandomHumanoidSpawnerERTChaplainEVA
@@ -190,6 +195,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTChaplainGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## ERT Janitor

@@ -225,6 +231,7 @@
      - NamesLastMilitary
    - type: Loadout
      prototypes: [ ERTJanitorGear ]
+      roleLoadout: [ RoleSurvivalExtended ]

 - type: entity
  id: RandomHumanoidSpawnerERTJanitorEVA
@@ -250,6 +257,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTJanitorGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## ERT Engineer

@@ -285,6 +293,7 @@
      - NamesLastMilitary
    - type: Loadout
      prototypes: [ ERTEngineerGear ]
+      roleLoadout: [ RoleSurvivalExtended ]

 - type: entity
  id: RandomHumanoidSpawnerERTEngineerEVA
@@ -310,6 +319,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTEngineerGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## ERT Security

@@ -345,6 +355,7 @@
      - NamesLastMilitary
    - type: Loadout
      prototypes: [ ERTSecurityGear ]
+      roleLoadout: [ RoleSurvivalExtended ]

 - type: entity
  id: RandomHumanoidSpawnerERTSecurityEVA
@@ -370,6 +381,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTSecurityGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 - type: entity
  id: RandomHumanoidSpawnerERTSecurityEVALecter
@@ -391,6 +403,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTSecurityGearEVALecter ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## ERT Medic

@@ -426,6 +439,7 @@
      - NamesLastMilitary
    - type: Loadout
      prototypes: [ ERTMedicalGear ]
+      roleLoadout: [ RoleSurvivalExtended ]

 - type: entity
  id: RandomHumanoidSpawnerERTMedicalEVA
@@ -451,6 +465,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ERTMedicalGearEVA ]
+      roleLoadout: [ RoleSurvivalEVA ]

 ## CBURN

@@ -471,6 +486,7 @@
  components:
    - type: Loadout
      prototypes: [CBURNGear]
+      roleLoadout: [ RoleSurvivalEVA ]
    - type: GhostRole
      name: ghost-role-information-cburn-agent-name
      description: ghost-role-information-cburn-agent-description
@@ -506,6 +522,7 @@
        settings: default
    - type: Loadout
      prototypes: [ CentcomGear ]
+      roleLoadout: [ RoleSurvivalStandard ]

 ## Syndicate

@@ -528,6 +545,7 @@
      randomizeName: false
    - type: Loadout
      prototypes: [SyndicateOperativeGearExtremelyBasic]
+      roleLoadout: [ RoleSurvivalSyndicate ]

 - type: entity
  id: RandomHumanoidSpawnerNukeOp
@@ -607,8 +625,6 @@
 - type: randomHumanoidSettings
  id: LostCargoTechnician
  parent: EventHumanoid
-  speciesBlacklist:
-  - Vox
  components:
    - type: GhostRole
      name: ghost-role-information-lost-cargo-technical-name
@@ -618,6 +634,8 @@
        settings: short
    - type: Loadout
      prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
+      roleLoadout: [ RoleSurvivalStandard ]
+

 # Clown troupe

@@ -660,8 +678,6 @@
  id: ClownTroupe
  parent: EventHumanoid
  randomizeName: false
-  speciesBlacklist:
-  - Vox
  components:
    - type: GhostRole
      name: ghost-role-information-clown-troupe-name
@@ -671,6 +687,7 @@
        settings: short
    - type: Loadout
      prototypes: [ ClownTroupe ]
+      roleLoadout: [ RoleSurvivalStandard ]
    - type: RandomMetadata
      nameSegments:
      - names_clown
@@ -682,6 +699,7 @@
  components:
    - type: Loadout
      prototypes: [ BananaClown ]
+      roleLoadout: [ RoleSurvivalStandard ]

 # Traveling exotic chef

@@ -712,8 +730,6 @@
 - type: randomHumanoidSettings
  id: TravelingChef
  parent: EventHumanoid
-  speciesBlacklist:
-  - Vox
  components:
    - type: GhostRole
      name: ghost-role-information-traveling-chef-name
@@ -723,6 +739,7 @@
        settings: short
    - type: Loadout
      prototypes: [ TravelingChef ]
+      roleLoadout: [ RoleSurvivalStandard ]

 # Disaster victim

@@ -774,8 +791,6 @@
 - type: randomHumanoidSettings
  id: DisasterVictimHead
  parent: EventHumanoidMindShielded
-  speciesBlacklist:
-  - Vox
  components:
    - type: GhostRole
      name: ghost-role-information-disaster-victim-name
@@ -790,6 +805,7 @@
  components:
    - type: Loadout
      prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]

 - type: randomHumanoidSettings
  id: DisasterVictimCMO
@@ -797,6 +813,7 @@
  components:
    - type: Loadout
      prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
+      roleLoadout: [ RoleSurvivalMedical ]

 - type: randomHumanoidSettings
  id: DisasterVictimCaptain
@@ -804,6 +821,7 @@
  components:
    - type: Loadout
      prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]

 # Syndie Disaster Victim

@@ -834,8 +852,6 @@
 - type: randomHumanoidSettings
  id: SyndieDisasterVictim
  parent: EventHumanoid
-  speciesBlacklist:
-  - Vox
  components:
    - type: NpcFactionMember
      factions:
@@ -848,3 +864,4 @@
        settings: short
    - type: Loadout
      prototypes: [ SyndicateOperativeGearCivilian ]
+      roleLoadout: [ RoleSurvivalStandard ]
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -167,6 +167,7 @@
  - type: Dna
  - type: MindContainer
    showExamineInfo: true
+  - type: CanEnterCryostorage
  - type: InteractionPopup
    successChance: 1
    interactSuccessString: hugging-success-generic
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -108,6 +108,11 @@
          32:
            sprite: Mobs/Species/Vox/displacement.rsi
            state: hand
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: head
      back:
        sizeMaps:
          32:
@@ -151,6 +156,11 @@
          32:
            sprite: Mobs/Species/Vox/displacement.rsi
            state: hand
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Vox/displacement.rsi
+            state: head
      back:
        sizeMaps:
          32:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -1,4 +1,5 @@
 # Lots of misc stuff in here, hard to parent it.
+# ^ Yeah, this stuff should probably get split into different files but not my fight today.

 # Powder (For when you throw stuff like flour and it explodes)

@@ -481,10 +482,33 @@
  components:
  - type: Sprite
    state: butter
+  - type: Slippery
+  - type: StepTrigger
+    intersectRatio: 0.2
+  - type: CollisionWake
+    enabled: false
+  - type: Physics
+    bodyType: Dynamic
+  - type: Fixtures
+    fixtures:
+      slips:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        layer:
+        - SlipLayer
+        hard: false
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.3,-0.2,0.3,0.2"
+        density: 10
+        mask:
+        - ItemMask

 - type: entity
  name: stick of cannabis butter
-  parent: FoodBakingBase
+  parent: FoodButter
  id: FoodCannabisButter
  description: Add this to your favorite baked goods for an irie time.
  components:
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -64,8 +64,8 @@
 - type: entity
  id: BiofabricatorMachineCircuitboard
  parent: BaseMachineCircuitboard
-  name: biofabricator machine board
-  description: A machine printed circuit board for a biofabricator.
+  name: biocube fabricator machine board
+  description: A machine printed circuit board for a biocube fabricator.
  components:
    - type: MachineBoard
      prototype: Biofabricator
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -648,7 +648,7 @@
 - type: entity
  id: Biofabricator
  parent: BaseLathe
-  name: biofabricator
+  name: biocube fabricator
  description: Produces animal cubes using biomass.
  components:
  - type: Sprite
@@ -657,16 +657,20 @@
    layers:
    - state: icon
      map: ["enum.LatheVisualLayers.IsRunning"]
+      color: "#ffaa99"
    - state: unlit
      shader: unshaded
      map: ["enum.PowerDeviceVisualLayers.Powered"]
+      color: "#ffaaaa"
    - state: inserting
      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+      color: "#ffaaaa"
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: Machine
    board: BiofabricatorMachineCircuitboard
  - type: MaterialStorage
+    ignoreColor: true
    whitelist:
      tags:
        - Sheet
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -1089,7 +1089,7 @@
 - type: entity
  parent: BaseWall
  id: WallMining
-  name: wall
+  name: mining wall
  components:
  - type: Tag
    tags:
@@ -1118,7 +1118,7 @@
 - type: entity
  parent: WallShuttleDiagonal
  id: WallMiningDiagonal
-  name: wall
+  name: mining wall
  suffix: diagonal
  placement:
    mode: SnapgridCenter