mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 03:25:49 +01:00
Adds more magic items and spells to the wizard spellbook (#15036)
* touches more or less everthing that is magic * Other changes I forgot to put in * removes extra s * nevermind lets not do drake form * Apply suggestions from code review Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Better variable name * Heart curse removed * Re adds new stuff Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
@@ -300,6 +300,7 @@
|
||||
icon = 'icons/obj/lavaland/artefacts.dmi'
|
||||
icon_state = "blue_cube"
|
||||
var/obj/item/warp_cube/linked
|
||||
var/cooldown = FALSE
|
||||
|
||||
/obj/item/warp_cube/Destroy()
|
||||
if(linked)
|
||||
@@ -315,6 +316,9 @@
|
||||
if(is_in_teleport_proof_area(user) || is_in_teleport_proof_area(linked))
|
||||
to_chat(user, "<span class='warning'>[src] sparks and fizzles.</span>")
|
||||
return
|
||||
if(cooldown)
|
||||
to_chat(user, "<span class='warning'>[src] sparks and fizzles.</span>")
|
||||
return
|
||||
|
||||
var/datum/effect_system/smoke_spread/smoke = new
|
||||
smoke.set_up(1, 0, user.loc)
|
||||
@@ -326,6 +330,13 @@
|
||||
var/datum/effect_system/smoke_spread/smoke2 = new
|
||||
smoke2.set_up(1, 0, user.loc)
|
||||
smoke2.start()
|
||||
cooldown = TRUE
|
||||
linked.cooldown = TRUE
|
||||
addtimer(CALLBACK(src, .proc/reset), 20 SECONDS)
|
||||
|
||||
/obj/item/warp_cube/proc/reset()
|
||||
cooldown = FALSE
|
||||
linked.cooldown = FALSE
|
||||
|
||||
/obj/item/warp_cube/red
|
||||
name = "red cube"
|
||||
|
||||
@@ -182,6 +182,10 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
|
||||
if(iscultist(owner))
|
||||
power_multiplier *= 2
|
||||
|
||||
//It's magic, they are a wizard.
|
||||
if(iswizard(owner))
|
||||
power_multiplier *= 2.5
|
||||
|
||||
//Try to check if the speaker specified a name or a job to focus on
|
||||
var/list/specific_listeners = list()
|
||||
var/found_string = null
|
||||
@@ -477,3 +481,10 @@ GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby"))
|
||||
|
||||
message_admins("[key_name_admin(owner)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
|
||||
log_game("[key_name(owner)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
|
||||
|
||||
/obj/item/organ/internal/vocal_cords/colossus/wizard
|
||||
desc = "They carry the voice of an ancient god. This one is enchanted to implant it into yourself when used in hand"
|
||||
|
||||
/obj/item/organ/internal/vocal_cords/colossus/wizard/attack_self(mob/living/user)
|
||||
user.drop_item()
|
||||
insert(user)
|
||||
|
||||
Reference in New Issue
Block a user