Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

# Conflicts: # Content.Client/Parallax/ParallaxControl.cs # Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/Labels/Label/LabelSystem.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Fluids/Components/EvaporationComponent.cs # Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml # Resources/Prototypes/Maps/Pools/deathmatch.yml # Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -133,7 +133,6 @@
  name: reagent-name-ethanol
  parent: BaseAlcohol
  desc: reagent-desc-ethanol
-  slippery: true
  physicalDesc: reagent-physical-desc-strong-smelling
  flavor: alcohol
  color: "#b05b3c"
@@ -473,6 +472,21 @@
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: false

+- type: reagent
+  id: AlienBrainHemorrhage
+  name: reagent-name-alien-brain-hemorrhage
+  parent: BaseAlcohol
+  desc: reagent-desc-alien-brain-hemorrhage
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: alienbrainhemorrhage
+  color: "#FFFDD0"
+  metamorphicSprite:
+      sprite: Objects/Consumable/Drinks/alienbrainhemorrhage.rsi
+      state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: AlliesCocktail
  name: reagent-name-allies-cocktail
@@ -753,6 +767,21 @@
        reagent: Ethanol
        amount: 0.2

+- type: reagent
+  id: Bronx
+  name: reagent-name-bronx
+  parent: BaseAlcohol
+  desc: reagent-desc-bronx
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: bronx
+  color: "#d68829"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bronx.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: CoconutRum
  name: reagent-name-coconut-rum
@@ -799,6 +828,21 @@
        reagent: Ethanol
        amount: 0.15

+- type: reagent
+  id: CrushDepth
+  name: reagent-name-crush-depth
+  parent: BaseAlcohol
+  desc: reagent-desc-crush-depth
+  physicalDesc: reagent-physical-desc-cloudy
+  flavor: crushdepth
+  color: "#0a0a33"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/crushdepth.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: CubaLibre
  name: reagent-name-cuba-libre
@@ -823,6 +867,21 @@
        amount: 0.07
  fizziness: 0.2

+- type: reagent
+  id: DarkandStormy
+  name: reagent-name-dark-and-stormy
+  parent: BaseAlcohol
+  desc: reagent-desc-dark-and-stormy
+  physicalDesc: reagent-physical-desc-bubbly
+  flavor: darkandstormy
+  color: "#cf7f17"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/dark&stormy.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: DemonsBlood
  name: reagent-name-demons-blood
@@ -909,6 +968,36 @@
        reagent: Ethanol
        amount: 0.15

+- type: reagent
+  id: Eggnog
+  name: reagent-name-eggnog
+  parent: BaseAlcohol
+  desc: reagent-desc-eggnog
+  physicalDesc: reagent-physical-desc-creamy
+  flavor: eggnog
+  color: "#e6d6bc"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/eggnogglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
+- type: reagent
+  id: ElectricShark
+  name: reagent-name-electric-shark
+  parent: BaseAlcohol
+  desc: reagent-desc-electric-shark
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: electricshark
+  color: "#3097cf"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/electricshark.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: ErikaSurprise
  name: reagent-name-erika-surprise
@@ -1143,6 +1232,51 @@
        reagent: Ethanol
        amount: 0.15

+- type: reagent
+  id: JackRose
+  name: reagent-name-jack-rose
+  parent: BaseAlcohol
+  desc: reagent-desc-jack-rose
+  physicalDesc: reagent-physical-desc-tart
+  flavor: jackrose
+  color: "#f53b3b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/jackrose.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
+- type: reagent
+  id: JungleBird
+  name: reagent-name-jungle-bird
+  parent: BaseAlcohol
+  desc: reagent-desc-jungle-bird
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: junglebird
+  color: "#f27c3d"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/junglebird.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
+- type: reagent
+  id: Kalimotxo
+  name: reagent-name-kalimotxo
+  parent: BaseAlcohol
+  desc: reagent-desc-kalimotxo
+  physicalDesc: reagent-physical-desc-bubbly
+  flavor: kalimotxo
+  color: "#360606"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/kalimotxo.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: LongIslandIcedTea
  name: reagent-name-long-island-iced-tea
@@ -1282,6 +1416,21 @@
  metamorphicChangeColor: false
  fizziness: 0.3

+- type: reagent
+  id: MonkeyBusiness
+  name: reagent-name-monkey-business
+  parent: BaseAlcohol
+  desc: reagent-desc-monkey-business
+  physicalDesc: reagent-physical-desc-tart
+  flavor: monkeybusiness
+  color: "#d6b929"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/monkeybusiness.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: Moonshine
  name: reagent-name-moonshine
@@ -1426,6 +1575,21 @@
        reagent: Ethanol
        amount: 0.2

+- type: reagent
+  id: Radler
+  name: reagent-name-radler
+  parent: BaseAlcohol
+  desc: reagent-desc-radler
+  physicalDesc: reagent-physical-desc-citric
+  flavor: radler
+  color: "#edff2b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/radler.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: Sbiten
  name: reagent-name-sbiten
@@ -1656,6 +1820,21 @@
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: false

+- type: reagent
+  id: Vampiro
+  name: reagent-name-vampiro
+  parent: BaseAlcohol
+  desc: reagent-desc-vampiro
+  physicalDesc: reagent-physical-desc-spicy
+  flavor: vampiro
+  color: "#b51b1b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/vampiro.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
 - type: reagent
  id: VodkaMartini
  name: reagent-name-vodka-martini
--- a/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/base_drink.yml
@@ -2,7 +2,8 @@
  id: BaseDrink
  group: Drinks
  abstract: true
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 3.5
  metabolisms:
    Drink:
      effects:
@@ -46,6 +47,9 @@
  id: BaseAlcohol
  group: Drinks
  abstract: true
+  slipData:
+    requiredSlipSpeed: 3.5
+  friction: 0.4
  metabolisms:
    Drink:
      effects:
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -435,13 +435,15 @@
  name: reagent-name-water
  parent: BaseDrink
  desc: reagent-desc-water
-  slippery: true
+  evaporationSpeed: 0.3
+  absorbent: true
  physicalDesc: reagent-physical-desc-translucent
  flavor: water
  color: "#75b1f0"
  recognizable: true
  boilingPoint: 100.0
  meltingPoint: 0.0
+  friction: 0.4
  metabolisms:
    Drink:
      effects:
@@ -452,12 +454,15 @@
  id: Ice
  name: reagent-name-ice
  desc: reagent-desc-ice
+  slipData:
+    requiredSlipSpeed: 3.5
  physicalDesc: reagent-physical-desc-frosty
  flavor: cold
  color: "#bed8e6"
  recognizable: true
  meltingPoint: 0.0
  boilingPoint: 100.0
+  friction: 0.05 #Copied from Ice Crust
  plantMetabolism:
  - !type:PlantAdjustWater
    amount: 1
@@ -588,3 +593,18 @@
      effects:
      - !type:SatiateThirst
        factor: 0.6
+
+- type: reagent
+  id: Tortuga
+  name: reagent-name-tortuga
+  parent: BaseDrink
+  desc: reagent-desc-tortuga
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: tortuga
+  color: "#1c8c40"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/tortuga.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
--- a/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/condiments.yml
@@ -174,7 +174,6 @@
  color: "#fb7125"
  recognizable: true
  physicalDesc: reagent-physical-desc-sticky
-  slippery: false
  viscosity: 0.55 #Start using syrup to attach your remote recievers to your microwaves!
  tileReactions:
    - !type:SpillTileReaction
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -13,7 +13,6 @@
  metamorphicChangeColor: false
  recognizable: true
  physicalDesc: reagent-physical-desc-ferrous
-  slippery: false
  metabolisms:
    Drink:
      effects:
@@ -56,7 +55,6 @@
  color: "#808A51"
  recognizable: true
  physicalDesc: reagent-physical-desc-slimy
-  slippery: false

 - type: reagent
  id: Slime
@@ -67,7 +65,6 @@
  color: "#2cf274"
  recognizable: true
  physicalDesc: reagent-physical-desc-viscous
-  slippery: false
  viscosity: 0.25
  tileReactions:
    - !type:SpillTileReaction
@@ -91,7 +88,6 @@
  color: "#cd7314"
  recognizable: true
  physicalDesc: reagent-physical-desc-sticky
-  slippery: false
  viscosity: 0.10
  tileReactions:
    - !type:SpillTileReaction
@@ -118,7 +114,6 @@
  color: "#162581"
  recognizable: true
  physicalDesc: reagent-physical-desc-metallic
-  slippery: false

 - type: reagent
  parent: Blood
@@ -130,7 +125,6 @@
  color: "#7a8bf2"
  recognizable: true
  physicalDesc: reagent-physical-desc-pungent
-  slippery: false

 - type: reagent
  id: ZombieBlood
@@ -140,7 +134,6 @@
  physicalDesc: reagent-physical-desc-necrotic
  flavor: bitter
  color: "#2b0700"
-  slippery: false
  metabolisms:
    Drink:
      # Disgusting!
@@ -202,7 +195,6 @@
  flavor: terrible
  color: "#d8d8b0"
  physicalDesc: reagent-physical-desc-exotic-smelling
-  slippery: false
  footstepSound:
    collection: FootstepBlood
    params:
@@ -216,7 +208,9 @@
  flavor: terrible
  color: "#87ab08"
  physicalDesc: reagent-physical-desc-pungent
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 4.0 #It's not as slippery as water
+  friction: 0.4
  metabolisms:
    Drink:
      effects:
@@ -238,7 +232,6 @@
  physicalDesc: reagent-physical-desc-neural
  flavor: mindful
  color: "#C584B8"
-  slippery: false
  metabolisms:
    Drink:
      effects:
--- a/Resources/Prototypes/Reagents/chemicals.yml
+++ b/Resources/Prototypes/Reagents/chemicals.yml
@@ -76,7 +76,7 @@
    Acidic:
      methods: [ Touch ]
      effects:
-      - !type:ActivateArtifact
+      - !type:ArtifactUnlock
        conditions:
        - !type:ReagentThreshold
          min: 5
@@ -165,7 +165,6 @@
  flavor: bitter
  color: "#E6E6DA"
  physicalDesc: reagent-physical-desc-crystalline
-  slippery: false

 - type: reagent
  id: Rororium
--- a/Resources/Prototypes/Reagents/cleaning.yml
+++ b/Resources/Prototypes/Reagents/cleaning.yml
@@ -68,7 +68,9 @@
  id: SpaceLube
  name: reagent-name-space-lube
  desc: reagent-desc-space-lube
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 1
+    superSlippery: true
  physicalDesc: reagent-physical-desc-shiny
  flavor: funny
  color: "#77b58e"
@@ -76,9 +78,8 @@
  boilingPoint: 290.0 # Glycerin
  meltingPoint: 18.2
  tileReactions:
-    - !type:SpillTileReaction
-      requiredSlipSpeed: 1
-      superSlippery: true
+  - !type:SpillTileReaction
+  friction: 0.0

 - type: reagent
  id: SpaceGlue
@@ -89,9 +90,9 @@
  color: "#ffffff"
  boilingPoint: 250.0
  meltingPoint: 380.0
-  viscosity: 0.5
  tileReactions:
-    - !type:SpillTileReaction
+  - !type:SpillTileReaction
+  viscosity: 0.5
  reactiveEffects:
    Acidic:
      methods: [ Touch ]
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -170,7 +170,8 @@
  id: Razorium
  name: reagent-name-razorium
  group: Toxins
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 3.5
  desc: reagent-desc-razorium
  physicalDesc: reagent-physical-desc-reflective
  flavor: sharp
@@ -209,7 +210,8 @@
  id: Fresium
  name: reagent-name-fresium
  group: Toxins
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 3.5
  desc: reagent-desc-fresium
  physicalDesc: reagent-physical-desc-frosty
  flavor: cold
@@ -305,7 +307,8 @@
  physicalDesc: reagent-physical-desc-funny
  flavor: funny
  color: "#FF4DD2"
-  slippery: true #clown juice gotta slip
+  slipData:
+    requiredSlipSpeed: 3.5 #clown juice gotta slip
  metabolisms:
    Medicine:
      effects:
--- a/Resources/Prototypes/Reagents/gases.yml
+++ b/Resources/Prototypes/Reagents/gases.yml
@@ -8,6 +8,52 @@
  boilingPoint: -183.0
  meltingPoint: -218.4
  metabolisms:
+    Poison:
+      effects:
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Human
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Animal
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Rat
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Plant
+      # Convert Oxygen into CO2.
+      - !type:ModifyLungGas
+        conditions:
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
+        ratios:
+          CarbonDioxide: 1.0
+          Oxygen: -1.0
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Vox
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Poison:
+              3
+      - !type:AdjustAlert
+        alertType: Toxins
+        conditions:
+          - !type:ReagentThreshold
+            min: 0.5
+          - !type:OrganType
+            type: Vox
+        clear: true
+        time: 5
    Gas:
      effects:
      - !type:Oxygenate
@@ -150,6 +196,32 @@
  flavor: bitter
  color: "#66ff33"
  metabolisms:
+    Poison:
+      effects:
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Plant
+      - !type:HealthChange
+        conditions:
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
+        - !type:OrganType
+          type: Vox
+          shouldHave: false
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Poison:
+              0.8
+      - !type:Oxygenate
+        conditions:
+        - !type:OrganType
+          type: Plant
+          shouldHave: false
+        factor: -4
    Gas:
      effects:
      - !type:Oxygenate
@@ -236,6 +308,12 @@
  boilingPoint: -88
  meltingPoint: -90
  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 2
    Gas:
      effects:
      - !type:Emote
@@ -317,6 +395,39 @@
  boilingPoint: -195.8
  meltingPoint: -210.0
  metabolisms:
+    Narcotic:
+      effects:
+      - !type:HealthChange
+        scaleByQuantity: true
+        ignoreResistances: true
+        damage:
+          types:
+            Cellular: 1
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 100
+        refresh: false
+      - !type:Drunk
+        boozePower: 100
+      - !type:PopupMessage
+        type: Local
+        messages: [ "frezon-lungs-cold" ]
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 0.5
+      - !type:PopupMessage
+        type: Local
+        visualType: Medium
+        messages: [ "frezon-euphoric" ]
+        probability: 0.1
+        conditions:
+        - !type:ReagentThreshold
+          reagent: Frezon
+          min: 1
    Gas:
      effects:
      - !type:HealthChange
--- a/Resources/Prototypes/Reagents/pyrotechnic.yml
+++ b/Resources/Prototypes/Reagents/pyrotechnic.yml
@@ -149,13 +149,15 @@
  parent: BasePyrotechnic
  desc: reagent-desc-welding-fuel
  physicalDesc: reagent-physical-desc-oily
-  slippery: true
+  slipData:
+    requiredSlipSpeed: 3.5
  flavor: bitter
  flavorMinimum: 0.01
  color: "#a76b1c"
  recognizable: true
  boilingPoint: -84.7 # Acetylene. Close enough.
  meltingPoint: -80.7
+  friction: 0.4
  tileReactions:
  - !type:FlammableTileReaction {}
  metabolisms:
@@ -177,4 +179,4 @@
  flavor: bitter
  color: "#9e6b38"
  boilingPoint: 190.0 # Perfluorooctanoic Acid.
-  meltingPoint: 45.0
+  meltingPoint: 45.0
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -171,7 +171,6 @@
  flavor: sour
  color: "#48b3b8"
  physicalDesc: reagent-physical-desc-ferrous
-  slippery: false
  metabolisms:
    Drink:
      effects: