From 752adfe2eac31aacc5314ec1a80c5ec3e425fac0 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 5 Jan 2016 16:19:47 -0500 Subject: [PATCH 1/2] see branch title --- code/game/gamemodes/wizard/artefact.dm | 42 +++++++++++++++++++++----- html/changelogs/fethas.yml | 13 ++++++++ 2 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/fethas.yml diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 2adbf74726c..15d219c8639 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -639,13 +639,16 @@ var/global/list/multiverse = list() if(spooky_scaries.len >= 3 && !unlimited) user << "This artifact can only affect three undead at a time!" return - M.makeSkeleton() - M.visible_message(" A massive amount of flesh sloughs off [M] and a skeleton rises up!") - M.revive() + if(heresy) + spawnheresy(M)//oh god why + else + M.makeSkeleton() + M.visible_message(" A massive amount of flesh sloughs off [M] and a skeleton rises up!") + M.revive() + equip_skeleton(M) spooky_scaries |= M M << "You have been revived by [user.real_name]!" M << "They are your master now, assist them even if it costs you your new life!" - equip_skeleton(M) desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" /obj/item/device/necromantic_stone/proc/check_spooky() @@ -667,10 +670,7 @@ var/global/list/multiverse = list() for(var/obj/item/I in H) H.unEquip(I) var/randomSpooky = "roman"//defualt - if(heresy) - randomSpooky = "yand" - else - randomSpooky = pick("roman","pirate","yand","clown") + randomSpooky = pick("roman","pirate","yand","clown") switch(randomSpooky) if("roman") @@ -708,6 +708,32 @@ var/global/list/multiverse = list() 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) +/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) + + if(prob(50)) + H.change_hair_color(216, 192, 120) + else + H.change_hair_color(140, 170, 74) + + H.update_dna() + H.update_body() + + 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) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) + 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") + H.real_name = "Neko-chan" + else + H.real_name = "[H.name]-chan" + H.say("NYA!~") /obj/item/device/necromantic_stone/nya name = "nya-cromantic stone" diff --git a/html/changelogs/fethas.yml b/html/changelogs/fethas.yml new file mode 100644 index 00000000000..c80357bbceb --- /dev/null +++ b/html/changelogs/fethas.yml @@ -0,0 +1,13 @@ +# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: Fethas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# 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 From 85c0c0be1955ecfb524d006dcd43864fbf2df4a7 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 6 Jan 2016 00:50:30 -0500 Subject: [PATCH 2/2] 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