-
Notifications
You must be signed in to change notification settings - Fork 3.2k
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
Add generator scrap (Plasma / uranium scrap) #32198
Open
beck-thompson
wants to merge
5
commits into
space-wizards:master
Choose a base branch
from
beck-thompson:generator-scrap
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 file contains 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
Binary file added
BIN
+378 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/generator_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions
57
Resources/Textures/Objects/Materials/Scrap/generator.rsi/meta.json
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Made by Beck Thompson using assets from https://github.com/Baystation12/Baystation12/blob/caa635edb97c58301ccdc64757eba323b6673cf3/icons/obj/structures/portgen.dmi", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "old_generator_plasma" | ||
}, | ||
{ | ||
"name": "old_generator_plasma_fuel_leak" | ||
}, | ||
{ | ||
"name": "generator_frame" | ||
}, | ||
{ | ||
"name": "uranium_generator" | ||
}, | ||
{ | ||
"name": "uranium_generator_fuel_tank" | ||
}, | ||
{ | ||
"name": "red_x" | ||
}, | ||
{ | ||
"name": "nothing" | ||
}, | ||
{ | ||
"name": "rad_outline", | ||
"delays": [ | ||
[ | ||
0.3, | ||
0.3, | ||
0.3, | ||
0.3 | ||
] | ||
] | ||
}, | ||
{ | ||
"name": "rad_dripping", | ||
"delays": [ | ||
[ | ||
2.0, | ||
0.05, | ||
0.05, | ||
0.05, | ||
0.05, | ||
0.05, | ||
0.05 | ||
] | ||
] | ||
} | ||
] | ||
} |
Binary file added
BIN
+102 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/nothing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+876 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+471 Bytes
...xtures/Objects/Materials/Scrap/generator.rsi/old_generator_plasma_fuel_leak.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+433 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_dripping.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+323 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/rad_outline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+729 Bytes
Resources/Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+318 Bytes
.../Textures/Objects/Materials/Scrap/generator.rsi/uranium_generator_fuel_tank.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are the ones worth less plasma/uranium less common than the ones that give full stacks?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just wanted them to be less common! I think it would be better for the higher plasma/uranium generators to appear more frequently.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More valuable things are rarer because you want them more, I don't think it makes much sense to have the less valuable version be less common, especially with just how much material you get from the filled generator.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remember this is scrap so being in better condition would make it less common (The two leaking ones are in much worse condition). Secondly, the other two generators are not very good so making them more common wouldn't be that helpful. Having to drag something that big for only 45 metal, 5 plastic, and 5 special is probably not worth it (At least when I'm doing salvage).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you're exclusively dragging with a fire extinguisher, yeah it might not be worthwhile, but it's very common for salvage to build a lattice bridge or have fultons, which makes it very easy to gather most or all of the scrap on a debris regardless of transportation difficulty.
What if you increased the value of the leaking one a bit, and decrease the value of the intact one? I feel bringing them a bit closer (maybe 10/20 or 12/20 for leaking/intact) would work out well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry forgot reply but yeah that makes sense! Tweaking the values to basically that now