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

Merc Spawner Fix #581

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Merc Spawner Fix #581

merged 2 commits into from
Nov 15, 2023

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Nov 14, 2023

Image fix

Copy link
Contributor

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

Resources/Textures/_NF/Markers/jobs.rsi

State Old New Status
green Added
mercenary Added

@Cheackraze Cheackraze merged commit bde5603 into new-frontiers-14:master Nov 15, 2023
11 checks passed
dvir001 pushed a commit to dvir001/frontier-station-14 that referenced this pull request Dec 22, 2023
* move SliceFoodEvent into a deltav file, move raising into Slice()

* import deltav event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Cheackraze pushed a commit that referenced this pull request Dec 24, 2023
* Deepfryer missing import

* deep frier slice fix (#581)

* move SliceFoodEvent into a deltav file, move raising into Slice()

* import deltav event

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Fix unlocalized name deep-fried-burnt-item (#535)

Fix unlocalized name

WHEW.

* Update SliceableFoodSystem.cs

* Deep

---------

Co-authored-by: deltanedas <[email protected]>
Co-authored-by: Loonessia <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants