zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz

This commit is contained in:
Aurorablade
2015-12-15 03:08:16 -05:00
parent 76eaf85c11
commit c3f662a6dc
15 changed files with 46 additions and 66 deletions
+1 -2
View File
@@ -10,7 +10,6 @@
var/prescription = 0
var/prescription_upgradable = 0
var/see_darkness = 1
var/HUDType = null
/obj/item/clothing/glasses/New()
. = ..()
@@ -235,7 +234,7 @@
darkness_view = 1
flash_protect = 1
tint = 1
HUDType = DATA_HUD_SECURITY_BASIC
//HUDType = DATA_HUD_SECURITY_BASIC
prescription_upgradable = 1
species_fit = list("Vox")
sprite_sheets = list(
+11 -1
View File
@@ -3,7 +3,7 @@
desc = "A heads-up display that provides important info in (almost) real time."
flags = null //doesn't protect eyes because it's a monocle, duh
origin_tech = "magnets=3;biotech=2"
HUDType = null //Hudtype is defined on glasses.dm
var/HUDType = null //Hudtype is defined on glasses.dm
prescription_upgradable = 1
var/list/icon/current = list() //the current hud icons
@@ -29,8 +29,18 @@
icon_state = "healthhud"
HUDType = DATA_HUD_MEDICAL_ADVANCED
///DELETE ME AFTER MAP FREEZE!!!!!!!!///
/obj/item/clothing/glasses/hud/health_advanced
name = "\improper Advanced Health Scanner HUD"
/obj/item/clothing/glasses/hud/health_advanced/New()
new /obj/item/clothing/glasses/hud/health/health_advanced (loc)
qdel(src)
/////!!!!!1111!!!!!!!!/////////////////
/obj/item/clothing/glasses/hud/health/health_advanced
name = "\improper Advanced Health Scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. Includes anti-flash filter."
icon_state = "advmedhud"
flash_protect = 1
@@ -488,7 +488,7 @@
if("security")
return istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses)
if("medical")
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health_advanced)
return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced)
else
return 0
else if(istype(M, /mob/living/silicon))
@@ -37,7 +37,6 @@
var/mob/M = src
faction |= "\ref[M]" //what
prepare_data_huds()
// Set up DNA.
if(!delay_ready_dna && dna)
dna.ready_dna(src)
@@ -22,8 +22,6 @@
if(B)
if((health >= (config.health_threshold_dead / 100 * 75)) && stat == DEAD)
update_revive()
med_hud_set_health()
med_hud_set_status()
if(stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
update_revive()
med_hud_set_health()
@@ -33,14 +33,6 @@
flags = IS_RESTRICTED
/mob/living/carbon/human/monkey/prepare_data_huds()
//Prepare our med HUD...
..()
//...and display it.
for(var/datum/atom_hud/data/human/medical/hud in huds)
hud.add_to_hud(src)
/datum/species/monkey/handle_npc(var/mob/living/carbon/human/H)
if(H.stat != CONSCIOUS)
return