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.

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

Upstream #60

Merged
merged 448 commits into from
Aug 17, 2024
Merged

Upstream #60

merged 448 commits into from
Aug 17, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Aug 9, 2024

  1. Improve Criminal Records Computer usability (#30292)

    * Avoid destroying and recreating record list on every update message
    
    * Add early-out on nullptr input
    
    * Remove sussy null suppress
    
    ---------
    
    Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
    Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
    3 people authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    d0a2187 View commit details
    Browse the repository at this point in the history
  2. improve job special (#30753)

    * cleanup of AddComponentSpecial
    
    * add RemoveComponentSpecial
    
    * require
    
    ---------
    
    Co-authored-by: deltanedas <@deltanedas:kde.org>
    deltanedas authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    ed8bcb0 View commit details
    Browse the repository at this point in the history
  3. Resprite the equipped gas canister suit slots (#30809)

    * add
    
    * red and generic
    
    * add meta
    UbaserB authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c1797b7 View commit details
    Browse the repository at this point in the history
  4. Automatic changelog update

    PJBot committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c3e96b3 View commit details
    Browse the repository at this point in the history
  5. Fix for stripping doafters (#30821)

    Apparently I need to check if they're holding an item
    
    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    9f8ff02 View commit details
    Browse the repository at this point in the history
  6. [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#2…

    …8719)
    
    * [Fix] CMO's equipped cloak
    
    * [Fix] CMO's equipped cloak
    
    * [Sprites] In hands for bluespace beaker
    
    * [Sprites] In hands for bluespace beaker
    
    * [Sprites] In hands for bluespace beaker
    
    * [Sprites] In hands for bluespace beaker
    MureixloI authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    3f4e093 View commit details
    Browse the repository at this point in the history
  7. Add arm64 support to packager for windows and osx (#29723)

    Wanted to package a server for the funny on my macbook and noticed it was not working cause of this... now it will workie :3
    VasilisThePikachu authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    873c314 View commit details
    Browse the repository at this point in the history
  8. Change translation for CutterMachine (#2453)

    Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
    NotSoDana and lzk228 authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    bb2d5a9 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    15adb2a View commit details
    Browse the repository at this point in the history
  10. Update rules (#2419)

    lzk228 authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    d409865 View commit details
    Browse the repository at this point in the history
  11. Buckling an entity requires a do-after (#29621)

    * Buckling an entity requires a do-after
    
    * Works but feels like bad code?
    
    * Cleanup
    
    ---------
    
    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    1e824d7 View commit details
    Browse the repository at this point in the history
  12. Automatic changelog update

    PJBot committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    bd5b13e View commit details
    Browse the repository at this point in the history
  13. Crowbar variants (#28988)

    * add
    
    * comma
    
    * sprites
    
    * yaml-ify
    
    * add s
    
    * lathe and engi belt
    
    * yes
    
    * fix maybe
    
    * progress
    
    * nearly there
    
    * fix
    
    * fix yaml linter having a stroke
    UbaserB authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    ed3ec4d View commit details
    Browse the repository at this point in the history
  14. Automatic changelog update

    PJBot committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    218fef3 View commit details
    Browse the repository at this point in the history
  15. Crowbars fix (#30828)

    * Crowbars fix
    
    * oops
    lzk228 authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c80c262 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    de3fdf6 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Configuration menu
    Copy the full SHA
    ee7644c View commit details
    Browse the repository at this point in the history
  2. Revert "Make hotplate and grill anchorable on table part 2" (#30830)

    Revert "Make hotplate and grill anchorable on table part 2 (#29454)"
    
    This reverts commit 268cab9.
    lzk228 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    45a2327 View commit details
    Browse the repository at this point in the history
  3. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    b692ab1 View commit details
    Browse the repository at this point in the history
  4. Entity Tables (EntitySpawnEntry replacement) (#30579)

    * Entity table code
    
    * entity table examples
    
    * fix dat shit
    
    * access
    
    * tests tests tests
    
    * sloth review
    EmoGarbage404 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    437c861 View commit details
    Browse the repository at this point in the history
  5. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    1745000 View commit details
    Browse the repository at this point in the history
  6. Changed chemistry airlock color (#30666)

    * chem
    
    * re-check
    
    * re-check. again
    
    * checks just die. last try
    
    * re-check :blessrng:
    Ko4ergaPunk authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    1fe46a7 View commit details
    Browse the repository at this point in the history
  7. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    4639864 View commit details
    Browse the repository at this point in the history
  8. Bent pipes deal 8 thrown damage (#30634)

    8 pipe throw damage
    Blackern5000 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    4c678e4 View commit details
    Browse the repository at this point in the history
  9. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    45214c2 View commit details
    Browse the repository at this point in the history
  10. [S] hopefully prevents a repeat of 4 am on 8/10/2024 in the #server-l…

    …eviathan-use channel (#30851)
    
    cant test this because the documentation sucks ass but fuck it we ball
    deathride58 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    7f23634 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    bf2bd9a View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0a4b220 View commit details
    Browse the repository at this point in the history
  13. Add Rat Kings wideswinging (#30808)

    Update regalrat.yml
    shampunj authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    563190f View commit details
    Browse the repository at this point in the history
  14. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    4e1fede View commit details
    Browse the repository at this point in the history
  15. Added suitskirt for psychologist (#30709)

    * Added jumpskirt
    
    * added locale
    
    * Added spaces in code
    
    * Updated the meta
    BackeTako authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    9bc1fab View commit details
    Browse the repository at this point in the history
  16. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    f642a01 View commit details
    Browse the repository at this point in the history
  17. ERT Chaplain Loadout fixer (#30855)

    Chaplain fixy
    Unkn0wnGh0st333 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    d340c5c View commit details
    Browse the repository at this point in the history
  18. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    2b4acde View commit details
    Browse the repository at this point in the history
  19. Infer type for EntSelector (#30856)

    Infer type for EntSelector.cs
    EmoGarbage404 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    fdbf2a2 View commit details
    Browse the repository at this point in the history
  20. Partially revert light tube sprites (#29091)

    * add
    
    * reduce contrast
    UbaserB authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    c812bd8 View commit details
    Browse the repository at this point in the history
  21. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    53058df View commit details
    Browse the repository at this point in the history
  22. Cursed Mask (#29659)

    * Cursed Mask
    
    * extra expressions
    
    * block ingestion
    
    * mind returning
    
    * okay fix the removal shit
    EmoGarbage404 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    fc1446e View commit details
    Browse the repository at this point in the history
  23. Fix some locales (#30860)

    * Fix some locales
    
    * forgor
    lzk228 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    6926033 View commit details
    Browse the repository at this point in the history
  24. #30851 followup - murderficates links (#30863)

    kneecaps links while we're at it
    deathride58 authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    7e44e75 View commit details
    Browse the repository at this point in the history
  25. Remove meta voiceline from the passenger figure (#30868)

    Update figurines.ftl
    MerrytheManokit authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    249d3cd View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    9ba038d View commit details
    Browse the repository at this point in the history
  27. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    084812c View commit details
    Browse the repository at this point in the history
  28. Reach tweaks reattempt 2 (#30782)

    * uhhh fix stuff maybe
    
    * - added a fax machine
    - made botany slightly bigger to accommodate a nutrimax vending machine
    - added air alarms, scrubbers and a waste pipe network
    SpaceLizardSky authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    b6e10a0 View commit details
    Browse the repository at this point in the history
  29. Configuration menu
    Copy the full SHA
    707daa1 View commit details
    Browse the repository at this point in the history
  30. Custom burgers - FoodSequence system (#30755)

    * setup foodsequence
    
    * name generation and max layers limit
    
    * move to nutrition
    
    * move code to serverside
    
    * move to appearance data
    
    * marked fields as required
    
    * Update foodsequence.yml
    
    * b
    
    * burgeers!
    
    * Update produce.yml
    
    * Update meat.yml
    
    * Update burger.yml
    
    * fix duplicate naming
    
    * Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl
    
    Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
    
    * merge flavor profiles
    
    * make food trash List<>
    
    * merge trash
    
    * Update FoodComponent.cs
    
    * Update FoodComponent.cs
    
    * organs and cannabis support
    
    ---------
    
    Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
    TheShuEd and Hrosts authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    4d75cb5 View commit details
    Browse the repository at this point in the history
  31. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    cfd8ef4 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    e569a78 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    6803021 View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    6b5eb93 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    9503451 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    8afec58 View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    d524d61 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    76d6014 View commit details
    Browse the repository at this point in the history
  39. Updated Core boxing ring beacon (#30800)

    Updated boxing ring beacon to be correctly labeled
    thetolbean authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    81371b9 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    63967be View commit details
    Browse the repository at this point in the history
  41. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    a99900f View commit details
    Browse the repository at this point in the history
  42. Vox Minor Clothing Update 2: Electric Boogaloo (#30838)

    * more vox masks n stuff
    
    * cluwne
    
    * fix
    
    * merc gas mask
    
    * bunny tail height fix
    Flareguy authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    179534f View commit details
    Browse the repository at this point in the history
  43. Automatic changelog update

    PJBot committed Aug 10, 2024
    Configuration menu
    Copy the full SHA
    f76fa0e View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. Torch no longer gives errors (#30884)

    First commit
    beck-thompson authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    09c8d4a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    32e315c View commit details
    Browse the repository at this point in the history
  3. Update Credits (#30891)

    Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
    github-actions[bot] and PJBot authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    8421701 View commit details
    Browse the repository at this point in the history
  4. Make followed session-specific (#30770)

    * Make followed session-specific
    
    * misimport
    metalgearsloth authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    9be61bf View commit details
    Browse the repository at this point in the history
  5. Add some container checks (#30896)

    Climbable container probably getting checked up the callstack so just check these ones.
    metalgearsloth authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    d7c3ba8 View commit details
    Browse the repository at this point in the history
  6. Add a component that inserts the held item when no interaction happen…

    …s on the stored item (#29823)
    
    * Insert when held item has no interaction with stored item
    
    * Decouple inserting on failure
    
    * Add component that stores the used entity when no interaction happened
    
    * Add prediction
    ShadowCommander authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    2f77d0d View commit details
    Browse the repository at this point in the history
  7. Remove uses of Component.Owner from AmbientSoundSystem (#30842)

    Remove Component.Owner from AmbientSoundSystem
    Mervill authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    c25c5ec View commit details
    Browse the repository at this point in the history
  8. Melee Executions (#30104)

    * melee executions
    
    * fix damage bug
    
    * cleanup
    
    * address reviews hopefully
    
    * resistance bypass mechanic
    
    * component changes
    
    * self executions (not finished yet)
    
    * self execs part two
    
    * ok i fixed things (still not finished)
    
    * finish everything
    
    * review stuff
    
    * nuke if (kind = special)
    
    * more review stuffs
    
    * Make suicide system much less hardcoded and make much more use of events
    
    * Fix a dumb bug I introduced
    
    * self execution popups
    
    * Integration tests
    
    * Why did they even take 0.5 blunt damage?
    
    * More consistent integration tests
    
    * Destructive equals true
    
    * Allow it to dirty-dispose
    
    * IS THIS WHAT YOU WANT?
    
    * FRESH AND CLEAN
    
    * modifier to multiplier
    
    * don't jinx the integration tests
    
    * no file-scoped namespace
    
    * Move the rest of execution to shared, create SuicideGhostEvent
    
    * handled
    
    * Get rid of unused code and add a comment
    
    * ghost before suicide
    
    * stop cat suicides
    
    * popup fix + small suicide change
    
    * make it a bit better
    
    ---------
    
    Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
    Scribbles0 and Plykiya authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    220aff2 View commit details
    Browse the repository at this point in the history
  9. Replaced some AddMarkups with AddMarkupOrThrow (#30632)

    * First commit
    
    * Silly me
    
    * bruh
    beck-thompson authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    ee922e3 View commit details
    Browse the repository at this point in the history
  10. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    0dc2d0a View commit details
    Browse the repository at this point in the history
  11. Make head of department lockers use EntityTables (#30854)

    * EntityTables for head of department lockers
    
    * I hope this works
    
    * even smaller
    
    ---------
    
    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    8d72e7d View commit details
    Browse the repository at this point in the history
  12. Don't show Station Event announcements to players in the lobby. (#30886)

    * Don't show Station Event announcements to players in the lobby.
    
    * fix pr
    
    ---------
    
    Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
    Mervill and metalgearsloth authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    d7b5ae0 View commit details
    Browse the repository at this point in the history
  13. Rename cooking shelf, improve content whitelist (#30858)

    Rename cooking shelf to kitchen shelf
    
    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    6aed90e View commit details
    Browse the repository at this point in the history
  14. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    c8f1c22 View commit details
    Browse the repository at this point in the history
  15. Change suit sensors on other players (#29668)

    * Suit sensors can be turned off on other players
    
    * less doafter time + interaction (nostate) check
    
    * code cleanup
    
    * code cleanup 2
    BombasterDS authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    67253a3 View commit details
    Browse the repository at this point in the history
  16. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    aabaaf1 View commit details
    Browse the repository at this point in the history
  17. Add MinHealth Construction Condition (#30892)

    * Add Min Health Condition and associated Locale
    
    * Add Comment
    blueDev2 authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    b16e57e View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    f93fe05 View commit details
    Browse the repository at this point in the history
  19. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    93c9d49 View commit details
    Browse the repository at this point in the history
  20. EntityTables for sec belts and webbing (#30900)

    * EntityTables for sec belts and webbing
    
    * update name
    
    ---------
    
    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    b6d04f8 View commit details
    Browse the repository at this point in the history
  21. Pax now refresh instead of stacking pacified forever (#30778)

    Pax refreshes instead of stacking pacified forever
    TokenStyle authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    ad71d8c View commit details
    Browse the repository at this point in the history
  22. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    8c4e5c5 View commit details
    Browse the repository at this point in the history
  23. Reorder priorities in MeleeCombatCompound (#30066)

    Reordered MeleeCombatCompound to improve unpulling
    osjarw authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    4564102 View commit details
    Browse the repository at this point in the history
  24. Make the sentient plant mutation non-copyable to other plantholders (…

    …#29133)
    
    make the sentient plant mutation not propagate by clipping, using the seed extractor or cryoxadone
    slarticodefast authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    bd5d415 View commit details
    Browse the repository at this point in the history
  25. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    e0f2929 View commit details
    Browse the repository at this point in the history
  26. fix(Commands): Improve Localization of commands. Standardize some beh…

    …aviors. (#30362)
    
    * I should be studying for school but that is sofucking boring, I will pass my class no matter, however getting an A might be a challenge. My gpa is important but is the tourture for 1 point of GPA worth it? The american government says yes but they are responsible for the majority of all genocides that have ever been conducted since the dawn of man
    
    * ugh
    
    * ugh
    Brandon-Huu authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    31c5d35 View commit details
    Browse the repository at this point in the history
  27. adds a throngler plushie, and adds it to the grand lotto (#29978)

    * adds a throngler plushie, and adds it to the grand lotto
    
    * this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is
    
    * make throngler plushie more rare
    
    how about I split the difference:
    original throngler: 0.0001
    other plushies: 0.01
    thongler plushie: 0.0005
    
    * removed inheritied soundhit
    Moomoobeef authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    28efd76 View commit details
    Browse the repository at this point in the history
  28. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    6ec6a28 View commit details
    Browse the repository at this point in the history
  29. fix a capitalisation mistake (#30908)

    ad
    UbaserB authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    58fd50c View commit details
    Browse the repository at this point in the history
  30. Small json files fixes (#30907)

    Small json fixes
    
    Resources/Textures/Interface/Default/meta.json: trailing comma
    Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
    Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
    mhamsterr authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    e26e662 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    c3525f4 View commit details
    Browse the repository at this point in the history
  32. Remove rest of Geras files (#30912)

    remove remaining geras stuff
    Killerqu00 authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    6552169 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    46f631f View commit details
    Browse the repository at this point in the history
  34. [MAPS] Pearl fix (#2474)

    XsenonDash authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    0b7edd2 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    aa15a9a View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    2e558f5 View commit details
    Browse the repository at this point in the history
  37. Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit …

    …(#30918)
    
    * Fixes inhand hardsuit cross color from space-wizards/space-station-14#26516 (comment)
    
    * Fixed HoS Turtle not covering all butt pixels
    
    ---------
    
    Co-authored-by: Zachary Yona <magicalusf@gmail.com>
    Magicalus and Zachary Yona authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    7aaac2c View commit details
    Browse the repository at this point in the history
  38. Add execution component to all energy sword weapons (#30909)

    Co-authored-by: plykiya <plykiya@protonmail.com>
    Plykiya and plykiya authored Aug 11, 2024
    Configuration menu
    Copy the full SHA
    c688da0 View commit details
    Browse the repository at this point in the history
  39. Automatic changelog update

    PJBot committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    86f4346 View commit details
    Browse the repository at this point in the history
  40. Configuration menu
    Copy the full SHA
    dea9a63 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Add diamond mining drills, buff regular mining drills (#30814)

    * why do I have to change so much just to add drills
    
    * diamon
    Blackern5000 authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    bcd7085 View commit details
    Browse the repository at this point in the history
  2. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    15812d2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a0a1421 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9f180e4 View commit details
    Browse the repository at this point in the history
  5. Contraband marking & examining (#28688)

    * System & loc strings
    
    * pass over syndie contraband
    
    * fixes
    
    * grand theft pass
    
    * contrabandexamine -> contraband
    
    * examine text generation update
    
    * all composition parents necessary
    
    * bring back minor contra so it has a less confusing message
    
    * minor
    
    * weapon pass
    
    * jumpsuit pass
    
    * feet pass
    
    * AUUUUUUUUUGHHHHHHHHHHHHHHHHHH
    
    * head
    
    * AUUUUGH
    
    * ear
    
    * belt
    
    * back
    
    * fix
    
    * bro
    
    * rename for more clarity
    
    * do da review
    
    * add cvar for contraband examine
    
    ---------
    
    Co-authored-by: EmoGarbage404 <retron404@gmail.com>
    Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
    3 people authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    485caa4 View commit details
    Browse the repository at this point in the history
  6. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9f55000 View commit details
    Browse the repository at this point in the history
  7. Sec Vest & Helmet Resprite (Attempt 2) (#30291)

    * Sec Vest & Helmet Resprite
    
    * Made Helmet side sprites better
    
    * Vest Alterations In Line With Feedback
    
    * Feedback Based Alterations PT.2 (How did I miss that?)
    
    * Alterations in line with Art Director Feedback
    DieselMohawk authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    6759d6a View commit details
    Browse the repository at this point in the history
  8. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    463a529 View commit details
    Browse the repository at this point in the history
  9. Hotfix #30291 (#30932)

    * add
    
    * Revert "add"
    
    This reverts commit 2b4ae87c4fbdd80d224ab19a655c9c547fcc43fd.
    
    * add
    UbaserB authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d220249 View commit details
    Browse the repository at this point in the history
  10. Make mantles loadout only. (#30929)

    * remove cloaks and mantles from dresser
    
    * remove mantles from lathe
    
    * add role timer loadout thing
    
    * add back cloak dresser
    
    * fix test fail
    
    * potentially fix test fail (?)
    UbaserB authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c6209cc View commit details
    Browse the repository at this point in the history
  11. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ca75d5a View commit details
    Browse the repository at this point in the history
  12. Removes variant cube migration (#30934)

    add
    UbaserB authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    7e17063 View commit details
    Browse the repository at this point in the history
  13. First Review Pass Contraband Fixes (#30930)

    * First pass contra fix
    
    * bam
    
    * More
    
    * Security crates are now marked as security restricted
    
    * Syndicate raid suit is contra
    
    * damn I forgot gatfruit
    Plykiya authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    883dc99 View commit details
    Browse the repository at this point in the history
  14. Add conducting gloves to the maintenance loot table (#30904)

    * add
    
    * lower weight
    UbaserB authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c02aeeb View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e4f37a4 View commit details
    Browse the repository at this point in the history
  16. Update space law for contraband upate (#30937)

    * update space law
    
    * missed a thing
    Chief-Engineer authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    691e37c View commit details
    Browse the repository at this point in the history
  17. Merge remote-tracking branch 'refs/remotes/upstream/master' into upst…

    …ream-sync
    
    # Conflicts:
    #	Content.Server/Chat/Systems/ChatSystem.cs
    #	Resources/Prototypes/AlertLevels/alert_levels.yml
    #	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
    #	Resources/Prototypes/Datasets/Names/fortunes.yml
    #	Resources/Prototypes/Datasets/ion_storm.yml
    #	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
    #	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
    #	Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
    #	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
    #	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
    #	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
    #	Resources/Prototypes/Recipes/Lathes/clothing.yml
    #	Resources/Prototypes/StatusIcon/faction.yml
    #	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
    #	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
    #	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
    #	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
    #	Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
    #	Resources/Textures/Clothing/Mask/joy.rsi/meta.json
    #	Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
    #	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
    #	Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
    #	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
    #	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
    #	Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
    #	Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
    #	Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
    #	Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
    #	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
    #	Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
    #	Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
    #	Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
    Morb0 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    acf1ff4 View commit details
    Browse the repository at this point in the history
  18. Fix upstream

    Morb0 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    f5f56c1 View commit details
    Browse the repository at this point in the history
  19. Fix DoDrop to DropNextTo in container cases (#30911)

    * Fix DoDrop to DropNextTo in container cases
    DoDrop is too heavy to calculation. In any other case we should use alternatives, for example DropNextTo helper method
    
    * codestyle change
    TokenStyle authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d4c0155 View commit details
    Browse the repository at this point in the history
  20. Update locale

    Morb0 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    84a13fb View commit details
    Browse the repository at this point in the history
  21. Fix Reagent Fire Stacks (#30766)

    * Fix Reagent Fire Stacks
    
    * Comments on code
    
    * little nicer wording?
    Cojoke-dot authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    0c1cfe8 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    a53dcce View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    42665f4 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    66591d5 View commit details
    Browse the repository at this point in the history
  25. Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratva…

    …… (#30954)
    
    Lines 88 and 89, updated 'narsie' and 'ratvar' to 'Nar'Sie' and Ratvar, per issue #30719.
    LeoSantich authored Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c9366b8 View commit details
    Browse the repository at this point in the history
  26. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ab16133 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    dcc1187 View commit details
    Browse the repository at this point in the history
  28. Automatic changelog update

    PJBot committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d49d78c View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Grey mantle in winterdrobe (#29774)

    * add the mantle
    
    * fix a few things
    
    * fix merge conflict stuff, remove from winterdrobe and lathe.
    
    * Add mantle to loadouts (20 hour requirement)
    Sadie-silly authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    329a0a8 View commit details
    Browse the repository at this point in the history
  2. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    bf7c327 View commit details
    Browse the repository at this point in the history
  3. Sliceable doAfter (#30824)

    * init
    
    * wtf git
    TheShuEd authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    cc180e5 View commit details
    Browse the repository at this point in the history
  4. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0998645 View commit details
    Browse the repository at this point in the history
  5. Add capfruit, a gatfruit mutation. (#30850)

    * add base
    
    * add fake suffix and flavor fix
    
    * address some reviews
    
    * parent it
    
    * fix test fail
    
    * add FoodSequence support and address small review
    UbaserB authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    135d524 View commit details
    Browse the repository at this point in the history
  6. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    79315c2 View commit details
    Browse the repository at this point in the history
  7. Fixes the grey mantle (#30971)

    add the thing i missed
    Sadie-silly authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7153e43 View commit details
    Browse the repository at this point in the history
  8. Add keybinds for rotating and flipping objects (#30540)

    * add keybinds for rotating and flipping objects
    
    * no popup for verbs
    slarticodefast authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    6a46222 View commit details
    Browse the repository at this point in the history
  9. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    c729079 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    dba0ea7 View commit details
    Browse the repository at this point in the history
  11. Make the Borgs Names Appear When they Make an Announcement (#30107)

    * Make the Borgs Names Appear When they Make an Announcement
    
    * bwomp
    
    * re-order
    
    * Use Name instead of metadata
    
    * goiup
    Cojoke-dot authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5d6baea View commit details
    Browse the repository at this point in the history
  12. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    14dfeab View commit details
    Browse the repository at this point in the history
  13. Added Cog(map) and its own evac shuttle (#30840)

    * Added new map Cog and its own evac shuttle
    
    * removed cog from default.yml so all checks will pass
    
    I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed
    
    * updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos
    
    * added renault spawner that was missing and changed some minor stuff
    
    * moved a escape pod from med/sci hallway to northern maints
    
    * added shutters to the brig and added vents and scrubbers where they were missing in the halls
    
    * extended salv's docking port so they can dock
    
    * Fixed according to cog review thread
    
    * fix pools
    
    * fix PostMapInitTest
    
    * Update MapLoadBenchmark.cs
    
    * added cap and hop spawn that i just forgot to add???????????????????
    
    * fixed again
    
    ---------
    
    Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
    Spessmann and Emisse authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    208b1d2 View commit details
    Browse the repository at this point in the history
  14. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    44db0bf View commit details
    Browse the repository at this point in the history
  15. Update publish-publish.yml

    Morb0 authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d1b37f5 View commit details
    Browse the repository at this point in the history
  16. Throngler Plushie Sprite (#30969)

    Throngonkler Plush sprite
    PoorMansDreams authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    02521d5 View commit details
    Browse the repository at this point in the history
  17. Automatic changelog update

    PJBot committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0d5d9f9 View commit details
    Browse the repository at this point in the history
  18. Crowbar sprite fix (#2485)

    SonicHDC authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a6f647a View commit details
    Browse the repository at this point in the history
  19. cog update (#30982)

    Emisse authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a186b91 View commit details
    Browse the repository at this point in the history
  20. cleaning up bounty descriptions (#30981)

    fixed up dumb text
    TheWaffleJesus authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    1e029ef View commit details
    Browse the repository at this point in the history
  21. Fix bug with rotating shelves (#30978)

    * Main
    
    * Update shelfs.yml
    
    * Little bug fix
    IgorAnt028 authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    204f3e6 View commit details
    Browse the repository at this point in the history
  22. No weather on concrete tiles (#30952)

    * concrete weather
    
    * miss
    NotSoDana authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    381e0d6 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    5c4334b View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. development build ghostrole lottery changes (#30980)

    debug ghostrole lottery changes
    Errant-4 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    9de922a View commit details
    Browse the repository at this point in the history
  2. Various cog fixes (#30987)

    various cog fixes
    Spessmann authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    58a33b2 View commit details
    Browse the repository at this point in the history
  3. refactor event schedulers to use explicit game rules (#29320)

    * works, still has testing values, im sure I did stupid shit.
    
    * shitvent crapfactor
    
    * snap extra word out of existence
    
    * shit I died of old
    
    * remove useless inaccurate design comments
    
    * Oopsie, handle requirement params in RandomRuleSystem too
    
    * I'm a slash slinging hasher
    
    * Address reviews, add admin alerts I forgor
    
    * EntityMan saves the day
    
    * address reviews 1
    
    * eh, I actually don't care about the cargo gifts thing.
    
    * started
    
    * Do reviews
    
    * you actually meant 1.2 lmao
    
    * dependency inheritance is a fickle bitch
    
    * I have no idea.
    
    * Threads are for sheets not computers.
    
    * fix traitor rule test
    
    * fix round type tattling
    
    * break things
    
    * It worky
    
    * Toolshed makes we want to drink depresso.
    
    * Finished?
    
    * remove debug values
    
    * timings
    
    * use defaults
    
    * alphabetize
    
    * bobby drop tables
    
    * Float required fr fr
    
    * continue
    
    * more continence
    
    * uno mas
    
    * obsolution
    
    * cleanup and documentations
    
    * Yell at self
    
    * use the right value defaults
    
    * housekeeping
    IProduceWidgets authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    07ec00e View commit details
    Browse the repository at this point in the history
  4. Automatic changelog update

    PJBot committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    452be33 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1ded394 View commit details
    Browse the repository at this point in the history
  6. Automatic changelog update

    PJBot committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    600d5bf View commit details
    Browse the repository at this point in the history
  7. fix the admin verbs trying to kill players by filling their lungs wit…

    …h plasma (#30991)
    
    fix the admin tools trying to kill players by filling their lungs with plasma
    slarticodefast authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8cb2cfc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    061f67d View commit details
    Browse the repository at this point in the history
  9. Update submodule to v230.0.1 (#30973)

    Fix replays due to vulnerability update
    PJB3005 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    059e3ef View commit details
    Browse the repository at this point in the history
  10. Make ahelp.admin_prefix default false (#30994)

    * Make ahelp.admin_prefix default false
    
    * More disabling
    
    Game defaults should match wizden as closely as possible.
    
    ---------
    
    Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
    DrSmugleaf and PJB3005 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    12b6cf5 View commit details
    Browse the repository at this point in the history
  11. Enable worldgen by default in non-wizden config (#30996)

    Enable worldgen by default
    
    If somebody can explain to me WHY this isn't enabled by default, that would be epic. Otherwise we're merging this
    PJB3005 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    8ac0246 View commit details
    Browse the repository at this point in the history
  12. Custom Taco & Kebabs - FoodSequence 2 (#30905)

    * control layer ordering
    
    * sprite update
    
    * taco!
    
    * taco naming gen
    
    * fix separator naming
    
    * some proto fixes
    
    * default naming separation
    
    * fix taco naming
    
    * rat update
    
    * hamsterburger
    
    * organs taco
    
    * remove from spawners
    
    * fixes
    
    * fix separators and lemons
    
    * Update food-sequence.ftl
    
    * randomization offset
    
    * fix
    
    * kebabs refactor
    
    * fix
    
    * skewer weapon
    
    * Update food_single.yml
    
    * Update migration.yml
    
    * suppermatter
    
    * hamlet centered
    
    * hamsburger
    
    * Update dead-0.png
    
    * 20 -> 4 burger layers max
    
    * Update burger.yml
    
    * canReact: false
    
    * capfruit update
    
    * Update burger.yml
    
    * Update burger.yml
    
    * Update produce.yml
    
    * some fixes
    
    * Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    
    * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    
    * Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    
    * chicken
    
    * Update food-sequence.ftl
    
    * documentation
    
    * fixes
    
    * Update meat.yml
    
    * Update meat.yml
    
    ---------
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    TheShuEd and slarticodefast authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    e659eb9 View commit details
    Browse the repository at this point in the history
  13. Automatic changelog update

    PJBot committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    07451eb View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    1fb03e9 View commit details
    Browse the repository at this point in the history
  15. Adds a random smokable spawner (#30870)

    * Textures to make lamps mappable to East/West.
    
    * Adds a random smokable spawner
    
    * remove double derma
    
    * Increase chance for just basic cig
    
    * Update to enitity tables
    
    * Tweak values
    
    * Remove space
    
    ---------
    
    Co-authored-by: Jeff <velcroboy333@hotmail.com>
    IamVelcroboy and BurningRash authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    890c0ee View commit details
    Browse the repository at this point in the history
  16. Fix lizards being unable to eat custom burgers (#31005)

    * Fix lizards being unable to eat custom burgers
    
    * ensure tag comp
    themias authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    cd8bd90 View commit details
    Browse the repository at this point in the history
  17. Automatic changelog update

    PJBot committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    84f229a View commit details
    Browse the repository at this point in the history
  18. Fix creator prefix for Cog (#30995)

    Now uses the same one as Atlas.
    PJB3005 authored Aug 14, 2024
    Configuration menu
    Copy the full SHA
    6c008be View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    dc2c02c View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    961890a View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Localization of the slot (#31008)

    localization of the slot
    chavonadelal authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b48ac84 View commit details
    Browse the repository at this point in the history
  2. Sedin (#27110)

    * Sedin
    
    * almost forgot this.
    
    * what
    
    * Did a few fixes, tried to readd popup
    
    * Fix popup, ready for merge
    
    * minor change
    
    * Generalize seed removal/destruction system, add popups in general.
    
    * fix
    
    * fix (again)
    
    * deadcode is no more
    
    * Sedin buff (nerfing the recipe soon)
    
    * godont
    
    * webedit moment
    
    ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit
    
    * CRIKEY
    
    * Revert "CRIKEY"
    
    This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.
    
    I was not supposed to commit that >:/
    
    * Alright, it should be good now but I havent tested it
    
    * ready for merge/review
    
    * prob -> probability
    
    * Requested changes nodoc
    
    * Review nodoc
    
    * documento
    
    * thumb up emoji
    Erisfiregamer1 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    e5d2738 View commit details
    Browse the repository at this point in the history
  3. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    df82c0a View commit details
    Browse the repository at this point in the history
  4. Adds a Dinky Star Sticker for security officers (#29767)

    * Sec-Star-TASTIC
    
    * fix license
    
    * now counts as trash
    
    * Sticks to people + wearable
    
    * no more sticky
    
    * no more sticky
    
    * mystery-space
    
    * Update Loadout Yaml
    PoorMansDreams authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    793eb87 View commit details
    Browse the repository at this point in the history
  5. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    20334f9 View commit details
    Browse the repository at this point in the history
  6. packed update (#31024)

    * packed update
    
    * bartender spawn
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    1bde7f3 View commit details
    Browse the repository at this point in the history
  7. Cog fixes (again) (#31030)

    * more cogmap fixes
    
    * updated cog a bunch
    Spessmann authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    0fd7b69 View commit details
    Browse the repository at this point in the history
  8. Fix top bun desc (#31019)

    FIX
    lzk228 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    bc5bc37 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b53ed58 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c1d4126 View commit details
    Browse the repository at this point in the history
  11. bagel update (#31033)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    54d42ac View commit details
    Browse the repository at this point in the history
  12. fland update (#31034)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    19e8c2e View commit details
    Browse the repository at this point in the history
  13. update lox (#31035)

    * lox update
    
    * real
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    caece14 View commit details
    Browse the repository at this point in the history
  14. meta update (#31037)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    d752702 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    fc5ba9a View commit details
    Browse the repository at this point in the history
  16. Correct relay mover entity (#31040)

    * Relay entity
    
    * Server
    Plykiya authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    af01d8f View commit details
    Browse the repository at this point in the history
  17. Figurine voicelines (#30865)

    * initial commit
    
    * tweaks to the new voice lines
    
    capitalizations of I's and the Y on hos 3 voice lines
    also changed the captain figuring voice line 2 to something completely different
    
    * capitalized one letter
    
    man i really suck at capitalization
    
    * more capitalization
    
    i never thought this pr would need so many changes
    
    * changed one comma to a dot
    
    * Update Resources/Locale/en-US/datasets/figurines.ftl
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    
    ---------
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    FATFSAAM2 and slarticodefast authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    b17f1c3 View commit details
    Browse the repository at this point in the history
  18. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    02eed07 View commit details
    Browse the repository at this point in the history
  19. Adding shock collar and electropack (#30529)

    * Adding shock collar with the new ShockOnTrigger
    
    * Cleaning and updating the shock collar
    
    * Add StripDelay datafield to ClothingComponent
    
    * Adding SelfUnremovableClothingComponent
    
    * ShockCollar Update
    
    * Correction of the shock collar
    
    * Correction of the shock collar 2
    
    * Renaming the DamageSpecifier DataField to Damage
    
    * Fixing the damage field in ShockCollar
    
    * Cleaning the ShockCollar
    
    * Renaming ShockCollar to ClothingNeckShockCollar
    
    * Adding ClothingNeckShockCollar as a stealTarget to a thief
    
    * Fixing a typo of the sprite path in ClothingNeckShockCollar
    
    * Cleaning the ShockOnTriggerComponent
    
    * Revision of SelfUnremovableClothing
    
    * Adding a ClothingBackpackElectropack
    
    * Sprite fix
    
    * Code review
    
    * Shock Collar sprite update
    
    * add commit hash
    
    ---------
    
    Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
    chavonadelal and EmoGarbage404 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    6567fa3 View commit details
    Browse the repository at this point in the history
  20. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    25074d0 View commit details
    Browse the repository at this point in the history
  21. Greatly improve the usability of the Gas Analyzer. (#30763)

    * greatly improve how the gas analyzer behaves
    
    * don't close the analyzer when the object goes out of range
    
    * cleanup
    
    * always switch to the device tab when a new device is analyzed
    
    * modern api part one
    
    * modern api part 2
    
    * modern api part three
    
    * file scope namespace
    Mervill authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    2e33657 View commit details
    Browse the repository at this point in the history
  22. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5da2b32 View commit details
    Browse the repository at this point in the history
  23. Fix false and true in player-panel.ftl (#31043)

    Fix false and true in player-panel
    
    Add a new True string
    IgorAnt028 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    84f9dd0 View commit details
    Browse the repository at this point in the history
  24. Contra Review Passs - Round 2 (#30942)

    * Contra pass round two
    
    * command too
    
    * Stamps
    
    * oopsied a bracket
    Plykiya authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f523df8 View commit details
    Browse the repository at this point in the history
  25. Namespace cleanup around Mind Roles (#30965)

    * namespaces
    
    * Comment does not need a semicolon
    
    ---------
    
    Co-authored-by: Vasilis <vascreeper@yahoo.com>
    Errant-4 and VasilisThePikachu authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    40b9fd4 View commit details
    Browse the repository at this point in the history
  26. [Maps] Minor mining shuttle update (#2495)

    Co-authored-by: Mota <belochuc@gmail.com>
    poeMota and KonChenY1 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    4be3375 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    b8b7cb3 View commit details
    Browse the repository at this point in the history
  28. Contraband Review Pass - The Threequel (#30970)

    Contraband pass number three
    Plykiya authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    dc66386 View commit details
    Browse the repository at this point in the history
  29. Packed Engi Solar Controller (#31042)

    * Replace alerts with solar console
    
    * Sci doesn't need two protolathes & engi frontdesk windoors shouldn't be atmos locked
    JustCone14 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    03f9dee View commit details
    Browse the repository at this point in the history
  30. Golden toilet (#31049)

    * golden toilet
    
    * Destructible
    
    * sprite
    
    * fix
    
    * copyright
    Nimfar11 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    84af71e View commit details
    Browse the repository at this point in the history
  31. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    49fd12a View commit details
    Browse the repository at this point in the history
  32. Salvage Spawners (#31020)

    * treasure entities and spawners
    
    * no more smiles
    EmoGarbage404 authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    c41fe93 View commit details
    Browse the repository at this point in the history
  33. Configuration menu
    Copy the full SHA
    796287d View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    f06176a View commit details
    Browse the repository at this point in the history
  35. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    6c6ee27 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    0ae5426 View commit details
    Browse the repository at this point in the history
  37. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8161402 View commit details
    Browse the repository at this point in the history
  38. evac lox update (#31052)

    lox update
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    18259d1 View commit details
    Browse the repository at this point in the history
  39. bagel update (#31053)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    cf4f8b6 View commit details
    Browse the repository at this point in the history
  40. Marathon Update (#31054)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    17b4ede View commit details
    Browse the repository at this point in the history
  41. box update (#31056)

    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    53e2dfd View commit details
    Browse the repository at this point in the history
  42. fland update (#31057)

    * fland update
    
    * exit button on med
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8cdc8d7 View commit details
    Browse the repository at this point in the history
  43. remove atlas, cluster, europa, saltern (#31058)

    * goodbye sweet maps
    
    * Update EvacShuttleTest.cs
    
    * Update EvacShuttleTest.cs
    
    * fix tests
    
    * fix tests
    
    * nightmare nightmare nightmare
    
    * rider is fucking me
    
    * jesus christ
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    9c1b8c1 View commit details
    Browse the repository at this point in the history
  44. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a17498e View commit details
    Browse the repository at this point in the history
  45. remove origin (#31059)

    derotate origin
    Emisse authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    af2ee4a View commit details
    Browse the repository at this point in the history
  46. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    28f41e1 View commit details
    Browse the repository at this point in the history
  47. Add German accent (#30541)

    * German accent
    
    * Add German motherfucker
    
    * German accent improvements
    
    * Fix failing tests
    
    * Only replace th at start of words
    
    * Correct plural for "warnungen"
    
    * hello and goodbye in German
    
    * Fix German again
    
    * Remove motherfucker from German accent
    
    * German goodbye refactor
    
    * 'fix' indents in speech.yml
    
    * German accent improvements
    
    * Reduce German umlautness
    
    * Add umlaut cooldown
    
    so consecutive vowels don't get umlauted
    
    * Fix german capitalization of th => zh
    
    * Add more banger words to German accent
    
    * Improve German tesla replacement
    
    * German akzent
    
    * German scientist gaming
    
    * Men and women, now in German
    
    * Also replace warops in German accent
    
    Co-Authored-By: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    
    * Make requested changes
    
    * Make some of the requested changes
    
    * Fix linter errors
    
    * Address remaining feedback
    
    * RE-add toned-down random umlauts
    
    * cabbage -> kraut
    
    ---------
    
    Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    Psychpsyo and slarticodefast authored Aug 15, 2024
    Configuration menu
    Copy the full SHA
    42316f8 View commit details
    Browse the repository at this point in the history
  48. Automatic changelog update

    PJBot committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    921ed4e View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Mining Rebalance (#30920)

    * first pass
    
    * this shit too
    
    * ok fix that shit
    
    * buff
    
    * actually fix that
    EmoGarbage404 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    3cdd62b View commit details
    Browse the repository at this point in the history
  2. Automatic changelog update

    PJBot committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    7de5156 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9bffa8 View commit details
    Browse the repository at this point in the history
  4. Fix mains wire light (#31066)

    No idea how long this was broken; mains wire relies upon this id being accurate which means it needs doing before the calls.
    metalgearsloth authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    c43323d View commit details
    Browse the repository at this point in the history
  5. Automatic changelog update

    PJBot committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    4c523b1 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0a9535e View commit details
    Browse the repository at this point in the history
  7. Fix bug with holding objects (#31009)

    Main
    IgorAnt028 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    1d2c72d View commit details
    Browse the repository at this point in the history
  8. Automatic changelog update

    PJBot committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    4ecc2c8 View commit details
    Browse the repository at this point in the history
  9. Replace obsolete map functions in IconSmoothSystem (#30958)

    * first part
    
    * second part
    Mervill authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    61a3562 View commit details
    Browse the repository at this point in the history
  10. packed update (#31078)

    Emisse authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    0b1eae3 View commit details
    Browse the repository at this point in the history
  11. omega update (#31079)

    Emisse authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    99bc389 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    49dd17d View commit details
    Browse the repository at this point in the history
  13. Automatic changelog update

    PJBot committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    f1f1680 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b17425f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    5eae386 View commit details
    Browse the repository at this point in the history
  16. Fix locale (#2489)

    lzk228 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    e41fcd3 View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    6bce842 View commit details
    Browse the repository at this point in the history
  18. Merge remote-tracking branch 'refs/remotes/upstream/master' into upst…

    …ream-sync
    
    # Conflicts:
    #	Content.Server/Administration/Systems/AdminSystem.cs
    #	Content.Server/Chat/Managers/ChatManager.cs
    #	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
    #	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
    #	Resources/Prototypes/Guidebook/rules.yml
    #	Resources/Prototypes/Maps/cluster.yml
    #	Resources/Prototypes/Maps/europa.yml
    #	Resources/Prototypes/Maps/origin.yml
    Morb0 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    a0bce91 View commit details
    Browse the repository at this point in the history
  19. Fix upstream

    Morb0 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    92b31a4 View commit details
    Browse the repository at this point in the history
  20. Update locale

    Morb0 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    5a59ce6 View commit details
    Browse the repository at this point in the history
  21. [Maps] Maus fix (#2497)

    Meguneri authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    e992b69 View commit details
    Browse the repository at this point in the history
  22. Fix upstream maps

    Morb0 committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    a0eccf1 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    00a2df5 View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    9dd204e View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    b65d7f0 View commit details
    Browse the repository at this point in the history
  26. [Maps] Maus fix (#2500)

    Meguneri authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    e084601 View commit details
    Browse the repository at this point in the history
  27. Concrete fix again (#2488)

    NotSoDana authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    ce78f0a View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. Update publish-publish.yml

    Morb0 authored Aug 17, 2024
    Configuration menu
    Copy the full SHA
    4d6e3eb View commit details
    Browse the repository at this point in the history
  2. Update publish-publish.yml

    Morb0 authored Aug 17, 2024
    Configuration menu
    Copy the full SHA
    4069b50 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'space-syndicate/master' into upstream

    # Conflicts:
    #	.github/workflows/publish-publish.yml
    #	Content.Server/Administration/Systems/AdminSystem.cs
    #	Content.Server/Atmos/EntitySystems/FlammableSystem.cs
    #	Content.Server/Chat/Managers/ChatManager.cs
    #	Content.Server/Connection/ConnectionManager.cs
    #	Content.Server/Ghost/Roles/GhostRoleSystem.cs
    #	Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs
    #	Resources/Locale/en-US/ss14-ru/prototypes/gamerules/events.ftl
    #	Resources/Locale/ru-RU/execution/execution.ftl
    #	Resources/Locale/ru-RU/job/job-names.ftl
    #	Resources/Locale/ru-RU/preferences/loadout-groups.ftl
    #	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
    #	Resources/Prototypes/Corvax/Maps/avrite.yml
    #	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
    #	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
    #	Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
    #	Resources/Prototypes/NPCs/Combat/melee.yml
    #	Resources/ServerInfo/Guidebook/Glossary.xml
    #	Resources/keybinds.yml
    Lokilife committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    5cb8045 View commit details
    Browse the repository at this point in the history
  4. Revert "Remove rest of Geras files (#30912)"

    This reverts commit 6552169.
    Lokilife committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    b1b8126 View commit details
    Browse the repository at this point in the history
  5. fix-upstream-errors

    Lokilife committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    0240958 View commit details
    Browse the repository at this point in the history