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

Non folding plasteel barricade #6855

Merged
merged 6 commits into from
Aug 14, 2024
Merged

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Aug 2, 2024

About the pull request

Adds non folding plasteel barricade.

dreamseeker_S1DDU1USY9

dreamseeker_ki0T5XoVfe

Has higher hp than folding one, costs less to build than folding one (6 plasteel vs 8), but very slow to build. (Basically the same situation with metal ones, just used the same logic.

Tweakerd folding plasteel cade name to indicate that it's folding one.

Explain why it's good for the game

Just fills a niche just as folding metal folding one did before.

Basically a port of Cosmic-Overlord/RU-TerraGov-Marine-Corps#119

Changelog

🆑
add: plasteel non folding barricade
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Aug 2, 2024
@Git-Nivrak

This comment was marked as off-topic.

@Blundir

This comment was marked as off-topic.

Copy link
Contributor

@kiVts kiVts left a comment

Choose a reason for hiding this comment

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

Code, Dunno about balance though

code/game/objects/structures/barricade/metal.dm Outdated Show resolved Hide resolved
code/game/objects/structures/barricade/plasteel.dm Outdated Show resolved Hide resolved
code/game/objects/items/stacks/sheets/sheet_types.dm Outdated Show resolved Hide resolved
code/game/objects/items/stacks/sheets/sheet_types.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Aug 7, 2024
@Drulikar Drulikar marked this pull request as draft August 7, 2024 05:09
@Drulikar Drulikar added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Aug 7, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 7, 2024
@Blundir Blundir marked this pull request as ready for review August 7, 2024 15:54
@Blundir Blundir requested a review from Drulikar August 7, 2024 15:54
cm13-github added a commit that referenced this pull request Aug 9, 2024
cm13-github added a commit that referenced this pull request Aug 10, 2024
cm13-github added a commit that referenced this pull request Aug 11, 2024
@cm13-issue-bot cm13-issue-bot mentioned this pull request Aug 11, 2024
@thevandie thevandie mentioned this pull request Aug 12, 2024
3 tasks
cm13-github added a commit that referenced this pull request Aug 13, 2024
cm13-github added a commit that referenced this pull request Aug 13, 2024
cm13-github added a commit that referenced this pull request Aug 13, 2024
cm13-github added a commit that referenced this pull request Aug 13, 2024
@realforest2001 realforest2001 added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Aug 14, 2024
@realforest2001 realforest2001 added this pull request to the merge queue Aug 14, 2024
cm13-github added a commit that referenced this pull request Aug 14, 2024
Merged via the queue into cmss13-devs:master with commit 5cf465e Aug 14, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Aug 14, 2024
@thevandie thevandie mentioned this pull request Aug 14, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants