Skip to content

Company Logos#491

Merged
FalloutFalcon merged 91 commits intoDarkPack13:masterfrom
dwinters99:stealing-from-CM
Apr 30, 2026
Merged

Company Logos#491
FalloutFalcon merged 91 commits intoDarkPack13:masterfrom
dwinters99:stealing-from-CM

Conversation

@dwinters99
Copy link
Copy Markdown
Member

@dwinters99 dwinters99 commented Jan 7, 2026

About The Pull Request

Port of cmss13-devs/cmss13#10840

logos needed
  • Pentex Group
  • Ardus Enterprises
  • Avalon Inc.
  • Circinus Brands
  • Consolidex Worldwide
  • Endron Intl.
  • Harold and Harold Mining, Inc.
  • Good House Intl.
  • Hallahan Fishing Company
  • Herculean Firearms Inc.
  • Herrick's
  • King Breweries
  • Magadon
  • Nastrum Enterprises
  • Omni TV
  • O'Tolley's
  • Black Dog Game Factory
  • Rainbow Inc.
  • Tellus Enterprises
  • Vesuvius Inc.
  • Young and Smith, Inc.

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:

FalloutFalcon and others added 5 commits November 3, 2025 17:10
<!-- 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. -->
@github-actions github-actions Bot added the UI label Jan 10, 2026
Copy link
Copy Markdown
Contributor

@chazzyjazzy chazzyjazzy left a comment

Choose a reason for hiding this comment

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

now that 'brand' is now on every obj, i think this is fine with me as long as abbys requetss also get addressed

Comment thread code/__HELPERS/icons.dm Outdated
Comment thread code/game/objects/items/skub.dm Outdated
@dwinters99 dwinters99 requested a review from a team as a code owner April 11, 2026 21:45
@dwinters99
Copy link
Copy Markdown
Member Author

guy who committed to the wrong branch

@github-actions
Copy link
Copy Markdown
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~7 days. Please address any outstanding review items and ensure your PR is finished - if both are true, and you have auto-staled anyway, you need to actively ask maintainers (by pinging them in the /tg/station Discord) to (re)review or merge your PR. If no maintainer responds to your request, you may wish to close this PR yourself while you seek maintainer comment, as you will later be able to reopen the PR yourself.

@github-actions github-actions Bot added the Stale label Apr 26, 2026
@github-actions github-actions Bot removed the Stale label Apr 29, 2026
@FalloutFalcon FalloutFalcon merged commit fc6584c into DarkPack13:master Apr 30, 2026
45 of 57 checks passed
darkpack13-api Bot added a commit that referenced this pull request Apr 30, 2026
github-actions Bot added a commit that referenced this pull request Apr 30, 2026
@dwinters99 dwinters99 deleted the stealing-from-CM branch April 30, 2026 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants