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

Phoron Will Make Us Rich #107

Closed
wants to merge 3 commits into from
Closed

Phoron Will Make Us Rich #107

wants to merge 3 commits into from

Conversation

VMSolidus
Copy link
Member

Phoron Will Make Us Rich

Phoron Will Make Us Rich

Changelog

🆑 VMSolidus

  • add: Phoron Will Make Us Rich

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI labels Apr 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 20, 2024 •
edited
Loading

RSI Diff Bot; head commit 41cb401 merging into 3bf08c7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Materials/Sheets/other.rsi

State Old New Status
phoron-inhand-left Modified
phoron-inhand-right Modified
phoron Modified
plasma-inhand-left Removed
plasma-inhand-right Removed
plasma Removed

Edit: diff updated after 41cb401

@toasterpm87
Copy link

Phoron will make us rich.

@LovelyLophi
Copy link
Member

John Nanotransen didn't kill his brother John Nanustrasen for this.

DangerRevolution
DangerRevolution approved these changes Apr 30, 2024
View reviewed changes
Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

do we want to change the material too? like plasma glass etc

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label May 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 4, 2024

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

@FoxxoTrystan
Copy link
Member

Ehh is this PR still going?
And i do like Plasma more then Phoron name personnaly.

How would server handle this? CVar?

@DangerRevolution
Copy link
Contributor

this needs conflicts fixed & we need to get to a consensus about this

@DangerRevolution DangerRevolution added Priority: 5-Whenever Doesn't matter when this gets resolved Size: 5-Very Small For especially small issues/PRs Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this labels May 28, 2024
@VMSolidus
Copy link
Member Author

I'll revisit this later with a less shitposty PR

@VMSolidus VMSolidus closed this May 29, 2024
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
@Fansana
Merge pull request Simple-Station#107 from ShatteredSwords/points-and…
4053692 
…-labcoat

Loadout Point Increase And Labcoat For All
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
@Floof-Station-Bot
Automatic Changelog Update (Simple-Station#107)
38cb9ef
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DangerRevolution DangerRevolution DangerRevolution approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT

@Peptide90 Peptide90 Awaiting requested review from Peptide90

@Pspritechologist Pspritechologist Awaiting requested review from Pspritechologist

@NotScoutieBoi NotScoutieBoi Awaiting requested review from NotScoutieBoi

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Priority: 5-Whenever Doesn't matter when this gets resolved Size: 5-Very Small For especially small issues/PRs Status: Merge Conflict FIX YOUR PR AAAGH Status: Needs Discussion Must be discussed Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@VMSolidus @toasterpm87 @LovelyLophi @FoxxoTrystan @DangerRevolution