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

[PTBF] Adds custom hallucination descriptions #27651

Merged
merged 15 commits into from
Jan 10, 2025
Merged

[PTBF] Adds custom hallucination descriptions #27651

merged 15 commits into from
Jan 10, 2025
+51 −1

Conversation

Accinator50
Copy link
Contributor

@Accinator50 Accinator50 commented Dec 15, 2024 •
edited
Loading

What Does This PR Do

This PR adds custom hallucination descriptions that have a chance of appearing when examining someone.
Thanks to @Calyxman for helping me with some of the messages!

Why It's Good For The Game

  1. PTBF 😃
  2. Unique messages that give players the chance to better incorporate hallucinations into their roleplay.

Images of changes

grafik

Testing

Compiled It
Looked at the custom messages

Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
add: Added custom hallucination messages to the examine feature
/:cl:

@Calyxman
Copy link

Please give me a mention for the ones I suggested
image
https://discord.com/channels/145533722026967040/145700319819464704/1317821994418438185

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Dec 15, 2024
Contrabang
Contrabang previously requested changes Dec 15, 2024
View reviewed changes
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Dec 15, 2024
lewcc
lewcc reviewed Dec 15, 2024
View reviewed changes
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got some pronoun helper fixes

code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
@Scribble-Sheep
Copy link
Contributor

Oh hell yeah, I love stuff I can kickboard off of for roleplay~

@Scribble-Sheep
Copy link
Contributor

Spelling/grammar pass looks alright to me from what I can tell, save for Luke's suggestions.

@Accinator50 Accinator50 requested a review from lewcc December 16, 2024 15:38
ExusA
ExusA reviewed Dec 16, 2024
View reviewed changes
Copy link
Contributor

@ExusA ExusA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found a couple more pronoun helpers missing.

code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Dec 20, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 24, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting review This PR is awaiting review from the review team -Status: Awaiting approval This PR is waiting for approval internally labels Dec 25, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting review This PR is awaiting review from the review team label Dec 26, 2024
Fordoxia
Fordoxia reviewed Dec 31, 2024
View reviewed changes
Copy link
Contributor

@Fordoxia Fordoxia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This empty line probably shouldn't be here.

code/modules/mob/living/carbon/examine.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Jan 2, 2025
lewcc
lewcc approved these changes Jan 3, 2025
View reviewed changes
Copy link
Contributor

@lewcc lewcc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks pretty good, just address fordoxia's change and I think it'll be good to go.

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Jan 5, 2025
@Burzah Burzah dismissed Contrabang’s stale review January 10, 2025 02:33

Changes addressed

@Burzah Burzah enabled auto-merge January 10, 2025 02:33
@Burzah Burzah added this pull request to the merge queue Jan 10, 2025
Merged via the queue into ParadiseSS13:master with commit 57c3b9b Jan 10, 2025
17 checks passed
@Accinator50 Accinator50 deleted the hallucination_description branch January 10, 2025 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ExusA ExusA ExusA left review comments

@Fordoxia Fordoxia Fordoxia left review comments

@FunnyMan3595 FunnyMan3595 FunnyMan3595 approved these changes

@lewcc lewcc lewcc approved these changes

@Contrabang Contrabang Awaiting requested review from Contrabang

@Calyxman Calyxman Awaiting requested review from Calyxman

Assignees
No one assigned
Labels
-Status: Awaiting review This PR is awaiting review from the review team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@Accinator50 @Calyxman @Scribble-Sheep @FunnyMan3595 @ExusA @lewcc @Contrabang @Fordoxia @ParadiseSS13-Bot @Burzah