cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15757 from warior4356/holy-chapel

Browse Source 
Makes the chapel holy once more.
This commit is contained in:
variableundefined
2021-07-25 08:37:18 -04:00
committed by GitHub
parent ea316e7fca ba8052af3f
commit b9aa1facce
15 changed files with 123 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+5
View File
@@ -121,6 +121,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
var/critfailchance = 0
var/centcom_cancast = TRUE //Whether or not the spell should be allowed on the admin zlevel
/// Whether or not the spell functions in a holy place
var/holy_area_cancast = TRUE
var/datum/action/spell_action/action = null
var/action_icon = 'icons/mob/actions/actions.dmi'
@@ -561,6 +563,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if(is_admin_level(user.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
return 0
if(!holy_area_cancast && user.holy_check())
return FALSE
if(charge_check)
switch(charge_type)
if("recharge")
code/datums/spells/construct_spells.dm
+9
View File
@@ -18,6 +18,7 @@
range = 0
summon_type = list(/turf/simulated/floor/engine/cult)
centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Summon Cult Wall"
@@ -32,6 +33,7 @@
range = 0
summon_type = list(/turf/simulated/wall/cult/artificer) //we don't want artificer-based runed metal farms
centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
@@ -43,6 +45,7 @@
invocation_type = "none"
range = 0
centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
delay = 50
summon_type = list(/turf/simulated/wall/r_wall)
@@ -58,6 +61,7 @@
invocation = "none"
invocation_type = "none"
range = 0
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/item/soulstone)
@@ -77,6 +81,7 @@
invocation = "none"
invocation_type = "none"
range = 0
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/structure/cult/functional/pylon)
@@ -92,6 +97,7 @@
invocation = "none"
invocation_type = "none"
range = 0
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/effect/forcefield/cult)
summon_lifespan = 200
@@ -111,6 +117,7 @@
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
jaunt_in_time = 12
jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith
jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out
@@ -137,6 +144,7 @@
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
proj_lifespan = 10
max_targets = 6
@@ -150,6 +158,7 @@
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
range = -1
include_user = 1
cooldown_min = 20 //25 deciseconds reduction per rank