diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index e9f9e0026cb54..dfe3df7686cca 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -42,6 +42,12 @@ icon_state = "glasses" item_state = "glasses" +/obj/item/clothing/glasses/regular/hipster + name = "Prescription Glasses" + desc = "Made by Uncool. Co." + icon_state = "hipster_glasses" + item_state = "hipster_glasses" + /obj/item/clothing/glasses/gglasses name = "Green Glasses" desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme." @@ -56,6 +62,12 @@ protective_temperature = 1300 darkness_view = -1 +/obj/item/clothing/glasses/sunglasses/big + desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes." + icon_state = "bigsunglasses" + item_state = "bigsunglasses" + protective_temperature = 1400 + /obj/item/clothing/glasses/sunglasses/sechud name = "HUDSunglasses" desc = "Sunglasses with a HUD." diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 3bbdc60fa61c4..33ac78e35ca16 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -69,39 +69,46 @@ desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records." icon_state = "securityhud" +/obj/item/clothing/glasses/hud/security/jensenshades + name = "Augmented shades" + desc = "Polarized bioneural eyewear, designed to augment your vision." + icon_state = "jensenshades" + item_state = "jensenshades" + protective_temperature = 1500 + vision_flags = SEE_MOBS + invisa_view = 2 - process_hud(var/mob/M) - if(!M) return - if(!M.client) return - var/client/C = M.client - var/icon/tempHud = 'hud.dmi' - for(var/mob/living/carbon/human/perp in view(M)) - if(!C) continue - var/perpname = "wot" - if(perp.wear_id) - C.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]") - if(istype(perp.wear_id,/obj/item/weapon/card/id)) - perpname = perp.wear_id:registered_name - else if(istype(perp.wear_id,/obj/item/device/pda)) - var/obj/item/device/pda/tempPda = perp.wear_id - perpname = tempPda.owner - else - perpname = perp.name - C.images += image(tempHud,perp,"hudunknown") - - for (var/datum/data/record/E in data_core.general) - if (E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - C.images += image(tempHud,perp,"hudwanted") - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated")) - C.images += image(tempHud,perp,"hudprisoner") - break - for(var/obj/item/weapon/implant/I in perp) - if(I.implanted) - if(istype(I,/obj/item/weapon/implant/tracking)) - C.images += image(tempHud,perp,"hud_imp_tracking") - if(istype(I,/obj/item/weapon/implant/loyalty)) - C.images += image(tempHud,perp,"hud_imp_loyal") +/obj/item/clothing/glasses/hud/security/process_hud(var/mob/M) + if(!M) return + if(!M.client) return + var/client/C = M.client + var/icon/tempHud = 'hud.dmi' + for(var/mob/living/carbon/human/perp in view(M)) + if(!C) continue + var/perpname = "wot" + if(perp.wear_id) + C.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]") + if(istype(perp.wear_id,/obj/item/weapon/card/id)) + perpname = perp.wear_id:registered_name + else if(istype(perp.wear_id,/obj/item/device/pda)) + var/obj/item/device/pda/tempPda = perp.wear_id + perpname = tempPda.owner + else + perpname = perp.name + C.images += image(tempHud,perp,"hudunknown") + for (var/datum/data/record/E in data_core.general) + if (E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) + C.images += image(tempHud,perp,"hudwanted") + break + else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated")) + C.images += image(tempHud,perp,"hudprisoner") + break + for(var/obj/item/weapon/implant/I in perp) + if(I.implanted) + if(istype(I,/obj/item/weapon/implant/tracking)) + C.images += image(tempHud,perp,"hud_imp_tracking") + if(istype(I,/obj/item/weapon/implant/loyalty)) + C.images += image(tempHud,perp,"hud_imp_loyal") diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index fd65179acdf3a..b269d173cd113 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 6ace12c8c6898..2295faab15df6 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ