Merge remote-tracking branch 'upstream/master' into upstream

# Conflicts: # Content.Server/Body/Components/BloodstreamComponent.cs # Content.Server/Chemistry/EntitySystems/ChemistrySystem.cs # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/open-inhand-right.png
2024-03-30 11:40:01 +07:00
parent 297cfd23ad 888a3bda51
commit cee423f4c8
86 changed files with 1016 additions and 690 deletions
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,44 +1,4 @@
 Entries:
- author: casperr04
-  changes:
-  - message: Fixed players being able to re-anchor items after fultoning them.
-    type: Fix
-  - message: Changed which objects can be fultoned.
-    type: Tweak
-  id: 5754
-  time: '2024-01-20T04:57:05.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/20628
- author: Blackern5000
-  changes:
-  - message: Crushers can no longer be researched.
-    type: Remove
-  id: 5755
-  time: '2024-01-20T05:11:02.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24319
- author: metalgearsloth
-  changes:
-  - message: Fix buckle sound playing twice in some instances.
-    type: Fix
-  id: 5756
-  time: '2024-01-20T06:22:19.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24321
- author: tday
-  changes:
-  - message: Added admin log messages for adding and ending game rules, and for the
-      commands to do so.
-    type: Add
-  - message: Added admin log messages for secret mode rule selection.
-    type: Add
-  id: 5757
-  time: '2024-01-20T18:02:13.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24092
- author: Nimfar11
-  changes:
-  - message: Adds snake kebab and its recipe.
-    type: Add
-  id: 5758
-  time: '2024-01-20T23:38:11.0000000+00:00'
-  url: https://api.github.com/repos/space-wizards/space-station-14/pulls/24341
 - author: Alekshhh
  changes:
  - message: Cerberus now has a wideswing that works similarly to spears.
@@ -3795,3 +3755,41 @@
  id: 6253
  time: '2024-03-30T01:25:43.0000000+00:00'
  url: https://github.com/space-wizards/space-station-14/pull/26541
+- author: Boaz1111
+  changes:
+  - message: Added an industrial reagent grinder to the basic hydroponics research.
+      It grinds things into reagents like a recycler.
+    type: Add
+  id: 6254
+  time: '2024-03-30T02:46:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25020
+- author: SonicHDC
+  changes:
+  - message: Added unzipping for lab coats!
+    type: Add
+  id: 6255
+  time: '2024-03-30T03:31:32.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26494
+- author: Zealith-Gamer
+  changes:
+  - message: Items being pulled no longer spin when being thrown.
+    type: Fix
+  id: 6256
+  time: '2024-03-30T03:35:43.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/26504
+- author: Plykiya
+  changes:
+  - message: Hyposprays can now be toggled to draw from solution containers like jugs
+      and beakers.
+    type: Tweak
+  id: 6257
+  time: '2024-03-30T03:59:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25544
+- author: EdenTheLiznerd
+  changes:
+  - message: Amanita toxin now kills you slightly slower, providing you time to seek
+      charcoal before it's too late
+    type: Tweak
+  id: 6258
+  time: '2024-03-30T04:00:21.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25830
--- a/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
+++ b/Resources/Locale/en-US/chemistry/components/hypospray-component.ftl
@@ -1,13 +1,21 @@
 ## UI

-hypospray-volume-text = Volume: [color=white]{$currentVolume}/{$totalVolume}[/color]
+hypospray-all-mode-text = Only Injects
+hypospray-mobs-only-mode-text = Draws and Injects
+hypospray-invalid-text = Invalid
+hypospray-volume-label = Volume: [color=white]{$currentVolume}/{$totalVolume}u[/color]
+    Mode: [color=white]{$modeString}[/color]

 ## Entity

 hypospray-component-inject-other-message = You inject {$other}.
 hypospray-component-inject-self-message = You inject yourself.
 hypospray-component-inject-self-clumsy-message = Oops! You injected yourself.
-hypospray-component-empty-message = It's empty!
+hypospray-component-empty-message = Nothing to inject.
 hypospray-component-feel-prick-message = You feel a tiny prick!
 hypospray-component-transfer-already-full-message = {$owner} is already full!
 hypospray-cant-inject = Can't inject into {$target}!
+
+hypospray-verb-mode-label = Toggle Container Draw
+hypospray-verb-mode-inject-all = You cannot draw from containers anymore.
+hypospray-verb-mode-inject-mobs-only = You can now draw from containers.
--- a/Resources/Locale/en-US/foldable/components/foldable-component.ftl
+++ b/Resources/Locale/en-US/foldable/components/foldable-component.ftl
@@ -4,4 +4,7 @@ foldable-deploy-fail = You can't deploy the {$object} here.
 fold-verb = Fold
 unfold-verb = Unfold

-fold-flip-verb = Flip
+fold-flip-verb = Flip
+
+fold-zip-verb = Zip up
+fold-unzip-verb = Unzip
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -65,6 +65,48 @@
      path: /Audio/White/Items/handling/cloth_drop.ogg
  # WD edit sounds end

+- type: entity
+  abstract: true
+  parent: [ClothingOuterStorageBase, BaseFoldable]
+  id: ClothingOuterStorageFoldableBase
+  components:
+  - type: Appearance
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-zip-verb
+    foldVerbText: fold-unzip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: open
+    foldedHeldPrefix: open
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+    - state: icon-open
+      map: ["foldedLayer"]
+      visible: false
+
+- type: entity
+  abstract: true
+  parent: ClothingOuterStorageFoldableBase
+  id: ClothingOuterStorageFoldableBaseOpened
+  suffix: opened
+  components:
+  - type: Foldable
+    folded: true
+  - type: Clothing
+    equippedPrefix: open
+  - type: Item
+    heldPrefix: open
+  - type: Sprite
+    layers:
+    - state: icon
+      map: [ "unfoldedLayer" ]
+      visible: false
+    - state: icon-open
+      map: ["foldedLayer"]
+      visible: true
+
 - type: entity
  abstract: true
  parent: ClothingOuterStorageBase
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -114,7 +114,7 @@
          Quantity: 20

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLab
  name: lab coat
  description: A suit that protects against minor chemical spills.
@@ -129,7 +129,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLab]
+  id: ClothingOuterCoatLabOpened
+  name: lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabChem
  name: chemist lab coat
  description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
@@ -144,7 +149,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabChem]
+  id: ClothingOuterCoatLabChemOpened
+  name: chemist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabViro
  name: virologist lab coat
  description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder.
@@ -158,9 +168,13 @@
      coefficients:
        Caustic: 0.75

+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabViro]
+  id: ClothingOuterCoatLabViroOpened
+  name: virologist lab coat

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabGene
  name: geneticist lab coat
  description: A suit that protects against minor chemical spills. Has an blue stripe on the shoulder.
@@ -174,9 +188,13 @@
      coefficients:
        Caustic: 0.75

+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabGene]
+  id: ClothingOuterCoatLabGeneOpened
+  name: geneticist lab coat

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatLabCmo
  name: chief medical officer's lab coat
  description: Bluer than the standard model.
@@ -191,7 +209,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatLabCmo]
+  id: ClothingOuterCoatLabCmoOpened
+  name: chief medical officer's lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatRnd
  name: scientist lab coat
  description: A suit that protects against minor chemical spills. Has a purple stripe on the shoulder.
@@ -206,7 +229,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRnd]
+  id: ClothingOuterCoatRndOpened
+  name: scientist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatRobo
  name: roboticist lab coat
  description: More like an eccentric coat than a labcoat. Helps pass off bloodstains as part of the aesthetic. Comes with red shoulder pads.
@@ -221,7 +249,12 @@
        Caustic: 0.75

 - type: entity
-  parent: ClothingOuterStorageBase
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRobo]
+  id: ClothingOuterCoatRoboOpened
+  name: roboticist lab coat
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
  id: ClothingOuterCoatRD
  name: research director lab coat
  description: Woven with top of the line technology, this labcoat helps protect against radiation in similar way to the experimental hardsuit.
@@ -236,6 +269,11 @@
        Caustic: 0.75
        Radiation: 0.9

+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatRD]
+  id: ClothingOuterCoatRDOpened
+  name: research director lab coat
+
 - type: entity
  parent: ClothingOuterStorageBase
  id: ClothingOuterCoatPirate
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1357,3 +1357,16 @@
    materialRequirements:
      Steel: 5
      CableHV: 2
+
+- type: entity
+  parent: BaseMachineCircuitboard
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  name: industrial reagent grinder machine board
+  components:
+  - type: MachineBoard
+    prototype: ReagentGrinderIndustrial
+    requirements:
+      MatterBin: 1
+      Manipulator: 3
+    materialRequirements:
+      Glass: 1
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -18,7 +18,7 @@
  - type: ExaminableSolution
    solution: hypospray
  - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
  - type: UseDelay
    delay: 0.5
  - type: StaticPrice
@@ -49,7 +49,7 @@
  - type: ExaminableSolution
    solution: hypospray
  - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
  - type: UseDelay
    delay: 0.5

@@ -73,6 +73,7 @@
  - type: ExaminableSolution
    solution: hypospray
  - type: Hypospray
+    onlyAffectsMobs: false
  - type: UseDelay
    delay: 0.5

@@ -113,6 +114,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 15
+    onlyAffectsMobs: false
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 1
@@ -202,6 +204,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 20
+    onlyAffectsMobs: false
  - type: SolutionContainerManager
    solutions:
      pen:
@@ -232,6 +235,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 20
+    onlyAffectsMobs: false
  - type: SolutionContainerManager
    solutions:
      pen:
@@ -262,6 +266,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 20
+    onlyAffectsMobs: false
  - type: SolutionContainerManager
    solutions:
      pen:
@@ -293,6 +298,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 30
+    onlyAffectsMobs: false
  - type: SolutionContainerManager
    solutions:
      pen:
@@ -330,6 +336,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 60
+    onlyAffectsMobs: false
  - type: StaticPrice
    price: 500
  - type: Tag
@@ -389,6 +396,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 30
+    onlyAffectsMobs: false
  - type: StaticPrice
    price: 500
  - type: Tag
@@ -417,6 +425,7 @@
  - type: Hypospray
    solutionName: pen
    transferAmount: 60
+    onlyAffectsMobs: false
  - type: StaticPrice
    price: 1000
  - type: Tag
@@ -439,7 +448,7 @@
  - type: ExaminableSolution
    solution: hypospray
  - type: Hypospray
-    onlyMobs: false
+    onlyAffectsMobs: false
  - type: UseDelay
    delay: 0.5
  - type: StaticPrice # A new shitcurity meta
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -488,6 +488,7 @@
      - ArtifactCrusherMachineCircuitboard
      - TelecomServerCircuitboard
      - MassMediaCircuitboard
+      - ReagentGrinderIndustrialMachineCircuitboard
  - type: BluespaceStorage
  - type: MaterialStorage
    whitelist:
--- a/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
@@ -56,3 +56,45 @@
      inputContainer: !type:Container
      machine_board: !type:Container
      machine_parts: !type:Container
+
+- type: entity
+  parent: Recycler #too different so different parent
+  id: ReagentGrinderIndustrial
+  name: industrial reagent grinder
+  description: An industrial reagent grinder.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      output:
+        maxVol: 400 #*slaps roof of machine* This baby can fit so much omnizine in it
+  - type: MaterialReclaimer
+    whitelist:
+      components:
+      - Extractable #same as reagent grinder
+    blacklist:
+      tags:
+      - HighRiskItem #ian meat
+    efficiency: 0.9
+  - type: Sprite
+    sprite: Structures/Machines/recycling.rsi
+    layers:
+      - state: grinder-b0
+  - type: Machine
+    board: ReagentGrinderIndustrialMachineCircuitboard
+  - type: GenericVisualizer
+    visuals:
+      enum.ConveyorVisuals.State:
+        enum.RecyclerVisualLayers.Main:
+          Forward: { state: grinder-b1 }
+          Reverse: { state: grinder-b1 }
+          Off: { state: grinder-b0 }
+  - type: ContainerContainer
+    containers:
+      machine_board: !type:Container
+      machine_parts: !type:Container
+  - type: Construction
+    graph: Machine
+    node: machine
+    containers:
+    - machine_parts
+    - machine_board
--- a/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/recycler.yml
@@ -116,4 +116,4 @@
    interactSuccessString: petting-success-recycler
    interactFailureString: petting-failure-generic
    interactSuccessSound:
-      path: /Audio/Items/drill_hit.ogg
+      path: /Audio/Items/drill_hit.ogg
--- a/Resources/Prototypes/Entities/Virtual/electrocution.yml
+++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml
@@ -1,7 +1,7 @@
 # Special entity used to attach to power networks as load when somebody gets electrocuted.
 - type: entity
  id: VirtualElectrocutionLoadBase
-  noSpawn: true
+  abstract: true
  components:
  - type: Electrocution
  - type: Icon
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -425,11 +425,12 @@
  color: "#D6CE7B"
  metabolisms:
    Poison:
+      metabolismRate: 0.2
      effects:
      - !type:HealthChange
        damage:
          types:
-            Poison: 6
+            Poison: 3

 - type: reagent
  id: VentCrud
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -956,3 +956,12 @@
     Steel: 100
     Glass: 900
     Gold: 100
+
+- type: latheRecipe
+  id: ReagentGrinderIndustrialMachineCircuitboard
+  result: ReagentGrinderIndustrialMachineCircuitboard
+  completetime: 5
+  materials:
+     Steel: 100
+     Glass: 900
+     Gold: 100
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -14,6 +14,7 @@
  - BorgModuleHarvesting
  - SeedExtractorMachineCircuitboard
  - HydroponicsTrayMachineCircuitboard
+  - ReagentGrinderIndustrialMachineCircuitboard

 - type: technology
  id: CritterMechs
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
@@ -28,6 +28,14 @@
    {
      "name": "open-equipped-OUTERCLOTHING-body-slim",
      "directions": 4
+    },
+    {
+      "name": "open-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-right",
+      "directions": 4
    }
  ]
 }
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
--- a/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
+++ b/Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
--- a/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json
+++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/evaprisoner.rsi/meta.json
@@ -25,6 +25,14 @@
    {
      "name": "inhand-right",
      "directions": 4
+    },
+    {
+      "name": "open-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "open-inhand-right",
+      "directions": 4
    }
  ]
 }