Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Server/_Orion/Mood/MoodSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/Packs/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- Drill
- Saw
- Hemostat
- SawElectric # Arcane

- type: latheRecipePack
id: MedicalStatic
Expand All @@ -65,6 +66,11 @@
- OffsetCane
- OffsetCaneWood
- JetInjector
# Arcane-Start
- Bloodpack
- ClothingNeckStethoscope
- MedicalBeamGunSyndicate
# Arcane-End

- type: latheRecipePack
id: RollerBedsStatic
Expand All @@ -79,6 +85,7 @@
- ClothingHandsGlovesLatex
- ClothingHandsGlovesNitrile
- ClothingMaskSterile
- ClothingEyesNightVisionMedicalGoggles # Arcane

# These are all empty
- type: latheRecipePack
Expand All @@ -102,6 +109,14 @@
- ChemMasterMachineCircuitboard
- CondenserMachineCircuitBoard
- HotplateMachineCircuitboard
# Arcane-Start
- MedicalScannerMachineCircuitboard
- MedicalRecordsComputerCircuitboard
- CrewMonitoringComputerCircuitboard
- MedicalBiofabMachineBoard
- DiagnoserMachineCircuitboard
- VaccinatorMachineCircuitboard
# Arcane-End

## Dynamic

Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/Packs/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
# - ShrapnelPayload
# Arcane-Start
- MagazineShotgun
- MagazineShotgunEmpty
- MagazineShotgunSlug
# Arcane-End

- type: latheRecipePack
id: SecurityWeaponsStatic
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Orion/Research/Nodes/cyborg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
- AdvancedSurgery
recipeUnlocks:
- BorgModuleAdvancedSurgery
- BorgModuleAdvancedTopical # Arcane
position: -5,0

- type: technology
Expand All @@ -157,6 +158,10 @@
- BorgModuleTool
- BorgModuleCable
- BorgModuleFireExtinguisher
# Arcane-Start
- BorgModuleInflatable
- BorgModuleArtistry
# Arcane-End
position: -5,-1

- type: technology
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Orion/Research/Nodes/engineering.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- TimerTrigger
- VoiceSignaller
- VoiceTrigger
- VoiceSensor # Arcane
- ProximitySignaller
position: 12,4

Expand Down Expand Up @@ -194,6 +195,7 @@
- CableStack
- CableMVStack
- CableHVStack
- CableDetStack1 # Arcane
- ClothingHeadHatWelding
- Welder
- WelderMini
Expand All @@ -212,6 +214,16 @@
- LightTube
- ClothingMaskWeldingGas
- SignallerAdvanced
# Arcane-Start
- EmptyDetonator
- TowelColorWhite
- MaterialDurathread
- FauxTileDarkAstroGrass
- FauxTileLightAstroGrass
- FauxTileDesertAstroSand
- FauxTileAstroIronsand
- FauxTileAstroIronsandBorderless
# Arcane-End
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Orion/Research/Nodes/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
- ScanningReagentHaloperidol
- ScanningReagentCryostylane
recipeUnlocks:
# Arcane-Start
- JetInjector
- ChemistryEmptyVialSmall
# Arcane-End
- LargeBeaker
- Beaker
- Bloodpack
Expand Down Expand Up @@ -137,6 +141,7 @@
requiredExperiments:
- ScanningReagentHaloperidol
recipeUnlocks:
- AdvancedJetInjector # Arcane
- HandheldCrewMonitor
- SyringeGun
- DefibrillatorCompact
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Orion/Research/Nodes/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
- type: General
amount: 500
recipeUnlocks:
# Arcane-Start
- UtilityKnife
- BoxFolderClipboardEmpty
- BoxFolderPlasticClipboardEmpty
# Arcane-End
- HandLabeler
- ParcelWrap
- CutterMachineCircuitboard
Expand Down Expand Up @@ -148,6 +153,7 @@
- type: General
amount: 500
recipeUnlocks:
- SmartFridgeCircuitboard # Arcane
- ElectricGrillMachineCircuitboard
- MicrowaveMachineCircuitboard
- FoodBowlBig
Expand Down
Loading