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

Mobsters from prerebase #860

Merged
merged 4 commits into from
Feb 23, 2024
Merged

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Feb 19, 2024

About the PR

Refill their satchel (except armor, that doesn't fit so they get to wear it on spawn) and readds the missing loadout + humanoids/spawner

Why / Balance

Dunno, it was something that was added alongside the typewriter and similar items but only the backpack was "readded" post-rebase.
Can be entirely removed if no longer a thing we care about.

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

@github-actions github-actions bot added Status: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Feb 19, 2024
Copy link
Contributor

github-actions bot commented Feb 19, 2024

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

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
mobster Added

Edit: diff updated after 13e9495

@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Feb 22, 2024
Copy link
Contributor

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Feb 22, 2024
@DebugOk DebugOk merged commit 39282a0 into DeltaV-Station:master Feb 23, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants