Skip to content

Commit

Permalink
Invisible Wall collide tweak (#4247)
Browse files Browse the repository at this point in the history
# About the pull request
Changes where the message comes from when collidin with an invisible
wall as it was hardcoded but using the same text as description var
<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
code: Changed backend for the message of walking into an invisible wall
to reduce duplication.
/:cl:
  • Loading branch information
realforest2001 authored Aug 25, 2023
1 parent 552a863 commit 0e5029b
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions code/game/objects/structures/blocker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/obj/structure/blocker/invisible_wall/Collided(atom/movable/AM)
to_chat(AM, SPAN_WARNING("You cannot go this way."))
var/msg = desc
if(!msg)
msg = "You cannot go this way."
to_chat(AM, SPAN_WARNING(msg))

/obj/structure/blocker/invisible_wall/New()
..()
Expand All @@ -35,10 +38,6 @@
desc = "You cannot wade out any further"
icon_state = "map_blocker"

/obj/structure/blocker/invisible_wall/water/Collided(atom/movable/AM)
to_chat(AM, SPAN_WARNING("You cannot wade out any further."))


/obj/structure/blocker/fog
name = "dense fog"
desc = "It looks way too dangerous to traverse. Best wait until it has cleared up."
Expand Down

0 comments on commit 0e5029b

Please sign in to comment.