Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream

2024-05-17 12:57:04 +03:00
parent 0a449d64d6 de7e1b33dd
commit 918ba35ccb
58 changed files with 3724 additions and 4985 deletions
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -1,6 +1,6 @@
 # White Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorWhite
  name: white jumpskirt
  description: A generic white jumpskirt with no rank markings.
@@ -27,7 +27,7 @@

 # Grey Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorGrey
  name: grey jumpskirt
  description: A tasteful grey jumpskirt that reminds you of the good old days.
@@ -58,7 +58,7 @@

 # Black Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorBlack
  name: black jumpskirt
  description: A generic black jumpskirt with no rank markings.
@@ -89,7 +89,7 @@

 # Blue Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorBlue
  name: blue jumpskirt
  description: A generic blue jumpskirt with no rank markings.
@@ -120,7 +120,7 @@

 # Dark Blue Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorDarkBlue
  name: dark blue jumpskirt
  description: A generic dark blue jumpskirt with no rank markings.
@@ -151,7 +151,7 @@

 # Teal Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorTeal
  name: teal jumpskirt
  description: A generic teal jumpskirt with no rank markings.
@@ -182,7 +182,7 @@

 # Green Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorGreen
  name: green jumpskirt
  description: A generic green jumpskirt with no rank markings.
@@ -213,7 +213,7 @@

 # Dark Green Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorDarkGreen
  name: dark green jumpskirt
  description: A generic dark green jumpskirt with no rank markings.
@@ -244,7 +244,7 @@

 # Orange Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorOrange
  name: orange jumpskirt
  description: Don't wear this near paranoid security officers.
@@ -275,7 +275,7 @@

 # Pink Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorPink
  name: pink jumpskirt
  description: Just looking at this makes you feel <i>fabulous</i>.
@@ -306,7 +306,7 @@

 # Red Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorRed
  name: red jumpskirt
  description: A generic red jumpskirt with no rank markings.
@@ -337,7 +337,7 @@

 # Yellow Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorYellow
  name: yellow jumpskirt
  description: A generic yellow jumpskirt with no rank markings.
@@ -368,7 +368,7 @@

 # Purple Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorPurple
  name: purple jumpskirt
  description: A generic light purple jumpskirt with no rank markings.
@@ -399,7 +399,7 @@

 # Light Brown Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorLightBrown
  name: light brown jumpskirt
  description: A generic light brown jumpskirt with no rank markings.
@@ -430,7 +430,7 @@

 # Brown Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorBrown
  name: brown jumpskirt
  description: A generic brown jumpskirt with no rank markings.
@@ -461,7 +461,7 @@

 # Maroon Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtColorMaroon
  name: maroon jumpskirt
  description: A generic maroon jumpskirt with no rank markings.
--- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -629,7 +629,7 @@
        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobCargoTechnician ]
+      prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ]
    - type: RandomMetadata
      nameSegments:
      - names_first
@@ -684,7 +684,7 @@
        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobClown ]
+      prototypes: [ ClownTroupe ]
    - type: RandomMetadata
      nameSegments:
      - names_clown
@@ -742,7 +742,7 @@
        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobChef ]
+      prototypes: [ TravelingChef ]
    - type: RandomMetadata
      nameSegments:
      - names_first
@@ -805,7 +805,7 @@
        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobResearchDirector ]
+      prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ]
    - type: RandomMetadata
      nameSegments:
      - names_first
@@ -823,7 +823,7 @@
        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobChiefMedicalOfficer ]
+      prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ]
    - type: RandomMetadata
      nameSegments:
      - names_first
@@ -841,7 +841,7 @@
        settings: default
    - type: GhostTakeoverAvailable
    - type: Loadout
-      roleLoadout: [ JobCaptain ]
+      prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ]
    - type: RandomMetadata
      nameSegments:
      - names_first
@@ -888,7 +888,7 @@
        settings: short
    - type: GhostTakeoverAvailable
    - type: Loadout
-      prototypes: [ SyndicateOperativeGearCivilian ]
+      prototypes: [ SyndicateOperativeGearDisasterVictim ]
    - type: RandomMetadata
      nameSegments:
      - names_first
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -553,7 +553,7 @@
    - type: Sprite
      state: medical
    - type: MachineBoard
-      prototype: chem_master
+      prototype: ChemMaster
      requirements:
        Capacitor: 1
      materialRequirements:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml
@@ -16,6 +16,17 @@
          - ItemMask
        restitution: 0.3  # fite me
        friction: 0.2
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StrongMetallic # We only want explosions breaking them (for the most part)
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 75
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
  - type: Tag
    tags:
    - Cartridge
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -1,9 +1,9 @@
 - type: entity
-  id: soda_dispenser
-  name: soda dispenser
-  suffix: Filled
  parent: ReagentDispenserBase
+  id: SodaDispenser
+  name: soda dispenser
  description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers.
+  suffix: Filled
  components:
  - type: Rotatable
  - type: Sprite
@@ -24,9 +24,9 @@
    - Bartender

 - type: entity
+  parent: SodaDispenser
  id: SodaDispenserEmpty
  suffix: Empty
-  parent: soda_dispenser
  components:
  - type: ReagentDispenser
    storageWhitelist:
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -51,10 +51,6 @@
      disposals: !type:Container
  - type: Physics
    bodyType: Static
-  - type: Fixtures
-    fixtures:
-      fix1:
-        hard: false
  - type: Construction
    graph: Toilet
    node: toilet
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -1,5 +1,5 @@
 - type: entity
-  id: chem_master
+  id: ChemMaster
  parent: [ BaseMachinePowered, ConstructibleMachine ]
  name: ChemMaster 4000
  description: An industrial grade chemical manipulator with pill and bottle production included.
--- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml
@@ -15,9 +15,7 @@
        mask:
        - TabletopMachineMask
        layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
+        - TabletopMachineLayer
        hard: false
  - type: ApcPowerReceiver
    powerLoad: 300
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -58,6 +58,7 @@
        - TabletopMachineMask
        layer:
        - TabletopMachineLayer
+        hard: false
  - type: Sprite
    sprite: Structures/Machines/microwave.rsi
    drawdepth: SmallObjects
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -32,6 +32,7 @@
        - TabletopMachineMask
        layer:
        - TabletopMachineLayer
+        hard: false
  - type: Sprite
    sprite: Structures/Machines/juicer.rsi
    drawdepth: SmallObjects