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

Angle grinder AGAIN! Also, makes plasma cutters used for salvage instead of mining (and base gearpacks) #3146

Merged
merged 65 commits into from
Oct 5, 2024
Merged

Angle grinder AGAIN! Also, makes plasma cutters used for salvage instead of mining (and base gearpacks) #3146

merged 65 commits into from
Oct 5, 2024

Commits on Jun 23, 2024

  1. adding angle grinder (no other object modified)

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6098b2f View commit details
    Browse the repository at this point in the history

  2. make angle grinder work on some things and hurt eyes

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    51b7e7e View commit details
    Browse the repository at this point in the history

  3. make the angle grinder work as a 80% circular saw for getho surgery

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    278357a View commit details
    Browse the repository at this point in the history

  4. typo in the last two commits

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    280f8dc View commit details
    Browse the repository at this point in the history

  5. deconstruct a bunch more stuff and allow to carry on back

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    873f927 View commit details
    Browse the repository at this point in the history

  6. adding a proper icon to the grinde (sprite made by nirv)

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    3d665ab View commit details
    Browse the repository at this point in the history

  7. fixed deconstruct windows with grinder

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    4716a4c View commit details
    Browse the repository at this point in the history

  8. angle grinder at a satisfactory price ? (probaly temporary)

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    fcb97a1 View commit details
    Browse the repository at this point in the history

  9. added the /atom/proc/deconstruct_act(/mob/living/user, /obj/item/I) p… 

    …roc and the signal that goes with it
    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    82d5207 View commit details
    Browse the repository at this point in the history

  10. typo

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f5975ca View commit details
    Browse the repository at this point in the history

  11. salvage waste planet brocken machines

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    69d790f View commit details
    Browse the repository at this point in the history

  12. force locked crates/closet

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6d19596 View commit details
    Browse the repository at this point in the history

  13. make some feature toggleable at compilation

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    16ea42c View commit details
    Browse the repository at this point in the history

  14. config anglegrinder outpost availability

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    79c264e View commit details
    Browse the repository at this point in the history

  15. angle grinder open safe, maybe ?

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    9472104 View commit details
    Browse the repository at this point in the history

  16. linter

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    5193d81 View commit details
    Browse the repository at this point in the history

  17. i'm gonna eat the linter

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    21b3fb0 View commit details
    Browse the repository at this point in the history

  18. fix the angle grinder making light

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    87a3a5d View commit details
    Browse the repository at this point in the history

  19. angle grinder now have it's sound yipee

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    ef14c14 View commit details
    Browse the repository at this point in the history

  20. move config #defines and make them better

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f1139ae View commit details
    Browse the repository at this point in the history

  21. deconstruct railing

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    207d085 View commit details
    Browse the repository at this point in the history

  22. deconstruct machine FRAME

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    1d9a9bf View commit details
    Browse the repository at this point in the history

  23. correct a typo in the previous commit

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    d5a5772 View commit details
    Browse the repository at this point in the history

  24. angle grinder deafen on use and you can now wear earmuff on neck

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    fbe0669 View commit details
    Browse the repository at this point in the history

  25. linter ?

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    d04bb56 View commit details
    Browse the repository at this point in the history

  26. guess who wote non compiling code to correct a linter error ?

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    d632fae View commit details
    Browse the repository at this point in the history

  27. does the linter take blood tribute ?

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    c26b6a3 View commit details
    Browse the repository at this point in the history

  28. white space

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    86804e4 View commit details
    Browse the repository at this point in the history

  29. Apply the description changes suggested by zevotech

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    d683af8 View commit details
    Browse the repository at this point in the history

  30. deconstructing wooden baricade

    @Thera-Pissed
    ritorizo authored and Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    65ee50f View commit details
    Browse the repository at this point in the history

  31. gets code up to date and basic changes

    @Thera-Pissed
    Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6381bb6 View commit details
    Browse the repository at this point in the history

  32. more code updates

    @Thera-Pissed
    Thera-Pissed committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    bc698e4 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. wield these

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    85021fc View commit details
    Browse the repository at this point in the history

  2. step 2. make it a backpack mount and take power

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    575c8d5 View commit details
    Browse the repository at this point in the history

  3. part 3 simple fixes

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    564c890 View commit details
    Browse the repository at this point in the history

  4. grilles and windows. windows get broken and are dumb to break

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    25fac9e View commit details
    Browse the repository at this point in the history

  5. plastitanium

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    e6bd316 View commit details
    Browse the repository at this point in the history

  6. revives gear_packs by bjarl because theyre just better

    @Thera-Pissed
    Thera-Pissed committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d9329ad View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. makes jackhammers not break walls good except concrete ones

    @Thera-Pissed
    Thera-Pissed committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    48d3ca9 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. adds grinders and normal cutters to colossus, gecko, and hyena

    @Thera-Pissed
    Thera-Pissed committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    48501d7 View commit details
    Browse the repository at this point in the history

  2. merge conflict

    @Thera-Pissed
    Thera-Pissed committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    183efd7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    925ed42 View commit details
    Browse the repository at this point in the history

  4. actually updates hyena

    @Thera-Pissed
    Thera-Pissed committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    318b986 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    71af6be View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. I love .dmi merge conflicts

    @Thera-Pissed
    Thera-Pissed committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    dd3a9e1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4973c65 View commit details
    Browse the repository at this point in the history

  3. merge conflict and preload cell fix

    @Thera-Pissed
    Thera-Pissed committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    04684be View commit details
    Browse the repository at this point in the history

  4. Merge branch 'angle-grinder-again' of https://github.com/Thera-Pissed… 

    …/Shiptest into angle-grinder-again
    @Thera-Pissed
    Thera-Pissed committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    dfa5080 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. conflict from temp fix

    @Thera-Pissed
    Thera-Pissed committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    781132c View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. cleans up closest deconstuct logic

    @FalloutFalcon
    FalloutFalcon committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    2fdc073 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from FalloutFalcon/quick-refactor-to-deconstuct 

    Quick refactor to deconstuct for closets
    @Thera-Pissed
    Thera-Pissed authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    d2bd1da View commit details
    Browse the repository at this point in the history

  3. gear_handle instead of attachment 

    other PR uses obj/item/attachment and its getting in first. I will win the PR race one of these days.
    @Thera-Pissed
    Thera-Pissed committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    c6ba5be View commit details
    Browse the repository at this point in the history

  4. Merge branch 'angle-grinder-again' of https://github.com/Thera-Pissed… 

    …/Shiptest into angle-grinder-again
    @Thera-Pissed
    Thera-Pissed committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    15e005b View commit details
    Browse the repository at this point in the history

  5. vsc + githubdesktop = head injury

    @Thera-Pissed
    Thera-Pissed committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    636b461 View commit details
    Browse the repository at this point in the history

  6. Update angle_grinder.dm

    @Thera-Pissed
    Thera-Pissed committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    f10b088 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. adv cut effect, part of review, went down mech saw rabbit hole. 

    new green & purple slicing animation for advanced cutters (and when I add a funny angle grinder). Better to_chat from review. Mech saw that's currently the best saw available, but stops your mech until the task completes (otherwise you could psychic saw and walk away).
    @Thera-Pissed
    Thera-Pissed committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    21f8bc2 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. tweaks & energy saw & inhands

    @Thera-Pissed
    Thera-Pissed committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    65366ea View commit details
    Browse the repository at this point in the history

  2. undoes map changes in prep for destructible walls 

    since destructible walls changes a load of maps, I'm waiting for that to go through before I tweak plasma cutters again.
    @Thera-Pissed
    Thera-Pissed committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    422d597 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Merge remote-tracking branch 'upstream/master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    e9ba71d View commit details
    Browse the repository at this point in the history

  2. destructable walls stuff

    @Thera-Pissed
    Thera-Pissed committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    32c1f7e View commit details
    Browse the repository at this point in the history

  3. part of review

    @Thera-Pissed
    Thera-Pissed committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    e1da812 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Update code/game/objects/structures/girders.dm 

    Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Signed-off-by: HelmCrab <90987989+Thera-Pissed@users.noreply.github.com>
    @Thera-Pissed @FalloutFalcon
    Thera-Pissed and FalloutFalcon authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    548f971 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge remote-tracking branch 'upstream/master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    89cacd4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into angle-grinder-again

    @Thera-Pissed
    Thera-Pissed committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    cf8d263 View commit details
    Browse the repository at this point in the history

  3. grinder works on walls again

    @Thera-Pissed
    Thera-Pissed committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    9b33fa1 View commit details
    Browse the repository at this point in the history