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

Merged forcewall and greater forcewall into a single spell (#19739)

Browse Source
This commit is contained in:
AzuleUtama
2022-11-24 21:52:24 +00:00
committed by GitHub
parent 3e7684ad20
commit bfdeb87aed
5 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/mime.dm
-1
View File
@@ -76,7 +76,6 @@
action_icon_state = "mime_bigwall"
action_background_icon_state = "bg_mime"
large = TRUE
/obj/effect/proc_holder/spell/forcewall/mime/Click()
if(usr && usr.mind)
code/datums/spells/wizard.dm
+7 -19
View File
@@ -192,7 +192,7 @@
/obj/effect/proc_holder/spell/forcewall
name = "Force Wall"
desc = "This spell creates a small unbreakable wall that only you can pass through, and does not need wizard garb. Lasts 30 seconds."
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."
school = "transmutation"
base_cooldown = 100
@@ -203,30 +203,18 @@
action_icon_state = "shield"
cooldown_min = 50 //12 deciseconds reduction per rank
var/wall_type = /obj/effect/forcefield/wizard
var/large = FALSE
/obj/effect/proc_holder/spell/forcewall/create_new_targeting()
return new /datum/spell_targeting/self
/obj/effect/proc_holder/spell/forcewall/cast(list/targets, mob/user = usr)
new wall_type(get_turf(user), user)
if(large) //Extra THICK
if(user.dir == SOUTH || user.dir == NORTH)
new wall_type(get_step(user, EAST), user)
new wall_type(get_step(user, WEST), user)
else
new wall_type(get_step(user, NORTH), user)
new wall_type(get_step(user, SOUTH), user)
/obj/effect/proc_holder/spell/forcewall/greater
name = "Greater Force Wall"
desc = "Create a larger magical barrier that only you can pass through, but requires wizard garb. Lasts 30 seconds."
clothes_req = TRUE
invocation = "TARCOL GRANDI ZHERI"
invocation_type = "shout"
large = TRUE
action_icon_state = "shield_greater"
if(user.dir == SOUTH || user.dir == NORTH)
new wall_type(get_step(user, EAST), user)
new wall_type(get_step(user, WEST), user)
else
new wall_type(get_step(user, NORTH), user)
new wall_type(get_step(user, SOUTH), user)
/obj/effect/proc_holder/spell/aoe/conjure/timestop
name = "Stop Time"