Merge branch 'master' into live

arkutils · Mar 3, 2024 · a9890c0 · a9890c0
2 parents 12ce41c + 4e66d43
commit a9890c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Pipfile b/Pipfile
@@ -31,7 +31,7 @@ psutil = "~=5.9.0"
 python_version = "3.10"
 
 [scripts]
-check = "pipenv check -i 39253 -i 39621 -i 41002 -i 50916 -i 51457 -i 61416"
+check = "pipenv check -i 39253 -i 39621 -i 41002 -i 50916 -i 51457 -i 61416 -i 61893"
 tests = "pytest --cov=. --cov-report=xml --no-cov-on-fail -m 'not uses_copyright_material'"
 tests-nogame = "pytest --cov=. --cov-report=xml --no-cov-on-fail -m 'not uses_copyright_material and not requires_game'"
 tests-nocov = "pytest -m 'not uses_copyright_material'"

diff --git a/config/overrides.yaml b/config/overrides.yaml
@@ -1912,6 +1912,9 @@ species:
             Unused: true
 
     # Tameability overrides for wiki.species
+    /Game/PrimalEarth/Dinos/Rhyniognatha/Rhynio_Character_BP:
+        taming_method: awake
+
     /Game/Aberration/Dinos/Nameless/Xenomorph_Character_BP:
         taming_method: none