Floofstation Release V11 #468
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add kettle as a playable mid pop map
other file for the map to work
Forgot to change the map path to /Maps/Floof/
forgot to add kettle to PostMapInitTest.cs
second attempt to fix the test
adding missing jobspawns to hopefully fix the test.
Co-authored-by: FoxxoTrystan <[email protected]>
|
Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation. You can move your current work from the master branch to another branch by branching from and resetting the master branch. |
|
Thank you for contributing to Floof Station repository. Unfortunately, it looks like you submitted your pull request to the stable branch, Please move this PR to the master Branch. |
github-actions
bot
added
Changes: C#
|
RSI Diff Bot; head commit a625a1f merging into 2894449 Resources/Textures/Floof/Mobs/Silicon/quad.rsi
Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi
Resources/Textures/Clothing/Eyes/Hud/command.rsi
Resources/Textures/Effects/medi_holo.rsi
Resources/Textures/Floof/Clothing/OuterClothing/Misc/shackles.rsi
Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi
Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi
Resources/Textures/_NF/Clothing/Belt/chaplain_sash.rsi
Resources/Textures/_NF/Clothing/Belt/chaplain_sash_overlay.rsi
Resources/Textures/_NF/Clothing/Belt/punk.rsi
Resources/Textures/_NF/Clothing/Eyes/Glasses/punk_glasses.rsi
Resources/Textures/_NF/Clothing/Head/Hats/bishop_mitre.rsi
Resources/Textures/_NF/Clothing/Head/Hats/cardinal_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/kippah.rsi
Resources/Textures/_NF/Clothing/Head/Hats/pilgrim_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/widebrim_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hats/witch_hunter_hat.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_blue.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_green.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_magenta.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/Coat/acid_raincoat_yellow.rsi
Resources/Textures/_NF/Clothing/Head/Hoods/cardinal_hood.rsi
Resources/Textures/_NF/Clothing/Mask/punkhalfmask.rsi
Resources/Textures/_NF/Clothing/Neck/Misc/crucifix.rsi
Resources/Textures/_NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_green.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_orange.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural.rsi
Resources/Textures/_NF/Clothing/OuterClothing/Armor/bulletproof_vest_procedural_elite.rsi
|
FoxxoTrystan
added
Priority: 1-High
|
this release is missing my PRs, if we're going ahead with the release please merge them first |
* commit commit * Update borgmodules.yml * Feendragon told me to do it I WAS TOLD TO DO IT I SWEAR * Update borgmodules.yml at this point why am i here
|
We aren't merging this release just yet. Waiting for approval from floofmin and others. May want to merge some more PRs first. |
Secmodules 2
Energy Shotgun
Core Update
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I was asked to do this by Trystan. This merges the following PRs into the stable branch:
#438
#439
#440
#441
#442
#443
#444
#445
#446
#447
#448
#449
#450
#452
#453
#454
#458
#463
#464
#465