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

PGF Squad Leader Equipment + Fixes #2863

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Mar 26, 2024

About The Pull Request

This PR adds equipment for the Marine Sergeant role of the PGF, including:

  • The Marine commander cap
  • The Marine commander flap hat

This PR also fixes military webbing.

PGF armor stats now resembles standard-issue military armor of the biggest military in the galaxy

Finally, this PR gives the captain an unique cloak design.

Why It's Good For The Game

There was a discussion about making the sergeant more unique visually, and I wasn't really impressed with the design presented, since they aren't a high-ranking command role.

So I came up with this: much better and more identifiable, while the captain has new cloak now!

Screenshot_12047
Screenshot_12052
Screenshot_12053
Screenshot_12055

Changelog

🆑
add: adds PGF Sergeant clothing!
add: PGF Captain now has a new cloak design!
balance: PGF armor now has similar stats to bulletproof armor!
/:cl:

@rye-rice rye-rice requested a review from a team as a code owner March 26, 2024 02:08
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Mar 26, 2024
@Imaginos16 Imaginos16 changed the title pgf squad leader equipment + fixes PGF Squad Leader Equipment + Fixes Mar 26, 2024
@@ -86,12 +86,14 @@
desc = "Raksha - a Kalixcian word for 'protection of the heart'. Sturdy and reliable."
icon_state = "marinevest"
item_state = "marinevest"
armor = list("melee" = 35, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) //the laser gun country should probably have laser armor
Copy link
Contributor

Choose a reason for hiding this comment

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

Thats quite a lot of armor in total

Copy link
Member Author

Choose a reason for hiding this comment

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

I accidentally deleted my draft comment because groggy but tldr;

Bulletproof armor has 60 bullet armor
Ablative armor has 60 laser
Regular has 35 melee

Lorewise it makes sense for laser centric planet to have good laser armor
Since frontier is one of the few places that use ballistics, they also equip frontier units with ballistic armor

Gameplay wise it's so the pgf can interact better with the gunplay balancing, but also you can just fucking shoot the arms/legs which aren't protected, just like the Regular bulletproo/Ablative armor

@Imaginos16 Imaginos16 added this pull request to the merge queue Mar 27, 2024
Merged via the queue into shiptest-ss13:master with commit 4b13946 Mar 27, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 12, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This PR adds equipment for the Marine Sergeant role of the PGF,
including:
- The Marine commander cap
- The Marine commander flap hat

This PR also fixes military webbing.

PGF armor stats now resembles standard-issue military armor of the
biggest military in the galaxy

Finally, this PR gives the captain an unique cloak design.

## Why It's Good For The Game

There was a discussion about making the sergeant more unique visually,
and I wasn't really impressed with the design presented, since they
aren't a high-ranking command role.

So I came up with this: much better and more identifiable, while the
captain has new cloak now!


![Screenshot_12047](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d393ee22-0e9a-4866-a441-1e73e42aa955)

![Screenshot_12052](https://github.com/shiptest-ss13/Shiptest/assets/58402542/0048ab55-5c6f-4d42-83cc-62767488d6d7)

![Screenshot_12053](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d10c89dc-a19f-4814-b804-3f7c30c69e4d)

![Screenshot_12055](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d77275c7-2fd6-47c2-b3ba-dd606bd79716)


## Changelog

:cl:
add: adds PGF Sergeant clothing!
add: PGF Captain now has a new cloak design!
balance: PGF armor now has similar stats to bulletproof armor!
/:cl:
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 15, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This PR adds equipment for the Marine Sergeant role of the PGF,
including:
- The Marine commander cap
- The Marine commander flap hat

This PR also fixes military webbing.

PGF armor stats now resembles standard-issue military armor of the
biggest military in the galaxy

Finally, this PR gives the captain an unique cloak design.

## Why It's Good For The Game

There was a discussion about making the sergeant more unique visually,
and I wasn't really impressed with the design presented, since they
aren't a high-ranking command role.

So I came up with this: much better and more identifiable, while the
captain has new cloak now!


![Screenshot_12047](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d393ee22-0e9a-4866-a441-1e73e42aa955)

![Screenshot_12052](https://github.com/shiptest-ss13/Shiptest/assets/58402542/0048ab55-5c6f-4d42-83cc-62767488d6d7)

![Screenshot_12053](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d10c89dc-a19f-4814-b804-3f7c30c69e4d)

![Screenshot_12055](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d77275c7-2fd6-47c2-b3ba-dd606bd79716)


## Changelog

:cl:
add: adds PGF Sergeant clothing!
add: PGF Captain now has a new cloak design!
balance: PGF armor now has similar stats to bulletproof armor!
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants