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

* Separates actions.dmi into multiple files * Delete beam_rifle.dm.rej * Delete action.dm.rej
2017-08-03 08:09:39 -05:00
parent cfa77cdc18
commit 1b22c5fe0c
50 changed files with 97 additions and 19 deletions
@@ -13,7 +13,7 @@ Doesn't work on other aliens/AI.*/
 	var/check_turf = 0
 	var/has_action = 1
 	var/datum/action/spell_action/alien/action = null
-	var/action_icon = 'icons/mob/actions.dmi'
+	var/action_icon = 'icons/mob/actions/actions_xeno.dmi'
 	var/action_icon_state = "spell_default"
 	var/action_background_icon_state = "bg_alien"

@@ -66,6 +66,7 @@
 /datum/action/innate/flight
 	name = "Toggle Flight"
 	check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_STUN
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "flight"

 /datum/action/innate/flight/Activate()
@@ -963,6 +963,7 @@
 /datum/action/innate/deploy_shell
 	name = "Deploy to AI Shell"
 	desc = "Wirelessly control a specialized cyborg shell."
+	icon_icon = 'icons/mob/actions/actions_AI.dmi'
 	button_icon_state = "ai_shell"

 /datum/action/innate/deploy_shell/Trigger()
@@ -974,6 +975,7 @@
 /datum/action/innate/deploy_last_shell
 	name = "Reconnect to shell"
 	desc = "Reconnect to the most recently used AI shell."
+	icon_icon = 'icons/mob/actions/actions_AI.dmi'
 	button_icon_state = "ai_last_shell"
 	var/mob/living/silicon/robot/last_used_shell

@@ -161,6 +161,7 @@

 /datum/action/innate/pai
 	name = "PAI Action"
+	icon_icon = 'icons/mob/actions/actions_silicon.dmi'
 	var/mob/living/silicon/pai/P

 /datum/action/innate/pai/Trigger()
@@ -197,8 +198,10 @@
 /datum/action/innate/pai/rest/Trigger()
 	..()
 	P.lay_down()
+
 /datum/action/innate/pai/light
 	name = "Toggle Integrated Lights"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
 	button_icon_state = "emp"
 	background_icon_state = "bg_tech"

@@ -1081,6 +1081,7 @@
 /datum/action/innate/undeployment
 	name = "Disconnect from shell"
 	desc = "Stop controlling your shell and resume normal core operations."
+ 	icon_icon = 'icons/mob/actions/actions_AI.dmi'
 	button_icon_state = "ai_core"

 /datum/action/innate/undeployment/Trigger()
@@ -383,6 +383,7 @@
 /datum/action/innate/seek_prey
 	name = "Seek the Harvest"
 	desc = "None can hide from Nar'Sie, activate to track a survivor attempting to flee the red harvest!"
+	icon_icon = 'icons/mob/actions/actions_cult.dmi'
 	background_icon_state = "bg_demon"
 	buttontooltipstyle = "cult"
 	button_icon_state = "cult_mark"
@@ -196,5 +196,6 @@

 /datum/action/generic/drone/select_filter
 	name = "Select Vision Filter"
+	icon_icon = 'icons/mob/actions/actions_silicon.dmi'
 	button_icon_state = "drone_vision"
 	procname = /mob/living/simple_animal/drone/verb/toggle_statics
@@ -27,6 +27,7 @@
 //Lets the wizard summon his art to fight for him
 /datum/action/boss/wizard_summon_minions
 	name = "Summon Minions"
+	icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
 	button_icon_state = "art_summon"
 	usage_probability = 40
 	boss_cost = 30
@@ -54,6 +55,7 @@
 //Hitting the wizard himself destroys all decoys
 /datum/action/boss/wizard_mimic
 	name = "Craft Mimicry"
+	icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'
 	button_icon_state = "mimic_summon"
 	usage_probability = 30
 	boss_cost = 40
@@ -754,6 +754,7 @@ Difficulty: Very Hard
 	range = -1
 	include_user = 1
 	selection_type = "view"
+	action_icon = 'icons/mob/actions/actions_spells.dmi'
 	action_icon_state = "exit_possession"
 	sound = null

@@ -293,7 +293,7 @@ Difficulty: Medium
 	animate(src, pixel_z = 0, time = duration)

 /obj/effect/temp_visual/target
-	icon = 'icons/mob/actions.dmi'
+	icon = 'icons/mob/actions/actions_items.dmi'
 	icon_state = "sniper_zoom"
 	layer = BELOW_MOB_LAYER
 	light_range = 2
@@ -7,6 +7,7 @@

 /datum/action/innate/slime
 	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_slime.dmi'
 	background_icon_state = "bg_alien"
 	var/needs_growth = NO_GROWTH_NEEDED