cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implants and Greimorian Egg/Larva Fixes (#14196)

Browse Source
This commit is contained in:
VisVirific
2022-06-04 17:29:17 -03:00
committed by GitHub
parent c08a7fcb1c
commit 042a57e5e4
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/machinery/body_scanner.dm
View File

@@ -523,15 +523,19 @@
if (O.implants.len) if (O.implants.len)
var/unk = 0 var/unk = 0
var/list/organic = list()
for (var/atom/movable/I in O.implants) for (var/atom/movable/I in O.implants)
if (is_type_in_list(I, known_implants)) if(is_type_in_list(I, known_implants))
wounds += "\a [I.name] is installed." wounds += "\a [I.name] is installed."
if(istype(I, /obj/effect/spider)) else if(istype(I, /obj/effect/spider))
wounds += "Abnormal organic body detected." organic += I
else else
unk += 1 unk += 1
if (unk) if (unk)
wounds += "Has an abnormal mass present." wounds += "Has an abnormal mass present."
var/friends = length(organic)
if(friends)
wounds += friends > 1 ? "Multiple abnormal organic bodies present." : "Abnormal organic body present."
if(length(wounds) || brute_damage != "None" || burn_damage != "None") if(length(wounds) || brute_damage != "None" || burn_damage != "None")
has_external_injuries = TRUE has_external_injuries = TRUE
@@ -742,15 +746,19 @@
if (e.implants.len) if (e.implants.len)
var/unknown_body = 0 var/unknown_body = 0
var/list/organic = list()
for(var/I in e.implants) for(var/I in e.implants)
if(is_type_in_list(I,known_implants)) if(is_type_in_list(I,known_implants))
imp += "[I] implanted:" imp += "[I] implanted:"
if(istype(I, /obj/effect/spider)) else if(istype(I, /obj/effect/spider))
imp += "Abnormal organic body present:" organic += I
else else
unknown_body++ unknown_body++
if(unknown_body) if(unknown_body)
imp += "Unknown body present:" imp += "Unknown body present:"
var/friends = length(organic)
if(friends)
imp += friends > 1 ? "Multiple abnormal organic bodies present:" : "Abnormal organic body present:"
if(!AN && !open && !infected && !imp) if(!AN && !open && !infected && !imp)
AN = "None:" AN = "None:"

8
code/game/machinery/computer/Operating.dm
View File

@@ -306,15 +306,19 @@
if (e.implants.len) if (e.implants.len)
var/unknown_body = 0 var/unknown_body = 0
var/list/organic = list()
for(var/I in e.implants) for(var/I in e.implants)
if(is_type_in_list(I,internal_bodyscanner.known_implants)) if(is_type_in_list(I,internal_bodyscanner.known_implants))
imp += "[I] implanted:" imp += "[I] implanted:"
if(istype(I, /obj/effect/spider)) else if(istype(I, /obj/effect/spider))
imp += "Abnormal organic body present:" organic += I
else else
unknown_body++ unknown_body++
if(unknown_body) if(unknown_body)
imp += "Unknown body present:" imp += "Unknown body present:"
var/friends = length(organic)
if(friends)
imp += friends > 1 ? "Multiple abnormal organic bodies present:" : "Abnormal organic body present:"
if(!AN && !open && !infected && !imp) if(!AN && !open && !infected && !imp)
AN = "None:" AN = "None:"

7
html/changelogs/implant_eggs_larvae_scans.yml Normal file
View File

@@ -0,0 +1,7 @@
author: Vrow
delete-after: True
changes:
- bugfix: "Fixes medscans/body scanners/operating consoles thinking there's something else when someone only has an implant in them."
- bugfix: "Fixes the above counting each and every single greimorian larva inside a limb that has eggs implanted."