From 85c0c0be1955ecfb524d006dcd43864fbf2df4a7 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 6 Jan 2016 00:50:30 -0500 Subject: [PATCH] nya --- code/game/gamemodes/wizard/artefact.dm | 19 ++++++++++++------- html/changelogs/fethas.yml | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 15d219c8639..29578da0bc8 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -711,17 +711,22 @@ var/global/list/multiverse = list() /obj/item/device/necromantic_stone/proc/spawnheresy(mob/living/carbon/human/H as mob) H.set_species("Human") if (H.gender == MALE) - H.gender = FEMALE - H.h_style = random_hair_style(H.gender, H.species) + H.change_gender(FEMALE) - if(prob(50)) - H.change_hair_color(216, 192, 120) - else - H.change_hair_color(140, 170, 74) + var/list/anime_hair =list("Odango", "Kusanagi Hair", "Pigtails", "Hime Cut", "Floorlength Braid", "Ombre", "Twincurls", "Twincurls 2") + H.change_hair(pick(anime_hair)) + + var/list/anime_hair_colours = list(list(216, 192, 120), + list(140,170,74),list(0,0,0)) + + var/list/chosen_colour = pick(anime_hair_colours) + H.change_hair_color(chosen_colour[1], chosen_colour[2], chosen_colour[3]) H.update_dna() H.update_body() + H.revive() + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/head/kitty(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/under/schoolgirl(H), slot_w_uniform) @@ -729,7 +734,7 @@ var/global/list/multiverse = list() H.equip_to_slot_or_del(new /obj/item/weapon/katana(H), slot_r_hand) H.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/roman(H), slot_l_hand) H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) - if(!H.real_name || H.real_name == "Unknown" || H.name == "Uknownwn") + if(!H.real_name || H.real_name == "unknown") H.real_name = "Neko-chan" else H.real_name = "[H.name]-chan" diff --git a/html/changelogs/fethas.yml b/html/changelogs/fethas.yml index c80357bbceb..1f5070b7233 100644 --- a/html/changelogs/fethas.yml +++ b/html/changelogs/fethas.yml @@ -10,4 +10,4 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Due to Archmage Steve leaving the nya-cromantic stone near the microwave, the true power of the stone has been unleashed. Subjects of the stone are not only ressurected..but ressurected as catgirls..We fired steve." \ No newline at end of file + - rscadd: "Due to Archmage Steve leaving the nya-cromantic stone near the microwave, the true power of the stone has been unleashed. Subjects of the stone are not only ressurected ... but resurrected as catgirls ... We fired steve." \ No newline at end of file