Merge branch 'master' into Dogtags

DeltaV-Station · Nov 27, 2024 · 9fefc87 · 9fefc87
2 parents bd44933 + 648b6af
commit 9fefc87
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 86 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: DebugOk
-  changes:
-  - message: Enabled gamerule voting on periapsis
-    type: Tweak
-  - message: Enabled map voting on periapsis
-    type: Tweak
-  id: 211
-  time: '2024-01-19T22:33:21.0000000+00:00'
 - author: DebugOk
   changes:
   - message: Added gridinv, sorry.
@@ -3776,3 +3768,10 @@
   id: 710
   time: '2024-11-26T18:19:14.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2292
+- author: Stop-Signs
+  changes:
+  - message: psych chems are no longer stronger nocturine
+    type: Tweak
+  id: 711
+  time: '2024-11-27T20:22:30.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2302
diff --git a/Resources/Prototypes/_CD/Reagents/medicine.yml b/Resources/Prototypes/_CD/Reagents/medicine.yml
@@ -206,36 +206,36 @@
         damage:
           types:
             Poison: 0.5
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Tranquinase # conflicts with many other meds
-          min: 2.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.4
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Soretizone # conflicts with many other meds
-          min: 3.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.3
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Agonolexyne # conflicts with many other meds
-          min: 0.25
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.3
+     #- !type:GenericStatusEffect
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Tranquinase # conflicts with many other meds
+         #min: 2.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.4
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Soretizone # conflicts with many other meds
+         #min: 3.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.3
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Agonolexyne # conflicts with many other meds
+         #min: 0.25
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.3
       - !type:PopupMessage
         type: Local
         visualType: Medium
@@ -344,15 +344,15 @@
         conditions:
         - !type:ReagentThreshold
           min: 16.5
-      - !type:GenericStatusEffect
-        conditions:
-        - !type:ReagentThreshold
-          min: 20.0
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-        probability: 0.1
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #conditions:
+       #- !type:ReagentThreshold
+         #min: 20.0
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+       #probability: 0.1
       - !type:HealthChange # poisons you if you take way too much
         conditions:
         - !type:ReagentThreshold
@@ -525,25 +525,25 @@
           - "reagent-effect-painkiller-normal3"
           - "reagent-effect-painkiller-normal4"
         probability: 0.085
-      - !type:GenericStatusEffect
-        probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          min: 14.5 # overdose knocks you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-      - !type:GenericStatusEffect
-        probability: 0.08
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Stubantazine
-          min: 5 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.1
+       #conditions:
+       #- !type:ReagentThreshold
+         #min: 14.5 # overdose knocks you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.08
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Stubantazine
+         #min: 5 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
       - !type:AdjustReagent
         conditions:
         - !type:ReagentThreshold
@@ -592,26 +592,26 @@
           - "reagent-effect-painkiller-strong5"
           - "reagent-effect-painkiller-strong6"
         probability: 0.1
-      - !type:GenericStatusEffect
-        probability: 0.1
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Stubantazine
-          min: 4 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
-      - !type:GenericStatusEffect
-        probability: 0.15
-        conditions:
-        - !type:ReagentThreshold
-          reagent: Soretizone
-          min: 2 # taking with other painkillers will knock you out
-        key: ForcedSleep
-        component: ForcedSleeping
-        refresh: false
-        type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.1
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Stubantazine
+         #min: 4 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
+     #- !type:GenericStatusEffect # DeltaV - Removed all psych med forcesleeps
+       #probability: 0.15
+       #conditions:
+       #- !type:ReagentThreshold
+         #reagent: Soretizone
+         #min: 2 # taking with other painkillers will knock you out
+       #key: ForcedSleep
+       #component: ForcedSleeping
+       #refresh: false
+       #type: Add
       - !type:AdjustReagent
         conditions:
         - !type:ReagentThreshold