Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mechanical Eye-Emotion Coupling #20271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Geevies
Copy link
Contributor

@Geevies Geevies commented Dec 17, 2024

  • Added the 'Mechanical Eye-Emotion Coupling' disability, which makes your character's eyes change colour based on their intent, so long as they're mechanical.
2024-12-17.23-05-36.mp4

Copy link
Contributor

@hazelrat hazelrat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think it's funny

if(HAS_TRAIT(src, TRAIT_DISABILITY_INTENT_EYES))
var/obj/item/organ/internal/eyes/eyes = get_eyes()
if(eyes && (eyes.status & ORGAN_ROBOT))
var/intent_colors = list(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't recreate a list everytime this runs, make it a global list that everyone shares

// has the trait that lets mechanical eyes change their colour
if(HAS_TRAIT(src, TRAIT_DISABILITY_INTENT_EYES))
var/obj/item/organ/internal/eyes/eyes = get_eyes()
if(eyes && (eyes.status & ORGAN_ROBOT))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should check the eye isn't being qdel'd

@SleepyGemmy
Copy link
Contributor

!review

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants