[MIRROR] Separates actions.dmi into multiple files (#2214)

* Separates actions.dmi into multiple files

* Delete beam_rifle.dm.rej

* Delete action.dm.rej
This commit is contained in:
CitadelStationBot
2017-08-03 08:09:39 -05:00
committed by kevinz000
parent cfa77cdc18
commit 1b22c5fe0c
50 changed files with 97 additions and 19 deletions
+1 -1
View File
@@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
var/critfailchance = 0
var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2
var/action_icon = 'icons/mob/actions.dmi'
var/action_icon = 'icons/mob/actions/actions_spells.dmi'
var/action_icon_state = "spell_default"
var/action_background_icon_state = "bg_spell"
var/datum/action/spell_action/action
@@ -9,6 +9,7 @@
range = 1
cooldown_min = 0
overlay = null
action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
action_icon_state = "bloodcrawl"
action_background_icon_state = "bg_demon"
var/phased = 0
@@ -2,6 +2,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser
charge_max = 1800
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "artificer"
action_background_icon_state = "bg_demon"
@@ -20,6 +21,7 @@
invocation = "none"
invocation_type = "none"
range = 2
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "areaconvert"
action_background_icon_state = "bg_cult"
@@ -40,6 +42,7 @@
invocation_type = "none"
range = 0
summon_type = list(/turf/open/floor/engine/cult)
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "floorconstruct"
action_background_icon_state = "bg_cult"
@@ -54,6 +57,7 @@
invocation = "none"
invocation_type = "none"
range = 0
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "lesserconstruct"
action_background_icon_state = "bg_cult"
@@ -83,6 +87,7 @@
invocation = "none"
invocation_type = "none"
range = 0
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "summonsoulstone"
action_background_icon_state = "bg_demon"
@@ -109,6 +114,7 @@
range = 0
summon_type = list(/obj/effect/forcefield/cult)
summon_lifespan = 200
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "cultforcewall"
action_background_icon_state = "bg_demon"
@@ -125,6 +131,7 @@
range = -1
include_user = 1
jaunt_duration = 50 //in deciseconds
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "phaseshift"
action_background_icon_state = "bg_demon"
jaunt_in_time = 12
@@ -164,7 +171,7 @@
smoke_spread = 3
smoke_amt = 4
action_icon_state = "parasmoke"
action_icon_state = "smoke"
action_background_icon_state = "bg_cult"
@@ -182,6 +189,7 @@
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_background_icon_state = "bg_demon"
action_icon_state = "abyssal_gaze"
@@ -222,6 +230,7 @@
clothes_req = FALSE
invocation = "none"
invocation_type = "none"
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_background_icon_state = "bg_demon"
action_icon_state = "dominate"
+5 -1
View File
@@ -10,6 +10,7 @@
school = "conjuration"
charge_max = 150
cooldown_min = 10
action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
action_icon_state = "pitchfork"
action_background_icon_state = "bg_demon"
@@ -26,6 +27,7 @@
invocation = "I aint have this much fun since Georgia."
action_icon_state = "golden_violin"
name = "Summon golden violin"
action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
action_background_icon_state = "bg_demon"
/obj/effect/proc_holder/spell/targeted/summon_contract
@@ -110,7 +112,7 @@
user.infernalphasein()
else
to_chat(user, "<span class='warning'>You are no longer near a potential signer.</span>")
else
to_chat(user, "<span class='warning'>You can only re-appear near a potential signer.")
revert_cast()
@@ -178,6 +180,7 @@
cooldown_min = 0
overlay = null
include_user = 0
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "sintouch"
action_background_icon_state = "bg_demon"
phase_allowed = 0
@@ -213,6 +216,7 @@
school = "conjuration"
charge_max = 10
cooldown_min = 50 //5 seconds, so the smoke can't be spammed
action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
action_icon_state = "funk"
action_background_icon_state = "bg_demon"
@@ -8,6 +8,7 @@
school = "conjuration"
charge_max = 100
cooldown_min = 10
action_icon = 'icons/mob/actions/actions_minor_antag.dmi'
action_icon_state = "moneybag"
@@ -34,6 +35,7 @@
clothes_req = 0
charge_max = 50
cooldown_min = 10
action_icon = 'icons/mob/actions/actions_silicon.dmi'
action_icon_state = "camera_jump"
var/ranges = list(7,8,9,10)
@@ -52,6 +54,7 @@
clothes_req = 0
charge_max = 50
cooldown_min = 10
action_icon = 'icons/mob/actions/actions_spells.dmi'
action_icon_state = "sacredflame"
var/mob/living/friend
var/obj/effect/mob_spawn/human/demonic_friend/friendShell
@@ -17,6 +17,7 @@
cooldown_min = 10
include_user = 1
action_icon = 'icons/mob/actions/actions_spells.dmi'
action_icon_state = "skeleton"
/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr)
@@ -5,6 +5,7 @@
cooldown_min = 0
level_max = 1
clothes_req = 0
action_icon = 'icons/mob/actions/actions_items.dmi'
action_icon_state = "voice_of_god"
var/command
var/cooldown_mod = 1
@@ -301,6 +301,7 @@
cooldown_min = 150
invocation_type = "none"
sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep
action_icon = 'icons/mob/actions/actions_xeno.dmi'
action_icon_state = "tailsweep"
action_background_icon_state = "bg_alien"