cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3805 from Menshin/hud_and_pulling

Browse Source 
Non-human HUD polishing (stop pulling and intent buttons)
This commit is contained in:
Cheridan
2014-06-13 17:58:49 -05:00
parent 4a26037c16 8beda90c81
commit 514ed5f0af
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/hud/alien.dm
+1
View File
@@ -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
code/_onclick/hud/alien_larva.dm
+1
View File
@@ -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
code/_onclick/hud/monkey.dm
+1
View File
@@ -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
code/modules/mob/living/carbon/alien/larva/life.dm
+5 -2
View File
@@ -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]"
code/modules/mob/living/carbon/monkey/life.dm
+5 -2
View File
@@ -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]"