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

Life Could Be A Dream: Adds Vaurca Attendant as a Warrior subspecies #19529

Merged
merged 18 commits into from Sep 30, 2024
Merged

Conversation

ghost
Copy link

@ghost ghost commented Jun 23, 2024

image
Basically, Attendants are now a subspecies of Warriors instead of a subspecies of Workers, meaning they carry most of the traits over from Warriors aside from the ones that have been modified by me. They also have a unique appearance that should still work with Vaurca clothing, instead of needing adjustments a la Bulwark. Hopefully, an acceptable alternative to the Attendant subspecies that was previously offered in #17550.

@desvenlafaxine

@ghost ghost requested review from Arrow768 and alsoandanswer as code owners June 23, 2024 03:17
@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Jun 23, 2024
@ghost
Copy link
Author

ghost commented Jun 23, 2024

!wip

@BotBOREALIS BotBOREALIS added the WIP The PR is a work in progress and should not be reviewed yet. label Jun 23, 2024
@ghost ghost changed the title Adds Vaurca Attendant as a Warrior bioform, based on having a gaster or no gaster Life Could Be A Dream: Adds Vaurca Attendant as a Warrior bioform, based on having a gaster or no gaster Jun 23, 2024
@ghost
Copy link
Author

ghost commented Jun 24, 2024

Current implementation is too snowflake and I have no desire to put it more in line with current subspecies code with any possibility of being told later that it isn't wanted. Anyone else is free to pick it back up.

@ghost ghost closed this Jun 24, 2024
@ghost
Copy link
Author

ghost commented Jun 26, 2024

nvm

@ghost ghost reopened this Jun 26, 2024
@ghost ghost changed the title Life Could Be A Dream: Adds Vaurca Attendant as a Warrior bioform, based on having a gaster or no gaster Life Could Be A Dream: Adds Vaurca Attendant as a Warrior subspecies Jun 26, 2024
@ghost
Copy link
Author

ghost commented Jun 26, 2024

Project updated. New sprites can be seen here:
image

@desvenlafaxine
Copy link
Contributor

I worked with Gabby, suggesting the changes to the sprite and the base stats. Needless to say, this is lore approved.

@ghost
Copy link
Author

ghost commented Jun 27, 2024

!review

@BotBOREALIS BotBOREALIS added Review Required and removed WIP The PR is a work in progress and should not be reviewed yet. labels Jun 27, 2024
@ghost
Copy link
Author

ghost commented Jul 25, 2024

I'd like some screenshots of them in clothing added to PR desc from all sides

Description updated with clothing from all angles!

@@ -279,7 +279,7 @@
/datum/unarmed_attack/bite/warrior
attack_name = "warrior bite"
attack_verb = list("mauled", "lacerated")
damage = 10
damage = 15
Copy link
Contributor

Choose a reason for hiding this comment

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

That's a pretty big buff. Why?

Copy link
Author

Choose a reason for hiding this comment

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

was requested by @desvenlafaxine. im not intent on sticking with it if not required to but he is free to explain his side first

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO it should at least be split into another PR? It's a pretty major balance change.

Copy link
Contributor

Choose a reason for hiding this comment

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

This can be dismissed if unwanted. The idea is just that the bite has been heavily nerfed and I wanted the basic Warriors to have a reason to use it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Make it a separate PR

@NonQueueingMatt NonQueueingMatt added the Changes Required The PR requires changes before it can be approved and/or merged. label Jul 26, 2024
Copy link

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

@DreamySkrell DreamySkrell removed the Changes Required The PR requires changes before it can be approved and/or merged. label Jul 28, 2024
@DreamySkrell
Copy link
Contributor

removing [changes required] as the warrior bite change was removed from this PR

@Arrow768
Copy link
Member

Arrow768 commented Aug 3, 2024

From a code Perspective that PR is good enough, but I am going to add MD to it to see if we want it

@Arrow768 Arrow768 added the ⛔ Maintainer Discussion The PR will be discussed by the maintainers. label Aug 3, 2024
@Arrow768 Arrow768 added this pull request to the merge queue Sep 28, 2024
@Arrow768 Arrow768 removed the ⛔ Maintainer Discussion The PR will be discussed by the maintainers. label Sep 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 28, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Sep 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 28, 2024
@Arrow768 Arrow768 added the Changes Required The PR requires changes before it can be approved and/or merged. label Sep 28, 2024
@Arrow768
Copy link
Member

@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Sep 30, 2024
Merged via the queue into Aurorastation:master with commit 54212e9 Sep 30, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge Changes Required The PR requires changes before it can be approved and/or merged. Sprites Adds new or changes existing sprites.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants