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

[MIRROR] Updates the "Slim" belt reskin and code cleanup of no longer used "peacekeeper" belts #1725

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#552

About The Pull Request

Saw the screenshot of the current belts included a very outdated sprite. Found out it's not even linking to TG's file so now its doing that.

While here I did a few other things:

  • Removed a nonmodular edit adding reskins to secbelts... which we then override with the reskins we ACTUALLY have available right now. This code was not in use.
  • Removed the Peacekeeper belt. Item not in use.
  • Repathed the Armadyne belt/webbing to be their own unique subtypes instead of subtypes of /peacekeeper
  • Removed lots of the redefined code on Peacekeeper webbing, bringing it in line with TG sec webbing (This may sound like a nerf, and it DOES remove one slot, but it actually makes it so that any subtype of /gun/ can be put in as long as its small enough. So might qualify as a buff.) (The hope is that whenever TG resprites the sec webbing we can just throw this item out entirely but right now its our "bluesec webbing"

How This Contributes To The Nova Sector Roleplay Experience

Sprite that isnt years out of date, other related cleanup

Proof of Testing

Screenshots/Videos Reskin, onmob, and obj icons all work as expected

image

Peacekeeper webbing still exists
image

So does the armadyne belt because they still exist inlore for now
image

Changelog

🆑 OrionTheFox
del: Removed unused "Peacekeeper Belt" and put the remaining "Peacekeeper Webbing" in-line with TG Sec Webbing
image: updated the icon used for the "Slim" variant of sec belts (now called "Basic")
/:cl:

…acekeeper" belts (#552)

* slim -> upstream basic

* remove overridden override (this is physically inaccessible code)

* removes peacekeeper belt (no longer used item)

* peacekeeper webbing is now just a reskin of TG webbing (until TG resprites it and I can remove this thing)

* removes unused icons too

* override woes and a CI fix

* okay fine you win shitcode you win

* fine. FINE. you WIN. i regret making you, you evil item.

* ok yea that ones on me

* oh my godddddd

* Forgive me. Forgive me.
@ReezeBL ReezeBL merged commit 0a60401 into master Jan 31, 2024
23 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-552 branch January 31, 2024 07:17
AnywayFarus added a commit that referenced this pull request Jan 31, 2024
Iajret pushed a commit that referenced this pull request Mar 30, 2024
* Your heart stops beating when you die now. (#82305)

## About The Pull Request

Your heart stops beating when you die now.

## Why It's Good For The Game

Did you know spacemen hearts kept beating for like 8 minutes despite
being dead until the organ failure finally stopped it? This is stupid
from a consistency and realism standpoint.

## Changelog
:cl:
balance: Your heart stops beating when you die now.
/:cl:

* Your heart stops beating when you die now.

---------

Co-authored-by: Iamgoofball <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants