Skip to content

Commit

Permalink
Merge pull request CleverRaven#68813 from GuardianDll/patch-1
Browse files Browse the repository at this point in the history
Small bad density list cleanup
  • Loading branch information
Maleclypse authored Oct 23, 2023
2 parents 1135aae + 439619b commit 446e59e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
4 changes: 2 additions & 2 deletions data/json/items/ammo/8x40mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"ascii_picture": "8mm_caseless",
"description": "An 8x40mm caseless round. Proprietary ammunition for Rivtech firearms.",
"weight": "12 g",
"volume": "230 ml",
"volume": "150 ml",
"price": 225,
"price_postapoc": 8000,
"flags": [ "IRREPLACEABLE_CONSUMABLE", "CASELESS_ROUNDS" ],
"material": [ "plastic", "powder" ],
"material": [ { "type": "steel", "portion": 33 }, { "type": "plastic", "portion": 50 }, { "type": "powder", "portion": 17 } ],
"symbol": "=",
"color": "pink",
"count": 40,
Expand Down
15 changes: 0 additions & 15 deletions data/mods/TEST_DATA/known_bad_density.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{
"type": "test_data",
"known_bad": [
"8mm_inc",
"meal_chitin_piece",
"blood",
"curry_meat",
Expand Down Expand Up @@ -40,7 +39,6 @@
"bot_gasbomb_hack",
"sandwich_reuben_wheat_free",
"tailoring_pattern_set",
"8mm_jhp",
"young_koji",
"k_gambeson_vest_xs",
"candy2",
Expand Down Expand Up @@ -76,7 +74,6 @@
"yeast",
"alloy_plate",
"candy3",
"kevlar_chainmail_suit",
"a180mag4",
"bolt_makeshift",
"liquid_soap",
Expand All @@ -90,7 +87,6 @@
"material_zincite",
"small_lcd_screen",
"biscuit",
"xl_kevlar_chainmail_hauberk",
"koji",
"light_minus_disposable_cell",
"fire_piston",
Expand Down Expand Up @@ -241,7 +237,6 @@
"pumpkin_yeast_bread",
"bandages",
"dried_salad",
"8mm_caseless",
"lung_provence",
"portal",
"dandelion_tea",
Expand All @@ -250,7 +245,6 @@
"bamboo_cooked",
"throwing_stick",
"cookbook_sushi",
"xl_kevlar_chainmail_suit",
"willowbark",
"soap",
"young_yeast",
Expand Down Expand Up @@ -302,7 +296,6 @@
"xl_k_gambeson_loose",
"mre_accessory",
"candy3gator",
"kevlar_chainmail_suit_xs",
"bolt_simple_small_game",
"raw_bamboo",
"brew_whiskey",
Expand Down Expand Up @@ -385,7 +378,6 @@
"human_cracklins",
"acid_spray",
"protein_powder",
"8mm_bootleg",
"hellfire_stew",
"large_stomach_sealed",
"book_nonf_hard_dodge_tlwd",
Expand Down Expand Up @@ -440,7 +432,6 @@
"hardtack",
"textbook_arthropod",
"vitamins",
"chem_match_head_powder",
"unfinished_charcoal",
"con_milk",
"venom_paralytic",
Expand Down Expand Up @@ -487,7 +478,6 @@
"pistachio",
"nachosvc",
"mortar_build",
"inj_vitb",
"clay_lump",
"manual_cutting",
"pepto",
Expand All @@ -502,7 +492,6 @@
"migo_bio_gun",
"cannonball_4lb",
"test_weldtank",
"8mm_civilian",
"chem_glycerol",
"xl_k_gambeson_pants",
"test_gum",
Expand Down Expand Up @@ -555,7 +544,6 @@
"amplifier_head",
"sarcophagus_access_code",
"mutant_blood",
"8mm_fmj",
"chestnut",
"flintlock_shot",
"xedra_microphone",
Expand Down Expand Up @@ -590,7 +578,6 @@
"flavored_bonemeal_tablet",
"chaw",
"moisturizer",
"8mm_hvp",
"load_bearing_vest",
"deluxe_beansnrice",
"broken_lab_security_drone_GR",
Expand Down Expand Up @@ -708,7 +695,6 @@
"porkbelly",
"huge_atomic_battery_cell",
"airhorn",
"kevlar_chainmail_hauberk_xs",
"corpse_scorched",
"mortar_adobe",
"chilidogs_wheat_free",
Expand All @@ -727,7 +713,6 @@
"soapy_water",
"camera_control",
"material_quicklime",
"kevlar_chainmail_hauberk",
"art_urchin",
"meat_fried",
"k_gambeson",
Expand Down

0 comments on commit 446e59e

Please sign in to comment.