cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes lightning bolt not giving tesla shock immunity when granted by an admin (#66973)

Browse Source
This commit is contained in:
SmArtKar
2022-05-15 14:41:36 -04:00
committed by GitHub
parent 480751a6f4
commit e0fc6b0e39
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/wizard/equipment/spellbook.dm
-8
View File
@@ -255,14 +255,6 @@
spell_type = /obj/effect/proc_holder/spell/aimed/lightningbolt
cost = 1
/datum/spellbook_entry/lightningbolt/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return TRUE on success
. = ..()
ADD_TRAIT(user, TRAIT_TESLA_SHOCKIMMUNE, "lightning_bolt_spell")
/datum/spellbook_entry/lightningbolt/Refund(mob/living/carbon/human/user, obj/item/spellbook/book)
. = ..()
REMOVE_TRAIT(user, TRAIT_TESLA_SHOCKIMMUNE, "lightning_bolt_spell")
/datum/spellbook_entry/infinite_guns
name = "Lesser Summon Guns"
desc = "Why reload when you have infinite guns? Summons an unending stream of bolt action rifles that deal little damage, but will knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Arcane Barrage."
code/modules/spells/spell_types/aimed.dm
+8
View File
@@ -115,6 +115,14 @@
deactive_msg = "You let the energy flow out of your hands back into yourself..."
projectile_type = /obj/projectile/magic/aoe/lightning
/obj/effect/proc_holder/spell/aimed/lightningbolt/on_gain(mob/living/user)
. = ..()
ADD_TRAIT(user, TRAIT_TESLA_SHOCKIMMUNE, "lightning_bolt_spell")
/obj/effect/proc_holder/spell/aimed/lightningbolt/on_lose(mob/living/user)
. = ..()
REMOVE_TRAIT(user, TRAIT_TESLA_SHOCKIMMUNE, "lightning_bolt_spell")
/obj/effect/proc_holder/spell/aimed/fireball
name = "Fireball"
desc = "This spell fires an explosive fireball at a target."