Move identity and name procs up to mob-level #3336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
code/modules/mob/mob.dm
Outdated
| var/obj/item/card/id/id = GetIdCard() | ||
| if(istype(id)) | ||
| return id.rank ? id.rank : if_no_job | ||
| else |
There was a problem hiding this comment.
Extraneous else that you seem to have trimmed off the other procs.
code/modules/mob/mob.dm
Outdated
| return FALSE | ||
| var/obj/item/clothing/mask/mask = get_equipped_item(slot_wear_mask_str) | ||
| var/obj/item/head = get_equipped_item(slot_head_str) | ||
| if(mask?.flags_inv & HIDEFACE || head?.flags_inv & HIDEFACE) |
There was a problem hiding this comment.
(mask?.flags_inv & HIDEFACE) and (head?.flags_inv & HIDEFACE)
code/modules/mob/mob.dm
Outdated
| if(mask?.flags_inv & HIDEFACE || head?.flags_inv & HIDEFACE) | ||
| return FALSE | ||
| var/decl/bodytype/our_bodytype = get_bodytype() | ||
| if(our_bodytype?.has_limbs[BP_HEAD]) |
There was a problem hiding this comment.
Maybe we need a should_have_limb(). Noting as a side comment that should_have_organ() needs to be moved to /mob/living too.
MistakeNot4892
requested changes
Sep 14, 2023
MistakeNot4892
added
awaiting author
out-of-phaze
force-pushed
the
feature/identity-generalization
branch
from
244485d to
f62822f
Compare
out-of-phaze
added
ready for review
MistakeNot4892
added
awaiting author
out-of-phaze
force-pushed
the
feature/identity-generalization
branch
from
f62822f to
9f651c8
Compare
out-of-phaze
force-pushed
the
feature/identity-generalization
branch
from
9f651c8 to
3a59897
Compare
code/modules/mob/examine.dm
Outdated
| @@ -40,11 +40,14 @@ | |||
| /mob/proc/show_other_examine_strings(mob/user, distance, infix, suffix, hideflags, decl/pronouns/pronouns) | |||
| return | |||
|
|
|||
| /mob/examine(mob/user, distance, infix, suffix) | |||
| /mob/examine(mob/living/user, distance, infix, suffix) | |||
There was a problem hiding this comment.
This makes the proc signature at odds with everywhere else, and ghosts will be unable to examine anyone now. Really should just gate the tail check imo.
out-of-phaze
force-pushed
the
feature/identity-generalization
branch
from
3a59897 to
6e793af
Compare
MistakeNot4892
approved these changes
Oct 10, 2023
MistakeNot4892
added
ready for review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Adds
exceptionskeyword argument to all overrides ofGetIdCards()on/mob.Adds return type annotation to
/mob/GetIdCard().Moves various identity-related procs up to mob-level and generalizes/cleans up the associated logic.
Removes a redundant helper proc,
/proc/FindNameFromID(), that was only used in one spot. Replaces it with the almost identical proc/mob/proc/get_id_name().Why and what will this PR improve
Cleanup and generalization of some pretty old code. Removes humantype/carbontype bias in code which should allow for carbon removal and non-humantype playable mobs in the future.