From 8beda90c8191fc79066d5ddb9c85da57f7634201 Mon Sep 17 00:00:00 2001 From: Menshin Date: Wed, 28 May 2014 16:28:53 +0200 Subject: [PATCH] * Added a "stop pulling" button to monkeys and alien larva * Make aliens use their hud "intent button". * Make monkeys use the current selected (e.g midnight) hud "intent button". --- code/_onclick/hud/alien.dm | 1 + code/_onclick/hud/alien_larva.dm | 1 + code/_onclick/hud/monkey.dm | 1 + code/modules/mob/living/carbon/alien/larva/life.dm | 7 +++++-- code/modules/mob/living/carbon/monkey/life.dm | 7 +++++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm index 9b34f7bcc6e..270d848eab9 100644 --- a/code/_onclick/hud/alien.dm +++ b/code/_onclick/hud/alien.dm @@ -72,6 +72,7 @@ using = new /obj/screen() using.name = "act_intent" + using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = mymob.a_intent using.screen_loc = ui_acti using.layer = 20 diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index cf9df80ad3b..d1888d6d369 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -6,6 +6,7 @@ using = new /obj/screen() using.name = "act_intent" + using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = mymob.a_intent using.screen_loc = ui_acti using.layer = 20 diff --git a/code/_onclick/hud/monkey.dm b/code/_onclick/hud/monkey.dm index a4e18e38a32..fecbfb5c513 100644 --- a/code/_onclick/hud/monkey.dm +++ b/code/_onclick/hud/monkey.dm @@ -7,6 +7,7 @@ using = new /obj/screen() using.name = "act_intent" + using.icon = ui_style using.icon_state = mymob.a_intent using.screen_loc = ui_acti using.layer = 20 diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 90ca908de60..cb4774f6b90 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -326,8 +326,11 @@ else healths.icon_state = "health6" - if(pullin) pullin.icon_state = "pull[pulling ? 1 : 0]" - + if(pullin) + if(pulling) + pullin.icon_state = "pull" + else + pullin.icon_state = "pull0" if (toxin) toxin.icon_state = "tox[toxins_alert ? 1 : 0]" if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]" diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 657a2ef15f7..220b99380f6 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -511,8 +511,11 @@ if(pressure) pressure.icon_state = "pressure[pressure_alert]" - if(pullin) pullin.icon_state = "pull[pulling ? 1 : 0]" - + if(pullin) + if(pulling) + pullin.icon_state = "pull" + else + pullin.icon_state = "pull0" if (toxin) toxin.icon_state = "tox[toxins_alert ? 1 : 0]" if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"