diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 6eb0d9b6a7..8f45717ac8 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -94,3 +94,12 @@ desc = "Allows you to dispose of the snack wrappings on the go instead of having to look for a bin or littering like an animal." cost = 0 var_changes = list("trashcan" = 1) + +/datum/trait/glowing_body + name = "Glowing Body" + desc = "Your body glows about as much as a PDA light! Settable color and toggle in Abilities tab ingame." + cost = 0 +/datum/trait/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.verbs |= /mob/living/proc/glow_toggle + H.verbs |= /mob/living/proc/glow_color diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index af5a69a2c3..48aec984fb 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -208,6 +208,11 @@ set_light(min(round(fire_stacks), 3), round(fire_stacks), l_color = "#FF9933") return TRUE + //VOREStation Add - Glowy trait + else if(glow_toggle) + set_light(2, l_color = glow_color) //2 is PDA brightness, so neutral in terms of balance + //VOREStation Add End + else set_light(0) return FALSE diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 7c4d5004f1..53e97793a8 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -21,6 +21,8 @@ var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr. var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time. var/fuzzy = 1 // Preference toggle for sharp/fuzzy icon. + var/glow_toggle = 0 // If they're glowing! + var/glow_color = "#FFFFFF" // The color they're glowing! // // Hook for generic creation of stuff on new creatures @@ -565,4 +567,25 @@ msg_admin_attack("[key_name(pred)] ate [key_name(prey)] via dropnom/slime feeding!. ([pred ? "JMP" : "null"])") else msg_admin_attack("[key_name(user)] forced [key_name(pred)] to eat [key_name(prey)] via dropnoms/slime feeding!! ([pred ? "JMP" : "null"])") - return 1 \ No newline at end of file + +/mob/living/proc/glow_toggle() + set name = "Glow (Toggle)" + set category = "Abilities" + set desc = "Toggle your glowing on/off!" + + //I don't really see a point to any sort of checking here. + //If they're passed out, the light won't help them. Same with buckled. Really, I think it's fine to do this whenever. + glow_toggle = !glow_toggle + + to_chat(src,"You [glow_toggle ? "en" : "dis"]able your body's glow.") + +/mob/living/proc/glow_color() + set name = "Glow (Set Color)" + set category = "Abilities" + set desc = "Pick a color for your body's glow." + + //Again, no real need for a check on this. I'm unsure how it could be somehow abused. + //Even if they open the box 900 times, who cares, they get the wrong color and do it again. + var/new_color = input(src,"Select a new color","Body Glow",glow_color) as color + if(new_color) + glow_color = new_color