From ad4e7cda95d4a6ff5405eacbdcfe72f0fd64a457 Mon Sep 17 00:00:00 2001 From: SpaceVampire <46720418+SpaceVampire@users.noreply.github.com> Date: Wed, 28 Apr 2021 23:07:23 -0400 Subject: [PATCH] [SIMI-MODULAR] Replaces Mayhem in a Bottle with Bloodlust in a Bottle. (#5190) * copy-paste * I will actually always forget this. * is-this-how-code-works * desc-update * sanity-check * nevermindI'msurethisisn'tactuallyneeded * Update modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm Co-authored-by: Gandalf * Update modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm Co-authored-by: Gandalf Co-authored-by: SpaceVampire <> Co-authored-by: Gandalf --- .../mining/lavaland/necropolis_chests.dm | 2 +- .../code/game/objects/items/miscellaneous.dm | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 0921ee05fcb..fa1358a658c 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -1054,7 +1054,7 @@ var/loot = rand(1,2) switch(loot) if(1) - new /obj/item/mayhem(src) + new /obj/item/bloodcrawlbottle(src) //SKYRAT EDIT if(2) new /obj/item/gun/magic/staff/spellblade(src) diff --git a/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm b/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm index 51ffecab8a1..6b1e74df703 100644 --- a/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm +++ b/modular_skyrat/modules/modular_items/code/game/objects/items/miscellaneous.dm @@ -7,3 +7,44 @@ throwforce = 3 w_class = WEIGHT_CLASS_NORMAL +//loot +/obj/item/bloodcrawlbottle + name = "bloodlust in a bottle" + desc = "Drinking this will give you unimaginable powers... and mildly disgust you because of it's metallic taste." + icon = 'icons/obj/wizard.dmi' + icon_state = "vial" + +/obj/item/bloodcrawlbottle/attack_self(mob/user) + to_chat(user, "You drink the bottle's contents.") + var/obj/effect/proc_holder/spell/bloodcrawl/S = new() + user.mind.AddSpell(S) + user.log_message("learned the spell bloodcrawl ([S])", LOG_ATTACK, color="orange") + qdel(src) + +/obj/effect/proc_holder/spell/bloodcrawl/lesser + name = "Lesser Blood Crawl" + desc = "Use pools of blood to phase out of existence. Requires large pools of blood, and a lot of your blood." + +/obj/effect/proc_holder/spell/bloodcrawl/lesser/choose_targets(mob/user = usr) + for(var/obj/effect/decal/cleanable/target in range(range, get_turf(user))) + if(target.can_bloodcrawl_in() && target.bloodiness >= 20) + perform(target) + return + revert_cast() + to_chat(user, "There must be a nearby source of plentiful blood!") + +/obj/effect/proc_holder/spell/bloodcrawl/lesser/perform(obj/effect/decal/cleanable/target, recharge = 1, mob/living/user = usr) + if(istype(user) && user.canUseTopic(user, TRUE)) + if(phased) + if(user.phasein(target)) + phased = FALSE + else + if(user.phaseout(target)) + phased = TRUE + if(iscarbon(user)) + var/mob/living/carbon/C = user + C.blood_volume -= 150 + start_recharge() + return + revert_cast() + to_chat(user, "You are unable to blood crawl!")