Merge branch 'I-am-Erk:master' into tower-maps

I-am-Erk · Jan 10, 2025 · bee0f2c · bee0f2c
2 parents 142ab08 + 19ab3e7
commit bee0f2c
Show file tree

Hide file tree

Showing 128 changed files with 34 additions and 5 deletions.
diff --git a/doc/tools/common_tools.md b/doc/tools/common_tools.md
@@ -31,6 +31,18 @@ Please refer [main CDDA documentation](https://github.com/CleverRaven/Cataclysm-
 
 // TODO: Add some info about slice_variants.py
 
+### ultica_build_flags.py
+
+This script uses GIMP to take in flag-like textures in `scratch\UltimateCataclysm\items\flags` and create contextual versions of those same flags, specifically:
+- "postup", a drooped version for hanging flags on walls
+- "hoisted", a waving version for hanging flags on flagpoles
+- "", a crumpled version for a dropped flag variant item
+
+To run, install GIMP, put flag textures in the above directory (along with an `output` folder), and run ultica_build_flags.cmd
+Flag textures should be offset by 2x5 and have a size of 28x18 to appear correctly
+Outputted flags must be moved manually to the appropriate `gfx` directory
+If script runtime is too slow, move unneeded flags from `scratch` folder
+
 ### unslice_multitile.py
 
 // TODO: Add some info about unslice_multitile.py
diff --git a/...MShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_abstract.png b/...MShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_abstract.png
diff --git a/...ShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_character.png b/...ShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_character.png
diff --git a/...ShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_landscape.png b/...ShockXotto+/pngs_small_20x20/items/painting/painting_var_painting_landscape.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/stethoscope.png b/gfx/MShockXotto+/pngs_small_20x20/items/stethoscope.png
diff --git a/gfx/MShockXotto+/pngs_tall_32x48/overlay/effects/overlay_effect_shattered.png b/gfx/MShockXotto+/pngs_tall_32x48/overlay/effects/overlay_effect_shattered.png
diff --git a/...MShockXotto+/pngs_tiles_32x32/item/plushies/teddy_bear_var_toy_plush_psheep.png b/...MShockXotto+/pngs_tiles_32x32/item/plushies/teddy_bear_var_toy_plush_psheep.png
diff --git a/...tto+/pngs_tiles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe.json b/...tto+/pngs_tiles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe.json
@@ -0,0 +1,10 @@
+{
+  "id": "mon_feral_dwarf_axe",
+  "fg": [
+    { "weight": 1, "sprite": "mon_feral_dwarf_axe_0" },
+    { "weight": 1, "sprite": "mon_feral_dwarf_axe_1" },
+    { "weight": 1, "sprite": "mon_feral_dwarf_axe_2" }
+  ],
+  "bg": [],
+  "rotates": false
+}
diff --git a/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_0.png b/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_0.png
diff --git a/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_1.png b/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_1.png
diff --git a/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_2.png b/...iles_32x32/mods/Magiclysm/monster/mon_feral_dwarf_axe/mon_feral_dwarf_axe_2.png
diff --git a/...Xotto+/pngs_tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe.json b/...Xotto+/pngs_tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe.json
@@ -0,0 +1,10 @@
+{
+  "id": "mon_feral_elf_pipe",
+  "fg": [
+    { "weight": 1, "sprite": "mon_feral_elf_pipe_0" },
+    { "weight": 1, "sprite": "mon_feral_elf_pipe_1" },
+    { "weight": 1, "sprite": "mon_feral_elf_pipe_2" }
+  ],
+  "bg": [],
+  "rotates": false
+}
diff --git a/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_0.png b/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_0.png
diff --git a/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_1.png b/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_1.png
diff --git a/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_2.png b/..._tiles_32x32/mods/Magiclysm/monster/mon_feral_elf_pipe/mon_feral_elf_pipe_2.png
diff --git a/gfx/UltimateCataclysm/layering.json b/gfx/UltimateCataclysm/layering.json
@@ -6,11 +6,8 @@
       "item_variants": [
         { "item": "american_flag", "layer": 90, "offset_x": 0, "offset_y": 0 },
         { "item": "national_flag", "layer": 90 },
-        {
-          "item": "lab_postit_bio",
-          "sprite": [ { "id": "postit_01", "weight": 1 }, { "id": "postit_02", "weight": 1 }, { "id": "postit_03", "weight": 1 } ],
-          "layer": 90
-        },
+        { "item": "pride_flag", "layer": 90 },
+        { "item": "lab_postit_bio", "sprite": [ { "id": "postit_01", "weight": 1 }, { "id": "postit_02", "weight": 1 }, { "id": "postit_03", "weight": 1 } ], "layer": 90 },
         {
           "item": "lab_postit_blob",
           "sprite": [ { "id": "postit_04", "weight": 1 }, { "id": "postit_05", "weight": 1 }, { "id": "postit_06", "weight": 1 } ],

diff --git a/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag.png b/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag_hoisted.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag_hoisted.png
diff --git a/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag_postup.png b/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_agender_pride_flag_postup.png
diff --git a/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag.png b/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag.png
diff --git a/...m/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag_hoisted.png b/...m/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag_hoisted.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag_postup.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_aromantic_pride_flag_postup.png
diff --git a/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag.png b/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag_hoisted.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag_hoisted.png
diff --git a/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag_postup.png b/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_asexual_pride_flag_postup.png
diff --git a/...imateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag.png b/...imateCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag.png
diff --git a/...aclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag_hoisted.png b/...aclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag_hoisted.png
diff --git a/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag_postup.png b/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_bear_pride_flag_postup.png
diff --git a/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag.png b/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag_hoisted.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag_hoisted.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag_postup.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_bisexual_pride_flag_postup.png
diff --git a/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag.png b/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag.png
diff --git a/...pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag_hoisted.png b/...pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag_hoisted.png
diff --git a/.../pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag_postup.png b/.../pngs_normal_32x32/items/flags/pride_flag_var_genderfluid_pride_flag_postup.png
diff --git a/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag.png b/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag.png
diff --git a/...pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag_hoisted.png b/...pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag_hoisted.png
diff --git a/.../pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag_postup.png b/.../pngs_normal_32x32/items/flags/pride_flag_var_genderqueer_pride_flag_postup.png
diff --git a/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag.png b/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag_hoisted.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag_hoisted.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag_postup.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_intersex_pride_flag_postup.png
diff --git a/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag.png b/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag.png
diff --git a/...s_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag_hoisted.png b/...s_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag_hoisted.png
diff --git a/...gs_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag_postup.png b/...gs_normal_32x32/items/flags/pride_flag_var_labrys_lesbian_pride_flag_postup.png
diff --git a/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag.png b/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag_hoisted.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag_hoisted.png
diff --git a/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag_postup.png b/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_leather_pride_flag_postup.png
diff --git a/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag.png b/...teCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag_hoisted.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag_hoisted.png
diff --git a/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag_postup.png b/...lysm/pngs_normal_32x32/items/flags/pride_flag_var_lesbian_pride_flag_postup.png
diff --git a/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag.png b/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag.png
diff --git a/...m/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag_hoisted.png b/...m/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag_hoisted.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag_postup.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_nonbinary_pride_flag_postup.png
diff --git a/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag.png b/...Cataclysm/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag.png
diff --git a/...m/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag_hoisted.png b/...m/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag_hoisted.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag_postup.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_pansexual_pride_flag_postup.png
diff --git a/...ataclysm/pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag.png b/...ataclysm/pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag.png
diff --git a/.../pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag_hoisted.png b/.../pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag_hoisted.png
diff --git a/...m/pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag_postup.png b/...m/pngs_normal_32x32/items/flags/pride_flag_var_polysexual_pride_flag_postup.png
diff --git a/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag.png b/...eCataclysm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag.png
diff --git a/...sm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag_hoisted.png b/...sm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag_hoisted.png
diff --git a/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag_postup.png b/...ysm/pngs_normal_32x32/items/flags/pride_flag_var_progress_pride_flag_postup.png
diff --git a/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag.png b/...taclysm/pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag.png
diff --git a/...pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag_hoisted.png b/...pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag_hoisted.png
diff --git a/.../pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag_postup.png b/.../pngs_normal_32x32/items/flags/pride_flag_var_transgender_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag.png b/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag_hoisted.png b/...imateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag_hoisted.png
diff --git a/...timateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag_postup.png b/...timateCataclysm/items/flags/output/pride_flag_var_agender_pride_flag_postup.png
diff --git a/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag.png b/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag.png
diff --git a/...ateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag_hoisted.png b/...ateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag_hoisted.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag_postup.png b/...mateCataclysm/items/flags/output/pride_flag_var_aromantic_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag.png b/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag_hoisted.png b/...imateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag_hoisted.png
diff --git a/...timateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag_postup.png b/...timateCataclysm/items/flags/output/pride_flag_var_asexual_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag.png b/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag.png
diff --git a/...UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag_hoisted.png b/...UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag_hoisted.png
diff --git a/.../UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag_postup.png b/.../UltimateCataclysm/items/flags/output/pride_flag_var_bear_pride_flag_postup.png
diff --git a/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag.png b/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag_hoisted.png b/...mateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag_hoisted.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag_postup.png b/...imateCataclysm/items/flags/output/pride_flag_var_bisexual_pride_flag_postup.png
diff --git a/.../UltimateCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag.png b/.../UltimateCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag.png
diff --git a/...eCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag_hoisted.png b/...eCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag_hoisted.png
diff --git a/...teCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag_postup.png b/...teCataclysm/items/flags/output/pride_flag_var_genderfluid_pride_flag_postup.png
diff --git a/.../UltimateCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag.png b/.../UltimateCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag.png
diff --git a/...eCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag_hoisted.png b/...eCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag_hoisted.png
diff --git a/...teCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag_postup.png b/...teCataclysm/items/flags/output/pride_flag_var_genderqueer_pride_flag_postup.png
diff --git a/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag.png b/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag_hoisted.png b/...mateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag_hoisted.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag_postup.png b/...imateCataclysm/items/flags/output/pride_flag_var_intersex_pride_flag_postup.png
diff --git a/...timateCataclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag.png b/...timateCataclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag.png
diff --git a/...taclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag_hoisted.png b/...taclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag_hoisted.png
diff --git a/...ataclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag_postup.png b/...ataclysm/items/flags/output/pride_flag_var_labrys_lesbian_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag.png b/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag_hoisted.png b/...imateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag_hoisted.png
diff --git a/...timateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag_postup.png b/...timateCataclysm/items/flags/output/pride_flag_var_leather_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag.png b/scratch/UltimateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag_hoisted.png b/...imateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag_hoisted.png
diff --git a/...timateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag_postup.png b/...timateCataclysm/items/flags/output/pride_flag_var_lesbian_pride_flag_postup.png
diff --git a/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag.png b/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag.png
diff --git a/...ateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag_hoisted.png b/...ateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag_hoisted.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag_postup.png b/...mateCataclysm/items/flags/output/pride_flag_var_nonbinary_pride_flag_postup.png
diff --git a/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag.png b/...ch/UltimateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag.png
diff --git a/...ateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag_hoisted.png b/...ateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag_hoisted.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag_postup.png b/...mateCataclysm/items/flags/output/pride_flag_var_pansexual_pride_flag_postup.png
diff --git a/...h/UltimateCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag.png b/...h/UltimateCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag.png
diff --git a/...teCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag_hoisted.png b/...teCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag_hoisted.png
diff --git a/...ateCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag_postup.png b/...ateCataclysm/items/flags/output/pride_flag_var_polysexual_pride_flag_postup.png
diff --git a/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag.png b/...tch/UltimateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag.png
diff --git a/...mateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag_hoisted.png b/...mateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag_hoisted.png
diff --git a/...imateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag_postup.png b/...imateCataclysm/items/flags/output/pride_flag_var_progress_pride_flag_postup.png
diff --git a/.../UltimateCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag.png b/.../UltimateCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag.png
diff --git a/...eCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag_hoisted.png b/...eCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag_hoisted.png
diff --git a/...teCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag_postup.png b/...teCataclysm/items/flags/output/pride_flag_var_transgender_pride_flag_postup.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_agender_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_agender_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_aromantic_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_aromantic_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_asexual_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_asexual_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_bear_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_bear_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_bisexual_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_bisexual_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_genderfluid_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_genderfluid_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_genderqueer_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_genderqueer_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_intersex_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_intersex_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_labrys_lesbian_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_labrys_lesbian_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_leather_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_leather_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_lesbian_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_lesbian_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_nonbinary_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_nonbinary_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_pansexual_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_pansexual_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_polysexual_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_polysexual_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_progress_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_progress_pride_flag.png
diff --git a/scratch/UltimateCataclysm/items/flags/pride_flag_var_transgender_pride_flag.png b/scratch/UltimateCataclysm/items/flags/pride_flag_var_transgender_pride_flag.png