mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
Merge pull request #3434 from CHOMPStation2/upstream-merge-11822
[MIRROR] Fixes double counting of implants on scanner printout
This commit is contained in:
@@ -219,7 +219,7 @@
|
||||
if(H.reagents.reagent_list.len >= 1)
|
||||
for(var/datum/reagent/R in H.reagents.reagent_list)
|
||||
reagentData[++reagentData.len] = list(
|
||||
"name" = R.name,
|
||||
"name" = R.name,
|
||||
"amount" = R.volume,
|
||||
"overdose" = (R.overdose && R.volume > R.overdose) ? TRUE : FALSE,
|
||||
)
|
||||
@@ -291,7 +291,7 @@
|
||||
|
||||
if(istype(E, /obj/item/organ/external/chest) && H.is_lung_ruptured())
|
||||
organData["lungRuptured"] = 1
|
||||
|
||||
|
||||
for(var/datum/wound/W in E.wounds)
|
||||
if(W.internal)
|
||||
organData["internalBleeding"] = 1
|
||||
@@ -479,7 +479,7 @@
|
||||
var/obj/item/device/nif/N = I //VOREStation Add: NIFs
|
||||
if(istype(I) && I.known_implant)
|
||||
imp += "[I] implanted:"
|
||||
if(istype(N) && N.known_implant) //VOREStation Add: NIFs
|
||||
else if(istype(N) && N.known_implant) //VOREStation Add: NIFs
|
||||
imp += "[N] implanted:"
|
||||
else
|
||||
unknown_body++
|
||||
|
||||
Reference in New Issue
Block a user