-
-
Notifications
You must be signed in to change notification settings - Fork 680
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
Teleportation Cleanup & Cult Teleports Respecting Anti-Magic #11466
Conversation
// The nullrod by itself does not block cult/wizard teleports | ||
/obj/item/nullrod/intercept_teleport(channel, turf/origin, turf/destination) | ||
return |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is incredibly hacky, not sending the signal at all because its a nullrod. If you want certain components to block teleports, then it should be a flag on the component itself and should be applied fully. You need to be careful that the wizard hardsuit with magic protection isn't going to block the wizard from teleporting to the station.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So as it turns out, I removed the INTERCEPT_TELEPORT for /datum/component/anti_magic, and just used .anti_magic_check() instead with self = TRUE
, which allows us to exclude stuff on our person (like gem encrusted hardsuit) but include stuff like holymelons.
About The Pull Request
check_teleport()
proc for when we want to pre-check teleports used primarily with hand-tele and teleporterforced
argument toignore_area_restrictions
as it was a misnomer.Why It's Good For The Game
Testing Photographs and Procedure
Screenshots&Videos
Blocked by a holymelon at the destination blessing the tile
Blocked teleport by being blessed
Blocked teleport due to tile being blessed
Wizard can teleport with full hardsuit
Changelog
🆑
code: Add check_teleport()
fix: Added more cult-related checks for teleports. Cults can no longer teleport holy items, etc.
fix: Clockcult teleport now respects blessing internally if it didn't already check
/:cl: