From 4b15a1d9ce69f7046f4b15b120c564e012fc7979 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Wed, 16 Aug 2023 09:08:52 -0400
Subject: [PATCH 01/11] Hotfix entitystorage (#19206)

---
 .../Storage/EntitySystems/SharedEntityStorageSystem.cs          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
index ac57ced2bdc168..8ea40f525c369d 100644
--- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
@@ -395,7 +395,7 @@ public bool CanFit(EntityUid toInsert, EntityUid container, EntityWhitelist? whi
 
         var targetIsMob = HasComp<BodyComponent>(toInsert);
         var storageIsItem = HasComp<ItemComponent>(container);
-        var allowedToEat = whitelist?.IsValid(toInsert) ?? storageIsItem;
+        var allowedToEat = whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
 
         // BEFORE REPLACING THIS WITH, I.E. A PROPERTY:
         // Make absolutely 100% sure you have worked out how to stop people ending up in backpacks.

From 180c74cc856c6c40c3b052585c8e50030a9065df Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 16 Aug 2023 09:09:58 -0400
Subject: [PATCH 02/11] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 7f4c88429636f9..1288584cb3e317 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,9 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - {message: Snow planets now have minerals and rocks on them., type: Add}
-  id: 4112
-  time: '2023-06-28T11:32:02.0000000+00:00'
 - author: metalgearsloth
   changes:
   - {message: Added walls to lava planets., type: Add}
@@ -3030,3 +3025,8 @@ Entries:
       range., type: Fix}
   id: 4611
   time: '2023-08-16T08:03:42.0000000+00:00'
+- author: EmoGarbage404
+  changes:
+  - {message: Lockers and crates work again., type: Fix}
+  id: 4612
+  time: '2023-08-16T13:08:53.0000000+00:00'

From 149d2a5ae5fe6201a9054a4fc2d0e6d14630abe8 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Wed, 16 Aug 2023 17:18:57 +0400
Subject: [PATCH 03/11] add binary radio to the various bots (#19203)

* radioing

* drones
---
 Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml   | 8 ++++++++
 Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index b920958f1e958d..59b383de121978 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -41,6 +41,14 @@
   - type: NpcFactionMember
     factions:
     - SimpleNeutral
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: HealthExaminable
     examinableTypes:
     - Blunt
diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
index cfc1917aa8967a..903a849ad8597a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -52,6 +52,14 @@
     showInHands: false
   - type: Body
     prototype: Drone
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: DoAfter
   - type: Pullable
   - type: Examiner

From 324f4b2c8a67b3170eeda7bc328f5206e9683b1e Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 16 Aug 2023 09:20:02 -0400
Subject: [PATCH 04/11] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1288584cb3e317..f47507bcd7faf7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,9 +1,4 @@
 Entries:
-- author: metalgearsloth
-  changes:
-  - {message: Added walls to lava planets., type: Add}
-  id: 4113
-  time: '2023-06-28T12:57:40.0000000+00:00'
 - author: crazybrain
   changes:
   - {message: The lsobjectives command now has autocompletion., type: Tweak}
@@ -3030,3 +3025,8 @@ Entries:
   - {message: Lockers and crates work again., type: Fix}
   id: 4612
   time: '2023-08-16T13:08:53.0000000+00:00'
+- author: Ilya246
+  changes:
+  - {message: 'Taxibots, cleanbots, and similar now have binary radio.', type: Add}
+  id: 4613
+  time: '2023-08-16T13:18:57.0000000+00:00'

From 8a0ca262afd98315d12aa5760d26b5286ecad1d0 Mon Sep 17 00:00:00 2001
From: Ilya246 <57039557+Ilya246@users.noreply.github.com>
Date: Wed, 16 Aug 2023 19:06:34 +0400
Subject: [PATCH 05/11] binary channel for sentient vendomats (#19212)

---
 .../Entities/Structures/Machines/vending_machines.yml     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 1f736239f2dc0a..8d558ffb181925 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -72,6 +72,14 @@
   - type: Speech
     speechVerb: Robotic
     speechSounds: Vending
+  - type: IntrinsicRadioReceiver
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
   - type: DoAfter
   - type: Electrified
     enabled: false

From ebdf249e52009169ae40cece687307435be3e68b Mon Sep 17 00:00:00 2001
From: JoeHammad1844 <130668733+JoeHammad1844@users.noreply.github.com>
Date: Thu, 17 Aug 2023 04:38:07 +1000
Subject: [PATCH 06/11] Add fingerless insulated gloves (#19111)

Fingerless insulated gloves are a joke variant of insulated gloves that neither insulates you, nor prevents you from transferring fingerprints. The name and description make this adequately clear.
---
 .../Prototypes/Catalog/Fills/Lockers/misc.yml    |   2 ++
 .../Entities/Clothing/Hands/gloves.yml           |  14 ++++++++++++++
 .../fingerlessinsuls.rsi/equipped-HAND.png       | Bin 0 -> 6547 bytes
 .../Hands/Gloves/fingerlessinsuls.rsi/icon.png   | Bin 0 -> 6973 bytes
 .../Gloves/fingerlessinsuls.rsi/inhand-left.png  | Bin 0 -> 291 bytes
 .../Gloves/fingerlessinsuls.rsi/inhand-right.png | Bin 0 -> 294 bytes
 .../Hands/Gloves/fingerlessinsuls.rsi/meta.json  |   1 +
 7 files changed, 17 insertions(+)
 create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png
 create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png
 create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index d519f238183ae2..32c1cfb506b432 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -117,6 +117,8 @@
           prob: 0.2
         - id: ClothingHandsGlovesColorYellow
           prob: 0.05
+        - id: ClothingHandsGlovesFingerlessInsulated
+          prob: 0.07
         - id: ClothingBeltUtility
           prob: 0.10
         - id: ClothingHeadHatCone
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 1a220c92c04c69..364fd1758406b1 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -264,6 +264,20 @@
     fiberMaterial: fibers-synthetic
     fiberColor: fibers-black
 
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsGlovesFingerlessInsulated
+  name: fingerless insulated gloves
+  description: Insulated gloves resistant to shocks, or at least they used to.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/fingerlessinsuls.rsi
+  - type: Fiber
+    fiberMaterial: fibers-insulative
+    fiberColor: fibers-yellow
+
 - type: entity
   parent: ClothingHandsBase
   id: ClothingHandsGlovesMercFingerless
diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a85dbeafd5c0371e24c9714794b01c143c618d6
GIT binary patch
literal 6547
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
PsNkWw`?wXktVsGNMpF^M

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb3f336c9690fe5b113accd69098ba7e63864075
GIT binary patch
literal 6973
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
YWH)gkKS(x#N<$!)rh80sj1C?D9}O)4ivR!s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e8542213fa3db8e812f443ec113ca7d350115ed
GIT binary patch
literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0MfW48#Bb#`}*5KY1nj
zf4-wGP>8W4$S;_|;n|HeASb6PB%;J6wK%ybv!En1KaYW-Voq>aK~d@VFTn*Lzdq6O
z*3~+9=6vvmP=kxc4<6~9_t8AbP}I}A!@@Yo__DE=!kkBwj!X(s2wrJqtG-`nYeZ+a
zvFhd(5=(l!jn`@znu{JWdlD2@@U@sxnunq8rnETg)v2?9_Ii1`IEHw1CMQU+E^Y{O
z5b!eQN|>G=)S?-1Xq^K`UXwtXG7GCg<l+R8o~DItES#DGK?*5NO3P+28np{v<`ZLQ
iYTG3t5MZ#0k-=goQ^M{JnLR*L89ZJ6T-G@yGywovEn|=X

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..a99658a193627f7a47dd25989098b06c1630d3e5
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0MfW48#Bb#`}*5KY1nj
zf4-wGP>8W4$S;_|;n|HeASb6PB%;J6wK%ybv!En1KaYW-Voq>aK~d@VFTn*Lzdq6O
z*3~+9=6vvmP=kxc4<6~9_t8AbP}I}A!@@Yo__DE=!kkBwj!X(s2wrJqtG-`nYeZ+a
zvFhd(5=(l!jn`@znu{JWdlD2@@U@sxnunq8rnETg)v2?9_WF9dIEHw1CMQU+E^fHh
z5Xi85heAxFP*|m!>kcNxHEtXSeG>$ZtYX;xLIbEGVFIHg)2EI@4D13*DNI?32YgOA
k>hQ6M80;1>N;<;Gu)dh_dwZw%7NEflp00i_>zopr0B?k7sQ>@~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json
new file mode 100644
index 00000000000000..16c9e9e5e12523
--- /dev/null
+++ b/Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-HAND", "directions": 4}, {"name": "inhand-left", "directions": 4}, {"name": "inhand-right", "directions": 4}]}

From 6b5c6978c989bf533b0162a6fec3776f06419e12 Mon Sep 17 00:00:00 2001
From: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Date: Wed, 16 Aug 2023 16:11:02 -0300
Subject: [PATCH 07/11] Rework salvage crate loot (#19215)

* more loot

* a
---
 .../Catalog/Fills/Crates/salvage.yml          | 41 ++++---------------
 .../Markers/Spawners/Random/salvage.yml       | 13 ++++++
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 9e83e1eec0e7b2..cd5daf6f722fd7 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -31,11 +31,13 @@
   - type: StorageFill
     contents:
         # Normal (10%)
-      - id: ToolboxEmergencyFilled
+      - id: OxygenTankFilled
         prob: 0.1
-      - id: ClothingMaskBreath
+      - id: SheetPlasma
         prob: 0.1
-      - id: OxygenTankFilled
+      - id: IngotGold
+        prob: 0.1
+      - id: IngotSilver
         prob: 0.1
       - id: SheetPlasma
         prob: 0.1
@@ -43,7 +45,7 @@
         prob: 0.1
       - id: ResearchDisk
         prob: 0.1
-      - id: ClothingBeltStorageWaistbag
+      - id: SheetUranium
         prob: 0.1
         #  - Service
       - id: CrayonBox
@@ -54,22 +56,15 @@
       - id: BoxSyringe
         prob: 0.1
       - id: BoxBeaker
-        prob: 0.1
-        #  - Scaf
-      - id: ClothingHeadHelmetScaf
-        prob: 0.1
-      - id: ClothingOuterArmorScaf
         prob: 0.1
         #  - Heh
       - id: SalvageHumanCorpse
         prob: 0.1
-      - id: LidSalami
-        prob: 0.1
         # Interesting (1%)
         #  - Ammo
       - id: MagazineBoxMagnum
         prob: 0.01
-      - id: ResearchDisk5000
+      - id: ResearchDisk10000
         prob: 0.01
         # Just no (0.1%)
         #  - Working guns
@@ -82,30 +77,8 @@
         #  - Skub
       - id: Skub
         prob: 0.001
-      - id: ResearchDisk10000
-        prob: 0.001
       - id: ClothingHeadHatCatEars
         prob: 0.01
-        #  - Pins
-      - id: ClothingNeckLGBTPin
-        prob: 0.025
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAromanticPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckAsexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckBisexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckIntersexPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckLesbianPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckNonBinaryPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckPansexualPin
-        orGroup: LGBTQIAPlusPins
-      - id: ClothingNeckTransPin
-        orGroup: LGBTQIAPlusPins
         # TRAITOR EQUIPMENT (0.01%)
       - id: Telecrystal10
         prob: 0.0001
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
index e98004bfc81486..a933a7ecbb9710 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml
@@ -20,6 +20,19 @@
         - CrateSalvageEquipment
         - CrateMaterialSteel
         - CrateMaterialGlass
+        - CrateServiceJanitorialSupplies
+        - CrateHydroponicsSeedsMedicinal
+        - CrateEmergencyInternals
+        - CrateFoodMRE
+        - CrateMaterialTextiles
+        - CrateMedicalSupplies
+        - CrateEngineeringCableBulk
+        - CrateMaterialCardboard
+        - CrateServiceBooks
+        - CrateServiceSmokeables
+        - CrateTrashCartFilled
+        - ClosetMaintenanceFilledRandom
+        - ClosetEmergencyFilledRandom
       rareChance: 0.4
       prototypes:
         - CrateSalvageAssortedGoodies

From 8e388a2494e6c6de06b8f6e2bcc7a1dbdf62f118 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 16 Aug 2023 15:12:07 -0400
Subject: [PATCH 08/11] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f47507bcd7faf7..70998c86679fcd 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,9 +1,4 @@
 Entries:
-- author: crazybrain
-  changes:
-  - {message: The lsobjectives command now has autocompletion., type: Tweak}
-  id: 4114
-  time: '2023-06-28T13:47:46.0000000+00:00'
 - author: deltanedas
   changes:
   - {message: 'Hazardous and Extreme expeditions can have more dangerous modifiers,
@@ -3030,3 +3025,9 @@ Entries:
   - {message: 'Taxibots, cleanbots, and similar now have binary radio.', type: Add}
   id: 4613
   time: '2023-08-16T13:18:57.0000000+00:00'
+- author: DogZeroX
+  changes:
+  - {message: 'Reworked the loot table from salvage spawners, the stuff you can find
+      is more varied and valuable overall.', type: Add}
+  id: 4614
+  time: '2023-08-16T19:11:02.0000000+00:00'

From 75c8ded542ef6efd9c7e26c08cbb68219e1f4e8b Mon Sep 17 00:00:00 2001
From: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Date: Wed, 16 Aug 2023 19:12:09 -0300
Subject: [PATCH 09/11] Nert part creation (#19216)

---
 Resources/Prototypes/Recipes/Lathes/Parts.yml | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Resources/Prototypes/Recipes/Lathes/Parts.yml b/Resources/Prototypes/Recipes/Lathes/Parts.yml
index c0c496e3963236..99f8273536608e 100644
--- a/Resources/Prototypes/Recipes/Lathes/Parts.yml
+++ b/Resources/Prototypes/Recipes/Lathes/Parts.yml
@@ -50,34 +50,34 @@
     Steel: 150
     Plastic: 150
     Plasma: 75
-    
+
 #Rating 3
 - type: latheRecipe
   id: SuperCapacitorStockPart
   result: SuperCapacitorStockPart
   completetime: 3
   materials:
-    Steel: 250
-    Plastic: 250
-    Plasma: 100
-    Gold: 125
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75
 
 - type: latheRecipe
   id: SuperMatterBinStockPart
   result: SuperMatterBinStockPart
   completetime: 3
   materials:
-    Steel: 250
-    Plastic: 250
-    Plasma: 100
-    Gold: 125
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75
 
 - type: latheRecipe
   id: PicoManipulatorStockPart
   result: PicoManipulatorStockPart
   completetime: 3
   materials:
-    Steel: 250
-    Plastic: 250
-    Plasma: 100
-    Gold: 125
+    Steel: 150
+    Plastic: 150
+    Plasma: 75
+    Gold: 75

From 24404fa010905e3a2d474825c9b3f69716831306 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 16 Aug 2023 18:13:14 -0400
Subject: [PATCH 10/11] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 70998c86679fcd..a608f2d39a5f98 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: deltanedas
-  changes:
-  - {message: 'Hazardous and Extreme expeditions can have more dangerous modifiers,
-      of which temperature has been added.', type: Tweak}
-  - {message: Hazardous and Extreme expeditions give 4 and 5 rewards respectively.,
-    type: Tweak}
-  id: 4115
-  time: '2023-06-28T14:01:27.0000000+00:00'
 - author: Lank
   changes:
   - {message: 'Added Lead, a tasteless, incredibly powerful but slow-acting poison
@@ -3031,3 +3023,9 @@ Entries:
       is more varied and valuable overall.', type: Add}
   id: 4614
   time: '2023-08-16T19:11:02.0000000+00:00'
+- author: DogZeroX
+  changes:
+  - {message: Higher rating stock parts are now cheaper to make. Print a bunch of
+      them and upgrade stuff!, type: Tweak}
+  id: 4615
+  time: '2023-08-16T22:12:09.0000000+00:00'

From b38685622e156598ac35c1eb0b93f4b81d36a368 Mon Sep 17 00:00:00 2001
From: Sailor <109166122+Equivocateur@users.noreply.github.com>
Date: Thu, 17 Aug 2023 01:20:09 +0300
Subject: [PATCH 11/11] Merge pull request #19223

* Change manifesto to manifest
---
 Content.Client/RoundEnd/RoundEndSummaryWindow.cs            | 6 +++---
 .../Locale/en-US/round-end/round-end-summary-window.ftl     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index 9288195d7b28dd..93212013a90576 100644
--- a/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -33,7 +33,7 @@ public RoundEndSummaryWindow(string gm, string roundEnd, TimeSpan roundTimeSpan,
             RoundId = roundId;
             var roundEndTabs = new TabContainer();
             roundEndTabs.AddChild(MakeRoundEndSummaryTab(gm, roundEnd, roundTimeSpan, roundId));
-            roundEndTabs.AddChild(MakePlayerManifestoTab(info));
+            roundEndTabs.AddChild(MakePlayerManifestTab(info));
 
             Contents.AddChild(roundEndTabs);
 
@@ -90,12 +90,12 @@ private BoxContainer MakeRoundEndSummaryTab(string gamemode, string roundEnd, Ti
             return roundEndSummaryTab;
         }
 
-        private BoxContainer MakePlayerManifestoTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
+        private BoxContainer MakePlayerManifestTab(RoundEndMessageEvent.RoundEndPlayerInfo[] playersInfo)
         {
             var playerManifestTab = new BoxContainer
             {
                 Orientation = LayoutOrientation.Vertical,
-                Name = Loc.GetString("round-end-summary-window-player-manifesto-tab-title")
+                Name = Loc.GetString("round-end-summary-window-player-manifest-tab-title")
             };
 
             var playerInfoContainerScrollbox = new ScrollContainer
diff --git a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
index 8069838e11ebf3..58d26319b3246a 100644
--- a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
+++ b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
@@ -1,6 +1,6 @@
 round-end-summary-window-title = Round End Summary
 round-end-summary-window-round-end-summary-tab-title = Round Information
-round-end-summary-window-player-manifesto-tab-title = Player Manifesto
+round-end-summary-window-player-manifest-tab-title = Player Manifest
 round-end-summary-window-round-id-label = Round [color=white]#{$roundId}[/color] has ended.
 round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color].
 round-end-summary-window-duration-label = It lasted for [color=yellow]{$hours} hours, {$minutes} minutes, and {$seconds} seconds.