cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-16 20:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mindread now reads the correct true name (#48301)

Browse Source 
* Mindread now reads the correct true name

* Fixes dna.real_name
This commit is contained in:
skoglol
2019-12-22 21:29:25 +01:00
committed by Jordan Brown
parent 811816cd6b
commit 91a94e46af
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/dna.dm
View File

@@ -338,7 +338,7 @@
set_species(newrace, icon_update=0) set_species(newrace, icon_update=0)
if(newreal_name) if(newreal_name)
real_name = newreal_name dna.real_name = newreal_name
dna.generate_unique_enzymes() dna.generate_unique_enzymes()
if(newblood_type) if(newblood_type)

5
code/datums/mutations/antenna.dm
View File

@@ -92,9 +92,8 @@
if(iscarbon(M)) if(iscarbon(M))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
to_chat(user, "<span class='boldnotice'>You find that their intent is to [H.a_intent]...</span>") to_chat(user, "<span class='boldnotice'>You find that their intent is to [H.a_intent]...</span>")
var/datum/dna/the_dna = H.has_dna() if(H.mind)
if(the_dna) to_chat(user, "<span class='boldnotice'>You uncover that [H.p_their()] true identity is [H.mind.name].</span>")
to_chat(user, "<span class='boldnotice'>You uncover that [H.p_their()] true identity is [the_dna.real_name].</span>")
else else
to_chat(user, "<span class='warning'>You can't find a mind to read inside of [M]!</span>") to_chat(user, "<span class='warning'>You can't find a mind to read inside of [M]!</span>")

8
code/game/machinery/cloning.dm
View File

@@ -185,6 +185,10 @@
var/mob/living/carbon/human/H = new /mob/living/carbon/human(src) var/mob/living/carbon/human/H = new /mob/living/carbon/human(src)
if(!clonename) //to prevent null names
clonename = "clone ([rand(1,999)])"
H.real_name = clonename
H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features) H.hardset_dna(ui, mutation_index, H.real_name, blood_type, mrace, features)
if(!HAS_TRAIT(H, TRAIT_RADIMMUNE))//dont apply mutations if the species is Mutation proof. if(!HAS_TRAIT(H, TRAIT_RADIMMUNE))//dont apply mutations if the species is Mutation proof.
@@ -201,10 +205,6 @@
H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment. H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
occupant = H occupant = H
if(!clonename) //to prevent null names
clonename = "clone ([rand(1,999)])"
H.real_name = clonename
icon_state = "pod_1" icon_state = "pod_1"
//Get the clone body ready //Get the clone body ready
maim_clone(H) maim_clone(H)