mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] DNA Clone Fix (#10580)
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
036ed10454
commit
e902125c5e
@@ -21,15 +21,12 @@
|
||||
manf = manf.species_alternates[prosfab.species]
|
||||
|
||||
if(!prosfab.species || (prosfab.species in manf.species_cannot_use)) // Fabricator ensures the manufacturer can make parts for the species we're set to.
|
||||
O.species = GLOB.all_species["[manf.suggested_species]"]
|
||||
O.data.setup_from_species(GLOB.all_species["[manf.suggested_species]"])
|
||||
else
|
||||
O.species = GLOB.all_species[prosfab.species]
|
||||
O.data.setup_from_species(GLOB.all_species[prosfab.species])
|
||||
else
|
||||
O.species = GLOB.all_species["Human"]
|
||||
O.data.setup_from_species(GLOB.all_species["Human"])
|
||||
O.robotize(prosfab.manufacturer)
|
||||
qdel_swap(O.dna, new/datum/dna()) //Uuughhhh... why do I have to do this?
|
||||
O.dna.ResetUI()
|
||||
O.dna.ResetSE()
|
||||
return O
|
||||
return ..()
|
||||
|
||||
@@ -60,15 +57,13 @@
|
||||
EO.remove_rejuv()
|
||||
|
||||
for(var/obj/item/organ/external/O in H.organs)
|
||||
O.species = GLOB.all_species[newspecies]
|
||||
O.data.setup_from_species(GLOB.all_species[newspecies])
|
||||
|
||||
if(!(O.organ_tag in manf.parts)) // Make sure we're using an actually present icon.
|
||||
manf = all_robolimbs["Unbranded"]
|
||||
|
||||
O.robotize(manf.company)
|
||||
qdel_swap(O.dna, new/datum/dna())
|
||||
O.dna.ResetUI()
|
||||
O.dna.ResetSE()
|
||||
O.data.setup_from_dna()
|
||||
|
||||
// Skincolor weirdness.
|
||||
O.s_col[1] = 255 // CHOMP Edit
|
||||
|
||||
Reference in New Issue
Block a user