mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Fixes virology goals completing even if you delivered less than 15u (#24749)
* fix * removes unnecessary else
This commit is contained in:
@@ -101,16 +101,21 @@ GLOBAL_LIST_EMPTY(archived_virology_goals)
|
||||
var/property = properties[goal_property]
|
||||
if(property != goal_property_value)
|
||||
continue
|
||||
var/found_goal_symptom = FALSE
|
||||
for(var/datum/symptom/S in D.symptoms)
|
||||
if(!goal_symptom)
|
||||
return
|
||||
if(S.type != goal_symptom)
|
||||
continue
|
||||
delivered_amount += BL.volume
|
||||
if(delivered_amount >= delivery_goal)
|
||||
completed = TRUE
|
||||
check_total_virology_goals_completion()
|
||||
return TRUE
|
||||
found_goal_symptom = TRUE
|
||||
break
|
||||
if(!found_goal_symptom)
|
||||
return
|
||||
delivered_amount += BL.volume
|
||||
if(delivered_amount >= delivery_goal)
|
||||
completed = TRUE
|
||||
check_total_virology_goals_completion()
|
||||
return TRUE
|
||||
|
||||
/datum/virology_goal/virus
|
||||
name = "Specific Viral Sample Request (Non-Stealth)"
|
||||
@@ -174,11 +179,11 @@ GLOBAL_LIST_EMPTY(archived_virology_goals)
|
||||
var/datum/symptom/SY = locate(S) in D.symptoms
|
||||
if(!SY)
|
||||
return
|
||||
delivered_amount += BL.volume
|
||||
if(delivered_amount >= delivery_goal)
|
||||
completed = TRUE
|
||||
check_total_virology_goals_completion()
|
||||
return TRUE
|
||||
delivered_amount += BL.volume
|
||||
if(delivered_amount >= delivery_goal)
|
||||
completed = TRUE
|
||||
check_total_virology_goals_completion()
|
||||
return TRUE
|
||||
|
||||
/datum/virology_goal/virus/stealth
|
||||
name = "Specific Viral Sample Request (Stealth)"
|
||||
|
||||
Reference in New Issue
Block a user