cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

useful commit message here

Browse Source
This commit is contained in:
Nerd Lord
2016-01-28 12:50:38 -05:00
parent cdcf4dbc26
commit d492db3e58
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/hud.dm
View File

@@ -101,7 +101,7 @@ var/datum/global_hud/global_hud = new()
var/obj/screen/blobpwrdisplay var/obj/screen/blobpwrdisplay
var/obj/screen/blobhealthdisplay var/obj/screen/blobhealthdisplay
var/obj/screen/guardian/healthdisplay var/obj/screen/guardianhealthdisplay
var/obj/screen/alien_plasma_display var/obj/screen/alien_plasma_display

12
code/modules/mob/living/simple_animal/guardian/guardian.dm
View File

@@ -99,7 +99,7 @@
resulthealth = round((summoner.health / abs(config.health_threshold_dead - summoner.maxHealth)) * 100) resulthealth = round((summoner.health / abs(config.health_threshold_dead - summoner.maxHealth)) * 100)
else else
resulthealth = round((summoner.health / summoner.maxHealth) * 100) resulthealth = round((summoner.health / summoner.maxHealth) * 100)
hud_used.healthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#efeeef'>[resulthealth]%</font></div>" hud_used.guardianhealthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#efeeef'>[resulthealth]%</font></div>"
/mob/living/simple_animal/hostile/guardian/adjustHealth(amount) //The spirit is invincible, but passes on damage to the summoner /mob/living/simple_animal/hostile/guardian/adjustHealth(amount) //The spirit is invincible, but passes on damage to the summoner
. = ..() . = ..()
@@ -749,11 +749,11 @@
var/obj/screen/using var/obj/screen/using
healthdisplay = new /obj/screen/guardian() guardianhealthdisplay = new /obj/screen/guardian()
healthdisplay.name = "summoner health" guardianhealthdisplay.name = "summoner health"
healthdisplay.screen_loc = ui_health guardianhealthdisplay.screen_loc = ui_health
healthdisplay.mouse_opacity = 0 guardianhealthdisplay.mouse_opacity = 0
adding += healthdisplay adding += guardianhealthdisplay
using = new /obj/screen/guardian/Manifest() using = new /obj/screen/guardian/Manifest()
using.screen_loc = ui_rhand using.screen_loc = ui_rhand