Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fixes humans unable to use vehicle gunner seat #6247

Merged
merged 8 commits into from
May 15, 2024
Merged

Fixes humans unable to use vehicle gunner seat #6247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8735bbe
initial
Doubleumc May 6, 2024
96352e9
humanoids granted thumbs
Doubleumc May 6, 2024
eaff95a
broadened thumbs check
Doubleumc May 6, 2024
96a42cf
Merge remote-tracking branch 'upstream/master' into vehicle-gunners-fix
Doubleumc May 10, 2024
a55893d
Merge remote-tracking branch 'upstream/master' into vehicle-gunners-fix
Doubleumc May 10, 2024
4fbd0f7
Merge remote-tracking branch 'upstream/master' into vehicle-gunners-fix
Doubleumc May 15, 2024
774034e
revert, simplify
Doubleumc May 15, 2024
50471a1
Update traits.dm
Doubleumc May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading