Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings

Fethas Carnival of horrors: A new shade for the detective
This commit is contained in:
Fox McCloud
2016-02-26 20:02:41 -05:00
7 changed files with 46 additions and 8 deletions
+1
View File
@@ -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)
@@ -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()
..()
@@ -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()
+1
View File
@@ -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")
+41
View File
@@ -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."
@@ -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