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

Reworks and adds a few flags (the fabric kind) #12926

Merged
merged 12 commits into from Dec 19, 2023

Conversation

DisturbHerb
Copy link
Contributor

@DisturbHerb DisturbHerb commented Jan 29, 2023

[MAPPING][OBJECTS][FEATURE][REWORK]

About the PR

This PR re-organises obj/decal/wallsign/flag into its own type, obj/decal/poster/flag, and introduces a new obj/item/flag that can be placed on walls much like fabric banners (#5036). Flags can also now be taken down from walls by attacking them with a free hand. All instances of flags in the public repository have been updated with the new file path. I hope.

Also, more flags. Thanks to Geonightman#2706 on Discord for making the icons for these.*
flegs

*this has been updated like numerous times sorry (accurate as of 1 feb 2023)

I drew the folded flag states and the blank flag stuff and I don't love them, feedback will be appreciated.

All of the flags, save for the lesbian pride ones, are currently player-unobtainable.

Why's this needed?

Flags are nice and I wanted them for a thing.

(u)DisturbHerb + Geonightman
(+)Flags can now be hung up and removed from walls.
(+)Adds a bunch of pride flags.

@boring-cyborg boring-cyborg bot added A-Mapping A mapping change C-Sprites Automatically applied on any .dmi or icons folder change labels Jan 29, 2023
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 29, 2023
@keywordlabeler keywordlabeler bot added A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features C-Rework Reworks a feature labels Jan 29, 2023
@ZeWaka
Copy link
Member

ZeWaka commented Jan 30, 2023

Why not just have a generic flag that can be painted like a canvas?

@DisturbHerb
Copy link
Contributor Author

DisturbHerb commented Jan 30, 2023

Why not just have a generic flag that can be painted like a canvas?

we've already got banners tho

i should add: the main reason why i'm implementing flags as their own thing as opposed to just BEEFing up banner code is primarily for mapping and so we could have a fun pre-made asset to decorate things with. i suspect the confusion might be brought about due to the inclusion of the blank flag, so i'd be perfectly happy to just turn that into an abstract type and killing it all together*

*i forgot that white flags have actual meaning, woops, we could put some more thought into it

@github-actions
Copy link
Contributor

This PR has been inactive for two weeks, and has been automatically marked as stale. This means it is at risk of being auto closed in another week. Please address any outstanding review items and ensure your PR is finished. If you are auto-staled anyway, ask developers if your PR will be merged. Once you have done any of the previous actions then you should request a developer remove the stale label on your PR, to reset the stale timer. If you feel no developer will respond in that time, you may wish to close this PR youself, while you seek developer comment, as you will then be able to reopen the PR yourself.

@github-actions github-actions bot added the S-Stale An inactive PR that has had no updates in the past two weeks label Feb 15, 2023
@github-actions github-actions bot closed this Feb 23, 2023
@DisturbHerb
Copy link
Contributor Author

Opening this PR as-is for review (since this was never actually opened).

@DisturbHerb DisturbHerb reopened this Sep 9, 2023
@DisturbHerb DisturbHerb marked this pull request as ready for review September 9, 2023 10:30
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 9, 2023
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 10, 2023
@frawhst frawhst removed the S-Stale An inactive PR that has had no updates in the past two weeks label Sep 12, 2023
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

seems cool

code/obj/decal/poster.dm Outdated Show resolved Hide resolved
code/obj/item/flag.dm Outdated Show resolved Hide resolved
code/obj/item/flag.dm Outdated Show resolved Hide resolved
code/obj/item/flag.dm Outdated Show resolved Hide resolved
code/obj/item/flag.dm Outdated Show resolved Hide resolved
DisturbHerb and others added 3 commits September 22, 2023 21:10
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
@github-actions github-actions bot added the S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) label Oct 22, 2023
@TobleroneSwordfish TobleroneSwordfish merged commit f9edfed into goonstation:master Dec 19, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 19, 2023
@DisturbHerb DisturbHerb deleted the fleg branch December 19, 2023 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object A-Mapping A mapping change C-Feature A new feature or enhancements to existing features C-Rework Reworks a feature C-Sprites Automatically applied on any .dmi or icons folder change S-Ready-For-Final-Review This PR has been looked over by members of the community. (automatic after 2 approvals) size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants