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

XM-CL ANCW: Caustic Armor for research #6592

Closed
wants to merge 60 commits into from
Closed

XM-CL ANCW: Caustic Armor for research #6592

wants to merge 60 commits into from

Conversation

TheManWithNoHands
Copy link
Contributor

@TheManWithNoHands TheManWithNoHands commented Jun 29, 2024 •
edited
Loading

About the pull request

Adds a new set of armor to the game.
The XM-CL ANCW. An Armor set that research can print for a step price.
It provides heavy Bio protection, a bit better bomb protection and heat protection, but in turn, it is much less effective against bullets and reacts harsher to electric shocks.

It has even an actual place in the lore, being that its based on the Z-110 ANCW. An anti xenomprh armor that uses gel to turn acid into basicly water. The chest pice contains its lore blurp.
https://avp.fandom.com/wiki/Z-110_Acid_Neutralizing_Combat_Wardrobe

Prices are WIP and definitly need a second opion.

Explain why it's good for the game

Its another thing research can buy using their printer.
The bioprinter is currently our fairest pointshop we have, being the only one that doesnt gain points by being AFK. And we have one shop where you can be AFK to earn metal, wich is one of the strongest things in the game.

The printer already has a lot of great options people can chose to spend their points on. Expanding the list of avalibel things to buy from it, gives the printer and research much more varity. So they hopefully dont do the same every round.
There is already the thing that a lot of researchers only use the printer to make more points for stims.
So giving the printer more atractive options would help reduce the over reliance on stims.

Testing Photographs and Procedure

https://imgur.com/a/TpXl0oc

Changelog

🆑 TheManWithNoHands

add: Added Caustic Armor
imageadd: added icons for new armor, helmet, gloves, boots, uniform and kit

/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Jun 29, 2024
@TheManWithNoHands TheManWithNoHands changed the title Z-210-C ANCW Armor for research Bioprinter Z-210-C ANCW Armor for research Jun 29, 2024
@TheManWithNoHands TheManWithNoHands changed the title Z-210-C ANCW Armor for research Z-210-C ANCW: Caustic Armor for research Jun 29, 2024
Zonespace27
Zonespace27 requested changes Jun 29, 2024
View reviewed changes
code/datums/research_upgrade_datum.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
@TheManWithNoHands TheManWithNoHands changed the title Z-210-C ANCW: Caustic Armor for research Z-210 ANCW: Caustic Armor for research Jun 30, 2024
Zonespace27
Zonespace27 requested changes Jul 5, 2024
View reviewed changes
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
code/modules/clothing/suits/marine_armor/_marine_armor.dm Outdated Show resolved Hide resolved
@cm13-github
Copy link
Contributor

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

@TheManWithNoHands
Copy link
Contributor Author

im not gonna touch the .dmi conflicts until the pr is aproved to be merged balance wise. I have to do this by hand everytime a Pr gets merged that touches any of those files. NO.

kiVts
kiVts requested changes Aug 9, 2024
View reviewed changes
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.

fix conflicts, The price might be too high for what it is but we will see.

code/datums/research_upgrade_datum.dm Show resolved Hide resolved
code/modules/cm_marines/equipment/kit_boxes.dm Show resolved Hide resolved
code/modules/clothing/shoes/marine_shoes.dm Show resolved Hide resolved
code/modules/clothing/head/helmet.dm Outdated Show resolved Hide resolved
code/datums/research_upgrade_datum.dm Outdated Show resolved Hide resolved
@kiVts kiVts marked this pull request as draft August 9, 2024 00:29
@TheManWithNoHands
Copy link
Contributor Author

TheManWithNoHands commented Aug 9, 2024 •
edited
Loading

fix conflicts, The price might be too high for what it is but we will see.

I keep having to resovle the conflix again and again by hand because i cant make the hooks work. So no, im waiting until this is aproved balance wise. The reason why this isnt going stale is because i used to immediatly .dmi errors.

Also stop setting my Pr on draft, especially if half your suggestions are just about subjective phrasing.

@TheManWithNoHands TheManWithNoHands marked this pull request as ready for review August 9, 2024 16:33
@Drulikar Drulikar added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Aug 9, 2024
@Drulikar
Copy link
Contributor

Drulikar commented Aug 9, 2024 •
edited
Loading

fix conflicts, The price might be too high for what it is but we will see.

I keep having to resovle the conflix again and again by hand because i cant make the hooks work. So no, im waiting until this is aproved balance wise. The reason why this isnt going stale is because i used to immediatly .dmi errors.

Also stop setting my Pr on draft, especially if half your suggestions are just about subjective phrasing.

You should seek help getting the hooks working. As far as I knew they were working for you. The last thing you were told to do IIRC was to clear your python cache so you can install the new python version.

It is standard procedure for maintainers to draft a PR when a review is made. A drafted PR & conflicted PR is remove from the review queue.

@TheManWithNoHands
Copy link
Contributor Author

You should seek help getting the hooks working. As far as I knew they were working for you. The last thing you were told to do IIRC was to clear your python cache so you can install the new python version.

Yeah, i will tinker around a bit again and see if i can get it to work. If not, i ask on the discord again.

It is standard procedure for maintainers to draft a PR when a review is made. A drafted PR & conflicted PR is remove from the review queue.
Ahh, got very confused by it. First time i saw it happen like that. Sorry about that then.

@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 9, 2024
@kiVts kiVts added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Aug 10, 2024
cm13-github added a commit that referenced this pull request Aug 10, 2024
@cm13-github
TGS Test Merge (#6592)
e3b0281
@TheManWithNoHands
Copy link
Contributor Author

TheManWithNoHands commented Aug 10, 2024 •
edited
Loading

definitly needs some buffs watching its TM

@kiVts
Copy link
Contributor

kiVts commented Aug 11, 2024

Off testmerge because it conflicts with hybrisa now

@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 18, 2024
@kiVts kiVts removed the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Aug 27, 2024
@TheManWithNoHands TheManWithNoHands marked this pull request as draft September 8, 2024 12:18
@TheManWithNoHands
Copy link
Contributor Author

something something, needs likly a rework and/or major rebalancing

@harryob
Copy link
Member

harryob commented Oct 26, 2024

pr appears to be stale (no commits for a couple weeks), feel free to ask us to reopen/open a new pr when you're working on it again

@harryob harryob closed this Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kiVts kiVts kiVts requested changes

@harryob harryob harryob requested changes

@nauticall nauticall nauticall approved these changes

@Zonespace27 Zonespace27 Awaiting requested review from Zonespace27

Assignees
No one assigned
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Merge Conflict PR can't be merged because it touched too much code Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@TheManWithNoHands @cm13-github @Catzonwheelz @Kaga-404 @Drulikar @kiVts @harryob @Zonespace27 @nauticall