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 = diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml index cd2a0d2a5cd..24c35f017c3 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/medical.yml @@ -52,6 +52,7 @@ - Drill - Saw - Hemostat + - SawElectric # Arcane - type: latheRecipePack id: MedicalStatic @@ -65,6 +66,11 @@ - OffsetCane - OffsetCaneWood - JetInjector + # Arcane-Start + - Bloodpack + - ClothingNeckStethoscope + - MedicalBeamGunSyndicate + # Arcane-End - type: latheRecipePack id: RollerBedsStatic @@ -79,6 +85,7 @@ - ClothingHandsGlovesLatex - ClothingHandsGlovesNitrile - ClothingMaskSterile + - ClothingEyesNightVisionMedicalGoggles # Arcane # These are all empty - type: latheRecipePack @@ -102,6 +109,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/_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