cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Made wizard spells into various subtypes"

Browse Source 
This reverts commit 8b703f55af.
This commit is contained in:
ZomgPonies
2014-07-23 10:58:20 -04:00
parent 5b395db88f
commit 800d5b4b0b
12 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+1 -1
View File
@@ -77,7 +77,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
if(istype(usr.wear_mask, /obj/item/clothing/mask/muzzle))
usr << "Mmmf mrrfff!"
return 0
var/obj/effect/proc_holder/spell/wizard/noclothes/spell = locate() in user.spell_list
var/obj/effect/proc_holder/spell/noclothes/spell = locate() in user.spell_list
if(clothes_req && !(spell && istype(spell)))//clothes check
if(!istype(usr, /mob/living/carbon/human))
usr << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans."
code/datums/spells/charge.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/targeted/wizard/charge
/obj/effect/proc_holder/spell/targeted/charge
name = "Charge"
desc = "This spell can be used to charge up spent magical artifacts, among other things."
code/datums/spells/construct_spells.dm
+1 -1
View File
@@ -72,7 +72,7 @@
summon_lifespan = 200
/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt/shift
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
name = "Phase Shift"
desc = "This spell allows you to pass through walls"
code/datums/spells/ethereal_jaunt.dm
+2 -2
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt
name = "Ethereal Jaunt"
desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
@@ -17,7 +17,7 @@
icon_power_button = "spell_jaunt"
/obj/effect/proc_holder/spell/targeted/wizard/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded
for(var/mob/living/target in targets)
spawn(0)
code/datums/spells/horsemask.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/targeted/wizard/horsemask
/obj/effect/proc_holder/spell/targeted/horsemask
name = "Curse of the Horseman"
desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes."
school = "transmutation"
code/datums/spells/knock.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/aoe_turf/wizard/knock
/obj/effect/proc_holder/spell/aoe_turf/knock
name = "Knock"
desc = "This spell opens nearby doors and does not require wizard garb."
code/datums/spells/mind_transfer.dm
+3 -3
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer
/obj/effect/proc_holder/spell/targeted/mind_transfer
name = "Mind Transfer"
desc = "This spell allows the user to switch bodies with a target."
@@ -25,7 +25,7 @@ Urist: I don't feel like figuring out how you store object spells so I'm leaving
Make sure spells that are removed from spell_list are actually removed and deleted when mind transfering.
Also, you never added distance checking after target is selected. I've went ahead and did that.
*/
/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer/cast(list/targets,mob/user = usr)
/obj/effect/proc_holder/spell/targeted/mind_transfer/cast(list/targets,mob/user = usr)
if(!targets.len)
user << "No mind found."
return
@@ -61,7 +61,7 @@ Also, you never added distance checking after target is selected. I've went ahea
//SPELL LOSS BEGIN
//NOTE: The caster must ALWAYS keep mind transfer, even when other spells are lost.
var/obj/effect/proc_holder/spell/targeted/wizard/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly.
var/obj/effect/proc_holder/spell/targeted/mind_transfer/m_transfer = locate() in user.spell_list//Find mind transfer directly.
var/list/checked_spells = user.spell_list
checked_spells -= m_transfer //Remove Mind Transfer from the list.
code/datums/spells/wizard.dm
+15 -15
View File
@@ -1,4 +1,4 @@
/obj/effect/proc_holder/spell/targeted/projectile/wizard/magic_missile
/obj/effect/proc_holder/spell/targeted/projectile/magic_missile
name = "Magic Missile"
desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
@@ -30,11 +30,11 @@
amt_weakened = 5
amt_dam_fire = 10
/obj/effect/proc_holder/spell/wizard/noclothes
/obj/effect/proc_holder/spell/noclothes
name = "No Clothes"
desc = "This is a placeholder for knowing if you dont need clothes for any spell"
/obj/effect/proc_holder/spell/targeted/genetic/wizard/mutate
/obj/effect/proc_holder/spell/targeted/genetic/mutate
name = "Mutate"
desc = "This spell causes you to turn into a hulk and gain laser vision for a short while."
@@ -51,7 +51,7 @@
duration = 300
cooldown_min = 300 //25 deciseconds reduction per rank
/obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/disintegrate
/obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate
name = "Disintegrate"
desc = "This spell instantly kills somebody adjacent to you with the vilest of magick."
@@ -70,7 +70,7 @@
icon_power_button = "spell_disintegrate"
/obj/effect/proc_holder/spell/targeted/wizard/smoke
/obj/effect/proc_holder/spell/targeted/smoke
name = "Smoke"
desc = "This spell spawns a cloud of choking smoke at your location and does not require wizard garb."
@@ -88,7 +88,7 @@
icon_power_button = "spell_smoke"
/obj/effect/proc_holder/spell/targeted/emplosion/wizard/disable_tech
/obj/effect/proc_holder/spell/targeted/emplosion/disable_tech
name = "Disable Tech"
desc = "This spell disables all weapons, cameras and most other technology in range."
charge_max = 400
@@ -104,7 +104,7 @@
icon_power_button = "spell_tech"
/obj/effect/proc_holder/spell/targeted/turf_teleport/wizard/blink
/obj/effect/proc_holder/spell/targeted/turf_teleport/blink
name = "Blink"
desc = "This spell randomly teleports you a short distance."
@@ -128,7 +128,7 @@
icon_power_button = "spell_blink"
/obj/effect/proc_holder/spell/targeted/area_teleport/wizard/teleport
/obj/effect/proc_holder/spell/targeted/area_teleport/teleport
name = "Teleport"
desc = "This spell teleports you to a type of area of your selection."
@@ -146,7 +146,7 @@
icon_power_button = "spell_teleport"
/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/forcewall
/obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall
name = "Forcewall"
desc = "This spell creates an unbreakable wall that lasts for 30 seconds and does not need wizard garb."
@@ -163,7 +163,7 @@
icon_power_button = "spell_forcewall"
/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/carp
/obj/effect/proc_holder/spell/aoe_turf/conjure/carp
name = "Summon Carp"
desc = "This spell conjures a simple carp."
@@ -177,7 +177,7 @@
summon_type = list(/mob/living/simple_animal/hostile/carp)
/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/construct
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct
name = "Artificer"
desc = "This spell conjures a construct which may be controlled by Shades"
@@ -191,7 +191,7 @@
summon_type = list(/obj/structure/constructshell)
/obj/effect/proc_holder/spell/aoe_turf/conjure/wizard/creature
/obj/effect/proc_holder/spell/aoe_turf/conjure/creature
name = "Summon Creature Swarm"
desc = "This spell tears the fabric of reality, allowing horrific daemons to spill forth"
@@ -205,7 +205,7 @@
summon_type = list(/mob/living/simple_animal/hostile/creature)
/obj/effect/proc_holder/spell/targeted/trigger/wizard/blind
/obj/effect/proc_holder/spell/targeted/trigger/blind
name = "Blind"
desc = "This spell temporarily blinds a single person and does not require wizard garb."
@@ -229,7 +229,7 @@
disabilities = 1
duration = 300
/obj/effect/proc_holder/spell/targeted/inflict_handler/wizard/flesh_to_stone
/obj/effect/proc_holder/spell/targeted/inflict_handler/flesh_to_stone
name = "Flesh to Stone"
desc = "This spell turns a single person into an inert statue for a long period of time."
@@ -246,7 +246,7 @@
icon_power_button = "spell_stone"
/obj/effect/proc_holder/spell/dumbfire/wizard/fireball
/obj/effect/proc_holder/spell/dumbfire/fireball
name = "Fireball"
desc = "This spell fires a fireball at a target and does not require wizard garb."