-
Notifications
You must be signed in to change notification settings - Fork 47
Wallets, Drivers Licenses, Concealed Carry Permits #490
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.
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
base: master
Are you sure you want to change the base?
Conversation
|
If you plan on adding ID to loadout I would like if ID was selectable a la backpack selection and PDA selection so that one could choose which kind of ID they wanted to spawn with. 'None' being an option would also be good. ID selection is a very commonly requested feature on Apocrypha |
Co-authored-by: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com>
FalloutFalcon
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having the driver's license require also carrying your passport on you is a little strange (we idealy want to reduce the chances of people dumping stuff they dont want on the floor when they spawn) but everything else looks good.
| if(!HAS_TRAIT(user, TRAIT_THAUMATURGY_KNOWLEDGE)) | ||
| to_chat(user, span_cult("A book whose title is inscribed in latin and coated with various sigils and shapes. You'll need a teacher if you want to learn more. For some reason it wont open.")) | ||
| return | ||
| display_rituals() | ||
| .=..() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looking at the parent calls for this:
since attack self sends signals I would avoid returning out of this early, It would be better to nest your checks in a different proc. e.g display_ritual or do a
if(can_read_tome()) display_rituals() in /obj/item/ritual_tome/attack_self
however. Out of scope in this pr lol.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we have either a darkpack file or we prefix all our files' names with darkpack?
.../interfaces/PreferencesMenu/preferences/features/character_preferences/country_of_origin.tsx
Show resolved
Hide resolved
No, it replaces the passport if country of origin is USA |
…ures/character_preferences/country_of_origin.tsx Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
ooooooh. Yea thats fine then |
XeonMations
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conflicts
About The Pull Request
adds wallets which can carry money, all 'cards' (id cards, drivers licenses, credit cards, concealed carry permits), and lockpicks
adds concealed carry permits which will ideally be purchasable with a merit
adds drivers licenses which should probably replace the passport because who tf just walks around with their passport
Why It's Good For The Game
thanks bomby
Changelog
🆑
add: adds wallets, concealed carry permits, and drivers licenses
/:cl: