do it via screen/act_intent instead

This commit is contained in:
Kyep
2018-07-27 17:15:25 -07:00
parent 740a35d248
commit da04b48df5
4 changed files with 18 additions and 39 deletions
@@ -79,11 +79,6 @@
var/deathmessage = ""
var/death_sound = null //The sound played on death
// Action Datums
var/datum/action/innate/simpleanimal/toggleintent/toggleintent_action
/mob/living/simple_animal/New()
..()
@@ -95,8 +90,6 @@
if(!istype(collar))
collar = new(src)
regenerate_icons()
toggleintent_action = new()
toggleintent_action.Grant(src)
/mob/living/simple_animal/Destroy()
if(collar)
@@ -579,31 +572,3 @@
/mob/living/simple_animal/SetEarDeaf()
return
// Actions
/datum/action/innate/simpleanimal/toggleintent
name = "Toggle Intent"
icon_icon = 'icons/mob/screen_bot.dmi'
button_icon_state = "help"
/datum/action/innate/simpleanimal/toggleintent/New(var/Target)
. = ..(Target)
UpdateButtonIcon()
/datum/action/innate/simpleanimal/toggleintent/Activate()
var/mob/living/simple_animal/user = owner
if(user.a_intent == INTENT_HELP)
user.a_intent = INTENT_HARM
else
user.a_intent = INTENT_HELP
UpdateButtonIcon()
/datum/action/innate/simpleanimal/toggleintent/UpdateButtonIcon()
var/mob/living/simple_animal/user = owner
if(user.a_intent == INTENT_HARM)
button_icon_state = "harm"
else
button_icon_state = "help"
return ..()
+1 -1
View File
@@ -356,7 +356,7 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
if(hud_used && hud_used.action_intent)
hud_used.action_intent.icon_state = "[a_intent]"
else if(isrobot(src) || islarva(src))
else if(isrobot(src) || islarva(src) || isanimal(src))
switch(input)
if(INTENT_HELP)
a_intent = INTENT_HELP