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

Fishin' and the killin' power of rock also trash is permanent #428

Merged
merged 13 commits into from
Sep 4, 2024
Merged

Fishin' and the killin' power of rock also trash is permanent #428

merged 13 commits into from
Sep 4, 2024

Commits on Sep 1, 2024

  1. Fishin'

    @AmoryBlaine
    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    867d795 View commit details
    Browse the repository at this point in the history

  2. trash 

    - Trash no longer magically disappears
- Rocks are now a prop that can be placed on maps and act as a type of basic weapon
    @AmoryBlaine
    AmoryBlaine committed Sep 1, 2024
    Configuration menu
    Copy the full SHA
    00fd121 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Garbage 

    Garbage is TRUE again, but less stuff is marked as garbage and garbage is infinite now
    @AmoryBlaine
    AmoryBlaine committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    89f7bf3 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Helmet garb and glasses are not garbage

    @AmoryBlaine
    AmoryBlaine committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    463f99b View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge branch 'master' into fishin'

    @AmoryBlaine
    AmoryBlaine committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    e524eb5 View commit details
    Browse the repository at this point in the history

  2. Re-adds garbage instances

    @AmoryBlaine
    AmoryBlaine committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    0770d57 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fishin'' of https://github.com/AmoryBlaine/PvE-CMSS13 i… 

    …nto fishin'
    @AmoryBlaine
    AmoryBlaine committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5708447 View commit details
    Browse the repository at this point in the history

  4. More garbage

    @AmoryBlaine
    AmoryBlaine committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    82a48a1 View commit details
    Browse the repository at this point in the history

  5. More garbage

    @AmoryBlaine
    AmoryBlaine committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a7ba4de View commit details
    Browse the repository at this point in the history

  6. Update code/game/objects/effects/decals/cleanable/misc.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @AmoryBlaine @Doubleumc
    AmoryBlaine and Doubleumc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    b85e928 View commit details
    Browse the repository at this point in the history

  7. Update code/datums/diseases/black_goo.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @AmoryBlaine @Doubleumc
    AmoryBlaine and Doubleumc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    62822d7 View commit details
    Browse the repository at this point in the history

  8. Update code/game/objects/prop.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @AmoryBlaine @Doubleumc
    AmoryBlaine and Doubleumc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    bac2b68 View commit details
    Browse the repository at this point in the history

  9. Update code/game/objects/items/props/helmetgarb.dm 

    Co-authored-by: Doubleumc <[email protected]>
    @AmoryBlaine @Doubleumc
    AmoryBlaine and Doubleumc committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a3775ff View commit details
    Browse the repository at this point in the history