cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Aurorablade
2016-02-26 00:52:57 -05:00
parent 7b5c5c2a13
commit 3c7281c2dd
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -141,7 +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 //overrides client.color while worn
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")
code/modules/clothing/glasses/glasses.dm
+15 -15
View File
@@ -211,40 +211,40 @@
/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
var/punused = null
action_button_name = "YEAH!"
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(slot == slot_glasses)
if(color_view && user.client && !user.client.color)
if(user.mind && (user.mind.assigned_role == "Detective"))
animate(user.client, color = color_view, time = 10)
//H.client.color = G.color_view
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)
//H.client.color = null
..(user)
/obj/item/clothing/glasses/sunglasses/noir/attack_self()
/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/noir/verb/pun()
/obj/item/clothing/glasses/sunglasses/yeah/verb/pun()
set category = "Object"
set name = "YEAH!"
set src in usr
if(usr.mind && (usr.mind.assigned_role == "Detective"))
if(!punused)//one per round
punused = 1
playsound(src.loc, 'sound/misc/yeah.ogg', 50, 1)
playsound(src.loc, 'sound/misc/yeah.ogg', 100, 1)
else
usr << "The moment is gone."