cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 17:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wizardry Fixes

Browse Source 
* Fixes #161
* Doubles the Magic Missile recharge time so that you can no longer perma stunlock people
* Lowers the amount of confusion subjugate does, also lowers its recharge time
This commit is contained in:
skull132
2016-02-21 17:48:48 +02:00
parent d42f82ef3d
commit a2fd4fac71
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/spells/targeted/equip/horsemask.dm
View File

@@ -5,7 +5,7 @@
charge_type = Sp_RECHARGE
charge_max = 150
charge_counter = 0
spell_flags = 0
spell_flags = SELECTABLE
invocation = "KN'A FTAGHU, PUCK 'BTHNK!"
invocation_type = SpI_SHOUT
range = 7

9
code/modules/spells/targeted/equip/remove_horsemask.dm
View File

@@ -5,7 +5,7 @@
charge_type = Sp_RECHARGE
charge_max = 150
charge_counter = 0
spell_flags = 0
spell_flags = SELECTABLE
invocation = "KN'A EUTH, PUCK 'BTHNK!"
invocation_type = SpI_SHOUT
range = 7
@@ -25,6 +25,7 @@
/spell/targeted/equip_item/remove_horsemask/cast(list/targets, mob/user = usr)
..()
for(var/mob/living/target in targets)
target.visible_message( "<span class='danger'>The horse head on [target]'s face lights up and burns away, revealing \his face.</span>", \
"<span class='danger'>Your face burns up once more, but you suddenly realize that you are no longer wearing a silly horsemask!</span>")
flick("e_flash", target.flash)
if (istype(target.wear_mask, /obj/item/clothing/mask/horsehead))
target.visible_message( "<span class='danger'>The horse head on [target]'s face lights up and burns away, revealing \his face.</span>", \
"<span class='danger'>Your face burns up once more, but you suddenly realize that you are no longer wearing a silly horsemask!</span>")
flick("e_flash", target.flash)

4
code/modules/spells/targeted/projectile/magic_missile.dm
View File

@@ -3,12 +3,12 @@
desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
school = "evocation"
charge_max = 150
charge_max = 300
spell_flags = NEEDSCLOTHES
invocation = "FORTI GY AMA"
invocation_type = SpI_SHOUT
range = 7
cooldown_min = 90 //15 deciseconds reduction per rank
cooldown_min = 150 //15 deciseconds reduction per rank
max_targets = 0

8
code/modules/spells/targeted/subjugate.dm
View File

@@ -3,7 +3,7 @@
desc = "This spell temporarily subjugates a target's mind and does not require wizard garb."
school = "transmutation"
charge_max = 300
charge_max = 250
spell_flags = 0
invocation = "DII ODA BAJI"
invocation_type = SpI_WHISPER
@@ -11,9 +11,9 @@
max_targets = 1
amt_dizziness = 300
amt_confused = 300
amt_stuttering = 300
amt_dizziness = 150
amt_confused = 150
amt_stuttering = 150
compatible_mobs = list(/mob/living/carbon/human)