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

Adjust Belt Storage #1870

Merged
11 commits merged into from
Sep 21, 2024
Merged

Adjust Belt Storage #1870

11 commits merged into from
Sep 21, 2024

Conversation

TadJohnson00
Copy link
Contributor

@TadJohnson00 TadJohnson00 commented Sep 20, 2024

About the PR

Adds the Wakizashi tag.
Alphabetises DeltaV tags.yml
Reworks katana sheaths to use container system instead of storage system
Adds medkit item slot to corpsman and CMO webbing
Adds sidearm holster slot to security belt and webbing
Add new item map and sprites for Delta-V belts.
Add whitelist requirements to medkits.

Why / Balance

In preparation for changes that will adjust how pistols are stowed, security webbing will now feature item slots allowing for the broader Sidearm tag, while boots and pockets will only be able to hold ConcealCarry tagged items.
Corpsmen (and CMOs using the webbing) will be capable of stowing a spare medkit on their belts. To ensure that the medkit slot is not being exploited for free storage space (and to combat the free four slots offered by combat medkits), each medkit will now only hold topicals, pill canisters, injectors, syringes, etc.

Technical details

n/a

Media

n/a

Requirements

Breaking changes

n/a
Changelog

🆑

  • add: Security and medical webbing now feature slots for sidearms and medkits respectively.
  • tweak: Medkits now have a whitelist for stored items.
  • fix: Security belts will now display stored items properly.

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Status: Needs Review labels Sep 20, 2024
Copy link
Contributor

github-actions bot commented Sep 20, 2024

RSI Diff Bot; head commit 34a4a67 merging into 4923bfc
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi

State Old New Status
baton Added
flashbang Added
gasgrenade Added
katana Added
medkit Added
slp Added
universal Added
wakizashi Added

Edit: diff updated after 34a4a67

@Avalon-Proto
Copy link
Contributor

Can you also add the medkit item slot to the Nukie agent webbing? And if I may ask, what did you whitelist medkits to carrying?

@TadJohnson00
Copy link
Contributor Author

TadJohnson00 commented Sep 20, 2024

Can you also add the medkit item slot to the Nukie agent webbing? And if I may ask, what did you whitelist medkits to carrying?

I mean, I probably could. As far as I'm aware, they actually get a full 2x8 storage with no whitelist requirements, though.
*edit: They do not. Wild. Yeah, sure, I'll chuck it on I guess.
**edit of edit: ...actually, I'm not completely sold. Nukies already get a shitton of an advantage, I'd probably have to standardise sprites, give the regular nukie webbing a holster slot... maybe later, if I get a super convincing argument.

As for the whitelist, it's all listed in the medkits.yml file. Off the top of my head, it extends to:

  • topicals (brutepacks, ointment, gauze, bloodpacks)
  • hyposprays (this is actually the tag that medipens get, surprisingly)
  • bottles
  • masks and tanks (see oxygen deprivation kit)
  • pill bottles

@Avalon-Proto
Copy link
Contributor

Can you also add the medkit item slot to the Nukie agent webbing? And if I may ask, what did you whitelist medkits to carrying?

I mean, I probably could. As far as I'm aware, they actually get a full 2x8 storage with no whitelist requirements, though. *edit: They do not. Wild. Yeah, sure, I'll chuck it on I guess. **edit of edit: ...actually, I'm not completely sold. Nukies already get a shitton of an advantage, I'd probably have to standardise sprites, give the regular nukie webbing a holster slot... maybe later, if I get a super convincing argument.

As for the whitelist, it's all listed in the medkits.yml file. Off the top of my head, it extends to:

  • topicals (brutepacks, ointment, gauze, bloodpacks)
  • hyposprays (this is actually the tag that medipens get, surprisingly)
  • bottles
  • masks and tanks (see oxygen deprivation kit)
  • pill bottles

As far as I know with the webbings. It was kind of a universal nerf across the board to split them up, just like CMO, standard. Etc. though maybe giving parameds one of these medkit slots would be nice. In the end your PR, just offering suggestions. Overall though I do like the sound of this one. I assume the sidearm slot for belts/rigs will allow you to fit any handgun type weapon inside?

@TadJohnson00
Copy link
Contributor Author

Funnily enough, I really wanted to give the CMO's webbing to paramedics when I first added it to the game, which is reflected in its description - but I think I was discouraged from it at the time. Maybe I'll look into doing something of the sort in future.

And yeah, the webbing/belt will let you equip anything with the Sidearm tag - this is every handgun, to my knowledge, as well as disablers, tasers, etc.

@Avalon-Proto
Copy link
Contributor

A chest rig or just more things being allowed on paramed belts would be a godsend to them everywhere. Bag space is at a premium as em after all. Overall this PR seems like a solid one imo and hope to see it merged soon

@deltanedas
Copy link
Member

molle pouches from cdda when :trollface:

overall really good pr

@TadJohnson00
Copy link
Contributor Author

fuck's goin on with B&T debug though?

@deltanedas
Copy link
Member

you need to add a container for the slots to every prototype

@MilonPL
Copy link
Contributor

MilonPL commented Sep 20, 2024

fuck's goin on with B&T debug though?

your yaml is fucked, the test makes sure that for each prototype, data fields of all components of this prototype post-init reflect the data fields as defined in the prototype
so after init, all entities created from the prototypes have fields that are not present in the yaml

containers:
  storagebase: !type:Container
    showEnts: False
    occludes: True
    ents: []
  holster: !type:ContainerSlot
    showEnts: False
    occludes: True
    ent: null

you probably need to add

  - type: ContainerContainer
    containers:
    (containers here)

@TadJohnson00
Copy link
Contributor Author

sighs

my dumbass was really here looking at the janicart for reference when y'all already had answers but ok

@FieldCommand
Copy link

As it stands, the CMO webbing is worse than the medical belt. Could it then perhaps get two slots, one for medkit and one for portable defib? I think this could make the CMO useful again. After all the CMO webbing, and command gear in general should have some of the nicer/better gear around.

@TadJohnson00
Copy link
Contributor Author

As it stands, the CMO webbing is worse than the medical belt. Could it then perhaps get two slots, one for medkit and one for portable defib? I think this could make the CMO useful again. After all the CMO webbing, and command gear in general should have some of the nicer/better gear around.

Medical belt is a 2x8 with a whitelist for medical items only. The CMO webbing is a 2x3 + 2x4 with no whitelist, meaning you lose two slots in exchange for being able to put anything in your belt (which, ostensibly, makes it just as good if not better in my opinion). Now, with the additional space offered by a medkit slot, you've got another 2x4 space for meds - giving you 6 more slots for medicine. As of this PR's merge, it will be objectively better than a medical belt. I don't really see the need to give it another slot at this stage.

@FieldCommand
Copy link

Medical belt is a 2x8 with a whitelist for medical items only. The CMO webbing is a 2x3 + 2x4 with no whitelist, meaning you lose two slots in exchange for being able to put anything in your belt (which, ostensibly, makes it just as good if not better in my opinion). Now, with the additional space offered by a medkit slot, you've got another 2x4 space for meds - giving you 6 more slots for medicine. As of this PR's merge, it will be objectively better than a medical belt. I don't really see the need to give it another slot at this stage.

The CMO belt used to be 3x8, giving 24 grid inventory. And now has two over all smaller 2x3 and 2x4, giving a total of 14 grid inventory. With the addition of a medkit inventory slot, it goes to 22 grid inventory total. This is better but not great. Something I liked to do as CMO was to have the portable defib in the webig as well, and that a 2x2 item. Mening, I will now have to use some of the space that is very premium in the current CMO webbing, even with the added medkit slot. That's why I asked for an extra slot locked only to the portable defib. How I would use the CMO webbing with current and planned use of is the 2x3 would be a porta defib, and hypo, and the 2x4 for topicals, (the medikit slot would be used for more topicals. But this is a deeper inventory, meaning more clicking to get in and out of inventory windows.)

And personally, I think the CMO webbing should have the same restriction as a medical belt.

@TadJohnson00
Copy link
Contributor Author

The CMO belt used to be 3x8, giving 24 grid inventory.

This was always a bug, and a mistake that occurred by oversight when moving from list inventory to grid inventory.

How I would use the CMO webbing with current and planned use of is the 2x3 would be a porta defib, and hypo, and the 2x4 for topicals.

But... but you could think so much bigger! You can put any set of tools in there, you can put beakers and shakers in there (powergamer alert!). You could put plushies or an emotional support shark in there... but you'd rather just put topicals... sighs.

And personally, I think the CMO webbing should have the same restriction as a medical belt.

The whole reason why the CMO webbing was originally added was because webbings were unique in the fact that they had no whitelist restriction, and I'll probably stick with that general idea for now unless it becomes a major balance issue.

@FieldCommand
Copy link

This was always a bug, and a mistake that occurred by oversight when moving from list inventory to grid inventory.

Fair enough, things like that happen.

But... but you could think so much bigger! You can put any set of tools in there, you can put beakers and shakers in there (powergamer alert!). You could put plushies or an emotional support shark in there... but you'd rather just put topicals... sighs.

That is what the backpack/dufflebag/satchel is for anything and everything I don't need to save someone's life then and there goes there. The webbing/belt is your one stop inventory for everything you need to save someone, and having any kind of liquid on me as a chemist, paramedic, corpsman, or CMO is just an accident waiting to happen. I am much more for pills in that regard, as they don't get spoiled for the tiniest explosion. And you are arguing for the removal of funny hidden stuff from sec because it breaks with the serious look of sec. But you are okay with a goofy CMO... If medical is not on the ball, then people die when shit hits the fan.

@TadJohnson00
Copy link
Contributor Author

Wow, okay, didn't know I wasn't allowed to make jokes here. Yikes.

No, I'm not advocating for people to put goofy shit in their rigs - and actually, both beakers and shakers are decent enough to put in rigs, shakers especially so since they are not destroyed by explosions, only take up two slots, hold 100u, etc. Ideally, though, CMOs can place flashlights, defibs, crowbars or jaws, any set of tools or useful items that you wouldn't be otherwise able to put in a medical belt. I'm well aware that medical fills a vital role and is expected to be efficient in their job.

And while you may dedicate your belt slot to medical items only, others may choose to put medical items in their bag and tools in their chest rig. Or maybe there's a mix of the two. The way in which you play medical personnel is not the definitive way, and you're more than welcome to continue using the regular medical or EMT belts if you don't want to mess around with the CMO webbing.

@deltanedas
Copy link
Member

not having a whitelist isnt that useful imo, if i want random non-medical shit i put it in my satchel.

cdda storage wyci

@TadJohnson00
Copy link
Contributor Author

Fair dos. Still not exactly sure what the issue being raised is; nothing is getting nerfed (other than medkits, I guess), the CMO webbing is getting buffed to a point where it's better than med belts. This PR is ready for review and merge.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

FTL + YAML looks fine, also thank you for alphabetizing tags. Appreciated. TJ told me to "Merge everything," so I'm speedmerging this!!

@ghost ghost merged commit bc609b8 into DeltaV-Station:master Sep 21, 2024
13 checks passed
@TadJohnson00 TadJohnson00 deleted the beltrework branch September 28, 2024 10:35
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants