From e3fa87b97390463e47560591cd8b1e029c25915d Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:51:04 +0200 Subject: [PATCH 1/3] petri dish --- .../Locations_MapExtras/locations.json | 1 + data/json/itemgroups/science_and_tech.json | 1 + data/json/itemgroups/tools.json | 1 + data/json/items/containers/containers.json | 29 +++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 9722bc42458c2..6ec330c228e30 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2121,6 +2121,7 @@ { "item": "stopcock", "prob": 3 }, { "item": "beaker", "prob": 5 }, { "item": "gradcylinder", "prob": 5 }, + { "item": "petri_dish", "prob": 5 }, { "item": "rack_test_tube", "prob": 5 }, { "item": "stand_ring", "prob": 5 }, { "item": "stand_ring_clamps", "prob": 5 }, diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index 08f2c4477a12b..466fd3361ade9 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -227,6 +227,7 @@ [ "microcentrifuge", 3 ], [ "beaker", 5 ], [ "gradcylinder", 5 ], + { "item": "petri_dish", "prob": 5 }, [ "flask_glass", 2 ], [ "rack_test_tube", 7 ], [ "rack_test_tube_micro", 7 ], diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 138c0d3dd93db..01f14953f8867 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -758,6 +758,7 @@ [ "stopcock", 3 ], [ "beaker", 5 ], [ "gradcylinder", 5 ], + { "item": "petri_dish", "prob": 5 }, [ "rack_test_tube", 5 ], [ "test_tube_micro", 5 ], [ "rack_test_tube_micro", 5 ], diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index 9a2cb2519c64c..82fd74f3deec5 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -2265,6 +2265,35 @@ "use_action": [ "HEAT_LIQUID_ITEMS" ], "flags": [ "COLLAPSE_CONTENTS" ] }, + { + "id": "petri_dish", + "type": "GENERIC", + "category": "container", + "name": { "str": "petri dish", "str_pl": "petri dishes" }, + "description": "A 9mm petri dish, commonly used in labs dealing with microorganisms or tissue samples.", + "weight": "25 g", + "volume": "145 ml", + "longest_side": "96 mm", + "price": "4 USD", + "price_postapoc": "2 cent", + "material": [ "glass" ], + "symbol": "u", + "color": "light_cyan", + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "watertight": true, + "open_container": true, + "max_contains_volume": "93 ml", + "max_contains_weight": "450 g" + } + ], + "qualities": [ [ "BOIL", 1 ], [ "CONTAIN", 1 ] ], + "use_action": [ "HEAT_LIQUID_ITEMS" ], + "flags": [ "COLLAPSE_CONTENTS" ], + "//": "Based on https://www.amazon.com/dp/B074Y6GD2R" + }, { "id": "flask_hip", "type": "GENERIC", From 0a210fa641630689bd916c6cac001dcc0b86e87d Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 27 Jul 2024 18:56:42 +0200 Subject: [PATCH 2/3] Update containers.json --- data/json/items/containers/containers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index 82fd74f3deec5..b99854bd2ae06 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -2269,8 +2269,8 @@ "id": "petri_dish", "type": "GENERIC", "category": "container", - "name": { "str": "petri dish", "str_pl": "petri dishes" }, - "description": "A 9mm petri dish, commonly used in labs dealing with microorganisms or tissue samples.", + "name": { "str": "Petri dish", "str_pl": "Petri dishes" }, + "description": "A 9mm Petri dish, commonly used in labs dealing with microorganisms or tissue samples.", "weight": "25 g", "volume": "145 ml", "longest_side": "96 mm", From 3e469d98bb64a1007e21151efd604b9415c64035 Mon Sep 17 00:00:00 2001 From: Karol1223 <68503002+Karol1223@users.noreply.github.com> Date: Sat, 27 Jul 2024 19:08:20 +0200 Subject: [PATCH 3/3] dictionary --- tools/spell_checker/dictionary.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index b3ecd9c0d9a19..6d24de5b40d5f 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -4640,6 +4640,7 @@ peto petos petpack petpacks +Petri petrichor peytral PF