cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3960 from zekesulastin/cloning-language-hack

Browse Source 
A more complete fix to #3697 - languages post-clone
This commit is contained in:
Zuhayr
2013-11-22 17:31:45 -08:00
parent 8b1c54823b 252ab1be9a
commit 6f5fcb7ecc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cloning.dm
+4 -3
View File
@@ -116,7 +116,7 @@
//Clonepod
//Start growing a human clone in the pod!
/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/ui, var/se, var/mindref, var/datum/species/mrace)
/obj/machinery/clonepod/proc/growclone(var/ckey, var/clonename, var/ui, var/se, var/mindref, var/datum/species/mrace, var/languages)
if(mess || attempting)
return 0
var/datum/mind/clonemind = locate(mindref)
@@ -195,7 +195,8 @@
H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
H.species = mrace
H.add_language(mrace.language)
for(var/datum/language/L in languages)
H.add_language(L.name)
H.update_mutantrace()
H.suiciding = 0
src.attempting = 0
@@ -437,4 +438,4 @@
/* EMP grenade/spell effect
if(istype(A, /obj/machinery/clonepod))
A:malfunction()
*/
*/
code/game/machinery/computer/cloning.dm
+3 -2
View File
@@ -313,7 +313,7 @@
else if(!config.revival_cloning)
temp = "Error: Unable to initiate cloning cycle."
else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"]))
else if(pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["languages"]))
temp = "Initiating cloning cycle..."
records.Remove(C)
del(C)
@@ -323,7 +323,7 @@
var/mob/selected = find_dead_player("[C.fields["ckey"]]")
selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable
var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")
if(answer != "No" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"]))
if(answer != "No" && pod1.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["languages"], C.fields["interface"]))
temp = "Initiating cloning cycle..."
records.Remove(C)
del(C)
@@ -370,6 +370,7 @@
R.fields["id"] = copytext(md5(subject.real_name), 2, 6)
R.fields["UI"] = subject.dna.uni_identity
R.fields["SE"] = subject.dna.struc_enzymes
R.fields["languages"] = subject.languages
//Add an implant if needed
var/obj/item/weapon/implant/health/imp = locate(/obj/item/weapon/implant/health, subject)