From ba2e99297385ba411f783ec2f4268d8083b237dd Mon Sep 17 00:00:00 2001 From: ReWAFFlution Date: Mon, 10 Aug 2026 18:58:12 +0300 Subject: [PATCH 1/4] Fix --- Content.Server/_Orion/Mood/MoodSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/_Orion/Mood/MoodSystem.cs b/Content.Server/_Orion/Mood/MoodSystem.cs index 113acdb8b93..6e62e064b1d 100644 --- a/Content.Server/_Orion/Mood/MoodSystem.cs +++ b/Content.Server/_Orion/Mood/MoodSystem.cs @@ -207,7 +207,7 @@ private void OnRefreshMoveSpeed(EntityUid uid, MoodComponent component, RefreshM return; var modifier = 1f; - if (component.CurrentMoodThreshold != MoodThreshold.Dead && component.CurrentMoodThreshold is <= MoodThreshold.Meh or >= MoodThreshold.Good) + if (component.CurrentMoodThreshold != MoodThreshold.Dead && component.CurrentMoodThreshold is <= MoodThreshold.Meh or >= MoodThreshold.Great) // Arcane-Edit { // This ridiculous math serves a purpose making high mood less impactful on movement speed than low mood modifier = From 6d21b598c8f375ffa9a080afe12b895ea0968d6c Mon Sep 17 00:00:00 2001 From: Cat_L Date: Thu, 6 Aug 2026 12:28:23 +0300 Subject: [PATCH 2/4] fixs --- .../Entities/Structures/Machines/lathe.yml | 1 + .../Recipes/Lathes/Packs/medical.yml | 18 ++++++++++++++++++ .../Recipes/Lathes/Packs/security.yml | 5 +++++ .../_Goobstation/Recipes/Lathes/Packs/misc.yml | 5 +++++ .../_Orion/Research/Nodes/cyborg.yml | 5 +++++ .../_Orion/Research/Nodes/engineering.yml | 12 ++++++++++++ .../_Orion/Research/Nodes/medical.yml | 5 +++++ .../_Orion/Research/Nodes/service.yml | 6 ++++++ 8 files changed, 57 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 981e81928da..916e0c39aba 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -181,6 +181,7 @@ - SecurityAmmoStaticGoob - SyndicateAmmoLightStatic - ScienceExplosives + - MedicalBeamGunSyndicate - type: BlueprintReceiver whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index cd2a0d2a5cd..a013c41fb2d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -52,6 +52,9 @@ - Drill - Saw - Hemostat + # Arcane-Start + - SawElectric + # Arcane-End - type: latheRecipePack id: MedicalStatic @@ -65,6 +68,10 @@ - OffsetCane - OffsetCaneWood - JetInjector + # Arcane-Start + - Bloodpack + - ClothingNeckStethoscope + # Arcane-End - type: latheRecipePack id: RollerBedsStatic @@ -79,6 +86,9 @@ - ClothingHandsGlovesLatex - ClothingHandsGlovesNitrile - ClothingMaskSterile + # Arcane-Start + - ClothingEyesNightVisionMedicalGoggles + # Arcane-End # These are all empty - type: latheRecipePack @@ -102,6 +112,14 @@ - ChemMasterMachineCircuitboard - CondenserMachineCircuitBoard - HotplateMachineCircuitboard + # Arcane-Start + - MedicalScannerMachineCircuitboard + - MedicalRecordsComputerCircuitboard + - CrewMonitoringComputerCircuitboard + - MedicalBiofabMachineBoard + - DiagnoserMachineCircuitboard + - VaccinatorMachineCircuitboard + # Arcane-End ## Dynamic diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml index 5f3e6baf227..1a1f0895d24 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/security.yml @@ -60,6 +60,11 @@ - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty # - ShrapnelPayload + # Arcane-Start + - MagazineShotgun + - MagazineShotgunEmpty + - MagazineShotgunSlug + # Arcane-End - type: latheRecipePack id: SecurityWeaponsStatic diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml index a895a349cf0..4b5f5d46ae9 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml @@ -36,6 +36,11 @@ - CartridgePuncturase - CartridgeTirizene +- type: latheRecipePack + id: MedicalBeamGunSyndicate + recipes: + - MedicalBeamGunSyndicate + - type: latheRecipePack id: ProtoLatheMiscStatic recipes: diff --git a/Resources/Prototypes/_Orion/Research/Nodes/cyborg.yml b/Resources/Prototypes/_Orion/Research/Nodes/cyborg.yml index 34336a78be1..1aaddc810de 100644 --- a/Resources/Prototypes/_Orion/Research/Nodes/cyborg.yml +++ b/Resources/Prototypes/_Orion/Research/Nodes/cyborg.yml @@ -133,6 +133,7 @@ - AdvancedSurgery recipeUnlocks: - BorgModuleAdvancedSurgery + - BorgModuleAdvancedTopical # Arcane position: -5,0 - type: technology @@ -157,6 +158,10 @@ - BorgModuleTool - BorgModuleCable - BorgModuleFireExtinguisher + # Arcane-Start + - BorgModuleInflatable + - BorgModuleArtistry + # Arcane-End position: -5,-1 - type: technology diff --git a/Resources/Prototypes/_Orion/Research/Nodes/engineering.yml b/Resources/Prototypes/_Orion/Research/Nodes/engineering.yml index 73f431081eb..a8493403501 100644 --- a/Resources/Prototypes/_Orion/Research/Nodes/engineering.yml +++ b/Resources/Prototypes/_Orion/Research/Nodes/engineering.yml @@ -28,6 +28,7 @@ - TimerTrigger - VoiceSignaller - VoiceTrigger + - VoiceSensor # Arcane - ProximitySignaller position: 12,4 @@ -194,6 +195,7 @@ - CableStack - CableMVStack - CableHVStack + - CableDetStack1 # Arcane - ClothingHeadHatWelding - Welder - WelderMini @@ -212,6 +214,16 @@ - LightTube - ClothingMaskWeldingGas - SignallerAdvanced + # Arcane-Start + - EmptyDetonator + - TowelColorWhite + - MaterialDurathread + - FauxTileDarkAstroGrass + - FauxTileLightAstroGrass + - FauxTileDesertAstroSand + - FauxTileAstroIronsand + - FauxTileAstroIronsandBorderless + # Arcane-End - FauxTileAstroGrass - FauxTileMowedAstroGrass - FauxTileJungleAstroGrass diff --git a/Resources/Prototypes/_Orion/Research/Nodes/medical.yml b/Resources/Prototypes/_Orion/Research/Nodes/medical.yml index 710aed9760d..41960ef5293 100644 --- a/Resources/Prototypes/_Orion/Research/Nodes/medical.yml +++ b/Resources/Prototypes/_Orion/Research/Nodes/medical.yml @@ -18,6 +18,10 @@ - ScanningReagentHaloperidol - ScanningReagentCryostylane recipeUnlocks: + # Arcane-Start + - JetInjector + - ChemistryEmptyVialSmall + # Arcane-End - LargeBeaker - Beaker - Bloodpack @@ -137,6 +141,7 @@ requiredExperiments: - ScanningReagentHaloperidol recipeUnlocks: + - AdvancedJetInjector # Arcane - HandheldCrewMonitor - SyringeGun - DefibrillatorCompact diff --git a/Resources/Prototypes/_Orion/Research/Nodes/service.yml b/Resources/Prototypes/_Orion/Research/Nodes/service.yml index bfdd949a511..463a6bea5fc 100644 --- a/Resources/Prototypes/_Orion/Research/Nodes/service.yml +++ b/Resources/Prototypes/_Orion/Research/Nodes/service.yml @@ -12,6 +12,11 @@ - type: General amount: 500 recipeUnlocks: + # Arcane-Start + - UtilityKnife + - BoxFolderClipboardEmpty + - BoxFolderPlasticClipboardEmpty + # Arcane-End - HandLabeler - ParcelWrap - CutterMachineCircuitboard @@ -148,6 +153,7 @@ - type: General amount: 500 recipeUnlocks: + - SmartFridgeCircuitboard # Arcane - ElectricGrillMachineCircuitboard - MicrowaveMachineCircuitboard - FoodBowlBig From 8343f32c1431d2bc2291eb154d3fe0d1a88ff4c6 Mon Sep 17 00:00:00 2001 From: Cat_L Date: Thu, 6 Aug 2026 13:13:22 +0300 Subject: [PATCH 3/4] fixs-tests --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/Packs/medical.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 916e0c39aba..981e81928da 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -181,7 +181,6 @@ - SecurityAmmoStaticGoob - SyndicateAmmoLightStatic - ScienceExplosives - - MedicalBeamGunSyndicate - type: BlueprintReceiver whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index a013c41fb2d..0fee2d388ea 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -71,6 +71,7 @@ # Arcane-Start - Bloodpack - ClothingNeckStethoscope + - MedicalBeamGunSyndicate # Arcane-End - type: latheRecipePack From 70eacc1a72c520883535e3de9aa34068bf3fb184 Mon Sep 17 00:00:00 2001 From: Cat_L Date: Mon, 10 Aug 2026 14:19:20 +0300 Subject: [PATCH 4/4] fixs-3 --- Resources/Prototypes/Recipes/Lathes/Packs/medical.yml | 8 ++------ .../Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml | 5 ----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index 0fee2d388ea..24c35f017c3 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -52,9 +52,7 @@ - Drill - Saw - Hemostat - # Arcane-Start - - SawElectric - # Arcane-End + - SawElectric # Arcane - type: latheRecipePack id: MedicalStatic @@ -87,9 +85,7 @@ - ClothingHandsGlovesLatex - ClothingHandsGlovesNitrile - ClothingMaskSterile - # Arcane-Start - - ClothingEyesNightVisionMedicalGoggles - # Arcane-End + - ClothingEyesNightVisionMedicalGoggles # Arcane # These are all empty - type: latheRecipePack diff --git a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml index 4b5f5d46ae9..a895a349cf0 100644 --- a/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml +++ b/Resources/Prototypes/_Goobstation/Recipes/Lathes/Packs/misc.yml @@ -36,11 +36,6 @@ - CartridgePuncturase - CartridgeTirizene -- type: latheRecipePack - id: MedicalBeamGunSyndicate - recipes: - - MedicalBeamGunSyndicate - - type: latheRecipePack id: ProtoLatheMiscStatic recipes: