[Needs Testmerge] Guestbook, from Mojave Sun #2770
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
keywordlabeler
bot
added
the
Do Not Merge
github-actions
bot
added
DME Edit
TGUI
Code change
thgvr
changed the title
meemofcourse
changed the title
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Mark Suckerberg <[email protected]>
| if(40 to 50) | ||
| return "Middle-Aged" | ||
| if(24 to 40) | ||
| return "" //not necessary because this is basically the most common age range |
There was a problem hiding this comment.
Need to add something to not display the age examine text because currently it spits out something like "they appear to be ."
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Closed
thgvr
removed
the
Do Not Merge
|
This all works and code quality is fine, we'll figure out something to clean up orbit menu later. LGTM |
shiptest-server
pushed a commit
that referenced
this pull request
Apr 16, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 16, 2024
<!-- 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. --> This thing sucks to port, I'm going to be real with you. TODO: * [x] Make it sort of work * [x] Fix an error where adding a guest name doesn't work * [ ] ~~Make it so reading IDs only work at close range~~ out of scope * [x] Make it so you automatically know your ship's crewmates ~~and captains know other faction members~~ * [x] Something with ERTs * [ ] ~~Make the guestbook save across rounds~~ asked to not    This pull request ports the following: * Mojave-Sun/mojave-sun-13#2415 * Mojave-Sun/mojave-sun-13#2433 These PRs change how examining someone works. You have to walk up to someone and remember their face in order to recognize their voice. Names will still be displayed with people's IDs <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> * The current anonymity system sucks for stealthy shit. You immediately know someone's real name. An improved system allows for more roleplay possibilities. * Kansatsu is more reliable. * You can rob people with a knife and a balaclava at the outpost, and they won't know who you are! <!-- 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. --> :cl: tweak: Identification Cards are now Access Cards. The only real difference is that your name only shows up on a double examine. refactor: Anonymous mechanics. Characters no longer instantly recognize each other, and need to properly memorize each other in order. You can recognize an unmasked person by ctrl-shift-clicking them. /: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. --> --------- Signed-off-by: meem <[email protected]> Signed-off-by: Mark Suckerberg <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]> Co-authored-by: goober3 <[email protected]>
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 16, 2024
)" This reverts commit 6764403.
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 16, 2024
<!-- 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 This thing sucks to port, I'm going to be real with you. TODO: * [x] Make it sort of work * [x] Fix an error where adding a guest name doesn't work * [ ] ~~Make it so reading IDs only work at close range~~ out of scope * [x] Make it so you automatically know your ship's crewmates ~~and captains know other faction members~~ * [x] Something with ERTs * [ ] ~~Make the guestbook save across rounds~~ asked to not    This pull request ports the following: * Mojave-Sun/mojave-sun-13#2415 * Mojave-Sun/mojave-sun-13#2433 These PRs change how examining someone works. You have to walk up to someone and remember their face in order to recognize their voice. Names will still be displayed with people's IDs <!-- 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 * The current anonymity system sucks for stealthy shit. You immediately know someone's real name. An improved system allows for more roleplay possibilities. * Kansatsu is more reliable. * You can rob people with a knife and a balaclava at the outpost, and they won't know who you are! <!-- 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: tweak: Identification Cards are now Access Cards. The only real difference is that your name only shows up on a double examine. refactor: Anonymous mechanics. Characters no longer instantly recognize each other, and need to properly memorize each other in order. You can recognize an unmasked person by ctrl-shift-clicking them. /: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. --> --------- Signed-off-by: meem <[email protected]> Signed-off-by: Mark Suckerberg <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]> Co-authored-by: goober3 <[email protected]>
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 20, 2024
)" This reverts commit 6764403.
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 20, 2024
…t-ss13#2770)"" This reverts commit 0f52064.
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 20, 2024
)" This reverts commit 04fe2b2.
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
May 11, 2024
)" This reverts commit 04fe2b2.
MysticalFaceLesS
added a commit
to CeladonSS13/Shiptest
that referenced
this pull request
May 11, 2024
)" This reverts commit 04fe2b2.
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Jun 3, 2024
Add old merge - [Needs Testmerge] Guestbook, from Mojave Sun (shiptest-ss13#2770) <!-- 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. --> This thing sucks to port, I'm going to be real with you. TODO: * [x] Make it sort of work * [x] Fix an error where adding a guest name doesn't work * [ ] ~~Make it so reading IDs only work at close range~~ out of scope * [x] Make it so you automatically know your ship's crewmates ~~and captains know other faction members~~ * [x] Something with ERTs * [ ] ~~Make the guestbook save across rounds~~ asked to not    This pull request ports the following: * Mojave-Sun/mojave-sun-13#2415 * Mojave-Sun/mojave-sun-13#2433 These PRs change how examining someone works. You have to walk up to someone and remember their face in order to recognize their voice. Names will still be displayed with people's IDs <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> * The current anonymity system sucks for stealthy shit. You immediately know someone's real name. An improved system allows for more roleplay possibilities. * Kansatsu is more reliable. * You can rob people with a knife and a balaclava at the outpost, and they won't know who you are! <!-- 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. --> :cl: tweak: Identification Cards are now Access Cards. The only real difference is that your name only shows up on a double examine. refactor: Anonymous mechanics. Characters no longer instantly recognize each other, and need to properly memorize each other in order. You can recognize an unmasked person by ctrl-shift-clicking them. /: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. --> --------- Signed-off-by: meem <[email protected]> Signed-off-by: Mark Suckerberg <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]> Co-authored-by: goober3 <[email protected]>
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.
About The Pull Request
This thing sucks to port, I'm going to be real with you.
TODO:
Make it so reading IDs only work at close rangeout of scopeand captains know other faction membersMake the guestbook save across roundsasked to notThis pull request ports the following:
These PRs change how examining someone works. You have to walk up to someone and remember their face in order to recognize their voice. Names will still be displayed with people's IDs
Why It's Good For The Game
Changelog
🆑
tweak: Identification Cards are now Access Cards. The only real difference is that your name only shows up on a double examine.
refactor: Anonymous mechanics. Characters no longer instantly recognize each other, and need to properly memorize each other in order. You can recognize an unmasked person by ctrl-shift-clicking them.
/:cl: