diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index cdb7948bdd..bd76a0330e 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -82,7 +82,7 @@ if(dish.growth >= 50) var/list/effects[0] for (var/datum/disease2/effectholder/e in dish.virus2.effects) - effects.Add(list(list("name" = (dish.analysed ? e.effect.name : "Unknown"), "stage" = (e.stage), "reference" = "\ref[e]"), "badness" = e.effect.badness)) + effects.Add(list(list("name" = (dish.analysed ? e.effect.name : "Unknown"), "stage" = (e.stage), "reference" = "\ref[e]", "badness" = e.effect.badness))) data["effects"] = effects else data["info"] = "Insufficient cell growth for gene splicing." diff --git a/tgui/packages/tgui/interfaces/DiseaseSplicer.tsx b/tgui/packages/tgui/interfaces/DiseaseSplicer.tsx index f962aa1628..4a8ff4b6ac 100644 --- a/tgui/packages/tgui/interfaces/DiseaseSplicer.tsx +++ b/tgui/packages/tgui/interfaces/DiseaseSplicer.tsx @@ -45,7 +45,7 @@ export const DiseaseSplicer = (props) => { const DiseaseSplicerVirusDish = (props) => { const { act, data } = useBackend(); - const { dish_inserted, effects, info, growth, affected_species } = data; + const { dish_inserted, effects = [], info, growth, affected_species } = data; return (
{ ) : ( <>
- {(effects && - effects.map((effect) => ( + {effects!.length > 0 ? ( + effects!.map((effect) => ( ({effect.stage}) {effect.name}{' '} {effect.badness > 1 ? 'Dangerous!' : null} - ))) || No virus sample loaded.} + )) + ) : ( + No virus sample loaded. + )}
{!affected_species || !affected_species.length @@ -98,8 +101,8 @@ const DiseaseSplicerVirusDish = (props) => { CAUTION: Reverse engineering will destroy the viral sample. - {effects && - effects.map((e) => ( + {!!effects!.length && + effects!.map((e) => (