Open
Conversation
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request all the bits and bobs to have a modular folder recongized by the codebase and a port of ApocryphaXIII/ApocryphaXIII#81 (the carpet part) <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and its effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: FalloutFalcon, PositiveEntropy, INFRARED_BARON image: new carpets! /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
…ndCity into stealing-from-CM
…o darkpack-pull-1-16-2026
Member
Author
|
accidentially pulled from the wrong branch FML |
chazzyjazzy
requested changes
Apr 7, 2026
Contributor
chazzyjazzy
left a comment
chazzyjazzy
left a comment
There was a problem hiding this comment.
mostly looks fine but im gonna want some others to take a look at this. also consider moving brand from every atom (which is... alot...) to every obj
FalloutFalcon
requested changes
Apr 8, 2026
chazzyjazzy
approved these changes
Apr 9, 2026
Contributor
chazzyjazzy
left a comment
chazzyjazzy
left a comment
There was a problem hiding this comment.
now that 'brand' is now on every obj, i think this is fine with me as long as abbys requetss also get addressed
Comment on lines
+569
to
+570
| // Done this way otherwise Width() and Height() would always be 0 for this icon // DARKPACK EDIT ADD START - Company Logos | ||
| var/icon/cleaned = icon('icons/effects/effects.dmi', "nothing") // DARKPACK EDIT ADD END |
Member
There was a problem hiding this comment.
Im very uncertin if this is not a breaking change for SOMETHING. Gonna make a downstream TM pr purely because of it.
This reverts commit 2ab365a.
Member
Author
|
guy who committed to the wrong branch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Port of cmss13-devs/cmss13#10840
logos needed
update 3/14/26: atomizing out the descriptions
Why It's Good For The Game
adds fun flavor to a lot of boring items
Changelog
🆑
add: company logo element
/:cl: