cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 15:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes a few plane issues (#16712)

Browse Source 
* fixes a few plane issues

* dme

* -
This commit is contained in:
Kashargul
2024-12-16 10:06:43 +10:00
committed by GitHub
parent 4e056c9560
commit 21f495a32e
10 changed files with 133 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_helpers.dm
+4
View File
@@ -160,6 +160,10 @@
hud_list[IMPTRACK_HUD] = gen_hud_image(ingame_hud, src, "hudblank", plane = PLANE_CH_IMPTRACK)
hud_list[SPECIALROLE_HUD] = gen_hud_image(ingame_hud, src, "hudblank", plane = PLANE_CH_SPECIAL)
hud_list[STATUS_HUD_OOC] = gen_hud_image(ingame_hud, src, "hudhealthy", plane = PLANE_CH_STATUS_OOC)
hud_list[HEALTH_VR_HUD] = gen_hud_image(ingame_hud_med_vr, src, "100", plane = PLANE_CH_HEALTH_VR)
hud_list[STATUS_R_HUD] = gen_hud_image(ingame_hud_vr, src, "hudblank", plane = PLANE_CH_STATUS_R)
hud_list[BACKUP_HUD] = gen_hud_image(ingame_hud_vr, src, "hudblank", plane = PLANE_CH_BACKUP)
hud_list[VANTAG_HUD] = gen_hud_image(ingame_hud_vr, src, "hudblank", plane = PLANE_CH_VANTAG)
add_overlay(hud_list)
/mob/living/carbon/human/recalculate_vis()
code/modules/mob/living/carbon/human/human_helpers_vr.dm
-7
View File
@@ -1,13 +1,6 @@
var/static/icon/ingame_hud_vr = icon('icons/mob/hud_vr.dmi')
var/static/icon/ingame_hud_med_vr = icon('icons/mob/hud_med_vr.dmi')
/mob/living/carbon/human/make_hud_overlays()
. = ..()
hud_list[HEALTH_VR_HUD] = gen_hud_image(ingame_hud_med_vr, src, "100", plane = PLANE_CH_HEALTH_VR)
hud_list[STATUS_R_HUD] = gen_hud_image(ingame_hud_vr, src, plane = PLANE_CH_STATUS_R)
hud_list[BACKUP_HUD] = gen_hud_image(ingame_hud_vr, src, plane = PLANE_CH_BACKUP)
hud_list[VANTAG_HUD] = gen_hud_image(ingame_hud_vr, src, plane = PLANE_CH_VANTAG)
/mob/living/carbon/human/proc/remove_marking(var/datum/sprite_accessory/marking/mark_datum)
if (!mark_datum)
return FALSE
code/modules/mob/living/carbon/human/life.dm
+36 -1
View File
@@ -2016,13 +2016,16 @@
/mob/living/carbon/human/proc/handle_hud_list()
if (BITTEST(hud_updateflag, HEALTH_HUD))
var/image/holder = grab_hud(HEALTH_HUD)
var/image/health_us = grab_hud(HEALTH_VR_HUD)
if(stat == DEAD)
holder.icon_state = "-100" // X_X
else
holder.icon_state = RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(getMaxHealth()-CONFIG_GET(number/health_threshold_crit))*100)
if(block_hud)
holder.icon_state = "hudblank"
health_us.icon_state = holder.icon_state
apply_hud(HEALTH_HUD, holder)
apply_hud(HEALTH_VR_HUD, health_us)
if (BITTEST(hud_updateflag, LIFE_HUD))
var/image/holder = grab_hud(LIFE_HUD)
@@ -2045,6 +2048,7 @@
var/image/holder = grab_hud(STATUS_HUD)
var/image/holder2 = grab_hud(STATUS_HUD_OOC)
var/image/status_r = grab_hud(STATUS_R_HUD)
if (isSynthetic())
holder.icon_state = "hudrobo"
else if(stat == DEAD)
@@ -2071,7 +2075,9 @@
holder.icon_state = "hudblank"
holder2.icon_state = "hudblank"
status_r.icon_state = holder.icon_state
apply_hud(STATUS_HUD, holder)
apply_hud(STATUS_R_HUD, status_r)
apply_hud(STATUS_HUD_OOC, holder2)
if (BITTEST(hud_updateflag, ID_HUD))
@@ -2153,7 +2159,36 @@
holder.icon_state = "hudsyndicate"
apply_hud(SPECIALROLE_HUD, holder)
attempt_vr(src,"handle_hud_list_vr",list()) //VOREStation Add - Custom HUDs.
//Backup implant hud status
if (BITTEST(hud_updateflag, BACKUP_HUD))
var/image/holder = grab_hud(BACKUP_HUD)
holder.icon_state = "hudblank"
for(var/obj/item/organ/external/E in organs)
for(var/obj/item/implant/I in E.implants)
if(I.implanted && istype(I,/obj/item/implant/backup))
var/obj/item/implant/backup/B = I
if(!mind)
holder.icon_state = "hud_backup_nomind"
else if(!(mind.name in B.our_db.body_scans))
holder.icon_state = "hud_backup_nobody"
else
holder.icon_state = "hud_backup_norm"
if(block_hud)
holder.icon_state = "hudblank"
apply_hud(BACKUP_HUD, holder)
//VOREStation Antag Hud
if (BITTEST(hud_updateflag, VANTAG_HUD))
var/image/vantag = grab_hud(VANTAG_HUD)
if(vantag_pref)
vantag.icon_state = vantag_pref
else
vantag.icon_state = "hudblank"
if(block_hud)
vantag.icon_state = "hudblank"
apply_hud(VANTAG_HUD, vantag)
hud_updateflag = 0
code/modules/mob/living/carbon/human/life_vr.dm
-52
View File
@@ -14,57 +14,6 @@
species.silk_reserve = min(species.silk_reserve + 2, species.silk_max_reserve)
adjust_nutrition(-0.4)
/mob/living/carbon/human/proc/handle_hud_list_vr()
//Right-side status hud updates with left side one.
if (BITTEST(hud_updateflag, STATUS_HUD))
var/image/other_status = hud_list[STATUS_HUD]
var/image/status_r = grab_hud(STATUS_R_HUD)
status_r.icon_state = other_status.icon_state
if(block_hud)
status_r.icon_state = "hudblank"
apply_hud(STATUS_R_HUD, status_r)
//Our custom health bar HUD
if (BITTEST(hud_updateflag, HEALTH_HUD))
var/image/other_health = hud_list[HEALTH_HUD]
var/image/health_us = grab_hud(HEALTH_VR_HUD)
health_us.icon_state = other_health.icon_state
if(block_hud)
health_us.icon_state = "hudblank"
apply_hud(HEALTH_VR_HUD, health_us)
//Backup implant hud status
if (BITTEST(hud_updateflag, BACKUP_HUD))
var/image/holder = grab_hud(BACKUP_HUD)
holder.icon_state = "hudblank"
for(var/obj/item/organ/external/E in organs)
for(var/obj/item/implant/I in E.implants)
if(I.implanted && istype(I,/obj/item/implant/backup))
var/obj/item/implant/backup/B = I
if(!mind)
holder.icon_state = "hud_backup_nomind"
else if(!(mind.name in B.our_db.body_scans))
holder.icon_state = "hud_backup_nobody"
else
holder.icon_state = "hud_backup_norm"
if(block_hud)
holder.icon_state = "hudblank"
apply_hud(BACKUP_HUD, holder)
//VOREStation Antag Hud
if (BITTEST(hud_updateflag, VANTAG_HUD))
var/image/vantag = grab_hud(VANTAG_HUD)
if(vantag_pref)
vantag.icon_state = vantag_pref
else
vantag.icon_state = "hudblank"
if(block_hud)
vantag.icon_state = "hudblank"
apply_hud(VANTAG_HUD, vantag)
//Our call for the NIF to do whatever
/mob/living/carbon/human/proc/handle_nif()
if(!nif) return
@@ -89,4 +38,3 @@
/mob/living/carbon
var/synth_cosmetic_pain = FALSE