cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changeling cloning works properly now.

Browse Source 
Changeling IDs are shown at the end of a round along with their names.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2087 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2011-09-02 06:01:18 +00:00
parent fa06e14ae0
commit 735a85abe8
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/gamemodes/changeling/changeling.dm
View File

@@ -197,7 +197,8 @@
else else
changeling_name = "[changeling.key] (character destroyed)" changeling_name = "[changeling.key] (character destroyed)"
world << "<B>The changeling was [changeling_name]</B>" world << "<B>The changeling was [changeling_name].</B>"
if(changeling.current) world << "<b>[changeling.current.gender=="male"?"His":"Her"] changeling ID was [changeling.current.gender=="male"?"Mr.":"Mrs."] [changeling.current.changeling.changelingID]."
world << "<B>Genomes absorbed: [totalabsorbed]</B>" world << "<B>Genomes absorbed: [totalabsorbed]</B>"
var/count = 1 var/count = 1

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

@@ -282,7 +282,7 @@
//Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs. //Can't clone without someone to clone. Or a pod. Or if the pod is busy. Or full of gibs.
if ((!selected) || (!src.pod1) || (src.pod1.occupant) || (src.pod1.mess)) if ((!selected) || (!src.pod1) || (src.pod1.occupant) || (src.pod1.mess))
src.temp = "Unable to initiate cloning cycle." // most helpful error message in THE HISTORY OF THE WORLD src.temp = "Unable to initiate cloning cycle." // most helpful error message in THE HISTORY OF THE WORLD
else if (src.pod1.growclone(selected, C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"])) else if (src.pod1.growclone(selected, C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["interface"],C.fields["changeling"]))
src.temp = "Cloning cycle activated." src.temp = "Cloning cycle activated."
src.records.Remove(C) src.records.Remove(C)
del(C) del(C)
@@ -321,6 +321,7 @@
R.fields["id"] = copytext(md5(subject.real_name), 2, 6) R.fields["id"] = copytext(md5(subject.real_name), 2, 6)
R.fields["UI"] = subject.dna.uni_identity R.fields["UI"] = subject.dna.uni_identity
R.fields["SE"] = subject.dna.struc_enzymes R.fields["SE"] = subject.dna.struc_enzymes
R.fields["changeling"] = subject.changeling
// Preferences stuff // Preferences stuff
R.fields["interface"] = subject.UI R.fields["interface"] = subject.UI
@@ -431,7 +432,7 @@
//Clonepod //Clonepod
//Start growing a human clone in the pod! //Start growing a human clone in the pod!
/obj/machinery/clonepod/proc/growclone(mob/ghost as mob, var/clonename, var/ui, var/se, var/mindref, var/mrace, var/UI) /obj/machinery/clonepod/proc/growclone(mob/ghost as mob, var/clonename, var/ui, var/se, var/mindref, var/mrace, var/UI, var/datum/changeling/changelingClone)
if (((!ghost) || (!ghost.client)) || src.mess || src.attempting) if (((!ghost) || (!ghost.client)) || src.mess || src.attempting)
return 0 return 0
@@ -492,9 +493,10 @@
if (src.occupant.mind in ticker.mode:cult) if (src.occupant.mind in ticker.mode:cult)
ticker.mode:add_cultist(src.occupant.mind) ticker.mode:add_cultist(src.occupant.mind)
ticker.mode:update_all_cult_icons() //So the icon actually appears ticker.mode:update_all_cult_icons() //So the icon actually appears
if ("changeling")
if (src.occupant.mind in ticker.mode:changelings) if (changelingClone)
src.occupant.make_changeling() occupant.changeling = changelingClone
src.occupant.make_changeling()
// -- End mode specific stuff // -- End mode specific stuff