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

substations, generators and smes replacement #144

Merged
merged 19 commits into from
Dec 30, 2023
Merged

substations, generators and smes replacement #144

merged 19 commits into from
Dec 30, 2023

Conversation

Peptide90
Copy link
Collaborator

@Peptide90 Peptide90 commented Dec 18, 2023

About the PR

Adds new sprites for the substation, mini fusion generator and smes (powerstorage).

To do:

  • Add the remaining assets as props that can be salvaged for parts. Leaving a husk of a panel and yielding electrical components.
  • Add the destroyed state for the substation as an asset and as a destruction spawn.
  • Deconstruction for server racks to give cable and electrical components. Fully deconstruct for steel.
  • Add a destroyed state for panels that can be deconstructed for steel only.
  • Deconstruction for substations, SMES and generator will include a circuit board. Removing from scope. They can be sufficiently advanced that people can't just deconstruct them and ruin the map power.
  • Possibly add Deuterium as the fuel for the mini reactor and to the main reactor (already have another branch for this, consider scrapping that one). Out of scope as need latest upstream.
  • Sprite a high tech energy storage option (enclave / BOS bunker style from F3.)
  • Sprite an APC replacement. Breaker box with lever for on / off and LED light for charging / discharging (Or redesign APC entirely to actually just be a local switch with no power storage).
  • Add destruction explosion for fusion generators and spawn hot gas.

Media

image
image
Content Client_zFwM4ekVZE
image
image
https://cdn.discordapp.com/attachments/995678248904179732/1189866895730552842/Content.Client_JrCfGnc4Oq.gif?ex=659fb8e6&is=658d43e6&hm=053c3377da0b76a9ca8076ea1cbbaadbc4ddccfc43852a0e4a9e94637616d9b5&

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

@github-actions github-actions bot added Changes: Sprites No C# For easier issues relating to YAML labels Dec 18, 2023
Copy link
Contributor

github-actions bot commented Dec 18, 2023

RSI Diff Bot; head commit 5226c1d merging into 3b92f9c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nuclear14/Objects/Misc/materials.rsi

State Old New Status
aluminium Added
bluewire Added
bluewire_2 Added
bluewire_3 Added
brass Added
bullets Added
casings Added
ceramic Added
ceramic_2 Added
ceramic_3 Added
circuits Added
circuits_2 Added
circuits_3 Added
cloth Added
coal Added
copper Added
firewood Added
firewood_2 Added
firewood_3 Added
gold Added
greenwire Added
greenwire_2 Added
greenwire_3 Added
ingot_aluminum Added
ingot_brass Added
ingot_copper Added
ingot_gold Added
ingot_lead Added
ingot_silver Added
ingot_steel Added
iron Added
lead Added
leather Added
log Added
militaryfiber Added
nail Added
nail_2 Added
nail_3 Added
nail_4 Added
plank Added
plank_2 Added
plank_3 Added
plastic Added
powder_aluminum Added
powder_brass Added
powder_copper Added
powder_gold Added
powder_lead Added
powder_silver Added
powder_steel Added
redwire Added
redwire_2 Added
redwire_3 Added
rubber Added
scrap Added
scrap_2 Added
scrap_3 Added
scrap_aluminum Added
scrap_brass Added
scrap_clockwork Added
scrap_copper Added
scrap_electronic Added
scrap_electronic_2 Added
scrap_electronic_3 Added
scrap_glass Added
scrap_glass_2 Added
scrap_glass_3 Added
scrap_gold Added
scrap_lead Added
scrap_parts Added
scrap_parts_2 Added
scrap_parts_3 Added
scrap_silver Added
scrap_steel Added
scrap_steel_2 Added
scrap_steel_3 Added
scrap_wood Added
silver Added
sulfur Added
thread Added
uranium Added
yellowwire Added
yellowwire_2 Added
yellowwire_3 Added

Resources/Textures/Nuclear14/Structures/Machines/mainframe.rsi

State Old New Status
mainframe Added
mainframe_on Added

Resources/Textures/Nuclear14/Structures/Power/32x48_machines.rsi

State Old New Status
generator Added
generator_damaged Added
generator_destroyed Added
generator_rust Added
generator_rust_damaged Added
generator_rust_destroyed Added
rack Added
rack_on Added
rackdestroyed Added
rackempty Added
rackparts Added
recorder Added
recorder_on Added
serverrack Added
serverrack_on Added
substation Added
substation_destroyed Added
substation_rust Added
substation_rust_destroyed Added

Resources/Textures/Nuclear14/Structures/Power/breakerbox.rsi

State Old New Status
base Added
channel1-auto_off Added
channel1-auto_on Added
display-charging Added
display-full Added
display-lack Added
frame Added
panel Added

Resources/Textures/Nuclear14/Structures/Power/enclave.rsi

State Old New Status
generator_enclave_off Added
generator_enclave_on Added
powerstorage_enclave Added
smes-oc0 Added
smes-oc1 Added
smes-oc2 Added
smes-og1 Added
smes-og2 Added
smes-og3 Added
smes-og4 Added
smes-og5 Added
smes-op0 Added
smes-op1 Added
smes-op2 Added
smes Added

Resources/Textures/Nuclear14/Structures/Power/powerstorage.rsi

State Old New Status
smes-oc0 Added
smes-oc1 Added
smes-oc2 Added
smes-og1 Added
smes-og2 Added
smes-og3 Added
smes-og4 Added
smes-og5 Added
smes-op0 Added
smes-op1 Added
smes-op2 Added
smes Added

Edit: diff updated after 5226c1d

@Peptide90 Peptide90 merged commit 568f40a into master Dec 30, 2023
6 of 7 checks passed
@Peptide90 Peptide90 deleted the substations branch December 30, 2023 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites No C# For easier issues relating to YAML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant