Merge branch 'CleverRaven:master' into master

AnotherSeawhite · Apr 4, 2024 · c6b9fdc · c6b9fdc
2 parents 46d1f12 + e9f4fbd
commit c6b9fdc
Show file tree

Hide file tree

Showing 214 changed files with 3,567 additions and 5,046 deletions.
diff --git a/.github/workflows/format_emscripten.yml b/.github/workflows/format_emscripten.yml
@@ -48,7 +48,7 @@ jobs:
         run: ls -a
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.TX_PR_CREATOR }}
           commit-message: JSON linter gh-pages file update

diff --git a/.github/workflows/pull-translations.yml b/.github/workflows/pull-translations.yml
@@ -44,7 +44,7 @@ jobs:
       - name: "Update stats"
         run: ./lang/update_stats.sh
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Routine i18n updates on ${{ steps.current-date.outputs.formattedTime }}
           token: ${{ secrets.TX_PR_CREATOR }}

diff --git a/.github/workflows/toc.yml b/.github/workflows/toc.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: npx doctoc doc/JSON_INFO.md --github
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Update the table of contents
           branch: update-toc

diff --git a/.github/workflows/update-tilesets.yml b/.github/workflows/update-tilesets.yml
@@ -35,7 +35,7 @@ jobs:
           make tools/format/json_formatter.cgi
           find gfx/ -name "*.json" -print0 | xargs -0 -L 1 -P $(nproc) tools/format/json_formatter.cgi || exit 0
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: |
             Routine tileset updates on ${{ steps.current-date.outputs.formattedTime }}

diff --git a/.github/workflows/weekly-changelog.yml b/.github/workflows/weekly-changelog.yml
@@ -33,7 +33,7 @@ jobs:
           echo "date=$( date +"%Y-%m-%d" -d $CURR_DATE )" >> $GITHUB_OUTPUT
           echo "old_date=$LAST_WEEK" >> $GITHUB_OUTPUT
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Weekly Changelog ${{ steps.getting-changes.outputs.old_date }} to ${{ steps.getting-changes.outputs.date }}
           committer: David Seguin <[email protected]>

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -1120,7 +1120,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "60 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ],
     "pre_terrain": "t_pit_shallow",
@@ -1299,7 +1299,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_pit_shallow",
@@ -1313,7 +1313,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_sconc_wall_halfway",
@@ -1354,7 +1354,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_reb_cage",
@@ -1368,7 +1368,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -1382,7 +1382,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "rope_6", 8 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -1410,7 +1410,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_reb_cage",
@@ -1424,7 +1424,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_column_halfway",
@@ -1465,7 +1465,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 5 ] ],
     "time": "120 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_ov_smreb_cage",
@@ -1493,7 +1493,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ],
     "pre_terrain": "t_ov_reb_cage",
@@ -1507,7 +1507,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "180 m",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ],
     "pre_terrain": "t_strconc_floor_halfway",
@@ -1997,7 +1997,7 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "180 m",
     "//": "The frame is used to keep the shape of the hole until the concrete is solid",
-    "tools": [ [ [ "con_mix", 50 ] ], [ [ "frame_wood", -1 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ], [ [ "frame_wood", -1 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 4 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_sconc_wall_halfway",
@@ -2011,7 +2011,7 @@
     "required_skills": [ [ "fabrication", 6 ] ],
     "time": "120 m",
     "//": "The frame is used to keep the shape of the hole until the concrete is solid",
-    "tools": [ [ [ "con_mix", 50 ] ], [ [ "frame_wood", -1 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ], [ [ "frame_wood", -1 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
     "pre_terrain": "t_strconc_wall_halfway",
@@ -2732,7 +2732,7 @@
     "qualities": [ [ { "id": "SAW_M", "level": 1 } ], [ { "id": "SCREW", "level": 1 } ], [ { "id": "SMOOTH", "level": 2 } ] ],
     "using": [ [ "welding_standard", 500 ], [ "welding_standard", 500 ] ],
     "//1": "lots of 1 meter square metal sheet and plating so very big weld",
-    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 50 ] ] ],
     "components": [
       [ [ "hdframe", 1 ] ],
       [ [ "steel_lump", 2 ], [ "steel_chunk", 8 ], [ "scrap", 40 ] ],
@@ -4947,7 +4947,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
-    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ],
     "pre_special": [ "check_empty", "check_stable", "check_up_OK", "check_nofloor_above" ],
@@ -4963,7 +4963,7 @@
     "category": "DIG",
     "required_skills": [ [ "fabrication", 3 ] ],
     "time": "150 m",
-    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "tools": [ [ [ "concrete_mix_tool", 125 ] ] ],
     "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
     "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ],
     "pre_special": [ "check_empty", "check_stable", "check_up_OK", "check_nofloor_above", "check_ramp_high" ],

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -3873,18 +3873,6 @@
     "//": "Mood debuff is handled separately by bad_food_mood_debuff EoC.",
     "rating": "bad"
   },
-  {
-    "type": "effect_type",
-    "id": "genetics_damaged",
-    "name": [ "Spent Phenotype", "Depleted Phenotype", "Bankrupt Phenotype" ],
-    "desc": [
-      "Mutation has left you with a persistent mild discomfort.  It seems harmless for now, but you can't predict if it'll get worse.",
-      "There's an enervating sense of dysmorphia throughout your whole body.  It waxes and wanes, but never quite goes away.  Mutating this much can't be good for you…",
-      "You're haunted by phantom pains across your entire body now.  Everything aches from an exhaustion that never seems to fade.  Any further mutation right now is very unlikely to have a happy ending."
-    ],
-    "max_intensity": 3,
-    "rating": "bad"
-  },
   {
     "type": "effect_type",
     "id": "hypovolemia",