Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes borgs duplicating ammunition with the munition clamp upgrade #2657

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Fixes borgs duplicating ammunition with the munition clamp upgrade #2657

merged 1 commit into from
Jun 14, 2024

Conversation

IndusRobot
Copy link
Contributor

About The Pull Request

Fixes borg contents not being checked when interacting with multiple powder racks or PDC racks. Normally when do_after removes contents from a human's hands it cancels all other pending do_afters. With borg munition clamps their hands do not change, so without refactors their contents will be checked in post by the machine.

Why It's Good For The Game

No fun allowed. Fixes #2616

Testing Photographs and Procedure

Screenshots&Videos
NSV.13._.Official._.MRP._.98.Free.Lag._.Spaceship.Combat.Server_.NSV.Dionysias.2024-05-20.14-40-48.mp4

Changelog

🆑
fix: fix borgs duplicating ammunition in deck turret and PDC
/:cl:

@IndusRobot IndusRobot changed the title fix borgs duplicating ammunition Fixes borgs duplicating ammunition with the munition clamp upgrade May 20, 2024
tontyGH
tontyGH reviewed May 22, 2024
View reviewed changes
Copy link
Contributor

@tontyGH tontyGH left a comment

Choose a reason for hiding this comment

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

Would prefer if this wasn't spaced in such a strange way

nsv13/code/modules/munitions/ship_weapons/_ship_weapon.dm Show resolved Hide resolved
nsv13/code/modules/munitions/ship_weapons/_ship_weapon.dm Show resolved Hide resolved
nsv13/code/modules/munitions/ship_weapons/ballistic_weapons/deck_guns.dm Show resolved Hide resolved
@Bokkiewokkie Bokkiewokkie added Fix Active Test Merge Munitions Issues and pull requests related to munitions. labels May 24, 2024
@Bokkiewokkie Bokkiewokkie merged commit 57cd724 into BeeStation:master Jun 14, 2024
9 checks passed
ss13-beebot added a commit that referenced this pull request Jun 14, 2024
@ss13-beebot
Automatic changelog generation for PR #2657 [ci skip]
0681152
Pockets-byte pushed a commit to Pockets-byte/NSV13 that referenced this pull request Jul 18, 2024
@IndusRobot @Pockets-byte
Fixes borgs duplicating ammunition with the munition clamp upgrade (B…
10943a9 
…eeStation#2657)
Pockets-byte pushed a commit to Pockets-byte/NSV13 that referenced this pull request Jul 18, 2024
@ss13-beebot @Pockets-byte
Automatic changelog generation for PR BeeStation#2657 [ci skip]
3c78a02
Pockets-byte added a commit to Pockets-byte/NSV13 that referenced this pull request Jul 18, 2024
@Pockets-byte
Squashed commit of the following:
57ff137 
commit 945041d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Tue Jul 16 00:15:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 9cb02c5
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 22:04:04 2024 +0000

    Automatic changelog compile [ci skip]

commit 939793d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:38:11 2024 -0500

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

commit ae25ec5
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:37:35 2024 -0300

    Fixes small typo in the NC reminder (BeeStation#2692)

commit c649dea
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:37:02 2024 -0500

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

commit 8a2a79d
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:36:22 2024 -0300

    Re-adds the basic plasma cutter back into its respective node. (BeeStation#2689)

commit dfeb981
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 19:03:52 2024 +0000

    Automatic changelog compile [ci skip]

commit 284e333
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:13:22 2024 -0500

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

commit 5408a33
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:12:43 2024 +0200

    Only /overmaps are passed to after_enter() (BeeStation#2678)

commit 1c03630
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:12:12 2024 -0500

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

commit ffed942
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:11:57 2024 -0500

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

commit f3bbe83
Author: Kenionatus <kenionatus@techie.com>
Date:   Fri Jul 12 20:11:33 2024 +0200

    Sort projectiles fx.dm better (BeeStation#2675)

commit 08f874b
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:10:55 2024 +0200

    Improves a little bit of cursed weapon code (BeeStation#2676)

commit 7b2eb24
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 18:05:04 2024 +0000

    Automatic changelog compile [ci skip]

commit c445ae1
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:00:46 2024 -0500

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

commit c5326c6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jul 12 20:00:09 2024 +0200

    Makes shields hits only spawn one visual (which is actually aligned with the ship) (BeeStation#2681)

commit 580f275
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 17:04:00 2024 +0000

    Automatic changelog compile [ci skip]

commit ac2fc1c
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:54:55 2024 -0500

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

commit 9ea99c5
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:54:19 2024 -0600

    adds a playable solgov fighter, and a fighter lasercannon  (BeeStation#2671)

commit c649731
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:52:43 2024 -0500

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

commit 6ced45c
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:52:00 2024 -0600

    Adds a solgov variant of the squad vendor (BeeStation#2669)

commit ee6f637
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 22:04:41 2024 +0000

    Automatic changelog compile [ci skip]

commit e5ceeaf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 16:16:16 2024 -0500

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

commit 6337c91
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 5 15:15:36 2024 -0600

    Adds relayed laser projectiles (BeeStation#2670)

    Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>

commit e7abbcc
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 00:14:35 2024 +0000

    Automatic changelog compile [ci skip]

commit 03f4807
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 19:04:11 2024 +0000

    Automatic changelog compile [ci skip]

commit 3d87385
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 13:51:16 2024 -0500

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

commit 2b48323
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 28 20:50:39 2024 +0200

    Removes integrity failure value from all overmap entities (BeeStation#2663)

commit e1004ae
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sun Jun 23 00:15:57 2024 +0000

    Automatic changelog compile [ci skip]

commit 0ee1b10
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 22:04:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 386288e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:50:06 2024 -0500

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

commit 879aea1
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:49:26 2024 +0200

    Updates the armour pumps to account for lag properly (BeeStation#2668)

commit f844e33
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:48:40 2024 -0500

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

commit 501304d
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 21 14:48:04 2024 -0700

    Atlas Armor Alterations (BeeStation#2661)

commit aaf1109
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:46:25 2024 -0500

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

commit cf8d193
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:45:49 2024 +0200

    Properly registers small craft in overmap ships and fixes sscrit explosions (BeeStation#2653)

commit 56ee105
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 00:14:15 2024 +0000

    Automatic changelog compile [ci skip]

commit 6d0981e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 21:03:53 2024 +0000

    Automatic changelog compile [ci skip]

commit 48d538a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:31:57 2024 -0500

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

commit 2b0d18c
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 14 13:31:22 2024 -0700

    Even more Atlas Mapping Fixes (BeeStation#2665)

commit b31ef9d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jun 14 22:23:33 2024 +0200

    Bump braces from 3.0.2 to 3.0.3 in /tgui (BeeStation#2682)

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit cfe0108
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:55 2024 -0500

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

commit 0b47f83
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:48 2024 -0500

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

commit a6a4a7c
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:21:17 2024 -0600

    Fixes Shells are not appropriately handling the presence of powder bags. (BeeStation#2659)

commit 01caa93
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:21:05 2024 +0200

    Adds the ability to (de)construct pool ladders (BeeStation#2660)

commit 0681152
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:20:01 2024 -0500

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

commit 9657baf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:19:26 2024 -0500

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

commit 57cd724
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:19:21 2024 -0600

    Fixes borgs duplicating ammunition with the munition clamp upgrade (BeeStation#2657)

commit 37579a6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:18:48 2024 +0200

    Fixes some Engineering design issues and Hangar airlocks on Gladius (BeeStation#2658)

commit 0c4a4ff
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 19:04:57 2024 +0000

    Automatic changelog compile [ci skip]

commit cf293ae
Author: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date:   Fri Jun 14 20:29:29 2024 +0200

    Updates forgotten armor values and syndicate armor stacking during boarding (BeeStation#2638)

commit 4a8b53a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 13:23:36 2024 -0500

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

commit d067eee
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 14 20:22:52 2024 +0200

    Adds digitigrade robotic legs (BeeStation#2646)

commit afe5367
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 16:04:03 2024 +0000

    Automatic changelog compile [ci skip]
Pockets-byte pushed a commit to Pockets-byte/NSV13 that referenced this pull request Jul 18, 2024
@DeltaFire15 @Pockets-byte
I don't know what I'm doing
b5e13c0 
help

Co-Authored-By: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Co-Authored-By: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

test

Squashed commit of the following:

commit 945041d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Tue Jul 16 00:15:00 2024 +0000

    Automatic changelog compile [ci skip]

commit 9cb02c5
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 22:04:04 2024 +0000

    Automatic changelog compile [ci skip]

commit 939793d
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:38:11 2024 -0500

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

commit ae25ec5
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:37:35 2024 -0300

    Fixes small typo in the NC reminder (BeeStation#2692)

commit c649dea
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sat Jul 13 16:37:02 2024 -0500

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

commit 8a2a79d
Author: riquewright <123000630+riquewright@users.noreply.github.com>
Date:   Sat Jul 13 18:36:22 2024 -0300

    Re-adds the basic plasma cutter back into its respective node. (BeeStation#2689)

commit dfeb981
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 19:03:52 2024 +0000

    Automatic changelog compile [ci skip]

commit 284e333
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:13:22 2024 -0500

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

commit 5408a33
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:12:43 2024 +0200

    Only /overmaps are passed to after_enter() (BeeStation#2678)

commit 1c03630
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:12:12 2024 -0500

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

commit ffed942
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:11:57 2024 -0500

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

commit f3bbe83
Author: Kenionatus <kenionatus@techie.com>
Date:   Fri Jul 12 20:11:33 2024 +0200

    Sort projectiles fx.dm better (BeeStation#2675)

commit 08f874b
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jul 12 20:10:55 2024 +0200

    Improves a little bit of cursed weapon code (BeeStation#2676)

commit 7b2eb24
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 18:05:04 2024 +0000

    Automatic changelog compile [ci skip]

commit c445ae1
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 13:00:46 2024 -0500

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

commit c5326c6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jul 12 20:00:09 2024 +0200

    Makes shields hits only spawn one visual (which is actually aligned with the ship) (BeeStation#2681)

commit 580f275
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 17:04:00 2024 +0000

    Automatic changelog compile [ci skip]

commit ac2fc1c
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:54:55 2024 -0500

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

commit 9ea99c5
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:54:19 2024 -0600

    adds a playable solgov fighter, and a fighter lasercannon  (BeeStation#2671)

commit c649731
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 12 11:52:43 2024 -0500

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

commit 6ced45c
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 12 10:52:00 2024 -0600

    Adds a solgov variant of the squad vendor (BeeStation#2669)

commit ee6f637
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 22:04:41 2024 +0000

    Automatic changelog compile [ci skip]

commit e5ceeaf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 16:16:16 2024 -0500

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

commit 6337c91
Author: ᛈᛟᚲᚲᛖᛏᛋ <55299415+Pockets-byte@users.noreply.github.com>
Date:   Fri Jul 5 15:15:36 2024 -0600

    Adds relayed laser projectiles (BeeStation#2670)

    Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>

commit e7abbcc
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jul 5 00:14:35 2024 +0000

    Automatic changelog compile [ci skip]

commit 03f4807
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 19:04:11 2024 +0000

    Automatic changelog compile [ci skip]

commit 3d87385
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 28 13:51:16 2024 -0500

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

commit 2b48323
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 28 20:50:39 2024 +0200

    Removes integrity failure value from all overmap entities (BeeStation#2663)

commit e1004ae
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Sun Jun 23 00:15:57 2024 +0000

    Automatic changelog compile [ci skip]

commit 0ee1b10
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 22:04:33 2024 +0000

    Automatic changelog compile [ci skip]

commit 386288e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:50:06 2024 -0500

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

commit 879aea1
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:49:26 2024 +0200

    Updates the armour pumps to account for lag properly (BeeStation#2668)

commit f844e33
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:48:40 2024 -0500

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

commit 501304d
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 21 14:48:04 2024 -0700

    Atlas Armor Alterations (BeeStation#2661)

commit aaf1109
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 16:46:25 2024 -0500

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

commit cf8d193
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 21 23:45:49 2024 +0200

    Properly registers small craft in overmap ships and fixes sscrit explosions (BeeStation#2653)

commit 56ee105
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 21 00:14:15 2024 +0000

    Automatic changelog compile [ci skip]

commit 6d0981e
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 21:03:53 2024 +0000

    Automatic changelog compile [ci skip]

commit 48d538a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:31:57 2024 -0500

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

commit 2b0d18c
Author: SerynEngi <75588150+SerynEngi@users.noreply.github.com>
Date:   Fri Jun 14 13:31:22 2024 -0700

    Even more Atlas Mapping Fixes (BeeStation#2665)

commit b31ef9d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jun 14 22:23:33 2024 +0200

    Bump braces from 3.0.2 to 3.0.3 in /tgui (BeeStation#2682)

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit cfe0108
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:55 2024 -0500

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

commit 0b47f83
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:21:48 2024 -0500

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

commit a6a4a7c
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:21:17 2024 -0600

    Fixes Shells are not appropriately handling the presence of powder bags. (BeeStation#2659)

commit 01caa93
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:21:05 2024 +0200

    Adds the ability to (de)construct pool ladders (BeeStation#2660)

commit 0681152
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:20:01 2024 -0500

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

commit 9657baf
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 15:19:26 2024 -0500

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

commit 57cd724
Author: IndusRobot <whiz_kid10@yahoo.com>
Date:   Fri Jun 14 14:19:21 2024 -0600

    Fixes borgs duplicating ammunition with the munition clamp upgrade (BeeStation#2657)

commit 37579a6
Author: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com>
Date:   Fri Jun 14 22:18:48 2024 +0200

    Fixes some Engineering design issues and Hangar airlocks on Gladius (BeeStation#2658)

commit 0c4a4ff
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 19:04:57 2024 +0000

    Automatic changelog compile [ci skip]

commit cf293ae
Author: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date:   Fri Jun 14 20:29:29 2024 +0200

    Updates forgotten armor values and syndicate armor stacking during boarding (BeeStation#2638)

commit 4a8b53a
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 13:23:36 2024 -0500

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

commit d067eee
Author: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
Date:   Fri Jun 14 20:22:52 2024 +0200

    Adds digitigrade robotic legs (BeeStation#2646)

commit afe5367
Author: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com>
Date:   Fri Jun 14 16:04:03 2024 +0000

    Automatic changelog compile [ci skip]

Revert "Squashed commit of the following:"

This reverts commit 57ff137.

Revert "test"

This reverts commit 0ee8584.

Revert "I don't know what I'm doing"

This reverts commit 197c80d.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tontyGH tontyGH tontyGH left review comments

@Bokkiewokkie Bokkiewokkie Bokkiewokkie approved these changes

Assignees
No one assigned
Labels
Active Test Merge Fix Munitions Issues and pull requests related to munitions.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Borg munitions upgrade duplicates gunpowder
3 participants
@IndusRobot @tontyGH @Bokkiewokkie