cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 02:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Buff wizard apprentice, limits to one per wizard (The Sequel) (#23258)

Browse Source 
* Buff wizard apprentice, limits to one per wizard

* Update restoration apprentice

* fix name of staff of healing

* rebuild tgui

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Apply snake case

* Update tgui.bundle.js

* Update code/game/gamemodes/wizard/artefact.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* remove forcewall from stealth

* tgui update and useless comment removal

* Update code/datums/spells/wizard_spells.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* update tgui

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
datlo
2023-12-14 21:35:21 +01:00
committed by GitHub
parent 5a163d7f7a
commit ff53bdd87f
7 changed files with 149 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/banana_touch.dm
+11
View File
@@ -19,6 +19,17 @@
icon_state = "banana_touch"
item_state = "banana_touch"
/obj/effect/proc_holder/spell/touch/banana/apprentice
hand_path = /obj/item/melee/touch_attack/banana/apprentice
/obj/item/melee/touch_attack/banana/apprentice
/obj/item/melee/touch_attack/banana/apprentice/afterattack(atom/target, mob/living/carbon/user, proximity)
if(iswizard(target) && target != user)
to_chat(user, "<span class='danger'>Seriously?! Honk THEM, not me!</span>")
return
..()
/obj/item/melee/touch_attack/banana/afterattack(atom/target, mob/living/carbon/user, proximity)
if(!proximity || target == user || !ishuman(target) || !iscarbon(user) || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED))
return
code/datums/spells/wizard_spells.dm
+26
View File
@@ -190,6 +190,29 @@
/obj/effect/proc_holder/spell/area_teleport/teleport/create_new_targeting()
return new /datum/spell_targeting/self
/obj/effect/proc_holder/spell/return_to_teacher
name = "Return to Teacher"
desc = "This spell teleports you back to your teacher."
school = "abjuration"
base_cooldown = 30 SECONDS
clothes_req = TRUE
invocation = "SCYAR TESO"
invocation_type = "shout"
cooldown_min = 10 SECONDS
action_icon_state = "spell_teleport"
var/datum/mind/teacher
/obj/effect/proc_holder/spell/return_to_teacher/create_new_targeting()
return new /datum/spell_targeting/self
/obj/effect/proc_holder/spell/return_to_teacher/cast(list/targets, mob/living/user = usr)
if(!(teacher && teacher.current))
to_chat(user, "<span class='danger'>The link to your teacher is broken!</span>")
return
do_teleport(user, teacher.current, 1, sound_in = 'sound/magic/blink.ogg', sound_out = 'sound/magic/blink.ogg', safe_turf_pick = TRUE)
/obj/effect/proc_holder/spell/forcewall
name = "Force Wall"
desc = "This spell creates a 3 tile wide unbreakable wall that only you can pass through, and does not need wizard garb. Lasts 30 seconds."
@@ -332,6 +355,9 @@
active = FALSE
/obj/effect/proc_holder/spell/fireball/apprentice
centcom_cancast = FALSE
/obj/effect/proc_holder/spell/fireball/create_new_targeting()
var/datum/spell_targeting/clicked_atom/C = new()
C.range = 20