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

cigarettes cigars lighters fit in helmet cosmetic #6841

Conversation

hislittlecuzingames
Copy link
Contributor

@hislittlecuzingames hislittlecuzingames commented Aug 1, 2024

About the pull request

Allows smoking rp items to fit in helmet cosmetic slots instead of taking up "valuable" slots.

Explain why it's good for the game

If you fill up your slots with gear, you often cannot fit smoking items like cigarettes and lighters. This allows players to RP more with their ability to take RP items without sacrificing gameplay items.

please verify...
I thought you'd use pipe equals to add bitflags in dm ie
my-bitflag |= MYNEWVALUE
This wouldn't compile though...

I saw ampersand equals removes items not on the right side of equals.
So I used regular equals and it seems to fit into backpacks and webbing no problem.

Testing Photographs and Procedure

I tested by spawning using "create humans" and spawning USCM and their class.
I verified the items fit in each of the basic helmets and also put in "game items" like bandages and an injector to assure they took the cosmetic slots, not the "item" slots.

I also put the cigarettes into the 5 slot webbing and backpacks.

Screenshots & Videos

354072752-7921f9a0-51af-49e1-a521-a3f9f8cd6363

354072765-f37b936a-3763-4d84-b047-69116d8d9b18

354072809-c56198eb-7482-4814-803b-e52193446e94

354073089-adb46a73-3798-4441-b381-0ef4432df429

354073414-2bfb7d21-feba-4d7a-8632-233add523e30

Changelog

🆑
qol: Can roleplay easier with cigarettes, cigars, lighters counting as cosmetic for helmet storage purposes.
/:cl:

@github-actions github-actions bot added the Quality of Life Make the game harder to play label Aug 1, 2024
@hislittlecuzingames hislittlecuzingames marked this pull request as ready for review August 1, 2024 04:36
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

I thought you'd use pipe equals to add bitflags in dm ie
my-bitflag |= MYNEWVALUE
This wouldn't compile though...

The error you likely got was that you can't assign a non-constant value in a definition.

Doing whatever |= thing means take whatever already exists in whatever and bitwise or that with thing. Since the existing value can be anything, thats not a constant value; and thus cannot be in a definition.

Code that has to execute cannot be in a definition.

With 515 the :: operator could do something similar though: e.g. flags_obj = parent_type::flags_obj|OBJ_IS_HELMET_GARB

But in this case the flags_object for all of these items, including /obj/item/clothing/mask/cigarette are already 0 so there is nothing to inherit for that flag currently.

code/game/objects/items/storage/fancy.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft August 1, 2024 10:51
@hislittlecuzingames
Copy link
Contributor Author

Thanks for the code snippet.

I made the adjustment to the better code convention, removed cigar boxes and added matchboxes to be cosmetic slots in helmets.
I verified they (cigarette pack, lighter) fit in the com tech helmet.

re-requesting review.

@hislittlecuzingames hislittlecuzingames marked this pull request as ready for review August 2, 2024 04:48
@Drulikar
Copy link
Contributor

Drulikar commented Aug 2, 2024

Pr title and description currently still mentions cigars but code does nothing regarding cigars.

@hislittlecuzingames

This comment was marked as outdated.

@hislittlecuzingames
Copy link
Contributor Author

hislittlecuzingames commented Aug 2, 2024

Pr title and description currently still mentions cigars but code does nothing regarding cigars.

the cigars are under the cigarettes as you mentioned. They're in the "flame tool" file for some reason.
~snip image

If you want me to test the cigar, I don't know where they are but if you tell me, I can produce screenshots of verified testing.

nevermind I can't read.

added appropriate support in "added cigar and weed support" commit.

@Drulikar Drulikar added this pull request to the merge queue Aug 3, 2024
Merged via the queue into cmss13-devs:master with commit 0e60f0e Aug 3, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Aug 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Quality of Life Make the game harder to play
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants