Skip to content

Commit

Permalink
Fixes humans unable to use vehicle gunner seat (#6247)
Browse files Browse the repository at this point in the history
# About the pull request

Fixes #6246

<!-- 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

Vehicle gunnery is meant to be used by humans.
# 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:
fix: humans can use vehicle gunner seats again
/:cl:
  • Loading branch information
Doubleumc authored May 15, 2024
1 parent 601d521 commit 6fdd3cd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
/mob/living/carbon/xenomorph = list(
"TRAIT_ABILITY_NO_PLASMA_TRANSFER" = TRAIT_ABILITY_NO_PLASMA_TRANSFER,
"TRAIT_ABILITY_OVIPOSITOR" = TRAIT_ABILITY_OVIPOSITOR,
"TRAIT_OPPOSABLE_THUMBS" = TRAIT_OPPOSABLE_THUMBS,
),
/datum/hive_status = list(
"TRAIT_XENONID" = TRAIT_XENONID,
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/objs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@
if (M.mob_size <= MOB_SIZE_XENO)
if ((M.stat == DEAD && istype(src, /obj/structure/bed/roller) || HAS_TRAIT(M, TRAIT_OPPOSABLE_THUMBS)))
do_buckle(M, user)
return
if ((M.mob_size > MOB_SIZE_HUMAN))
to_chat(user, SPAN_WARNING("[M] is too big to buckle in."))
return
Expand Down
2 changes: 0 additions & 2 deletions code/modules/vehicles/interior/interactable/seats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
to_chat(user, SPAN_WARNING("You are unable to use heavy weaponry."))
return

if(!HAS_TRAIT(user, TRAIT_OPPOSABLE_THUMBS))
return
for(var/obj/item/I in user.contents) //prevents shooting while zoomed in, but zoom can still be activated and used without shooting
if(I.zoom)
I.zoom(user)
Expand Down

0 comments on commit 6fdd3cd

Please sign in to comment.