From 74d0bd8763fc0f3cddeb03d5dc387b09f65102ac Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 25 Jul 2018 10:54:59 +0300 Subject: [PATCH] Couple clown tweaks. -Allows our responsible whitelist clowns spawn with the bikehorn. -Disables the destructive forced name randomization and lossy rename BS on join. --- code/game/jobs/job/special.dm | 2 ++ code/modules/mob/new_player/new_player.dm | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm index 5091e9d4e3e..178e8301c90 100644 --- a/code/game/jobs/job/special.dm +++ b/code/game/jobs/job/special.dm @@ -109,8 +109,10 @@ if(H.backbag > 0) H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H.back), slot_in_backpack) + H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H.back), slot_in_backpack) else H.equip_to_slot_or_del(new /obj/item/weapon/stamp/clown(H), slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(H.back), slot_l_hand) return 1 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index ed5c11163b4..26f3af22627 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -482,9 +482,10 @@ if(mind) 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") + // VOREStation edit to disable the destructive forced renaming for our responsible whitelist clowns. + //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") mind.original = new_character // VOREStation mind.loaded_from_ckey = client.ckey