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.

Sign up for GitHub

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

Jump to bottom

lower max firestacks to 10, refactor flammable #27159

Merged
merged 7 commits into from
Apr 23, 2024
Merged

lower max firestacks to 10, refactor flammable #27159

merged 7 commits into from
Apr 23, 2024

Commits on Apr 20, 2024

  1. lower max firestacks to 10, refactor flammable

    @QuietlyWhisper
    QuietlyWhisper committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    e626a43 View commit details
    Browse the repository at this point in the history

  2. fix

    @QuietlyWhisper
    QuietlyWhisper committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    ef73391 View commit details
    Browse the repository at this point in the history

  3. uncap fire stack damage, lower fire stack damage

    @QuietlyWhisper
    QuietlyWhisper committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    9fd31a8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into tweak-firestacks

    @QuietlyWhisper
    QuietlyWhisper committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    8239bcf View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into tweak-firestacks

    @QuietlyWhisper
    QuietlyWhisper committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    aa82535 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2024

  1. Merge remote-tracking branch 'upstream/master' into tweak-firestacks

    @QuietlyWhisper
    QuietlyWhisper committed Apr 21, 2024
    Configuration menu
    Copy the full SHA
    cdf70c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge remote-tracking branch 'upstream/master' into tweak-firestacks 

    # Conflicts:
#	Content.Server/Atmos/EntitySystems/FlammableSystem.cs
    @QuietlyWhisper
    QuietlyWhisper committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    15bba41 View commit details
    Browse the repository at this point in the history