diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index abcded54f1f..cc8caa6284e 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -120,6 +120,7 @@ /* var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(H) CIG.light("") H.equip_or_collect(CIG, slot_wear_mask) */ + H.equip_or_collect(new /obj/item/clothing/glasses/sunglasses/noir(H),slot_glasses) H.equip_or_collect(new /obj/item/clothing/gloves/color/black(H), slot_gloves) if(H.mind.role_alt_title && H.mind.role_alt_title == "Forensic Technician") H.equip_or_collect(new /obj/item/clothing/suit/storage/forensics/blue(H), slot_wear_suit) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 298c5b75f53..3f75bca668c 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -20,6 +20,7 @@ var/global/list/image/splatter_cache=list() var/basecolor="#A10808" // Color when wet. var/list/datum/disease2/disease/virus2 = list() var/amount = 5 + appearance_flags = NO_CLIENT_COLOR /obj/effect/decal/cleanable/blood/New() ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 9f4ff977321..2aa4ce9db01 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -349,6 +349,8 @@ new /obj/item/weapon/gun/projectile/revolver/detective(src) new /obj/item/taperoll/police(src) new /obj/item/clothing/accessory/holster/armpit(src) + new /obj/item/clothing/glasses/sunglasses/yeah(src) + new /obj/item/device/flashlight/seclite(src) return /obj/structure/closet/secure_closet/detective/update_icon() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 39301d01fe0..c956975f13a 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -141,6 +141,7 @@ var/invisa_view = 0 var/flash_protect = 0 //Mal: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS var/tint = 0 //Mal: Sets the item's level of visual impairment tint, normally set to the same as flash_protect + var/color_view = null//overrides client.color while worn strip_delay = 20 // but seperated to allow items to protect but not impair vision, like space helmets put_on_delay = 25 species_restricted = list("exclude","Kidan") diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2c3566c767d..e2b3a96de71 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -207,6 +207,47 @@ "Vox" = 'icons/mob/species/vox/eyes.dmi' ) + +/obj/item/clothing/glasses/sunglasses/noir + name = "noir sunglasses" + desc = "Somehow these seem even more out-of-date than normal sunglasses." + color_view = list(0.3, 0.3, 0.3, 0,\ + 0.3, 0.3, 0.3, 0,\ + 0.3, 0.3, 0.3, 0,\ + 0.0, 0.0, 0.0, 1,) //greyscale + +/obj/item/clothing/glasses/sunglasses/noir/equipped(mob/user, slot) + if(color_view && user.client && !user.client.color) + animate(user.client, color = color_view, time = 10) + + ..(user, slot) + +/obj/item/clothing/glasses/sunglasses/noir/dropped(mob/user) + if(user.client && user.client.color) + animate(user.client, color = null, time = 10) + ..(user) + +/obj/item/clothing/glasses/sunglasses/yeah + name = "agreeable glasses" + desc = "H.C Limited edition." + var/punused = null + action_button_name = "YEAH!" + +/obj/item/clothing/glasses/sunglasses/yeah/attack_self() + pun() + + +/obj/item/clothing/glasses/sunglasses/yeah/verb/pun() + set category = "Object" + set name = "YEAH!" + set src in usr + if(!punused)//one per round + punused = 1 + playsound(src.loc, 'sound/misc/yeah.ogg', 100, 1) + else + usr << "The moment is gone." + + /obj/item/clothing/glasses/sunglasses/reagent name = "sunscanners" desc = "Strangely ancient technology used to help provide rudimentary eye color. Outfitted with apparatus to scan individual reagents." diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 15449efe109..75b82119fd6 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -433,14 +433,6 @@ if(!G.see_darkness) H.see_invisible = SEE_INVISIBLE_MINIMUM - //switch(G.HUDType) - // if(SECHUD) - // process_sec_hud(H,1) - // if(MEDHUD) - // process_med_hud(H,1) - // if(ANTAGHUD) - // process_antag_hud(H) - if(H.head) if(istype(H.head, /obj/item/clothing/head)) var/obj/item/clothing/head/hat = H.head diff --git a/sound/misc/yeah.ogg b/sound/misc/yeah.ogg new file mode 100644 index 00000000000..355d46019e1 Binary files /dev/null and b/sound/misc/yeah.ogg differ