diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 6f08a356013..70720249454 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -387,7 +387,7 @@
occupantData["blind"] = (H.sdisabilities & BLIND)
occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
- occupantData = attempt_vr(src,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert
+ occupantData = attempt_vr(connected,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert
data["occupant"] = occupantData
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
diff --git a/code/game/machinery/adv_med_vr.dm b/code/game/machinery/adv_med_vr.dm
index 8e0f1b54985..154e04f91ca 100644
--- a/code/game/machinery/adv_med_vr.dm
+++ b/code/game/machinery/adv_med_vr.dm
@@ -13,19 +13,9 @@
else
objectprey++
- incoming["livingprey"] = livingprey
- incoming["humanprey"] = humanprey
- incoming["objectprey"] = objectprey
+ incoming["livingPrey"] = livingprey
+ incoming["humanPrey"] = humanprey
+ incoming["objectPrey"] = objectprey
incoming["weight"] = H.weight
return incoming
-
-/obj/machinery/body_scanconsole/proc/format_occupant_data_vr(list/incoming)
- var/message = ""
-
- message += text("Body Weight (to scale): [incoming["weight"]]lbs / [incoming["weight"] / 2.20463]kg
")
-
- if(incoming["livingprey"] || incoming["humanprey"] || incoming["objectprey"])
- message += text("Foreign bodies detected:
[incoming["humanprey"] ? "- [incoming["humanprey"]] humanoid(s)
" : ""][incoming["livingprey"] ? "- [incoming["humanprey"]] non-humanoid(s)
" : ""][incoming["objectprey"] ? "- [incoming["humanprey"]] object(s)
" : ""]
")
-
- return message
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm
index e0c982c5b3a..3c0c796d3df 100644
--- a/code/modules/reagents/Chemistry-Recipes_vr.dm
+++ b/code/modules/reagents/Chemistry-Recipes_vr.dm
@@ -87,11 +87,11 @@
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks // BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
+/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash)
-
+*/
for(var/i = 1, i <= 4 + rand(1,2), i++)
var/chosen = pick(borks)
var/obj/B = new chosen
@@ -134,11 +134,11 @@
var/list/material = typesof(/obj/item/stack/material) - blocked
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
+/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash)
-
+*/
var/spawn_amount = rand(1,50)
var/chosen = pick(material)
var/obj/item/stack/material/C = new chosen
@@ -269,11 +269,11 @@
var/list/voremobs = typesof(mob_path) - mob_path - blocked // list of possible hostile mobs
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
+/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash)
-
+*/
var/spawn_count = rand(1,3)
for(var/i = 1, i <= spawn_count, i++)
var/chosen = pick(voremobs)
diff --git a/nano/templates/adv_med.tmpl b/nano/templates/adv_med.tmpl
index 7f7e931caf6..320ac09443e 100644
--- a/nano/templates/adv_med.tmpl
+++ b/nano/templates/adv_med.tmpl
@@ -67,6 +67,31 @@ Used In File(s): \code\game\machinery\adv_med.dm
Body Temperature: |
{{:helper.round(data.occupant.bodyTempC*10)/10}}°C, {{:helper.round(data.occupant.bodyTempF*10)/10}}°F |
+
+
+ | Body Weight: |
+ {{:helper.round(data.occupant.weight)}} lbs, {{:helper.round(
+ data.occupant.weight/2.20463)}} kgs |
+ {{if data.occupant.humanPrey}}
+
+ | Foreign Humanoids: |
+ {{:data.occupant.humanPrey}} |
+
+ {{/if}}
+ {{if data.occupant.livingPrey}}
+
+ | Foreign Creatures: |
+ {{:data.occupant.livingPrey}} |
+
+ {{/if}}
+ {{if data.occupant.objectPrey}}
+
+ | Foreign Objects: |
+ {{:data.occupant.objectPrey}} |
+
+ {{/if}}
+
+
{{if data.occupant.hasVirus}}