Refactors Scrying Code (2.0)#7359
Draft
realforest2001 wants to merge 40 commits into
Draft
Conversation
added 29 commits
January 28, 2026 23:55
overlay .
realforest2001
marked this pull request as draft
July 23, 2026 08:12
added 2 commits
July 23, 2026 09:18
github-actions
Bot
added
Feature
added 2 commits
July 23, 2026 09:41
realforest2001
added
Feature
realforest2001
marked this pull request as ready for review
July 23, 2026 09:41
added 3 commits
July 23, 2026 10:53
| var/mob/scry_eye/scrying_eye | ||
| var/mob/living/carbon/held_user | ||
|
|
||
| var/interact_method = "attack_self" |
Collaborator
There was a problem hiding this comment.
This should be a numeric define
Collaborator
There was a problem hiding this comment.
or maybe you don't even need it and just change it depending on structure / item
| . = ..() | ||
|
|
||
| /datum/component/scrying/proc/activate(datum/source, mob/user) | ||
| if(!pass_extra_checks(user)) |
Collaborator
There was a problem hiding this comment.
This should be a callback
| break | ||
|
|
||
| held_user = user | ||
| if(HAS_TRAIT(found_target, TRAIT_ANTISCRYING)) |
Collaborator
There was a problem hiding this comment.
Move this above the input
| return FALSE | ||
|
|
||
| //check is applied twice to prevent someone from bypassing the cooldown | ||
| if(!COOLDOWN_FINISHED(src, scry_cooldown)) |
Collaborator
There was a problem hiding this comment.
Move this above the above check
| return FALSE | ||
| return TRUE | ||
|
|
||
| /datum/component/scrying/mirror |
Collaborator
There was a problem hiding this comment.
This one can remain a subtype for now
realforest2001
marked this pull request as draft
July 24, 2026 00:11
Co-authored-by: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Reworks scrying so it isn't a bunch of copy pasted code all over the place and no longer uses ghosts.
Disables the Vampire Lord's free moving spying eye due to code constraints, to be further worked upon.
Adds a lock to using scrying orb, requiring Arcyne Magic skill.
Why It's Good For The Game
Makes things a bit easier down the line, and provides QOL for people doing the scrying.
Changelog
🆑
refactor: Refactors how scrying is attached to objects.
add: You can now still hear your personal surroundings and speak to people around you whilst scrying.
del: Black Mirror no longer asks if you want to locate the person who's blood it contains.
add: Scrying Orb can now only be used by people with Arcyne magic skill.
del: Temporarily disables the free-form spying eye the Vampire Lord gets.
/:cl:
Pre-Merge Checklist