Cloner fixes, no longer shoves the wrong player into a cloned person. (#26155)

This commit is contained in:
Spaghetti-bit
2024-07-08 20:30:43 -07:00
committed by GitHub
parent 8a6643f64f
commit 9d654d08ab
3 changed files with 5 additions and 0 deletions
+1
View File
@@ -4,6 +4,7 @@
#define SCANNER_ABSORBED "absorbed"
#define SCANNER_NO_SOUL "soulless"
#define SCANNER_BRAIN_ISSUE "suicide or missing brain"
#define SCANNER_POD_IN_PROGRESS "cloning in progress"
#define SCANNER_MISC "miscellanious"
#define SCANNER_SUCCESSFUL "successful"
+2
View File
@@ -101,6 +101,8 @@
has_scanned = TRUE
if(console.selected_pod?.currently_cloning)
return SCANNER_POD_IN_PROGRESS
if(!scanned.dna || HAS_TRAIT(scanned, TRAIT_GENELESS))
return SCANNER_MISC
if(HAS_TRAIT(scanned, TRAIT_BADDNA) && scanning_tier < 4)
+2
View File
@@ -341,6 +341,8 @@
feedback = list("text" = "Failed to sequence the patient's brain. Further attempts may succeed.", "color" = "average", "scan_succeeded" = FALSE)
if(SCANNER_BRAIN_ISSUE)
feedback = list("text" = "The patient's brain is inactive or missing.", "color" = "bad", "scan_succeeded" = FALSE)
if(SCANNER_POD_IN_PROGRESS)
feedback = list("text" = "The selected pod is currently cloning someone.", "color" = "average", "scan_succeeded" = FALSE)
else
var/datum/cloning_data/scan = scanner_result