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

Quadborgs 3 #539

Merged
merged 18 commits into from
Feb 16, 2025
Merged

Quadborgs 3 #539

merged 18 commits into from
Feb 16, 2025

Conversation

fenndragon
Copy link
Contributor

Description

adds 2 new Quadborgs and the Apex Admeme

Changelog

🆑

  • add: Added new Quad borgs
  • fix: Fixed the other quad sprites

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Feb 7, 2025
Copy link
Contributor

github-actions bot commented Feb 7, 2025

RSI Diff Bot; head commit 43caf30 merging into 27fb1d8
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/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

Edit: diff updated after 43caf30

@fenndragon
Copy link
Contributor Author

um... what do those test fails even mean

@fenndragon
Copy link
Contributor Author

alright this should be ready

Quadborg Guidebook and GuideHelp components
@github-actions github-actions bot added Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files labels Feb 9, 2025
@fenndragon
Copy link
Contributor Author

woooo added the guide from m3739!

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Feb 9, 2025
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Feb 9, 2025
@M3739
Copy link
Contributor

M3739 commented Feb 9, 2025

Just so you know, I am committed to this matter. Once the changes are finalized on fenndragon's end, and everything checks out, I'll revise and update the guidebook entry accordingly, along with any relevant GuideHelpComponent along the way.

Happy to oblige.

fenndragon and others added 2 commits February 9, 2025 12:13
Fixed Guidebook info
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Feb 9, 2025
@fenndragon
Copy link
Contributor Author

cool, I guess that means this is ready to merge

@FoxxoTrystan FoxxoTrystan merged commit ace68c5 into Fansana:master Feb 16, 2025
14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Feb 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants