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

Cherry-Picking Map Spawners #563

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

southbridge-fur
Copy link
Contributor

@southbridge-fur southbridge-fur commented Feb 17, 2025

Description

Cherry-picking several map spawners and spawner changes from upstream.
This is the first of many PRs I'm gonna open porting things from upstream to here.
This is mostly to provide quality of life in this case, as I really like these spawners and would like to use them in my map.
I will also take some time to add them to other maps in rotation.

Cherry picked PRs

The two Amber station-specific PRs are only partial cherry-picks, as to not include the changes to the map. I'll be creating a PR in the future with the map after I've ported everything I care about.
Some of the PRs I've cherry picked from upstream are my own, so it may be a little difficult to follow unfortunately.

I'll open another PR later to also add some more items to these loot pools for Floof.


Media

image
Yep they all work pretty well


Changelog

No CL, this is entirely a setup for some mapping changes in the future though!

EmoGarbage404 and others added 6 commits February 17, 2025 04:30
* Entity table code

* entity table examples

* fix dat shit

* access

* tests tests tests

* sloth review
Infer type for EntSelector.cs
* adds more spawners

* make it WORK. ooo.. a. e

* fix

* outerclothing capitalization

* prototype fix

* flashbang fix
* Added spanwers and modified others

* adjusted values to be more in line with what I want

* this comment may have caused that test fail

* oh my god another typo

* Modified door crate to be engineering flavored

* reduced the pride vendor odds

Webedit lmao
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files and removed Status: Needs Review Someone please review this labels Feb 17, 2025
Copy link
Contributor

github-actions bot commented Feb 17, 2025

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

Resources/Textures/Structures/Machines/VendingMachines/random.rsi

State Old New Status
clothing Added

Edit: diff updated after c83bb57

Copy link
Collaborator

@Memeji Memeji left a comment

Choose a reason for hiding this comment

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

Idea itself is good for me, just needs a look over the code.

@Forzii
Copy link
Contributor

Forzii commented Feb 28, 2025

It does look like at least some of these are in EE already, just not pulled to Floof yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants