Solving future merge conflicts #5699
Open
Conversation
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
This reverts commit 4781b07.
This reverts commit 0379d25.
* Waow * Corrected recipe * Corrected donator item path * Apply suggestions from code review --------- Co-authored-by: Thedragmeme <[email protected]> Co-authored-by: Thedragmeme <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
* Adds donator item for BonkaiTheRoris * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
* Waow! * CODE * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Hood_type * Update modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm * Update modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
* Add Starfruit seeds, plant, fruit, and juice. Add Starfruit seeds as donator loadout item for snailomi and thedragmeme. * Add Starfruit seed to cargo as supply pack * Move starfruit to imports * Fix starfruit plant name and description * Refine starfruit description * Add juice typepath to starfruit * Fix line return * Update modular_nova/modules/cargo/code/packs.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
…ut (Fluffy-Frontier#4552) Co-authored-by: Bloop <[email protected]>
* Update TGS DMAPI * Donate deeze nuts * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: GoldenAlpharex <[email protected]> * I need an adult * I HATE IT HERE --------- Co-authored-by: novasector-ci[bot] <181600888+novasector-ci[bot]@users.noreply.github.com> Co-authored-by: GoldenAlpharex <[email protected]>
…ntier#4580) * Update TGS DMAPI * bonz * what the FUCK is oat meal * My hubris knows no bounds * Drinks finished * Food coded * most but not all works * there is no war in basingse * add recipie bookkk * ckeys * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * recipioee * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: CRITAWAKETS <[email protected]> * Update modular_nova/modules/cargo/code/packs.dm * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm Co-authored-by: GoldenAlpharex <[email protected]> * capitalization consistency and fixes * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm * Update modular_nova/modules/customization/modules/hydroponics/grown/starfruit.dm --------- Co-authored-by: novasector-ci[bot] <181600888+novasector-ci[bot]@users.noreply.github.com> Co-authored-by: CRITAWAKETS <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
* we do a little donating * Mal's review Co-authored-by: Bloop <[email protected]> * Another adjustment from Sciamach --------- Co-authored-by: Bloop <[email protected]>
…r#4707) * Adds donator item for bonkaitheroris: plushie edition * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]>
* afda bba * updat * updat2 * Update suit_digi.dmi * update to kick another check * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_items.dm Co-authored-by: Bloop <[email protected]> * Update modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm Co-authored-by: Bloop <[email protected]> * Updat --------- Co-authored-by: Bloop <[email protected]>
* Dagmar items * Removes myself from the loadout WL * updats
* adds the ahabs spear retool kit Co-Authored-By: amateurthrowaway <[email protected]> * [NO GBP] fixes the glaive retool kit specifically again (#90055) ## About The Pull Request Makes sure that applying a retool kit redirects the inhand files, so the glaive retool kit stops turning crushers invisible. ## Why It's Good For The Game Invisible crusher inhands are decidedly suboptimal. ## Changelog :cl: fix: The glaive retool kit works again and no longer turns your crusher invisible. /:cl: --------- Co-authored-by: Hatterhat <[email protected]> * minor typo correction Co-Authored-By: amateurthrowaway <[email protected]> * better modularity * updates the commenting & read_me updates the commenting to be consistent with modularisation guidelines * Update code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm Co-authored-by: Bloop <[email protected]> * Update code/modules/mining/equipment/kinetic_crusher/kinetic_crusher.dm Co-authored-by: Bloop <[email protected]> * moves changes to module override moves changes from tgfile kinetic_crusher.dm to module override miningweapons.dm * Revert these icon files back to TG * adds the donator to the donator items whoops! --------- Co-authored-by: amateurthrowaway <[email protected]> Co-authored-by: Hatterhat <[email protected]> Co-authored-by: Hatterhat <[email protected]> Co-authored-by: Bloop <[email protected]>
Un-whitelist Sciira's plush
…rontier#5126) * under * under part 2 Kills peacekeeper's under clothing Moves the rest of it de-peacekeeper'd (so far) Reordering Still plenty to do and untested * under part 2.1 i forgot * plasmaman * removes pref and pda stuff * airlocks * Decal changes * under last part * gloves, moving stuff * I lost track honestly One thing i can remember is that I removed peacekeeper warden suit due to it looking visually outdated and not too different from other versions Oh and most of the magic was done here * Love is in the air? Nope, tear gas. saddles, kills armadyne and lopland stuff repaths peacekeeper stuff that are being used to another file while letting the unused rest be * Peacekeepers everywhere i hate lopland * makes armadyne no longer a peacekeeper subtype it's probably on the chopping block actually but we'll see * the commit that makes it all work * Minor reskinning fixes * head of edge * I'm like an overworked mcdonalds worker * gta san andreas squirrel * gta iv running on nintendo DS * Update modular_nova/modules/crafting/crafting.dm Co-authored-by: OrionTheFox <[email protected]> * 500 eyepatches Co-authored-by: OrionTheFox <[email protected]> * Update tgui/packages/tgui/interfaces/AmmoWorkbench.jsx Co-authored-by: OrionTheFox <[email protected]> * Removes sol helmet, among fixes and following some suggestions -gmod error on dmis -moves clothing overrides to sec haul -chops the secdrobe numbers down a bit -repath fixes * Garment debloating Not the best sprite but honestly I might just resprite garments entirely * pushed too early * this will lint (lie) * im sleep deprived but this should probably address almost everything i should also not code while sleep deprived not my favorite approach for plasmamen since reskins worked fine but they were also causing runtimes to no end also removal of some duplicate stuff like the hos beret and the jacket reskin for warden thanks btw orion moving bluesec hos stuff to their rightful place and all warden's a mix since they're designed to be blue by default on TG oh and jackboots footstep noises goes for all jackboots since it was already a bit silly it was sec jackboots only * removes unused stuff * no lint? * redseccifies ouroboros, brings blue back on places it belongs * more map revisions * warden neglect * Merge skew * Update neck.dmi * Automapper fix, redshield fix. * Reverts the ammobench change to fix merge conflict with ammo balance pr (which removes the bit of code modified here) --------- Co-authored-by: OrionTheFox <[email protected]> Co-authored-by: Bloop <[email protected]>
Improves how the loadout menu looks by switching it to the new ImageButton component, converting recolorable/reskinnable to use icons with tooltips, and allowing items within a category to be grouped up together (only used by pocket items as of now) <details> <summary>How it looks:</summary>   </details> Monocles have been made prescription, and prescription, contains pens, hair color, and other misc tags have been removed. <details> <summary>Additionally, plushies now have better baked-in sprites for loadouts, with randomized lizard plushie receiving a coat of rainbow paint in place of the removed tooltip.</summary>  </details> Blue button make it hard to figure out details on certain items, and tiny grey text is borderline unreadable. Also our pocket items category is horribly bloated. :cl: qol: Redesigned the loadout UI balance: Monocles now work as prescription glasses image: Loadout plushies no longer use mapper previews for their images /:cl:
## About The Pull Request Adds donor items for Kaynite (Bag, mask, gloves, pants, hoodie + armored variant) to loadout. Armored variant may only be crafted with a security vest. Credit to Darkinite for sprites. ## How This Contributes To The Nova Sector Roleplay Experience Donators are cool ## Proof of Testing <details> <summary>   https://github.com/user-attachments/assets/a7a6db7d-98fc-4ece-a69e-2441d84f5fc9 </summary> </details> ## Changelog :cl: add: Kaynite donor items /:cl: --------- Co-authored-by: Bloop <[email protected]>
## About The Pull Request Fixes the loadout because I am dumb and missed a word ## How This Contributes To The Nova Sector Roleplay Experience working items are good ## Proof of Testing  <details> <summary>Screenshots/Videos</summary> </details> ## Changelog :cl: fix: fixed 2 donor items not showing up correctly in the loadout /:cl:
## About The Pull Request Adds a donator ecologist outfit, sprites by Darkii ## Proof of Testing <details> <summary>Screenshots/Videos</summary> Digi vs standard    </details> ## Changelog :cl: add: Added donator ecologist outfit /:cl: --------- Co-authored-by: Bloop <[email protected]> Co-authored-by: OrionTheFox <[email protected]>
Collaborator
Author
|
Не... Это точно не сработало |
Contributor
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
Попытка решить наши мердж конфликты
Коротко о том, почему:
Пропущены:
4379
4471
4468
4505
4552
4574
4580
4661
4689
4707
4721
4737
4808
4883
5046
5204
5126 (частично)
5447
5504
5478
5c6bbdfee1206ff09d2a123e9f5e9bcc947a4e05 (частично)
5506 (батч)
5545 (частично)
5540
91029 (?)
f87bdde487b2a12532a91b00bb6aef40fc956bbe (частично)
5854
5863 (батч)
c14caf31f21f91161d5f110504101da1a9fa62df (частично)
6231 (не точно)
6257
6277
6283
5468
6d8e4ce4b05665eea97dbe67c85e827f5bd3f7ca (частично)
37ff4b0bd34bf573ec2444116846b096318d49aa (частично)