cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clown and mime brain/head naming. (#24668)

Browse Source
This commit is contained in:
Charlie Nolan
2024-03-18 18:44:25 +00:00
committed by GitHub
parent 4dcc43fc88
commit ba2720a231
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_procs.dm
+9
View File
@@ -1383,3 +1383,12 @@ so that different stomachs can handle things in different ways VB*/
// keep most of what's passed in, but don't change the angle
. = ..(target_turf, crush_damage, should_crit, crit_damage_factor, forced_crit, weaken_time, knockdown_time, should_rotate = FALSE, rightable = FALSE)
KnockDown(10 SECONDS)
/mob/living/carbon/rename_character(oldname, newname)
. = ..()
if(!.)
return
for(var/obj/item/organ/internal/IO in internal_organs)
if(IO.dna?.real_name == oldname)
IO.dna.real_name = newname
code/modules/mob/living/carbon/human/human_organs.dm
+9
View File
@@ -175,3 +175,12 @@ old_ue: Set this to a UE string, and this proc will overwrite the dna of organs
for(var/obj/item/organ/external/limb in bodyparts)
if(limb.status & ORGAN_SPLINTED)
splinted_limbs += limb
/mob/living/carbon/human/rename_character(oldname, newname)
. = ..()
if(!.)
return
for(var/obj/item/organ/external/BP in bodyparts)
if(BP.dna?.real_name == oldname)
BP.dna.real_name = newname
code/modules/mob/new_player/new_player.dm
+4 -3
View File
@@ -551,11 +551,12 @@
if(mind)
mind.active = FALSE //we wish to transfer the key manually
if(mind.assigned_role == "Clown") //give them a clownname if they are a clown
new_character.real_name = pick(GLOB.clown_names) //I hate this being here of all places but unfortunately dna is based on real_name!
// Clowns and mimes get appropriate default names, and the chance to pick a custom one.
if(mind.assigned_role == "Clown")
new_character.rename_character(new_character.real_name, pick(GLOB.clown_names))
new_character.rename_self("clown")
else if(mind.assigned_role == "Mime")
new_character.real_name = pick(GLOB.mime_names)
new_character.rename_character(new_character.real_name, pick(GLOB.mime_names))
new_character.rename_self("mime")
mind.set_original_mob(new_character)
mind.transfer_to(new_character) //won't transfer key since the mind is not active