cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3861 from eswordthecat/Bleeding-Edge

Browse Source 
Moved mime and clown rename code.
This commit is contained in:
d3athrow
2015-04-12 14:41:44 -05:00
parent 48f5d22f1d e02ff8adf4
commit 093bc457b9
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/jobs/job/civilian.dm
View File

@@ -258,6 +258,8 @@
else else
H.equip_or_collect(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform) H.equip_or_collect(new /obj/item/clothing/under/rank/clown(H), slot_w_uniform)
H.equip_or_collect(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/shoes/clown_shoes(H), slot_shoes)
H.real_name = pick(clown_names)
H.rename_self("clown")
return 1 return 1
@@ -299,6 +301,7 @@
H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing(H), slot_in_backpack)
H.add_spell(new /spell/aoe_turf/conjure/forcewall/mime, "grey_spell_ready") H.add_spell(new /spell/aoe_turf/conjure/forcewall/mime, "grey_spell_ready")
H.miming = 1 H.miming = 1
H.rename_self("mime")
return 1 return 1

11
code/modules/mob/new_player/new_player.dm
View File

@@ -424,15 +424,10 @@ Round Duration: [round(hours)]h [round(mins)]m<br>"}
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
if(mind) if (mind)
mind.active = 0 //we wish to transfer the key manually mind.active = 0 // 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(clown_names) //I hate this being here of all places but unfortunately dna is based on real_name!
new_character.rename_self("clown")
else if(mind.assigned_role == "Mime")
new_character.rename_self("mime")
mind.original = new_character mind.original = new_character
mind.transfer_to(new_character) //won't transfer key since the mind is not active mind.transfer_to(new_character) // won't transfer key since the mind is not active
new_character.name = real_name new_character.name = real_name
new_character.dna.ready_dna(new_character) new_character.dna.ready_dna(new_character)