Stimpacks 1.1.1 - Intended Behavior Edition (#14608)

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -39,6 +39,7 @@ flavor-base-fizzy = fizzy
 flavor-base-shocking = shocking
 flavor-base-cheap = cheap
 flavor-base-piquant = piquant
+flavor-base-sharp = sharp
 
 # lmao
 flavor-base-terrible = terrible
@@ -175,3 +176,4 @@ flavor-complex-medicine = like medicine
 flavor-complex-carpet = like a handful of fur
 flavor-complex-bee = unbeelievable
 flavor-complex-sax = like jazz
+flavor-complex-bottledlightning = like lightning in a bottle

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -153,7 +153,7 @@
             Quantity: 20
   - type: Tag
     tags: []
-    
+
 - type: entity
   name: stimulant injector
   parent: ChemicalMedipen
@@ -170,9 +170,14 @@
         reagents:
         - ReagentId: Stimulants
           Quantity: 60
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 60
+  - type: StaticPrice
+    price: 500
   - type: Tag
     tags: []
-    
+
 - type: entity
   name: stimulant microinjector
   parent: ChemicalMedipen
@@ -189,9 +194,11 @@
         reagents:
         - ReagentId: Stimulants
           Quantity: 15
+  - type: StaticPrice
+    price: 100
   - type: Tag
     tags: []
-    
+
 - type: entity
   name: experimental stimulant injector
   parent: ChemicalMedipen
@@ -208,6 +215,11 @@
         reagents:
         - ReagentId: ExperimentalStimulants
           Quantity: 60
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 60
+  - type: StaticPrice
+    price: 1000
   - type: Tag
     tags: []
 

Resources/Prototypes/Flavors/flavors.yml

@@ -154,6 +154,11 @@
   flavorType: Base
   description: flavor-base-terrible
 
+- type: flavor
+  id: sharp
+  flavorType: Base
+  description: flavor-base-sharp
+
 - type: flavor
   id: nothing
   flavorType: Complex
@@ -657,4 +662,9 @@
 - type: flavor
   id: garlic
   flavorType: Complex
-  description: flavor-complex-garlic
+  description: flavor-complex-garlic
+
+- type: flavor
+  id: bottledlightning
+  flavorType: Complex
+  description: flavor-complex-bottledlightning

Resources/Prototypes/Reagents/narcotics.yml

@@ -149,7 +149,7 @@
   group: Narcotics
   desc: reagent-desc-experimental-stimulants
   physicalDesc: reagent-physical-desc-exhilarating
-  flavor: bottled lightning
+  flavor: bottledlightning
   color: "#AE0101"
   boilingPoint: 212.0
   meltingPoint: 170.0
@@ -158,13 +158,22 @@
       metabolismRate: 0.25 # lasts for 4 minutes instead of 5
       effects:
       - !type:MovespeedModifier # nyoom
+        conditions:
+        - !type:ReagentThreshold
+          min: 10
         walkSpeedModifier: 1.8
         sprintSpeedModifier: 1.8
+      - !type:MovespeedModifier # antinyoom
+        conditions:
+        - !type:ReagentThreshold
+          max: 10 # ghetto withdrawal
+        walkSpeedModifier: 0.7
+        sprintSpeedModifier: 0.7
       - !type:Electrocute
         conditions:
           - !type:ReagentThreshold
             max: 10 # ghetto withdrawal effect
-        probability: 0.3 # get stunlocked nerd
+        probability: 0.1 # get stunlocked nerd
       - !type:Jitter
         conditions:
         - !type:ReagentThreshold
@@ -177,33 +186,41 @@
         component: StutteringAccent
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
-            min: 10
+        - !type:ReagentThreshold
+          min: 10
         damage:
           types:
             Poison: 1 # You will be laying on the floor in crit in 100 seconds if you don't have antitoxin meds (Ideally this should deal twice as much damage but since nukies don't have access to stellbinin it would kill them)
       - !type:HealthChange
         conditions:
-          - !type:ReagentThreshold
-            min: 60.1 #so nukies don't take a tick of 8 poison damage when it first gets injected
+        - !type:ReagentThreshold
+          min: 60
         damage:
           types:
             Poison: 8 # TODO this should ideally kill your liver instead
       # effectively negates stamcrits
       - !type:GenericStatusEffect
         conditions:
-          - !type:ReagentThreshold
-            min: 10
+        - !type:ReagentThreshold
+          min: 10
         key: Stun
         time: 6
         type: Remove
       - !type:GenericStatusEffect
         conditions:
-          - !type:ReagentThreshold
-            min: 10
+        - !type:ReagentThreshold
+          min: 10
         key: KnockedDown
         time: 6
         type: Remove
+      - !type:GenericStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          min: 10
+        key: ForcedSleep
+        component: ForcedSleeping
+        refresh: false
+        type: Remove
     Medicine:
       metabolismRate: 0.25
       effects:
@@ -217,7 +234,7 @@
           - !type:ReagentThreshold
             min: 10
           damage:
-            types:
+            groups:
               Brute: -4
               Burn: -4
         # stops CMOs from hypoing you with lexorin and sec from filling you with tranq shells