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.

Sign up for GitHub

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

Jump to bottom

Superglue audit #75682

Merged
merged 22 commits into from
Aug 16, 2024
Merged

Superglue audit #75682

merged 22 commits into from
Aug 16, 2024

Conversation

Holli-Git
Copy link
Contributor

@Holli-Git Holli-Git commented Aug 14, 2024 •
edited
Loading

Summary

Content "Superglue Overhaul"

Purpose of change

Superglue is currently a single use glue, that doesn't really make any sense. Superglue IRL can be used in portions, and not the whole tube in one go.

Describe the solution

Makes superglue into charges, and makes them spawn in tubes/bottles. Also adjusts recipes to use a more proper amount, and standardizes what one use of superglue is. Though this does require a revamp of the adhesive requirement because god, 7.5 yards of duct tape? That's crazy. Also adds the superglue recipe back to innawoods because the migration was too messy and it's dumb so yeah.

Describe alternatives you've considered

Legitimately not doing this. It sucks.

Testing

A lot and I don't feel like going back for screenshots.

Additional context

Original PR: #75598

@Holli-Git Holli-Git mentioned this pull request Aug 14, 2024
Closed
@github-actions github-actions bot added NPC / Factions NPCs, AI, Speech, Factions, Ownership [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Missions Quests and missions Vehicles Vehicles, parts, mechanics & interactions Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Spawn Creatures, items, vehicles, locations appearing on map Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Aug 14, 2024
@github-actions github-actions bot added Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Aftershock Anything to do with the Aftershock mod Items: Containers Things that hold other things Items: Armor / Clothing Armor and clothing Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod labels Aug 14, 2024
@Holli-Git @github-actions
Update data/json/items/containers/containers.json
6397d81 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 14, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 15, 2024
Karol1223
Karol1223 approved these changes Aug 15, 2024
View reviewed changes
Copy link
Contributor

@Karol1223 Karol1223 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool beans, I think. But also it's 63 files with a lot of small changes, I might have missed something. If anything goes wrong we're blaming Guardian.

@Maleclypse Maleclypse merged commit 0b8d7ba into CleverRaven:master Aug 16, 2024
18 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Karol1223 Karol1223 Karol1223 approved these changes

@GuardianDll GuardianDll Awaiting requested review from GuardianDll

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Missions Quests and missions Mods: Aftershock Anything to do with the Aftershock mod Mods: Innawood 🌲 Anything to do with Innawood mod Mods: Mind Over Matter Mods: Sky Island Anything about the Sky Island mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding NPC / Factions NPCs, AI, Speech, Factions, Ownership Spawn Creatures, items, vehicles, locations appearing on map Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Holli-Git @Karol1223 @Maleclypse