unmergeableslop5000

Content.Server/Mood/MoodComponent.cs

@@ -34,19 +34,19 @@ public sealed partial class MoodComponent : Component
     ///     The lowest point that low morale can multiply our movement speed by. Lowering speed follows a linear curve, rather than geometric.
     /// </summary>
     [DataField]
-    public float MinimumSpeedModifier = 0.75f;
+    public float MinimumSpeedModifier = 0.85f;
 
     /// <summary>
     ///     The maximum amount that high morale can multiply our movement speed by. This follows a significantly slower geometric sequence.
     /// </summary>
     [DataField]
-    public float MaximumSpeedModifier = 1.15f;
+    public float MaximumSpeedModifier = 1.25f;
 
     [DataField]
-    public float IncreaseCritThreshold = 1.2f;
+    public float IncreaseCritThreshold = 1.35f;
 
     [DataField]
-    public float DecreaseCritThreshold = 0.9f;
+    public float DecreaseCritThreshold = 0.85f;
 
     [ViewVariables(VVAccess.ReadOnly)]
     public FixedPoint2 CritThresholdBeforeModify;
@@ -59,13 +59,13 @@ public sealed partial class MoodComponent : Component
     {
         { MoodThreshold.Perfect, 100f },
         { MoodThreshold.Exceptional, 80f },
-        { MoodThreshold.Great, 70f },
-        { MoodThreshold.Good, 60f },
-        { MoodThreshold.Neutral, 50f },
-        { MoodThreshold.Meh, 40f },
-        { MoodThreshold.Bad, 30f },
-        { MoodThreshold.Terrible, 20f },
-        { MoodThreshold.Horrible, 10f },
+        { MoodThreshold.Great, 60f },
+        { MoodThreshold.Good, 50f },
+        { MoodThreshold.Neutral, 35f },
+        { MoodThreshold.Meh, 30f },
+        { MoodThreshold.Bad, 20f },
+        { MoodThreshold.Terrible, 10f },
+        { MoodThreshold.Horrible, 5f },
         { MoodThreshold.Dead, 0f }
     };
 

Content.Shared/CCVar/CCVars.Mood.cs

@@ -10,20 +10,20 @@ public sealed partial class CCVars
 
     public static readonly CVarDef<bool> MoodEnabled =
 #if RELEASE
-        CVarDef.Create("mood.enabled", false, CVar.SERVER);
+        CVarDef.Create("mood.enabled", true, CVar.SERVER);
 #else
-        CVarDef.Create("mood.enabled", false, CVar.SERVER);
+        CVarDef.Create("mood.enabled", true, CVar.SERVER);
 #endif
 
     public static readonly CVarDef<bool> MoodIncreasesSpeed =
         CVarDef.Create("mood.increases_speed", true, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodDecreasesSpeed =
-        CVarDef.Create("mood.decreases_speed", false, CVar.SERVER);
+        CVarDef.Create("mood.decreases_speed", true, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodModifiesThresholds =
         CVarDef.Create("mood.modify_thresholds", false, CVar.SERVER);
 
     public static readonly CVarDef<bool> MoodVisualEffects =
-        CVarDef.Create("mood.visual_effects", true, CVar.CLIENTONLY | CVar.ARCHIVE);
+        CVarDef.Create("mood.visual_effects", false, CVar.CLIENTONLY | CVar.ARCHIVE);
 }

Resources/Locale/en-US/_Crescent/reagent/medicine.ftl

@@ -14,4 +14,7 @@ reagent-name-bloodeye = blood-eye
 reagent-desc-bloodeye = A chemical cocktail of combat drugs known to invoke violent tendencies within the user. Blood-eye was originally produced by Shinohara Heavy Industries, but later taken off the shelves after narcotic regulations were put into place.
 
 reagent-name-jv201 = JV-201
-reagent-desc-jv201 = A versatile lubricant gel. It will increase the efficiency of living tissue, even if against organic will. Sourced from Carthage Industries.
+reagent-desc-jv201 = A versatile lubricant gel. It will increase the efficiency of living tissue, even if against organic will. Sourced from Carthage Industries.
+
+reagent-name-scop = Scop
+reagent-desc-scop = A disgusting mixture of "nutrients", the texture is similar to blended bone and sand.

Resources/Prototypes/Mood/categories.yml

@@ -14,5 +14,8 @@
 - type: moodCategory
   id: NicotineAddiction
 
+- type: moodCategory
+  id: StimulantAddiction
+
 - type: moodCategory
   id: Thirst

Resources/Prototypes/Mood/drugs.yml

@@ -30,18 +30,25 @@
 # Non-Addictive Drugs
 - type: moodEffect
   id: EthanolBenefit
-  moodChange: 3
+  moodChange: 10
   timeout: 300 #5 minutes
 
 - type: moodEffect
   id: SpaceDrugsBenefit
-  moodChange: 7
+  moodChange: 10
   timeout: 300 #5 minutes
 
 - type: moodEffect
   id: StrongStimulant
-  moodChange: 10
-  timeout: 300 #5 minutes
+  moodChange: 20
+  timeout: 50
+  moodletOnEnd: StimulantWithdrawal
+
+- type: moodEffect
+  id: StimulantWithdrawal
+  moodChange: -20 #No timeout
+  timeout: 300
+  category: "StimulantAddiction"
 
 # Floor Juice
 - type: moodEffect
@@ -186,3 +193,8 @@
   id: TastyEffect
   moodChange: 3
   timeout: 1800 #30 minutes
+
+- type: moodEffect
+  id: RationEffect
+  moodChange: -5
+  timeout: 300 #5 minutes

Resources/Prototypes/Mood/genericNeeds.yml

@@ -1,43 +1,43 @@
-# Hunger
+# Hunger
 - type: moodEffect
   id: HungerOverfed
-  moodChange: 10
+  moodChange: 15
   category: "Hunger"
 
 - type: moodEffect
   id: HungerOkay
-  moodChange: 7
+  moodChange: 10
   category: "Hunger"
 
 - type: moodEffect
   id: HungerPeckish
-  moodChange: -3
+  moodChange: -5
   category: "Hunger"
 
 - type: moodEffect
   id: HungerStarving
-  moodChange: -7
+  moodChange: -10
   category: "Hunger"
 
 # Thirst
 - type: moodEffect
   id: ThirstOverHydrated
-  moodChange: 10
+  moodChange: 15
   category: "Thirst"
 
 - type: moodEffect
   id: ThirstOkay
-  moodChange: 7
+  moodChange: 10
   category: "Thirst"
 
 - type: moodEffect
   id: ThirstThirsty
-  moodChange: -3
+  moodChange: -5
   category: "Thirst"
 
 - type: moodEffect
   id: ThirstParched
-  moodChange: -7
+  moodChange: -10
   category: "Thirst"
 
 # Health
@@ -60,4 +60,4 @@
 - type: moodEffect
   id: HealthHeavyDamage
   moodChange: -20
-  category: "Health"
+  category: "Health"

Resources/Prototypes/Mood/genericNegativeEffects.yml

@@ -7,6 +7,12 @@
   moodChange: -7
   timeout: 6
 
+- type: moodEffect
+  id: BeingPet
+  moodChange: -20
+  timeout: 120
+  category: PositiveInteraction
+
 - type: moodEffect
   id: OnFire
   moodChange: -10

Resources/Prototypes/Mood/genericPositiveEffects.yml

@@ -3,13 +3,7 @@
   moodChange: 3
   timeout: 120
   category: PositiveInteraction
-
-- type: moodEffect
-  id: BeingPet
-  moodChange: 3
-  timeout: 120
-  category: PositiveInteraction
-
+
 - type: moodEffect
   id: ArcadePlay
   moodChange: 3

Resources/Prototypes/_Crescent/Entities/Objects/Consumables/Food/fleshbeastmeatchunk.yml

@@ -27,4 +27,4 @@
     - type: Tag
       tags:
         - Raw
-        - Meat
+        - Meat

Resources/Prototypes/_Crescent/Entities/Objects/Consumables/Food/rationcompsdsm.yml

@@ -1,4 +1,4 @@
-#All of the MRE components that can spawn in the DSM Ration Packs. 
+#All of the MRE components that can spawn in the DSM Ration Packs.
 #Bases
 - type: entity
   parent: FoodBase
@@ -15,10 +15,12 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 40
+        - ReagentId: Scop
+          Quantity: 5
   - type: Item
     sprite: _Crescent/Objects/Consumables/Food/ration.rsi
     size: Small
-    
+
 - type: entity
   parent: FoodBase
   id: RationComponentBaseSide
@@ -34,15 +36,17 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 20
+        - ReagentId: Scop
+          Quantity: 5
   - type: Item
     sprite: _Crescent/Objects/Consumables/Food/ration.rsi
     size: Small
-#Mains    
+#Mains
 - type: entity
   name: Ration Component (Menu 1, Soy Patty, Beef Flavored)
   parent: RationComponentBaseMain
   id: RationComponentMainSoyBeef
-  description: A squishy rectangular "patty", made out of soy protein, and cheaply altered to taste like beef. 
+  description: A squishy rectangular "patty", made out of soy protein, and cheaply altered to taste like beef.
   components:
     - type: FlavorProfile
       flavors:
@@ -124,7 +128,7 @@
     - type: Food
       trash:
       - RationCompMainTrash
-      
+
 - type: entity
   name: Ration Component (Menu 6, Beans in Savory Sauce)
   parent: RationComponentBaseMain
@@ -147,7 +151,7 @@
   name: Ration Component (Side 1, Water Flavored Sustenance Bar)
   parent: RationComponentBaseSide
   id: RationComponentSideBrickWater
-  description: A brick of nutrients, made to taste like purified water. 
+  description: A brick of nutrients, made to taste like purified water.
   components:
     - type: FlavorProfile
       flavors:
@@ -165,7 +169,7 @@
   name: Ration Component (Side 2, Chocolate Flavored Sustenance Bar)
   parent: RationComponentBaseSide
   id: RationComponentSideBrickChocolate
-  description: A brick of nutrients, made to taste like chocolate. 
+  description: A brick of nutrients, made to taste like chocolate.
   components:
     - type: FlavorProfile
       flavors:
@@ -271,4 +275,4 @@
   - type: Sprite
     sprite: _Crescent/Objects/Consumables/Food/ration.rsi
     state: dsmrationcompsideopen
-  - type: Item
+  - type: Item

Resources/Prototypes/_Crescent/Entities/Objects/Consumables/Food/rationcompsncwl.yml

@@ -1,26 +1,27 @@
-#All of the MRE components that can spawn in the NCWL Ration Packs. 
+#All of the MRE components that can spawn in the NCWL Ration Packs.
 #Bases
 - type: entity
   abstract: true
   parent: FoodTinBase
   id: NcwlRationComponentBase
   name: NCWL Ration Can
   description: A ration can, manufactured by the NCWL
-  components: 
+  components:
   - type: SolutionContainerManager
     solutions:
       food:
         maxVol: 20
         reagents:
         - ReagentId: Nutriment
           Quantity: 20
+        - ReagentId: Scop
+          Quantity: 5
   - type: Openable
     openableByHand: true
     sound:
       path: /Audio/Items/can_open3.ogg
   - type: Item
     size: Small
-
 - type: entity
   abstract: true
   parent: BaseItem
@@ -49,7 +50,7 @@
     - type: Food
       trash:
       - NcwlRationComponentTrashMoth
- 
+
 - type: entity
   name: Ration Can (Menu 2, Soy Protein Chunks, Beef Flavor)
   parent: NcwlRationComponentBase
@@ -67,7 +68,7 @@
     - type: Food
       trash:
       - NcwlRationComponentTrashSoybeef
-      
+
 - type: entity
   name: Ration Can (Menu 3, Lard with Protein)
   parent: NcwlRationComponentBase
@@ -86,7 +87,7 @@
     - type: Food
       trash:
       - NcwlRationComponentTrashLard
-      
+
 - type: entity
   name: Ration Can (Menu 4, Soy Balls in Sauce)
   parent: NcwlRationComponentBase
@@ -135,7 +136,7 @@
     sprite: _Crescent/Objects/Consumables/Food/ncwlrationmoth.rsi
     state: trash
   - type: Item
-  
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
@@ -146,7 +147,7 @@
     sprite: _Crescent/Objects/Consumables/Food/ncwlrationsoybeef.rsi
     state: trash
   - type: Item
-  
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
@@ -157,7 +158,7 @@
     sprite: _Crescent/Objects/Consumables/Food/ncwlrationlard.rsi
     state: trash
   - type: Item
-  
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
@@ -168,7 +169,7 @@
     sprite: _Crescent/Objects/Consumables/Food/ncwlrationsoyballs.rsi
     state: trash
   - type: Item
-  
+
 - type: entity
   categories: [ HideSpawnMenu ]
   parent: FoodPacketTrash
@@ -178,4 +179,4 @@
   - type: Sprite
     sprite: _Crescent/Objects/Consumables/Food/ncwlrationsoup.rsi
     state: trash
-  - type: Item
+  - type: Item