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

Baton shove now requires disarm intent #11187

Merged
merged 2 commits into from
Jul 18, 2024

Conversation

ToasterBan
Copy link
Contributor

About The Pull Request

atomisation of #11169

Why It's Good For The Game

I heard a lot of people disliked baton shoving so making it optional probably a good idea

Testing Photographs and Procedure

Screenshots&Videos

see #11169

Changelog

🆑
tweak: stunbatons only shove on disarm intent
/:cl:

Copy link
Contributor

@Rukofamicom Rukofamicom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering I have heard no arguments against this from either side of the baton's usage, this seems like a fine tweak

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dislike this, I made the shove changes active on all intents on purpose for the following reasons:

  • Security would have to position themselves effectively, a chaotic scenario and poor position will result in allies being knocked down.
  • It's a buff to the baton's defensive use, and a nerf to the offensive capability. Introducing a tile of space after a stun baton attack makes it so that each attack of the baton by a single person is slower, lowering the DPS without needing to reduce the damage. This reduces the DPS without making it so that the survivability of the security officer is significantly impacted, since its also harder for the opponent to get a rebound attack on the user.

@DarnTheMarn
Copy link
Contributor

That is all well and good. But what is the point, the tonfa bypasses all of those and manages to just be a better baton at this point. Yeah it takes a few more hits but it's EMP proof, can paralyze, can disarm, can leg break, you can get pretty much as many as you want, it's all upsides almost. The baton always pushing plus the gun equip slowdown means that unless you snag a bola on someone, they're probably getting away. And bolas are their own can of worms.

@Fronsis
Copy link

Fronsis commented Jul 16, 2024

I dislike this, I made the shove changes active on all intents on purpose for the following reasons:

  • Security would have to position themselves effectively, a chaotic scenario and poor position will result in allies being knocked down.
  • It's a buff to the baton's defensive use, and a nerf to the offensive capability. Introducing a tile of space after a stun baton attack makes it so that each attack of the baton by a single person is slower, lowering the DPS without needing to reduce the damage. This reduces the DPS without making it so that the survivability of the security officer is significantly impacted, since its also harder for the opponent to get a rebound attack on the user.

I've yet to find a single main officer that likes the shove change, as a matter of fact one of the big reasons tonfa started being used more was because of the baton push, eventually people went ''oh right the k.o!!'' and started using that feature other than to mess around.

Now that it's supposedely solved with your own pr ( #11200 ) i don't see why this wouldn't be good, you actually give agency to the Officer, in fact you could even make it that the shove-attack takes more hits to crit because they're sacrificing a heavy blow to keep the assailant away from them, which is something you've talked in the past: give agency on melee combats to both parties.

As the baton currently stands, what you think happens.. doesn't happen.

Security would have to position themselves effectively, a chaotic scenario and poor position will result in allies being knocked down.

I've never seen someone else be knocked down by the baton-shove ever since it was introduced, mind you i don't play every day multiple rounds but i'm quite active in general and constantly speaking with others and reading stories so yeah.. that never happens, and if it happens it doesn't really matter because people would not be disarmed from it.

You could argue the ''think about your positioning in a fight'' was more relevant when the first iteration of your baton-shove was introduced, where you could shove them into walls and tables, once that was removed to balance it because it was too powerful it just became an annoyance since it was just a husk of what the PR was.

On a regular arrest scenario, that might include a chase, most Officers find it extremely annoying because they don't see the point of it(i've spoken with a couple of sec mains and i agree with their views, feel free to make a Poll) because.. you're chasing someone yet your attacks push them away in a very.. weird way it also feels weird that each attack is strong enough to shove one spessmen one block away, it doesn't feel good nor fun to play with and that's why a lot of folks moved to Tonfa.

With this PR your interests in a more dynamic melee fight remains, given that they can choose to have agency on wether to press the attack or shove them away if they're being attacked and that certainly is more engaging and fun than the current baton.

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am willing to concede on this and revisit it later

@PowerfulBacon PowerfulBacon added this pull request to the merge queue Jul 18, 2024
Merged via the queue into BeeStation:master with commit 17726da Jul 18, 2024
8 checks passed
@ToasterBan ToasterBan deleted the just-baton-change branch July 18, 2024 17:36
EvilDragonfiend pushed a commit to EvilDragonfiend/BeeStation-Hornet-Evildragon-Fork that referenced this pull request Aug 12, 2024
* tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm

* Revert "tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm"

This reverts commit ac7814c.
EvilDragonfiend pushed a commit to EvilDragonfiend/BeeStation-Hornet-Evildragon-Fork that referenced this pull request Aug 12, 2024
EvilDragonfiend pushed a commit to EvilDragonfiend/BeeStation-Hornet-Evildragon-Fork that referenced this pull request Aug 12, 2024
XeonMations added a commit to XeonMations/BeeStation-Hornet that referenced this pull request Aug 13, 2024
commit feb4830
Author: Evildragon <[email protected]>
Date:   Mon Aug 12 19:18:41 2024 +0900

    squashed

commit 3995bb6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 30 00:12:18 2024 +0000

    Automatic changelog compile [ci skip]

commit bfa45eb
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 13:06:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 4718a84
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 07:20:21 2024 -0500

    Automatic changelog generation for PR BeeStation#11246 [ci skip]

commit 25bba7d
Author: spockye <[email protected]>
Date:   Mon Jul 29 14:10:09 2024 +0200

    fixes missing wall (BeeStation#11246)

commit 75fed78
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 00:12:20 2024 +0000

    Automatic changelog compile [ci skip]

commit ad07e7c
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 23:03:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 3a20888
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 17:07:12 2024 -0500

    Automatic changelog generation for PR BeeStation#11245 [ci skip]

commit 1c7a624
Author: spockye <[email protected]>
Date:   Sun Jul 28 23:57:54 2024 +0200

    removes holopad from glass floor on corg (BeeStation#11245)

    * removes holopad from glass floor

    * replaced glass floor with holopad

commit 384db43
Author: BeeBot <[email protected]>
Date:   Sun Jul 28 16:48:45 2024 -0500

    Update TGS DMAPI (BeeStation#11232)

commit fa030d5
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 00:13:22 2024 +0000

    Automatic changelog compile [ci skip]

commit 1aba55e
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 21:03:32 2024 +0000

    Automatic changelog compile [ci skip]

commit fc224ac
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:17:35 2024 -0500

    Automatic changelog generation for PR BeeStation#11235 [ci skip]

commit 7d5399c
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:19 2024 +0200

    [PORT] ports the shark plushie (BeeStation#11235)

    * ports shark plushie from TG

    * adds the plush to the choice beacon

    * oops

    adds a comma

    * Pigeon Variation Package: moodlet, better icon and spawners

    ---------

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

commit 3a18dca
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:07:48 2024 -0500

    Automatic changelog generation for PR BeeStation#11237 [ci skip]

commit 32b1ae2
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:08 2024 +0200

    simply ports better cone sprites (BeeStation#11237)

commit f2841a9
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 00:11:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 1f3df7e
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 16:03:54 2024 +0000

    Automatic changelog compile [ci skip]

commit 7314954
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 10:16:56 2024 -0500

    Automatic changelog generation for PR BeeStation#11231 [ci skip]

commit a1c9962
Author: Markus Larsson <[email protected]>
Date:   Fri Jul 26 17:07:21 2024 +0200

    Prevents Free Range Intercoms from Accessing Syndicate and CentCom Radio Channels (BeeStation#11231)

    * Update radio.dm

    * Update radio.dm

commit daf7f99
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 13:04:56 2024 +0000

    Automatic changelog compile [ci skip]

commit f56e6e4
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:55:51 2024 -0500

    Automatic changelog generation for PR BeeStation#11213 [ci skip]

commit 45bfa98
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:42:09 2024 +0300

    Adds the ability to craft different types of lockers. (BeeStation#11213)

    * done

    * done

commit 08a6811
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:46:25 2024 -0500

    Automatic changelog generation for PR BeeStation#11121 [ci skip]

commit 57f99c4
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:36:50 2024 +0300

    Fixed space dragon's gust ability hitting people through walls (BeeStation#11121)

    * Update space_dragon.dm

    * stuffs

    * Update space_dragon.dm

commit 01d39bc
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 00:11:45 2024 +0000

    Automatic changelog compile [ci skip]

commit 98ecd3c
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 25 01:29:46 2024 +0000

    Automatic changelog compile [ci skip]

commit 1514cd2
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 20:12:13 2024 -0500

    Automatic changelog generation for PR BeeStation#11217 [ci skip]

commit 6b40f76
Author: XeonMations <[email protected]>
Date:   Thu Jul 25 04:02:28 2024 +0300

    no more bugs (BeeStation#11217)

commit 4eb2ffa
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 04:03:49 2024 +0000

    Automatic changelog compile [ci skip]

commit 7f5c69b
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 22:35:43 2024 -0500

    Automatic changelog generation for PR BeeStation#11228 [ci skip]

commit 4c30a59
Author: Rukofamicom <[email protected]>
Date:   Tue Jul 23 22:26:01 2024 -0500

    Revert "Pirate shuttle rebalancing and update (BeeStation#11221)" (BeeStation#11228)

    This reverts commit 00c836b.

commit dcecb26
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 00:12:56 2024 +0000

    Automatic changelog compile [ci skip]

commit 25e2ea9
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 23:04:03 2024 +0000

    Automatic changelog compile [ci skip]

commit 7c497d2
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:06:20 2024 -0500

    Automatic changelog generation for PR BeeStation#11182 [ci skip]

commit d0359b6
Author: Tsar-Salat <[email protected]>
Date:   Tue Jul 23 17:56:51 2024 -0400

    MetaSec brig retiling (BeeStation#11182)

    * nice

    * oops

    * redoes armoury / storage and gear room decalling

    * oops

    fixed a floor decal

    * more small decal changes to offices and sec

    ---------

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

commit 51fb123
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:03:16 2024 +0000

    Automatic changelog compile [ci skip]

commit 8e7dc53
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 11:18:59 2024 -0500

    Automatic changelog generation for PR BeeStation#11220 [ci skip]

commit f427c3a
Author: Geatish <[email protected]>
Date:   Tue Jul 23 18:09:06 2024 +0200

    Small Radstation atmos fix and changes take 2 (BeeStation#11220)

    * rad atmos dep fix

    Rerouted distro piping around the designated work area, also removed the unremovable glass floor from there.
    Finally fixed the atmosphereic shutters not being openable.

    * Fixes small things around gas miners

    Fixed: Removed plating between the eastern miners and atmos. Fixed plasma glass tiles on gas chambers spawning with N2, making them contaminate the gas chamber if you were to remove the glass.

    * I hate maints I hate maints I hate maints

    also removed the extra apc in xeno.

    * Empty commit

    Just dirt

    * god i pray

    guhh

    * The apc was added again???

    how?

    * added back a window

    whoops

    * Now it was too many windows

    smh, better be fucking done now

    ---------

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

commit d7cd6e6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 16:04:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 8ee0c29
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 10:59:17 2024 -0500

    Automatic changelog generation for PR BeeStation#11225 [ci skip]

commit 7348c94
Author: spockye <[email protected]>
Date:   Tue Jul 23 17:49:43 2024 +0200

    small fix for cameras on explo shuttle (BeeStation#11225)

commit c319bc0
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 00:12:12 2024 +0000

    Automatic changelog compile [ci skip]

commit af9e370
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 08:04:39 2024 +0000

    Automatic changelog compile [ci skip]

commit a6b490c
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 02:25:07 2024 -0500

    Automatic changelog generation for PR BeeStation#11221 [ci skip]

commit 85300f2
Author: spockye <[email protected]>
Date:   Mon Jul 22 09:15:31 2024 +0200

    Pirate shuttle rebalancing and update (BeeStation#11221)

    * tones down decalling and supplies

    * Update pirate_default.dmm

commit fb21ec8
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 01:30:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 95b4254
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 20:15:49 2024 -0500

    Automatic changelog generation for PR BeeStation#11211 [ci skip]

commit 57fff7a
Author: ClownMoff <[email protected]>
Date:   Mon Jul 22 02:06:12 2024 +0100

    Fixes the bananium sword causing bleed (BeeStation#11211)

    * henk

    * Update clown_weapons.dm

commit 50f1640
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 00:13:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 6cae2a6
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 20 00:11:40 2024 +0000

    Automatic changelog compile [ci skip]

commit e72bb00
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 12:04:44 2024 +0000

    Automatic changelog compile [ci skip]

commit 947433a
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 06:35:45 2024 -0500

    Automatic changelog generation for PR BeeStation#11208 [ci skip]

commit 7da94eb
Author: Aramix <[email protected]>
Date:   Fri Jul 19 14:26:18 2024 +0300

    added divable var to closet and its logic (BeeStation#11208)

commit af034cd
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 00:12:42 2024 +0000

    Automatic changelog compile [ci skip]

commit 286b02e
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 17:03:21 2024 +0000

    Automatic changelog compile [ci skip]

commit 3dcaaa4
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:40:19 2024 -0500

    Automatic changelog generation for PR BeeStation#11187 [ci skip]

commit b40c9a0
Author: ToasterBan <[email protected]>
Date:   Thu Jul 18 18:23:16 2024 +0200

    Baton shove now requires disarm intent (BeeStation#11187)

    * tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm

    * Revert "tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm"

    This reverts commit ac7814c.

commit aabea95
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:30:39 2024 -0500

    Automatic changelog generation for PR BeeStation#11175 [ci skip]

commit 1040e75
Author: Hardly3D <[email protected]>
Date:   Thu Jul 18 13:20:52 2024 -0300

    New Hairstyle: Short Bangs 2 (BeeStation#11175)

    * Adds short bangs 2

    * Consistency fix
github-merge-queue bot pushed a commit that referenced this pull request Sep 20, 2024
* brbrbr

* made latejoin work

* Squashed commit of the following:

commit feb4830
Author: Evildragon <[email protected]>
Date:   Mon Aug 12 19:18:41 2024 +0900

    squashed

commit 3995bb6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 30 00:12:18 2024 +0000

    Automatic changelog compile [ci skip]

commit bfa45eb
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 13:06:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 4718a84
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 07:20:21 2024 -0500

    Automatic changelog generation for PR #11246 [ci skip]

commit 25bba7d
Author: spockye <[email protected]>
Date:   Mon Jul 29 14:10:09 2024 +0200

    fixes missing wall (#11246)

commit 75fed78
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 29 00:12:20 2024 +0000

    Automatic changelog compile [ci skip]

commit ad07e7c
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 23:03:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 3a20888
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 17:07:12 2024 -0500

    Automatic changelog generation for PR #11245 [ci skip]

commit 1c7a624
Author: spockye <[email protected]>
Date:   Sun Jul 28 23:57:54 2024 +0200

    removes holopad from glass floor on corg (#11245)

    * removes holopad from glass floor

    * replaced glass floor with holopad

commit 384db43
Author: BeeBot <[email protected]>
Date:   Sun Jul 28 16:48:45 2024 -0500

    Update TGS DMAPI (#11232)

commit fa030d5
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 28 00:13:22 2024 +0000

    Automatic changelog compile [ci skip]

commit 1aba55e
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 21:03:32 2024 +0000

    Automatic changelog compile [ci skip]

commit fc224ac
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:17:35 2024 -0500

    Automatic changelog generation for PR #11235 [ci skip]

commit 7d5399c
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:19 2024 +0200

    [PORT] ports the shark plushie (#11235)

    * ports shark plushie from TG

    * adds the plush to the choice beacon

    * oops

    adds a comma

    * Pigeon Variation Package: moodlet, better icon and spawners

    ---------

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

commit 3a18dca
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 15:07:48 2024 -0500

    Automatic changelog generation for PR #11237 [ci skip]

commit 32b1ae2
Author: spockye <[email protected]>
Date:   Sat Jul 27 21:58:08 2024 +0200

    simply ports better cone sprites (#11237)

commit f2841a9
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 27 00:11:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 1f3df7e
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 16:03:54 2024 +0000

    Automatic changelog compile [ci skip]

commit 7314954
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 10:16:56 2024 -0500

    Automatic changelog generation for PR #11231 [ci skip]

commit a1c9962
Author: Markus Larsson <[email protected]>
Date:   Fri Jul 26 17:07:21 2024 +0200

    Prevents Free Range Intercoms from Accessing Syndicate and CentCom Radio Channels (#11231)

    * Update radio.dm

    * Update radio.dm

commit daf7f99
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 13:04:56 2024 +0000

    Automatic changelog compile [ci skip]

commit f56e6e4
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:55:51 2024 -0500

    Automatic changelog generation for PR #11213 [ci skip]

commit 45bfa98
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:42:09 2024 +0300

    Adds the ability to craft different types of lockers. (#11213)

    * done

    * done

commit 08a6811
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 07:46:25 2024 -0500

    Automatic changelog generation for PR #11121 [ci skip]

commit 57f99c4
Author: XeonMations <[email protected]>
Date:   Fri Jul 26 15:36:50 2024 +0300

    Fixed space dragon's gust ability hitting people through walls (#11121)

    * Update space_dragon.dm

    * stuffs

    * Update space_dragon.dm

commit 01d39bc
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 26 00:11:45 2024 +0000

    Automatic changelog compile [ci skip]

commit 98ecd3c
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 25 01:29:46 2024 +0000

    Automatic changelog compile [ci skip]

commit 1514cd2
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 20:12:13 2024 -0500

    Automatic changelog generation for PR #11217 [ci skip]

commit 6b40f76
Author: XeonMations <[email protected]>
Date:   Thu Jul 25 04:02:28 2024 +0300

    no more bugs (#11217)

commit 4eb2ffa
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 04:03:49 2024 +0000

    Automatic changelog compile [ci skip]

commit 7f5c69b
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 22:35:43 2024 -0500

    Automatic changelog generation for PR #11228 [ci skip]

commit 4c30a59
Author: Rukofamicom <[email protected]>
Date:   Tue Jul 23 22:26:01 2024 -0500

    Revert "Pirate shuttle rebalancing and update (#11221)" (#11228)

    This reverts commit 00c836b.

commit dcecb26
Author: ss13-beebot <[email protected]>
Date:   Wed Jul 24 00:12:56 2024 +0000

    Automatic changelog compile [ci skip]

commit 25e2ea9
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 23:04:03 2024 +0000

    Automatic changelog compile [ci skip]

commit 7c497d2
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:06:20 2024 -0500

    Automatic changelog generation for PR #11182 [ci skip]

commit d0359b6
Author: Tsar-Salat <[email protected]>
Date:   Tue Jul 23 17:56:51 2024 -0400

    MetaSec brig retiling (#11182)

    * nice

    * oops

    * redoes armoury / storage and gear room decalling

    * oops

    fixed a floor decal

    * more small decal changes to offices and sec

    ---------

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

commit 51fb123
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 17:03:16 2024 +0000

    Automatic changelog compile [ci skip]

commit 8e7dc53
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 11:18:59 2024 -0500

    Automatic changelog generation for PR #11220 [ci skip]

commit f427c3a
Author: Geatish <[email protected]>
Date:   Tue Jul 23 18:09:06 2024 +0200

    Small Radstation atmos fix and changes take 2 (#11220)

    * rad atmos dep fix

    Rerouted distro piping around the designated work area, also removed the unremovable glass floor from there.
    Finally fixed the atmosphereic shutters not being openable.

    * Fixes small things around gas miners

    Fixed: Removed plating between the eastern miners and atmos. Fixed plasma glass tiles on gas chambers spawning with N2, making them contaminate the gas chamber if you were to remove the glass.

    * I hate maints I hate maints I hate maints

    also removed the extra apc in xeno.

    * Empty commit

    Just dirt

    * god i pray

    guhh

    * The apc was added again???

    how?

    * added back a window

    whoops

    * Now it was too many windows

    smh, better be fucking done now

    ---------

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

commit d7cd6e6
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 16:04:38 2024 +0000

    Automatic changelog compile [ci skip]

commit 8ee0c29
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 10:59:17 2024 -0500

    Automatic changelog generation for PR #11225 [ci skip]

commit 7348c94
Author: spockye <[email protected]>
Date:   Tue Jul 23 17:49:43 2024 +0200

    small fix for cameras on explo shuttle (#11225)

commit c319bc0
Author: ss13-beebot <[email protected]>
Date:   Tue Jul 23 00:12:12 2024 +0000

    Automatic changelog compile [ci skip]

commit af9e370
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 08:04:39 2024 +0000

    Automatic changelog compile [ci skip]

commit a6b490c
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 02:25:07 2024 -0500

    Automatic changelog generation for PR #11221 [ci skip]

commit 85300f2
Author: spockye <[email protected]>
Date:   Mon Jul 22 09:15:31 2024 +0200

    Pirate shuttle rebalancing and update (#11221)

    * tones down decalling and supplies

    * Update pirate_default.dmm

commit fb21ec8
Author: ss13-beebot <[email protected]>
Date:   Mon Jul 22 01:30:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 95b4254
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 20:15:49 2024 -0500

    Automatic changelog generation for PR #11211 [ci skip]

commit 57fff7a
Author: ClownMoff <[email protected]>
Date:   Mon Jul 22 02:06:12 2024 +0100

    Fixes the bananium sword causing bleed (#11211)

    * henk

    * Update clown_weapons.dm

commit 50f1640
Author: ss13-beebot <[email protected]>
Date:   Sun Jul 21 00:13:07 2024 +0000

    Automatic changelog compile [ci skip]

commit 6cae2a6
Author: ss13-beebot <[email protected]>
Date:   Sat Jul 20 00:11:40 2024 +0000

    Automatic changelog compile [ci skip]

commit e72bb00
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 12:04:44 2024 +0000

    Automatic changelog compile [ci skip]

commit 947433a
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 06:35:45 2024 -0500

    Automatic changelog generation for PR #11208 [ci skip]

commit 7da94eb
Author: Aramix <[email protected]>
Date:   Fri Jul 19 14:26:18 2024 +0300

    added divable var to closet and its logic (#11208)

commit af034cd
Author: ss13-beebot <[email protected]>
Date:   Fri Jul 19 00:12:42 2024 +0000

    Automatic changelog compile [ci skip]

commit 286b02e
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 17:03:21 2024 +0000

    Automatic changelog compile [ci skip]

commit 3dcaaa4
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:40:19 2024 -0500

    Automatic changelog generation for PR #11187 [ci skip]

commit b40c9a0
Author: ToasterBan <[email protected]>
Date:   Thu Jul 18 18:23:16 2024 +0200

    Baton shove now requires disarm intent (#11187)

    * tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm

    * Revert "tonfa now paralyses rather than sleeps, stunbaton only shoves on disarm"

    This reverts commit ac7814c.

commit aabea95
Author: ss13-beebot <[email protected]>
Date:   Thu Jul 18 11:30:39 2024 -0500

    Automatic changelog generation for PR #11175 [ci skip]

commit 1040e75
Author: Hardly3D <[email protected]>
Date:   Thu Jul 18 13:20:52 2024 -0300

    New Hairstyle: Short Bangs 2 (#11175)

    * Adds short bangs 2

    * Consistency fix

* hope this works

* Revert "hope this works"

This reverts commit dd018cf.

* take 2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants