diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index a4e7cf3af38..4049c5cb348 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -146,6 +146,26 @@ h1.alert, h2.alert {color: #000000;} 100% {color: #3bb5d3;} } +// SKYRAT ADDITION BEGIN +.velvet {color: #660015; font-weight: bold; animation: velvet 5000ms infinite;} + @keyframes velvet { + 0% {color: #400020; } + 40% {color: #FF0000; } + 50% {color: #FF8888; } + 60% {color: #FF0000; } + 100% {color: #400020; } +} + +.hexnut {color: #0099ff; font-weight: bold; animation: hexnut 5000ms infinite; animation-direction: alternate;} + @keyframes hexnut { + 0% {color: #0099ff;} + 35% {color: #a64dff;} + 50% {color: #00997a;} + 60% {color: #ffb31a;} + 100% {color: #ff33cc;} +} +// SKYRAT ADDITION END + .phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} @keyframes phobia { 0% {color: #0d0d0d;} diff --git a/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm b/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm index f8ac401c012..478b0a4ac28 100644 --- a/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/customization/modules/client/loadout/donator/personal/donator_personal.dm @@ -34,11 +34,16 @@ path = /obj/item/clothing/neck/cloak/grunnyyy ckeywhitelist = list("grunnyyy") -/datum/loadout_item/gloves/donator/hypnoring +/datum/loadout_item/gloves/donator/hypnoring_coffee name = "Hypnodemon's Ring" - path = /obj/item/clothing/gloves/ring/coffeepot + path = /obj/item/clothing/gloves/ring/hypno/coffeepot ckeywhitelist = list("coffeepot") +/datum/loadout_item/gloves/donator/hypnoring_bippy + name = "Hypnodemon's Ring" + path = /obj/item/clothing/gloves/ring/hypno/bippys + ckeywhitelist = list("bippys") + /datum/loadout_item/suit/donator/kimjacket name = "Aerostatic Bomber Jacket" path = /obj/item/clothing/suit/kimjacket diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index 1ec955085d0..d87d6ec0999 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -455,22 +455,35 @@ mutant_variants = NONE fitted = FEMALE_UNIFORM_TOP +/obj/item/clothing/gloves/ring/hypno + var/list/spans = list() + actions_types = list(/datum/action/item_action/hypno_whisper) + //Donation reward for CoffeePot -/obj/item/clothing/gloves/ring/coffeepot +/obj/item/clothing/gloves/ring/hypno/coffeepot name = "hypnodemon's ring" desc = "A pallid, softly desaturated-looking gold ring that doesn't look like it belongs. It's hard to put one's finger on why it feels at odds with the world around it - the shine coming off it looks like it could be a mismatch with the lighting in the room, or it could be that it seems to glint and twinkle occasionally when there's no obvious reason for it to - though only when you're not really looking." - actions_types = list(/datum/action/item_action/hypno_whisper) + spans = list("velvet") + +//Donation reward for Bippys +/obj/item/clothing/gloves/ring/hypno/bippys + name = "hypnobot hexnut" + desc = "A silver bolt component that once belonged to a very peculiar IPC. It's large enough to be worn as a ring on nearly any finger, and is said to amplify the voice of one's mind to another's in the softness of a Whisper..." + icon_state = "ringsilver" + inhand_icon_state = "sring" + worn_icon_state = "sring" + spans = list("hexnut") /datum/action/item_action/hypno_whisper name = "Hypnotic Whisper" -/obj/item/clothing/gloves/ring/coffeepot/ui_action_click(mob/living/user, action) +/obj/item/clothing/gloves/ring/hypno/ui_action_click(mob/living/user, action) if(!isliving(user) || !can_use(user)) return var/message = input(user, "Speak with a hypnotic whisper", "Whisper") if(QDELETED(src) || QDELETED(user) || !message || !user.can_speak()) return - user.whisper(message, spans = list("hypnophrase")) + user.whisper(message, spans = spans) //Donation reward for SlippyJoe /obj/item/clothing/head/avipilot diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 208adc50f9c..d5a79bbe60f 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -757,6 +757,57 @@ em { } } +// SKYRAT ADDITION BEGIN +.velvet { + color: #660015; + font-weight: bold; + animation: velvet 5000ms infinite; +} +@keyframes velvet { + 0% { + color: #400020; + } + 40% { + color: #ff0000; + } + 50% { + color: #ff8888; + } + 60% { + color: #ff0000; + } + 100% { + color: #400020; + } +} + +.hexnut { + color: #0099ff; + font-weight: bold; + animation: hexnut 5000ms infinite; + animation-direction: alternate; +} + +@keyframes hexnut { + 0% { + color: #0099ff; + } + 35% { + color: #a64dff; + } + 50% { + color: #00997a; + } + 60% { + color: #ffb31a; + } + 100% { + color: #ff33cc; + } +} + +// SKYRAT ADDITION END + .phobia { color: #dd0000; font-weight: bold;