8000 Expanded mortar & laser designator usage by BonniePandora · Pull Request #817 · cmss13-devs/cmss13-pve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Expanded mortar & laser designator usage #817

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
Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Expanded mortar & laser designator usage #817

wants to merge 8 commits into from

Conversation

BonniePandora
Copy link
Contributor
@BonniePandora BonniePandora commented Mar 3, 2025 •
edited
Loading

About the pull request

Enables the usage of the M402 mortar system on shipmaps depending on the level of ceiling present. CEILING_HULL_METAL gives a fitting description whilst not being super-reinforced, for mappers

The laser designator can now laze targets under a sight-blocking roof, so long as the user is in the open or under a roof that allows vision with assets above. Something something the designator or dropship computers calculates C

Explain why it's good for the game

Means the mortar pit on the likes of firebase zulu can now be used without having to rely on GM fuckery to get a close immitation.
Designators being able to laze targets under roofs means the HIMAT isn't worthless in a build up area

Testing Photographs and Procedure

Compiles without issue, tested locally & works as expected
image
image

Changelog

🆑 Pandora029
balance: The M402 mortar & rangefinding functions can now be used on the ship map, so long as the ceiling isn't too tough
balance: Laser designators can now laze targets that are under a roof, so long as the user themselves are in the open
/:cl:

@cmss13-ci cmss13-ci bot added the Balance label Mar 3, 2025
@Staykeu Staykeu mentioned this pull request Mar 3, 2025
Closed
3 tasks
@nauticall
Copy link
Contributor

Should probably make it depend on ceiling or a map specific flag? It feels a bit weird even under extraordinary circumstances (like ship boardings) to launch a mortar inside a spaceship.

@BonniePandora
Copy link
Contr 8000 ibutor Author

Should probably make it depend on ceiling or a map specific flag? It feels a bit weird even under extraordinary circumstances (like ship boardings) to launch a mortar inside a spaceship.

Oh this was done mostly for the likes of firebase zulu where the ship-map is ostensibly a map on the surface of a world
If I was gonna make this something to be used on all maps I'd uh, redo it to check for that, aye
Isn't like mortars are issued all that often enough by GMs for it to be much of a concern for someone to set up the tube and pop off a round on the Garrow though

AndroBetel
AndroBetel requested changes Mar 6, 2025
View reviewed changes
@AndroBetel AndroBetel marked this pull request as draft March 17, 2025 14:43
@cm13-github
Copy link
Contributor
cm13-github commented Mar 28, 2025 •
edited
Loading

Test merge deployment history:

Test Merge Deployed @ 03/28/2025 00:26:40 +00:00:
Server Instance

PVECM: Green

Merged By

MessageCypher

Revision

Origin: 934ac37
Pull Request: 4612daf
Server: a92c9333a731ef7cf92fc613c7c7ad1d0ea9d1ad

Test Merge Updated @ 03/28/2025 19:37:19 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 934ac37
Pull Request: 4612daf
Server: 5347eeb013df16765c5ce3b20ad0678abf10c750

Test Merge Removed @ 03/30/2025 01:53:23 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/13/2025 14:39:20 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: bf4ec68
Server: c97cad73658f2f050c5fb1fccd132862cf755d8c

Test Merge Updated @ 04/13/2025 14:43:55 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: bf4ec68
Server: 40c318c79ce3412b26004ade753b16c8a092eb1b

Test Merge Updated @ 04/13/2025 15:15:00 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: bf4ec68
Server: 38aec3653bb5dfc18babb9441ad4d3c7fdb324dc

Test Merge Deployed @ 04/13/2025 19:58:57 +00:00:
Server Instance

PVECM: Blue

Merged By

Merrgear

Revision

Origin: 785d59a
Pull Request: bf4ec68
Server: 53f3a8108ae50a31874597b708ea9f77db2d4451

Test Merge Updated @ 04/14/2025 00:33:18 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: a0c6796
Pull Request: bf4ec68
Server: 83d71aae1dd3f2f4d63a4d8341ee472d30ad65e9

Test Merge Removed @ 04/15/2025 00:16:11 +00:00:
Server Instance

PVECM: Red

Test Merge Removed @ 04/15/2025 19:50:13 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 04/25/2025 00:27:05 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 20ee98d
Pull Request: bf4ec68
Server: 019c6f56236df01d33ebe222518f623e8eac2080

Test Merge Removed @ 04/25/2025 16:01:23 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/01/2025 05:10:32 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 099cc3ba8a5d9b048d4f7aa0531786e7dd08c082

Test Merge Updated @ 05/01/2025 05:13:00 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: babce68d6ed918ac515c1d4d4548382ca9ce43a3

Test Merge Removed @ 05/01/2025 19:02:39 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/03/2025 21:51:48 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 7f26ef8e798fc52e78e06e9628339e3cc705feca

Test Merge Updated @ 05/03/2025 22:01:19 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: bc3e1b55eb3e540f52f10d1ab62e3e073e4ae147

Test Merge Removed @ 05/03/2025 23:51:00 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 05/04/2025 09:37:51 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: ff89a897734e72821ade6fd0e478fb9fcfb3d88d

Test Merge Updated @ 05/04/2025 09:50:40 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 0cd74f101f1577c8fd35254aac91791f34596114

Test Merge Updated @ 05/04/2025 12:38:24 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 14c2791608097ea9f13bddc1b33a25df3e5206dc

Test Merge Updated @ 05/04/2025 13:06:25 +00:00:
Server Instance

PVECM: Red

Merged By

Athena14

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 34f4eeab12a3c8322f63a7164f5d7524cba97f0e

Test Merge Updated @ 05/04/2025 16:44:39 +00:00:
Server Instance

PVECM: Red

Merged By

Some Random Username

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 533072c0bf112c3f62cea054f964f0ddd5799540

Test Merge Updated @ 05/05/2025 12:16:30 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 7e020da
Pull Request: bf4ec68
Server: 6eadf3094bef54308cf9b5470e87b67fd1346754

Test Merge Updated @ 05/07/2025 02:44:54 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: acb3f60
Pull Request: bf4ec68
Server: e922cdd9ee2e67676b7713fbe7eae6a10ffd23a2

Test Merge Updated @ 05/07/2025 06:26:29 +00:00:
Server Instance

PVECM: Red

Merged By

EmiSol

Revision

Origin: acb3f60
Pull Request: bf4ec68
Server: ca82548590e500162f5ded8bb2215abe2e54bed8

Test Merge Updated @ 05/07/2025 07:34:49 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: acb3f60
Pull Request: bf4ec68
Server: b6eeb09c4ff7847ca4c42ec669836e5c3dd668cd

Test Merge Updated @ 05/07/2025 13:16:49 +00:00:
Server Instance

PVECM: Red

Merged By

Pandora029

Revision

Origin: acb3f60
Pull Request: bf4ec68
Server: 74d012034293a277a622dbbd528f8c4b84afa4a0

Test Merge Updated @ 05/08/2025 13:32:03 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: e522938
Pull Request: bf4ec68
Server: f03c29e82220a18062b02fdfd6f1e2e679ceeb05

Test Merge Removed @ 05/08/2025 21:46:47 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 05/08/2025 23:44:19 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 07f897a
Pull Request: bf4ec68
Server: e212c45813cc8c0904c98df0ae9b692d321a10af

Test Merge Updated @ 05/08/2025 23:46:33 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: 07f897a
Pull Request: bf4ec68
Server: d0e7cc106af78469fc470078c460cc640c3d7079

Test Merge Updated @ 05/09/2025 22:12:03 +00:00:
Server Instance

PVECM: Green

Merged By

Merrgear

Revision

Origin: 907dec9
Pull Request: bf4ec68
Server: 57cc8423ac237586b2f250a7ea10ad005a596969

Test Merge Deployed @ 05/10/2025 04:39:54 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 907dec9
Pull Request: bf4ec68
Server: 910565ba379d4d12652a2648092e3c1bf70ae03a

Test Merge Removed @ 05/10/2025 18:59:00 +00:00:
Server Instance

PVECM: Green

Test Merge Removed @ 05/11/2025 21:06:52 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 05/12/2025 14:03:20 +00:00:
Server Instance

PVECM: Green

Merged By

Xan

Revision

Origin: 907dec9
Pull Request: bf4ec68
Server: 12c68ca958ddb82d304cb3a07d439c5de23c0067

Test Merge Removed @ 05/13/2025 14:25:40 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/15/2025 14:18:48 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: a3dbcb7
Pull Request: bf4ec68
Server: fcb24448a4c704aa55881c5ca254b05a00db07b1

Test Merge Removed @ 05/16/2025 00:05:49 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 05/20/2025 08:57:01 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c33d5a0
Pull Request: bf4ec68
Server: 88a78d48f439753914a74b706817d61f8a1acd73

Test Merge Updated @ 05/21/2025 07:38:34 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: 4285d93d1df4ac7167e6b971ccd41fee38fd4cbc

Test Merge Updated @ 05/21/2025 07:52:52 +00:00:
Server Instance

PVECM: Green

Merged By

AndroBetel

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: e47ba20a9cad5d5216c3482dbcd7288911aeea0f

Test Merge Updated @ 05/21/2025 11:14:16 +00:00:
Server Instance

PVECM: Green

Merged By

Suno

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: b54b23a783c64109fde797632c4128dde7326216

Test Merge Updated @ 05/21/2025 14:10:21 +00:00:
Server Instance

PVECM: Green

Merged By

Suno

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: 1bd55ca8591fbc9280cc08054e584c0d036327c5

Test Merge Updated @ 05/22/2025 15:03:46 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: b18d285822e4696c3f07c30692557f36991ca576

Test Merge Updated @ 05/22/2025 15:15:54 +00:00:
Server Instance

PVECM: Green

Merged By

Suno

Revision

Origin: 7136ecf
Pull Request: bf4ec68
Server: cc948356549a168b687af517b76d413edf8e6b03

Test Merge Removed @ 05/22/2025 20:19:51 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/24/2025 12:55:34 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: 1c66ba4
Pull Request: bf4ec68
Server: d3d6950aaa68ae570f6fdf420b0a6f8ca61d001c

Test Merge Removed @ 05/25/2025 00:25:15 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/25/2025 23:50:09 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: e660c4e
Pull Request: bf4ec68
Server: 0d357e1be745bd6a566145d00951292255721428

Test Merge Removed @ 05/26/2025 04:26:46 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/26/2025 10:48:40 +00:00:
Server Instance

PVECM: Blue

Merged By

Eonoc

Revision

Origin: e660c4e
Pull Request: bf4ec68
Server: fce3521933499bceb56b6abd9b11e1611e4696bd

Test Merge Updated @ 05/26/2025 18:04:12 +00:00:
Server Instance

PVECM: Blue

Merged By

Warfan

Revision

Origin: e660c4e
Pull Request: bf4ec68
Server: 5e41a44db3db893720ee63f49558468b41f90df2

Test Merge Removed @ 05/26/2025 18:20:58 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 05/27/2025 05:09:37 +00:00:
Server Instance

PVECM: Green

Merged By

Eonoc

Revision

Origin: dd93556
Pull Request: bf4ec68
Server: 52e5832c242c4a8256db4d02c88eec332ef493c4

Test Merge Updated @ 05/27/2025 05:14:16 +00:00:
Server Instance

PVECM: Green

Merged By

Eonoc

Revision

Origin: dd93556
Pull Request: bf4ec68
Server: c7ca3a70fb2a5830c1b8373dbb15f7bcdfb16b44

Test Merge Updated @ 05/27/2025 13:21:29 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: dd93556
Pull Request: bf4ec68
Server: 292bc5f4a2e791f29405f772c9d7629318999a19

Test Merge Updated @ 05/27/2025 16:58:21 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: dd93556
Pull Request: bf4ec68
Server: b227c0d248c5680db86b2209a582291b339bc8b7

Test Merge Updated @ 05/27/2025 19:35:24 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 4f91864
Pull Request: bf4ec68
Server: 5cea54afcadd6201a47f1dda3ae60710a6ea01e6

Test Merge Removed @ 05/27/2025 22:41:20 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 05/28/2025 18:12:51 +00:00:
Server Instance

PVECM: Green

Merged By

EmiSol

Revision

Origin: 0fe7029
Pull Request: bf4ec68
Server: 2472877b911782574dc81fd48abce8b86f6a2e50

Test Merge Deployed @ 05/29/2025 01:03:44 +00:00:
Server Instance

PVECM: Red

Merged By

Karmac

Revision

Origin: 0fe7029
Pull Request: bf4ec68
Server: 1440032fc76c6848657121c6c3149432e1705964

Test Merge Removed @ 05/29/2025 05:38:10 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 05/29/2025 06:36:30 +00:00:
Server Instance

PVECM: Green

Merged By

Eonoc

Revision

Origin: 0fe7029
Pull Request: bf4ec68
Server: f018f078c9c7303386d20b7038c994708b7c5fdf

Test Merge Deployed @ 05/29/2025 08:33:16 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 0fe7029
Pull Request: bf4ec68
Server: d3775b7a704328058455599020192ed3371e35bb

Test Merge Updated @ 05/29/2025 13:21:06 +00:00:
Server Instance

PVECM: Green

Merged By

Suno

Revision

Origin: 0fe7029
Pull Request: bf4ec68
Server: 783a1f6e0f6a1cc0fdd21b14c16552a6cf3e85db

Test Merge Removed @ 05/29/2025 19:08:13 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 05/29/2025 23:51:49 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: 75811db
Pull Request: bf4ec68
Server: 18b889b62bcb49c303391b356b6cb66e2164f0aa

Test Merge Updated @ 05/30/2025 09:57:16 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 75811db
Pull Request: bf4ec68
Server: bbb9d0aab0b1c7ae2de9ff01aafaa10a7cf028d9

Test Merge Updated @ 05/31/2025 01:51:50 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 75811db
Pull Request: bf4ec68
Server: 8786f9607261c1ca82ec3f1daff59d3695b396d1

Test Merge Updated @ 05/31/2025 12:29:27 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 75811db
Pull Request: bf4ec68
Server: 76e2912e65a5ee6e8c0cb009391542e84f40b76a

Test Merge Updated @ 06/01/2025 14:32:10 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 03c3e8d
Pull Request: bf4ec68
Server: bad219923f847f43202ed836757ce6df3df616a0

Test Merge Updated @ 06/01/2025 14:46:30 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 03c3e8d
Pull Request: bf4ec68
Server: e5942d637db46bd9ace76ad7ab5af3bb1176d485

Test Merge Updated @ 06/01/2025 15:04:29 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 03c3e8d
Pull Request: bf4ec68
Server: cb97163a5199842b2c636986b9a126a026c1a58c

Test Merge Updated @ 06/01/2025 15:24:00 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 03c3e8d
Pull Request: bf4ec68
Server: 611c8881ff1d4a32a8fe35930a91cad93526252c

Test Merge Deployed @ 06/01/2025 15:35:09 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 03c3e8d
Pull Request: bf4ec68
Server: 5185432b7d977d17845355e0d3925d6763991e70

Test Merge Updated @ 06/01/2025 18:31:15 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 915f964
Pull Request: bf4ec68
Server: 2c3d765343d7d16abe351fa769906a903dc2d47a

Test Merge Updated @ 06/01/2025 18:56:41 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: 7b9adb0
Pull Request: bf4ec68
Server: d3ad9307253434c1deaaf83b9483706532f46916

Test Merge Updated @ 06/01/2025 19:15:23 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: 7b9adb0
Pull Request: bf4ec68
Server: cd48b2642eddcfab19580bfb8f2580cd57761de1

Test Merge Updated @ 06/02/2025 05:40:13 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 7b9adb0
Pull Request: bf4ec68
Server: 883429de99639908731e01def73ad5efc6323d8d

Test Merge Updated @ 06/02/2025 09:28:49 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 7b9adb0
Pull Request: bf4ec68
Server: 1ce1ae389d6a2fb7c299f393cde56d50819439a3

Test Merge Removed @ 06/02/2025 18:37:22 +00:00:
Server Instance

PVECM: Blue

Test Merge Updated @ 06/03/2025 05:06:41 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: ed74cd0c263c1ab73b04e0655c1af934e4c8ceca

Test Merge Deployed @ 06/03/2025 10:46:11 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: fb3e908c0a4505f710265d9550e999a6ae1183a2

Test Merge Updated @ 06/03/2025 11:09:35 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 2ef798370da85a21bd31f1b19357cf8f68901d59

Test Merge Updated @ 06/03/2025 14:47:09 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 4c1dc0a5987274df1fe3e5583a205e0af4d1fc7b

Test Merge Updated @ 06/04/2025 00:44:28 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: de991ffae3bd35eee8c1e923f9a9cb3a3a4fa1f7

Test Merge Updated @ 06/04/2025 02:05:31 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 9f0bb2f5b67c2af530d97e688dbb46755c8f8731

Test Merge Removed @ 06/04/2025 03:11:54 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/04/2025 07:46:02 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 971af2cb191304e505bca08bacc7c8ee3beb9189

Test Merge Updated @ 06/04/2025 08:05:49 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 213d6ada76d0d94627ba08fa8182e2aa0a6f4e79

Test Merge Updated @ 06/04/2025 08:20:12 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 5c5f78b09ea1b49a2796dc53149ab6dcbba64d1b

Test Merge Updated @ 06/04/2025 08:50:32 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: d83c25df5774af0fc53bc8e793ebd9b6646118eb

Test Merge Updated @ 06/04/2025 14:16:30 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 67a1d4a1c141181000da52f03a3f740f785943ca

Test Merge Updated @ 06/04/2025 19:54:44 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: c0d8100
Pull Request: bf4ec68
Server: 17ba9008a95fc909a3d9599bd1f511507d3b621e

Test Merge Removed @ 06/04/2025 19:57:33 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/05/2025 05:52:34 +00:00:
Server Instance

PVECM: Blue

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: c3a679c29fb4644f251689e79d5083f312b4abb6

Test Merge Updated @ 06/05/2025 11:23:53 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: 9782b5f002a948c7621e3d78983cfd573598a16d

Test Merge Updated @ 06/05/2025 11:34:14 +00:00:
Server Instance

PVECM: Blue

Merged By

SpartanBobby

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: e72fe1ee04c83db981009b854f3133803716d91a

Test Merge Updated @ 06/05/2025 17:32:38 +00:00:
Server Instance

PVECM: Blue

Merged B 10000 y

SpartanBobby

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: a166758920460f2c4d30b03a15367d8e58fe8eb0

Test Merge Removed @ 06/05/2025 20:17:26 +00:00:
Server Instance

PVECM: Blue

Test Merge Deployed @ 06/07/2025 05:53:32 +00:00:
Server Instance

PVECM: Red

Merged By

Karmac

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: 092417d92211387bece50c477320e426488283ed

Test Merge Removed @ 06/07/2025 10:02:14 +00:00:
Server Instance

PVECM: Red

Test Merge Deployed @ 06/07/2025 15:16:59 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: 0ccfd65b4d6efa85ab2c00160e32e1fd2004c886

Test Merge Updated @ 06/07/2025 18:12:22 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: a4c64001ee8b4d6754aed96a47e44c2e8ff54c32

Test Merge Updated @ 06/07/2025 20:42:59 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: 739e709d1123397a327bec024e234233986a8659

Test Merge Updated @ 06/08/2025 01:07:12 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: c0d8100
Pull Request: 1d0b4b6
Server: 2b1534e5143b20da78443332799245114e9d5a09

Test Merge Removed @ 06/08/2025 09:59:12 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/09/2025 01:33:18 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: ed25a470ab2d1218c7e8cea7b0297e3806898c1a

Test Merge Updated @ 06/09/2025 01:37:20 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 5c946353af05a8a77fbe601bf70885d301687730

Test Merge Updated @ 06/09/2025 07:58:18 +00:00:
Server Instance

PVECM: Blue

Merged By

twizzums

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 83a4fe5eba0ea9d14ebb0b4c274d4fad8996adf1

Test Merge Updated @ 06/09/2025 13:41:13 +00:00:
Server Instance

PVECM: Blue

Merged By

Karmac

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 1eb29c59debd8b90edcc83bae2dd868a71d0371a

Test Merge Updated @ 06/09/2025 16:56:12 +00:00:
Server Instance

PVECM: Blue

Merged By

Xan

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 0a754cb5ae15e33f3f33ba649a4502e02a0a004c

Test Merge Updated @ 06/10/2025 15:13:22 +00:00:
Server Instance

PVECM: Blue

Merged By

twizzums

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 390ea44fe23d49ee191da4dc053be4f0696f6b7c

Test Merge Updated @ 06/11/2025 14:39:26 +00:00:
Server Instance

PVECM: Blue

Merged By

Emilitia Ennehrt

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 140ab188f5091d0da1941d47333394d9fe612ff7

Test Merge Deployed @ 06/11/2025 14:43:44 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 443594b5d7227ebb96bd25896ffaadf1b540b130

Test Merge Updated @ 06/11/2025 18:38:19 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: 082ebcbb26e31d5729ff2cc1ef7e9766ec53a372

Test Merge Updated @ 06/12/2025 03:00:18 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: f6bb84b75aea655979378b8f12a92ce2e5783701

Test Merge Deployed @ 06/12/2025 07:58:27 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: af0029e8538af318f8cd00ef840a1a9a48198611

Test Merge Updated @ 06/12/2025 10:46:46 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 620f2c5
Pull Request: 1d0b4b6
Server: c08687c7f25a8ce4e6c2d8d141846ce767f5049a

Test Merge Removed @ 06/12/2025 15:23:27 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/13/2025 03:33:52 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 0afa75e
Pull Request: 1d0b4b6
Server: bf1d08281f47c1528ea6bc3482509a1af03ed234

Test Merge Updated @ 06/13/2025 18:36:53 +00:00:
Server Instance

PVECM: Red

Merged By

twizzums

Revision

Origin: 99b8e3d
Pull Request: 1d0b4b6
Server: 8e91af1fd556739d8d0d0485b6d8ce63c41a764d

Test Merge Updated @ 06/14/2025 01:33:07 +00:00:
Server Instance

PVECM: Red

Merged By

shorttemperedleprech

Revision

Origin: 99b8e3d
Pull Request: 1d0b4b6
Server: 11955d1cd320449c9a70bd5dbefaa6fd991fbd1d

Test Merge Updated @ 06/14/2025 21:00:30 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: 1081311
Pull Request: 1d0b4b6
Server: 17e1bd3ec5ad04540fc0a8699d892e3e60c263cd

Test Merge Updated @ 06/15/2025 05:52:42 +00:00:
Server Instance

PVECM: Red

Merged By

Emilitia Ennehrt

Revision

Origin: 1081311
Pull Request: 1d0b4b6
Server: bd77be32544615b4bbcbd8c536e530b4aa176ea4

Test Merge Deployed @ 06/15/2025 13:18:49 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 1081311
Pull Request: 1d0b4b6
Server: 946021f0e6656b2e778237a0ee7cad62bf1f8fd9

Test Merge Updated @ 06/15/2025 13:19:55 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 1081311
Pull Request: 1d0b4b6
Server: 6a69fd99554d603fb1a31f3cddde987f5be09d41

Test Merge Removed @ 06/15/2025 16:28:35 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/16/2025 01:31:54 +00:00:
Server Instance

PVECM: Blue

Merged By

Pandora029

Revision

Origin: 1081311
Pull Request: 1d0b4b6
Server: 1336b5e7252083fab18440b98c8ad87d2055012b

Test Merge Deployed @ 06/16/2025 09:03:09 +00:00:
Server Instance

PVECM: Green

Merged By

twizzums

Revision

Origin: 4652094
Pull Request: 1d0b4b6
Server: 9084499fc911e6cfdd3faa875ec5d40d7f4c4e55

Test Merge Updated @ 06/16/2025 14:16:24 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: 85f9cee1e25ed6c524d02a425f19bcbf7c03bff5

Test Merge Removed @ 06/16/2025 14:24:57 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 06/16/2025 14:26:39 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: c51b153c4d7852435e89a8ab396f818a9156d7a8

Test Merge Updated @ 06/16/2025 19:12:56 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: 56390cb80f724904605de298a4ccd432c6a9206a

Test Merge Updated @ 06/17/2025 00:18:20 +00:00:
Server Instance

PVECM: Blue

Merged By

Rob606

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: ae7841fb4de5d182aa2185600ad3dd68d9c1a02c

Test Merge Updated @ 06/17/2025 07:56:27 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: 37674d958b349ae133b11d56e3970f52ee9a11bb

Test Merge Updated @ 06/17/2025 12:44:58 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 91b90b6
Pull Request: 1d0b4b6
Server: b0711c0043398847f3bf292244c8c318b7dfd160

Test Merge Removed @ 06/17/2025 23:37:01 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/18/2025 03:03:45 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 87763d1
Pull Request: 1d0b4b6
Server: 362448e21ee93279bb17254c6a0e98dd9e489668

Test Merge Updated @ 06/18/2025 23:31:23 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 87763d1
Pull Request: 1d0b4b6
Server: 64bc7632c826d0be60c87bc50d0303c75706aa48

Test Merge Deployed @ 06/20/2025 10:31:44 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 3ee4d1c
Pull Request: 1d0b4b6
Server: 72bdff7b81690e1f6c7b29b3836253d902f1b047

Test Merge Deployed @ 06/20/2025 16:02:00 +00:00:
Server Instance

PVECM: Red

Merged By

StinkethStonketh

Revision

Origin: 6164265
Pull Request: 1d0b4b6
Server: c4d76df0951db83fa485337ff922e627dd39f67c

Test Merge Updated @ 06/20/2025 16:20:30 +00:00:
Server Instance

PVECM: Red

Merged By

StinkethStonketh

Revision

Origin: 6164265
Pull Request: 1d0b4b6
Server: 00c69c9ee5d3349743561db1e9bbf8949d6ab6b4

Test Merge Removed @ 06/20/2025 16:36:00 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/20/2025 18:56:53 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 6164265
Pull Request: 1d0b4b6
Server: adbb46e8d4a9b1ac8592471449e23fc15e3ffce3

Test Merge Updated @ 06/21/2025 13:13:54 +00:00:
Server Instance

PVECM: Blue

Merged By

Warfan

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 461e36948e1b26b1a7317facab05d947d2a533a3

Test Merge Updated @ 06/21/2025 13:20:21 +00:00:
Server Instance

PVECM: Red

Merged By

Warfan

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 49f5b42610953f049f157b580a3cee18032987e2

Test Merge Deployed @ 06/21/2025 13:22:37 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 2a543be0c4c6c6bea04efe0516b3d9e41d80f711

Test Merge Removed @ 06/21/2025 15:40:05 +00:00:
Server Instance

PVECM: Green

Test Merge Updated @ 06/21/2025 17:44:47 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 57d6646727ec4406bea6ddffc3b7df12c8312204

Test Merge Deployed @ 06/21/2025 20:10:21 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 5800d84e17d3585a35e2b9cf0f66e7cb0711769a

Test Merge Removed @ 06/22/2025 03:48:06 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 06/22/2025 06:07:24 +00:00:
Server Instance

PVECM: Green

Merged By

Emilitia Ennehrt

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 4ee7106742b12b0405f110c0c9a66b5948d68805

Test Merge Updated @ 06/22/2025 11:53:01 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: f31cb9ea2b99d389ea30c3fc06f694c10a7f1047

Test Merge Updated @ 06/22/2025 13:14:48 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: a3674fd7bbb3b30d5a0ea63f61c65eace93ae180

Test Merge Updated @ 06/22/2025 15:23:12 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: bce14da270cc7bbb937a0b3e87272fce632e4d07

Test Merge Updated @ 06/22/2025 16:01:32 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: abd3b29
Pull Request: c9dfc04
Server: 27f0c7a0143f76f1e8a94f94e15b897528fc013e

Test Merge Removed @ 06/22/2025 17:29:30 +00:00:
Server Instance

PVECM: Blue

Test Merge Updated @ 06/22/2025 20:16:52 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: 4b4cd05
Pull Request: c9dfc04
Server: 0f91a6904b3ed8629ee037d73016a20454f7237f

Test Merge Deployed @ 06/23/2025 00:04:08 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: 4b4cd05
Pull Request: c9dfc04
Server: fc6de74be1d2c63d4cb42cf2a18e4bd6ac58cde2

Test Merge Updated @ 06/23/2025 14:27:06 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 4b4cd05
Pull Request: c9dfc04
Server: 73121d9cc8b0131c2100cf420a05c1ab57d9eb14

Test Merge Updated @ 06/23/2025 18:01:30 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 68cbb9527a2f869ee3c6b0174c176232dad69523

Test Merge Updated @ 06/23/2025 20:15:19 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 34f464420b23588a0b4c95f5e289ec0714c04f74

Test Merge Updated @ 06/23/2025 21:35:00 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 5542c682788edc3dd49f267a11703041d5e5a32d

Test Merge Updated @ 06/23/2025 21:46:44 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 6734210f6e5cdeb67078b970d93869c62db80ee2

Test Merge Updated @ 06/23/2025 22:01:23 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: f4a871228b3acac97aeb0508225034b3f42c635c

Test Merge Updated @ 06/24/2025 03:09:21 +00:00:
Server Instance

PVECM: Blue

Merged By

Some Random Username

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 525879f239091cb01431f50aca4dac85cb523c01

Test Merge Updated @ 06/24/2025 06:15:15 +00:00:
Server Instance

PVECM: Green

Merged By

Emilitia Ennehrt

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: a9e81a0787c5ad3949de1375eeabe29256e5bd9c

Test Merge Removed @ 06/24/2025 12:39:22 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 06/25/2025 00:25:46 +00:00:
Server Instance

PVECM: Red

Merged By

shorttemperedleprech

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 53fcb8582268520502838d6ce6b06ad348760e9a

Test Merge Deployed @ 06/25/2025 09:33:23 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 2fe769bdee3ce8a86499e09e899e2aae9657be07

Test Merge Updated @ 06/25/2025 16:08:31 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 2a6dcf2d2742ad35fd56ecb6be66ce3aaa05ca9f

Test Merge Updated @ 06/25/2025 16:17:49 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: b6d68df78a38f30031aa555085ed3b35f78a1229

Test Merge Updated @ 06/25/2025 20:34:45 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 00813c12870ec6b271873cdddc671ec2d8a5a7fc

Test Merge Updated @ 06/25/2025 21:01:53 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 6d5a6ed4fb8f3ae7c05d090946249db07b2715db

Test Merge Updated @ 06/25/2025 23:46:41 +00:00:
Server Instance

PVECM: Red

Merged By

shorttemperedleprech

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 869b3f20a432337bdca02a7fbf8efd7052a34c16

Test Merge Updated @ 06/26/2025 00:32:28 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: c05e2a40d4531c7d34121894d623c5c5571e992a

Test Merge Updated @ 06/26/2025 00:48:41 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 1eaaf9317c6bdc33c567eb12d1ea808765fe88b5

Test Merge Updated @ 06/26/2025 00:53:08 +00:00:
Server Instance

PVECM: Red

Merged By

shorttemperedleprech

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 57596f8a39e943b6aedf2479c2d637aefe0d41c4

Test Merge Updated @ 06/26/2025 12:51:37 +00:00:
Server Instance

PVECM: Red

Merged By

E 8000 militia Ennehrt

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: 45bd191794b554035aa56d788e4fced6bf5f99ff

Test Merge Updated @ 06/26/2025 16:07:31 +00:00:
Server Instance

PVECM: Red

Merged By

goshflipheck

Revision

Origin: e6c14d5
Pull Request: c9dfc04
Server: f2636f5bb0f3665325570d968d497e75e6d22b5d

Test Merge Removed @ 06/26/2025 19:47:35 +00:00:
Server Instance

PVECM: Red

Test Merge Updated @ 06/27/2025 00:25:52 +00:00:
Server Instance

PVECM: Blue

Merged By

shorttemperedleprech

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: efe799fd3e1405b385bab9be00727a5ee6370d83

Test Merge Updated @ 06/27/2025 04:10:48 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 45e7e1debdeb6bcc2008b05e86c174a23e49384a

Test Merge Updated @ 06/27/2025 17:28:02 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 4cb2a8fe73ba741ef47c63846ebaacd8607eef5d

Test Merge Updated @ 06/27/2025 18:58:51 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: cef95ff19f0be8b6fd3f5497eaa67ee3b87bb74e

Test Merge Updated @ 06/27/2025 19:05:18 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 28639277b36e8e016ff397084ac410147e60bd96

Test Merge Updated @ 06/27/2025 21:15:27 +00:00:
Server Instance

PVECM: Blue

Merged By

lordloko

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 3f9cf097f1acf00f8dd68cab314bf12adb0bb65a

Test Merge Updated @ 06/27/2025 23:38:20 +00:00:
Server Instance

PVECM: Green

Merged By

StinkethStonketh

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: ad53c4773869f6b9d239bd84c228ef1a271b9d75

Test Merge Removed @ 06/28/2025 01:05:43 +00:00:
Server Instance

PVECM: Blue

Test Merge Updated @ 06/28/2025 09:29:10 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 380525254dd3818b8b36725599f333a448c6265a

Test Merge Updated @ 06/28/2025 09:38:22 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: d7ae21d39d3cbe7cbc497c8b969cdd6c8b936afe

Test Merge Updated @ 06/28/2025 09:49:39 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: f572760f460ae107206dfb460c3643007b6c90ad

Test Merge Updated @ 06/28/2025 14:43:24 +00:00:
Server Instance

PVECM: Green

Merged By

Warfan

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: 2d03e8fb83358652737c399f4126e240e0e3cc60

Test Merge Updated @ 06/28/2025 19:02:21 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: e6c14d5
Pull Request: 7db6e96
Server: e5404158300ed8e482a4bf48e8a0f2dfb89ab686

Test Merge Updated @ 06/28/2025 21:58:47 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: e30c235
Pull Request: 7db6e96
Server: be782b95cc9a557c1b78e2152dfe081b228b6e19

Test Merge Updated @ 06/29/2025 10:24:42 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: e0b7ab26292b5d7d9fbe779aceb087da43bb2b17

Test Merge Updated @ 06/29/2025 13:26:25 +00:00:
Server Instance

PVECM: Green

Merged By

Emilitia Ennehrt

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 1c47848db180eb97538f99380ec7681fcb55f35e

Test Merge Updated @ 06/29/2025 19:56:13 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: e4314e2f76fe4058e89c53f26ee65423106165b6

Test Merge Updated @ 06/29/2025 19:57:38 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 42976d02b6f76d825f31978d7ff7ca15519d14b2

Test Merge Updated @ 06/30/2025 01:34:33 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 377de577df087e80654b94eabf889253135a053e

Test Merge Updated @ 06/30/2025 10:56:44 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 931fa0676c269ebdc007534f075d2cdd67692bc3

Test Merge Updated @ 06/30/2025 14:18:54 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 5a9a115117181aaf54dd3a5055ec4c23148385fe

Test Merge Updated @ 06/30/2025 14:22:16 +00:00:
Server Instance

PVECM: Green

Merged By

Karmac

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: e4d49993275470d30cd7f6af8d67d9dce8340ff2

Test Merge Updated @ 06/30/2025 18:11:24 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 9e2611273321607a7aa1b5e79b43cfb574103b90

Test Merge Updated @ 06/30/2025 23:11:28 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: a5c0200a7c58f0b4d3d23ff7ce5ba0a5b8253f28

Test Merge Updated @ 06/30/2025 23:17:11 +00:00:
Server Instance

PVECM: Green

Merged By

Rob606

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 14023e9a3b88b36afcce999513ed7084ac13a3df

Test Merge Updated @ 06/30/2025 23:36:38 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: 167b2d597aaccd3b458b8ae9f648e4c5f38326dd

Test Merge Updated @ 07/01/2025 00:15:27 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 5d6f309
Pull Request: 7db6e96
Server: eefc1136fd99d4eb04de3bbb4bef5d95c19ae8e6

Test Merge Updated @ 07/01/2025 15:08:32 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: 9a7b5d4
Pull Request: 7db6e96
Server: 871db17c8a9d50c11625b1519e512bbd3974fb8e

Test Merge Updated @ 07/01/2025 22:15:19 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: 9a7b5d4
Pull Request: 7db6e96
Server: 865fd261b5758f522e844fb6144ef0ce6c6cf2ec

Test Merge Updated @ 07/02/2025 14:22:31 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: efccbe1
Pull Request: 7db6e96
Server: f76d8daac795f59b7999844364552f3a10a64f78

Test Merge Updated @ 07/02/2025 18:59:05 +00:00:
Server Instance

PVECM: Green

Merged By

Joooks

Revision

Origin: efccbe1
Pull Request: 7db6e96
Server: 546398653602dd0f3825e42e48c8a12288c813f3

Test Merge Updated @ 07/02/2025 23:51:43 +00:00:
Server Instance

PVECM: Green

Merged By

shorttemperedleprech

Revision

Origin: efccbe1
Pull Request: 7db6e96
Server: d2b29a485a2d5dbbfd9bbaeb030d649aecae7cfa

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@BonniePandora BonniePandora changed the title Shipmap mortar usage Expanded mortar & laser designator usage Jun 4, 2025
@BonniePandora BonniePandora marked this pull request as ready for review June 4, 2025 23:07
@BonniePandora BonniePandora requested a review from AndroBetel June 4, 2025 23:07
@Spacefire5 Spacefire5 mentioned this pull request Jun 15, 2025
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndroBetel AndroBetel AndroBetel approved these changes

Assignees
No one assigned
Labels
Balance
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BonniePandora @nauticall @cm13-github @AndroBetel
0