From 4db4257f94cd74b0a948b4b898dea33ff317b545 Mon Sep 17 00:00:00 2001 From: SarmentiCampbell <61919894+SarmentiCampbell@users.noreply.github.com> Date: Sun, 31 Jul 2022 03:09:33 +0200 Subject: [PATCH] [SEMI-MODULAR] Adding back some stuffs that got removed during spell refactor (#14857) * added two spells, a potion and a curator box back * added ronin in dme * updated with reviews * updated with review --- .../mining/lavaland/necropolis_chests.dm | 2 +- modular_skyrat/modules/curatorbundle/Ronin.dm | 9 ++++++ .../modules/morewizardstuffs/spellbook.dm | 19 +++++++++++++ .../spells/bloodcrawl_potion.dm | 12 ++++++++ .../spells/magical_stimpack.dm | 18 ++++++++++++ .../morewizardstuffs/spells/snap_celeritas.dm | 28 +++++++++++++++++++ tgstation.dme | 5 ++++ 7 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/modules/curatorbundle/Ronin.dm create mode 100644 modular_skyrat/modules/morewizardstuffs/spellbook.dm create mode 100644 modular_skyrat/modules/morewizardstuffs/spells/bloodcrawl_potion.dm create mode 100644 modular_skyrat/modules/morewizardstuffs/spells/magical_stimpack.dm create mode 100644 modular_skyrat/modules/morewizardstuffs/spells/snap_celeritas.dm diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 4a570efd039..f5c8f0dd1e5 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -113,7 +113,7 @@ var/loot = rand(1,2) switch(loot) if(1) - new /obj/item/mayhem(src) + new /obj/item/bloodcrawl_bottle(src) //SKYRAT EDIT ORIGINAL : new /obj/item/mayhem(src) if(2) new /obj/item/soulscythe(src) diff --git a/modular_skyrat/modules/curatorbundle/Ronin.dm b/modular_skyrat/modules/curatorbundle/Ronin.dm new file mode 100644 index 00000000000..c62d46238ee --- /dev/null +++ b/modular_skyrat/modules/curatorbundle/Ronin.dm @@ -0,0 +1,9 @@ +/obj/item/storage/box/hero/ronin + name = "Sword Saint, Wandering Vagabond - 1600's." + desc = "Anyone can give up, it's the easiest thing in the world to do. But to hold it together when everyone else would understand if you fell apart, that's true strength. Become the wandering swordsman you were always meant to be!" + +/obj/item/storage/box/hero/ronin/PopulateContents() + new /obj/item/clothing/under/costume/kamishimo(src) + new /obj/item/clothing/head/rice_hat(src) + new /obj/item/katana/weak/curator(src) + new /obj/item/clothing/shoes/sandal(src) diff --git a/modular_skyrat/modules/morewizardstuffs/spellbook.dm b/modular_skyrat/modules/morewizardstuffs/spellbook.dm new file mode 100644 index 00000000000..6d71c84f45f --- /dev/null +++ b/modular_skyrat/modules/morewizardstuffs/spellbook.dm @@ -0,0 +1,19 @@ +//OFFENSIVE + +//DEFENSIVE + +//MOBILITY +/datum/spellbook_entry/celeritas + name = "Celeritas" + desc = "You will be able to swap places with someone just by snapping your fingers!" + spell_type = /datum/action/cooldown/spell/pointed/celeritas + cost = 1 + category = "Mobility" + +/datum/spellbook_entry/magical_stimpack + name = "Magic Stimpack" + desc = "This spell magically injects stimulants straight into your blood. Won't work on species with no reagent reactions!" + spell_type = /datum/action/cooldown/spell/stimpack + cost = 1 + category = "Mobility" + diff --git a/modular_skyrat/modules/morewizardstuffs/spells/bloodcrawl_potion.dm b/modular_skyrat/modules/morewizardstuffs/spells/bloodcrawl_potion.dm new file mode 100644 index 00000000000..0f738697bbf --- /dev/null +++ b/modular_skyrat/modules/morewizardstuffs/spells/bloodcrawl_potion.dm @@ -0,0 +1,12 @@ +/obj/item/bloodcrawl_bottle + 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/bloodcrawl_bottle/attack_self(mob/user) + to_chat(user, span_notice("You drink the contents of [src].")) + var/datum/action/cooldown/spell/jaunt/bloodcrawl/new_spell = new () + new_spell.Grant(user) + user.log_message("learned the spell bloodcrawl ([new_spell])", LOG_ATTACK, color="orange") + qdel(src) diff --git a/modular_skyrat/modules/morewizardstuffs/spells/magical_stimpack.dm b/modular_skyrat/modules/morewizardstuffs/spells/magical_stimpack.dm new file mode 100644 index 00000000000..df355c1a73a --- /dev/null +++ b/modular_skyrat/modules/morewizardstuffs/spells/magical_stimpack.dm @@ -0,0 +1,18 @@ +/datum/action/cooldown/spell/stimpack + name = "Magic Stimpack" + desc = "This spell magically injects stimulants straight into your blood. Won't work on species with no reagent reactions!" + school = "transmutation" + cooldown_time = 10 SECONDS + cooldown_reduction_per_rank = 1.25 SECONDS + spell_requirements = NONE + invocation = "STIMULUS CHEQ'US" + invocation_type = INVOCATION_SHOUT + +/datum/action/cooldown/spell/stimpack/cast(mob/living/cast_on) + . = ..() + cast_on.balloon_alert(cast_on, "speeding up") + cast_on.SetKnockdown(0) + cast_on.setStaminaLoss(0) + cast_on.set_resting(FALSE) + cast_on.reagents.add_reagent(/datum/reagent/medicine/stimulants, 3) // Ideally this comes out to a bit less than 30 seconds with tidi taken into account. + return TRUE diff --git a/modular_skyrat/modules/morewizardstuffs/spells/snap_celeritas.dm b/modular_skyrat/modules/morewizardstuffs/spells/snap_celeritas.dm new file mode 100644 index 00000000000..3e0426c47d9 --- /dev/null +++ b/modular_skyrat/modules/morewizardstuffs/spells/snap_celeritas.dm @@ -0,0 +1,28 @@ +/datum/action/cooldown/spell/pointed/celeritas + name = "Celeritas" + desc = "Swap places with a target within range." + school = "transmutation" + cooldown_time = 20 SECONDS + cooldown_reduction_per_rank = 4 SECONDS + spell_requirements = NONE + invocation_type = INVOCATION_NONE + base_icon_state = "spellcard" + button_icon_state = "spellcard0" + cast_range = 12 + active_msg = "You prepare to swap spots with a target..." + deactive_msg = "You dispel swap spots." + +/datum/action/cooldown/spell/pointed/celeritas/cast(mob/living/cast_on) + . = ..() + swap_spot(owner, cast_on) + +/datum/action/cooldown/spell/pointed/celeritas/proc/swap_spot(mob/living/caster, mob/living/cast_on) + caster.emote("snap") + playsound(caster, 'sound/weapons/punchmiss.ogg', 75, TRUE) + var/turf/targeted_turf = get_turf(cast_on) + var/turf/caster_turf = get_turf(caster) + + new /obj/effect/temp_visual/small_smoke/halfsecond(caster.drop_location()) + new /obj/effect/temp_visual/small_smoke/halfsecond(targeted_turf) + do_teleport(caster, targeted_turf, 0, no_effects = TRUE, channel = TELEPORT_CHANNEL_MAGIC) + do_teleport(cast_on, caster_turf, 0, no_effects = TRUE, channel= TELEPORT_CHANNEL_MAGIC) diff --git a/tgstation.dme b/tgstation.dme index d9dbc3dce25..abd69c6438d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5200,6 +5200,7 @@ #include "modular_skyrat\modules\cryosleep\code\job.dm" #include "modular_skyrat\modules\cryosleep\code\mind.dm" #include "modular_skyrat\modules\curatorbundle\Mushy.dm" +#include "modular_skyrat\modules\curatorbundle\Ronin.dm" #include "modular_skyrat\modules\customization\__DEFINES\DNA.dm" #include "modular_skyrat\modules\customization\__DEFINES\lists.dm" #include "modular_skyrat\modules\customization\__DEFINES\loadout.dm" @@ -5822,6 +5823,10 @@ #include "modular_skyrat\modules\moretraitoritems\code\syndiemirror.dm" #include "modular_skyrat\modules\moretraitoritems\code\uplink_kits.dm" #include "modular_skyrat\modules\moretraitoritems\code\weaponry.dm" +#include "modular_skyrat\modules\morewizardstuffs\spellbook.dm" +#include "modular_skyrat\modules\morewizardstuffs\spells\bloodcrawl_potion.dm" +#include "modular_skyrat\modules\morewizardstuffs\spells\magical_stimpack.dm" +#include "modular_skyrat\modules\morewizardstuffs\spells\snap_celeritas.dm" #include "modular_skyrat\modules\mounted_machine_gun\code\ammobox.dm" #include "modular_skyrat\modules\mounted_machine_gun\code\mounted_machine_gun.dm" #include "modular_skyrat\modules\multicellcharger\code\multi_cell_charger.dm"