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

Add more generator types #78910

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Add more generator types #78910

merged 1 commit into from
Jan 4, 2025

Conversation

GuardianDll
Copy link
Member

@GuardianDll GuardianDll commented Jan 2, 2025 •
edited
Loading

Summary

None

Purpose of change

Sudden continuation of #75618

Describe the solution

Four generator types: portable (gasoline, 3000W, 5,8L of volume capacity) diesel generator (diesel, 7000W, 15L), military diesel generator (diesel, 10000W, 34L) and powerful gasoline generator (gasoline, 12000W, 41L)

Testing

image
image
image
image
image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mods: Aftershock Anything to do with the Aftershock mod Appliance/Power Grid Anything to do with appliances and power grid Mods: No Hope Relating to the mod No Hope Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter labels Jan 2, 2025
github-actions[bot]
github-actions bot reviewed Jan 2, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @Standing-Storm @Night-Pryanik

@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 Jan 2, 2025
@github-actions github-actions bot added Items: Battery / UPS Electric power management BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jan 2, 2025
@Maleclypse Maleclypse merged commit 30b4133 into CleverRaven:master Jan 4, 2025
28 checks passed
@GuardianDll GuardianDll deleted the generator branch January 4, 2025 08:35
@zakhad zakhad mentioned this pull request Jan 8, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
Appliance/Power Grid Anything to do with appliances and power grid astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Battery / UPS Electric power management [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Aftershock Anything to do with the Aftershock mod Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope Mods: Xedra Evolved Anything to do with Xedra Evolved Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@GuardianDll @Maleclypse