diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index bffdb4af2b..3f17fe7299 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -164,6 +164,7 @@ /obj/machinery/body_scanconsole var/obj/machinery/bodyscanner/connected + var/known_implants = list(/obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking) var/delete var/temphtml name = "Body Scanner Console" @@ -265,25 +266,6 @@ if(!D.hidden[SCANNER]) dat += text("Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]
") - var/implnts = "" - for(var/obj/item/weapon/implant/I in occupant) - if(I in occupant) - if(I.implanted) - if(istype(I, /obj/item/weapon/implant/death_alarm)) - implnts += "death alarm
" - if(istype(I, /obj/item/weapon/implant/loyalty)) - implnts += "loyalty
" - if(istype(I, /obj/item/weapon/implant/chem)) - implnts += "chemical
" - if(istype(I, /obj/item/weapon/implant/tracking)) - implnts += "tracking
" - - if(implnts) - dat += "
" - dat += "Detected implants:
" - - dat += implnts - dat += "
" dat += "" dat += "" @@ -315,8 +297,14 @@ AN = "[e.broken_description]:" if(e.open) open = "Open:" - if(e.implants.len) - imp = "Unknown body present:" + var/unknown_body = 0 + for(var/I in e.implants) + if(is_type_in_list(I,known_implants)) + imp += "[I] implanted:" + else + unknown_body++ + if(unknown_body) + imp += "Unknown body present:" if(!AN && !open && !infected & !imp) AN = "None:" if(!(e.status & ORGAN_DESTROYED)) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 1f6b068cdd..a525adcf28 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -50,7 +50,7 @@ ..() /obj/item/weapon/implant/tracking - name = "tracking" + name = "tracking implant" desc = "Track with this." var/id = 1.0 @@ -219,7 +219,7 @@ Implant Specifics:
"} del(src) /obj/item/weapon/implant/chem - name = "chem" + name = "chemical implant" desc = "Injects things." allow_reagents = 1 @@ -283,7 +283,7 @@ the implant may become unstable and either pre-maturely inject the subject or si malfunction-- /obj/item/weapon/implant/loyalty - name = "loyalty" + name = "loyalty implant" desc = "Makes you loyal or such." get_data() diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm index 87ba9b3b44..84ce811804 100644 --- a/maps/tgstation2.dmm +++ b/maps/tgstation2.dmm @@ -7823,7 +7823,7 @@ "cUw" = (/obj/machinery/sleeper,/turf/simulated/shuttle/floor4,/area/shuttle/vox/station) "cUx" = (/obj/machinery/sleep_console,/turf/simulated/shuttle/floor4,/area/shuttle/vox/station) "cUy" = (/obj/machinery/bodyscanner,/turf/simulated/shuttle/floor4,/area/shuttle/vox/station) -"cUz" = (/obj/machinery/body_scanconsole,/turf/simulated/shuttle/floor4,/area/shuttle/vox/station) +"cUz" = (/obj/machinery/body_scanconsole{known_implants = list(/obj/item/weapon/implant/cortical)},/turf/simulated/shuttle/floor4,/area/shuttle/vox/station) "cUA" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/vox/station) "cUB" = (/obj/structure/shuttle/engine/heater,/turf/simulated/shuttle/plating,/area/shuttle/vox/station) "cUC" = (/obj/structure/rack,/obj/item/clothing/tie/storage/black_vest,/obj/item/clothing/suit/space/vox/medic,/obj/item/clothing/head/helmet/space/vox/medic,/obj/item/clothing/mask/breath/vox,/turf/simulated/shuttle/floor4,/area/shuttle/vox/station)
Organ