Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Cloners scan for dna before they check if the body is damaged #7187

Merged
alexkar598 merged 3 commits into from
Nov 30, 2019
Merged

Cloners scan for dna before they check if the body is damaged #7187

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73e185a
E (#11)
SomeguyManperson Nov 26, 2019
b01c8cb
Revert "E (#11)" (#12)
SomeguyManperson Nov 26, 2019
c40ce70
baddna comes first
SomeguyManperson Nov 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions code/game/machinery/computer/cloning.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,14 +548,14 @@
scantemp = "<font class='bad'>Subject's brain is not responding to scanning stimuli.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
return
if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
if(HAS_TRAIT(mob_occupant, TRAIT_BADDNA))
scantemp = "<font class='bad'>Subject's DNA is too damaged to initiate cloning procedure.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
if((HAS_TRAIT(mob_occupant, TRAIT_HUSK)) && (src.scanner.scan_level < 2))
scantemp = "<font class='bad'>Subject's body is too damaged to scan properly.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
if (!body_only && isnull(mob_occupant.mind))
scantemp = "<font class='bad'>Mental interface failure.</font>"
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
Expand Down