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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user