Skip to content

[BALANCE] Make the Super syndie kittie not a freedom implant anymore. #6017

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

Merged
merged 1 commit into from
Mar 24, 2025

Conversation

Marabout2
Copy link
Contributor

About The Pull Request

Until now the Syndicate Kitten that was added here #5290 could transform while cuffed, rendering useless any non-lethal forms with them. Now, they will have some checks to stop it.

Why It's Good For The Game

It will make the cat not able to bypass any security non-lethal means, which in turns mean security won't be forced to lethal them everytime they see it.

Changelog

🆑

balance: rebalanced the kitten ears so they can't break free while being cuffed, unconcious, with their hands blocked.
/:cl:

@rdcb53
Copy link

rdcb53 commented Mar 23, 2025

thank god

@Kmla2 Kmla2 added the Balance perfectly balanced as all things should be label Mar 23, 2025
@Milo123amongus
Copy link

this guy is usually stinky but i agree with him rn

@tired-wired tired-wired added the Approval: admin approved PR is approved by admins label Mar 24, 2025
@tired-wired tired-wired merged commit 5a11fcb into Monkestation:master Mar 24, 2025
27 checks passed
github-actions bot added a commit that referenced this pull request Mar 24, 2025
@Marabout2 Marabout2 deleted the kitty-balance branch March 25, 2025 21:45
StrangeWeirdKitten pushed a commit to Bubberstation/Bubberstation that referenced this pull request Apr 6, 2025
## About The Pull Request
- This PR makes the new syndicat ears item have a 1 minute cool down
when used and the normal ears have the same thing.

- This also ports a fix that was done on monkey station:
Monkestation/Monkestation2.0#6017

## Why It's Good For The Game
- After watching a round on here and getting complaints about this from
SPLURT I understand now why 20 seconds is too short for such a item like
this if your gonna be a cat your gonna be a cat for a long while.

- Also to quote monkey station:
"It will make the cat not able to bypass any security non-lethal means,
which in turns mean security won't be forced to lethal them everytime
they see it."

## Proof Of Testing
Should work only changed the time values.

Edit: Compiled and tested locally

<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
:cl:
balance: Super cat ear cool downs are longer and removed the freedom
implant function.
/:cl:
nevimer added a commit to Bubberstation/Bubberstation that referenced this pull request Apr 14, 2025
commit cb550ab79badae3ffd493dcee24d96f7ad146ed6
Merge: 732416f01d8 2fac5d45a6d
Author: Roxy <[email protected]>
Date:   Mon Apr 14 14:40:04 2025 -0400

    Merge branch 'master' into upstream-25-04a

commit 2fac5d45a6d47f14328e6111a6c1b066e2540d26
Author: Arturlang <[email protected]>
Date:   Mon Apr 14 01:11:47 2025 +0100

    bring back heretic mute ghoul maxhp to 135 HP (#3464)

    ## About The Pull Request
    bring back heretic mute ghoul maxhp to 135 HP, these are the changes
    made in
    https://github.com/Bubberstation/Bubberstation/pull/2972
    ## Why It's Good For The Game
    otherwise flesh heretic is really sad
    ## Proof Of Testing
    numbers change, no need
    ## Changelog
    no cl

    ---------

    Co-authored-by: Roxy <[email protected]>

commit e9c4522c27a996b88abc5132c9ff7bde741e6b1e
Author: Bubberbot <[email protected]>
Date:   Mon Apr 14 01:59:19 2025 +0200

    Automatic changelog for PR #3453 [ci skip]

commit 2d595eba4f1468e06f306e93423def4281fd864f
Author: shellspeed1 <[email protected]>
Date:   Sun Apr 13 16:58:54 2025 -0700

    Fixes bitrunning sim having cybersun comms and also makes sure persistence borgs have correct key (#3453)

    ## About The Pull Request

    What it says on the tin
    ## Why It's Good For The Game

    Its best to not let bitrunners ghost spawns talk on comms
    ## Proof Of Testing

    I just did my last cpa today, I'll test this later. Besides its 3 lines
    with just an item swaped.
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    fix: Bitrunning sims no longer have comms access
    fix: Borgs given the persistence access upgrade no longer default to
    interdyne and get cybersun comms instead
    /:cl:

    Co-authored-by: Roxy <[email protected]>

commit 394e8d64d44a9fbcfe823b35b64ef11798902b7e
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 23:24:50 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 49141446bfb3541a63e1e461ba39e6c4d57a77f2
Author: Bubberbot <[email protected]>
Date:   Mon Apr 14 00:18:15 2025 +0200

    Automatic changelog for PR #3497 [ci skip]

commit 0332c060a8aa51c621f5119214f9c70c723fc1bd
Author: Roxy <[email protected]>
Date:   Sun Apr 13 18:17:52 2025 -0400

    Xenoarch Machine QOL (#3497)

    <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
    not be viewable. -->
    <!-- You can view Contributing.MD for a detailed description of the pull
    request process. -->

    ## About The Pull Request

    A little treat for xenoarch
    - The xenoarch bag can now hold broken items and useless relics in
    addition to strange rocks
    - You can use the bag on both the researcher and the recoverer to dump
    the contents in
    - The digger and the researcher make a sound now

    ## Why It's Good For The Game

    A bag that holds only one type of item is annoying, you get a lot of the
    other two items too

    ## Proof Of Testing

    <!-- Compile and run your code locally. Make sure it works. This is the
    place to show off your changes! We are not responsible for testing your
    features. -->
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/e314f9e2-efd3-4e4a-a7ea-412c674f88bf)

    </details>

    ## Changelog

    <!-- If your PR modifies aspects of the game that can be concretely
    observed by players or admins you should add a changelog. If your change
    does NOT meet this description, remove this section. Be sure to properly
    mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
    and its effects on PRs in the tgstation guides for contributors. Please
    note that maintainers freely reserve the right to remove and add tags
    should they deem it appropriate. You can attempt to finagle the system
    all you want, but it's best to shoot for clear communication right off
    the bat. -->

    :cl:
    qol: the xenoarch bag can now hold broken items and useless relics
    qol: you can use the bag on the researcher and the recoverer to dump
    items in
    sound: the digger and researcher now make a sound when they complete a
    cycle
    /:cl:

    <!-- Both :cl:'s are required for the changelog to work! You can put
    your name to the right of the first :cl: if you want to overwrite your
    GitHub username as author ingame. -->
    <!-- You can use multiple of the same prefix (they're only used for the
    icon ingame) and delete the unneeded ones. Despite some of the tags,
    changelogs should generally represent how a player might be affected by
    the changes rather than a summary of the PR's contents. -->

    <!-- By opening a pull request. You have read and understood the
    repository rules located on the main README.md on this project. -->

commit 2b8c0744068be1cee0d7f75061127159fc4293f2
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 19:47:30 2025 +0200

    Automatic changelog for PR #3498 [ci skip]

commit e613940ada3d0ed591b3f8c207b19ddff0626941
Author: nevimer <[email protected]>
Date:   Sun Apr 13 13:47:04 2025 -0400

    restores RCD vending, moves RCD's to lockers (#3498)

    ## About The Pull Request
    moves RCD's from engineers backpacks to their lockers roundstart - to
    accommodate the stowaway change aswell as keep a tab on infinite station
    resources.
    ## Why It's Good For The Game

    Above point

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    balance: reenabled the RCD vendors and moved RCD's from spawning in
    backpacks to lockers.
    /:cl:

commit 732416f01d8ccc6e082cbdbeb60b30c461d8e965
Author: Roxy <[email protected]>
Date:   Sun Apr 13 03:03:20 2025 -0400

    these use GMM prices and thus fluctuate

commit 99f097d67faf17569711d670d5891103d96932b1
Merge: 790b64602cd 945479a6220
Author: Roxy <[email protected]>
Date:   Sun Apr 13 02:12:01 2025 -0400

    Merge branch 'master' into upstream-25-04a

commit 945479a6220b9053e91b58ba31ef8342d4209858
Author: Roxy <[email protected]>
Date:   Sun Apr 13 00:59:23 2025 -0400

    Fix hot spring runtime related to duplicate elements (#90555)

    If something is mapped to spawn in on a hot spring tile, the tile will
    add the immerse element in `/turf/open/water/Entered` before
    `Initialize` runs, and when it does there's no check if the element has
    already been added, unlike other spots where the immerse element is
    added. This fixes that by adding a check on the call in `Initialize`.

commit 3472fddc113f0278ed1d6d3bd6b463e03f581341
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Apr 13 04:16:19 2025 +0000

    Automatic TGS DMAPI Update (#2743)

    This pull request updates the TGS DMAPI to the latest version. Please
    note any changes that may be breaking or unimplemented in your codebase
    by checking what changes are in the definitions file:
    code/__DEFINES/tgs.dm before merging.

    Full changelog can be found
    [here](https://raw.githubusercontent.com/tgstation/tgstation-server/gh-pages/changelog.yml).

    - Added compatibility with SpacemanDMM's `redefined_proc` lint. (#2058
    Cyberboss)
    #tgs-dmapi-release

    Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>

commit e5630753ae7cdaa419deb87507997ad7ca8b6779
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:53:13 2025 +0200

    Automatic changelog for PR #3481 [ci skip]

commit ac3fea9660fb10b7a2656b987b0ed81635896434
Author: chestlet <[email protected]>
Date:   Sat Apr 12 20:52:34 2025 -0700

    Nova Port: RB-MK2 GUI Rework (#5136) (#3481)

    ## About The Pull Request
    A significant [rework of the RB-MK2
    GUI](https://github.com/NovaSector/NovaSector/pull/5136) that I did over
    on Nova. The one you guys have now is painful to use in comparison so
    let's get it up to snuff.

    ## Why It's Good For The Game
    More information makes the RB-MK2 easier to use and teach in character.
    With how the GUI is currently, it gives no intuitive explanation for
    what it's doing. You can't tell what's going on with it.

    ## Proof Of Testing

    <details>
    <summary>Screenshots/Videos</summary>

    https://github.com/user-attachments/assets/7a178ac2-df8e-40d3-a6f3-b6aa617b69fd

    </details>

    ## Changelog
    :cl: Chestlet
    admin: Improved RB-MK2 logging so admins have a full trace of exactly
    what happened with it.
    fix: Corrected 'tritium usage' math in the RB-MK2.
    code: We've noticed that the Radioscopical Bluespace Reactor Mark Two
    blueprints provided to our stations came with antiquated firmware. This
    issue has been rectified. (Significant rework of the RB-MK2 GUI)
    /:cl:

commit 071fcd84a8e57f00f014f716fb0a2d60cecf2b02
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:48:58 2025 +0200

    Automatic changelog for PR #3495 [ci skip]

commit 0a5f60a36c1ec1979cdf1ca1374f041e51ea191b
Author: Roxy <[email protected]>
Date:   Sat Apr 12 23:48:24 2025 -0400

    Xenoarch machines cleanup (#3495)

    ## About The Pull Request

    Clean up the code for xenoarch machines some because it made me sad.
    - Changes `attackby`'s to `item_interaction`
    - Keep a list of xenoarch items in contents instead of storing them in
    **an instance of `/obj/item` (yes the abstract concept of an item)**
    - Add context tips for all item interactions and removes that info from
    examine text
    - Switched a list to `static`
    - Add assoc list of `broken_item` types to reward pools instead of
    having a nightmare ladder of `istype` checks

    ## Why It's Good For The Game

    Fixes #3442

    ## Proof Of Testing

    Scout's honor

    ## Changelog
    :cl:
    qol: xenoarch machines have context tooltips now
    fix: fixed xenoarch diggers not working
    /:cl:

commit 16f02c756b2cef6f4f8edb1440e7b6dd75f92ece
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:34:54 2025 +0200

    Automatic changelog for PR #3441 [ci skip]

commit ede9fc164686767f32eb9217d3ec874e9839fd06
Author: Bombermansam <[email protected]>
Date:   Sat Apr 12 23:34:09 2025 -0400

    [Modular] Adds crowbars to standard borg models that do not have them (#3441)

    ## About The Pull Request
    Adds crowbars to standard borg models that do not have them.
    ## Why It's Good For The Game
    This is a QOL addition, it should not affect balance.

    Half the borg models in the game do not have crowbars and can get stuck
    behind doors if the power fails which is no fun for anyone. This fixes
    it.
    ## Proof Of Testing
    It compiles and was tested locally.
    <details>
    <summary> Screenshots </summary>

    ![dreamseeker_18bfQxpDIz](https://github.com/user-attachments/assets/2dfc12f4-33a1-4ce9-8440-3ea4a098d6e9)

    ![dreamseeker_42TYSMAdVu](https://github.com/user-attachments/assets/5d71bf3f-d20e-47a1-b75e-ece7a10014b0)

    ![dreamseeker_NHBJgPvAtz](https://github.com/user-attachments/assets/56930158-73bb-4917-bb6d-ed6b09ff54aa)

    ![dreamseeker_p9yVo1VNaF](https://github.com/user-attachments/assets/761615e7-dad6-4086-a408-c2fca10f3d58)

    </details>

    ## Changelog
    :cl:
    add: Adds Crowbars to Service, Medical, Clown, Sec and Peacekeeper borgs
    /:cl:

commit 8e4d6f7052236b2181fcecc2d192d693516aaa4c
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:32:18 2025 +0200

    Automatic changelog for PR #3491 [ci skip]

commit 0cdf875ceccba145931944765b454973a9f576d7
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 03:32:09 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit c6f88a026e64905b4db4f8a7e3fbc1dbe6d0b446
Author: Roxy <[email protected]>
Date:   Sat Apr 12 23:31:16 2025 -0400

    Fix HEV armor not fully initializing (#3491)

    ## About The Pull Request

    `ADD_TRAIT`/`REMOVE_TRAIT` don't take lists you need to use a proc for
    that

    ## Why It's Good For The Game

    Fixes #3484

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/c11c26f8-2f80-44c8-8f94-513155b7f316)

    </details>

    ## Changelog
    :cl:
    fix: fixed HEV suit not turning on properly
    /:cl:

commit f93466e6ab7c19c2f6203b3e99d29db0f94b90d4
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:18:39 2025 +0200

    Automatic changelog for PR #3486 [ci skip]

commit 952a110077b7730b16b3ca0ccd08021d98beca28
Author: ariaworld <[email protected]>
Date:   Sun Apr 13 05:18:04 2025 +0200

    [FIX?] - Brings robotic brain surgery in line with organic brain sugery/lobotomy after the recent update (#3486)

    ## About The Pull Request
    As title!
    ## Why It's Good For The Game
    I originally opened this as an issue because I wasn't sure if this was
    intended, it's why I labeled it as [FIX?]
    Currently organic brain surgery heals the previous tiers of traumas as
    well which makes sure there's no leftover traumas left and also removes
    the RNG re-roll, applying a status effect instead. This PR brings the
    robotic surgery/lobotomy in line with the organic one in a few ways:

    1. Robotic blessed lobotomy now requires holy water as well (just like
    organic)
    2. Fix posibrain surgery now cures TRAUMA_RESILIENCE_SURGERY traumas as
    well
    3. Reticulate splines surgery now cures TRAUMA_RESILIENCE_SURGERY and
    TRAUMA_RESILIENCE_LOBOTOMY traumas as well
    4. Replaced RNG prob(75) roll with the 15-minute status effect that was
    added to organic brain surgery.

    This should balance/fix the robotic brain surgery to the recent change
    that was done to the organic brain surgery. Only issue is the fact how
    the original surgery was coded: there was no RNG roll for fix posibrain
    surgery, while the normal organic surgery did.
    Please feel free to close this PR if this was an intended feature/there
    are issues with potential balance arguments.
    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>
    (It compiles, very simple code just handles surgery steps)
    </details>

    ## Changelog
    :cl: Goku
    balance: Robotic blessed lobotomy now also requires holy water (just
    like the organic surgery)
    balance: Robotic blessed lobotomy requires liquid solder instead of
    Palladium Synthate Catalyst
    fix: Fix posibrain surgery now also cures surgery-tier brain traumas
    balance: Reticulate splines surgery now also cures lower tier brain
    traumas (surgery and lobotomy)
    balance: Replaced advanced robotic brain surgery RNG roll with the
    15-minute vulnerability status effect that was added to organic brain
    surgery
    /:cl:

    ---------

    Co-authored-by: lessthanthree <[email protected]>

commit 790b64602cd2e59b8397c4fe2451d2c14bddb546
Merge: 7d39bddbcb2 5e1b40cf890
Author: lessthanthree <[email protected]>
Date:   Sat Apr 12 20:13:11 2025 -0700

    Merge branch 'master' into upstream-25-04a

commit 5e1b40cf89009ab8b81bce1395a6f928134aa88a
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:08:22 2025 +0200

    Automatic changelog for PR #3492 [ci skip]

commit 5e94554873f7b977d773a86574813e7c319e7284
Author: ariaworld <[email protected]>
Date:   Sun Apr 13 05:07:55 2025 +0200

    [FIX] Fixes Wooden shelves turning into metal racks when broken. (#3492)

    ## About The Pull Request
    Title!
    ## Why It's Good For The Game
    Bugfix, my immersion was ruined
    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![shelf](https://github.com/user-attachments/assets/0bdb3fd2-0b85-4672-a02f-0772a4cb4f20)

    </details>

    ## Changelog
    :cl:Goku
    fix: Fix wooden shelves turning into metal rack parts when broken.
    /:cl:

commit 7fed3cb7e4de10480adec559d0ccf90c4242d9e7
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 05:07:00 2025 +0200

    Automatic changelog for PR #3493 [ci skip]

commit 2d38b200a094a05e2ff64aeff0dd22b36bf7a061
Author: LT3 <[email protected]>
Date:   Sat Apr 12 20:06:37 2025 -0700

    Allow hypospray in medical pouch (#3493)

    ## About The Pull Request

    Adds hypospray and cable to the allowed list of items in the medical
    pouch

    ## Why It's Good For The Game

    Commonly held items, other reagent containers are accepted but hypo is
    missing.

    ## Changelog

    :cl: LT3
    qol: The medical pouch can now hold hyposprays and cable coil
    /:cl:

commit 7d39bddbcb2e775207a4a3e72a3940f9fbf3b0f1
Merge: fde55e27444 bb642474217
Author: lessthanthree <[email protected]>
Date:   Sat Apr 12 17:25:22 2025 -0700

    Merge branch 'upstream-25-04a' of https://github.com/Bubberstation/Bubberstation into upstream-25-04a

commit fde55e2744421b10f115724f70f3db8339b13df0
Author: lessthanthree <[email protected]>
Date:   Sat Apr 12 17:25:20 2025 -0700

    screenshots

commit cfa0c206569f4d303311c7164aacb077be653be9
Author: Bubberbot <[email protected]>
Date:   Sun Apr 13 01:39:06 2025 +0200

    Automatic changelog for PR #3478 [ci skip]

commit 0397536620866b03537b66608b032724a0a4319c
Author: CatoChristopherMrow <[email protected]>
Date:   Sat Apr 12 19:38:42 2025 -0400

    Makes tackle gloves reskinnable (#3478)

    ## About The Pull Request
    Makes tackle gloves reskinnable to their blue, red, and black variants.
    ## Why It's Good For The Game
    Stops basic sec gear forcing you to either wear clashing colors or not
    get the benefit of standard equipment. Viva la matching colors.
    ## Proof Of Testing
    Works on my machine
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl: UvvU
    add: Tackle gloves are now reskinnable.
    /:cl:

    ---------

    Co-authored-by: Ian Yanik <[email protected]>

commit 42b725836aebfb600cb97aa2e318a25239df3b6d
Author: Bubberbot <[email protected]>
Date:   Sat Apr 12 23:24:45 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit bb642474217244fd233372d9c68cb4bab5f871f7
Merge: 72beef087ea c872e81588b
Author: LT3 <[email protected]>
Date:   Sat Apr 12 16:10:29 2025 -0700

    Merge branch 'master' into upstream-25-04a

commit 72beef087ea8a1b291e286b09a0eb5a6713ba255
Author: Roxy <[email protected]>
Date:   Sat Apr 12 15:26:15 2025 -0400

    this now returns an icon path not an icon object

commit 4e85c985ee77a37b44dcef393b815a04421463b7
Author: Roxy <[email protected]>
Date:   Sat Apr 12 15:08:12 2025 -0400

    broken dmi

commit c872e81588bf25b4e6e091851a9ad23a2cec27ae
Author: Bubberbot <[email protected]>
Date:   Sat Apr 12 07:45:40 2025 +0200

    Automatic changelog for PR #3490 [ci skip]

commit 27801b991c5496d9de264a71ec82e1caea777357
Author: Roxy <[email protected]>
Date:   Sat Apr 12 01:45:17 2025 -0400

    Fix admin chat buttons to cancel/refund storyteller events not working (#3490)

    ## About The Pull Request

    The chat messages that get sent when a storyteller event is about to run
    try to call `Topic` on the scheduled event datum but there isn't
    actually a `Topic` proc defined for them

    ## Why It's Good For The Game

    It's mean to trick admins with fake buttons

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/41d0df79-3220-4b8e-8f86-63df97b2d540)

    </details>

    ## Changelog
    :cl:
    admin: the cancel and refund buttons in storyteller event notifications
    will actually do something now
    /:cl:

commit bb14605128db2b1b5390d60b28665ed0ceae154a
Author: Roxy <[email protected]>
Date:   Sat Apr 12 01:06:39 2025 -0400

    im tired

commit 1245d5145e4f41d63dbe983355ef4619b6441655
Author: Roxy <[email protected]>
Date:   Sat Apr 12 00:40:09 2025 -0400

    what if the world was made of pudding

commit 7011b910d3bfaa0dba4a3d118721ad1d42a7625c
Merge: b8c00cbd266 e9ede320c9a
Author: Roxy <[email protected]>
Date:   Sat Apr 12 00:31:56 2025 -0400

    Merge branch 'master' into upstream-25-04a

commit b8c00cbd2660017d578f07ce20c3732dcfcdb60f
Author: Roxy <[email protected]>
Date:   Sat Apr 12 00:31:01 2025 -0400

    silence linters

commit 3a3ea510ed12812fba0d97f545bf87749c16831a
Author: Roxy <[email protected]>
Date:   Sat Apr 12 00:00:12 2025 -0400

    the economy is in shambles

commit 0a3e17e897b270dc19a63038b8e99e15ff9242ce
Author: Roxy <[email protected]>
Date:   Fri Apr 11 23:43:06 2025 -0400

    missing icons

commit fefc1348f722cf26bb407e6f7a5ba98184867fba
Author: Roxy <[email protected]>
Date:   Fri Apr 11 23:24:46 2025 -0400

    no override for this

commit 952f2a7502d972093e1f86bd9fa20bf3ea9788bf
Author: Roxy <[email protected]>
Date:   Fri Apr 11 23:16:07 2025 -0400

    shotgun icon states

commit 8e256d21c2bdfd2136f60705a3b5f7600ca6c9e7
Author: Roxy <[email protected]>
Date:   Fri Apr 11 23:02:28 2025 -0400

    no icon

commit 60164e1a4c038661d41bbb25a1e0e536147455a2
Author: Roxy <[email protected]>
Date:   Fri Apr 11 22:39:35 2025 -0400

    fucking capital letters?

commit 1e395535db671e61ce6514c35928a900d61a3570
Author: Roxy <[email protected]>
Date:   Fri Apr 11 22:28:06 2025 -0400

    GRRRRRR

commit 68e35b0068388eb94d1c9ec5b865787b1cdc300a
Author: Roxy <[email protected]>
Date:   Fri Apr 11 21:19:15 2025 -0400

    wrong

commit 9f8c9499f2890fad3c479d42c12888b1e0c55a3a
Author: Roxy <[email protected]>
Date:   Fri Apr 11 20:59:17 2025 -0400

    just put your icons anywhere who gives a shit

commit f6bc1091867a3b234f2634e8cb120eae5b0053d9
Author: Roxy <[email protected]>
Date:   Fri Apr 11 19:58:40 2025 -0400

    buh

commit edc876bff750ddce0593e917f5a68de02383c55e
Author: Roxy <[email protected]>
Date:   Fri Apr 11 19:49:32 2025 -0400

    added our GAGS configs to deploy

commit e9ede320c9a9fed15cab0bb027ff806ef66160a6
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 23:23:21 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit c726e4ee2d231d48334d43b8ce42d8b4e70b52b0
Author: Roxy <[email protected]>
Date:   Fri Apr 11 18:50:04 2025 -0400

    fixed recipe foodtypes

commit 9e23291b14371e4703a38ae1711b1fe5b75cbf37
Author: Roxy <[email protected]>
Date:   Fri Apr 11 18:24:53 2025 -0400

    Fix changelogs

commit bb8477826614c6e81285c5586de07ee26686c6b1
Author: Roxy <[email protected]>
Date:   Fri Apr 11 17:59:23 2025 -0400

    number of args changed for inject

commit f00ed38c1dfae82498554e84901af5fae640b473
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 11:03:02 2025 +0200

    Automatic changelog for PR #3456 [ci skip]

commit 29b3c8daba8f3045eb467e87c42c56afaae5c739
Author: aKromatopzia <[email protected]>
Date:   Fri Apr 11 17:02:38 2025 +0800

    Smolraptor Updates (#3456)

    ## About The Pull Request
    Adds blue and red sec smolraptors, makes janitor an alt of service

    ![Screenshot_50](https://github.com/user-attachments/assets/a5be3ed8-75da-4939-937c-0261dfcb1953)

    ## Proof Of Testing
    it works

    ## Changelog

    :cl:
    add: sec smolraptors
    image: fixes some errors in smolraptors
    /:cl:

commit 7c0978a47f6bae08e06234bb1ea752c5391e25ac
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 08:21:22 2025 +0200

    Automatic changelog for PR #3463 [ci skip]

commit 04fd2b0a8a70ed0cc375d97e4ec3006c708ec2b8
Author: ArrisFairburne <[email protected]>
Date:   Fri Apr 11 02:20:59 2025 -0400

    Synth brain PDAs now have departmental PDA apps pre-installed (#3463)

    ## About The Pull Request

    Synth brains now start with your department's apps pre-installed. For
    example, Scientist synths now start with NT Science Hub. They also now
    have double the storage space compared to the basic PDA.

    ## Why It's Good For The Game

    Convenience.
    Also, synth PDAs have sort of existed in a weird limbo where (at least,
    from my point of view having talked to some others) most synth players
    just don't actually use one of the defining features of their race
    because normal PDAs are largely better and more convenient, hopefully
    this change emphasizes their abilities.
    The doubled brain storage space is just so that synth brain PDAs can
    comfortably house whatever programs come with being a dept. head.
    Balance wise, I doubt it will affect anything (what could you even do
    with the extra storage space, short of the dept. head apps? basic crew
    apps fit comfortably on the basic PDA limit, synths can't be emagged for
    expensive syndie apps, and synths can't store files on their brain via
    disks).

    ## Proof Of Testing

    (image taken after I spawned as RD; this is the synth brain PDA)

    ![image](https://github.com/user-attachments/assets/9a4dc579-f5a3-4df2-ad39-17aace34a250)

    ## Changelog
    :cl:
    qol: Synthetic crew now spawn in with PDA apps relevant to their work
    station.
    bal: Synthetic crew brain PDAs now have 128 max capacity points (was
    previously 64)
    /:cl:

commit eaa6352aff1ec67f4fa5dc62ec7169523a46a88e
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 08:20:28 2025 +0200

    Automatic changelog for PR #3471 [ci skip]

commit 02f3cfdb00e17562b57c400a8a712cffa8f2cde0
Author: ariaworld <[email protected]>
Date:   Fri Apr 11 08:20:05 2025 +0200

    [MAPPING]: Change Kilo Station dorms area type from Locker to Dorms. (#3471)

    ## About The Pull Request
    Makes sure Kilo Station's dorms area actually is a Dorms area.
    ## Why It's Good For The Game
    Other stations' dorms are inside actual Dorms areas, effectively
    granting protection from events like sudden brain trauma/heart attack,
    but Kilo Station didn't have this, they were classified as lockers
    instead.
    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![e](https://github.com/user-attachments/assets/ae6e79db-d68f-4895-a661-e5fa5b0383de)
    </details>

    ## Changelog
    :cl:Goku
    map: Kilo Station's Dormitories area type is now classified as
    dormitories, not as a Locker room.
    /:cl:

commit 5266275bc498752787f4a818514fee1a18bc7735
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 07:03:33 2025 +0200

    Automatic changelog for PR #3485 [ci skip]

commit 0a38cf2824b15c475e36608c187ddd16d30d0351
Author: Roxy <[email protected]>
Date:   Fri Apr 11 01:03:07 2025 -0400

    Fix examine menu character preview being tiny (#3485)

    ## About The Pull Request

    Upstream fixed the tiny character preview but it requires a little tweak
    on implementations

    ## Why It's Good For The Game

    I can't see the blorbo

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/48961934-05ed-4cfe-b025-26628bea661c)

    </details>

    ## Changelog
    :cl:
    fix: fixed character preview in the examine window being tiny
    /:cl:

commit 3fc7296b8296f0bfa063b35c622e86eebeb54a28
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 06:23:15 2025 +0200

    Automatic changelog for PR #3483 [ci skip]

commit 1d52e91fd0316c25e15d2226aafa21a58e8b6b79
Author: Roxy <[email protected]>
Date:   Fri Apr 11 00:22:51 2025 -0400

    Fix double box on vote results chat message (#3483)

    ## About The Pull Request

    There's a redundant override in `vote.dm` to enclose the vote results in
    a purple examine box, this is the default way votes are displayed now so
    it's making vote results appear as a box within a box

    ## Why It's Good For The Game

    Looks wrong

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>
    Before:

    ![image](https://github.com/user-attachments/assets/e85781f3-ee68-4581-8a26-42aa577479f9)

    After:

    ![image](https://github.com/user-attachments/assets/b9ffda2a-950b-42e3-b476-c3b62dadd9a0)

    </details>

    ## Changelog
    :cl:
    fix: fixed vote results in chat having an extra box around them
    /:cl:

commit ab74044fc6cc09949f2209a9e76d33410c7c5275
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 06:20:31 2025 +0200

    Automatic changelog for PR #3363 [ci skip]

commit cb06f207d39109d6d658c721f5687cfb87764177
Author: Kepteyn <[email protected]>
Date:   Fri Apr 11 05:20:07 2025 +0100

    Just a couple more hotel rooms (#3363)

    ## About The Pull Request

    This adds four (and a half) new infinidorm hotel rooms -- A bar themed
    one, for when you want bar RP that's less public; a nightclub themed
    one; an space themed one for the spaceophilliacs who want to bang in
    space (or an airlock), and finally an oasis themed one, with a day and a
    night version.

    It also fixes the lights in the Library room, given we're no longer
    downstreaming from Skyrat, and it adds a template dmm that should make
    it easier for people to add new rooms should they wish - the plaque on
    the floor represents the spawn point.

    ## Why It's Good For The Game

    This adds even more variety to the infinidorm room options for people to
    roleplay in as a ghost. Or to _roleplay_ in. The bar one in particular
    provides an option for people who want to do a bar RP with some friends
    without getting pesky interruptions from their fellow human beings who
    feel the need to start a gunfight in the bar.

    ## Proof Of Testing

    All the new hotel rooms and the library have been tested in game, and
    are working quite nicely! The template map does not show up as an option
    in-game, as it exists to help mappers.

    ## Screenshots
    <details>
    <summary>Foxbar</summary>

    ![Untitled](https://github.com/user-attachments/assets/ae28e61e-c7db-4b77-8134-82e49ceced3a)

    </details>
    <details>
    <summary>Nightclub</summary>

    ![Untitled](https://github.com/user-attachments/assets/fcc200f1-59e9-402e-aa64-5d97bced377d)

    </details>

    <details>
    <summary>EVA</summary>

    ![Untitled](https://github.com/user-attachments/assets/d2f08b34-921b-4a1c-9c7a-927e04113b8c)
    _The floor is, infact, fake space, and is surrounded by a fake-space
    wall. You will survive nude in space here. Spacesuits still provided._
    </details>

    <details>
    <summary>Oasis</summary>

    ![Untitled](https://github.com/user-attachments/assets/38a9c04b-57c9-4b65-8208-f57abe526eab)
    _Only one is shown for brevity's sake, as the only difference between
    day and night versions is the strength of the external lighting_

    </details>

    <details>
    <summary>Template</summary>

    ![Untitled](https://github.com/user-attachments/assets/9630b870-21d5-47d2-aecf-40d343458451)
    _The template room. The bluespace border must be indestructible solid in
    some form, while the dark grey flooring represents the wall's location
    on the defautl Hilbert room. The door is located where the default door
    is on it, and the plaque on the ground shows where the player will
    spawn_

    </details>

    ## Changelog

    :cl:
    add: Added infinidorms: Fox Bar; The Nightclub; EVA; and Oasis (day and
    night versions)
    add: Added a mapping template for creating new infinidorms at
    modular_skyrat\modules\hotel_rooms
    fix: modified the lights of the Library infinidorm so it's not so damn
    dark.
    /:cl:

commit 700856e3c5c89511aee9ab587f7a2e0122c14597
Author: Bubberbot <[email protected]>
Date:   Thu Apr 10 23:25:40 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 02353b9ec2d8b4a2e6d1d6c4cea55fec6ba3bdf1
Author: Bubberbot <[email protected]>
Date:   Fri Apr 11 01:05:38 2025 +0200

    Automatic changelog for PR #3475 [ci skip]

commit f1722bb1c63388ea5c2ce69bc4d4a5f55ba10558
Author: LT3 <[email protected]>
Date:   Thu Apr 10 16:05:12 2025 -0700

    Disable lean reset on direction change (#3475)

    ## About The Pull Request

    Edits TG's lean component to perform the same as the pixel shift
    component

    ## Why It's Good For The Game

    Consistent shifting movement

    ## Changelog

    :cl: LT3
    qol: Leaning no longer resets with directional change
    /:cl:

commit 4a5c80e1813ecaf7d26ddeabf2593d2b44c86dcb
Merge: b908b32d387 ada9345244f
Author: Majkl-J <[email protected]>
Date:   Thu Apr 10 10:46:20 2025 -0700

    Merge branch 'master' of https://github.com/Bubberstation/Bubberstation into upstream-25-04a

commit ada9345244fc14db55c44c63b2a35d61fe055e3d
Author: Bubberbot <[email protected]>
Date:   Thu Apr 10 19:16:21 2025 +0200

    Automatic changelog for PR #2896 [ci skip]

commit 472893ae5e7ceecb80375101458ca188cd1044b8
Author: Manatee <[email protected]>
Date:   Thu Apr 10 12:15:56 2025 -0500

    Tarkon Tweaks and Xeno Changes (#2896)

    ## About The Pull Request

    Update as of 01/26

    So that was a lie

    Anyways I completely remade tarkon, which is what I ORIGNIALLY wanted to
    do, but used a lot of the pre-existing tarkon assets to do so, to
    maintain the same feel.

    Some NEW NEW features (as the project grew in scope) include:

    Med/RND/Engineering are now separate "Islands" like charlie (tarkon was
    always meant to be like that anyhow
    Each one has a few xenos, and a new "Emergency power generator"
    Scanning this with the new (not a ripoff) Hack-C tool will call in a
    repair drone (Original content) to repair it, and it needs to be
    defended from the xenos it alerts.
    Sucsesfully completing a defence will reward sickass weapons and gear
    you wouldn't normally ever get to see, making further areas easier, and
    a key for the final area.
    Once all 3 keys are obtained, and the areas are re-secured, you can go
    to the boss area and clear out the AI sat / command zone.

    A bitrunning server to allow them to make their own bitden (it's the
    first prototype, and the rest must be researched so it's not
    shift-start)

    more floor safes with various things like some ore thumpers and two
    bluespace beakers

    Crates! Someone misfiled a crate of goodies and it got sent here! These
    orders should be delivered to their owners! I'm sure they would
    appreciate it! Probably...

    A Recycler (Amazing)

    A produce order console! Now you can actually cook whatever you want!
    And it gives you a reason to sell stuff for money!

    more stuff, lots more stuff. things keep getting added the longer it
    takes for this to be looked at.

    Also adds three new variants of xenobio, and two new variants of the
    cargo bay. One cult (we miss you cult), one carp, and a monkey themed
    xenobio.

    ## Why It's Good For The Game
    Part 1 of my attempt to make tarkon feel better to play. The overall
    gameplay was very "Meta" and didn't really give you any reason to clear
    out xenos or the threats. Who knows what might come next.
    Tarkon was pretty stale. A bit of new stuff might be nice. plus a reason
    to use their shuttle is good.

    Furthermore, tarkon WILL run on solar, so if you REALLY don't want to,
    you don't HAVE to go and clear everything out.

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/f707090e-426c-4d63-b171-8fdfa33a0489)

    ![image](https://github.com/user-attachments/assets/26b97663-53c4-49b5-827d-484b6aae9b38)

    ![image](https://github.com/user-attachments/assets/94d03e35-8a44-4d39-b8e7-5fa1a722ff8e)

    ![image](https://github.com/user-attachments/assets/a865263b-6e62-409e-a537-7c5e157e21f7)

    ![image](https://github.com/user-attachments/assets/7d8edb71-5dec-469b-9a39-fe3f1305b127)

    ![image](https://github.com/user-attachments/assets/1bae535a-82e3-43f9-93a0-d2983e011ea7)

    ![image](https://github.com/user-attachments/assets/2ad382a1-58e8-4846-a575-2e4bc732216d)

    ![image](https://github.com/user-attachments/assets/2a41c51c-d447-413f-a4f2-3c272c8ddd15)

    ![image](https://github.com/user-attachments/assets/aaae91bd-aec4-4f0d-93c8-857e63416562)

    ![image](https://github.com/user-attachments/assets/4e89da8d-bbc7-4084-bb8d-353ec032ca4c)

    I did test it, and run the wave defense, it DOES work.
    </details>

    ## Changelog
    :cl:
    add:  BUNCH of new tarkon things!
    map: Tarkon QOL changes
    /:cl:

    ---------

    Co-authored-by: Waterpig <[email protected]>
    Co-authored-by: Arturlang <[email protected]>

commit b908b32d387ffe9a2b40d2d25a03cd04c2e62868
Author: Majkl-J <[email protected]>
Date:   Thu Apr 10 08:35:37 2025 -0700

    Compiletimes done

commit a9601004a82714a72f62e9b5db07d2adde27c0c3
Author: Majkl-J <[email protected]>
Date:   Thu Apr 10 08:35:26 2025 -0700

    We are so comically stupid

commit 0f8d37991fefd3503ace103dc6960dc205fea77e
Author: Bubberbot <[email protected]>
Date:   Thu Apr 10 00:05:02 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 31897a95e98d7a6e7fb566f906e721e7fbaa856a
Author: Bubberbot <[email protected]>
Date:   Thu Apr 10 01:54:47 2025 +0200

    Automatic changelog for PR #3468 [ci skip]

commit 385b7344240455f2ae64a10609f3902a4c58295c
Author: Bubberbot <[email protected]>
Date:   Thu Apr 10 01:54:32 2025 +0200

    Automatic changelog for PR #3470 [ci skip]

commit 0903ee683e79092c25f4a188bad347851a62f3f5
Author: Roxy <[email protected]>
Date:   Wed Apr 9 19:54:20 2025 -0400

    Fix shuttles no longer making sounds or (un)bolting doors (#3468)

    ## About The Pull Request

    The code for these things got lost in an upstream because shuttle code
    got split into multiple files

    ## Why It's Good For The Game

    Fixes #3251

    ## Proof Of Testing

    I tested it and the shuttle went bwwwwrrmmmmm pshewww and the door bolts
    went chk

    ## Changelog
    :cl:
    fix: fixed shuttles missing landing/take off engine sounds
    fix: fixed shuttles not bolting/unbolting their doors when moving
    /:cl:

commit e5b57bc08c9c0e88d771c4b5a5c9627bce87045a
Author: LT3 <[email protected]>
Date:   Wed Apr 9 16:54:09 2025 -0700

    Fix meow emote for cat tongues (#3470)

    ## About The Pull Request

    Fixes the meow emote to use the correct emote if you have a cat tongue

    ## Why It's Good For The Game

    MEOW.

    ## Changelog

    :cl: LT3
    fix: Mobs with cat tongue get their alternate meow sound back
    /:cl:

commit 204ea57363eb1226cc0bc3281eb019515e95b89e
Author: Bubberbot <[email protected]>
Date:   Wed Apr 9 23:23:16 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit ce5944e0733f4c5985e2e48878a02c0c35463d0a
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 08:19:09 2025 -0700

    6 compiletime errors left

commit d1905c44f543297886b0e9ebea7f0b8a6633855b
Author: Bubberbot <[email protected]>
Date:   Wed Apr 9 14:03:13 2025 +0200

    Automatic changelog for PR #3461 [ci skip]

commit 6c3bc536048a921ecccf80a0c728fa2b34f4a16e
Author: Odairu <[email protected]>
Date:   Wed Apr 9 08:02:51 2025 -0400

    Deathmatch now stores and reapplies your respawn timer prior to being spawned (#3461)

    ## About The Pull Request
    Title
    ## Why It's Good For The Game
    item number TWO on the list
    ## Proof Of Testing

    ![image](https://github.com/user-attachments/assets/3f6fd5d7-1d62-41a5-9c97-3178585f350a)
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    code: deathmatch doesn't reset your respawn timer
    /:cl:

commit f890cb36b9265f011a187b4f332812590838292c
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 01:45:20 2025 -0700

    some color stuff

commit fb849a2a8ebc2166915cfbec1e850510678b2f22
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 01:38:18 2025 -0700

    Fixes

commit 381d77fa68707cc5315b698474df026c2103166c
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 01:20:20 2025 -0700

    We love guncode and refactors!!!!

commit f30bb6ca01319218795e4004219938aa3d976eb3
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 01:00:40 2025 -0700

    I love cherry picking!!!

commit 6677a4c7bbe3c7536276178c841290a489d0a4a9
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 01:00:27 2025 -0700

    so apparently some dumbass on nova reused the turret flag bitfield and it only now runtimes

commit 7acc721baadbdea3d3795a45b9837cfeb4fd4fd0
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 00:58:48 2025 -0700

    Martials and arcade rework updates

commit bf9f393204fe7d40d5e57e76db870eb1a32aed25
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 00:47:58 2025 -0700

    This might break taur icons, remember to test once we compile

commit 3bc256cb16ca2e85b78830345bba0a487f49fc17
Author: Majkl-J <[email protected]>
Date:   Wed Apr 9 00:41:03 2025 -0700

    Several varchanges from tg

commit 76f5dc1b5fe63df5eb2b559c7fdf84750fc89f2f
Author: Bubberbot <[email protected]>
Date:   Tue Apr 8 23:23:40 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 538049c4cd4960d2c81c43f2e387896049fb02c7
Author: Waterpig <[email protected]>
Date:   Tue Apr 8 20:00:59 2025 +0200

    reagent applicators fixes

commit df43e50d68419d2f24bd62eef0432bda8394cc7d
Author: Waterpig <[email protected]>
Date:   Tue Apr 8 19:56:27 2025 +0200

    Some missed merge fixes

commit 0f0838bb3536eaa038d3c566654ae8bce22b2dcd
Author: Bubberbot <[email protected]>
Date:   Tue Apr 8 09:27:36 2025 +0200

    Automatic changelog for PR #3399 [ci skip]

commit 234a41058644c24aa850fa13f5e22c874bbaea00
Author: Bubberbot <[email protected]>
Date:   Tue Apr 8 09:27:29 2025 +0200

    Automatic changelog for PR #3397 [ci skip]

commit 722b51eb079d16b37f605e6d8a99cecc9e4b54ae
Author: Iamgoofball <[email protected]>
Date:   Tue Apr 8 02:27:12 2025 -0500

    [MODULAR] Removes the 60 round Sol drum from being printable in Security (#3399)

    ## About The Pull Request

    Removes the 60 round Sol drum from being printable in Security

    ## Why It's Good For The Game

    After discussing magazine size standardization, this came up and to be
    100% honest, the crew does not need LMG ammo capacity on any of their
    guns. Even though it's illegal contraband to use(yes, Illegal Tech is
    still fuckin' Illegal lol), it's still a lot of ammo capacity that we
    don't really want the crew to have.

    ## Proof Of Testing

    Just deleting a research design.

    ## Changelog

    :cl:
    del: Removes the 60 round Sol drum from being printable in Security
    /:cl:

    ---------

    Co-authored-by: The Sharkening <[email protected]>

commit 3e7223b959ca74eb85392fcd003897dda31906ba
Author: Iamgoofball <[email protected]>
Date:   Tue Apr 8 02:27:06 2025 -0500

    [MODULAR] Puts the Sol/Carwo/Romulus/Szot/Trappiste gun magazine sizes in line with /tg/ standards (tiny for everything but rifles which are normal) (#3397)

    ## About The Pull Request

    Puts the Sol/Carwo/Romulus/Szot/Trappiste gun magazine sizes in line
    with /tg/ standards (tiny for everything but rifles which are normal)

    ## Why It's Good For The Game

    Size inconsistencies between items results in confused players; it's
    good to keep this sort of thing synced up so that we're not having
    players ask why one pistol magazine fits in a box while another pistol
    magazine doesn't fit in a box when the air tank that's bigger than both
    of them does fit in the box.

    If I find other guns with weird weight classes I'll fix those too.

    ## Proof Of Testing

    Single-line changes, weight classes is a proven working system already.

    ## Changelog
    :cl:
    qol: Puts the Sol/Carwo/Romulus/Szot/Trappiste gun magazine weight
    classes in line with /tg/ standards for magazine weight classes (tiny
    for everything but rifles or larger which are normal)
    /:cl:

commit 7b420bb680605143dd5ca89f57f6e8e146480a1c
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 22:16:23 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit f30b0d5df07a13f9c3d77ec86b110d9f0f33c861
Author: Bubberbot <[email protected]>
Date:   Tue Apr 8 00:12:44 2025 +0200

    Automatic changelog for PR #3452 [ci skip]

commit aa4901b5717bbda98434b7344168cee684f5dc5c
Author: LT3 <[email protected]>
Date:   Mon Apr 7 15:11:59 2025 -0700

    Map vote is called automatically on blob/nukies/etc. round end (#3452)

    ## About The Pull Request

    Triggers the automatic map vote when the round is about to end due to a
    station threat, if it hasn't happened.

    ## Why It's Good For The Game

    Saves it delaying the next round if no admin catches it in time, causing
    a delay as the vote and another restart needs to occur.

    ## Changelog

    :cl: LT3
    admin: Map vote is automatically triggered near the conclusion of
    station ending threats
    fix: Only a single announcement is sent when the shuttle is called,
    fixing the overlapping sounds
    /:cl:

commit a6845577bdde9690527fd32e9160e3b940fa2d46
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 21:55:15 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit bf8c0ef85fe8cb732a100c5c1b8aeb5e5bb69a70
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 23:49:40 2025 +0200

    Automatic changelog for PR #3459 [ci skip]

commit 28e4e2cd426791476bc4cef4d88da505fd62a137
Author: Roxy <[email protected]>
Date:   Mon Apr 7 17:49:12 2025 -0400

    Refactor changelog handling to separate files (#3459)

    ## About The Pull Request

    This rewrites how our actions handle changelogs, and rewrites a bunch of
    the changelog TGUI (in a separate file cause I don't feel like
    massacring the upstream one). The gist of it is that our actions will
    now create autochangelog files with bubber in the name, our changelog
    compile will only compile those autochangelogs (not upstream ones if
    they happen to be in there), and the compile will be done into separate
    bubber changelog files in `html/changelogs/bubber_archive`. In game, the
    UI will pull both archive files (upstream and ours) and combine them in
    the changelog list, putting the codebase logo next to each change to
    distinguish which one it's from.

    ~~NOTE: I'm opening this as a draft because I'm going to try and reset
    our tg changelogs and then reapply all our historical changelogs into
    the new bubber archive files, I'm just putting this up now so the code
    can be reviewed and shit~~ done

    ## Why It's Good For The Game

    For players this makes it easier to distinguish where a change came
    from, and for developers this means we don't need to worry about
    breaking the changelog when we do an upstream pull, we can completely
    ignore it and just pull everything, and our tg archive files will be 1:1
    with upstream with no shit from us added in.

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/ac8a96f9-dcb3-43f0-8d36-faf610f3a7e0)

    </details>

    ## Changelog

    :cl: TealSeer, LT3
    refactor: refactored how changelogs are generated and displayed
    /:cl:

    ---------

    Co-authored-by: lessthanthree <[email protected]>

commit 7de99181db65aeb362fb7729d154eb94ec1f762e
Author: Roxy <[email protected]>
Date:   Mon Apr 7 17:44:07 2025 -0400

    Rename Autochangelog (#3462)

    the refactor is about to merge this isnt gonna be included otherwise

commit 0ed680f2aad20d224459a9f7882f61dd6209790e
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 23:36:02 2025 +0200

    Automatic changelog for PR #3457 [ci skip]

commit 0f13b89457f6eeaf10b1212b6f2dd5050df911c8
Author: Odairu <[email protected]>
Date:   Mon Apr 7 17:35:25 2025 -0400

    30 minute grace period to respawn (world time, not round time) (#3457)

    ## About The Pull Request
    from when the server starts to 30 minutes after, respawning is free of
    charge
    ## Why It's Good For The Game
    item #1 on the list
    ## Proof Of Testing
    it works dude trust me
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    code: respawn enabled until 30 min (world time)
    /:cl:

commit 99cb23f3c5fbe93d6425958d971775e93c3c9c8d
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 18:30:45 2025 +0200

    Automatic changelog for PR #3434 [ci skip]

commit 697d89abf33b6c4d081e04b404e3ccd2be7ae125
Author: pixelkitty286 <[email protected]>
Date:   Mon Apr 7 11:30:19 2025 -0500

    Cleans up and reorganizes some of the borg code (#3434)

    ## About The Pull Request
    This PR reorganizes and cleans up some of the borg code and separates
    sprite defines and borg defines once more but this time correctly.

    Also fixes some small bugs with foot steps with chameleon module.

    Moved some borg model specific trait procs into their own file.
    ## Why It's Good For The Game
    Makes it more organized so we don't have one HUGE file containing all
    the sprite defines and borg model code

    ## Proof Of Testing
    It's all back end. Compile test was last done late march.

    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    fix: chameleon model foot steps
    code: moved many of the borg defines to their correct _defines file and
    folder
    /:cl:

commit 74985f40fc6bf05777df49612e8a4debc967900a
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 10:28:15 2025 +0200

    Automatic changelog for PR #3447 [ci skip]

commit d58cf909af49c68b16702829d29f889258a81493
Author: Jinshee <[email protected]>
Date:   Mon Apr 7 01:27:49 2025 -0700

    Change podperson eye color (Again (Thanks Upstream)) (#3447)

commit cb3052e6eab5969d0a257e68d383c422b6350249
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 02:04:52 2025 +0200

    Automatic changelog for PR #3448 [ci skip]

commit c29d36ada55c70507524cfca21c61a74ed0b5619
Author: sippykot <[email protected]>
Date:   Mon Apr 7 02:04:27 2025 +0200

    Fish Ass: ports over large shark tails from CHOMP (#3448)

    ## About The Pull Request

    see title
    if you want to see who made the sprites, follow the accreditation chain:
    https://github.com/CHOMPStation2/CHOMPStation2/pull/9926

    it doesn't fully use all the sprites, because our system here is so much
    clunkier to use - if someone wants they can probably bash out several
    more tail variants by copying and rearranging the existing sprites

    ## Why It's Good For The Game

    people wanted them, gushed over them in #suggestions, and then no one
    did anything, so...
    also, 🦈

    ## Proof Of Testing

    yeah i compiled it, they finally showed up in game, thanks #coder-longue

    ## Changelog

    :cl:
    add: 4 new tail options
    image: new tail sprites
    /:cl:

    ---------

    Co-authored-by: Roxy <[email protected]>

commit fa6845f9e67bf66df331d8917a0a75421c768a92
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 23:22:10 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 55fd8dd1f7c5bfe15902e32977a77019503bfbae
Author: Bubberbot <[email protected]>
Date:   Mon Apr 7 01:01:20 2025 +0200

    Automatic changelog for PR #3426 [ci skip]

commit 16f6d075485761110a9b83c3c2b461f7a821dee5
Author: Odairu <[email protected]>
Date:   Sun Apr 6 19:00:55 2025 -0400

    Shadekin NV and movespeed rebalance (#3426)

    ## About The Pull Request
    title + nerf movespeed in the light
    ## Why It's Good For The Game
    still can't see shit (nv trait is 4.5, bumping it up to 15)
    ## Proof Of Testing
    it werks
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    balance: shadekin nv buffed from 4.5/100 to 15/100
    balance: shadekin move a bit slower in the light
    /:cl:

commit d2f96730ba23a5c0017181c79f40dfb777ad769c
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 22:16:10 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit c7def946b612c9e0cfe6a21bcf3cd578f05bf793
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 17:39:00 2025 +0200

    Automatic changelog for PR #3450 [ci skip]

commit f833f3edc4126d4ac899315308ae17480ea68025
Author: Roxy <[email protected]>
Date:   Sun Apr 6 11:38:26 2025 -0400

    Fix persistence medbots speaking on syndicate frequency (#3450)

    ## About The Pull Request

    Make them speak on cybersun frequency

    ## Why It's Good For The Game

    Fixes #3446

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/05dc7869-8904-4005-be2a-d59301daef13)

    </details>

    ## Changelog

    :cl:
    fix: fixed persistence medbots speaking on wrong radio frequency
    /:cl:

commit 17b620b48e23402b4bd08a6d2deafa730d950bcf
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 10:19:15 2025 +0200

    Automatic changelog for PR #3438 [ci skip]

commit bfb9c9e2b548d71931eb5e3897a1f5a432bd91e9
Author: pixelkitty286 <[email protected]>
Date:   Sun Apr 6 03:18:52 2025 -0500

    Nerfs super syndicat and makes it no longer a freedom implant. (#3438)

    ## About The Pull Request
    - This PR makes the new syndicat ears item have a 1 minute cool down
    when used and the normal ears have the same thing.

    - This also ports a fix that was done on monkey station:
    https://github.com/Monkestation/Monkestation2.0/pull/6017

    ## Why It's Good For The Game
    - After watching a round on here and getting complaints about this from
    SPLURT I understand now why 20 seconds is too short for such a item like
    this if your gonna be a cat your gonna be a cat for a long while.

    - Also to quote monkey station:
    "It will make the cat not able to bypass any security non-lethal means,
    which in turns mean security won't be forced to lethal them everytime
    they see it."

    ## Proof Of Testing
    Should work only changed the time values.

    Edit: Compiled and tested locally

    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    balance: Super cat ear cool downs are longer and removed the freedom
    implant function.
    /:cl:

commit 4ed70fa4c7c29f57d7ca74e3cda7b1b9df6c2594
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 10:18:17 2025 +0200

    Automatic changelog for PR #3451 [ci skip]

commit 65331b085f2246230ebf5b1abb2b2d003339b26a
Author: Roxy <[email protected]>
Date:   Sun Apr 6 04:17:45 2025 -0400

    Fix invisible sprites on security HUD nightvision goggles (#3451)

    ## About The Pull Request

    Upstream changed NV goggles to have different icon states for on and off
    and we dont have that so I reverted it to the tg sprite

    ## Why It's Good For The Game

    Fixes #3383

    ## Proof Of Testing
    <details>
    <summary>Screenshots/Videos</summary>

    ![image](https://github.com/user-attachments/assets/77943197-de8f-409a-86c3-bad205888054)

    </details>

    ## Changelog

    :cl:
    fix: fixed sechud nv goggles being invisible when off
    /:cl:

commit 8aad924f769daca5c1037a65496bafb95fbee97e
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 10:16:18 2025 +0200

    Automatic changelog for PR #3443 [ci skip]

commit 3bd5803844dca628da3df6802ebf94a7fc9f97fa
Author: Swift <[email protected]>
Date:   Sun Apr 6 03:15:53 2025 -0500

    Removes tackle buff for having cat ears (#3443)

    ## About The Pull Request

    Title, manual revert of #1513

    ## Why It's Good For The Game

    Tackle chance could be brought to 100% and people have reportedly been
    exploiting this fact.

    ## Proof Of Testing

    I think it will complie

    ## Changelog

    :cl:Swiftfeather
    balance: Cat ears no longer provide a tackle bonus
    /:cl:

commit 89594c85474090c75409ee5581b720f2465cb7c0
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 00:56:59 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit b4af64b182798ae1f4f7c27046ee7c0067225634
Author: Bubberbot <[email protected]>
Date:   Sun Apr 6 02:25:40 2025 +0200

    Automatic changelog for PR #3370 [ci skip]

commit 0e684db68a7f034a6eb8773f711a2ccac2a02379
Author: LT3 <[email protected]>
Date:   Sat Apr 5 17:24:44 2025 -0700

    Update various sound prefs for 516 compatibility (#3370)

    ## About The Pull Request

    Updates our various sound prefs to be functional post upstream/516.

    ## Why It's Good For The Game

    We can control sound as expected again.

    ## To-Do

    - [x] Conditional preference sounds
    - [x] Jukebox sound toggle
    - [x] Jukebox volume override

    ## Changelog

    :cl: LT3
    fix: Sound prefs that went missing post-516 are restored
    add: Jukebox volume slider in game preferences
    /:cl:

    ---------

    Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>

commit 60e73702c6eb31a7a023e5fdfef7f38c83da95c8
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 07:14:09 2025 +0000

    Bubberstation automatic changelog compile [ci skip]

commit 9a368231734e5061ac99374c55726eb8a52b648b
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 09:02:26 2025 +0200

    Automatic changelog for PR #3425 [ci skip]

commit 1ab85fd20637c6d2a2503e3ae5a1a0cdb888e515
Author: Odairu <[email protected]>
Date:   Sat Apr 5 03:02:02 2025 -0400

    Spices up vulpkanin [bounty] (#3425)

    ## About The Pull Request
    Changes vulpkanin in several ways:
    - Peanutbutter gives a mood buff
    - Chocolate deals toxin damage while inside you
    - innate hardened soles
    - innate night vision
    - hunger will drain twice as fast
    - higher sensitivity to flashes
    ## Why It's Good For The Game
    vulpkanin are literally human but fluffy, they don't even have lore in
    the species selector (lol) also I'm being paid
    ## Proof Of Testing

    ![image](https://github.com/user-attachments/assets/8860340c-e6c4-4ad9-81ac-89a60f7645eb)

    ![image](https://github.com/user-attachments/assets/3a497358-64f1-4f37-a8c4-e289c7a84734)

    ![image](https://github.com/user-attachments/assets/d6dec08b-c0a6-4d75-8715-2f66791a9cd4)
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    add: several vulpkanin species buffs/debuffs
    /:cl:

    ---------

    Co-authored-by: LT3 <[email protected]>

commit 4da0397b161a65d02b10fcca90c8b1923e9923a3
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 08:54:22 2025 +0200

    Automatic changelog for PR #3396 [ci skip]

commit 1ed1187fca385fca011a78d0d670248e57e88b5a
Author: Jinshee <[email protected]>
Date:   Fri Apr 4 23:53:57 2025 -0700

    Slug Scream! (#3396)

    ## About The Pull Request

    Adds a new scream, "Slug". Sound file ripped from Splurt

    ## Why It's Good For The Game

    Expression is the best thing that this video game medium can offer.

    ## Proof Of Testing

    https://github.com/user-attachments/assets/147be9dc-98c2-4ee4-bc76-762331710143

    ## Changelog

    :cl:
    sound: Slug Scream sound added to *scream choices
    /:cl:

commit 66e28121d41d22ccad9e69bf36587860de97b7d5
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 08:53:15 2025 +0200

    Automatic changelog for PR #3431 [ci skip]

commit 88a238b93cb760327317d559d34e9d91959345fd
Author: Bombermansam <[email protected]>
Date:   Sat Apr 5 02:52:48 2025 -0400

    Allows players to be sad like raptors (#3431)

    ## About The Pull Request
    Adds a Sad Kweh emote from the two unused raptor sound files.
    ## Why It's Good For The Game
    You can now sad birdly.
    ## Proof Of Testing
    It compiles and was tested locally.

    https://github.com/user-attachments/assets/bc5f31fb-ad12-4026-be94-d28d2db542df

    ## Changelog
    :cl:
    add: *skweh emote to be sad
    /:cl:

commit 4a93b42977f54f4e5af8f6df284a0df75b0a1531
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 08:51:43 2025 +0200

    Automatic changelog for PR #3432 [ci skip]

commit f51c4d79426e88be073f92c291ab798ad56d2bac
Author: Bombermansam <[email protected]>
Date:   Sat Apr 5 02:51:18 2025 -0400

    Silicons can now Yip (#3432)

    ## About The Pull Request
    Silicons can now emit a singular yip so they can express their inner
    kobold but not too much.
    ## Why It's Good For The Game
    Silicons can yipyip but not yip. This fixes it.
    ## Proof Of Testing
    It compiles and was tested locally.
    </details>

    ## Changelog
    :cl:
    fix: Silicons can now yip.
    /:cl:

commit 14ec8a04401cc64b864ce09b4c9966ef5f2b3468
Author: Bubberbot <[email protected]>
Date:   Sat Apr 5 08:43:03 2025 +0200

    Automatic changelog for PR #3437 [ci skip]

commit e05fe31faa2ad7b9fd6a09d0d5de9771de5117de
Author: Odairu <[email protected]>
Date:   Sat Apr 5 02:42:41 2025 -0400

    Adds more flavor to shadekin empathy (#3437)

    ## About The Pull Request
    BASED ON SANITY SHADEKIN EMPATHY WILL:
    -Take more or less time to send
    -At lowest levels of sanity the message starts to break down some
    -Be a different color in chat
    ## Why It's Good For The Game
    Shadekin empathy is communication through FEELINGS so it being
    better/worse based on how you're FEELING makes sense (to me)
    ## Proof Of Testing

    ![image](https://github.com/user-attachments/assets/2c539f7b-7edc-43c1-9c28-f8da4606dc17)
    <details>
    <summary>Screenshots/Videos</summary>

    </details>

    ## Changelog
    :cl:
    balance: shadekin empathy is better/worse based on mood
    /:cl:

    ---------

    Co-authored-by: Waterpig <[email protected]>

commit 457754c4618df52d7b53e0052a1ba8b11197675d
Author: Bubberbot <151680451+B…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Approval: admin approved PR is approved by admins Balance perfectly balanced as all things should be
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants