Merge pull request #13055 from Anonus/actionbuttons

Gives constructs action buttons, adds cool effects to cult turfs.
This commit is contained in:
Remie Richards
2015-11-18 20:26:47 +00:00
15 changed files with 89 additions and 42 deletions
+21 -8
View File
@@ -2,13 +2,15 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser
charge_max = 1800
action_icon_state = "artificer"
action_background_icon_state = "bg_demon"
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult
cult_req = 1
charge_max = 2500
/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
name = "Floor Construction"
name = "Summon Cult Floor"
desc = "This spell constructs a cult floor"
school = "conjuration"
@@ -17,11 +19,12 @@
invocation = "none"
invocation_type = "none"
range = 0
summon_type = list(/turf/simulated/floor/plasteel/cult)
centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
summon_type = list(/turf/simulated/floor/engine/cult)
action_icon_state = "floorconstruct"
action_background_icon_state = "bg_cult"
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Lesser Construction"
name = "Summon Cult Wall"
desc = "This spell constructs a cult wall"
school = "conjuration"
@@ -30,8 +33,10 @@
invocation = "none"
invocation_type = "none"
range = 0
action_icon_state = "lesserconstruct"
action_background_icon_state = "bg_cult"
summon_type = list(/turf/simulated/wall/cult)
centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
@@ -43,7 +48,6 @@
invocation = "none"
invocation_type = "none"
range = 0
centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
summon_type = list(/turf/simulated/wall/r_wall)
@@ -57,7 +61,8 @@
invocation = "none"
invocation_type = "none"
range = 0
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_demon"
summon_type = list(/obj/item/device/soulstone)
@@ -76,8 +81,10 @@
invocation = "none"
invocation_type = "none"
range = 0
summon_type = list(/obj/effect/forcefield)
summon_type = list(/obj/effect/forcefield/cult)
summon_lifespan = 200
action_icon_state = "cultforcewall"
action_background_icon_state = "bg_demon"
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
@@ -93,6 +100,8 @@
include_user = 1
jaunt_duration = 50 //in deciseconds
centcom_cancast = 0 //Stop people from getting to centcom
action_icon_state = "phaseshift"
action_background_icon_state = "bg_demon"
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/jaunt_disappear(atom/movable/overlay/animation, mob/living/target)
animation.icon_state = "phase_shift"
@@ -118,6 +127,8 @@
invocation_type = "none"
proj_lifespan = 10
max_targets = 6
action_icon_state = "magicm"
action_background_icon_state = "bg_demon"
/obj/effect/proc_holder/spell/targeted/smoke/disable
@@ -135,3 +146,5 @@
smoke_spread = 3
smoke_amt = 4
action_icon_state = "parasmoke"
action_background_icon_state = "bg_cult"