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

Some Loadout Additions #89500

Merged
merged 9 commits into from
Feb 21, 2025
Merged

Some Loadout Additions #89500

merged 9 commits into from
Feb 21, 2025

Conversation

Jacquerel
Copy link
Member

@Jacquerel Jacquerel commented Feb 15, 2025

About The Pull Request

Mostly inspired by #87924 because there was stuff in there that was mergeable but the author decided not to go forward with any of it as a result of some of it not being wanted.

This adds various items to the loadout, and removes one quirk which literally just gave you an item and did nothing else.
I didn't remove the musician quirk because alongside giving you an item it also applies a trait which makes people like your music more.

Additions:

Shoes (new category):

  • Sneakers (recolourable)
  • Laceup Shoes
  • Cowboy Boots (Brown, Black, or White)
  • Sandals (with laces) (wooden & black)
  • Glow Shoes (recolourable)

Glasses:

  • Monocle
  • Thin glasses (disco elysium Kim glasses)

Neck:

  • Bowtie

Items:

  • Lighter (technically this has a 0.5% chance to intercept one bullet when worn in your suit storage slot... I am hoping that is insignificant enough that we don't care)
  • Pocket Flask (I don't actually know why this doesn't do the same thing as the lighter)
  • Wallet
  • Clipboard
  • Dye Spray
  • Random Contraband Poster
  • Random Titillating Poster (this one might be a little OTT but I thought it was funny)

I think these largely fulfil the criteria of "not dramatically altering your silhouette", "minimal mechanical value", "not out of place in a crowd", and "easy to get"
If there are quibbles about stuff like cowboy boots, glow shoes, lighters, flasks, etc I will be pretty easily convinced to remove whatever.

I also removed a duplicate definition of some shoes, don't freak out that it looks like I removed them they're defined already further up in the file.

Why It's Good For The Game

It's nice to customise your character.

Changelog

🆑 Jacquerel, Dawnseer, & Carlarc
add: Added a variety of shoes to the loadout system
add: Added another pair of pairs of glasses to the loadout system
add: Added a variety of pocket items to the loadout system
del: Removed the Colourist quirk, as you can now get the exact same item via the loadout system
/:cl:

@github-actions github-actions bot added Feature Exposes new bugs in interesting ways Removal This was too fun, too fun! I'm turning this feature around labels Feb 15, 2025
@LemonInTheDark
Copy link
Member

some of these seem like they overlap pretty hard with existing quirks, am I just being old or

@MrMelbert
Copy link
Contributor

I think you should add a pref migration for colorist quirk -> loadout item

@Jacquerel
Copy link
Member Author

some of these seem like they overlap pretty hard with existing quirks, am I just being old or

The camera, candles, instrument, and arguably cigarettes are all things quirks can allow you to spawn with yeah.
All of those quirks also do other things alongside giving you an item though so I didn't automatically want to touch them, I just figured that maybe you just want a camera without a personal photo album or some candles without getting bolded prayer text (actually I assume most people who take that quirk throw the candles away immediately).

@LemonInTheDark
Copy link
Member

LemonInTheDark commented Feb 15, 2025

I would prefer to pick one or the other tbh, especially stuff like the musician trait (applies to cameras as well) where you're taking the sell from "here's a cool themed item and a trait that makes you better at it" to "pay 2 points for a trait you vaguely understand". muddies choice in a way that kinda sucks

@Jacquerel
Copy link
Member Author

I would prefer to pick one or the other tbh, especially stuff like the musician trait where you're taking the sell from "here's a cool themed item and a trait that makes you better at it" to "pay 2 points for a trait you vaguely understand". muddies choice in a way that kinda sucks

Alright I'll nix those ones then.

@MatrixOne500
Copy link

Thank you so much for adding the shoes, I'm so tired of having to start in weird skater converse sneakers every shift. Laceups were a must-have in the equipment screen, and black cowboots are very welcome too

@Dawnseer
Copy link
Contributor

Dawnseer commented Feb 15, 2025

Finally! the thin prescription glasses! Praise be!
And a clipboard! Even better!

@EmptyLullaby
Copy link
Contributor

now my digitigrade lizard wont have to walk barefoot to the clothesmate to buy jackboots on any job that starts with laceups. finally.

@DrAmazing343
Copy link
Contributor

COWBOY BOOTS COWBOY BOOTS COWBOY BOOTS

@optimumtact
Copy link
Member

now my digitigrade lizard wont have to walk barefoot to the clothesmate to buy jackboots on any job that starts with laceups. finally.

That walk of shame is critical to the integrity of the lizard pysche i assure u!

@SmArtKar
Copy link
Member

Otherwise looks amazing

@Jacquerel Jacquerel requested a review from Fikou as a code owner February 20, 2025 22:12
@github-actions github-actions bot added the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Feb 20, 2025
@github-actions github-actions bot removed the Merge Conflict Adding upstream files to your repo via drag and drop won't resolve conflicts label Feb 20, 2025
@SmArtKar
Copy link
Member

what makes you a spaceman in 2025? Wearing velcro sandals

@SmArtKar SmArtKar merged commit d26e197 into tgstation:master Feb 21, 2025
24 checks passed
tgstation-ci bot added a commit that referenced this pull request Feb 21, 2025
github-actions bot added a commit that referenced this pull request Feb 21, 2025
@Jacquerel Jacquerel deleted the loadout-loot branch February 21, 2025 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Exposes new bugs in interesting ways Removal This was too fun, too fun! I'm turning this feature around
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants