Merge branch 'CleverRaven:master' into spawn_in_shelter

CleverRaven · Nov 1, 2024 · 3530b92 · 3530b92
2 parents 7232392 + f348de9
commit 3530b92
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 584 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -10,7 +10,7 @@
     "coverage": 40,
     "comfort": 5,
     "floor_bedding_warmth": 1000,
-    "required_str": -1,
+    "required_str": 12,
     "deconstruct": { "items": [ { "item": "mattress", "count": 1 } ], "furn_set": "f_bed_frame" },
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
     "bash": {

diff --git a/data/mods/DinoMod/DESIGN.md b/data/mods/DinoMod/DESIGN.md
@@ -34,7 +34,7 @@ monstergroups folder:
 * fungi.json is where you add the fungal variant to spawn in fungal locations
 * lab.json is where you add the dinosaur if it is not native to North America
 * misc.json has all kinds of odd lists, especially for safe, scavenging, and underground dinos
-* monstergroups_egg.json is where you add the hatchling to be spawned from its own egg, and from random eggs
+* monstergroups_egg.json is where you add the hatchling to be spawned from random eggs, if they are North American natives
 * wilderness.json is where your dino will be spawned in natural settings. Forests should stay safe.
 * zinosaur.json  adds the zombified version to zombie spawn lists and is where the zombie upgrade groups go for now