Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloning scanner fixes #11942

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 0 additions & 2 deletions code/datums/records/manifest.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
var/list/general = list()
/// This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character().
var/list/locked = list()
//List used entirely just for cloning.
var/list/cloning = list()
/// Total number of security rapsheet prints. Changes the header.
var/print_count = 0

Expand Down
15 changes: 9 additions & 6 deletions code/datums/records/record.dm
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,15 @@
UE,
bank_account
)
. = ..()
src.id = id
src.age = age
src.blood_type = blood_type
src.dna_string = dna_string
src.fingerprint = fingerprint
src.gender = gender
src.initial_rank = initial_rank
src.name = name
src.species = species
src.weakref_dna = weakref_dna
src.uni_identity = uni_identity
src.SE = SE
Expand All @@ -639,10 +646,7 @@
src.UE = UE
src.bank_account = bank_account

GLOB.manifest.cloning += src

/datum/record/cloning/Destroy()
GLOB.manifest.cloning -= src
return ..()
EvilDragonfiend marked this conversation as resolved.
Show resolved Hide resolved

// Copy the record's data to the target.
Expand All @@ -655,18 +659,17 @@
gender = target.gender
initial_rank = target.initial_rank
name = target.name
rank = target.rank
species = target.species
weakref_dna = target.weakref_dna
uni_identity = target.uni_identity
SE = target.SE
UE = target.UE
weakref_mind = target.weakref_mind
last_death = target.last_death
factions = target.factions
traumas = target.traumas
body_only = target.body_only
implant = target.implant
UE = target.UE
return

/datum/record/cloning/proc/resolve_dna()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/cloning.dm
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ DEFINE_BUFFER_HANDLER(/obj/machinery/computer/cloning)
scantemp = "Failed loading: Data already exists!"
return FALSE
var/datum/record/cloning/cloning_record = new()
diskette.data.copy_to(cloning_record)
cloning_record.copy_to(diskette.data)

records += cloning_record
scantemp = "Loaded into internal storage successfully."
Expand Down
Loading