diff --git a/code/modules/autowiki/pages/fishing.dm b/code/modules/autowiki/pages/fishing.dm index 57ce95712fd..8dfd661cf15 100644 --- a/code/modules/autowiki/pages/fishing.dm +++ b/code/modules/autowiki/pages/fishing.dm @@ -50,7 +50,7 @@ "name" = full_capitalize(escape_value(fish::name)), "icon" = filename, "description" = description, - "size_weight" = "[fish::average_size]cm / [fish::average_weight]g", + "size_weight" = "[fish::average_size] cm / [fish::average_weight] kiloclam", "fluid" = escape_value(fish::required_fluid_type), "temperature" = "Doesn't matter", "stable_population" = fish::stable_population, diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 4906f97ba30..4cbd21dc35f 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -138,9 +138,9 @@ GLOBAL_LIST_INIT(fish_compatible_fluid_types, list( /// The maximum size this fish can reach, calculated the first time update_size_and_weight() is called. var/maximum_size - /// Weight in grams. Null until update_size_and_weight is called. Grind results scale with it. Don't think too hard how a trout could fit in a blender. + /// Weight in "kiloclam". Null until update_size_and_weight is called. Grind results scale with it. Don't think too hard how a trout could fit in a blender. var/weight - /// Average weight for this fish type in grams + /// Average weight for this fish type in "kiloclam" var/average_weight = 1000 /// Temporarily stores the new weight of the fish from randomize_size_and_weight() to be used by update_size_weight() later, so that it can be deferred. var/temp_weight @@ -549,7 +549,7 @@ GLOBAL_LIST_INIT(fish_compatible_fluid_types, list( if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISH) || HAS_TRAIT(loc, TRAIT_EXAMINE_FISH)) . += span_notice("[p_theyre(TRUE)] [size] cm long.") - . += span_notice("[p_they(TRUE)] weighs [weight] g.") + . += span_notice("[p_they(TRUE)] weighs [weight] [span_tooltip("the standard unit of measurement for space age fish", "kiloclam")].") if(HAS_TRAIT(src, TRAIT_FISH_GENEGUNNED)) . += span_warning("[p_theyve(TRUE)] been edited by a fish genegun. [p_they(TRUE)]'ll die if edited again.") diff --git a/tgui/packages/tgui/interfaces/FishAnalyzer.tsx b/tgui/packages/tgui/interfaces/FishAnalyzer.tsx index ebd1957465b..76912135539 100644 --- a/tgui/packages/tgui/interfaces/FishAnalyzer.tsx +++ b/tgui/packages/tgui/interfaces/FishAnalyzer.tsx @@ -142,10 +142,10 @@ const FishItem = (props) => { /> - {fish.fish_weight}g + {fish.fish_weight} kiloclam - {fish.fish_size}cm + {fish.fish_size} cm diff --git a/tgui/packages/tgui/interfaces/FishCatalog.tsx b/tgui/packages/tgui/interfaces/FishCatalog.tsx index deb7d83d97d..24f437c40ae 100644 --- a/tgui/packages/tgui/interfaces/FishCatalog.tsx +++ b/tgui/packages/tgui/interfaces/FishCatalog.tsx @@ -92,7 +92,7 @@ export const FishCatalog = (props) => { {currentFish.size} cm - {currentFish.weight} g + {currentFish.weight} kiloclam {currentFish.beauty}