Conversation
Ermucat
pushed a commit
that referenced
this pull request
Feb 26, 2025
…4675) * Reduce NukeOps Reinforcement to 25TC from 35TC * price adjustment to 30 * Revert "price adjustment to 30" This reverts commit f337f5a. * revert "price adjustment to 30" This reverts commit f337f5a. submodule?! YAML preserve me... * Revert "price adjustment to 30" This reverts commit f337f5a. submodule!?!? yaml save me * attempt #2 at changing to 30
Ermucat
pushed a commit
that referenced
this pull request
Apr 13, 2025
* Atlas changes * Further changes * Removed extra evac beacon * Pod should pop up now. Hopefully.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
RSI Diff Bot; head commit 00932bb merging into ab5e418 Resources/Textures/_Harmony/Objects/Weapons/Bombs/X-4.rsi
|
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Signed-off-by: Ermucat <NCramey09@gmail.com>
Ermucat
pushed a commit
that referenced
this pull request
Sep 24, 2025
* [April Fools] Elf species (space-wizards#35353) elf * [April Fools] Juice that makes me go insane (space-wizards#35370) * kill me * MAKE IT STOP * is it finally over? * web edit * webedit Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * webedit Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * webedit Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * webedit * WEBEDIT PLEASE Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * vulpkanin species the ultimate april fools joke Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com> * cant be bothered * make build and test debug run on the april fools branch (space-wizards#35396) welp * Revert "[April Fools] Juice that makes me go insane (space-wizards#35370)" This reverts commit fcbdcf8. * Revert "[April Fools] Elf species (space-wizards#35353)" This reverts commit 704293a. * nuh uh * localized names * fix survival box * abilities (Mostly don't work yet, pending PRs) * wagging loc * slight heat tweaks * stuff * Update Vulpkanin.xml * vulp screams + quieter howl * MessyDrinker by Orks * MessyDrinker guidebook * animal bones * fix wagging * missed * no loc * Lower damage, remove butchering * Revert "animal bones" This reverts commit 3457cde. * leap * collision * leap desc update * leap guidebook * fix leap * microbalance * comment * microbalancing pt 2 * microbalancing pt 3 * test fail fix (i hope) * fix organs * no leaping on the ground * remove SolutionScanner + ling work * fix clone * add stuff back * microbalancing pt yes * male vulp names mainly slavic names with some similiar sounding ones mixed in * Revert "male vulp names" This reverts commit 1666f81. * male vulps names pr 2 (slavic, dog names, few puns) Slavic names, with mixed in typical dog names and some puns * female names (mainly slavic, other stuff mixed in) * oops * Update vulpkanin.yml * Vulps WIP Work (#1) * Modified aesprite tools * WIP * wipperoni * We are done here, wawa * Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip" This reverts commit d258645, reversing changes made to 0ae39e8. * Resolve merge issue * Fix Urist McVulp forgetting his fursuit --------- Co-authored-by: Southbridge-fur <southbridgefur@gmail.com> * re-add ears and husk overlay * revert adding ears to vox * Crest Markings * Fade Markings * Sharp Markings * microbalance + comments * censor character nudity option compliance * Ear Markings * 1984 wagging animations * Tail Markings * tail wag icon * annoyance * guidebook * slight temperature tweak * seperate out snouts, port over 2 markings for testing * fix * seperate snout file * Snout/Head Markings * cleanup + locale for ears * Head and Snout loc * gray eyes * crest and husk cleanup * Tail and Chest loc * Legs and Arms loc * most important commit * mime vulps like rations too * missing loc * microbalance * not needed * goatee * white eyes * harmony feedback tail fixes * personal changes and fixes after playing * fix fluffy tail clipping * Sprite fixes, displacement fixes (#2) * Tune head displacement * Vulps Sprite Tuning * helmets * detail * Urist * wag * comban't * fix attributions * remove vulp biosuits * fix vulp beards * fixed up ears * comment note * further ear tweaks * engi helmets --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
Ermucat
pushed a commit
that referenced
this pull request
Dec 14, 2025
…er fills (space-wizards#41360) * Replace all existing storage fills with container fills, adjust some formatting to accomadate * Forgot to remove that * I really need to spell better * Right, those are 3x3 * Change some NestedSelectors to GroupSelectors * Actual container fills, test fix (maybe), and a few minor formatting changes * Fix some more mistakes * Forgot to add to that comment * Some parenting fixes * Test optimisation, maybe * Roll holiday lights instead of individually listing it * Move eletrical toolbox to NestedSelector * Back to entity tables (except for vending) * More nesting (and a TODO) * Yet another fix * Probably shoulda done it this way originally * Entity tables for vending restocks * I am good at formatting * Make added table names consistent * Make grand lottery weights a little more readable * Use existing fills for bio suit crates * Get rid of some more redundant amounts * Nuke the StorageFill test section and update some comments * Apply changes from code review * Split off changes to vending restocks * Split off changes to vending restocks * Apply more changes from code review * Attempt #2 of detangling this mess (oh shit I missed the pin) * They look so similar * I am great at formatting * Missed a newline * How did I manage to do that * Move toy in FoodMealHappyHonkClown to top to prioritise * Apply changes from review and move dank pizza to organise by weight
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
About the PR
Why / Balance
Technical details
Media
Requirements
Breaking changes
Changelog