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.

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

Science to Epistemics #47

Merged
merged 17 commits into from
Sep 28, 2023
Merged

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 27, 2023

About the PR

Replaces (almost) every mention of Science to Epistemics.
Replaces Research Director with Mystagogue.
Replaces Scientist coat with DeltaV coat
Replaces RD coat with DeltaV Mysta coat, give Mysta the new DeltaV mysta hat
Replaces the science directional sign with the epistemic directional sign (only .yml)
Removes the duplicate epistemics headsets since they are directly replaced
Move Chaplain to Epistemics
Replaces the Chaplain job icon, pda and id sprite to fit their new position.

Why / Balance

Technical details

I think I covered everything but make sure to check.

Media

no
ss+(2023-09-28+at+01 00 13)
ss (2023-09-28 at 10 06 05)

Breaking changes

Changelog

🆑

  • tweak: Science is now Epistemics.

@github-actions github-actions bot added the Changes: YML Changes any yml files label Sep 27, 2023
@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 27, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 27, 2023
Those were simply renamed in the base files
@github-actions
Copy link
Contributor

github-actions bot commented Sep 27, 2023

RSI Diff Bot; head commit ae2a7cb merging into 584b0a8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
Chaplain Added

Resources/Textures/DeltaV/Objects/Devices/pda.rsi

State Old New Status
pda-chaplain Added

Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi

State Old New Status
idchaplain Added

Resources/Textures/Nyanotrasen/Structures/Wallmounts/signs.rsi

State Old New Status
direction_epi Added

Edit: diff updated after ae2a7cb

@FluffiestFloof FluffiestFloof marked this pull request as ready for review September 28, 2023 08:14
@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 28, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 28, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 28, 2023
Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 28, 2023
DebugOk
DebugOk previously approved these changes Sep 28, 2023
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@Colin-Tel
Copy link
Contributor

Colin-Tel commented Sep 28, 2023

What shall we name the Scientist and Research Assistant?

I'm thinking "Acolyte" and "Initiate" Per Leo's take, we'll stick with their OG names.

Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

Looks good!

@Colin-Tel Colin-Tel merged commit b8b25d6 into DeltaV-Station:master Sep 28, 2023
13 of 14 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 28, 2023
@FluffiestFloof FluffiestFloof deleted the episcientemics branch September 29, 2023 10:15
TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024
gagaegadgsrgvsdrgsdrgngvjuhdbguerhguvehurg
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants