Skip to content

Commit

Permalink
Fixes extraneous messages in regards to wall nests (#3807)
Browse files Browse the repository at this point in the history
# About the pull request

Mouse drop was not checking for if you were actually grabbing something
before passing to the proc like in the other areas it is called which
caused extraneous messages.

Also, mouse drop does not guarantee a mob being passed which was causing
extraneous and confusing messages when dropping wall resin onto a wall
while dragging something.

# Explain why it's good for the game

Confusing and extraneous messages bad.

# 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: Morrow
fix: Fixed extraneous messages in regards to wall nests
/:cl:
  • Loading branch information
morrowwolf authored Jul 7, 2023
1 parent ba18cc8 commit 45de3ce
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion code/game/turfs/walls/walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,15 @@
qdel(found_nest) //nests are built on walls, no walls, no nest

/turf/closed/wall/MouseDrop_T(mob/current_mob, mob/user)
if(!ismob(current_mob))
return

if(acided_hole)
if(current_mob == user && isxeno(user))
acided_hole.use_wall_hole(user)
return
if(isxeno(user))

if(isxeno(user) && istype(user.get_active_hand(), /obj/item/grab))
var/mob/living/carbon/xenomorph/user_as_xenomorph = user
user_as_xenomorph.do_nesting_host(current_mob, src)
..()
Expand Down
6 changes: 5 additions & 1 deletion code/modules/cm_aliens/weeds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,11 @@

/obj/effect/alien/weeds/weedwall/MouseDrop_T(mob/current_mob, mob/user)
. = ..()
if(isxeno(user))

if(!ismob(current_mob))
return

if(isxeno(user) && istype(user.get_active_hand(), /obj/item/grab))
var/mob/living/carbon/xenomorph/user_as_xenomorph = user
user_as_xenomorph.do_nesting_host(current_mob, src)

Expand Down

0 comments on commit 45de3ce

Please sign in to comment.