Skip to content

Commit

Permalink
Minor Newscaster Fix (#3613)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Newscasters can now check your ID through a wallet.
Newscasters no longer display your job.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
functionality
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: Newscasters can now read IDs through a wallet.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Bjarl <94164348+Bjarl@users.noreply.github.com>
  • Loading branch information
Erikafox and Erikafox authored Oct 24, 2024
1 parent de5b708 commit 7f86f82
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions code/game/machinery/newscaster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -814,12 +814,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster/security_unit, 30)
if(istype(human_user.wear_id, /obj/item/pda))
var/obj/item/pda/P = human_user.wear_id
if(P.id)
scanned_user = "[P.id.registered_name] ([P.id.assignment])"
scanned_user = "[P.id.registered_name])"
else
scanned_user = "Unknown"
else if(istype(human_user.wear_id, /obj/item/card/id))
var/obj/item/card/id/ID = human_user.wear_id
scanned_user ="[ID.registered_name] ([ID.assignment])"
scanned_user ="[ID.registered_name])"
else if(istype(human_user.wear_id, /obj/item/storage/wallet))
var/obj/item/storage/wallet/our_wallet = human_user.wear_id
if(our_wallet.front_id)
var/obj/item/card/id/ID = our_wallet.GetID()
scanned_user = "[ID.registered_name]"
else
scanned_user ="Unknown"
else
Expand Down

0 comments on commit 7f86f82

Please sign in to comment.