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

Floofstation Release V14 #560

Merged
merged 122 commits into from
Feb 16, 2025
Merged

Floofstation Release V14 #560

merged 122 commits into from
Feb 16, 2025

Conversation

FoxxoTrystan
Copy link
Collaborator

V14

Check History for PR list.

This include a bunch of fixes and things requested.

VividPups and others added 30 commits January 27, 2025 00:59
ask to be added
OOOO so different  *rolls eyes*
Adds, stachel, beret, Cloak, thong, winter coat
update two
add the set job, pda, and ID
Added company policy from floof wiki to root level of the guidebook, using base game folders.
Changed some file and folder names to be more generic (SOP instead of JUST company policy) in preparation for future additions, plus added an SOP root for the guidebook entries.
Tweaked the description and naming of the main plushie crate, and made both that and the lizard plushie crate buyable
I was being dumb and didn't consider maps and such that were using the crate!
Locker shit
Added comment to show description was modified for Floofstation
Upped the cost a bit. You do get 10 plushies from the one crate, and the other lets you get a bunch of weh juice...
Move the Fill locker to the right YML folder
I decided that I should probably just move all these server-specific changes into server-specific folders...
update
Clean up and fixs
Copy link
Contributor

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.

@github-actions github-actions bot closed this Feb 16, 2025
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Feb 16, 2025
@Memeji Memeji reopened this Feb 16, 2025
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Audio Changes any ogg files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files labels Feb 16, 2025
Copy link
Contributor

github-actions bot commented Feb 16, 2025

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

Resources/Textures/Floof/Mobs/Silicon/quad.rsi

State Old New Status
quadsprite Modified
quadspriteCC Modified
quadspritel Modified
quadspriter Modified
quadspritesalv Modified
quadspritesalvl Modified
quadspritesalvr Modified
Apex Added
quadspritemed Added
quadspritemedl Added
quadspritemedr Added
quadspriteserv Added
quadspriteservl Added
quadspriteservr Added

Resources/Textures/Clothing/Shoes/Boots/moonboots.rsi

State Old New Status
equipped-FEET-vox Added
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Objects/Misc/bureaucracy.rsi

State Old New Status
ream-bright Added
ream-classic Added
ream-white Added

Resources/Textures/Floof/Clothing/Back/surgeongeneralsatchel.rsi

State Old New Status
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Belts/surgeongeneralbelt.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Departmental/Medical/surgeongeneralthong.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Departmental/Security/corpsmansocks.rsi

State Old New Status
equipped-FEET Added
icon Added

Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanthong.rsi

State Old New Status
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Departmental/Security/corpsmanwarmer.rsi

State Old New Status
equipped-HAND Added
icon Added

Resources/Textures/Floof/Clothing/Head/Hoods/surgeongeneralhood.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/Floof/Clothing/Head/surgeongeneralberet.rsi

State Old New Status
equipped-HELMET-hamster Added
equipped-HELMET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/Neck/surgeongeneralcloak.rsi

State Old New Status
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/Hardsuits/surgengeneralhardsuit.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/coatsg.rsi

State Old New Status
equipped-OUTERCLOTHING-resomi Added
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Misc/stamp.rsi

State Old New Status
stamp-sg Added

Resources/Textures/Floof/Objects/Specific/Hydroponics/a_equipment/Harvestbag.rsi

State Old New Status
equipped-BELT Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi

State Old New Status
borg_l_medarm+o Added
borg_l_medleg+o Added
borg_l_servarm+o Added
borg_l_servleg+o Added
borg_medchest+o Added
borg_medhead+o Added
borg_r_medarm+o Added
borg_r_medleg+o Added
borg_r_servarm+o Added
borg_r_servleg+o Added
borg_servchest+o Added
borg_servhead+o Added

Resources/Textures/Floof/Structures/Lockers/surgeongeneral.rsi

State Old New Status
generic Added
generic_door Added
generic_icon Added
generic_open Added
locked Added
surgeon_secure Added
surgeon_secure_door Added
surgeon_secure_open Added
unlocked Added
welded Added

Resources/Textures/_DV/Objects/Misc/stickies.rsi

State Old New Status
sticky_note Added
sticky_note_dispenser_base Added
sticky_note_dispenser_bin1 Added
sticky_note_dispenser_bin2 Added
sticky_note_dispenser_bin3 Added
sticky_note_dispenser_bin4 Added
sticky_note_dispenser_bin5 Added
sticky_note_words Added

Edit: diff updated after bc53276

@Fansana Fansana merged commit b63b0b6 into stable Feb 16, 2025
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: Workflow Changes any GitHub workflow files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.