Skip to content

Commit

Permalink
The shuttle won't gib you anymore while you're in jaunt (#83134)
Browse files Browse the repository at this point in the history
## About The Pull Request
As it's said in title, the shuttle will not gib you now while you in
jaunt. This applies to a mage, a (s)laughter demon, an ash heretic and
anything that uses spell "jaunt" and its child classes.
## Why It's Good For The Game
I think it's pretty counterintuitive that you can't be harmed by
anything in the jaunt, including an explosion, but if you accidentally
end up on the tile where the shuttle arrives, it deletes you. So, this
PR closes this logical hole.
## Changelog
:cl:
fix: The shuttle will no longer delete you while you are in jaunt
/:cl:

Co-authored-by: paganiy <leunscrupuloustrolle@gmail.com>
  • Loading branch information
paganiy and paganiy committed May 9, 2024
1 parent 2efd770 commit 9526e99
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/game/objects/effects/phased_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "water"
anchored = TRUE
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | SHUTTLE_CRUSH_PROOF
invisibility = INVISIBILITY_OBSERVER
movement_type = FLOATING
/// The movable which's jaunting in this dummy
Expand Down

0 comments on commit 9526e99

Please sign in to comment.