Floof Merge 11/10/24 #30
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
* Testing? Mosin rework * Update snipers.yml * Update 2 * update 3 * Update snipers.yml * Update snipers.yml * Dumb updates updates do be dumb sometimes * WOULD THIS WORK? FUCK FUCK FU
Mosin Rework Port over From Frontier
Add Neck Floof
Give Thermal Insulation to Penguins
Rape and SA RP are not appropriate on this server and violate our rules of extreme content being made public. if you wish to RP it where nobody else knows what's going on fine. but as soon as that door opens it never happened
Remove Rape and SA From S-LAW
Remove Gax Station From Map Pool
added deception back
added chemicals back
Edit/Fixes LPO
moved files
Cryptobiolin Uplink Injector
Floofstation Release V1
|
RSI Diff Bot; head commit a0530f9 merging into 192e3c1 Resources/Textures/Mobs/Aliens/FXS/rouny.rsi
Resources/Textures/Floof/Interface/Misc/hypno_icons.rsi
Resources/Textures/Floof/Mobs/Animals/baby_dragon.rsi
Resources/Textures/Mobs/Customization/reptilian_parts.rsi
|
|
I shall become the destroyer of test fails. |
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
Floof merge :)